Deep copy subgraphs to clipboard, update nested ids on paste (#5003 ) (#5022 )

* Deep copy to clipboard, update nested ids on paste The copyToClipboard function wasn't walking subgraphs and leaving nested subgraphs unserialized. This has now been fixed. This requires that equivalent support be added to _pasteFromClipboard to update the ids of nested subgraphs which are pasted. * Add extra advisory comments Co-authored-by: AustinMroz <austin@comfy.org>
fix: improve minimap subgraph navigation with graph UUID callback tracking (#5018 ) (#5020 )
2026-04-24 08:19:51 +00:00 · 2025-08-15 14:26:53 -07:00 · 2025-08-15 14:01:34 -07:00 · 2025-08-15 13:36:48 -07:00 · 2025-08-15 13:04:32 -07:00 · 2025-08-15 12:12:54 -07:00
183 changed files with 6987 additions and 9880 deletions
--- a/.claude/commands/create-frontend-release.md
+++ b/.claude/commands/create-frontend-release.md
@@ -210,52 +210,29 @@ echo "Last stable release: $LAST_STABLE"
       echo "WARNING: PR #$PR not on main branch!"
   done
   ```
-3. Create standardized release notes using this exact template:
+3. Create comprehensive release notes including:
+   - **Version Change**: Show version bump details
+   - **Changelog** grouped by type:
+     - 🚀 **Features** (feat:)
+     - 🐛 **Bug Fixes** (fix:)
+     - 💥 **Breaking Changes** (BREAKING CHANGE)
+     - 📚 **Documentation** (docs:)
+     - 🔧 **Maintenance** (chore:, refactor:)
+     - ⬆️ **Dependencies** (deps:, dependency updates)
+       - **Litegraph Changes** (if version updated):
+         - 🚀 Features: ${LITEGRAPH_FEATURES}
+         - 🐛 Bug Fixes: ${LITEGRAPH_FIXES}
+         - 💥 Breaking Changes: ${LITEGRAPH_BREAKING}
+         - 🔧 Other Changes: ${LITEGRAPH_OTHER}
+       - **Other Major Dependencies**: ${OTHER_DEP_CHANGES}
+   - Include PR numbers and links
+   - Add issue references (Fixes #123)
+4. **Save release notes:**
   ```bash
-   cat > release-notes-${NEW_VERSION}.md << 'EOF'
-   ## ⚠️ Breaking Changes
-   <!-- List breaking changes if any, otherwise remove this entire section -->
-   - Breaking change description (#PR_NUMBER)
-
-   ---
-
-   ## What's Changed
-
-   ### 🚀 Features
-   <!-- List features here, one per line with PR reference -->
-   - Feature description (#PR_NUMBER)
-
-   ### 🐛 Bug Fixes
-   <!-- List bug fixes here, one per line with PR reference -->
-   - Bug fix description (#PR_NUMBER)
-
-   ### 🔧 Maintenance
-   <!-- List refactoring, chore, and other maintenance items -->
-   - Maintenance item description (#PR_NUMBER)
-
-   ### 📚 Documentation
-   <!-- List documentation changes if any, remove section if empty -->
-   - Documentation update description (#PR_NUMBER)
-
-   ### ⬆️ Dependencies
-   <!-- List dependency updates -->
-   - Updated dependency from vX.X.X to vY.Y.Y (#PR_NUMBER)
-
-   **Full Changelog**: https://github.com/Comfy-Org/ComfyUI_frontend/compare/${BASE_TAG}...v${NEW_VERSION}
-   EOF
+   # Save release notes for PR and GitHub release
+   echo "$RELEASE_NOTES" > release-notes-${NEW_VERSION}.md
   ```
-4. **Parse commits and populate template:**
-   - Group commits by conventional commit type (feat:, fix:, chore:, etc.)
-   - Extract PR numbers from commit messages
-   - For breaking changes, analyze if changes affect:
-     - Public APIs (app object, api module)
-     - Extension/workspace manager APIs
-     - Node schema, workflow schema, or other public schemas
-     - Any other public-facing interfaces
-   - For dependency updates, list version changes with PR numbers
-   - Remove empty sections (e.g., if no documentation changes)
-   - Ensure consistent bullet format: `- Description (#PR_NUMBER)`
-5. **CONTENT REVIEW**: Release notes follow standard format?
+5. **CONTENT REVIEW**: Release notes clear and comprehensive with dependency details?

 ### Step 9: Create Version Bump PR

@@ -296,12 +273,38 @@ echo "Workflow triggered. Waiting for PR creation..."
     --body-file release-notes-${NEW_VERSION}.md \
     --label "Release"
   ```
-3. **Update PR with release notes:**
+3. **Add required sections to PR body:**
   ```bash
-   # For workflow-created PRs, update the body with our release notes
-   gh pr edit ${PR_NUMBER} --body-file release-notes-${NEW_VERSION}.md
+   # Create PR body with release notes plus required sections
+   cat > pr-body.md << EOF
+   ${RELEASE_NOTES}
+
+   ## Breaking Changes
+   ${BREAKING_CHANGES:-None}
+
+   ## Testing Performed
+   - ✅ Full test suite (unit, component)
+   - ✅ TypeScript compilation
+   - ✅ Linting checks
+   - ✅ Build verification
+   - ✅ Security audit
+
+   ## Distribution Channels
+   - GitHub Release (with dist.zip)
+   - PyPI Package (comfyui-frontend-package)
+   - npm Package (@comfyorg/comfyui-frontend-types)
+
+   ## Post-Release Tasks
+   - [ ] Verify all distribution channels
+   - [ ] Update external documentation
+   - [ ] Monitor for issues
+   EOF
   ```
-4. **PR REVIEW**: Version bump PR created with standardized release notes?
+4. Update PR with enhanced description:
+   ```bash
+   gh pr edit ${PR_NUMBER} --body-file pr-body.md
+   ```
+5. **PR REVIEW**: Version bump PR created and enhanced correctly?

 ### Step 10: Critical Release PR Verification

@@ -589,46 +592,55 @@ The command implements multiple quality gates:
 - Draft release status
 - Python package specs require that prereleases use alpha/beta/rc as the preid

-## Critical Implementation Notes
+## Common Issues and Solutions

-When executing this release process, pay attention to these key aspects:
+### Issue: Pre-release Version Confusion
+**Problem**: Not sure whether to promote pre-release or create new version
+**Solution**: 
+- Follow semver standards: a prerelease version is followed by a normal release.  It should have the same major, minor, and patch versions as the prerelease.

-### 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
+### Issue: Wrong Commit Count
+**Problem**: Changelog includes commits from other branches
+**Solution**: Always use `--first-parent` flag with git log

-### 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
-  gh pr view ${PR_NUMBER} --json baseRefName
-  ```
+**Update**: Sometimes update-locales doesn't add [skip ci] - always verify!

-### 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:
-  ```bash
-  git commit --allow-empty -m "Trigger release workflow"
-  ```
+### Issue: Missing PRs in Changelog
+**Problem**: PR was merged to different branch
+**Solution**: Verify PR merge target with:
+```bash
+gh pr view ${PR_NUMBER} --json baseRefName
+```

-### 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
+### Issue: Incomplete Dependency Changelog
+**Problem**: Litegraph or other dependency updates only show version bump, not actual changes
+**Solution**: The command now automatically:
+- Detects litegraph version changes between releases
+- Clones the litegraph repository temporarily
+- Extracts and categorizes changes between versions
+- Includes detailed litegraph changelog in release notes
+- Cleans up temporary files after analysis

-### Breaking Changes Detection
- Analyze changes to public-facing APIs:
-  - The `app` object and its methods
-  - The `api` module exports
-  - Extension and workspace manager interfaces
-  - Node schema, workflow schema, and other public schemas
- Any modifications to these require marking as breaking changes
+### Issue: Release Failed Due to [skip ci]
+**Problem**: Release workflow didn't trigger after merge
+**Prevention**: Always avoid this scenario
+- Ensure that `[skip ci]` or similar flags are NOT in the `HEAD` commit message of the PR
+  - Push a new, empty commit to the PR
+- Always double-check this immediately before merging

-### 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
+**Recovery Strategy**:
+1. Revert version in a new PR (e.g., 1.24.0 → 1.24.0-1)
+2. Merge the revert PR
+3. Run version bump workflow again
+4. This creates a fresh PR without [skip ci]
+Benefits: Cleaner than creating extra version numbers
+
+## Key Learnings & Notes
+
+1. **PR Author**: Version bump PRs are created by `comfy-pr-bot`, not `github-actions`
+2. **Workflow Speed**: Version bump workflow typically completes in ~20-30 seconds
+3. **Update-locales Behavior**: Inconsistent - sometimes adds [skip ci], sometimes doesn't
+4. **Recovery Options**: Reverting version is cleaner than creating extra versions
+5. **Dependency Tracking**: Command now automatically includes litegraph and major dependency changes in changelogs
+6. **Litegraph Integration**: Temporary cloning of litegraph repo provides detailed change analysis between versions

--- a/.claude/commands/create-hotfix-release.md
+++ b/.claude/commands/create-hotfix-release.md
@@ -138,50 +138,14 @@ For each commit:
   ```bash
   gh pr create --base core/X.Y --head release/1.23.5 \
     --title "[Release] v1.23.5" \
-     --body "Release notes will be added shortly..." \
+     --body "..." \
     --label "Release"
   ```
 3. **CRITICAL**: Verify "Release" label is added
-4. Create standardized release notes:
-   ```bash
-   cat > release-notes-${NEW_VERSION}.md << 'EOF'
-   ## ⚠️ Breaking Changes
-   <!-- List breaking changes if any, otherwise remove this entire section -->
-   - Breaking change description (#PR_NUMBER)
-
-   ---
-
-   ## What's Changed
-
-   ### 🚀 Features
-   <!-- List features here, one per line with PR reference -->
-   - Feature description (#PR_NUMBER)
-
-   ### 🐛 Bug Fixes
-   <!-- List bug fixes here, one per line with PR reference -->
-   - Bug fix description (#PR_NUMBER)
-
-   ### 🔧 Maintenance
-   <!-- List refactoring, chore, and other maintenance items -->
-   - Maintenance item description (#PR_NUMBER)
-
-   ### 📚 Documentation
-   <!-- List documentation changes if any, remove section if empty -->
-   - Documentation update description (#PR_NUMBER)
-
-   ### ⬆️ Dependencies
-   <!-- List dependency updates -->
-   - Updated dependency from vX.X.X to vY.Y.Y (#PR_NUMBER)
-
-   **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
-     ```
+4. PR description should include:
+   - Version: `1.23.4` → `1.23.5`
+   - Included fixes (link to previous PR)
+   - Release notes for users
 5. **CONFIRMATION REQUIRED**: Release PR has "Release" label?

 ### Step 11: Monitor Release Process
--- a/.claude/commands/pr.md
+++ b/.claude/commands/pr.md
@@ -1,131 +0,0 @@
-# Create PR
-
-Automate PR creation with proper tags, labels, and concise summary.
-
-## Step 1: Check Prerequisites
-
-```bash
-# Ensure you have uncommitted changes
-git status
-
-# If changes exist, commit them first
-git add .
-git commit -m "[tag] Your commit message"
-```
-
-## Step 2: Push and Create PR
-
-You'll create the PR with the following structure:
-
-### PR Tags (use in title)
-
- `[feat]` - New features → label: `enhancement`
- `[bugfix]` - Bug fixes → label: `verified bug`
- `[refactor]` - Code restructuring → label: `enhancement`
- `[docs]` - Documentation → label: `documentation`
- `[test]` - Test changes → label: `enhancement`
- `[ci]` - CI/CD changes → label: `enhancement`
-
-### Label Mapping
-
-#### General Labels
-
- Feature/Enhancement: `enhancement`
- Bug fixes: `verified bug`
- Documentation: `documentation`
- Dependencies: `dependencies`
- Performance: `Performance`
- Desktop app: `Electron`
-
-#### Product Area Labels
-
-**Core Features**
-
- `area:nodes` - Node-related functionality
- `area:workflows` - Workflow management
- `area:queue` - Queue system
- `area:models` - Model handling
- `area:templates` - Template system
- `area:subgraph` - Subgraph functionality
-
-**UI Components**
-
- `area:ui` - General user interface improvements
- `area:widgets` - Widget system
- `area:dom-widgets` - DOM-based widgets
- `area:links` - Connection links between nodes
- `area:groups` - Node grouping functionality
- `area:reroutes` - Reroute nodes
- `area:previews` - Preview functionality
- `area:minimap` - Minimap navigation
- `area:floating-toolbox` - Floating toolbar
- `area:mask-editor` - Mask editing tools
-
-**Navigation & Organization**
-
- `area:navigation` - Navigation system
- `area:search` - Search functionality
- `area:workspace-management` - Workspace features
- `area:topbar-menu` - Top bar menu
- `area:help-menu` - Help menu system
-
-**System Features**
-
- `area:settings` - Settings/preferences
- `area:hotkeys` - Keyboard shortcuts
- `area:undo-redo` - Undo/redo system
- `area:customization` - Customization features
- `area:auth` - Authentication
- `area:comms` - Communication/networking
-
-**Development & Infrastructure**
-
- `area:CI/CD` - CI/CD pipeline
- `area:testing` - Testing infrastructure
- `area:vue-migration` - Vue migration work
- `area:manager` - ComfyUI Manager integration
-
-**Platform-Specific**
-
- `area:mobile` - Mobile support
- `area:3d` - 3D-related features
-
-**Special Areas**
-
- `area:i18n` - Translation/internationalization
- `area:CNR` - Comfy Node Registry
-
-## Step 3: Execute PR Creation
-
-```bash
-# First, push your branch
-git push -u origin $(git branch --show-current)
-
-# Then create the PR (replace placeholders)
-gh pr create \
-  --title "[TAG] Brief description" \
-  --body "$(cat <<'EOF'
-## Summary
-One sentence describing what changed and why.
-
-## Changes
- **What**: Core functionality added/modified
- **Breaking**: Any breaking changes (if none, omit this line)
- **Dependencies**: New dependencies (if none, omit this line)
-
-## Review Focus
- Critical design decisions or edge cases that need attention
-
-Fixes #ISSUE_NUMBER
-EOF
-)" \
-  --label "APPROPRIATE_LABEL" \
-  --base main
-```
-
-## Additional Options
-
- Add multiple labels: `--label "enhancement,Performance"`
- Request reviewers: `--reviewer @username`
- Mark as draft: `--draft`
- Open in browser after creation: `--web`
--- a/.cursorrules
+++ b/.cursorrules
@@ -49,7 +49,7 @@ DO NOT use deprecated PrimeVue components. Use these replacements instead:

 ## Development Guidelines
 1. Leverage VueUse functions for performance-enhancing styles
-2. Use es-toolkit for utility functions
+2. Use lodash for utility functions
 3. Use TypeScript for type safety
 4. Implement proper props and emits definitions
 5. Utilize Vue 3's Teleport component when needed
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -18,7 +18,7 @@ Use Tailwind CSS for styling

 Leverage VueUse functions for performance-enhancing styles

-Use es-toolkit for utility functions
+Use lodash for utility functions

 Use TypeScript for type safety

--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,20 +0,0 @@
-## Summary
-
-<!-- One sentence describing what changed and why. -->
-
-## Changes
-
- **What**: <!-- Core functionality added/modified -->
- **Breaking**: <!-- Any breaking changes (if none, remove this line) -->
- **Dependencies**: <!-- New dependencies (if none, remove this line) -->
-
-## Review Focus
-
-<!-- Critical design decisions or edge cases that need attention -->
-
-<!-- If this PR fixes an issue, uncomment and update the line below -->
-<!-- Fixes #ISSUE_NUMBER -->
-
-## Screenshots (if applicable)
-
-<!-- Add screenshots or video recording to help explain your changes -->
--- a/.github/workflows/auto-fix-and-update.yaml
+++ b/.github/workflows/auto-fix-and-update.yaml
@@ -1,206 +0,0 @@
-name: Auto-fix and Update
-
-on:
-  pull_request:
-    branches-ignore: [wip/*, draft/*, temp/*]
-
-permissions:
-  contents: write
-  pull-requests: write
-  issues: write
-
-jobs:
-  auto-fix-and-update:
-    # Only run on PRs from the same repository (not forks) to avoid permission issues, auto fix any lint and formats, update locales, and commit the changes back
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup ComfyUI Frontend and Backend
-        uses: Comfy-Org/ComfyUI_frontend_setup_action@v2.3
-
-      # Step 1: Cache ESLint for better performance
-      - name: Cache ESLint
-        uses: actions/cache@v4
-        with:
-          path: ComfyUI_frontend/.eslintcache
-          key: ${{ runner.os }}-eslint-${{ hashFiles('ComfyUI_frontend/eslint.config.js', 'ComfyUI_frontend/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-eslint-
-
-      # Step 2: Run lint and format fixes
-      - name: Run ESLint with auto-fix
-        run: npm run lint:fix
-        working-directory: ComfyUI_frontend
-
-      - name: Run Prettier with auto-format
-        run: npm run format
-        working-directory: ComfyUI_frontend
-
-      # Step 3: Update locales (only if there are relevant changes)
-      - name: Check if locale updates needed
-        id: check-locale-changes
-        run: |
-          # Check if there are changes to files that would affect locales
-          if git diff --name-only origin/${{ github.base_ref }}..HEAD | grep -E '\.(vue|ts|tsx)$' | grep -v test | head -1; then
-            echo "locale_updates_needed=true" >> $GITHUB_OUTPUT
-          else
-            echo "locale_updates_needed=false" >> $GITHUB_OUTPUT
-          fi
-        working-directory: ComfyUI_frontend
-
-      - name: Install Playwright Browsers
-        if: steps.check-locale-changes.outputs.locale_updates_needed == 'true'
-        run: npx playwright install chromium --with-deps
-        working-directory: ComfyUI_frontend
-
-      - name: Start dev server
-        if: steps.check-locale-changes.outputs.locale_updates_needed == 'true'
-        run: npm run dev:electron &
-        working-directory: ComfyUI_frontend
-
-      - name: Update en.json
-        if: steps.check-locale-changes.outputs.locale_updates_needed == 'true'
-        run: npm run collect-i18n -- scripts/collect-i18n-general.ts
-        env:
-          PLAYWRIGHT_TEST_URL: http://localhost:5173
-        working-directory: ComfyUI_frontend
-
-      - name: Update translations
-        if: steps.check-locale-changes.outputs.locale_updates_needed == 'true'
-        run: npm run locale
-        env:
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-        working-directory: ComfyUI_frontend
-
-      # Step 4: Check for any changes from both lint-format and locale updates
-      - name: Check for changes
-        id: verify-changed-files
-        run: |
-          if [ -n "$(git status --porcelain)" ]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
-            # Show what changed for debugging
-            echo "Changed files:"
-            git status --porcelain
-          else
-            echo "changed=false" >> $GITHUB_OUTPUT  
-          fi
-        working-directory: ComfyUI_frontend
-
-      # Step 5: Commit all changes in a single commit
-      - name: Commit auto-fixes and locale updates
-        if: steps.verify-changed-files.outputs.changed == 'true'
-        run: |
-          git config --global user.name 'github-actions'
-          git config --global user.email 'github-actions@github.com'
-          git fetch origin ${{ github.head_ref }}
-          # Stash any local changes before checkout
-          git stash -u
-          git checkout -B ${{ github.head_ref }} origin/${{ github.head_ref }}
-          # Apply the stashed changes if any
-          git stash pop || true
-          git add .
-          git diff --staged --quiet || git commit -m "[auto-fix] Apply ESLint, Prettier fixes and update locales"
-          git push origin HEAD:${{ github.head_ref }}
-        working-directory: ComfyUI_frontend
-
-      # Step 6: Run final validation
-      - name: Final validation
-        run: |
-          npm run lint
-          npm run format:check
-          npm run knip
-        working-directory: ComfyUI_frontend
-
-      # Step 7: Comment on PR about what was fixed
-      - name: Comment on PR about auto-fixes
-        if: steps.verify-changed-files.outputs.changed == 'true'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            let changes = [];
-            if ('${{ steps.check-locale-changes.outputs.locale_updates_needed }}' === 'true') {
-              changes.push('Locale updates');
-            }
-            // Always include lint/format as we ran them
-            changes.push('ESLint auto-fixes', 'Prettier formatting');
-
-            const changesText = changes.join('\n- ');
-
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `## 🔧 Auto-fixes Applied
-
-            This PR has been automatically updated with the following changes:
-
-            - ${changesText}
-
-            **⚠️ Important**: Your local branch is now behind. Run \`git pull\` before making additional changes to avoid conflicts.`
-            });
-
-  # Separate job for fork PRs that can't auto-commit, we only check lint and formats, and do not commit back
-  fork-pr-check:
-    if: github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout PR
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/*'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Cache ESLint
-        uses: actions/cache@v4
-        with:
-          path: .eslintcache
-          key: ${{ runner.os }}-eslint-fork-${{ hashFiles('eslint.config.js', 'package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-eslint-fork-
-
-      - name: Check linting and formatting
-        id: check-lint-format
-        run: |
-          # Run checks and capture exit codes
-          npm run lint || echo "lint_failed=true" >> $GITHUB_OUTPUT
-          npm run format:check || echo "format_failed=true" >> $GITHUB_OUTPUT
-          npm run knip || echo "knip_failed=true" >> $GITHUB_OUTPUT
-
-      - name: Comment on fork PR about manual fixes needed
-        if: steps.check-lint-format.outputs.lint_failed == 'true' || steps.check-lint-format.outputs.format_failed == 'true' || steps.check-lint-format.outputs.knip_failed == 'true'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `## ⚠️ Linting/Formatting Issues Found
-
-            This PR has linting or formatting issues that need to be fixed.
-
-            **Since this PR is from a fork, auto-fix cannot be applied automatically.**
-
-            ### Option 1: Set up pre-commit hooks (recommended)
-            Run this once to automatically format code on every commit:
-            \`\`\`bash
-            npm run prepare
-            \`\`\`
-
-            ### Option 2: Fix manually
-            Run these commands and push the changes:
-            \`\`\`bash
-            npm run lint:fix
-            npm run format
-            \`\`\`
-
-            See [CONTRIBUTING.md](https://github.com/Comfy-Org/ComfyUI_frontend/blob/main/CONTRIBUTING.md#git-pre-commit-hooks) for more details.`
-            });
--- a/.github/workflows/claude-pr-review.yml
+++ b/.github/workflows/claude-pr-review.yml
@@ -19,10 +19,10 @@ jobs:
      should-proceed: ${{ steps.check-status.outputs.proceed }}
    steps:
      - name: Wait for other CI checks
-        uses: lewagon/wait-on-check-action@e106e5c43e8ca1edea6383a39a01c5ca495fd812
+        uses: lewagon/wait-on-check-action@v1.3.1
        with:
          ref: ${{ github.event.pull_request.head.sha }}
-          check-regexp: '^(lint-and-format|test|playwright-tests)'
+          check-regexp: '^(eslint|prettier|test|playwright-tests)'
          wait-interval: 30
          repo-token: ${{ secrets.GITHUB_TOKEN }}
      
@@ -30,7 +30,7 @@ jobs:
        id: check-status
        run: |
          # Get all check runs for this commit
-          CHECK_RUNS=$(gh api repos/${{ github.repository }}/commits/${{ github.event.pull_request.head.sha }}/check-runs --jq '.check_runs[] | select(.name | test("lint-and-format|test|playwright-tests")) | {name, conclusion}')
+          CHECK_RUNS=$(gh api repos/${{ github.repository }}/commits/${{ github.event.pull_request.head.sha }}/check-runs --jq '.check_runs[] | select(.name | test("eslint|prettier|test|playwright-tests")) | {name, conclusion}')
          
          # Check if any required checks failed
          if echo "$CHECK_RUNS" | grep -q '"conclusion": "failure"'; then
--- a/.github/workflows/create-release-candidate-branch.yaml
+++ b/.github/workflows/create-release-candidate-branch.yaml
@@ -145,7 +145,7 @@ jobs:
            -d '{
              "required_status_checks": {
                "strict": true,
-                "contexts": ["lint-and-format", "test", "playwright-tests"]
+                "contexts": ["build", "test"]
              },
              "enforce_admins": false,
              "required_pull_request_reviews": {
--- a/.github/workflows/eslint.yaml
+++ b/.github/workflows/eslint.yaml
@@ -0,0 +1,17 @@
+name: ESLint
+
+on:
+  pull_request:
+    branches-ignore: [ wip/*, draft/*, temp/* ]
+
+jobs:
+  eslint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 'lts/*'
+    - run: npm ci
+    - run: npm run lint
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -0,0 +1,23 @@
+name: Prettier Check
+
+on:
+  pull_request:
+    branches-ignore: [ wip/*, draft/*, temp/* ]
+
+jobs:
+  prettier:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 'lts/*'
+
+    - name: Install dependencies
+      run: npm ci
+
+    - name: Run Prettier check
+      run: npm run format:check
--- a/.github/workflows/i18n.yaml
+++ b/.github/workflows/i18n.yaml
@@ -0,0 +1,51 @@
+name: Update Locales
+
+on:
+  pull_request:
+    branches: [ main, master, dev* ]
+    paths-ignore:
+      - '.github/**'
+      - '.husky/**'
+      - '.vscode/**'
+      - 'browser_tests/**'
+      - 'tests-ui/**'
+
+jobs:
+  update-locales:
+    # Don't run on fork PRs
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    steps:
+    - uses: Comfy-Org/ComfyUI_frontend_setup_action@v2.3
+    - name: Install Playwright Browsers
+      run: npx playwright install chromium --with-deps
+      working-directory: ComfyUI_frontend
+    - name: Start dev server
+      # Run electron dev server as it is a superset of the web dev server
+      # We do want electron specific UIs to be translated.
+      run: npm run dev:electron &
+      working-directory: ComfyUI_frontend
+    - name: Update en.json
+      run: npm run collect-i18n -- scripts/collect-i18n-general.ts
+      env:
+        PLAYWRIGHT_TEST_URL: http://localhost:5173
+      working-directory: ComfyUI_frontend
+    - name: Update translations
+      run: npm run locale
+      env:
+        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+      working-directory: ComfyUI_frontend
+    - name: Commit updated locales
+      run: |
+        git config --global user.name 'github-actions'
+        git config --global user.email 'github-actions@github.com'
+        git fetch origin ${{ github.head_ref }}
+        # Stash any local changes before checkout
+        git stash -u
+        git checkout -B ${{ github.head_ref }} origin/${{ github.head_ref }}
+        # Apply the stashed changes if any
+        git stash pop || true
+        git add src/locales/
+        git diff --staged --quiet || git commit -m "Update locales [skip ci]"
+        git push origin HEAD:${{ github.head_ref }}
+      working-directory: ComfyUI_frontend
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -22,7 +22,6 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version: 'lts/*'
-          cache: 'npm'
      - name: Get current version
        id: current_version
        run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
@@ -35,13 +34,6 @@ jobs:
          else
            echo "is_prerelease=false" >> $GITHUB_OUTPUT
          fi
-      - name: Cache Vite build
-        uses: actions/cache@v4
-        with:
-          path: node_modules/.vite
-          key: ${{ runner.os }}-vite-release-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-vite-release-
      - name: Build project
        env:
          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
@@ -125,7 +117,6 @@ jobs:
        with:
          node-version: 'lts/*'
          registry-url: https://registry.npmjs.org
-          cache: 'npm'
      - run: npm ci
      - run: npm run build:types
      - name: Publish package
--- a/.github/workflows/test-ui.yaml
+++ b/.github/workflows/test-ui.yaml
@@ -4,7 +4,7 @@ on:
  push:
    branches: [main, master, core/*, desktop/*]
  pull_request:
-    branches-ignore: [wip/*, draft/*, temp/*, vue-nodes-migration]
+    branches-ignore: [wip/*, draft/*, temp/*]

 jobs:
  setup:
@@ -35,16 +35,6 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version: lts/*
-          cache: 'npm'
-          cache-dependency-path: ComfyUI_frontend/package-lock.json
-
-      - name: Cache Vite build
-        uses: actions/cache@v4
-        with:
-          path: ComfyUI_frontend/node_modules/.vite
-          key: ${{ runner.os }}-vite-build-${{ hashFiles('ComfyUI_frontend/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-vite-build-

      - name: Build ComfyUI_frontend
        run: |
@@ -70,7 +60,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        browser: [chromium, chromium-2x, chromium-0.5x, mobile-chrome]
+        browser: [chromium, chromium-2x, mobile-chrome]
    steps:
      - name: Wait for cache propagation
        run: sleep 10
@@ -102,23 +92,7 @@ jobs:
          wait-for-it --service 127.0.0.1:8188 -t 600
        working-directory: ComfyUI

-      - name: Get Playwright version
-        id: playwright-version
-        run: echo "version=$(npm list @playwright/test --depth=0 --json | jq -r '.dependencies["@playwright/test"].version')" >> $GITHUB_OUTPUT
-        working-directory: ComfyUI_frontend
-
-      - name: Cache Playwright browsers
-        uses: actions/cache@v4
-        id: playwright-cache
-        with:
-          path: ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.version }}-chromium
-          restore-keys: |
-            ${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.version }}-
-            ${{ runner.os }}-playwright-
-
      - name: Install Playwright Browsers
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
        run: npx playwright install chromium --with-deps
        working-directory: ComfyUI_frontend

--- a/.github/workflows/update-manager-types.yaml
+++ b/.github/workflows/update-manager-types.yaml
@@ -61,11 +61,6 @@ jobs:
            exit 1
          fi

-      - name: Lint generated types
-        run: |
-          echo "Linting generated ComfyUI-Manager API types..."
-          npm run lint:fix:no-cache -- ./src/types/generatedManagerTypes.ts
-
      - name: Check for changes
        id: check-changes
        run: |
@@ -80,7 +75,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@v7
        with:
          token: ${{ secrets.PR_GH_TOKEN }}
          commit-message: '[chore] Update ComfyUI-Manager API types from ComfyUI-Manager@${{ steps.manager-info.outputs.commit }}'
--- a/.github/workflows/update-registry-types.yaml
+++ b/.github/workflows/update-registry-types.yaml
@@ -61,11 +61,6 @@ jobs:
            exit 1
          fi

-      - name: Lint generated types
-        run: |
-          echo "Linting generated Comfy Registry API types..."
-          npm run lint:fix:no-cache -- ./src/types/comfyRegistryTypes.ts
-
      - name: Check for changes
        id: check-changes
        run: |
--- a/.github/workflows/vitest.yaml
+++ b/.github/workflows/vitest.yaml
@@ -17,19 +17,10 @@ jobs:
      uses: actions/setup-node@v4
      with:
        node-version: 'lts/*'
-        cache: 'npm'

    - name: Install dependencies
      run: npm ci

-    - name: Cache Vite
-      uses: actions/cache@v4
-      with:
-        path: node_modules/.vite
-        key: ${{ runner.os }}-vite-${{ hashFiles('package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-vite-
-
    - name: Run Vitest tests
      run: |
        npm run test:component
--- a/.gitignore
+++ b/.gitignore
@@ -7,15 +7,6 @@ yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*

-# Package manager lockfiles (allow users to use different package managers)
-bun.lock
-bun.lockb
-pnpm-lock.yaml
-yarn.lock
-
-# ESLint cache
-.eslintcache
-
 node_modules
 dist
 dist-ssr
@@ -67,8 +58,5 @@ dist.zip
 # Temporary repository directory
 templates_repo/

-# Vite's timestamped config modules
+# Vite’s timestamped config modules
 vite.config.mts.timestamp-*.mjs
-
-# Linux core dumps
-./core
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,40 +0,0 @@
-# Repository Guidelines
-
-## Project Structure & Module Organization
- Source: `src/` (Vue 3 + TypeScript). Key areas: `components/`, `views/`, `stores/` (Pinia), `composables/`, `services/`, `utils/`, `assets/`, `locales/`.
- Routing/i18n/entry: `src/router.ts`, `src/i18n.ts`, `src/main.ts`.
- Tests: unit/component in `tests-ui/` and `src/components/**/*.{test,spec}.ts`; E2E in `browser_tests/`.
- Public assets: `public/`. Build output: `dist/`.
- Config: `vite.config.mts`, `vitest.config.ts`, `playwright.config.ts`, `eslint.config.js`, `.prettierrc`.
-
-## Build, Test, and Development Commands
- `npm run dev`: Start Vite dev server.
- `npm run dev:electron`: Dev server with Electron API mocks.
- `npm run build`: Type-check then production build to `dist/`.
- `npm run preview`: Preview the production build locally.
- `npm run test:unit`: Run Vitest unit tests (`tests-ui/`).
- `npm run test:component`: Run component tests (`src/components/`).
- `npm run test:browser`: Run Playwright E2E tests (`browser_tests/`).
- `npm run lint` / `npm run lint:fix`: Lint (ESLint). `npm run format` / `format:check`: Prettier.
- `npm run typecheck`: Vue TSC type checking.
-
-## Coding Style & Naming Conventions
- Language: TypeScript, Vue SFCs (`.vue`). Indent 2 spaces; single quotes; no semicolons; width 80 (see `.prettierrc`).
- Imports: sorted/grouped by plugin; run `npm run format` before committing.
- ESLint: Vue + TS rules; no floating promises; unused imports disallowed; i18n raw text restrictions in templates.
- Naming: Vue components in PascalCase (e.g., `MenuHamburger.vue`); composables `useXyz.ts`; Pinia stores `*Store.ts`.
-
-## Testing Guidelines
- Frameworks: Vitest (unit/component, happy-dom) and Playwright (E2E).
- Test files: `**/*.{test,spec}.{ts,tsx,js}` under `tests-ui/`, `src/components/`, and `src/lib/litegraph/test/`.
- Coverage: text/json/html reporters enabled; aim to cover critical logic and new features.
- Playwright: place tests in `browser_tests/`; optional tags like `@mobile`, `@2x` are respected by config.
-
-## Commit & Pull Request Guidelines
- Commits: Prefer Conventional Commits (e.g., `feat(ui): add sidebar`), `refactor(litegraph): …`. Use `[skip ci]` for locale-only updates when appropriate.
- PRs: Include clear description, linked issues (`Fixes #123`), and screenshots/GIFs for UI changes. Add/adjust tests and i18n strings when applicable.
- Quality gates: `npm run lint`, `npm run typecheck`, and relevant tests must pass. Keep PRs focused and small.
-
-## Security & Configuration Tips
- Secrets: Use `.env` (see `.env_example`); do not commit secrets.
- Backend: Dev server expects ComfyUI backend at `localhost:8188` by default; configure via `.env`.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -255,17 +255,11 @@ npm run format
 - Add translations to `src/locales/en/main.json`
 - Use translation keys: `const { t } = useI18n(); t('key.path')`

-## Icons
+## Custom Icons

-The project supports three types of icons, all with automatic imports (no manual imports needed):
+The project supports custom SVG icons through the unplugin-icons system. Custom icons are stored in `src/assets/icons/custom/` and can be used as Vue components with the `i-comfy:` prefix.

-1. **PrimeIcons** - Built-in PrimeVue icons using CSS classes: `<i class="pi pi-plus" />`
-2. **Iconify Icons** - 200,000+ icons from various libraries: `<i-lucide:settings />`, `<i-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 `src/assets/icons/custom/`.
-
-For detailed instructions and code examples, see [src/assets/icons/README.md](src/assets/icons/README.md).
+For detailed instructions on adding and using custom icons, see [src/assets/icons/README.md](src/assets/icons/README.md).

 ## Working with litegraph.js

--- a/browser_tests/assets/reroute/single-native-reroute-default-workflow.json
+++ b/browser_tests/assets/reroute/single-native-reroute-default-workflow.json
@@ -1,259 +0,0 @@
-{
-  "id": "dec788c2-9829-4a5d-a1ee-d6f0a678b42a",
-  "revision": 0,
-  "last_node_id": 9,
-  "last_link_id": 9,
-  "nodes": [
-    {
-      "id": 7,
-      "type": "CLIPTextEncode",
-      "pos": [413, 389],
-      "size": [425.27801513671875, 180.6060791015625],
-      "flags": {},
-      "order": 3,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "clip",
-          "type": "CLIP",
-          "link": 5
-        }
-      ],
-      "outputs": [
-        {
-          "name": "CONDITIONING",
-          "type": "CONDITIONING",
-          "slot_index": 0,
-          "links": [6]
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "CLIPTextEncode"
-      },
-      "widgets_values": ["text, watermark"]
-    },
-    {
-      "id": 6,
-      "type": "CLIPTextEncode",
-      "pos": [415, 186],
-      "size": [422.84503173828125, 164.31304931640625],
-      "flags": {},
-      "order": 2,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "clip",
-          "type": "CLIP",
-          "link": 3
-        }
-      ],
-      "outputs": [
-        {
-          "name": "CONDITIONING",
-          "type": "CONDITIONING",
-          "slot_index": 0,
-          "links": [4]
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "CLIPTextEncode"
-      },
-      "widgets_values": [
-        "beautiful scenery nature glass bottle landscape, , purple galaxy bottle,"
-      ]
-    },
-    {
-      "id": 5,
-      "type": "EmptyLatentImage",
-      "pos": [473, 609],
-      "size": [315, 106],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "LATENT",
-          "type": "LATENT",
-          "slot_index": 0,
-          "links": [2]
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "EmptyLatentImage"
-      },
-      "widgets_values": [512, 512, 1]
-    },
-    {
-      "id": 3,
-      "type": "KSampler",
-      "pos": [863, 186],
-      "size": [315, 262],
-      "flags": {},
-      "order": 4,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "model",
-          "type": "MODEL",
-          "link": 1
-        },
-        {
-          "name": "positive",
-          "type": "CONDITIONING",
-          "link": 4
-        },
-        {
-          "name": "negative",
-          "type": "CONDITIONING",
-          "link": 6
-        },
-        {
-          "name": "latent_image",
-          "type": "LATENT",
-          "link": 2
-        }
-      ],
-      "outputs": [
-        {
-          "name": "LATENT",
-          "type": "LATENT",
-          "slot_index": 0,
-          "links": [7]
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "KSampler"
-      },
-      "widgets_values": [
-        156680208700286,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
-    },
-    {
-      "id": 8,
-      "type": "VAEDecode",
-      "pos": [1209, 188],
-      "size": [210, 46],
-      "flags": {},
-      "order": 5,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "samples",
-          "type": "LATENT",
-          "link": 7
-        },
-        {
-          "name": "vae",
-          "type": "VAE",
-          "link": 8
-        }
-      ],
-      "outputs": [
-        {
-          "name": "IMAGE",
-          "type": "IMAGE",
-          "slot_index": 0,
-          "links": [9]
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "VAEDecode"
-      },
-      "widgets_values": []
-    },
-    {
-      "id": 9,
-      "type": "SaveImage",
-      "pos": [1451, 189],
-      "size": [210, 58],
-      "flags": {},
-      "order": 6,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "images",
-          "type": "IMAGE",
-          "link": 9
-        }
-      ],
-      "outputs": [],
-      "properties": {},
-      "widgets_values": ["ComfyUI"]
-    },
-    {
-      "id": 4,
-      "type": "CheckpointLoaderSimple",
-      "pos": [26, 474],
-      "size": [315, 98],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "MODEL",
-          "type": "MODEL",
-          "slot_index": 0,
-          "links": [1]
-        },
-        {
-          "name": "CLIP",
-          "type": "CLIP",
-          "slot_index": 1,
-          "links": [3, 5]
-        },
-        {
-          "name": "VAE",
-          "type": "VAE",
-          "slot_index": 2,
-          "links": [8]
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "CheckpointLoaderSimple"
-      },
-      "widgets_values": ["v1-5-pruned-emaonly-fp16.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"]
-  ],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    },
-    "reroutes": [
-      {
-        "id": 1,
-        "pos": [372.66668701171875, 415.33331298828125],
-        "linkIds": [3]
-      }
-    ],
-    "linkExtensions": [
-      {
-        "id": 3,
-        "parentId": 1
-      }
-    ],
-    "frontendVersion": "1.26.1"
-  },
-  "version": 0.4
-}
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -786,164 +786,6 @@ export class ComfyPage {
    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.
@@ -958,7 +800,93 @@ export class ComfyPage {
   * @returns Promise that resolves when the context menu appears
   */
  async rightClickSubgraphInputSlot(inputName?: string): Promise<void> {
-    return this.interactWithSubgraphSlot('input', 'rightClick', inputName)
+    const foundSlot = await this.page.evaluate(async (targetInputName) => {
+      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 input node
+      const inputNode = currentGraph.inputNode
+      if (!inputNode) {
+        throw new Error('No input node found in subgraph')
+      }
+
+      // Get available inputs
+      const inputs = currentGraph.inputs
+      if (!inputs || inputs.length === 0) {
+        throw new Error('No input slots found in subgraph')
+      }
+
+      // Filter to specific input if requested
+      const inputsToTry = targetInputName
+        ? inputs.filter((inp) => inp.name === targetInputName)
+        : inputs
+
+      if (inputsToTry.length === 0) {
+        throw new Error(
+          targetInputName
+            ? `Input slot '${targetInputName}' not found`
+            : 'No input slots available to try'
+        )
+      }
+
+      // Try right-clicking on each input slot position until one works
+      for (const input of inputsToTry) {
+        if (!input.pos) continue
+
+        const testX = input.pos[0]
+        const testY = input.pos[1]
+
+        // Create a right-click event at the input slot position
+        const rightClickEvent = {
+          canvasX: testX,
+          canvasY: testY,
+          button: 2, // Right mouse button
+          preventDefault: () => {},
+          stopPropagation: () => {}
+        }
+
+        // Trigger the input node's right-click handler
+        if (inputNode.onPointerDown) {
+          inputNode.onPointerDown(
+            rightClickEvent,
+            app.canvas.pointer,
+            app.canvas.linkConnector
+          )
+        }
+
+        // Wait briefly for menu to appear
+        await new Promise((resolve) => setTimeout(resolve, 100))
+
+        // Check if litegraph context menu appeared
+        const menuExists = document.querySelector('.litemenu-entry')
+        if (menuExists) {
+          return { success: true, inputName: input.name, x: testX, y: testY }
+        }
+      }
+
+      return { success: false }
+    }, inputName)
+
+    if (!foundSlot.success) {
+      throw new Error(
+        inputName
+          ? `Could not open context menu for input slot '${inputName}'`
+          : 'Could not find any input slot position to right-click'
+      )
+    }
+
+    // Wait for the litegraph context menu to be visible
+    await this.page.waitForSelector('.litemenu-entry', {
+      state: 'visible',
+      timeout: 5000
+    })
  }

  /**
@@ -972,31 +900,93 @@ export class ComfyPage {
   * @returns Promise that resolves when the context menu appears
   */
  async rightClickSubgraphOutputSlot(outputName?: string): Promise<void> {
-    return this.interactWithSubgraphSlot('output', 'rightClick', outputName)
-  }
+    const foundSlot = await this.page.evaluate(async (targetOutputName) => {
+      const app = window['app']
+      const currentGraph = app.canvas.graph

-  /**
-   * 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)
-  }
+      // 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'
+        )
+      }

-  /**
-   * 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 the output node
+      const outputNode = currentGraph.outputNode
+      if (!outputNode) {
+        throw new Error('No output node found in subgraph')
+      }
+
+      // Get available outputs
+      const outputs = currentGraph.outputs
+      if (!outputs || outputs.length === 0) {
+        throw new Error('No output slots found in subgraph')
+      }
+
+      // Filter to specific output if requested
+      const outputsToTry = targetOutputName
+        ? outputs.filter((out) => out.name === targetOutputName)
+        : outputs
+
+      if (outputsToTry.length === 0) {
+        throw new Error(
+          targetOutputName
+            ? `Output slot '${targetOutputName}' not found`
+            : 'No output slots available to try'
+        )
+      }
+
+      // Try right-clicking on each output slot position until one works
+      for (const output of outputsToTry) {
+        if (!output.pos) continue
+
+        const testX = output.pos[0]
+        const testY = output.pos[1]
+
+        // Create a right-click event at the output slot position
+        const rightClickEvent = {
+          canvasX: testX,
+          canvasY: testY,
+          button: 2, // Right mouse button
+          preventDefault: () => {},
+          stopPropagation: () => {}
+        }
+
+        // Trigger the output node's right-click handler
+        if (outputNode.onPointerDown) {
+          outputNode.onPointerDown(
+            rightClickEvent,
+            app.canvas.pointer,
+            app.canvas.linkConnector
+          )
+        }
+
+        // Wait briefly for menu to appear
+        await new Promise((resolve) => setTimeout(resolve, 100))
+
+        // Check if litegraph context menu appeared
+        const menuExists = document.querySelector('.litemenu-entry')
+        if (menuExists) {
+          return { success: true, outputName: output.name, x: testX, y: testY }
+        }
+      }
+
+      return { success: false }
+    }, outputName)
+
+    if (!foundSlot.success) {
+      throw new Error(
+        outputName
+          ? `Could not open context menu for output slot '${outputName}'`
+          : 'Could not find any output slot position to right-click'
+      )
+    }
+
+    // Wait for the litegraph context menu to be visible
+    await this.page.waitForSelector('.litemenu-entry', {
+      state: 'visible',
+      timeout: 5000
+    })
  }

  /**
--- a/browser_tests/fixtures/utils/taskHistory.ts
+++ b/browser_tests/fixtures/utils/taskHistory.ts
@@ -1,5 +1,5 @@
-import _ from 'es-toolkit/compat'
 import fs from 'fs'
+import _ from 'lodash'
 import path from 'path'
 import type { Request, Route } from 'playwright'
 import { v4 as uuidv4 } from 'uuid'
@@ -75,9 +75,7 @@ export default class TaskHistory {

  private async handleGetView(route: Route) {
    const fileName = getFilenameParam(route.request())
-    if (!this.outputContentTypes.has(fileName)) {
-      return route.continue()
-    }
+    if (!this.outputContentTypes.has(fileName)) route.continue()

    const asset = this.loadAsset(fileName)
    return route.fulfill({
--- a/browser_tests/tests/rerouteNode.spec.ts
+++ b/browser_tests/tests/rerouteNode.spec.ts
@@ -100,29 +100,4 @@ test.describe('LiteGraph Native Reroute Node', () => {
      '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'
-    )
-
-    // 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 "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'
-    )
-  })
 })
--- a/browser_tests/tests/rerouteNode.spec.ts-snapshots/native-reroute-delete-from-midpoint-context-menu-chromium-linux.png
+++ b/browser_tests/tests/rerouteNode.spec.ts-snapshots/native-reroute-delete-from-midpoint-context-menu-chromium-linux.png
--- a/browser_tests/tests/sidebar/workflows.spec.ts
+++ b/browser_tests/tests/sidebar/workflows.spec.ts
@@ -317,25 +317,6 @@ test.describe('Workflows sidebar', () => {
    ])
  })

-  test('Can duplicate workflow from context menu', async ({ comfyPage }) => {
-    await comfyPage.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'
-    ])
-  })
-
  test('Can drop workflow from workflows sidebar', async ({ comfyPage }) => {
    await comfyPage.setupWorkflowsDirectory({
      'workflow1.json': 'default.json'
--- a/browser_tests/tests/subgraph-rename-dialog.spec.ts
+++ b/browser_tests/tests/subgraph-rename-dialog.spec.ts
@@ -1,157 +0,0 @@
-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'
-
-// Common selectors
-const SELECTORS = {
-  promptDialog: '.graphdialog input'
-} as const
-
-test.describe('Subgraph Slot Rename Dialog', () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
-  })
-
-  test('Shows current slot label (not stale) in rename dialog', async ({
-    comfyPage
-  }) => {
-    await comfyPage.loadWorkflow('basic-subgraph')
-
-    const subgraphNode = await comfyPage.getNodeRefById('2')
-    await subgraphNode.navigateIntoSubgraph()
-
-    // Get initial slot label
-    const initialInputLabel = await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
-      return graph.inputs?.[0]?.label || graph.inputs?.[0]?.name || null
-    })
-
-    // First rename
-    await comfyPage.rightClickSubgraphInputSlot(initialInputLabel)
-    await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
-
-    await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
-      state: 'visible'
-    })
-
-    // Clear and enter new name
-    await comfyPage.page.fill(SELECTORS.promptDialog, '')
-    await comfyPage.page.fill(SELECTORS.promptDialog, RENAMED_NAME)
-    await comfyPage.page.keyboard.press('Enter')
-
-    // Wait for dialog to close
-    await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
-      state: 'hidden'
-    })
-
-    // Force re-render
-    await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
-    await comfyPage.nextFrame()
-
-    // Verify the rename worked
-    const afterFirstRename = await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
-      const slot = graph.inputs?.[0]
-      return {
-        label: slot?.label || null,
-        name: slot?.name || null,
-        displayName: slot?.displayName || slot?.label || slot?.name || null
-      }
-    })
-    expect(afterFirstRename.label).toBe(RENAMED_NAME)
-
-    // 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.page.waitForSelector(SELECTORS.promptDialog, {
-      state: 'visible'
-    })
-
-    // Get the current value in the prompt dialog
-    const dialogValue = await comfyPage.page.inputValue(SELECTORS.promptDialog)
-
-    // This should show the current label (RENAMED_NAME), not the original name
-    expect(dialogValue).toBe(RENAMED_NAME)
-    expect(dialogValue).not.toBe(afterFirstRename.name) // Should not show the original slot.name
-
-    // Complete the second rename to ensure everything still works
-    await comfyPage.page.fill(SELECTORS.promptDialog, '')
-    await comfyPage.page.fill(SELECTORS.promptDialog, SECOND_RENAMED_NAME)
-    await comfyPage.page.keyboard.press('Enter')
-
-    // Wait for dialog to close
-    await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
-      state: 'hidden'
-    })
-
-    // Force re-render
-    await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
-    await comfyPage.nextFrame()
-
-    // Verify the second rename worked
-    const afterSecondRename = await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
-      return graph.inputs?.[0]?.label || null
-    })
-    expect(afterSecondRename).toBe(SECOND_RENAMED_NAME)
-  })
-
-  test('Shows current output slot label in rename dialog', async ({
-    comfyPage
-  }) => {
-    await comfyPage.loadWorkflow('basic-subgraph')
-
-    const subgraphNode = await comfyPage.getNodeRefById('2')
-    await subgraphNode.navigateIntoSubgraph()
-
-    // Get initial output slot label
-    const initialOutputLabel = await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
-      return graph.outputs?.[0]?.label || graph.outputs?.[0]?.name || null
-    })
-
-    // First rename
-    await comfyPage.rightClickSubgraphOutputSlot(initialOutputLabel)
-    await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
-
-    await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
-      state: 'visible'
-    })
-
-    // Clear and enter new name
-    await comfyPage.page.fill(SELECTORS.promptDialog, '')
-    await comfyPage.page.fill(SELECTORS.promptDialog, RENAMED_NAME)
-    await comfyPage.page.keyboard.press('Enter')
-
-    // Wait for dialog to close
-    await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
-      state: 'hidden'
-    })
-
-    // Force re-render
-    await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
-    await comfyPage.nextFrame()
-
-    // 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.page.waitForSelector(SELECTORS.promptDialog, {
-      state: 'visible'
-    })
-
-    // Get the current value in the prompt dialog
-    const dialogValue = await comfyPage.page.inputValue(SELECTORS.promptDialog)
-
-    // This should show the current label (RENAMED_NAME), not the original name
-    expect(dialogValue).toBe(RENAMED_NAME)
-  })
-})
--- a/browser_tests/tests/subgraph.spec.ts
+++ b/browser_tests/tests/subgraph.spec.ts
@@ -155,182 +155,6 @@ test.describe('Subgraph Operations', () => {
      expect(newInputName).toBe(RENAMED_INPUT_NAME)
      expect(newInputName).not.toBe(initialInputLabel)
    })
-
-    test('Can rename input slots via double-click', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('basic-subgraph')
-
-      const subgraphNode = await comfyPage.getNodeRefById('2')
-      await subgraphNode.navigateIntoSubgraph()
-
-      const initialInputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
-        return graph.inputs?.[0]?.label || null
-      })
-
-      await comfyPage.doubleClickSubgraphInputSlot(initialInputLabel)
-
-      await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
-        state: 'visible'
-      })
-      await comfyPage.page.fill(SELECTORS.promptDialog, RENAMED_INPUT_NAME)
-      await comfyPage.page.keyboard.press('Enter')
-
-      // Force re-render
-      await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
-      await comfyPage.nextFrame()
-
-      const newInputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
-        return graph.inputs?.[0]?.label || null
-      })
-
-      expect(newInputName).toBe(RENAMED_INPUT_NAME)
-      expect(newInputName).not.toBe(initialInputLabel)
-    })
-
-    test('Can rename output slots via double-click', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('basic-subgraph')
-
-      const subgraphNode = await comfyPage.getNodeRefById('2')
-      await subgraphNode.navigateIntoSubgraph()
-
-      const initialOutputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
-        return graph.outputs?.[0]?.label || null
-      })
-
-      await comfyPage.doubleClickSubgraphOutputSlot(initialOutputLabel)
-
-      await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
-        state: 'visible'
-      })
-      const renamedOutputName = 'renamed_output'
-      await comfyPage.page.fill(SELECTORS.promptDialog, renamedOutputName)
-      await comfyPage.page.keyboard.press('Enter')
-
-      // Force re-render
-      await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
-      await comfyPage.nextFrame()
-
-      const newOutputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
-        return graph.outputs?.[0]?.label || null
-      })
-
-      expect(newOutputName).toBe(renamedOutputName)
-      expect(newOutputName).not.toBe(initialOutputLabel)
-    })
-
-    test('Right-click context menu still works alongside double-click', async ({
-      comfyPage
-    }) => {
-      await comfyPage.loadWorkflow('basic-subgraph')
-
-      const subgraphNode = await comfyPage.getNodeRefById('2')
-      await subgraphNode.navigateIntoSubgraph()
-
-      const initialInputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
-        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.page.waitForSelector(SELECTORS.promptDialog, {
-        state: 'visible'
-      })
-      const rightClickRenamedName = 'right_click_renamed'
-      await comfyPage.page.fill(SELECTORS.promptDialog, rightClickRenamedName)
-      await comfyPage.page.keyboard.press('Enter')
-
-      // Force re-render
-      await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
-      await comfyPage.nextFrame()
-
-      const newInputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
-        return graph.inputs?.[0]?.label || null
-      })
-
-      expect(newInputName).toBe(rightClickRenamedName)
-      expect(newInputName).not.toBe(initialInputLabel)
-    })
-
-    test('Can double-click on slot label text to rename', async ({
-      comfyPage
-    }) => {
-      await comfyPage.loadWorkflow('basic-subgraph')
-
-      const subgraphNode = await comfyPage.getNodeRefById('2')
-      await subgraphNode.navigateIntoSubgraph()
-
-      const initialInputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
-        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 graph = app.canvas.graph
-        const input = graph.inputs?.[0]
-
-        if (!input?.labelPos) {
-          throw new Error('Could not get label position for testing')
-        }
-
-        // Use labelPos for more precise clicking on the text
-        const testX = input.labelPos[0]
-        const testY = input.labelPos[1]
-
-        const leftClickEvent = {
-          canvasX: testX,
-          canvasY: testY,
-          button: 0, // Left mouse button
-          preventDefault: () => {},
-          stopPropagation: () => {}
-        }
-
-        const inputNode = graph.inputNode
-        if (inputNode?.onPointerDown) {
-          inputNode.onPointerDown(
-            leftClickEvent,
-            app.canvas.pointer,
-            app.canvas.linkConnector
-          )
-
-          // Trigger double-click if pointer has the handler
-          if (app.canvas.pointer.onDoubleClick) {
-            app.canvas.pointer.onDoubleClick(leftClickEvent)
-          }
-        }
-      })
-
-      // Wait for dialog to appear
-      await comfyPage.page.waitForTimeout(200)
-      await comfyPage.nextFrame()
-
-      await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
-        state: 'visible'
-      })
-      const labelClickRenamedName = 'label_click_renamed'
-      await comfyPage.page.fill(SELECTORS.promptDialog, labelClickRenamedName)
-      await comfyPage.page.keyboard.press('Enter')
-
-      // Force re-render
-      await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
-      await comfyPage.nextFrame()
-
-      const newInputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
-        return graph.inputs?.[0]?.label || null
-      })
-
-      expect(newInputName).toBe(labelClickRenamedName)
-      expect(newInputName).not.toBe(initialInputLabel)
-    })
  })

  test.describe('Subgraph Creation and Deletion', () => {
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -14,10 +14,7 @@ export default [
    ignores: [
      'src/scripts/*',
      'src/extensions/core/*',
-      'src/types/vue-shim.d.ts',
-      // Generated files that don't need linting
-      'src/types/comfyRegistryTypes.ts',
-      'src/types/generatedManagerTypes.ts'
+      'src/types/vue-shim.d.ts'
    ]
  },
  {
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -1,75 +0,0 @@
-import type { KnipConfig } from 'knip'
-
-const config: KnipConfig = {
-  entry: [
-    'src/main.ts',
-    'vite.config.mts',
-    'vite.electron.config.mts',
-    'vite.types.config.mts',
-    'eslint.config.js',
-    'tailwind.config.js',
-    'postcss.config.js',
-    'playwright.config.ts',
-    'playwright.i18n.config.ts',
-    'vitest.config.ts',
-    'scripts/**/*.{js,ts}'
-  ],
-  project: [
-    'src/**/*.{js,ts,vue}',
-    'tests-ui/**/*.{js,ts,vue}',
-    'browser_tests/**/*.{js,ts}',
-    'scripts/**/*.{js,ts}'
-  ],
-  ignore: [
-    // Generated files
-    'dist/**',
-    'types/**',
-    'node_modules/**',
-    // Config files that might not show direct usage
-    '.husky/**',
-    // Temporary or cache files
-    '.vite/**',
-    'coverage/**',
-    // i18n config
-    '.i18nrc.cjs',
-    // Test setup files
-    'browser_tests/globalSetup.ts',
-    'browser_tests/globalTeardown.ts',
-    'browser_tests/utils/**',
-    // Scripts
-    'scripts/**',
-    // Vite config files
-    'vite.electron.config.mts',
-    'vite.types.config.mts',
-    // Auto generated manager types
-    'src/types/generatedManagerTypes.ts'
-  ],
-  ignoreExportsUsedInFile: true,
-  // Vue-specific configuration
-  vue: true,
-  // Only check for unused files, disable all other rules
-  // TODO: Gradually enable other rules - see https://github.com/Comfy-Org/ComfyUI_frontend/issues/4888
-  rules: {
-    binaries: 'off',
-    classMembers: 'off',
-    dependencies: 'off',
-    devDependencies: 'off',
-    duplicates: 'off',
-    enumMembers: 'off',
-    exports: 'off',
-    nsExports: 'off',
-    nsTypes: 'off',
-    types: 'off',
-    unlisted: 'off'
-  },
-  // Include dependencies analysis
-  includeEntryExports: true,
-  // Workspace configuration for monorepo-like structure
-  workspaces: {
-    '.': {
-      entry: ['src/main.ts']
-    }
-  }
-}
-
-export default config
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@comfyorg/comfyui-frontend",
-  "version": "1.26.2",
+  "version": "1.25.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@comfyorg/comfyui-frontend",
-      "version": "1.26.2",
+      "version": "1.25.5",
      "license": "GPL-3.0-only",
      "dependencies": {
        "@alloc/quick-lru": "^5.2.0",
@@ -30,12 +30,12 @@
        "axios": "^1.8.2",
        "dompurify": "^3.2.5",
        "dotenv": "^16.4.5",
-        "es-toolkit": "^1.39.9",
        "extendable-media-recorder": "^9.2.27",
        "extendable-media-recorder-wav-encoder": "^7.0.129",
        "firebase": "^11.6.0",
        "fuse.js": "^7.0.0",
        "jsondiffpatch": "^0.6.0",
+        "lodash": "^4.17.21",
        "loglevel": "^1.9.2",
        "marked": "^15.0.11",
        "pinia": "^2.1.7",
@@ -62,6 +62,7 @@
        "@trivago/prettier-plugin-sort-imports": "^5.2.0",
        "@types/dompurify": "^3.0.5",
        "@types/fs-extra": "^11.0.4",
+        "@types/lodash": "^4.17.6",
        "@types/node": "^20.14.8",
        "@types/semver": "^7.7.0",
        "@types/three": "^0.169.0",
@@ -79,7 +80,6 @@
        "happy-dom": "^15.11.0",
        "husky": "^9.0.11",
        "identity-obj-proxy": "^3.0.0",
-        "knip": "^5.62.0",
        "lint-staged": "^15.2.7",
        "postcss": "^8.4.39",
        "prettier": "^3.3.2",
@@ -1001,40 +1001,6 @@
        "@jridgewell/sourcemap-codec": "^1.4.10"
      }
    },
-    "node_modules/@emnapi/core": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz",
-      "integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.0.4",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/runtime": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz",
-      "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/wasi-threads": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz",
-      "integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
    "node_modules/@esbuild/aix-ppc64": {
      "version": "0.21.5",
      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
@@ -3103,19 +3069,6 @@
        "node": ">=18"
      }
    },
-    "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.0.3.tgz",
-      "integrity": "sha512-rZxtMsLwjdXkMUGC3WwsPwLNVqVqnTJT6MNIB6e+5fhMcSCPP0AOsNWuMQ5mdCq6HNjs/ZeWAEchpqeprqBD2Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/core": "^1.4.5",
-        "@emnapi/runtime": "^1.4.5",
-        "@tybys/wasm-util": "^0.10.0"
-      }
-    },
    "node_modules/@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3167,275 +3120,6 @@
        "node": ">=8.0.0"
      }
    },
-    "node_modules/@oxc-resolver/binding-android-arm-eabi": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.6.1.tgz",
-      "integrity": "sha512-Ma/kg29QJX1Jzelv0Q/j2iFuUad1WnjgPjpThvjqPjpOyLjCUaiFCCnshhmWjyS51Ki1Iol3fjf1qAzObf8GIA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-android-arm64": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.6.1.tgz",
-      "integrity": "sha512-xjL/FKKc5p8JkFWiH7pJWSzsewif3fRf1rw2qiRxRvq1uIa6l7Zoa14Zq2TNWEsqDjdeOrlJtfWiPNRnevK0oQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-darwin-arm64": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.6.1.tgz",
-      "integrity": "sha512-u0yrJ3NHE0zyCjiYpIyz4Vmov21MA0yFKbhHgixDU/G6R6nvC8ZpuSFql3+7C8ttAK9p8WpqOGweepfcilH5Bw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-darwin-x64": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.6.1.tgz",
-      "integrity": "sha512-2lox165h1EhzxcC8edUy0znXC/hnAbUPaMpYKVlzLpB2AoYmgU4/pmofFApj+axm2FXpNamjcppld8EoHo06rw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-freebsd-x64": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.6.1.tgz",
-      "integrity": "sha512-F45MhEQ7QbHfsvZtVNuA/9obu3il7QhpXYmCMfxn7Zt9nfAOw4pQ8hlS5DroHVp3rW35u9F7x0sixk/QEAi3qQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.6.1.tgz",
-      "integrity": "sha512-r+3+MTTl0tD4NoWbfTIItAxJvuyIU7V0fwPDXrv7Uj64vZ3OYaiyV+lVaeU89Bk/FUUQxeUpWBwdKNKHjyRNQw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-arm-musleabihf": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.6.1.tgz",
-      "integrity": "sha512-TBTZ63otsWZ72Z8ZNK2JVS0HW1w9zgOixJTFDNrYPUUW1pXGa28KAjQ1yGawj242WLAdu3lwdNIWtkxeO2BLxQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.6.1.tgz",
-      "integrity": "sha512-SjwhNynjSG2yMdyA0f7wz7Yvo3ppejO+ET7n2oiI7ApCXrwxMzeRWjBzQt+oVWr2HzVOfaEcDS9rMtnR83ulig==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.6.1.tgz",
-      "integrity": "sha512-f4EMidK6rosInBzPMnJ0Ri4RttFCvvLNUNDFUBtELW/MFkBwPTDlvbsmW0u0Mk/ruBQ2WmRfOZ6tT62kWMcX2Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-ppc64-gnu": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.6.1.tgz",
-      "integrity": "sha512-1umENVKeUsrWnf5IlF/6SM7DCv8G6CoKI2LnYR6qhZuLYDPS4PBZ0Jow3UDV9Rtbv5KRPcA3/uXjI88ntWIcOQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.6.1.tgz",
-      "integrity": "sha512-Hjyp1FRdJhsEpIxsZq5VcDuFc8abC0Bgy8DWEa31trCKoTz7JqA7x3E2dkFbrAKsEFmZZ0NvuG5Ip3oIRARhow==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-riscv64-musl": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.6.1.tgz",
-      "integrity": "sha512-ODJOJng6f3QxpAXhLel3kyWs8rPsJeo9XIZHzA7p//e+5kLMDU7bTVk4eZnUHuxsqsB8MEvPCicJkKCEuur5Ag==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.6.1.tgz",
-      "integrity": "sha512-hCzRiLhqe1ZOpHTsTGKp7gnMJRORlbCthawBueer2u22RVAka74pV/+4pP1tqM07mSlQn7VATuWaDw9gCl+cVg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.6.1.tgz",
-      "integrity": "sha512-JansPD8ftOzMYIC3NfXJ68tt63LEcIAx44Blx6BAd7eY880KX7A0KN3hluCrelCz5aQkPaD95g8HBiJmKaEi2w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-x64-musl": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.6.1.tgz",
-      "integrity": "sha512-R78ES1rd4z2x5NrFPtSWb/ViR1B8wdl+QN2X8DdtoYcqZE/4tvWtn9ZTCXMEzUp23tchJ2wUB+p6hXoonkyLpA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-wasm32-wasi": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.6.1.tgz",
-      "integrity": "sha512-qAR3tYIf3afkij/XYunZtlz3OH2Y4ni10etmCFIJB5VRGsqJyI6Hl+2dXHHGJNwbwjXjSEH/KWJBpVroF3TxBw==",
-      "cpu": [
-        "wasm32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@napi-rs/wasm-runtime": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.6.1.tgz",
-      "integrity": "sha512-QqygWygIuemGkaBA48POOTeinbVvlamqh6ucm8arGDGz/mB5O00gXWxed12/uVrYEjeqbMkla/CuL3fjL3EKvw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-win32-ia32-msvc": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-11.6.1.tgz",
-      "integrity": "sha512-N2+kkWwt/bk0JTCxhPuK8t8JMp3nd0n2OhwOkU8KO4a7roAJEa4K1SZVjMv5CqUIr5sx2CxtXRBoFDiORX5oBg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.6.1.tgz",
-      "integrity": "sha512-DfMg3cU9bJUbN62Prbp4fGCtLgexuwyEaQGtZAp8xmi1Ii26uflOGx0FJkFTF6lVMSFoIRFvIL8gsw5/ZdHrMw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
    "node_modules/@pinia/testing": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/@pinia/testing/-/testing-0.1.5.tgz",
@@ -4802,17 +4486,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/@tybys/wasm-util": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
-      "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
    "node_modules/@types/argparse": {
      "version": "1.0.38",
      "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
@@ -4886,6 +4559,12 @@
      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
      "license": "MIT"
    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.6",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz",
+      "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==",
+      "dev": true
+    },
    "node_modules/@types/markdown-it": {
      "version": "14.1.2",
      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
@@ -7991,15 +7670,6 @@
        "node": ">= 0.4"
      }
    },
-    "node_modules/es-toolkit": {
-      "version": "1.39.9",
-      "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.39.9.tgz",
-      "integrity": "sha512-9OtbkZmTA2Qc9groyA1PUNeb6knVTkvB2RSdr/LcJXDL8IdEakaxwXLHXa7VX/Wj0GmdMJPR3WhnPGhiP3E+qg==",
-      "workspaces": [
-        "docs",
-        "benchmarks"
-      ]
-    },
    "node_modules/esbuild": {
      "version": "0.21.5",
      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
@@ -8799,17 +8469,16 @@
      "license": "Apache-2.0"
    },
    "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@nodelib/fs.stat": "^2.0.2",
        "@nodelib/fs.walk": "^1.2.3",
        "glob-parent": "^5.1.2",
        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
+        "micromatch": "^4.0.4"
      },
      "engines": {
        "node": ">=8.6.0"
@@ -8882,16 +8551,6 @@
        "node": ">=0.8.0"
      }
    },
-    "node_modules/fd-package-json": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fd-package-json/-/fd-package-json-2.0.0.tgz",
-      "integrity": "sha512-jKmm9YtsNXN789RS/0mSzOC1NUq9mkVd65vbSSVsKdjGvYXBuE4oWe2QOEoFeRmJg+lPuZxpmrfFclNhoRMneQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "walk-up-path": "^4.0.0"
-      }
-    },
    "node_modules/fflate": {
      "version": "0.8.2",
      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
@@ -9187,22 +8846,6 @@
        "node": ">=0.4.x"
      }
    },
-    "node_modules/formatly": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/formatly/-/formatly-0.2.4.tgz",
-      "integrity": "sha512-lIN7GpcvX/l/i24r/L9bnJ0I8Qn01qijWpQpDDvTLL29nKqSaJJu4h20+7VJ6m2CAhQ2/En/GbxDiHCzq/0MyA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fd-package-json": "^2.0.0"
-      },
-      "bin": {
-        "formatly": "bin/index.mjs"
-      },
-      "engines": {
-        "node": ">=18.3.0"
-      }
-    },
    "node_modules/formdata-node": {
      "version": "4.4.1",
      "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz",
@@ -10874,109 +10517,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/knip": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/knip/-/knip-5.62.0.tgz",
-      "integrity": "sha512-hfTUVzmrMNMT1khlZfAYmBABeehwWUUrizLQoLamoRhSFkygsGIXWx31kaWKBgEaIVL77T3Uz7IxGvSw+CvQ6A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/webpro"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/knip"
-        },
-        {
-          "type": "polar",
-          "url": "https://polar.sh/webpro-nl"
-        }
-      ],
-      "license": "ISC",
-      "dependencies": {
-        "@nodelib/fs.walk": "^1.2.3",
-        "fast-glob": "^3.3.3",
-        "formatly": "^0.2.4",
-        "jiti": "^2.4.2",
-        "js-yaml": "^4.1.0",
-        "minimist": "^1.2.8",
-        "oxc-resolver": "^11.1.0",
-        "picocolors": "^1.1.1",
-        "picomatch": "^4.0.1",
-        "smol-toml": "^1.3.4",
-        "strip-json-comments": "5.0.2",
-        "zod": "^3.22.4",
-        "zod-validation-error": "^3.0.3"
-      },
-      "bin": {
-        "knip": "bin/knip.js",
-        "knip-bun": "bin/knip-bun.js"
-      },
-      "engines": {
-        "node": ">=18.18.0"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18",
-        "typescript": ">=5.0.4"
-      }
-    },
-    "node_modules/knip/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/knip/node_modules/jiti": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz",
-      "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jiti": "lib/jiti-cli.mjs"
-      }
-    },
-    "node_modules/knip/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/knip/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/knip/node_modules/strip-json-comments": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.2.tgz",
-      "integrity": "sha512-4X2FR3UwhNUE9G49aIsJW5hRRR3GXGTBTZRMfv568O60ojM8HcWjV/VxAxCDW3SUND33O6ZY66ZuRcdkj73q2g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/kolorist": {
      "version": "1.8.0",
      "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
@@ -11452,8 +10992,7 @@
    "node_modules/lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
    "node_modules/lodash-es": {
      "version": "4.17.21",
@@ -12849,22 +12388,6 @@
        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
      }
    },
-    "node_modules/napi-postinstall": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz",
-      "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "napi-postinstall": "lib/cli.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/napi-postinstall"
-      }
-    },
    "node_modules/natural-compare": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -13218,41 +12741,6 @@
      "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==",
      "license": "MIT"
    },
-    "node_modules/oxc-resolver": {
-      "version": "11.6.1",
-      "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.6.1.tgz",
-      "integrity": "sha512-WQgmxevT4cM5MZ9ioQnEwJiHpPzbvntV5nInGAKo9NQZzegcOonHvcVcnkYqld7bTG35UFHEKeF7VwwsmA3cZg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "napi-postinstall": "^0.3.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/Boshen"
-      },
-      "optionalDependencies": {
-        "@oxc-resolver/binding-android-arm-eabi": "11.6.1",
-        "@oxc-resolver/binding-android-arm64": "11.6.1",
-        "@oxc-resolver/binding-darwin-arm64": "11.6.1",
-        "@oxc-resolver/binding-darwin-x64": "11.6.1",
-        "@oxc-resolver/binding-freebsd-x64": "11.6.1",
-        "@oxc-resolver/binding-linux-arm-gnueabihf": "11.6.1",
-        "@oxc-resolver/binding-linux-arm-musleabihf": "11.6.1",
-        "@oxc-resolver/binding-linux-arm64-gnu": "11.6.1",
-        "@oxc-resolver/binding-linux-arm64-musl": "11.6.1",
-        "@oxc-resolver/binding-linux-ppc64-gnu": "11.6.1",
-        "@oxc-resolver/binding-linux-riscv64-gnu": "11.6.1",
-        "@oxc-resolver/binding-linux-riscv64-musl": "11.6.1",
-        "@oxc-resolver/binding-linux-s390x-gnu": "11.6.1",
-        "@oxc-resolver/binding-linux-x64-gnu": "11.6.1",
-        "@oxc-resolver/binding-linux-x64-musl": "11.6.1",
-        "@oxc-resolver/binding-wasm32-wasi": "11.6.1",
-        "@oxc-resolver/binding-win32-arm64-msvc": "11.6.1",
-        "@oxc-resolver/binding-win32-ia32-msvc": "11.6.1",
-        "@oxc-resolver/binding-win32-x64-msvc": "11.6.1"
-      }
-    },
    "node_modules/p-finally": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -15316,19 +14804,6 @@
        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
      }
    },
-    "node_modules/smol-toml": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.4.2.tgz",
-      "integrity": "sha512-rInDH6lCNiEyn3+hH8KVGFdbjc099j47+OSgbMrfDYX1CmXLfdKd7qi6IfcWj2wFxvSVkuI46M+wPGYfEOEj6g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/cyyynthia"
-      }
-    },
    "node_modules/source-map": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -17925,16 +17400,6 @@
        "node": ">=14"
      }
    },
-    "node_modules/walk-up-path": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz",
-      "integrity": "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
    "node_modules/web-streams-polyfill": {
      "version": "4.0.0-beta.3",
      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@comfyorg/comfyui-frontend",
  "private": true,
-  "version": "1.26.2",
+  "version": "1.25.6",
  "type": "module",
  "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
  "homepage": "https://comfy.org",
@@ -21,11 +21,8 @@
    "test:component": "vitest run src/components/",
    "prepare": "husky || true",
    "preview": "vite preview",
-    "lint": "eslint src --cache",
-    "lint:fix": "eslint src --cache --fix",
-    "lint:no-cache": "eslint src",
-    "lint:fix:no-cache": "eslint src --fix",
-    "knip": "knip",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
    "locale": "lobe-i18n locale",
    "collect-i18n": "playwright test --config=playwright.i18n.config.ts",
    "json-schema": "tsx scripts/generate-json-schema.ts"
@@ -41,6 +38,7 @@
    "@trivago/prettier-plugin-sort-imports": "^5.2.0",
    "@types/dompurify": "^3.0.5",
    "@types/fs-extra": "^11.0.4",
+    "@types/lodash": "^4.17.6",
    "@types/node": "^20.14.8",
    "@types/semver": "^7.7.0",
    "@types/three": "^0.169.0",
@@ -58,7 +56,6 @@
    "happy-dom": "^15.11.0",
    "husky": "^9.0.11",
    "identity-obj-proxy": "^3.0.0",
-    "knip": "^5.62.0",
    "lint-staged": "^15.2.7",
    "postcss": "^8.4.39",
    "prettier": "^3.3.2",
@@ -99,12 +96,12 @@
    "axios": "^1.8.2",
    "dompurify": "^3.2.5",
    "dotenv": "^16.4.5",
-    "es-toolkit": "^1.39.9",
    "extendable-media-recorder": "^9.2.27",
    "extendable-media-recorder-wav-encoder": "^7.0.129",
    "firebase": "^11.6.0",
    "fuse.js": "^7.0.0",
    "jsondiffpatch": "^0.6.0",
+    "lodash": "^4.17.21",
    "loglevel": "^1.9.2",
    "marked": "^15.0.11",
    "pinia": "^2.1.7",
--- a/src/CLAUDE.md
+++ b/src/CLAUDE.md
@@ -51,7 +51,7 @@ const template = await fetch('/templates/default.json')

 ## General Guidelines

- Use es-toolkit for utility functions
+- Use lodash 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`
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -616,8 +616,7 @@ audio.comfy-audio.empty-audio-widget {
 .comfy-load-3d canvas,
 .comfy-load-3d-animation canvas,
 .comfy-preview-3d canvas,
-.comfy-preview-3d-animation canvas,
-.comfy-load-3d-viewer canvas{
+.comfy-preview-3d-animation canvas{
  display: flex;
  width: 100% !important;
  height: 100% !important;
--- a/src/assets/icons/README.md
+++ b/src/assets/icons/README.md
@@ -1,148 +1,53 @@
-# ComfyUI Icons Guide
+# ComfyUI Custom Icons Guide

-ComfyUI supports three types of icons that can be used throughout the interface. All icons are automatically imported - no manual imports needed!
+This guide explains how to add and use custom SVG icons in the ComfyUI frontend.

-## Quick Start - Code Examples
+## Overview

-### 1. PrimeIcons
+ComfyUI uses a hybrid icon system that supports:
+- **PrimeIcons** - Legacy icon library (CSS classes like `pi pi-plus`)
+- **Iconify** - Modern icon system with 200,000+ icons
+- **Custom Icons** - Your own SVG icons

-```vue
-<template>
-  <!-- Basic usage -->
-  <i class="pi pi-plus" />
-  <i class="pi pi-cog" />
-  <i class="pi pi-check text-green-500" />
+Custom icons are powered by [unplugin-icons](https://github.com/unplugin/unplugin-icons) and integrate seamlessly with Vue's component system.

-  <!-- In PrimeVue components -->
-  <button icon="pi pi-save" label="Save" />
-  <button icon="pi pi-times" severity="danger" />
-</template>
-```
+## Quick Start

-[Browse all PrimeIcons →](https://primevue.org/icons/#list)
-
-### 2. Iconify Icons (Recommended)
-
-```vue
-<template>
-  <!-- Primary icon set: Lucide -->
-  <i-lucide:download />
-  <i-lucide:settings />
-  <i-lucide:workflow class="text-2xl" />
-
-  <!-- Other popular icon sets -->
-  <i-mdi:folder-open />
-  <!-- Material Design Icons -->
-  <i-heroicons:document-text />
-  <!-- Heroicons -->
-  <i-tabler:brand-github />
-  <!-- Tabler Icons -->
-  <i-carbon:cloud-upload />
-  <!-- Carbon Icons -->
-
-  <!-- With styling -->
-  <i-lucide:save class="w-6 h-6 text-blue-500" />
-</template>
-```
-
-[Browse 200,000+ icons →](https://icon-sets.iconify.design/)
-
-### 3. Custom Icons
-
-```vue
-<template>
-  <!-- Your custom SVG icons from src/assets/icons/custom/ -->
-  <i-comfy:workflow />
-  <i-comfy:node-tree />
-  <i-comfy:my-custom-icon class="text-xl" />
-
-  <!-- In PrimeVue button -->
-  <Button severity="secondary">
-    <template #icon>
-      <i-comfy:workflow />
-    </template>
-  </Button>
-</template>
-```
-
-## Icon Usage Patterns
-
-### In Buttons
-
-```vue
-<template>
-  <!-- PrimeIcon in button (simple) -->
-  <Button icon="pi pi-check" label="Confirm" />
-
-  <!-- Iconify/Custom in button (template) -->
-  <Button>
-    <template #icon>
-      <i-lucide:save />
-    </template>
-    Save File
-  </Button>
-</template>
-```
-
-### Conditional Icons
-
-```vue
-<template>
-  <i-lucide:eye v-if="isVisible" />
-  <i-lucide:eye-off v-else />
-
-  <!-- Or with ternary -->
-  <component :is="isLocked ? 'i-lucide:lock' : 'i-lucide:lock-open'" />
-</template>
-```
-
-### With Tooltips
-
-```vue
-<template>
-  <i-lucide:info
-    v-tooltip="'Click for more information'"
-    class="cursor-pointer"
-  />
-</template>
-```
-
-## Using Iconify Icons
-
-### Finding Icons
-
-1. Visit [Iconify Icon Sets](https://icon-sets.iconify.design/)
-2. Search or browse collections
-3. Click on any icon to get its name
-4. Use with `i-[collection]:[icon-name]` format
-
-### Popular Collections
-
- **Lucide** (`i-lucide:`) - Our primary icon set, clean and consistent
- **Material Design Icons** (`i-mdi:`) - Comprehensive Material Design icons
- **Heroicons** (`i-heroicons:`) - Beautiful hand-crafted SVG icons
- **Tabler** (`i-tabler:`) - 3000+ free SVG icons
- **Carbon** (`i-carbon:`) - IBM's design system icons
-
-## Adding Custom Icons
-
-### 1. Add Your SVG
-
-Place your SVG file in `src/assets/icons/custom/`:
+### 1. Add Your SVG Icon

+Place your SVG file in the `custom/` directory:
 ```
 src/assets/icons/custom/
-├── workflow-duplicate.svg
-├── node-preview.svg
 └── your-icon.svg
 ```

-### 2. SVG Format Requirements
+### 2. Use in Components

+```vue
+<template>
+  <!-- Use as a Vue component -->
+  <i-comfy:your-icon />
+  
+  <!-- In a PrimeVue button -->
+  <Button>
+    <template #icon>
+      <i-comfy:your-icon />
+    </template>
+  </Button>
+</template>
+```
+
+## SVG Requirements
+
+### File Naming
+- Use kebab-case: `workflow-icon.svg`, `node-tree.svg`
+- Avoid special characters and spaces
+- The filename becomes the icon name
+
+### SVG Format
 ```xml
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <!-- Use currentColor for theme compatibility -->
-  <path fill="currentColor" d="..." />
+  <path d="..." />
 </svg>
 ```

@@ -152,98 +57,59 @@ src/assets/icons/custom/
 - Use `currentColor` for theme-aware icons
 - Keep SVGs optimized and simple

-### 3. Use Immediately
+### Color Theming

-```vue
-<template>
-  <i-comfy:your-icon />
-</template>
-```
-
-No imports needed - icons are auto-discovered!
-
-## Icon Guidelines
-
-### Naming Conventions
-
- **Files**: `kebab-case.svg` (workflow-icon.svg)
- **Usage**: `<i-comfy:workflow-icon />`
-
-### Size & Styling
-
-```vue
-<template>
-  <!-- Size with Tailwind classes -->
-  <i-lucide:plus class="w-4 h-4" />
-  <!-- 16px -->
-  <i-lucide:plus class="w-6 h-6" />
-  <!-- 24px (default) -->
-  <i-lucide:plus class="w-8 h-8" />
-  <!-- 32px -->
-
-  <!-- Or text size -->
-  <i-lucide:plus class="text-sm" />
-  <i-lucide:plus class="text-2xl" />
-
-  <!-- Colors -->
-  <i-lucide:check class="text-green-500" />
-  <i-lucide:x class="text-red-500" />
-</template>
-```
-
-### Theme Compatibility
-
-Always use `currentColor` in SVGs for automatic theme adaptation:
+For icons that adapt to the current theme, use `currentColor`:

 ```xml
-<!-- ✅ Good: Adapts to light/dark theme -->
+<!-- ✅ Good: Uses currentColor -->
 <svg viewBox="0 0 24 24">
-  <path fill="currentColor" d="..." />
+  <path stroke="currentColor" fill="none" d="..." />
 </svg>

-<!-- ❌ Bad: Fixed colors -->
+<!-- ❌ Bad: Hardcoded colors -->
 <svg viewBox="0 0 24 24">
-  <path fill="#000000" d="..." />
+  <path stroke="white" fill="black" d="..." />
 </svg>
 ```

-## Migration Guide
-
-### From PrimeIcons to Iconify/Custom
+## Usage Examples

+### Basic Icon
 ```vue
-<template>
-  <!-- Before -->
-  <Button icon="pi pi-download" />
-
-  <!-- After -->
-  <Button>
-    <template #icon>
-      <i-lucide:download />
-    </template>
-  </Button>
-</template>
+<i-comfy:workflow />
 ```

-### From Inline SVG to Custom Icon
-
+### With Classes
 ```vue
-<template>
-  <!-- Before: Inline SVG -->
-  <svg class="w-6 h-6" viewBox="0 0 24 24">
-    <path d="..." />
-  </svg>
+<i-comfy:workflow class="text-2xl text-blue-500" />
+```

-  <!-- After: Save as custom/my-icon.svg and use -->
-  <i-comfy:my-icon class="w-6 h-6" />
+### In Buttons
+```vue
+<Button severity="secondary" text>
+  <template #icon>
+    <i-comfy:workflow />
+  </template>
+</Button>
+```
+
+### Conditional Icons
+```vue
+<template #icon>
+  <i-comfy:workflow v-if="isWorkflow" />
+  <i-comfy:node v-else />
 </template>
 ```

 ## Technical Details

-### Auto-Import System
+### How It Works

-Icons are automatically imported using `unplugin-icons` - no manual imports needed! Just use the icon component directly.
+1. **unplugin-icons** automatically discovers SVG files in `custom/`
+2. During build, SVGs are converted to Vue components
+3. Components are tree-shaken - only used icons are bundled
+4. The `i-` prefix and `comfy:` namespace identify custom icons

 ### Configuration

@@ -253,18 +119,17 @@ The icon system is configured in `vite.config.mts`:
 Icons({
  compiler: 'vue3',
  customCollections: {
-    comfy: FileSystemIconLoader('src/assets/icons/custom')
+    'comfy': FileSystemIconLoader('src/assets/icons/custom'),
  }
 })
 ```

 ### TypeScript Support

-Icons are fully typed. If TypeScript doesn't recognize a new custom icon:
-
-1. Restart the dev server
-2. Ensure the SVG file is valid
-3. Check filename follows kebab-case
+Icons are automatically typed. If TypeScript doesn't recognize a new icon:
+1. Restart your dev server
+2. Check that the SVG file is valid
+3. Ensure the filename follows kebab-case convention

 ## Troubleshooting

@@ -292,6 +157,22 @@ Icons are fully typed. If TypeScript doesn't recognize a new custom icon:
 4. **Theme support**: Always use `currentColor` for adaptable icons
 5. **Test both themes**: Verify icons look good in light and dark modes

+## Migration from PrimeIcons
+
+When replacing a PrimeIcon with a custom icon:
+
+```vue
+<!-- Before: PrimeIcon -->
+<Button icon="pi pi-box" />
+
+<!-- After: Custom icon -->
+<Button>
+  <template #icon>
+    <i-comfy:workflow />
+  </template>
+</Button>
+```
+
 ## Adding Icon Collections

 To add an entire icon set from npm:
@@ -300,11 +181,4 @@ To add an entire icon set from npm:
 2. Configure in `vite.config.mts`
 3. Use with the appropriate prefix

-See the [unplugin-icons documentation](https://github.com/unplugin/unplugin-icons) for details.
-
-## Resources
-
- [PrimeIcons List](https://primevue.org/icons/#list)
- [Iconify Icon Browser](https://icon-sets.iconify.design/)
- [Lucide Icons](https://lucide.dev/icons/)
- [unplugin-icons docs](https://github.com/unplugin/unplugin-icons)
+See the [unplugin-icons documentation](https://github.com/unplugin/unplugin-icons) for details.
--- a/src/assets/icons/custom/ai-model.svg
+++ b/src/assets/icons/custom/ai-model.svg
@@ -1,6 +0,0 @@
-<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.91396 12.7428L5.41396 10.7428C5.57175 10.1116 5.09439 9.50024 4.44382 9.50024H2.50538C2.04651 9.50024 1.64652 9.81253 1.53523 10.2577L1.03523 12.2577C0.877446 12.8888 1.3548 13.5002 2.00538 13.5002H3.94382C4.40269 13.5002 4.80267 13.1879 4.91396 12.7428Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
-<path d="M5.91396 6.74277L6.41396 4.74277C6.57175 4.11163 6.09439 3.50024 5.44382 3.50024H3.50538C3.04651 3.50024 2.64652 3.81253 2.53523 4.2577L2.03523 6.2577C1.87745 6.88885 2.3548 7.50024 3.00538 7.50024H4.94382C5.40269 7.50024 5.80267 7.18794 5.91396 6.74277Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
-<path d="M10.914 12.7428L11.414 10.7428C11.5718 10.1116 11.0944 9.50024 10.4438 9.50024H8.50538C8.04651 9.50024 7.64652 9.81253 7.53523 10.2577L7.03523 12.2577C6.87745 12.8888 7.3548 13.5002 8.00538 13.5002H9.94382C10.4027 13.5002 10.8027 13.1879 10.914 12.7428Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
-<path d="M12.2342 5.46739L11.5287 7.11354C11.4248 7.35597 11.0811 7.35597 10.9772 7.11354L10.2717 5.46739C10.2414 5.39659 10.185 5.34017 10.1141 5.30983L8.468 4.60433C8.22557 4.50044 8.22557 4.15675 8.468 4.05285L10.1141 3.34736C10.185 3.31701 10.2414 3.26059 10.2717 3.18979L10.9772 1.54364C11.0811 1.30121 11.4248 1.30121 11.5287 1.54364L12.2342 3.18979C12.2645 3.26059 12.3209 3.31701 12.3918 3.34736L14.0379 4.05285C14.2803 4.15675 14.2803 4.50044 14.0379 4.60433L12.3918 5.30983C12.3209 5.34017 12.2645 5.39659 12.2342 5.46739Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
-</svg>
--- a/src/assets/icons/custom/node.svg
+++ b/src/assets/icons/custom/node.svg
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 10L10.598 10.2577C10.4812 10.6954 10.0848 11 9.63172 11H5.30161C4.64458 11 4.16608 10.3772 4.33538 9.74234L5.40204 5.74234C5.51878 5.30458 5.91523 5 6.36828 5H10.8286C11.4199 5 11.8505 5.56051 11.6982 6.13185L11.6736 6.22389M14 8H10M4.5 8H2" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
-</svg>
--- a/src/assets/icons/custom/template.svg
+++ b/src/assets/icons/custom/template.svg
@@ -1,5 +0,0 @@
-<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.1894 6.24254L13.6894 4.24254C13.8471 3.61139 13.3698 3 12.7192 3H3.78077C3.3219 3 2.92192 3.3123 2.81062 3.75746L2.31062 5.75746C2.15284 6.38861 2.63019 7 3.28077 7H12.2192C12.6781 7 13.0781 6.6877 13.1894 6.24254Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
-<path d="M13.1894 12.2425L13.6894 10.2425C13.8471 9.61139 13.3698 9 12.7192 9H8.78077C8.3219 9 7.92192 9.3123 7.81062 9.75746L7.31062 11.7575C7.15284 12.3886 7.6302 13 8.28077 13H12.2192C12.6781 13 13.0781 12.6877 13.1894 12.2425Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
-<path d="M5.18936 12.2425L5.68936 10.2425C5.84714 9.61139 5.36978 9 4.71921 9H3.78077C3.3219 9 2.92192 9.3123 2.81062 9.75746L2.31062 11.7575C2.15284 12.3886 2.6302 13 3.28077 13H4.21921C4.67808 13 5.07806 12.6877 5.18936 12.2425Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
-</svg>
--- a/src/components/actionbar/ComfyActionbar.vue
+++ b/src/components/actionbar/ComfyActionbar.vue
@@ -20,7 +20,7 @@ import {
  useLocalStorage,
  watchDebounced
 } from '@vueuse/core'
-import { clamp } from 'es-toolkit/compat'
+import { clamp } from 'lodash'
 import Panel from 'primevue/panel'
 import { Ref, computed, inject, nextTick, onMounted, ref, watch } from 'vue'

--- a/src/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue
+++ b/src/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue
@@ -20,7 +20,7 @@
          >
            <div class="shortcut-info flex-grow pr-4">
              <div class="shortcut-name text-sm font-medium">
-                {{ command.label || command.id }}
+                {{ t(`commands.${normalizeI18nKey(command.id)}.label`) }}
              </div>
            </div>

@@ -50,6 +50,7 @@ import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'

 import type { ComfyCommandImpl } from '@/stores/commandStore'
+import { normalizeI18nKey } from '@/utils/formatUtil'

 const { t } = useI18n()

--- a/src/components/common/ApiNodesCostBreakdown.vue
+++ b/src/components/common/ApiNodesCostBreakdown.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="flex flex-col gap-3 h-full">
+    <div class="flex justify-between text-xs">
+      <div>{{ t('apiNodesCostBreakdown.title') }}</div>
+      <div>{{ t('apiNodesCostBreakdown.costPerRun') }}</div>
+    </div>
+    <ScrollPanel class="flex-grow h-0">
+      <div class="flex flex-col gap-2">
+        <div
+          v-for="node in nodes"
+          :key="node.name"
+          class="flex items-center justify-between px-3 py-2 rounded-md bg-[var(--p-content-border-color)]"
+        >
+          <div class="flex items-center gap-2">
+            <span class="text-base font-medium leading-tight">{{
+              node.name
+            }}</span>
+          </div>
+          <div class="flex items-center gap-1">
+            <Tag
+              severity="secondary"
+              icon="pi pi-dollar"
+              rounded
+              class="text-amber-400 p-1"
+            />
+            <span class="text-base font-medium leading-tight">
+              {{ node.cost.toFixed(costPrecision) }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </ScrollPanel>
+    <template v-if="showTotal && nodes.length > 1">
+      <Divider class="my-2" />
+      <div class="flex justify-between items-center border-t px-3">
+        <span class="text-sm">{{ t('apiNodesCostBreakdown.totalCost') }}</span>
+        <div class="flex items-center gap-1">
+          <Tag
+            severity="secondary"
+            icon="pi pi-dollar"
+            rounded
+            class="text-yellow-500 p-1"
+          />
+          <span>{{ totalCost.toFixed(costPrecision) }}</span>
+        </div>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Divider from 'primevue/divider'
+import ScrollPanel from 'primevue/scrollpanel'
+import Tag from 'primevue/tag'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import type { ApiNodeCost } from '@/types/apiNodeTypes'
+
+const { t } = useI18n()
+
+const {
+  nodes,
+  showTotal = true,
+  costPrecision = 3
+} = defineProps<{
+  nodes: ApiNodeCost[]
+  showTotal?: boolean
+  costPrecision?: number
+}>()
+
+const totalCost = computed(() =>
+  nodes.reduce((sum, node) => sum + node.cost, 0)
+)
+</script>
--- a/src/components/common/ApiNodesList.vue
+++ b/src/components/common/ApiNodesList.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="flex flex-col gap-3 h-full">
+    <div class="flex text-xs">
+      <div>{{ t('apiNodesCostBreakdown.title') }}</div>
+    </div>
+    <ScrollPanel class="flex-grow h-0">
+      <div class="flex flex-col gap-2">
+        <div
+          v-for="nodeName in nodeNames"
+          :key="nodeName"
+          class="flex items-center justify-between px-3 py-2 rounded-md bg-[var(--p-content-border-color)]"
+        >
+          <div class="flex items-center gap-2">
+            <span class="text-base font-medium leading-tight">{{
+              nodeName
+            }}</span>
+          </div>
+        </div>
+      </div>
+    </ScrollPanel>
+  </div>
+</template>
+
+<script setup lang="ts">
+import ScrollPanel from 'primevue/scrollpanel'
+import { useI18n } from 'vue-i18n'
+
+const { t } = useI18n()
+
+const { nodeNames } = defineProps<{ nodeNames: string[] }>()
+</script>
--- a/src/components/common/SearchBox.vue
+++ b/src/components/common/SearchBox.vue
@@ -42,7 +42,7 @@
 </template>

 <script setup lang="ts" generic="TFilter extends SearchFilter">
-import { debounce } from 'es-toolkit/compat'
+import { debounce } from 'lodash'
 import Button from 'primevue/button'
 import IconField from 'primevue/iconfield'
 import InputIcon from 'primevue/inputicon'
--- a/src/components/common/VirtualGrid.vue
+++ b/src/components/common/VirtualGrid.vue
@@ -16,7 +16,7 @@

 <script setup lang="ts" generic="T">
 import { useElementSize, useScroll, whenever } from '@vueuse/core'
-import { clamp, debounce } from 'es-toolkit/compat'
+import { clamp, debounce } from 'lodash'
 import { type CSSProperties, computed, onBeforeUnmount, ref, watch } from 'vue'

 type GridState = {
--- a/src/components/dialog/content/MissingModelsWarning.vue
+++ b/src/components/dialog/content/MissingModelsWarning.vue
@@ -36,7 +36,6 @@ 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 '@/stores/settingStore'
--- a/src/components/dialog/content/error/ReportIssuePanel.vue
+++ b/src/components/dialog/content/error/ReportIssuePanel.vue
@@ -169,8 +169,8 @@ import { Form, FormField, type FormSubmitEvent } from '@primevue/forms'
 import { zodResolver } from '@primevue/forms/resolvers/zod'
 import type { CaptureContext, User } from '@sentry/core'
 import { captureMessage } from '@sentry/core'
-import _ from 'es-toolkit/compat'
-import { cloneDeep } from 'es-toolkit/compat'
+import _ from 'lodash'
+import cloneDeep from 'lodash/cloneDeep'
 import Button from 'primevue/button'
 import Checkbox from 'primevue/checkbox'
 import Dropdown from 'primevue/dropdown'
--- a/src/components/dialog/content/manager/ManagerDialogContent.vue
+++ b/src/components/dialog/content/manager/ManagerDialogContent.vue
@@ -93,7 +93,7 @@

 <script setup lang="ts">
 import { whenever } from '@vueuse/core'
-import { merge } from 'es-toolkit/compat'
+import { merge } from 'lodash'
 import Button from 'primevue/button'
 import {
  computed,
--- a/src/components/dialog/content/manager/button/PackEnableToggle.test.ts
+++ b/src/components/dialog/content/manager/button/PackEnableToggle.test.ts
@@ -12,7 +12,7 @@ import { useComfyManagerStore } from '@/stores/comfyManagerStore'
 import PackEnableToggle from './PackEnableToggle.vue'

 // Mock debounce to execute immediately
-vi.mock('es-toolkit/compat', () => ({
+vi.mock('lodash', () => ({
  debounce: <T extends (...args: any[]) => any>(fn: T) => fn
 }))

--- a/src/components/dialog/content/manager/button/PackEnableToggle.vue
+++ b/src/components/dialog/content/manager/button/PackEnableToggle.vue
@@ -10,7 +10,7 @@
 </template>

 <script setup lang="ts">
-import { debounce } from 'es-toolkit/compat'
+import { debounce } from 'lodash'
 import ToggleSwitch from 'primevue/toggleswitch'
 import { computed, ref } from 'vue'

--- a/src/components/dialog/content/manager/packCard/PackCardHeader.vue
+++ b/src/components/dialog/content/manager/packCard/PackCardHeader.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="w-[100%] flex justify-between items-center">
+    <div class="flex justify-start items-center">
+      <div class="w-1 h-6 rounded-md" />
+      <div class="w-6 h-6 relative overflow-hidden">
+        <i class="pi pi-box text-xl text-muted" style="opacity: 0.6" />
+      </div>
+      <div class="px-3 py-2 rounded-md flex justify-start items-start gap-2.5">
+        <div class="text-right justify-start text-sm font-bold leading-none">
+          {{ $t('manager.nodePack') }}
+        </div>
+      </div>
+    </div>
+    <div class="inline-flex justify-start items-center gap-3">
+      <div
+        v-if="nodePack.downloads"
+        class="flex items-center text-sm text-muted tracking-tighter"
+      >
+        <i class="pi pi-download mr-2" />
+        {{ $n(nodePack.downloads) }}
+      </div>
+      <template v-if="isInstalled">
+        <PackEnableToggle :node-pack="nodePack" />
+      </template>
+      <template v-else>
+        <PackInstallButton :node-packs="[nodePack]" />
+      </template>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import PackEnableToggle from '@/components/dialog/content/manager/button/PackEnableToggle.vue'
+import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
+import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import type { components } from '@/types/comfyRegistryTypes'
+
+const { nodePack } = defineProps<{
+  nodePack: components['schemas']['Node']
+}>()
+
+const { isPackInstalled } = useComfyManagerStore()
+const isInstalled = computed(() => isPackInstalled(nodePack?.id))
+</script>
--- a/src/components/dialog/content/manager/registrySearchBar/RegistrySearchBar.vue
+++ b/src/components/dialog/content/manager/registrySearchBar/RegistrySearchBar.vue
@@ -57,7 +57,7 @@
 </template>

 <script setup lang="ts">
-import { stubTrue } from 'es-toolkit/compat'
+import { stubTrue } from 'lodash'
 import AutoComplete, {
  AutoCompleteOptionSelectEvent
 } from 'primevue/autocomplete'
--- a/src/components/graph/SelectionOverlay.vue
+++ b/src/components/graph/SelectionOverlay.vue
@@ -14,13 +14,12 @@

 <script setup lang="ts">
 import { whenever } from '@vueuse/core'
-import { provide, readonly, ref, watch } from 'vue'
+import { ref, watch } from 'vue'

 import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteGraphItems'
 import { useAbsolutePosition } from '@/composables/element/useAbsolutePosition'
 import { createBounds } from '@/lib/litegraph/src/litegraph'
 import { useCanvasStore } from '@/stores/graphStore'
-import { SelectionOverlayInjectionKey } from '@/types/selectionOverlayTypes'

 const canvasStore = useCanvasStore()
 const { style, updatePosition } = useAbsolutePosition()
@@ -28,13 +27,6 @@ const { getSelectableItems } = useSelectedLiteGraphItems()

 const visible = ref(false)
 const showBorder = ref(false)
-// Increment counter to notify child components of position/visibility change
-// This does not include viewport changes.
-const overlayUpdateCount = ref(0)
-provide(SelectionOverlayInjectionKey, {
-  visible: readonly(visible),
-  updateCount: readonly(overlayUpdateCount)
-})

 const positionSelectionOverlay = () => {
  const selectableItems = getSelectableItems()
@@ -60,7 +52,6 @@ whenever(
  () => {
    requestAnimationFrame(() => {
      positionSelectionOverlay()
-      overlayUpdateCount.value++
      canvasStore.getCanvas().state.selectionChanged = false
    })
  },
@@ -80,7 +71,6 @@ watch(
      requestAnimationFrame(() => {
        visible.value = true
        positionSelectionOverlay()
-        overlayUpdateCount.value++
      })
    } else {
      // Selection change update to visible state is delayed by a frame. Here
@@ -88,7 +78,6 @@ watch(
      // the initial selection and dragging happens at the same time.
      requestAnimationFrame(() => {
        visible.value = false
-        overlayUpdateCount.value++
      })
    }
  }
--- a/src/components/graph/SelectionToolbox.vue
+++ b/src/components/graph/SelectionToolbox.vue
@@ -1,7 +1,6 @@
 <template>
  <Panel
    class="selection-toolbox absolute left-1/2 rounded-lg"
-    :class="{ 'animate-slide-up': shouldAnimate }"
    :pt="{
      header: 'hidden',
      content: 'p-0 flex flex-row'
@@ -13,7 +12,6 @@
    <BypassButton />
    <PinButton />
    <EditModelButton />
-    <Load3DViewerButton />
    <MaskEditorButton />
    <ConvertToSubgraphButton />
    <DeleteButton />
@@ -29,7 +27,7 @@

 <script setup lang="ts">
 import Panel from 'primevue/panel'
-import { computed, inject } from 'vue'
+import { computed } from 'vue'

 import BypassButton from '@/components/graph/selectionToolbox/BypassButton.vue'
 import ColorPickerButton from '@/components/graph/selectionToolbox/ColorPickerButton.vue'
@@ -39,28 +37,19 @@ import EditModelButton from '@/components/graph/selectionToolbox/EditModelButton
 import ExecuteButton from '@/components/graph/selectionToolbox/ExecuteButton.vue'
 import ExtensionCommandButton from '@/components/graph/selectionToolbox/ExtensionCommandButton.vue'
 import HelpButton from '@/components/graph/selectionToolbox/HelpButton.vue'
-import Load3DViewerButton from '@/components/graph/selectionToolbox/Load3DViewerButton.vue'
 import MaskEditorButton from '@/components/graph/selectionToolbox/MaskEditorButton.vue'
 import PinButton from '@/components/graph/selectionToolbox/PinButton.vue'
 import RefreshSelectionButton from '@/components/graph/selectionToolbox/RefreshSelectionButton.vue'
-import { useRetriggerableAnimation } from '@/composables/element/useRetriggerableAnimation'
 import { useCanvasInteractions } from '@/composables/graph/useCanvasInteractions'
 import { useExtensionService } from '@/services/extensionService'
 import { type ComfyCommandImpl, useCommandStore } from '@/stores/commandStore'
 import { useCanvasStore } from '@/stores/graphStore'
-import { SelectionOverlayInjectionKey } from '@/types/selectionOverlayTypes'

 const commandStore = useCommandStore()
 const canvasStore = useCanvasStore()
 const extensionService = useExtensionService()
 const canvasInteractions = useCanvasInteractions()

-const selectionOverlayState = inject(SelectionOverlayInjectionKey)
-const { shouldAnimate } = useRetriggerableAnimation(
-  selectionOverlayState?.updateCount,
-  { animateOnMount: true }
-)
-
 const extensionToolboxCommands = computed<ComfyCommandImpl[]>(() => {
  const commandIds = new Set<string>(
    canvasStore.selectedItems
@@ -82,20 +71,4 @@ const extensionToolboxCommands = computed<ComfyCommandImpl[]>(() => {
 .selection-toolbox {
  transform: translateX(-50%) translateY(-120%);
 }
-
-/* Slide up animation using CSS animation */
-@keyframes slideUp {
-  from {
-    transform: translateX(-50%) translateY(-100%);
-    opacity: 0;
-  }
-  to {
-    transform: translateX(-50%) translateY(-120%);
-    opacity: 1;
-  }
-}
-
-.animate-slide-up {
-  animation: slideUp 0.3s ease-out;
-}
 </style>
--- a/src/components/graph/selectionToolbox/Load3DViewerButton.vue
+++ b/src/components/graph/selectionToolbox/Load3DViewerButton.vue
@@ -1,38 +0,0 @@
-<template>
-  <Button
-    v-show="is3DNode"
-    v-tooltip.top="{
-      value: t('commands.Comfy_3DViewer_Open3DViewer.label'),
-      showDelay: 1000
-    }"
-    severity="secondary"
-    text
-    icon="pi pi-pencil"
-    @click="open3DViewer"
-  />
-</template>
-
-<script setup lang="ts">
-import Button from 'primevue/button'
-import { computed } from 'vue'
-
-import { t } from '@/i18n'
-import { useCommandStore } from '@/stores/commandStore'
-import { useCanvasStore } from '@/stores/graphStore'
-import { useSettingStore } from '@/stores/settingStore'
-import { isLGraphNode, isLoad3dNode } from '@/utils/litegraphUtil'
-
-const commandStore = useCommandStore()
-const canvasStore = useCanvasStore()
-
-const is3DNode = computed(() => {
-  const enable3DViewer = useSettingStore().get('Comfy.Load3D.3DViewerEnable')
-  const nodes = canvasStore.selectedItems.filter(isLGraphNode)
-
-  return nodes.length === 1 && nodes.some(isLoad3dNode) && enable3DViewer
-})
-
-const open3DViewer = () => {
-  void commandStore.execute('Comfy.3DViewer.Open3DViewer')
-}
-</script>
--- a/src/components/helpcenter/HelpCenterMenuContent.vue
+++ b/src/components/helpcenter/HelpCenterMenuContent.vue
@@ -188,13 +188,16 @@ const showVersionUpdates = computed(() =>
  settingStore.get('Comfy.Notification.ShowVersionUpdates')
 )

-const moreItems = computed<MenuItem[]>(() => {
-  const allMoreItems: MenuItem[] = [
+const moreMenuItem = computed(() =>
+  menuItems.value.find((item) => item.key === 'more')
+)
+
+const menuItems = computed<MenuItem[]>(() => {
+  const moreItems: MenuItem[] = [
    {
      key: 'desktop-guide',
      type: 'item',
      label: t('helpCenter.desktopUserGuide'),
-      visible: isElectron(),
      action: () => {
        openExternalLink(EXTERNAL_LINKS.DESKTOP_GUIDE)
        emit('close')
@@ -227,19 +230,6 @@ const moreItems = computed<MenuItem[]>(() => {
    }
  ]

-  // Filter for visible items only
-  return allMoreItems.filter((item) => item.visible !== false)
-})
-
-const hasVisibleMoreItems = computed(() => {
-  return !!moreItems.value.length
-})
-
-const moreMenuItem = computed(() =>
-  menuItems.value.find((item) => item.key === 'more')
-)
-
-const menuItems = computed<MenuItem[]>(() => {
  return [
    {
      key: 'docs',
@@ -286,9 +276,8 @@ const menuItems = computed<MenuItem[]>(() => {
      type: 'item',
      icon: '',
      label: t('helpCenter.more'),
-      visible: hasVisibleMoreItems.value,
      action: () => {}, // No action for more item
-      items: moreItems.value
+      items: moreItems
    }
  ]
 })
--- a/src/components/load3d/Load3D.vue
+++ b/src/components/load3d/Load3D.vue
@@ -57,20 +57,9 @@
      @update-edge-threshold="handleUpdateEdgeThreshold"
      @export-model="handleExportModel"
    />
-    <div
-      v-if="enable3DViewer"
-      class="absolute top-12 right-2 z-20 pointer-events-auto"
-    >
-      <ViewerControls :node="node" />
-    </div>
-
    <div
      v-if="showRecordingControls"
-      class="absolute right-2 z-20 pointer-events-auto"
-      :class="{
-        'top-12': !enable3DViewer,
-        'top-24': enable3DViewer
-      }"
+      class="absolute top-12 right-2 z-20 pointer-events-auto"
    >
      <RecordingControls
        :node="node"
@@ -93,7 +82,6 @@ import { useI18n } from 'vue-i18n'
 import Load3DControls from '@/components/load3d/Load3DControls.vue'
 import Load3DScene from '@/components/load3d/Load3DScene.vue'
 import RecordingControls from '@/components/load3d/controls/RecordingControls.vue'
-import ViewerControls from '@/components/load3d/controls/ViewerControls.vue'
 import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
 import {
  CameraType,
@@ -103,7 +91,6 @@ import {
 } from '@/extensions/core/load3d/interfaces'
 import type { CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import type { ComponentWidget } from '@/scripts/domWidget'
-import { useSettingStore } from '@/stores/settingStore'
 import { useToastStore } from '@/stores/toastStore'

 const { t } = useI18n()
@@ -134,9 +121,6 @@ const isRecording = ref(false)
 const hasRecording = ref(false)
 const recordingDuration = ref(0)
 const showRecordingControls = ref(!inputSpec.isPreview)
-const enable3DViewer = computed(() =>
-  useSettingStore().get('Comfy.Load3D.3DViewerEnable')
-)

 const showPreviewButton = computed(() => {
  return !type.includes('Preview')
--- a/src/components/load3d/Load3dViewerContent.vue
+++ b/src/components/load3d/Load3dViewerContent.vue
@@ -1,149 +0,0 @@
-<template>
-  <div
-    ref="viewerContentRef"
-    class="flex w-full"
-    :class="[maximized ? 'h-full' : 'h-[70vh]']"
-    @mouseenter="viewer.handleMouseEnter"
-    @mouseleave="viewer.handleMouseLeave"
-  >
-    <div ref="mainContentRef" class="flex-1 relative">
-      <div
-        ref="containerRef"
-        class="absolute w-full h-full comfy-load-3d-viewer"
-        @resize="viewer.handleResize"
-      />
-    </div>
-
-    <div class="w-72 flex flex-col">
-      <div class="flex-1 overflow-y-auto p-4">
-        <div class="space-y-2">
-          <div class="p-2 space-y-4">
-            <SceneControls
-              v-model:background-color="viewer.backgroundColor.value"
-              v-model:show-grid="viewer.showGrid.value"
-              :has-background-image="viewer.hasBackgroundImage.value"
-              @update-background-image="viewer.handleBackgroundImageUpdate"
-            />
-          </div>
-
-          <div class="p-2 space-y-4">
-            <ModelControls
-              v-model:up-direction="viewer.upDirection.value"
-              v-model:material-mode="viewer.materialMode.value"
-            />
-          </div>
-
-          <div class="p-2 space-y-4">
-            <CameraControls
-              v-model:camera-type="viewer.cameraType.value"
-              v-model:fov="viewer.fov.value"
-            />
-          </div>
-
-          <div class="p-2 space-y-4">
-            <LightControls
-              v-model:light-intensity="viewer.lightIntensity.value"
-            />
-          </div>
-
-          <div class="p-2 space-y-4">
-            <ExportControls @export-model="viewer.exportModel" />
-          </div>
-        </div>
-      </div>
-
-      <div class="p-4">
-        <div class="flex gap-2">
-          <Button
-            icon="pi pi-times"
-            severity="secondary"
-            :label="t('g.cancel')"
-            @click="handleCancel"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Button from 'primevue/button'
-import { onBeforeUnmount, onMounted, ref, toRaw } from 'vue'
-
-import CameraControls from '@/components/load3d/controls/viewer/CameraControls.vue'
-import ExportControls from '@/components/load3d/controls/viewer/ExportControls.vue'
-import LightControls from '@/components/load3d/controls/viewer/LightControls.vue'
-import ModelControls from '@/components/load3d/controls/viewer/ModelControls.vue'
-import SceneControls from '@/components/load3d/controls/viewer/SceneControls.vue'
-import { t } from '@/i18n'
-import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
-import { useLoad3dService } from '@/services/load3dService'
-import { useDialogStore } from '@/stores/dialogStore'
-
-const props = defineProps<{
-  node: LGraphNode
-}>()
-
-const viewerContentRef = ref<HTMLDivElement>()
-const containerRef = ref<HTMLDivElement>()
-const mainContentRef = ref<HTMLDivElement>()
-const maximized = ref(false)
-const mutationObserver = ref<MutationObserver | null>(null)
-
-const viewer = useLoad3dService().getOrCreateViewer(toRaw(props.node))
-
-onMounted(async () => {
-  const source = useLoad3dService().getLoad3d(props.node)
-  if (source && containerRef.value) {
-    await viewer.initializeViewer(containerRef.value, source)
-  }
-
-  if (viewerContentRef.value) {
-    mutationObserver.value = new MutationObserver((mutations) => {
-      mutations.forEach((mutation) => {
-        if (
-          mutation.type === 'attributes' &&
-          mutation.attributeName === 'maximized'
-        ) {
-          maximized.value =
-            (mutation.target as HTMLElement).getAttribute('maximized') ===
-            'true'
-
-          setTimeout(() => {
-            viewer.refreshViewport()
-          }, 0)
-        }
-      })
-    })
-
-    mutationObserver.value.observe(viewerContentRef.value, {
-      attributes: true,
-      attributeFilter: ['maximized']
-    })
-  }
-
-  window.addEventListener('resize', viewer.handleResize)
-})
-
-const handleCancel = () => {
-  viewer.restoreInitialState()
-  useDialogStore().closeDialog()
-}
-
-onBeforeUnmount(() => {
-  window.removeEventListener('resize', viewer.handleResize)
-
-  if (mutationObserver.value) {
-    mutationObserver.value.disconnect()
-    mutationObserver.value = null
-  }
-
-  // we will manually cleanup the viewer in dialog close handler
-})
-</script>
-
-<style scoped>
-:deep(.p-panel-content) {
-  padding: 0;
-}
-</style>
--- a/src/components/load3d/controls/ViewerControls.vue
+++ b/src/components/load3d/controls/ViewerControls.vue
@@ -1,52 +0,0 @@
-<template>
-  <div class="relative bg-gray-700 bg-opacity-30 rounded-lg">
-    <div class="flex flex-col gap-2">
-      <Button class="p-button-rounded p-button-text" @click="openIn3DViewer">
-        <i
-          v-tooltip.right="{
-            value: t('load3d.openIn3DViewer'),
-            showDelay: 300
-          }"
-          class="pi pi-expand text-white text-lg"
-        />
-      </Button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Tooltip } from 'primevue'
-import Button from 'primevue/button'
-
-import Load3DViewerContent from '@/components/load3d/Load3dViewerContent.vue'
-import { t } from '@/i18n'
-import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
-import { useLoad3dService } from '@/services/load3dService'
-import { useDialogStore } from '@/stores/dialogStore'
-
-const vTooltip = Tooltip
-
-const { node } = defineProps<{
-  node: LGraphNode
-}>()
-
-const openIn3DViewer = () => {
-  const props = { node: node }
-
-  useDialogStore().showDialog({
-    key: 'global-load3d-viewer',
-    title: t('load3d.viewer.title'),
-    component: Load3DViewerContent,
-    props: props,
-    dialogComponentProps: {
-      style: 'width: 80vw; height: 80vh;',
-      maximizable: true,
-      onClose: async () => {
-        await useLoad3dService().handleViewerClose(props.node)
-      }
-    }
-  })
-}
-</script>
-
-<style scoped></style>
--- a/src/components/load3d/controls/viewer/CameraControls.vue
+++ b/src/components/load3d/controls/viewer/CameraControls.vue
@@ -1,37 +0,0 @@
-<template>
-  <div class="space-y-4">
-    <label>
-      {{ t('load3d.viewer.cameraType') }}
-    </label>
-    <Select
-      v-model="cameraType"
-      :options="cameras"
-      option-label="title"
-      option-value="value"
-    >
-    </Select>
-  </div>
-
-  <div v-if="showFOVButton" class="space-y-4">
-    <label>{{ t('load3d.fov') }}</label>
-    <Slider v-model="fov" :min="10" :max="150" :step="1" aria-label="fov" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import Select from 'primevue/select'
-import Slider from 'primevue/slider'
-import { computed } from 'vue'
-
-import { CameraType } from '@/extensions/core/load3d/interfaces'
-import { t } from '@/i18n'
-
-const cameras = [
-  { title: t('load3d.cameraType.perspective'), value: 'perspective' },
-  { title: t('load3d.cameraType.orthographic'), value: 'orthographic' }
-]
-
-const cameraType = defineModel<CameraType>('cameraType')
-const fov = defineModel<number>('fov')
-const showFOVButton = computed(() => cameraType.value === 'perspective')
-</script>
--- a/src/components/load3d/controls/viewer/ExportControls.vue
+++ b/src/components/load3d/controls/viewer/ExportControls.vue
@@ -1,37 +0,0 @@
-<template>
-  <Select
-    v-model="exportFormat"
-    :options="exportFormats"
-    option-label="label"
-    option-value="value"
-  >
-  </Select>
-
-  <Button severity="secondary" text rounded @click="exportModel(exportFormat)">
-    {{ t('load3d.export') }}
-  </Button>
-</template>
-
-<script setup lang="ts">
-import Button from 'primevue/button'
-import Select from 'primevue/select'
-import { ref } from 'vue'
-
-import { t } from '@/i18n'
-
-const emit = defineEmits<{
-  (e: 'exportModel', format: string): void
-}>()
-
-const exportFormats = [
-  { label: 'GLB', value: 'glb' },
-  { label: 'OBJ', value: 'obj' },
-  { label: 'STL', value: 'stl' }
-]
-
-const exportFormat = ref('obj')
-
-const exportModel = (format: string) => {
-  emit('exportModel', format)
-}
-</script>
--- a/src/components/load3d/controls/viewer/LightControls.vue
+++ b/src/components/load3d/controls/viewer/LightControls.vue
@@ -1,30 +0,0 @@
-<template>
-  <label>{{ t('load3d.lightIntensity') }}</label>
-
-  <Slider
-    v-model="lightIntensity"
-    class="w-full"
-    :min="lightIntensityMinimum"
-    :max="lightIntensityMaximum"
-    :step="lightAdjustmentIncrement"
-  />
-</template>
-
-<script setup lang="ts">
-import Slider from 'primevue/slider'
-
-import { t } from '@/i18n'
-import { useSettingStore } from '@/stores/settingStore'
-
-const lightIntensity = defineModel<number>('lightIntensity')
-
-const lightIntensityMaximum = useSettingStore().get(
-  'Comfy.Load3D.LightIntensityMaximum'
-)
-const lightIntensityMinimum = useSettingStore().get(
-  'Comfy.Load3D.LightIntensityMinimum'
-)
-const lightAdjustmentIncrement = useSettingStore().get(
-  'Comfy.Load3D.LightAdjustmentIncrement'
-)
-</script>
--- a/src/components/load3d/controls/viewer/ModelControls.vue
+++ b/src/components/load3d/controls/viewer/ModelControls.vue
@@ -1,52 +0,0 @@
-<template>
-  <div class="space-y-4">
-    <div>
-      <label>{{ t('load3d.upDirection') }}</label>
-      <Select
-        v-model="upDirection"
-        :options="upDirectionOptions"
-        option-label="label"
-        option-value="value"
-      />
-    </div>
-
-    <div>
-      <label>{{ t('load3d.materialMode') }}</label>
-      <Select
-        v-model="materialMode"
-        :options="materialModeOptions"
-        option-label="label"
-        option-value="value"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Select from 'primevue/select'
-import { computed } from 'vue'
-
-import { MaterialMode, UpDirection } from '@/extensions/core/load3d/interfaces'
-import { t } from '@/i18n'
-
-const upDirection = defineModel<UpDirection>('upDirection')
-const materialMode = defineModel<MaterialMode>('materialMode')
-
-const upDirectionOptions = [
-  { label: t('load3d.upDirections.original'), value: 'original' },
-  { label: '-X', value: '-x' },
-  { label: '+X', value: '+x' },
-  { label: '-Y', value: '-y' },
-  { label: '+Y', value: '+y' },
-  { label: '-Z', value: '-z' },
-  { label: '+Z', value: '+z' }
-]
-
-const materialModeOptions = computed(() => {
-  return [
-    { label: t('load3d.materialModes.original'), value: 'original' },
-    { label: t('load3d.materialModes.normal'), value: 'normal' },
-    { label: t('load3d.materialModes.wireframe'), value: 'wireframe' }
-  ]
-})
-</script>
--- a/src/components/load3d/controls/viewer/SceneControls.vue
+++ b/src/components/load3d/controls/viewer/SceneControls.vue
@@ -1,82 +0,0 @@
-<template>
-  <div class="space-y-4">
-    <div v-if="!hasBackgroundImage">
-      <label>
-        {{ t('load3d.backgroundColor') }}
-      </label>
-      <input v-model="backgroundColor" type="color" class="w-full" />
-    </div>
-
-    <div>
-      <Checkbox v-model="showGrid" input-id="showGrid" binary name="showGrid" />
-      <label for="showGrid" class="pl-2">
-        {{ t('load3d.showGrid') }}
-      </label>
-    </div>
-
-    <div v-if="!hasBackgroundImage">
-      <Button
-        severity="secondary"
-        :label="t('load3d.uploadBackgroundImage')"
-        icon="pi pi-image"
-        class="w-full"
-        @click="openImagePicker"
-      />
-      <input
-        ref="imagePickerRef"
-        type="file"
-        accept="image/*"
-        class="hidden"
-        @change="handleImageUpload"
-      />
-    </div>
-
-    <div v-if="hasBackgroundImage" class="space-y-2">
-      <Button
-        severity="secondary"
-        :label="t('load3d.removeBackgroundImage')"
-        icon="pi pi-times"
-        class="w-full"
-        @click="removeBackgroundImage"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Button from 'primevue/button'
-import Checkbox from 'primevue/checkbox'
-import { ref } from 'vue'
-
-import { t } from '@/i18n'
-
-const backgroundColor = defineModel<string>('backgroundColor')
-const showGrid = defineModel<boolean>('showGrid')
-
-defineProps<{
-  hasBackgroundImage?: boolean
-}>()
-
-const emit = defineEmits<{
-  (e: 'updateBackgroundImage', file: File | null): void
-}>()
-
-const imagePickerRef = ref<HTMLInputElement | null>(null)
-
-const openImagePicker = () => {
-  imagePickerRef.value?.click()
-}
-
-const handleImageUpload = (event: Event) => {
-  const input = event.target as HTMLInputElement
-  if (input.files && input.files[0]) {
-    emit('updateBackgroundImage', input.files[0])
-  }
-
-  input.value = ''
-}
-
-const removeBackgroundImage = () => {
-  emit('updateBackgroundImage', null)
-}
-</script>
--- a/src/components/node/NodePreview.vue
+++ b/src/components/node/NodePreview.vue
@@ -82,7 +82,7 @@ https://github.com/Nuked88/ComfyUI-N-Sidebar/blob/7ae7da4a9761009fb6629bc04c6830
 </template>

 <script setup lang="ts">
-import _ from 'es-toolkit/compat'
+import _ from 'lodash'
 import { computed } from 'vue'

 import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2'
--- a/src/components/sidebar/SideToolbar.vue
+++ b/src/components/sidebar/SideToolbar.vue
@@ -8,13 +8,10 @@
        :icon-badge="tab.iconBadge"
        :tooltip="tab.tooltip"
        :tooltip-suffix="getTabTooltipSuffix(tab)"
-        :label="tab.label || tab.title"
-        :is-small="isSmall"
        :selected="tab.id === selectedTab?.id"
        :class="tab.id + '-tab-button'"
        @click="onTabClick(tab)"
      />
-      <SidebarTemplatesButton />
      <div class="side-tool-bar-end">
        <SidebarLogoutIcon v-if="userStore.isMultiUserServer" />
        <SidebarHelpCenterIcon />
@@ -46,7 +43,6 @@ import type { SidebarTabExtension } from '@/types/extensionTypes'
 import SidebarHelpCenterIcon from './SidebarHelpCenterIcon.vue'
 import SidebarIcon from './SidebarIcon.vue'
 import SidebarLogoutIcon from './SidebarLogoutIcon.vue'
-import SidebarTemplatesButton from './SidebarTemplatesButton.vue'

 const workspaceStore = useWorkspaceStore()
 const settingStore = useSettingStore()
@@ -90,7 +86,7 @@ const getTabTooltipSuffix = (tab: SidebarTabExtension) => {
  box-shadow: var(--bar-shadow);

  --sidebar-width: 4rem;
-  --sidebar-icon-size: 1rem;
+  --sidebar-icon-size: 1.5rem;
 }

 .side-tool-bar-container.small-sidebar {
--- a/src/components/sidebar/SidebarIcon.vue
+++ b/src/components/sidebar/SidebarIcon.vue
@@ -19,29 +19,12 @@
    @click="emit('click', $event)"
  >
    <template #icon>
-      <div class="side-bar-button-content">
-        <slot name="icon">
-          <OverlayBadge v-if="shouldShowBadge" :value="overlayValue">
-            <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"
-          />
-        </slot>
-        <span v-if="label && !isSmall" class="side-bar-button-label">{{
-          t(label)
-        }}</span>
-      </div>
+      <slot name="icon">
+        <OverlayBadge v-if="shouldShowBadge" :value="overlayValue">
+          <i :class="icon + ' side-bar-button-icon'" />
+        </OverlayBadge>
+        <i v-else :class="icon + ' side-bar-button-icon'" />
+      </slot>
    </template>
  </Button>
 </template>
@@ -50,7 +33,6 @@
 import Button from 'primevue/button'
 import OverlayBadge from 'primevue/overlaybadge'
 import { computed } from 'vue'
-import type { Component } from 'vue'
 import { useI18n } from 'vue-i18n'

 const { t } = useI18n()
@@ -59,17 +41,13 @@ const {
  selected = false,
  tooltip = '',
  tooltipSuffix = '',
-  iconBadge = '',
-  label = '',
-  isSmall = false
+  iconBadge = ''
 } = defineProps<{
-  icon?: string | Component
+  icon?: string
  selected?: boolean
  tooltip?: string
  tooltipSuffix?: string
  iconBadge?: string | (() => string | null)
-  label?: string
-  isSmall?: boolean
 }>()

 const emit = defineEmits<{
@@ -96,21 +74,8 @@ const computedTooltip = computed(() => t(tooltip) + tooltipSuffix)
 <style scoped>
 .side-bar-button {
  width: var(--sidebar-width);
-  height: calc(var(--sidebar-width) + 0.5rem);
-  border-radius: 0;
-}
-
-.side-tool-bar-end .side-bar-button {
  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 whitespace-nowrap;
-  line-height: 1;
+  border-radius: 0;
 }

 .comfyui-body-left .side-bar-button.side-bar-button-selected,
--- a/src/components/sidebar/SidebarTemplatesButton.vue
+++ b/src/components/sidebar/SidebarTemplatesButton.vue
@@ -1,35 +0,0 @@
-<template>
-  <SidebarIcon
-    :icon="TemplateIcon"
-    :tooltip="$t('sideToolbar.templates')"
-    :label="$t('sideToolbar.labels.templates')"
-    :is-small="isSmall"
-    class="templates-tab-button"
-    @click="openTemplates"
-  />
-</template>
-
-<script setup lang="ts">
-import { computed, defineAsyncComponent, markRaw } from 'vue'
-
-import { useCommandStore } from '@/stores/commandStore'
-import { useSettingStore } from '@/stores/settingStore'
-
-import SidebarIcon from './SidebarIcon.vue'
-
-// Import the custom template icon
-const TemplateIcon = markRaw(
-  defineAsyncComponent(() => import('virtual:icons/comfy/template'))
-)
-
-const settingStore = useSettingStore()
-const commandStore = useCommandStore()
-
-const isSmall = computed(
-  () => settingStore.get('Comfy.Sidebar.Size') === 'small'
-)
-
-const openTemplates = () => {
-  void commandStore.execute('Comfy.BrowseTemplates')
-}
-</script>
--- a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
+++ b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
@@ -265,14 +265,6 @@ const renderTreeNode = (
                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)
-              }
            }
          ]
        },
--- a/src/composables/bottomPanelTabs/useTerminal.ts
+++ b/src/composables/bottomPanelTabs/useTerminal.ts
@@ -1,7 +1,7 @@
 import { FitAddon } from '@xterm/addon-fit'
 import { Terminal } from '@xterm/xterm'
 import '@xterm/xterm/css/xterm.css'
-import { debounce } from 'es-toolkit/compat'
+import { debounce } from 'lodash'
 import { Ref, markRaw, onMounted, onUnmounted } from 'vue'

 export function useTerminal(element: Ref<HTMLElement | undefined>) {
--- a/src/composables/element/useOverflowObserver.ts
+++ b/src/composables/element/useOverflowObserver.ts
@@ -1,5 +1,5 @@
 import { useMutationObserver, useResizeObserver } from '@vueuse/core'
-import { debounce } from 'es-toolkit/compat'
+import { debounce } from 'lodash'
 import { readonly, ref } from 'vue'

 /**
--- a/src/composables/element/useRetriggerableAnimation.ts
+++ b/src/composables/element/useRetriggerableAnimation.ts
@@ -1,80 +0,0 @@
-import { onMounted, ref, watch } from 'vue'
-import type { Ref, WatchSource } from 'vue'
-
-/**
- * A composable that manages retriggerable CSS animations.
- * Provides a boolean ref that can be toggled to restart CSS animations.
- *
- * @param trigger - Optional reactive source that triggers the animation when it changes
- * @param options - Configuration options
- * @returns An object containing the animation state ref
- *
- * @example
- * ```vue
- * <template>
- *   <div :class="{ 'animate-slide-up': shouldAnimate }">
- *     Content
- *   </div>
- * </template>
- *
- * <script setup>
- * const { shouldAnimate } = useRetriggerableAnimation(someReactiveTrigger)
- * </script>
- * ```
- */
-export function useRetriggerableAnimation<T = any>(
-  trigger?: WatchSource<T> | Ref<T>,
-  options: {
-    animateOnMount?: boolean
-    animationDelay?: number
-  } = {}
-) {
-  const { animateOnMount = true, animationDelay = 0 } = options
-
-  const shouldAnimate = ref(false)
-
-  /**
-   * Retriggers the animation by removing and re-adding the animation class
-   */
-  const retriggerAnimation = () => {
-    // Remove animation class
-    shouldAnimate.value = false
-    // Force browser reflow to ensure the class removal is processed
-    void document.body.offsetHeight
-    // Re-add animation class in the next frame
-    requestAnimationFrame(() => {
-      if (animationDelay > 0) {
-        setTimeout(() => {
-          shouldAnimate.value = true
-        }, animationDelay)
-      } else {
-        shouldAnimate.value = true
-      }
-    })
-  }
-
-  // Trigger animation on mount if requested
-  if (animateOnMount) {
-    onMounted(() => {
-      if (animationDelay > 0) {
-        setTimeout(() => {
-          shouldAnimate.value = true
-        }, animationDelay)
-      } else {
-        shouldAnimate.value = true
-      }
-    })
-  }
-
-  // Watch for trigger changes to retrigger animation
-  if (trigger) {
-    watch(trigger, () => {
-      retriggerAnimation()
-    })
-  }
-
-  return {
-    shouldAnimate,
-    retriggerAnimation
-  }
-}
--- a/src/composables/node/useNodeBadge.ts
+++ b/src/composables/node/useNodeBadge.ts
@@ -1,4 +1,4 @@
-import _ from 'es-toolkit/compat'
+import _ from 'lodash'
 import { computed, onMounted, watch } from 'vue'

 import { useNodePricing } from '@/composables/node/useNodePricing'
--- a/src/composables/node/useNodePricing.ts
+++ b/src/composables/node/useNodePricing.ts
@@ -1362,6 +1362,12 @@ const apiNodeCosts: Record<string, { displayPrice: string | PricingFunction }> =
          return '$0.0004/$0.0016 per 1K tokens'
        } else if (model.includes('gpt-4.1')) {
          return '$0.002/$0.008 per 1K tokens'
+        } else if (model.includes('gpt-5-nano')) {
+          return '$0.00005/$0.0004 per 1K tokens'
+        } else if (model.includes('gpt-5-mini')) {
+          return '$0.00025/$0.002 per 1K tokens'
+        } else if (model.includes('gpt-5')) {
+          return '$0.00125/$0.01 per 1K tokens'
        }
        return 'Token-based'
      }
--- a/src/composables/nodePack/useMissingNodes.ts
+++ b/src/composables/nodePack/useMissingNodes.ts
@@ -1,4 +1,4 @@
-import { groupBy } from 'es-toolkit/compat'
+import { groupBy } from 'lodash'
 import { computed, onMounted } from 'vue'

 import { useWorkflowPacks } from '@/composables/nodePack/useWorkflowPacks'
--- a/src/composables/sidebarTabs/useModelLibrarySidebarTab.ts
+++ b/src/composables/sidebarTabs/useModelLibrarySidebarTab.ts
@@ -1,21 +1,16 @@
-import { defineAsyncComponent, markRaw } from 'vue'
+import { markRaw } from 'vue'

 import ModelLibrarySidebarTab from '@/components/sidebar/tabs/ModelLibrarySidebarTab.vue'
 import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
 import { isElectron } from '@/utils/envUtil'

-const AiModelIcon = markRaw(
-  defineAsyncComponent(() => import('virtual:icons/comfy/ai-model'))
-)
-
 export const useModelLibrarySidebarTab = (): SidebarTabExtension => {
  return {
    id: 'model-library',
-    icon: AiModelIcon,
+    icon: 'pi pi-box',
    title: 'sideToolbar.modelLibrary',
    tooltip: 'sideToolbar.modelLibrary',
-    label: 'sideToolbar.labels.models',
    component: markRaw(ModelLibrarySidebarTab),
    type: 'vue',
    iconBadge: () => {
--- a/src/composables/sidebarTabs/useNodeLibrarySidebarTab.ts
+++ b/src/composables/sidebarTabs/useNodeLibrarySidebarTab.ts
@@ -1,19 +1,14 @@
-import { defineAsyncComponent, markRaw } from 'vue'
+import { markRaw } from 'vue'

 import NodeLibrarySidebarTab from '@/components/sidebar/tabs/NodeLibrarySidebarTab.vue'
 import type { SidebarTabExtension } from '@/types/extensionTypes'

-const NodeIcon = markRaw(
-  defineAsyncComponent(() => import('virtual:icons/comfy/node'))
-)
-
 export const useNodeLibrarySidebarTab = (): SidebarTabExtension => {
  return {
    id: 'node-library',
-    icon: NodeIcon,
+    icon: 'pi pi-book',
    title: 'sideToolbar.nodeLibrary',
    tooltip: 'sideToolbar.nodeLibrary',
-    label: 'sideToolbar.labels.nodes',
    component: markRaw(NodeLibrarySidebarTab),
    type: 'vue'
  }
--- a/src/composables/sidebarTabs/useQueueSidebarTab.ts
+++ b/src/composables/sidebarTabs/useQueueSidebarTab.ts
@@ -15,7 +15,6 @@ export const useQueueSidebarTab = (): SidebarTabExtension => {
    },
    title: 'sideToolbar.queue',
    tooltip: 'sideToolbar.queue',
-    label: 'sideToolbar.labels.queue',
    component: markRaw(QueueSidebarTab),
    type: 'vue'
  }
--- a/src/composables/sidebarTabs/useWorkflowsSidebarTab.ts
+++ b/src/composables/sidebarTabs/useWorkflowsSidebarTab.ts
@@ -1,20 +1,16 @@
-import { defineAsyncComponent, markRaw } from 'vue'
+import { markRaw } from 'vue'

 import WorkflowsSidebarTab from '@/components/sidebar/tabs/WorkflowsSidebarTab.vue'
 import { useSettingStore } from '@/stores/settingStore'
 import { useWorkflowStore } from '@/stores/workflowStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'

-const WorkflowIcon = markRaw(
-  defineAsyncComponent(() => import('virtual:icons/comfy/workflow'))
-)
-
 export const useWorkflowsSidebarTab = (): SidebarTabExtension => {
  const settingStore = useSettingStore()
  const workflowStore = useWorkflowStore()
  return {
    id: 'workflows',
-    icon: WorkflowIcon,
+    icon: 'pi pi-folder-open',
    iconBadge: () => {
      if (
        settingStore.get('Comfy.Workflow.WorkflowTabsPosition') !== 'Sidebar'
@@ -26,7 +22,6 @@ export const useWorkflowsSidebarTab = (): SidebarTabExtension => {
    },
    title: 'sideToolbar.workflows',
    tooltip: 'sideToolbar.workflows',
-    label: 'sideToolbar.labels.workflows',
    component: markRaw(WorkflowsSidebarTab),
    type: 'vue'
  }
--- a/src/composables/useLoad3dViewer.ts
+++ b/src/composables/useLoad3dViewer.ts
@@ -1,376 +0,0 @@
-import { ref, toRaw, watch } from 'vue'
-
-import Load3d from '@/extensions/core/load3d/Load3d'
-import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
-import {
-  CameraType,
-  MaterialMode,
-  UpDirection
-} from '@/extensions/core/load3d/interfaces'
-import { t } from '@/i18n'
-import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
-import { useLoad3dService } from '@/services/load3dService'
-import { useToastStore } from '@/stores/toastStore'
-
-interface Load3dViewerState {
-  backgroundColor: string
-  showGrid: boolean
-  cameraType: CameraType
-  fov: number
-  lightIntensity: number
-  cameraState: any
-  backgroundImage: string
-  upDirection: UpDirection
-  materialMode: MaterialMode
-  edgeThreshold: number
-}
-
-export const useLoad3dViewer = (node: LGraphNode) => {
-  const backgroundColor = ref('')
-  const showGrid = ref(true)
-  const cameraType = ref<CameraType>('perspective')
-  const fov = ref(75)
-  const lightIntensity = ref(1)
-  const backgroundImage = ref('')
-  const hasBackgroundImage = ref(false)
-  const upDirection = ref<UpDirection>('original')
-  const materialMode = ref<MaterialMode>('original')
-  const edgeThreshold = ref(85)
-  const needApplyChanges = ref(true)
-
-  let load3d: Load3d | null = null
-  let sourceLoad3d: Load3d | null = null
-
-  const initialState = ref<Load3dViewerState>({
-    backgroundColor: '#282828',
-    showGrid: true,
-    cameraType: 'perspective',
-    fov: 75,
-    lightIntensity: 1,
-    cameraState: null,
-    backgroundImage: '',
-    upDirection: 'original',
-    materialMode: 'original',
-    edgeThreshold: 85
-  })
-
-  watch(backgroundColor, (newColor) => {
-    if (!load3d) return
-    try {
-      load3d.setBackgroundColor(newColor)
-    } catch (error) {
-      console.error('Error updating background color:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToUpdateBackgroundColor', { color: newColor })
-      )
-    }
-  })
-
-  watch(showGrid, (newValue) => {
-    if (!load3d) return
-    try {
-      load3d.toggleGrid(newValue)
-    } catch (error) {
-      console.error('Error toggling grid:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToToggleGrid', { show: newValue ? 'on' : 'off' })
-      )
-    }
-  })
-
-  watch(cameraType, (newCameraType) => {
-    if (!load3d) return
-    try {
-      load3d.toggleCamera(newCameraType)
-    } catch (error) {
-      console.error('Error toggling camera:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToToggleCamera', { camera: newCameraType })
-      )
-    }
-  })
-
-  watch(fov, (newFov) => {
-    if (!load3d) return
-    try {
-      load3d.setFOV(Number(newFov))
-    } catch (error) {
-      console.error('Error updating FOV:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToUpdateFOV', { fov: newFov })
-      )
-    }
-  })
-
-  watch(lightIntensity, (newValue) => {
-    if (!load3d) return
-    try {
-      load3d.setLightIntensity(Number(newValue))
-    } catch (error) {
-      console.error('Error updating light intensity:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToUpdateLightIntensity', { intensity: newValue })
-      )
-    }
-  })
-
-  watch(backgroundImage, async (newValue) => {
-    if (!load3d) return
-    try {
-      await load3d.setBackgroundImage(newValue)
-      hasBackgroundImage.value = !!newValue
-    } catch (error) {
-      console.error('Error updating background image:', error)
-      useToastStore().addAlert(t('toastMessages.failedToUpdateBackgroundImage'))
-    }
-  })
-
-  watch(upDirection, (newValue) => {
-    if (!load3d) return
-    try {
-      load3d.setUpDirection(newValue)
-    } catch (error) {
-      console.error('Error updating up direction:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToUpdateUpDirection', { direction: newValue })
-      )
-    }
-  })
-
-  watch(materialMode, (newValue) => {
-    if (!load3d) return
-    try {
-      load3d.setMaterialMode(newValue)
-    } catch (error) {
-      console.error('Error updating material mode:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToUpdateMaterialMode', { mode: newValue })
-      )
-    }
-  })
-
-  watch(edgeThreshold, (newValue) => {
-    if (!load3d) return
-    try {
-      load3d.setEdgeThreshold(Number(newValue))
-    } catch (error) {
-      console.error('Error updating edge threshold:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToUpdateEdgeThreshold', { threshold: newValue })
-      )
-    }
-  })
-
-  const initializeViewer = async (
-    containerRef: HTMLElement,
-    source: Load3d
-  ) => {
-    if (!containerRef) return
-
-    sourceLoad3d = source
-
-    try {
-      load3d = new Load3d(containerRef, {
-        node: node,
-        disablePreview: true,
-        isViewerMode: true
-      })
-
-      await useLoad3dService().copyLoad3dState(source, load3d)
-
-      const sourceCameraType = source.getCurrentCameraType()
-      const sourceCameraState = source.getCameraState()
-
-      cameraType.value = sourceCameraType
-      backgroundColor.value = source.sceneManager.currentBackgroundColor
-      showGrid.value = source.sceneManager.gridHelper.visible
-      lightIntensity.value = (node.properties['Light Intensity'] as number) || 1
-
-      const backgroundInfo = source.sceneManager.getCurrentBackgroundInfo()
-      if (
-        backgroundInfo.type === 'image' &&
-        node.properties['Background Image']
-      ) {
-        backgroundImage.value = node.properties['Background Image'] as string
-        hasBackgroundImage.value = true
-      } else {
-        backgroundImage.value = ''
-        hasBackgroundImage.value = false
-      }
-
-      if (sourceCameraType === 'perspective') {
-        fov.value = source.cameraManager.perspectiveCamera.fov
-      }
-
-      upDirection.value = source.modelManager.currentUpDirection
-      materialMode.value = source.modelManager.materialMode
-      edgeThreshold.value = (node.properties['Edge Threshold'] as number) || 85
-
-      initialState.value = {
-        backgroundColor: backgroundColor.value,
-        showGrid: showGrid.value,
-        cameraType: cameraType.value,
-        fov: fov.value,
-        lightIntensity: lightIntensity.value,
-        cameraState: sourceCameraState,
-        backgroundImage: backgroundImage.value,
-        upDirection: upDirection.value,
-        materialMode: materialMode.value,
-        edgeThreshold: edgeThreshold.value
-      }
-
-      const width = node.widgets?.find((w) => w.name === 'width')
-      const height = node.widgets?.find((w) => w.name === 'height')
-
-      if (width && height) {
-        load3d.setTargetSize(
-          toRaw(width).value as number,
-          toRaw(height).value as number
-        )
-      }
-    } catch (error) {
-      console.error('Error initializing Load3d viewer:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToInitializeLoad3dViewer')
-      )
-    }
-  }
-
-  const exportModel = async (format: string) => {
-    if (!load3d) return
-
-    try {
-      await load3d.exportModel(format)
-    } catch (error) {
-      console.error('Error exporting model:', error)
-      useToastStore().addAlert(
-        t('toastMessages.failedToExportModel', { format: format.toUpperCase() })
-      )
-    }
-  }
-
-  const handleResize = () => {
-    load3d?.handleResize()
-  }
-
-  const handleMouseEnter = () => {
-    load3d?.updateStatusMouseOnViewer(true)
-  }
-
-  const handleMouseLeave = () => {
-    load3d?.updateStatusMouseOnViewer(false)
-  }
-
-  const restoreInitialState = () => {
-    const nodeValue = node
-
-    needApplyChanges.value = false
-
-    if (nodeValue.properties) {
-      nodeValue.properties['Background Color'] =
-        initialState.value.backgroundColor
-      nodeValue.properties['Show Grid'] = initialState.value.showGrid
-      nodeValue.properties['Camera Type'] = initialState.value.cameraType
-      nodeValue.properties['FOV'] = initialState.value.fov
-      nodeValue.properties['Light Intensity'] =
-        initialState.value.lightIntensity
-      nodeValue.properties['Camera Info'] = initialState.value.cameraState
-      nodeValue.properties['Background Image'] =
-        initialState.value.backgroundImage
-    }
-  }
-
-  const applyChanges = async () => {
-    if (!sourceLoad3d || !load3d) return false
-
-    const viewerCameraState = load3d.getCameraState()
-    const nodeValue = node
-
-    if (nodeValue.properties) {
-      nodeValue.properties['Background Color'] = backgroundColor.value
-      nodeValue.properties['Show Grid'] = showGrid.value
-      nodeValue.properties['Camera Type'] = cameraType.value
-      nodeValue.properties['FOV'] = fov.value
-      nodeValue.properties['Light Intensity'] = lightIntensity.value
-      nodeValue.properties['Camera Info'] = viewerCameraState
-      nodeValue.properties['Background Image'] = backgroundImage.value
-    }
-
-    await useLoad3dService().copyLoad3dState(load3d, sourceLoad3d)
-
-    if (backgroundImage.value) {
-      await sourceLoad3d.setBackgroundImage(backgroundImage.value)
-    }
-
-    sourceLoad3d.forceRender()
-
-    if (nodeValue.graph) {
-      nodeValue.graph.setDirtyCanvas(true, true)
-    }
-
-    return true
-  }
-
-  const refreshViewport = () => {
-    useLoad3dService().handleViewportRefresh(load3d)
-  }
-
-  const handleBackgroundImageUpdate = async (file: File | null) => {
-    if (!file) {
-      backgroundImage.value = ''
-      hasBackgroundImage.value = false
-      return
-    }
-
-    try {
-      const resourceFolder =
-        (node.properties['Resource Folder'] as string) || ''
-      const subfolder = resourceFolder.trim()
-        ? `3d/${resourceFolder.trim()}`
-        : '3d'
-
-      const uploadPath = await Load3dUtils.uploadFile(file, subfolder)
-
-      if (uploadPath) {
-        backgroundImage.value = uploadPath
-        hasBackgroundImage.value = true
-      }
-    } catch (error) {
-      console.error('Error uploading background image:', error)
-      useToastStore().addAlert(t('toastMessages.failedToUploadBackgroundImage'))
-    }
-  }
-
-  const cleanup = () => {
-    load3d?.remove()
-    load3d = null
-    sourceLoad3d = null
-  }
-
-  return {
-    // State
-    backgroundColor,
-    showGrid,
-    cameraType,
-    fov,
-    lightIntensity,
-    backgroundImage,
-    hasBackgroundImage,
-    upDirection,
-    materialMode,
-    edgeThreshold,
-    needApplyChanges,
-
-    // Methods
-    initializeViewer,
-    exportModel,
-    handleResize,
-    handleMouseEnter,
-    handleMouseLeave,
-    restoreInitialState,
-    applyChanges,
-    refreshViewport,
-    handleBackgroundImageUpdate,
-    cleanup
-  }
-}
--- a/src/composables/useMinimap.ts
+++ b/src/composables/useMinimap.ts
@@ -5,9 +5,9 @@ import { useCanvasTransformSync } from '@/composables/canvas/useCanvasTransformS
 import { LGraphEventMode, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { NodeId } from '@/schemas/comfyWorkflowSchema'
 import { api } from '@/scripts/api'
-import { app } from '@/scripts/app'
 import { useCanvasStore } from '@/stores/graphStore'
 import { useSettingStore } from '@/stores/settingStore'
+import { useWorkflowStore } from '@/stores/workflowStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { adjustColor } from '@/utils/colorUtil'

@@ -27,6 +27,7 @@ export type MinimapOptionKey =
 export function useMinimap() {
  const settingStore = useSettingStore()
  const canvasStore = useCanvasStore()
+  const workflowStore = useWorkflowStore()
  const colorPaletteStore = useColorPaletteStore()

  const containerRef = ref<HTMLDivElement>()
@@ -147,7 +148,11 @@ export function useMinimap() {
  }

  const canvas = computed(() => canvasStore.canvas)
-  const graph = ref(app.canvas?.graph)
+  const graph = computed(() => {
+    // If we're in a subgraph, use that; otherwise use the canvas graph
+    const activeSubgraph = workflowStore.activeSubgraph
+    return activeSubgraph || canvas.value?.graph
+  })

  const containerStyles = computed(() => ({
    width: `${width}px`,
@@ -627,7 +632,8 @@ export function useMinimap() {
    c.setDirty(true, true)
  }

-  let originalCallbacks: GraphCallbacks = {}
+  // Map to store original callbacks per graph ID
+  const originalCallbacksMap = new Map<string, GraphCallbacks>()

  const handleGraphChanged = useThrottleFn(() => {
    needsFullRedraw.value = true
@@ -641,11 +647,18 @@ export function useMinimap() {
    const g = graph.value
    if (!g) return

-    originalCallbacks = {
+    // Check if we've already wrapped this graph's callbacks
+    if (originalCallbacksMap.has(g.id)) {
+      return
+    }
+
+    // Store the original callbacks for this graph
+    const originalCallbacks: GraphCallbacks = {
      onNodeAdded: g.onNodeAdded,
      onNodeRemoved: g.onNodeRemoved,
      onConnectionChange: g.onConnectionChange
    }
+    originalCallbacksMap.set(g.id, originalCallbacks)

    g.onNodeAdded = function (node) {
      originalCallbacks.onNodeAdded?.call(this, node)
@@ -670,15 +683,18 @@ export function useMinimap() {
    const g = graph.value
    if (!g) return

-    if (originalCallbacks.onNodeAdded !== undefined) {
-      g.onNodeAdded = originalCallbacks.onNodeAdded
-    }
-    if (originalCallbacks.onNodeRemoved !== undefined) {
-      g.onNodeRemoved = originalCallbacks.onNodeRemoved
-    }
-    if (originalCallbacks.onConnectionChange !== undefined) {
-      g.onConnectionChange = originalCallbacks.onConnectionChange
+    const originalCallbacks = originalCallbacksMap.get(g.id)
+    if (!originalCallbacks) {
+      throw new Error(
+        'Attempted to cleanup event listeners for graph that was never set up'
+      )
    }
+
+    g.onNodeAdded = originalCallbacks.onNodeAdded
+    g.onNodeRemoved = originalCallbacks.onNodeRemoved
+    g.onConnectionChange = originalCallbacks.onConnectionChange
+
+    originalCallbacksMap.delete(g.id)
  }

  const init = async () => {
@@ -751,6 +767,19 @@ export function useMinimap() {
    { immediate: true, flush: 'post' }
  )

+  // Watch for graph changes (e.g., when navigating to/from subgraphs)
+  watch(graph, (newGraph, oldGraph) => {
+    if (newGraph && newGraph !== oldGraph) {
+      cleanupEventListeners()
+      setupEventListeners()
+      needsFullRedraw.value = true
+      updateFlags.value.bounds = true
+      updateFlags.value.nodes = true
+      updateFlags.value.connections = true
+      updateMinimap()
+    }
+  })
+
  watch(visible, async (isVisible) => {
    if (isVisible) {
      if (containerRef.value) {
--- a/src/composables/useRegistrySearch.ts
+++ b/src/composables/useRegistrySearch.ts
@@ -1,5 +1,5 @@
 import { watchDebounced } from '@vueuse/core'
-import { orderBy } from 'es-toolkit/compat'
+import { orderBy } from 'lodash'
 import { computed, ref, watch } from 'vue'

 import { DEFAULT_PAGE_SIZE } from '@/constants/searchConstants'
--- a/src/composables/useWorkflowPersistence.ts
+++ b/src/composables/useWorkflowPersistence.ts
@@ -1,4 +1,3 @@
-import { tryOnScopeDispose } from '@vueuse/core'
 import { computed, watch } from 'vue'

 import { api } from '@/scripts/api'
@@ -89,11 +88,6 @@ export function useWorkflowPersistence() {
  )
  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)
--- a/src/composables/widgets/useFloatWidget.ts
+++ b/src/composables/widgets/useFloatWidget.ts
@@ -1,4 +1,4 @@
-import _ from 'es-toolkit/compat'
+import _ from 'lodash'

 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { INumericWidget } from '@/lib/litegraph/src/types/widgets'
--- a/src/constants/coreTemplates.ts
+++ b/src/constants/coreTemplates.ts
@@ -0,0 +1,438 @@
+export const CORE_TEMPLATES = [
+  {
+    moduleName: 'default',
+    title: 'Basics',
+    type: 'image',
+    templates: [
+      {
+        name: 'default',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate images from text descriptions.'
+      },
+      {
+        name: 'image2image',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Transform existing images using text prompts.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/img2img/'
+      },
+      {
+        name: 'lora',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Apply LoRA models for specialized styles or subjects.',
+        tutorialUrl: 'https://comfyanonymous.github.io/ComfyUI_examples/lora/'
+      },
+      {
+        name: 'inpaint_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Edit specific parts of images seamlessly.',
+        thumbnailVariant: 'compareSlider',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/inpaint/'
+      },
+      {
+        name: 'inpain_model_outpainting',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Extend images beyond their original boundaries.',
+        thumbnailVariant: 'compareSlider',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/inpaint/#outpainting'
+      },
+      {
+        name: 'embedding_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Use textual inversion for consistent styles',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/textual_inversion_embeddings/'
+      },
+      {
+        name: 'gligen_textbox_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Specify the location and size of objects.',
+        tutorialUrl: 'https://comfyanonymous.github.io/ComfyUI_examples/gligen/'
+      },
+      {
+        name: 'lora_multiple',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Combine multiple LoRA models for unique results.',
+        tutorialUrl: 'https://comfyanonymous.github.io/ComfyUI_examples/lora/'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: 'Flux',
+    type: 'image',
+    templates: [
+      {
+        name: 'flux_dev_checkpoint_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Create images using Flux development models.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/flux/#flux-dev-1'
+      },
+      {
+        name: 'flux_schnell',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate images quickly with Flux Schnell.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/flux/#flux-schnell-1'
+      },
+      {
+        name: 'flux_fill_inpaint_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Fill in missing parts of images.',
+        thumbnailVariant: 'compareSlider',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/flux/#fill-inpainting-model'
+      },
+      {
+        name: 'flux_fill_outpaint_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Extend images using Flux outpainting.',
+        thumbnailVariant: 'compareSlider',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/flux/#fill-inpainting-model'
+      },
+      {
+        name: 'flux_canny_model_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate images from edge detection.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/flux/#canny-and-depth'
+      },
+      {
+        name: 'flux_depth_lora_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Create images with depth-aware LoRA.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/flux/#canny-and-depth'
+      },
+      {
+        name: 'flux_redux_model_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description:
+          'Transfer style from a reference image to guide image generation with Flux.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/flux/#redux'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: 'ControlNet',
+    type: 'image',
+    templates: [
+      {
+        name: 'controlnet_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Control image generation with reference images.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/controlnet/'
+      },
+      {
+        name: '2_pass_pose_worship',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate images from pose references.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/controlnet/#pose-controlnet'
+      },
+      {
+        name: 'depth_controlnet',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Create images with depth-aware generation.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/controlnet/#t2i-adapter-vs-controlnets'
+      },
+      {
+        name: 'depth_t2i_adapter',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Quickly generate depth-aware images with a T2I adapter.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/controlnet/#t2i-adapter-vs-controlnets'
+      },
+      {
+        name: 'mixing_controlnets',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Combine multiple ControlNet models together.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/controlnet/#mixing-controlnets'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: 'Upscaling',
+    type: 'image',
+    templates: [
+      {
+        name: 'hiresfix_latent_workflow',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Enhance image quality in latent space.',
+        thumbnailVariant: 'zoomHover',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/2_pass_txt2img/'
+      },
+      {
+        name: 'esrgan_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Use upscale models to enhance image quality.',
+        thumbnailVariant: 'zoomHover',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/upscale_models/'
+      },
+      {
+        name: 'hiresfix_esrgan_workflow',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Use upscale models during intermediate steps.',
+        thumbnailVariant: 'zoomHover',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/2_pass_txt2img/#non-latent-upscaling'
+      },
+      {
+        name: 'latent_upscale_different_prompt_model',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Upscale and change prompt across passes',
+        thumbnailVariant: 'zoomHover',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/2_pass_txt2img/#more-examples'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: 'Video',
+    type: 'video',
+    templates: [
+      {
+        name: 'ltxv_text_to_video',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate videos from text descriptions.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/ltxv/#text-to-video'
+      },
+      {
+        name: 'ltxv_image_to_video',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Convert still images into videos.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/ltxv/#image-to-video'
+      },
+      {
+        name: 'mochi_text_to_video_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Create videos with Mochi model.',
+        tutorialUrl: 'https://comfyanonymous.github.io/ComfyUI_examples/mochi/'
+      },
+      {
+        name: 'hunyuan_video_text_to_video',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate videos using Hunyuan model.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/hunyuan_video/'
+      },
+      {
+        name: 'image_to_video',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Transform images into animated videos.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/video/#image-to-video'
+      },
+      {
+        name: 'txt_to_image_to_video',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description:
+          'Generate images from text and then convert them into videos.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/video/#image-to-video'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: 'SD3.5',
+    type: 'image',
+    templates: [
+      {
+        name: 'sd3.5_simple_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate images with SD 3.5.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/sd3/#sd35'
+      },
+      {
+        name: 'sd3.5_large_canny_controlnet_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description:
+          'Use edge detection to guide image generation with SD 3.5.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/sd3/#sd35-controlnets'
+      },
+      {
+        name: 'sd3.5_large_depth',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Create depth-aware images with SD 3.5.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/sd3/#sd35-controlnets'
+      },
+      {
+        name: 'sd3.5_large_blur',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description:
+          'Generate images from blurred reference images with SD 3.5.',
+        thumbnailVariant: 'hoverDissolve',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/sd3/#sd35-controlnets'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: 'SDXL',
+    type: 'image',
+    templates: [
+      {
+        name: 'sdxl_simple_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Create high-quality images with SDXL.',
+        tutorialUrl: 'https://comfyanonymous.github.io/ComfyUI_examples/sdxl/'
+      },
+      {
+        name: 'sdxl_refiner_prompt_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Enhance SDXL outputs with refiners.',
+        tutorialUrl: 'https://comfyanonymous.github.io/ComfyUI_examples/sdxl/'
+      },
+      {
+        name: 'sdxl_revision_text_prompts',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description:
+          'Transfer concepts from reference images to guide image generation with SDXL.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/sdxl/#revision'
+      },
+      {
+        name: 'sdxl_revision_zero_positive',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description:
+          'Add text prompts alongside reference images to guide image generation with SDXL.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/sdxl/#revision'
+      },
+      {
+        name: 'sdxlturbo_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate images in a single step with SDXL Turbo.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/sdturbo/'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: 'Area Composition',
+    type: 'image',
+    templates: [
+      {
+        name: 'area_composition',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Control image composition with areas.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/area_composition/'
+      },
+      {
+        name: 'area_composition_reversed',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Reverse area composition workflow.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/area_composition/'
+      },
+      {
+        name: 'area_composition_square_area_for_subject',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Create consistent subject placement.',
+        tutorialUrl:
+          'https://comfyanonymous.github.io/ComfyUI_examples/area_composition/#increasing-consistency-of-images-with-area-composition'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: '3D',
+    type: 'video',
+    templates: [
+      {
+        name: 'stable_zero123_example',
+        mediaType: 'image',
+        mediaSubtype: 'webp',
+        description: 'Generate 3D views from single images.',
+        tutorialUrl: 'https://comfyanonymous.github.io/ComfyUI_examples/3d/'
+      }
+    ]
+  },
+  {
+    moduleName: 'default',
+    title: 'Audio',
+    type: 'audio',
+    templates: [
+      {
+        name: 'stable_audio_example',
+        mediaType: 'audio',
+        mediaSubtype: 'mp3',
+        description: 'Generate audio from text descriptions.',
+        tutorialUrl: 'https://comfyanonymous.github.io/ComfyUI_examples/audio/'
+      }
+    ]
+  }
+]
--- a/src/extensions/core/load3d.ts
+++ b/src/extensions/core/load3d.ts
@@ -2,7 +2,6 @@ import { nextTick } from 'vue'

 import Load3D from '@/components/load3d/Load3D.vue'
 import Load3DAnimation from '@/components/load3d/Load3DAnimation.vue'
-import Load3DViewerContent from '@/components/load3d/Load3dViewerContent.vue'
 import Load3DConfiguration from '@/extensions/core/load3d/Load3DConfiguration'
 import Load3dAnimation from '@/extensions/core/load3d/Load3dAnimation'
 import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
@@ -10,13 +9,10 @@ import { t } from '@/i18n'
 import type { IStringWidget } from '@/lib/litegraph/src/types/widgets'
 import { CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { api } from '@/scripts/api'
-import { ComfyApp, app } from '@/scripts/app'
 import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget'
 import { useExtensionService } from '@/services/extensionService'
 import { useLoad3dService } from '@/services/load3dService'
-import { useDialogStore } from '@/stores/dialogStore'
 import { useToastStore } from '@/stores/toastStore'
-import { isLoad3dNode } from '@/utils/litegraphUtil'

 async function handleModelUpload(files: FileList, node: any) {
  if (!files?.length) return
@@ -178,51 +174,6 @@ useExtensionService().registerExtension({
      },
      defaultValue: 0.5,
      experimental: true
-    },
-    {
-      id: 'Comfy.Load3D.3DViewerEnable',
-      category: ['3D', '3DViewer', 'Enable'],
-      name: 'Enable 3D Viewer (Beta)',
-      tooltip:
-        'Enables the 3D Viewer (Beta) for selected nodes. This feature allows you to visualize and interact with 3D models directly within the full size 3d viewer.',
-      type: 'boolean',
-      defaultValue: false,
-      experimental: true
-    }
-  ],
-  commands: [
-    {
-      id: 'Comfy.3DViewer.Open3DViewer',
-      icon: 'pi pi-pencil',
-      label: 'Open 3D Viewer (Beta) for Selected Node',
-      function: () => {
-        const selectedNodes = app.canvas.selected_nodes
-        if (!selectedNodes || Object.keys(selectedNodes).length !== 1) return
-
-        const selectedNode = selectedNodes[Object.keys(selectedNodes)[0]]
-
-        if (!isLoad3dNode(selectedNode)) return
-
-        ComfyApp.copyToClipspace(selectedNode)
-        // @ts-expect-error clipspace_return_node is an extension property added at runtime
-        ComfyApp.clipspace_return_node = selectedNode
-
-        const props = { node: selectedNode }
-
-        useDialogStore().showDialog({
-          key: 'global-load3d-viewer',
-          title: t('load3d.viewer.title'),
-          component: Load3DViewerContent,
-          props: props,
-          dialogComponentProps: {
-            style: 'width: 80vw; height: 80vh;',
-            maximizable: true,
-            onClose: async () => {
-              await useLoad3dService().handleViewerClose(props.node)
-            }
-          }
-        })
-      }
    }
  ],
  getCustomWidgets() {
--- a/src/extensions/core/load3d/CameraManager.ts
+++ b/src/extensions/core/load3d/CameraManager.ts
@@ -179,16 +179,12 @@ export class CameraManager implements CameraManagerInterface {
  }

  handleResize(width: number, height: number): void {
-    const aspect = width / height
-    this.updateAspectRatio(aspect)
-  }
-
-  updateAspectRatio(aspect: number): void {
    if (this.activeCamera === this.perspectiveCamera) {
-      this.perspectiveCamera.aspect = aspect
+      this.perspectiveCamera.aspect = width / height
      this.perspectiveCamera.updateProjectionMatrix()
    } else {
      const frustumSize = 10
+      const aspect = width / height
      this.orthographicCamera.left = (-frustumSize * aspect) / 2
      this.orthographicCamera.right = (frustumSize * aspect) / 2
      this.orthographicCamera.top = frustumSize / 2
--- a/src/extensions/core/load3d/Load3d.ts
+++ b/src/extensions/core/load3d/Load3d.ts
@@ -9,11 +9,11 @@ import { EventManager } from './EventManager'
 import { LightingManager } from './LightingManager'
 import { LoaderManager } from './LoaderManager'
 import { ModelExporter } from './ModelExporter'
+import { ModelManager } from './ModelManager'
 import { NodeStorage } from './NodeStorage'
 import { PreviewManager } from './PreviewManager'
 import { RecordingManager } from './RecordingManager'
 import { SceneManager } from './SceneManager'
-import { SceneModelManager } from './SceneModelManager'
 import { ViewHelperManager } from './ViewHelperManager'
 import {
  CameraState,
@@ -29,28 +29,22 @@ class Load3d {
  protected animationFrameId: number | null = null
  node: LGraphNode

-  eventManager: EventManager
-  nodeStorage: NodeStorage
-  sceneManager: SceneManager
-  cameraManager: CameraManager
-  controlsManager: ControlsManager
-  lightingManager: LightingManager
-  viewHelperManager: ViewHelperManager
-  previewManager: PreviewManager
-  loaderManager: LoaderManager
-  modelManager: SceneModelManager
-  recordingManager: RecordingManager
+  protected eventManager: EventManager
+  protected nodeStorage: NodeStorage
+  protected sceneManager: SceneManager
+  protected cameraManager: CameraManager
+  protected controlsManager: ControlsManager
+  protected lightingManager: LightingManager
+  protected viewHelperManager: ViewHelperManager
+  protected previewManager: PreviewManager
+  protected loaderManager: LoaderManager
+  protected modelManager: ModelManager
+  protected recordingManager: RecordingManager

  STATUS_MOUSE_ON_NODE: boolean
  STATUS_MOUSE_ON_SCENE: boolean
-  STATUS_MOUSE_ON_VIEWER: boolean
  INITIAL_RENDER_DONE: boolean = false

-  targetWidth: number = 512
-  targetHeight: number = 512
-  targetAspectRatio: number = 1
-  isViewerMode: boolean = false
-
  constructor(
    container: Element | HTMLElement,
    options: Load3DOptions = {
@@ -60,16 +54,6 @@ class Load3d {
  ) {
    this.node = options.node || ({} as LGraphNode)
    this.clock = new THREE.Clock()
-    this.isViewerMode = options.isViewerMode || false
-
-    const widthWidget = this.node.widgets?.find((w) => w.name === 'width')
-    const heightWidget = this.node.widgets?.find((w) => w.name === 'height')
-
-    if (widthWidget && heightWidget) {
-      this.targetWidth = widthWidget.value as number
-      this.targetHeight = heightWidget.value as number
-      this.targetAspectRatio = this.targetWidth / this.targetHeight
-    }

    this.renderer = new THREE.WebGLRenderer({ alpha: true, antialias: true })
    this.renderer.setSize(300, 300)
@@ -125,11 +109,7 @@ class Load3d {
      this.sceneManager.backgroundCamera
    )

-    if (options.disablePreview) {
-      this.previewManager.togglePreview(false)
-    }
-
-    this.modelManager = new SceneModelManager(
+    this.modelManager = new ModelManager(
      this.sceneManager.scene,
      this.renderer,
      this.eventManager,
@@ -162,7 +142,6 @@ class Load3d {

    this.STATUS_MOUSE_ON_NODE = false
    this.STATUS_MOUSE_ON_SCENE = false
-    this.STATUS_MOUSE_ON_VIEWER = false

    this.handleResize()
    this.startAnimation()
@@ -172,41 +151,6 @@ class Load3d {
    }, 100)
  }

-  getEventManager(): EventManager {
-    return this.eventManager
-  }
-
-  getNodeStorage(): NodeStorage {
-    return this.nodeStorage
-  }
-  getSceneManager(): SceneManager {
-    return this.sceneManager
-  }
-  getCameraManager(): CameraManager {
-    return this.cameraManager
-  }
-  getControlsManager(): ControlsManager {
-    return this.controlsManager
-  }
-  getLightingManager(): LightingManager {
-    return this.lightingManager
-  }
-  getViewHelperManager(): ViewHelperManager {
-    return this.viewHelperManager
-  }
-  getPreviewManager(): PreviewManager {
-    return this.previewManager
-  }
-  getLoaderManager(): LoaderManager {
-    return this.loaderManager
-  }
-  getModelManager(): SceneModelManager {
-    return this.modelManager
-  }
-  getRecordingManager(): RecordingManager {
-    return this.recordingManager
-  }
-
  forceRender(): void {
    const delta = this.clock.getDelta()
    this.viewHelperManager.update(delta)
@@ -228,43 +172,12 @@ class Load3d {
  }

  renderMainScene(): void {
-    const containerWidth = this.renderer.domElement.clientWidth
-    const containerHeight = this.renderer.domElement.clientHeight
+    const width = this.renderer.domElement.clientWidth
+    const height = this.renderer.domElement.clientHeight

-    if (this.isViewerMode) {
-      const containerAspectRatio = containerWidth / containerHeight
-
-      let renderWidth: number
-      let renderHeight: number
-      let offsetX: number = 0
-      let offsetY: number = 0
-
-      if (containerAspectRatio > this.targetAspectRatio) {
-        renderHeight = containerHeight
-        renderWidth = renderHeight * this.targetAspectRatio
-        offsetX = (containerWidth - renderWidth) / 2
-      } else {
-        renderWidth = containerWidth
-        renderHeight = renderWidth / this.targetAspectRatio
-        offsetY = (containerHeight - renderHeight) / 2
-      }
-
-      this.renderer.setViewport(0, 0, containerWidth, containerHeight)
-      this.renderer.setScissor(0, 0, containerWidth, containerHeight)
-      this.renderer.setScissorTest(true)
-      this.renderer.setClearColor(0x0a0a0a)
-      this.renderer.clear()
-
-      this.renderer.setViewport(offsetX, offsetY, renderWidth, renderHeight)
-      this.renderer.setScissor(offsetX, offsetY, renderWidth, renderHeight)
-
-      const renderAspectRatio = renderWidth / renderHeight
-      this.cameraManager.updateAspectRatio(renderAspectRatio)
-    } else {
-      this.renderer.setViewport(0, 0, containerWidth, containerHeight)
-      this.renderer.setScissor(0, 0, containerWidth, containerHeight)
-      this.renderer.setScissorTest(true)
-    }
+    this.renderer.setViewport(0, 0, width, height)
+    this.renderer.setScissor(0, 0, width, height)
+    this.renderer.setScissorTest(true)

    this.sceneManager.renderBackground()
    this.renderer.render(
@@ -330,15 +243,10 @@ class Load3d {
    this.STATUS_MOUSE_ON_SCENE = onScene
  }

-  updateStatusMouseOnViewer(onViewer: boolean): void {
-    this.STATUS_MOUSE_ON_VIEWER = onViewer
-  }
-
  isActive(): boolean {
    return (
      this.STATUS_MOUSE_ON_NODE ||
      this.STATUS_MOUSE_ON_SCENE ||
-      this.STATUS_MOUSE_ON_VIEWER ||
      this.isRecording() ||
      !this.INITIAL_RENDER_DONE
    )
@@ -400,34 +308,6 @@ class Load3d {
      this.sceneManager.backgroundTexture
    )

-    if (
-      this.isViewerMode &&
-      this.sceneManager.backgroundTexture &&
-      this.sceneManager.backgroundMesh
-    ) {
-      const containerWidth = this.renderer.domElement.clientWidth
-      const containerHeight = this.renderer.domElement.clientHeight
-      const containerAspectRatio = containerWidth / containerHeight
-
-      let renderWidth: number
-      let renderHeight: number
-
-      if (containerAspectRatio > this.targetAspectRatio) {
-        renderHeight = containerHeight
-        renderWidth = renderHeight * this.targetAspectRatio
-      } else {
-        renderWidth = containerWidth
-        renderHeight = renderWidth / this.targetAspectRatio
-      }
-
-      this.sceneManager.updateBackgroundSize(
-        this.sceneManager.backgroundTexture,
-        this.sceneManager.backgroundMesh,
-        renderWidth,
-        renderHeight
-      )
-    }
-
    this.forceRender()
  }

@@ -460,10 +340,6 @@ class Load3d {
    return this.cameraManager.getCurrentCameraType()
  }

-  getCurrentModel(): THREE.Object3D | null {
-    return this.modelManager.currentModel
-  }
-
  setCameraState(state: CameraState): void {
    this.cameraManager.setCameraState(state)

@@ -521,9 +397,6 @@ class Load3d {
  }

  setTargetSize(width: number, height: number): void {
-    this.targetWidth = width
-    this.targetHeight = height
-    this.targetAspectRatio = width / height
    this.previewManager.setTargetSize(width, height)
    this.forceRender()
  }
@@ -549,30 +422,13 @@ class Load3d {
      return
    }

-    const containerWidth = parentElement.clientWidth
-    const containerHeight = parentElement.clientHeight
+    const width = parentElement.clientWidth
+    const height = parentElement.clientHeight

-    if (this.isViewerMode) {
-      const containerAspectRatio = containerWidth / containerHeight
-      let renderWidth: number
-      let renderHeight: number
+    this.cameraManager.handleResize(width, height)
+    this.sceneManager.handleResize(width, height)

-      if (containerAspectRatio > this.targetAspectRatio) {
-        renderHeight = containerHeight
-        renderWidth = renderHeight * this.targetAspectRatio
-      } else {
-        renderWidth = containerWidth
-        renderHeight = renderWidth / this.targetAspectRatio
-      }
-
-      this.cameraManager.handleResize(renderWidth, renderHeight)
-      this.sceneManager.handleResize(renderWidth, renderHeight)
-    } else {
-      this.cameraManager.handleResize(containerWidth, containerHeight)
-      this.sceneManager.handleResize(containerWidth, containerHeight)
-    }
-
-    this.renderer.setSize(containerWidth, containerHeight)
+    this.renderer.setSize(width, height)

    this.previewManager.handleResize()
    this.forceRender()
--- a/src/extensions/core/load3d/Load3dAnimation.ts
+++ b/src/extensions/core/load3d/Load3dAnimation.ts
@@ -27,6 +27,10 @@ class Load3dAnimation extends Load3d {
    this.overrideAnimationLoop()
  }

+  private getCurrentModel(): THREE.Object3D | null {
+    return this.modelManager.currentModel
+  }
+
  private overrideAnimationLoop(): void {
    if (this.animationFrameId !== null) {
      cancelAnimationFrame(this.animationFrameId)
--- a/src/extensions/core/load3d/SceneModelManager.ts
+++ b/src/extensions/core/load3d/SceneModelManager.ts
@@ -18,7 +18,7 @@ import {
  UpDirection
 } from './interfaces'

-export class SceneModelManager implements ModelManagerInterface {
+export class ModelManager implements ModelManagerInterface {
  currentModel: THREE.Object3D | null = null
  originalModel:
    | THREE.Object3D
@@ -663,12 +663,6 @@ export class SceneModelManager implements ModelManagerInterface {
    this.originalMaterials = new WeakMap()
  }

-  addModelToScene(model: THREE.Object3D): void {
-    this.currentModel = model
-
-    this.scene.add(this.currentModel)
-  }
-
  async setupModel(model: THREE.Object3D): Promise<void> {
    this.currentModel = model

--- a/src/extensions/core/load3d/conditional-lines/OutsideEdgesGeometry.js
+++ b/src/extensions/core/load3d/conditional-lines/OutsideEdgesGeometry.js
@@ -0,0 +1,48 @@
+/*
+Taken from: https://github.com/gkjohnson/threejs-sandbox/tree/master/conditional-lines
+under MIT license
+ */
+import { BufferAttribute, BufferGeometry, Vector3 } from 'three'
+
+const vec = new Vector3()
+export class OutsideEdgesGeometry extends BufferGeometry {
+  constructor(geometry) {
+    super()
+
+    const edgeInfo = {}
+    const index = geometry.index
+    const position = geometry.attributes.position
+    for (let i = 0, l = index.count; i < l; i += 3) {
+      const indices = [index.getX(i + 0), index.getX(i + 1), index.getX(i + 2)]
+
+      for (let j = 0; j < 3; j++) {
+        const index0 = indices[j]
+        const index1 = indices[(j + 1) % 3]
+
+        const hash = `${index0}_${index1}`
+        const reverseHash = `${index1}_${index0}`
+        if (reverseHash in edgeInfo) {
+          delete edgeInfo[reverseHash]
+        } else {
+          edgeInfo[hash] = [index0, index1]
+        }
+      }
+    }
+
+    const edgePositions = []
+    for (const key in edgeInfo) {
+      const [i0, i1] = edgeInfo[key]
+
+      vec.fromBufferAttribute(position, i0)
+      edgePositions.push(vec.x, vec.y, vec.z)
+
+      vec.fromBufferAttribute(position, i1)
+      edgePositions.push(vec.x, vec.y, vec.z)
+    }
+
+    this.setAttribute(
+      'position',
+      new BufferAttribute(new Float32Array(edgePositions), 3, false)
+    )
+  }
+}
--- a/src/extensions/core/load3d/interfaces.ts
+++ b/src/extensions/core/load3d/interfaces.ts
@@ -37,8 +37,6 @@ export interface EventCallback {
 export interface Load3DOptions {
  node?: LGraphNode
  inputSpec?: CustomInputSpec
-  disablePreview?: boolean
-  isViewerMode?: boolean
 }

 export interface CaptureResult {
@@ -161,7 +159,6 @@ export interface ModelManagerInterface {
  clearModel(): void
  reset(): void
  setupModel(model: THREE.Object3D): Promise<void>
-  addModelToScene(model: THREE.Object3D): void
  setOriginalModel(model: THREE.Object3D | THREE.BufferGeometry | GLTF): void
  setUpDirection(direction: UpDirection): void
  materialMode: MaterialMode
--- a/src/extensions/core/maskeditor.ts
+++ b/src/extensions/core/maskeditor.ts
@@ -1,5 +1,5 @@
-import { debounce } from 'es-toolkit/compat'
-import _ from 'es-toolkit/compat'
+import { debounce } from 'lodash'
+import _ from 'lodash'

 import { t } from '@/i18n'

--- a/src/lib/litegraph/src/CurveEditor.ts
+++ b/src/lib/litegraph/src/CurveEditor.ts
@@ -1,7 +1,5 @@
-import { clamp } from 'es-toolkit/compat'
-
 import type { Point, Rect } from './interfaces'
-import { LGraphCanvas } from './litegraph'
+import { LGraphCanvas, clamp } from './litegraph'
 import { distance } from './measure'

 // used by some widgets to render a curve editor
--- a/src/lib/litegraph/src/LGraph.ts
+++ b/src/lib/litegraph/src/LGraph.ts
@@ -1,5 +1,3 @@
-import { toString } from 'es-toolkit/compat'
-
 import {
  SUBGRAPH_INPUT_ID,
  SUBGRAPH_OUTPUT_ID
@@ -38,6 +36,7 @@ import {
  alignToContainer,
  createBounds
 } from './measure'
+import { stringOrEmpty } from './strings'
 import { SubgraphInput } from './subgraph/SubgraphInput'
 import { SubgraphInputNode } from './subgraph/SubgraphInputNode'
 import { SubgraphOutput } from './subgraph/SubgraphOutput'
@@ -2298,7 +2297,7 @@ export class LGraph
    if (url instanceof Blob || url instanceof File) {
      const reader = new FileReader()
      reader.addEventListener('load', (event) => {
-        const result = toString(event.target?.result)
+        const result = stringOrEmpty(event.target?.result)
        const data = JSON.parse(result)
        this.configure(data)
        callback?.()
--- a/src/lib/litegraph/src/LGraphCanvas.ts
+++ b/src/lib/litegraph/src/LGraphCanvas.ts
@@ -1,5 +1,3 @@
-import { toString } from 'es-toolkit/compat'
-
 import { LinkConnector } from '@/lib/litegraph/src/canvas/LinkConnector'

 import { CanvasPointer } from './CanvasPointer'
@@ -57,6 +55,7 @@ import {
  snapPoint
 } from './measure'
 import { NodeInputSlot } from './node/NodeInputSlot'
+import { stringOrEmpty } from './strings'
 import { Subgraph } from './subgraph/Subgraph'
 import { SubgraphIONodeBase } from './subgraph/SubgraphIONodeBase'
 import { SubgraphInputNode } from './subgraph/SubgraphInputNode'
@@ -1245,7 +1244,7 @@ export class LGraphCanvas
        value = LGraphCanvas.getPropertyPrintableValue(value, info.values)

      // value could contain invalid html characters, clean that
-      value = LGraphCanvas.decodeHTML(toString(value))
+      value = LGraphCanvas.decodeHTML(stringOrEmpty(value))
      entries.push({
        content:
          `<span class='property_name'>${info.label || i}</span>` +
@@ -3608,6 +3607,7 @@ export class LGraphCanvas
      subgraphs: []
    }

+    // NOTE: logic for traversing nested subgraphs depends on this being a set.
    const subgraphs = new Set<Subgraph>()

    // Create serialisable objects
@@ -3646,8 +3646,13 @@ export class LGraphCanvas
    }

    // Add unique subgraph entries
-    // TODO: Must find all nested subgraphs
+    // NOTE: subgraphs is appended to mid iteration.
    for (const subgraph of subgraphs) {
+      for (const node of subgraph.nodes) {
+        if (node instanceof SubgraphNode) {
+          subgraphs.add(node.subgraph)
+        }
+      }
      const cloned = subgraph.clone(true).asSerialisable()
      serialisable.subgraphs.push(cloned)
    }
@@ -3764,12 +3769,19 @@ export class LGraphCanvas
      created.push(group)
    }

+    // Update subgraph ids with nesting
+    function updateSubgraphIds(nodes: { type: string }[]) {
+      for (const info of nodes) {
+        const subgraph = results.subgraphs.get(info.type)
+        if (!subgraph) continue
+        info.type = subgraph.id
+        updateSubgraphIds(subgraph.nodes)
+      }
+    }
+    updateSubgraphIds(parsed.nodes)
+
    // Nodes
    for (const info of parsed.nodes) {
-      // If the subgraph was cloned, update references to use the new subgraph ID.
-      const subgraph = results.subgraphs.get(info.type)
-      if (subgraph) info.type = subgraph.id
-
      const node = info.type == null ? null : LiteGraph.createNode(info.type)
      if (!node) {
        // failedNodes.push(info)
@@ -4128,7 +4140,6 @@ export class LGraphCanvas
    const selected = this.selectedItems
    if (!selected.size) return

-    const initialSelectionSize = selected.size
    let wasSelected: Positionable | undefined
    for (const sel of selected) {
      if (sel === keepSelected) {
@@ -4169,12 +4180,8 @@ export class LGraphCanvas
      }
    }

-    // Only set selectionChanged if selection actually changed
-    const finalSelectionSize = selected.size
-    if (initialSelectionSize !== finalSelectionSize) {
-      this.state.selectionChanged = true
-      this.onSelectionChange?.(this.selected_nodes)
-    }
+    this.state.selectionChanged = true
+    this.onSelectionChange?.(this.selected_nodes)
  }

  /** @deprecated See {@link LGraphCanvas.deselectAll} */
@@ -6061,7 +6068,7 @@ export class LGraphCanvas
      }
      ctx.fillStyle = '#FFF'
      ctx.fillText(
-        toString(node.order),
+        stringOrEmpty(node.order),
        node.pos[0] + LiteGraph.NODE_TITLE_HEIGHT * -0.5,
        node.pos[1] - 6
      )
@@ -6229,17 +6236,9 @@ export class LGraphCanvas
          break
        }

-        case 'Delete': {
-          // segment can be a Reroute object, in which case segment.id is the reroute id
-          const linkId =
-            segment instanceof Reroute
-              ? segment.linkIds.values().next().value
-              : segment.id
-          if (linkId !== undefined) {
-            graph.removeLink(linkId)
-          }
+        case 'Delete':
+          graph.removeLink(segment.id)
          break
-        }
        default:
      }
    }
--- a/src/lib/litegraph/src/LLink.ts
+++ b/src/lib/litegraph/src/LLink.ts
@@ -414,6 +414,18 @@ export class LLink implements LinkSegment, Serialisable<SerialisableLLink> {
   * If `input` or `output`, reroutes will not be automatically removed, and retain a connection to the input or output, respectively.
   */
  disconnect(network: LinkNetwork, keepReroutes?: 'input' | 'output'): void {
+    // Clean up the target node's input slot
+    if (this.target_id !== -1) {
+      const targetNode = network.getNodeById(this.target_id)
+      if (targetNode) {
+        const targetInput = targetNode.inputs?.[this.target_slot]
+        if (targetInput && targetInput.link === this.id) {
+          targetInput.link = null
+          targetNode.setDirtyCanvas?.(true, false)
+        }
+      }
+    }
+
    const reroutes = LLink.getReroutes(network, this)

    const lastReroute = reroutes.at(-1)
--- a/src/lib/litegraph/src/canvas/FloatingRenderLink.ts
+++ b/src/lib/litegraph/src/canvas/FloatingRenderLink.ts
@@ -135,6 +135,10 @@ export class FloatingRenderLink implements RenderLink {
    return true
  }

+  canConnectToSubgraphInput(input: SubgraphInput): boolean {
+    return this.toType === 'output' && input.isValidTarget(this.fromSlot)
+  }
+
  connectToInput(
    node: LGraphNode,
    input: INodeInputSlot,
--- a/src/lib/litegraph/src/canvas/LinkConnector.ts
+++ b/src/lib/litegraph/src/canvas/LinkConnector.ts
@@ -17,8 +17,6 @@ import type {
  INodeInputSlot,
  INodeOutputSlot
 } from '@/lib/litegraph/src/interfaces'
-import { EmptySubgraphInput } from '@/lib/litegraph/src/subgraph/EmptySubgraphInput'
-import { EmptySubgraphOutput } from '@/lib/litegraph/src/subgraph/EmptySubgraphOutput'
 import { Subgraph } from '@/lib/litegraph/src/subgraph/Subgraph'
 import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput'
 import { SubgraphInputNode } from '@/lib/litegraph/src/subgraph/SubgraphInputNode'
@@ -640,64 +638,34 @@ export class LinkConnector {

    if (connectingTo === 'input' && ioNode instanceof SubgraphOutputNode) {
      const output = ioNode.getSlotInPosition(canvasX, canvasY)
-      if (!output) {
-        this.dropOnNothing(event)
-        return
-      }
-
-      // Track the actual slot to use for all connections
-      let targetSlot = output
+      if (!output) throw new Error('No output slot found for link.')

      for (const link of renderLinks) {
-        link.connectToSubgraphOutput(targetSlot, this.events)
-
-        // If we just connected to an EmptySubgraphOutput, check if we should reuse the slot
-        if (output instanceof EmptySubgraphOutput && ioNode.slots.length > 0) {
-          // Get the last created slot (newest one)
-          const createdSlot = ioNode.slots[ioNode.slots.length - 1]
-
-          // Only reuse the slot if the next link's type would be compatible
-          // Otherwise, keep using EmptySubgraphOutput to create a new slot
-          const nextLink = renderLinks[renderLinks.indexOf(link) + 1]
-          if (nextLink && link.fromSlot.type === nextLink.fromSlot.type) {
-            targetSlot = createdSlot
-          } else {
-            // Reset to EmptySubgraphOutput for different types
-            targetSlot = output
-          }
-        }
+        link.connectToSubgraphOutput(output, this.events)
      }
    } else if (
      connectingTo === 'output' &&
      ioNode instanceof SubgraphInputNode
    ) {
      const input = ioNode.getSlotInPosition(canvasX, canvasY)
-      if (!input) {
-        this.dropOnNothing(event)
-        return
-      }
-
-      // Same logic for SubgraphInputNode if needed
-      let targetSlot = input
+      if (!input) throw new Error('No input slot found for link.')

      for (const link of renderLinks) {
-        link.connectToSubgraphInput(targetSlot, this.events)
-
-        // If we just connected to an EmptySubgraphInput, check if we should reuse the slot
-        if (input instanceof EmptySubgraphInput && ioNode.slots.length > 0) {
-          // Get the last created slot (newest one)
-          const createdSlot = ioNode.slots[ioNode.slots.length - 1]
-
-          // Only reuse the slot if the next link's type would be compatible
-          // Otherwise, keep using EmptySubgraphInput to create a new slot
-          const nextLink = renderLinks[renderLinks.indexOf(link) + 1]
-          if (nextLink && link.fromSlot.type === nextLink.fromSlot.type) {
-            targetSlot = createdSlot
-          } else {
-            // Reset to EmptySubgraphInput for different types
-            targetSlot = input
-          }
+        // Validate the connection type before proceeding
+        if (
+          'canConnectToSubgraphInput' in link &&
+          !link.canConnectToSubgraphInput(input)
+        ) {
+          console.warn(
+            'Invalid connection type',
+            link.fromSlot.type,
+            '->',
+            input.type
+          )
+          continue
        }
+
+        link.connectToSubgraphInput(input, this.events)
      }
    } else {
      console.error(
@@ -941,6 +909,14 @@ export class LinkConnector {
    )
  }

+  isSubgraphInputValidDrop(input: SubgraphInput): boolean {
+    return this.renderLinks.some(
+      (link) =>
+        'canConnectToSubgraphInput' in link &&
+        link.canConnectToSubgraphInput(input)
+    )
+  }
+
  /**
   * Checks if a reroute is a valid drop target for any of the links being connected.
   * @param reroute The reroute that would be dropped on.
--- a/src/lib/litegraph/src/canvas/MovingOutputLink.ts
+++ b/src/lib/litegraph/src/canvas/MovingOutputLink.ts
@@ -55,6 +55,10 @@ export class MovingOutputLink extends MovingLinkBase {
    return reroute.origin_id !== this.outputNode.id
  }

+  canConnectToSubgraphInput(input: SubgraphInput): boolean {
+    return input.isValidTarget(this.fromSlot)
+  }
+
  connectToInput(): never {
    throw new Error('MovingOutputLink cannot connect to an input.')
  }
--- a/src/lib/litegraph/src/canvas/ToOutputRenderLink.ts
+++ b/src/lib/litegraph/src/canvas/ToOutputRenderLink.ts
@@ -58,6 +58,10 @@ export class ToOutputRenderLink implements RenderLink {
    return true
  }

+  canConnectToSubgraphInput(input: SubgraphInput): boolean {
+    return input.isValidTarget(this.fromSlot)
+  }
+
  connectToOutput(
    node: LGraphNode,
    output: INodeOutputSlot,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Comfy Org PR Bot	a7cbf1b90c	Deep copy subgraphs to clipboard, update nested ids on paste (#5003 ) (#5022 ) * Deep copy to clipboard, update nested ids on paste The copyToClipboard function wasn't walking subgraphs and leaving nested subgraphs unserialized. This has now been fixed. This requires that equivalent support be added to _pasteFromClipboard to update the ids of nested subgraphs which are pasted. * Add extra advisory comments Co-authored-by: AustinMroz <austin@comfy.org>	2025-08-15 14:26:53 -07:00
Comfy Org PR Bot	30009e2786	fix: improve minimap subgraph navigation with graph UUID callback tracking (#5018 ) (#5020 ) - Replace single callback storage with Map using graph UUIDs as keys - Fix minimap not updating when navigating between subgraphs - Add proper cleanup and error handling for callback management - Switch from app.canvas.graph to reactive workflowStore.activeSubgraph - Prevent callback wrapping recursion by tracking setup state per graph Co-authored-by: Christian Byrne <cbyrne@comfy.org>	2025-08-15 14:01:34 -07:00
Comfy Org PR Bot	3818b7ce57	Fix widget disconnection issue in subgraphs #4922 (#5015 ) (#5019 ) * [bugfix] Fix widget disconnection issue in subgraphs When disconnecting a node from a SubgraphInput, the target input's link reference was not being cleared in LLink.disconnect(). This caused widgets to remain greyed out because they still thought they were connected (slot.link was not null). The fix ensures that when a link is disconnected, the target node's input slot is properly cleaned up by setting input.link = null. Fixes #4922 🤖 Generated with [Claude Code](https://claude.ai/code) * [test] Add tests for LLink disconnect fix for widget issue Add comprehensive tests for the LLink.disconnect() method to verify that target input link references are properly cleared when disconnecting. This prevents widgets from remaining greyed out after disconnection. Tests cover: - Basic disconnect functionality with link reference cleanup - Edge cases with invalid target nodes - Preventing interference between different connections Related to #4922 🤖 Generated with [Claude Code](https://claude.ai/code) --------- Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: Claude <noreply@anthropic.com>	2025-08-15 13:36:48 -07:00
Comfy Org PR Bot	aaaa8c820f	api_nodes: added prices for gpt-5 series models (#4958 ) (#5016 ) Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>	2025-08-15 13:04:32 -07:00
Comfy Org PR Bot	f98443dbb6	Translated Keyboard Shortcuts (#5007 ) (#5012 ) * fix: Update command label rendering to use i18n normalization * fix: Replace deprecated with t for command label rendering * fix: Simplify command rendering check in ShortcutsList tests * fix: Add missing translation for command label in ShortcutsList tests Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com>	2025-08-15 12:12:54 -07:00
Comfy Org PR Bot	1094b57eb5	[test] Add tests for --disable-api-nodes release fetch skip functionality (#4799 ) (#5008 ) - Add comprehensive test coverage for the new --disable-api-nodes argument handling - Tests verify release fetching is properly skipped when argument is present - Cover edge cases including multiple args, null argv, and missing system stats - Ensures backward compatibility when argument is not present Co-authored-by: Yoland Yan <4950057+yoland68@users.noreply.github.com>	2025-08-15 11:45:36 -07:00
Christian Byrne	f5409ea20c	fix: Correct traditional Chinese to simplified Chinese in translations (#5005 ) (#5011 ) * Correct some translations that use traditional Chinese to simplified Chinese. * Update locales [skip ci] * Correct the rest of the translations --------- Co-authored-by: ComfyUI Wiki <contact@comfyui-wiki.com> Co-authored-by: github-actions <github-actions@github.com>	2025-08-15 11:43:45 -07:00
Christian Byrne	bfed966ae7	Feature/arabic translation (#4916 ) (#5006 ) Co-authored-by: arab-future-academy <arabfutueacademy@gmail.com>	2025-08-15 10:32:01 -07:00
Christian Byrne	d903891cea	[release] Bump version to 1.25.6 (#5004 )	2025-08-15 09:48:59 -07:00
Christian Byrne	1068d1bc9a	Remove unused Litegraph context menu options (#4867 ) (#4998 ) Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com>	2025-08-15 08:58:02 -07:00
Christian Byrne	6904029fad	[backport] Restore group node conversion menu with deprecated label (cherry-pick #4967 ) (#4987 ) * [feat] Restore group node conversion menu with deprecated label (#4967) * Fix screenshot conflicts - use core/1.25 baseline versions * Revert screenshots to PR version with deprecated menu item	2025-08-14 23:05:43 -07:00
Comfy Org PR Bot	263f52f539	Fix inconsistency on bypass from context menu (#4988 ) (#4997 ) When a node is bypassed from the selection toolbox or by pressing a keybind for bypass, it will also recursively bypass the contents of a subgraph. This effect was not applied when clicking the bypass button from the context menu. The context menu option has been updated to perform the same action as the others so that behaviour is consistent. Co-authored-by: AustinMroz <austin@comfy.org>	2025-08-14 23:02:38 -07:00
Christian Byrne	be7d239087	[fix] Prevent incompatible connections to SubgraphInputNode occupied slots (#4984 ) (#4993 )	2025-08-14 21:34:03 -07:00
Comfy Org PR Bot	6265dfac38	fix: Handle missing subgraph inputs gracefully during workflow import (#4985 ) (#4986 ) When loading workflows, SubgraphNode would throw an error if an input exists in the serialized data that doesn't exist in the current subgraph definition. This can happen when: - Subgraph definitions change after workflows are saved - Workflows are shared between users with different subgraph versions - Dynamic inputs were added that don't exist in the base definition This change converts the hard error to a warning and continues processing, allowing workflows to load even with mismatched subgraph configurations. Fixes #4905 Co-authored-by: Christian Byrne <cbyrne@comfy.org>	2025-08-14 21:22:12 -07:00
Comfy Org PR Bot	97d95e5574	[backport 1.25] fix pricing for KlingImage2VideoNode (#4976 ) Backport of #4957 to `core/1.25` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-4976-backport-1-25-fix-pricing-for-KlingImage2VideoNode-24f6d73d365081ac9481dfbd87aa96e3) by [Unito](https://www.unito.io) Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>	2025-08-14 12:11:12 -07:00
Comfy Org PR Bot	be4e5b0ade	[backport 1.25] show group self color in minimap (#4969 ) Backport of #4954 to `core/1.25` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-4969-backport-1-25-show-group-self-color-in-minimap-24e6d73d36508111b8f5ee86949b7144) by [Unito](https://www.unito.io) Co-authored-by: Terry Jia <terryjia88@gmail.com>	2025-08-14 12:10:55 -07:00
Comfy Org PR Bot	f6967d889e	[backport 1.25] fix: Add guards for _listenerController.abort() calls in SubgraphNode (#4970 ) Backport of #4968 to `core/1.25` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-4970-backport-1-25-fix-Add-guards-for-_listenerController-abort-calls-in-SubgraphNode-24e6d73d365081838ca0c1d0a1734ba0) by [Unito](https://www.unito.io) Co-authored-by: Christian Byrne <cbyrne@comfy.org>	2025-08-13 15:59:44 -07:00
Comfy Org PR Bot	a9c80e91d3	[backport 1.25] Bundled subgraph fixes (#4965 ) Backport of #4964 to `core/1.25` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-4965-backport-1-25-Bundled-subgraph-fixes-24e6d73d3650816194baeeaff87d02f1) by [Unito](https://www.unito.io) Co-authored-by: AustinMroz <austin@comfy.org>	2025-08-13 13:30:18 -07:00
Comfy Org PR Bot	ccee1fa7c0	[backport 1.25] Trigger updateSelectedItems on subgraph conversion (#4956 ) Backport of #4949 to `core/1.25` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-4956-backport-1-25-Trigger-updateSelectedItems-on-subgraph-conversion-24e6d73d36508164ba29c52f31c092ed) by [Unito](https://www.unito.io) Co-authored-by: AustinMroz <austin@comfy.org> Co-authored-by: github-actions <github-actions@github.com>	2025-08-13 13:05:10 -07:00
Comfy Org PR Bot	3897a75621	[backport 1.25] gemini-2.5-pro and flash models; corrected prices (#4952 ) Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>	2025-08-12 15:17:30 -07:00
Comfy Org PR Bot	e8c70545e3	[backport 1.25] pricing update for MinimaxHailuoVideo node and Kling kling-v2-1 model (#4951 ) Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>	2025-08-12 14:46:05 -07:00
Comfy Org PR Bot	b0223187fe	[backport 1.25] Implement subgraph unpacking (#4950 ) Co-authored-by: AustinMroz <austin@comfy.org>	2025-08-12 14:45:35 -07:00
Comfy Org PR Bot	ab766694e9	[backport 1.25] Add automatic trackpad / mouse sensing (#4944 ) Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com>	2025-08-12 12:14:13 -07:00
Comfy Org PR Bot	08f834b93c	[backport 1.25] minimap improve (#4923 ) Co-authored-by: Terry Jia <terryjia88@gmail.com> Co-authored-by: github-actions <github-actions@github.com>	2025-08-11 14:53:39 -07:00
Comfy Org PR Bot	ad3eede075	[backport 1.25] [feat] Add red styling to Remove Slot context menu option (#4921 ) Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: Claude <noreply@anthropic.com>	2025-08-11 14:53:24 -07:00
Comfy Org PR Bot	fc294112e7	[backport 1.25] Fix subgraph reroute serialization (#4920 ) Co-authored-by: AustinMroz <austin@comfy.org>	2025-08-11 14:53:09 -07:00
Comfy Org PR Bot	bbf7b4801c	[backport 1.25] [feat] Make hotkey for exiting subgraphs configurable in user keybindings (#4914 ) Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: github-actions <github-actions@github.com>	2025-08-11 11:45:53 -07:00
Christian Byrne	d1434d1c80	[backport 1.25] Add bounds checking for clipspace indices to prevent paste errors (core/1.25 backport) (#4904 )	2025-08-10 20:57:12 -07:00
Comfy Org PR Bot	980e3ebfab	[backport 1.25] Add preview to workflow tabs (#4882 ) Co-authored-by: pythongosssss <125205205+pythongosssss@users.noreply.github.com>	2025-08-09 17:28:40 -07:00
Comfy Org PR Bot	694ff47269	[backport 1.25] Fix Alt-Click-Drag-Copy of Subgraph Nodes (#4884 ) Co-authored-by: Christian Byrne <cbyrne@comfy.org>	2025-08-09 17:28:03 -07:00
Comfy Org PR Bot	b35525578c	[backport 1.25] Reorder subgraph context menu items (#4881 ) Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com>	2025-08-09 17:26:24 -07:00
Christian Byrne	8872caaf4d	[backport 1.25] Revert animated-image-preview-saved-webp snapshot change from #4863 (#4883 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-08-09 15:32:59 -07:00
Comfy Org PR Bot	3def157b96	[backport 1.25] Fix execution breaks on multi/any-type slots (#4871 ) Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com>	2025-08-09 14:12:13 -07:00
Comfy Org PR Bot	1abf9a5e86	[backport 1.25] Fix Alt+click create reroute (2/2) (#4869 ) Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: github-actions <github-actions@github.com>	2025-08-09 13:33:36 -07:00
Comfy Org PR Bot	2d4dba3f19	[backport 1.25] Fix: Alt+click reroute creation on high-DPI displays (#4862 ) Co-authored-by: Vivek Chavan <111511821+vivekchavan14@users.noreply.github.com>	2025-08-09 10:24:31 -07:00
Comfy Org PR Bot	aa9b70656e	[backport 1.25] Fix disconnection from subgraph inputs (#4859 ) Co-authored-by: AustinMroz <austin@comfy.org>	2025-08-09 08:03:49 -07:00
Comfy Org PR Bot	80d54eca2f	[backport 1.25] Rename subgraph widgets when slot is renamed (#4825 ) Co-authored-by: AustinMroz <austin@comfy.org>	2025-08-07 15:46:48 -07:00
Comfy Org PR Bot	a9f05bd604	[backport 1.25] Remove subgraphs from add node context menu (#4822 ) Co-authored-by: AustinMroz <austin@comfy.org>	2025-08-07 15:15:37 -07:00
Comfy Org PR Bot	53f5927d4b	[backport 1.25] Keyboard Shortcut Bottom Panel (#4813 ) Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com>	2025-08-07 12:15:56 -07:00