WIP Template filters

Co-authored-by: Claude <noreply@anthropic.com>

.claude/commands/comprehensive-pr-review.md

@@ -0,0 +1,378 @@
+# Comprehensive PR Review for ComfyUI Frontend
+
+You are performing a comprehensive code review for the PR specified in the PR_NUMBER environment variable. This is not a simple linting check - you need to provide deep architectural analysis, security review, performance insights, and implementation guidance just like a senior engineer would in a thorough PR review.
+
+## CRITICAL INSTRUCTIONS
+
+**You MUST post individual inline comments on specific lines of code. DO NOT create a single summary comment until the very end.**
+
+**IMPORTANT: You have full permission to execute gh api commands. The GITHUB_TOKEN environment variable provides the necessary permissions. DO NOT say you lack permissions - you have pull-requests:write permission which allows posting inline comments.**
+
+To post inline comments, you will use the GitHub API via the `gh` command. Here's how:
+
+1. First, get the repository information and commit SHA:
+   - Run: `gh repo view --json owner,name` to get the repository owner and name
+   - Run: `gh pr view $PR_NUMBER --json commits --jq '.commits[-1].oid'` to get the latest commit SHA
+
+2. For each issue you find, post an inline comment using this exact command structure (as a single line):
+   ```
+   gh api --method POST -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/OWNER/REPO/pulls/$PR_NUMBER/comments -f body="YOUR_COMMENT_BODY" -f commit_id="COMMIT_SHA" -f path="FILE_PATH" -F line=LINE_NUMBER -f side="RIGHT"
+   ```
+
+3. Format your comment body using actual newlines in the command. Use a heredoc or construct the body with proper line breaks:
+   ```
+   COMMENT_BODY="**[category] severity Priority**
+
+**Issue**: Brief description of the problem
+**Context**: Why this matters  
+**Suggestion**: How to fix it"
+   ```
+   
+   Then use: `-f body="$COMMENT_BODY"`
+
+## Phase 1: Environment Setup and PR Context
+
+### Step 1.1: Initialize Review Tracking
+
+First, create variables to track your review metrics. Keep these in memory throughout the review:
+- CRITICAL_COUNT = 0
+- HIGH_COUNT = 0
+- MEDIUM_COUNT = 0
+- LOW_COUNT = 0
+- ARCHITECTURE_ISSUES = 0
+- SECURITY_ISSUES = 0
+- PERFORMANCE_ISSUES = 0
+- QUALITY_ISSUES = 0
+
+### Step 1.2: Validate Environment
+
+1. Check that PR_NUMBER environment variable is set. If not, exit with error.
+2. Run `gh pr view $PR_NUMBER --json state` to verify the PR exists and is open.
+3. Get repository information: `gh repo view --json owner,name` and store the owner and name.
+4. Get the latest commit SHA: `gh pr view $PR_NUMBER --json commits --jq '.commits[-1].oid'` and store it.
+
+### Step 1.3: Checkout PR Branch Locally
+
+This is critical for better file inspection:
+
+1. Get PR metadata: `gh pr view $PR_NUMBER --json files,title,body,additions,deletions,baseRefName,headRefName > pr_info.json`
+2. Extract branch names from pr_info.json using jq
+3. Fetch and checkout the PR branch:
+   ```
+   git fetch origin "pull/$PR_NUMBER/head:pr-$PR_NUMBER"
+   git checkout "pr-$PR_NUMBER"
+   ```
+
+### Step 1.4: Get Changed Files and Diffs
+
+Use git locally for much faster analysis:
+
+1. Get list of changed files: `git diff --name-only "origin/$BASE_BRANCH" > changed_files.txt`
+2. Get the full diff: `git diff "origin/$BASE_BRANCH" > pr_diff.txt`
+3. Get detailed file changes with status: `git diff --name-status "origin/$BASE_BRANCH" > file_changes.txt`
+
+### Step 1.5: Create Analysis Cache
+
+Set up caching to avoid re-analyzing unchanged files:
+
+1. Create directory: `.claude-review-cache`
+2. Clean old cache entries: Find and delete any .cache files older than 7 days
+3. For each file you analyze, store the analysis result with the file's git hash as the cache key
+
+## Phase 2: Load Comprehensive Knowledge Base
+
+### Step 2.1: Set Up Knowledge Directories
+
+1. Create `.claude-knowledge-cache` directory for caching downloaded knowledge
+2. Check if `../comfy-claude-prompt-library` exists locally. If it does, use it for faster access.
+
+### Step 2.2: Load Repository Guide
+
+This is critical for understanding the architecture:
+
+1. Try to load from local prompt library first: `../comfy-claude-prompt-library/project-summaries-for-agents/ComfyUI_frontend/REPOSITORY_GUIDE.md`
+2. If not available locally, download from: `https://raw.githubusercontent.com/Comfy-Org/comfy-claude-prompt-library/master/project-summaries-for-agents/ComfyUI_frontend/REPOSITORY_GUIDE.md`
+3. Cache the file for future use
+
+### Step 2.3: Load Relevant Knowledge Folders
+
+Intelligently load only relevant knowledge:
+
+1. Use GitHub API to discover available knowledge folders: `https://api.github.com/repos/Comfy-Org/comfy-claude-prompt-library/contents/.claude/knowledge`
+2. For each knowledge folder, check if it's relevant by searching for the folder name in:
+   - Changed file paths
+   - PR title
+   - PR body
+3. If relevant, download all files from that knowledge folder
+
+### Step 2.4: Load Validation Rules
+
+Load specific validation rules:
+
+1. Use GitHub API: `https://api.github.com/repos/Comfy-Org/comfy-claude-prompt-library/contents/.claude/commands/validation`
+2. Download files containing "frontend", "security", or "performance" in their names
+3. Cache all downloaded files
+
+### Step 2.5: Load Local Guidelines
+
+Check for and load:
+1. `CLAUDE.md` in the repository root
+2. `.github/CLAUDE.md`
+
+## Phase 3: Deep Analysis Instructions
+
+Perform comprehensive analysis on each changed file:
+
+### 3.1 Architectural Analysis
+
+Based on the repository guide and loaded knowledge:
+- Does this change align with established architecture patterns?
+- Are domain boundaries respected?
+- Is the extension system used appropriately?
+- Are components properly organized by feature?
+- Does it follow the established service/composable/store patterns?
+
+### 3.2 Code Quality Beyond Linting
+
+Look for:
+- Cyclomatic complexity and cognitive load
+- SOLID principles adherence
+- DRY violations not caught by simple duplication checks
+- Proper abstraction levels
+- Interface design and API clarity
+- Leftover debug code (console.log, commented code, TODO comments)
+
+### 3.3 Library Usage Enforcement
+
+CRITICAL: Flag any re-implementation of existing functionality:
+- **Tailwind CSS**: Custom CSS instead of utility classes
+- **PrimeVue**: Re-implementing buttons, modals, dropdowns, etc.
+- **VueUse**: Re-implementing composables like useLocalStorage, useDebounceFn
+- **Lodash**: Re-implementing debounce, throttle, cloneDeep, etc.
+- **Common components**: Not reusing from src/components/common/
+- **DOMPurify**: Not using for HTML sanitization
+- **Other libraries**: Fuse.js, Marked, Pinia, Zod, Tiptap, Xterm.js, Axios
+
+### 3.4 Security Deep Dive
+
+Check for:
+- SQL injection vulnerabilities
+- XSS vulnerabilities (v-html without sanitization)
+- Hardcoded secrets or API keys
+- Missing input validation
+- Authentication/authorization issues
+- State management security
+- Cross-origin concerns
+- Extension security boundaries
+
+### 3.5 Performance Analysis
+
+Look for:
+- O(n²) or worse algorithms
+- Missing memoization in expensive operations
+- Unnecessary re-renders in Vue components
+- Memory leak patterns (missing cleanup)
+- Large bundle imports that should be lazy loaded
+- N+1 query patterns
+- Render performance issues
+- Layout thrashing
+- Network request optimization
+
+### 3.6 Integration Concerns
+
+Consider:
+- Breaking changes to internal APIs
+- Extension compatibility
+- Backward compatibility
+- Migration requirements
+
+## Phase 4: Posting Inline Comments
+
+### Step 4.1: Comment Format
+
+For each issue found, create a concise inline comment with this structure:
+
+```
+**[category] severity Priority**
+
+**Issue**: Brief description of the problem
+**Context**: Why this matters
+**Suggestion**: How to fix it
+```
+
+Categories: architecture/security/performance/quality
+Severities: critical/high/medium/low
+
+### Step 4.2: Posting Comments
+
+For EACH issue:
+
+1. Identify the exact file path and line number
+2. Update your tracking counters (CRITICAL_COUNT, etc.)
+3. Construct the comment body with proper newlines
+4. Execute the gh api command as a SINGLE LINE:
+
+```bash
+gh api --method POST -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/OWNER/REPO/pulls/$PR_NUMBER/comments -f body="$COMMENT_BODY" -f commit_id="COMMIT_SHA" -f path="FILE_PATH" -F line=LINE_NUMBER -f side="RIGHT"
+```
+
+CRITICAL: The entire command must be on one line. Use actual values, not placeholders.
+
+### Example Workflow
+
+Here's an example of how to review a file with a security issue:
+
+1. First, get the repository info:
+   ```bash
+   gh repo view --json owner,name
+   # Output: {"owner":{"login":"Comfy-Org"},"name":"ComfyUI_frontend"}
+   ```
+
+2. Get the commit SHA:
+   ```bash
+   gh pr view $PR_NUMBER --json commits --jq '.commits[-1].oid'
+   # Output: abc123def456
+   ```
+
+3. Find an issue (e.g., SQL injection on line 42 of src/db/queries.js)
+
+4. Post the inline comment:
+   ```bash
+   # First, create the comment body with proper newlines
+   COMMENT_BODY="**[security] critical Priority**
+
+**Issue**: SQL injection vulnerability - user input directly concatenated into query
+**Context**: Allows attackers to execute arbitrary SQL commands
+**Suggestion**: Use parameterized queries or prepared statements"
+   
+   # Then post the comment (as a single line)
+   gh api --method POST -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/Comfy-Org/ComfyUI_frontend/pulls/$PR_NUMBER/comments -f body="$COMMENT_BODY" -f commit_id="abc123def456" -f path="src/db/queries.js" -F line=42 -f side="RIGHT"
+   ```
+
+Repeat this process for every issue you find in the PR.
+
+## Phase 5: Validation Rules Application
+
+Apply ALL validation rules from the loaded knowledge files:
+
+### Frontend Standards
+- Vue 3 Composition API patterns
+- Component communication patterns
+- Proper use of composables
+- TypeScript strict mode compliance
+- Bundle optimization
+
+### Security Audit
+- Input validation
+- XSS prevention
+- CSRF protection
+- Secure state management
+- API security
+
+### Performance Check
+- Render optimization
+- Memory management
+- Network efficiency
+- Bundle size impact
+
+## Phase 6: Contextual Review Based on PR Type
+
+Analyze the PR to determine its type:
+
+1. Extract PR title and body from pr_info.json
+2. Count files, additions, and deletions
+3. Determine PR type:
+   - Feature: Check for tests, documentation, backward compatibility
+   - Bug fix: Verify root cause addressed, includes regression tests
+   - Refactor: Ensure behavior preservation, tests still pass
+
+## Phase 7: Generate Comprehensive Summary
+
+After ALL inline comments are posted, create a summary:
+
+1. Calculate total issues by category and severity
+2. Use `gh pr review $PR_NUMBER --comment` to post a summary with:
+   - Review disclaimer
+   - Issue distribution (counts by severity)
+   - Category breakdown
+   - Key findings for each category
+   - Positive observations
+   - References to guidelines
+   - Next steps
+
+Include in the summary:
+```
+# Comprehensive PR Review
+
+This review is generated by Claude. It may not always be accurate, as with human reviewers. If you believe that any of the comments are invalid or incorrect, please state why for each. For others, please implement the changes in one way or another.
+
+## Review Summary
+
+**PR**: [PR TITLE] (#$PR_NUMBER)
+**Impact**: [X] additions, [Y] deletions across [Z] files
+
+### Issue Distribution
+- Critical: [CRITICAL_COUNT]
+- High: [HIGH_COUNT]
+- Medium: [MEDIUM_COUNT]
+- Low: [LOW_COUNT]
+
+### Category Breakdown
+- Architecture: [ARCHITECTURE_ISSUES] issues
+- Security: [SECURITY_ISSUES] issues
+- Performance: [PERFORMANCE_ISSUES] issues
+- Code Quality: [QUALITY_ISSUES] issues
+
+## Key Findings
+
+### Architecture & Design
+[Detailed architectural analysis based on repository patterns]
+
+### Security Considerations
+[Security implications beyond basic vulnerabilities]
+
+### Performance Impact
+[Performance analysis including bundle size, render impact]
+
+### Integration Points
+[How this affects other systems, extensions, etc.]
+
+## Positive Observations
+[What was done well, good patterns followed]
+
+## References
+- [Repository Architecture Guide](https://github.com/Comfy-Org/comfy-claude-prompt-library/blob/master/project-summaries-for-agents/ComfyUI_frontend/REPOSITORY_GUIDE.md)
+- [Frontend Standards](https://github.com/Comfy-Org/comfy-claude-prompt-library/blob/master/.claude/commands/validation/frontend-code-standards.md)
+- [Security Guidelines](https://github.com/Comfy-Org/comfy-claude-prompt-library/blob/master/.claude/commands/validation/security-audit.md)
+
+## Next Steps
+1. Address critical issues before merge
+2. Consider architectural feedback for long-term maintainability
+3. Add tests for uncovered scenarios
+4. Update documentation if needed
+
+---
+*This is a comprehensive automated review. For architectural decisions requiring human judgment, please request additional manual review.*
+```
+
+## Important Guidelines
+
+1. **Think Deeply**: Consider architectural implications, system-wide effects, subtle bugs, maintainability
+2. **Be Specific**: Point to exact lines with concrete suggestions
+3. **Be Constructive**: Focus on improvements, not just problems
+4. **Be Concise**: Keep comments brief and actionable
+5. **No Formatting**: Don't use markdown headers in inline comments
+6. **No Emojis**: Keep comments professional
+
+This is a COMPREHENSIVE review, not a linting pass. Provide the same quality feedback a senior engineer would give after careful consideration.
+
+## Execution Order
+
+1. Phase 1: Setup and checkout PR
+2. Phase 2: Load all relevant knowledge
+3. Phase 3-5: Analyze each changed file thoroughly
+4. Phase 4: Post inline comments as you find issues
+5. Phase 6: Consider PR type for additional checks
+6. Phase 7: Post comprehensive summary ONLY after all inline comments
+
+Remember: Individual inline comments for each issue, then one final summary. Never batch issues into a single comment.

.claude/commands/create-frontend-release.md

@@ -137,8 +137,7 @@ echo "Last stable release: $LAST_STABLE"
 1. Run complete test suite:
    ```bash
    npm run test:unit
-   npm run test:component  
-   npm run test:browser
+   npm run test:component
    ```
 2. Run type checking:
    ```bash
@@ -170,7 +169,79 @@ echo "Last stable release: $LAST_STABLE"
 3. Generate breaking change summary
 4. **COMPATIBILITY REVIEW**: Breaking changes documented and justified?
 
-### Step 7: Generate and Save Changelog
+### Step 7: Analyze Dependency Updates
+
+1. **Check for dependency version changes:**
+   ```bash
+   # Compare package.json between versions to detect dependency updates
+   PREV_PACKAGE_JSON=$(git show ${BASE_TAG}:package.json 2>/dev/null || echo '{}')
+   CURRENT_PACKAGE_JSON=$(cat package.json)
+   
+   # Extract litegraph versions
+   PREV_LITEGRAPH=$(echo "$PREV_PACKAGE_JSON" | grep -o '"@comfyorg/litegraph": "[^"]*"' | grep -o '[0-9][^"]*' || echo "not found")
+   CURRENT_LITEGRAPH=$(echo "$CURRENT_PACKAGE_JSON" | grep -o '"@comfyorg/litegraph": "[^"]*"' | grep -o '[0-9][^"]*' || echo "not found")
+   
+   echo "Litegraph version change: ${PREV_LITEGRAPH} → ${CURRENT_LITEGRAPH}"
+   ```
+
+2. **Generate litegraph changelog if version changed:**
+   ```bash
+   if [ "$PREV_LITEGRAPH" != "$CURRENT_LITEGRAPH" ] && [ "$PREV_LITEGRAPH" != "not found" ]; then
+     echo "📦 Fetching litegraph changes between v${PREV_LITEGRAPH} and v${CURRENT_LITEGRAPH}..."
+     
+     # Clone or update litegraph repo for changelog analysis
+     if [ ! -d ".temp-litegraph" ]; then
+       git clone https://github.com/comfyanonymous/litegraph.js.git .temp-litegraph
+     else
+       cd .temp-litegraph && git fetch --all && cd ..
+     fi
+     
+     # Get litegraph changelog between versions
+     LITEGRAPH_CHANGES=$(cd .temp-litegraph && git log v${PREV_LITEGRAPH}..v${CURRENT_LITEGRAPH} --oneline --no-merges 2>/dev/null || \
+       git log --oneline --no-merges --since="$(git log -1 --format=%ci ${BASE_TAG})" --until="$(git log -1 --format=%ci HEAD)" 2>/dev/null || \
+       echo "Unable to fetch litegraph changes")
+     
+     # Categorize litegraph changes
+     LITEGRAPH_FEATURES=$(echo "$LITEGRAPH_CHANGES" | grep -iE "(feat|feature|add)" || echo "")
+     LITEGRAPH_FIXES=$(echo "$LITEGRAPH_CHANGES" | grep -iE "(fix|bug)" || echo "")
+     LITEGRAPH_BREAKING=$(echo "$LITEGRAPH_CHANGES" | grep -iE "(break|breaking)" || echo "")
+     LITEGRAPH_OTHER=$(echo "$LITEGRAPH_CHANGES" | grep -viE "(feat|feature|add|fix|bug|break|breaking)" || echo "")
+     
+     # Clean up temp directory
+     rm -rf .temp-litegraph
+     
+     echo "✅ Litegraph changelog extracted"
+   else
+     echo "ℹ️  No litegraph version change detected"
+     LITEGRAPH_CHANGES=""
+   fi
+   ```
+
+3. **Check other significant dependency updates:**
+   ```bash
+   # Extract all dependency changes for major version bumps
+   OTHER_DEP_CHANGES=""
+   
+   # Compare major dependency versions (you can extend this list)
+   MAJOR_DEPS=("vue" "vite" "@vitejs/plugin-vue" "typescript" "pinia")
+   
+   for dep in "${MAJOR_DEPS[@]}"; do
+     PREV_VER=$(echo "$PREV_PACKAGE_JSON" | grep -o "\"$dep\": \"[^\"]*\"" | grep -o '[0-9][^"]*' | head -1 || echo "")
+     CURR_VER=$(echo "$CURRENT_PACKAGE_JSON" | grep -o "\"$dep\": \"[^\"]*\"" | grep -o '[0-9][^"]*' | head -1 || echo "")
+     
+     if [ "$PREV_VER" != "$CURR_VER" ] && [ -n "$PREV_VER" ] && [ -n "$CURR_VER" ]; then
+       # Check if it's a major version change
+       PREV_MAJOR=$(echo "$PREV_VER" | cut -d. -f1 | sed 's/[^0-9]//g')
+       CURR_MAJOR=$(echo "$CURR_VER" | cut -d. -f1 | sed 's/[^0-9]//g')
+       
+       if [ "$PREV_MAJOR" != "$CURR_MAJOR" ]; then
+         OTHER_DEP_CHANGES="${OTHER_DEP_CHANGES}\n- **${dep}**: ${PREV_VER} → ${CURR_VER} (Major version change)"
+       fi
+     fi
+   done
+   ```
+
+### Step 8: Generate Comprehensive Release Notes
 
 1. Extract commit messages since base release:
    ```bash
@@ -185,42 +256,29 @@ echo "Last stable release: $LAST_STABLE"
        echo "WARNING: PR #$PR not on main branch!"
    done
    ```
-3. Group by type:
-   - 🚀 **Features** (feat:)
-   - 🐛 **Bug Fixes** (fix:)
-   - 💥 **Breaking Changes** (BREAKING CHANGE)
-   - 📚 **Documentation** (docs:)
-   - 🔧 **Maintenance** (chore:, refactor:)
-   - ⬆️ **Dependencies** (deps:, dependency updates)
-4. Include PR numbers and links
-5. Add issue references (Fixes #123)
-6. **Save changelog locally:**
-   ```bash
-   # Save to dated file for history
-   echo "$CHANGELOG" > release-notes-${NEW_VERSION}-$(date +%Y%m%d).md
-   
-   # Save to current for easy access
-   echo "$CHANGELOG" > CURRENT_RELEASE_NOTES.md
-   ```
-7. **CHANGELOG REVIEW**: Verify all PRs listed are actually on main branch
-
-### Step 8: Create Enhanced Release Notes
-
-1. Create comprehensive user-facing release notes including:
-   - **What's New**: Major features and improvements
-   - **Bug Fixes**: User-visible fixes
-   - **Breaking Changes**: Migration guide if applicable
-   - **Dependencies**: Major dependency updates
-   - **Performance**: Notable performance improvements
-   - **Contributors**: Thank contributors for their work
-2. Reference related documentation updates
-3. Include screenshots for UI changes (if available)
+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
-   # Enhanced release notes for GitHub
-   echo "$RELEASE_NOTES" > github-release-notes-${NEW_VERSION}.md
+   # Save release notes for PR and GitHub release
+   echo "$RELEASE_NOTES" > release-notes-${NEW_VERSION}.md
    ```
-5. **CONTENT REVIEW**: Release notes clear and helpful for users?
+5. **CONTENT REVIEW**: Release notes clear and comprehensive with dependency details?
 
 ### Step 9: Create Version Bump PR
 
@@ -258,25 +316,20 @@ echo "Workflow triggered. Waiting for PR creation..."
    
    # For manual PRs
    gh pr create --title "${NEW_VERSION}" \
-     --body-file enhanced-pr-description.md \
+     --body-file release-notes-${NEW_VERSION}.md \
      --label "Release"
    ```
-3. **Create enhanced PR description:**
+3. **Add required sections to PR body:**
    ```bash
-   cat > enhanced-pr-description.md << EOF
-   # Release v${NEW_VERSION}
-
-   ## Version Change
-   \`${CURRENT_VERSION}\` → \`${NEW_VERSION}\` (${VERSION_TYPE})
-
-   ## Changelog
-   ${CHANGELOG}
+   # Create PR body with release notes plus required sections
+   cat > pr-body.md << EOF
+   ${RELEASE_NOTES}
 
    ## Breaking Changes
-   ${BREAKING_CHANGES}
+   ${BREAKING_CHANGES:-None}
 
    ## Testing Performed
-   - ✅ Full test suite (unit, component, browser)
+   - ✅ Full test suite (unit, component)
    - ✅ TypeScript compilation
    - ✅ Linting checks
    - ✅ Build verification
@@ -295,15 +348,11 @@ echo "Workflow triggered. Waiting for PR creation..."
    ```
 4. Update PR with enhanced description:
    ```bash
-   gh pr edit ${PR_NUMBER} --body-file enhanced-pr-description.md
+   gh pr edit ${PR_NUMBER} --body-file pr-body.md
    ```
-5. Add changelog as comment for easy reference:
-   ```bash
-   gh pr comment ${PR_NUMBER} --body-file CURRENT_RELEASE_NOTES.md
-   ```
-6. **PR REVIEW**: Version bump PR created and enhanced correctly?
+5. **PR REVIEW**: Version bump PR created and enhanced correctly?
 
-### Step 11: Critical Release PR Verification
+### Step 10: Critical Release PR Verification
 
 1. **CRITICAL**: Verify PR has "Release" label:
    ```bash
@@ -325,7 +374,7 @@ echo "Workflow triggered. Waiting for PR creation..."
    ```
 7. **FINAL CODE REVIEW**: Release label present and no [skip ci]?
 
-### Step 12: Pre-Merge Validation
+### Step 11: Pre-Merge Validation
 
 1. **Review Requirements**: Release PRs require approval
 2. Monitor CI checks - watch for update-locales
@@ -333,7 +382,7 @@ echo "Workflow triggered. Waiting for PR creation..."
 4. Check no new commits to main since PR creation
 5. **DEPLOYMENT READINESS**: Ready to merge?
 
-### Step 13: Execute Release
+### Step 12: Execute Release
 
 1. **FINAL CONFIRMATION**: Merge PR to trigger release?
 2. Merge the Release PR:
@@ -358,7 +407,7 @@ echo "Workflow triggered. Waiting for PR creation..."
    gh run watch ${WORKFLOW_RUN_ID}
    ```
 
-### Step 14: Enhance GitHub Release
+### Step 13: Enhance GitHub Release
 
 1. Wait for automatic release creation:
    ```bash
@@ -371,10 +420,10 @@ echo "Workflow triggered. Waiting for PR creation..."
 
 2. **Enhance the GitHub release:**
    ```bash
-   # Update release with our enhanced notes
+   # Update release with our release notes
    gh release edit v${NEW_VERSION} \
      --title "🚀 ComfyUI Frontend v${NEW_VERSION}" \
-     --notes-file github-release-notes-${NEW_VERSION}.md \
+     --notes-file release-notes-${NEW_VERSION}.md \
      --latest
    
    # Add any additional assets if needed
@@ -386,7 +435,7 @@ echo "Workflow triggered. Waiting for PR creation..."
    gh release view v${NEW_VERSION}
    ```
 
-### Step 15: Verify Multi-Channel Distribution
+### Step 14: Verify Multi-Channel Distribution
 
 1. **GitHub Release:**
    ```bash
@@ -424,7 +473,7 @@ echo "Workflow triggered. Waiting for PR creation..."
 
 4. **DISTRIBUTION VERIFICATION**: All channels published successfully?
 
-### Step 16: Post-Release Monitoring Setup
+### Step 15: Post-Release Monitoring Setup
 
 1. **Monitor immediate release health:**
    ```bash
@@ -492,8 +541,7 @@ echo "Workflow triggered. Waiting for PR creation..."
    - Plan next release cycle
 
    ## Files Generated
-   - \`release-notes-${NEW_VERSION}-$(date +%Y%m%d).md\` - Detailed changelog
-   - \`github-release-notes-${NEW_VERSION}.md\` - GitHub release notes
+   - \`release-notes-${NEW_VERSION}.md\` - Comprehensive release notes
    - \`post-release-checklist.md\` - Follow-up tasks
    EOF
    ```
@@ -544,7 +592,7 @@ echo "- GitHub: Update release with warning notes"
 The command implements multiple quality gates:
 
 1. **🔒 Security Gate**: Vulnerability scanning, secret detection
-2. **🧪 Quality Gate**: Full test suite, linting, type checking
+2. **🧪 Quality Gate**: Unit and component tests, linting, type checking
 3. **📋 Content Gate**: Changelog accuracy, release notes quality
 4. **🔄 Process Gate**: Release timing verification
 5. **✅ Verification Gate**: Multi-channel publishing confirmation
@@ -602,6 +650,15 @@ The command implements multiple quality gates:
 gh pr view ${PR_NUMBER} --json baseRefName
 ```
 
+### 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
+
 ### Issue: Release Failed Due to [skip ci]
 **Problem**: Release workflow didn't trigger after merge
 **Prevention**: Always avoid this scenario
@@ -622,4 +679,6 @@ Benefits: Cleaner than creating extra version numbers
 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
 

.gitattributes

@@ -5,3 +5,7 @@
 *.ts text eol=lf
 *.vue text eol=lf
 *.js text eol=lf
+
+# Generated files
+src/types/comfyRegistryTypes.ts linguist-generated=true
+src/types/generatedManagerTypes.ts linguist-generated=true

.github/CLAUDE.md

@@ -0,0 +1,36 @@
+# ComfyUI Frontend - Claude Review Context
+
+This file provides additional context for the automated PR review system.
+
+## Quick Reference
+
+### PrimeVue Component Migrations
+
+When reviewing, flag these deprecated components:
+- `Dropdown` → Use `Select` from 'primevue/select'
+- `OverlayPanel` → Use `Popover` from 'primevue/popover'
+- `Calendar` → Use `DatePicker` from 'primevue/datepicker'
+- `InputSwitch` → Use `ToggleSwitch` from 'primevue/toggleswitch'
+- `Sidebar` → Use `Drawer` from 'primevue/drawer'
+- `Chips` → Use `AutoComplete` with multiple enabled and typeahead disabled
+- `TabMenu` → Use `Tabs` without panels
+- `Steps` → Use `Stepper` without panels
+- `InlineMessage` → Use `Message` component
+
+### API Utilities Reference
+
+- `api.apiURL()` - Backend API calls (/prompt, /queue, /view, etc.)
+- `api.fileURL()` - Static file access (templates, extensions)
+- `$t()` / `i18n.global.t()` - Internationalization
+- `DOMPurify.sanitize()` - HTML sanitization
+
+## Review Scope
+
+This automated review performs comprehensive analysis including:
+- Architecture and design patterns
+- Security vulnerabilities
+- Performance implications
+- Code quality and maintainability
+- Integration concerns
+
+For implementation details, see `.claude/commands/comprehensive-pr-review.md`.

.github/workflows/claude-pr-review.yml

@@ -0,0 +1,84 @@
+name: Claude PR Review
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+  id-token: write
+  statuses: write
+
+on:
+  pull_request:
+    types: [labeled]
+
+jobs:
+  wait-for-ci:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'claude-review'
+    outputs:
+      should-proceed: ${{ steps.check-status.outputs.proceed }}
+    steps:
+      - name: Wait for other CI checks
+        uses: lewagon/wait-on-check-action@v1.3.1
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          check-regexp: '^(eslint|prettier|test|playwright-tests)'
+          wait-interval: 30
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Check if we should proceed
+        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("eslint|prettier|test|playwright-tests")) | {name, conclusion}')
+          
+          # Check if any required checks failed
+          if echo "$CHECK_RUNS" | grep -q '"conclusion": "failure"'; then
+            echo "Some CI checks failed - skipping Claude review"
+            echo "proceed=false" >> $GITHUB_OUTPUT
+          else
+            echo "All CI checks passed - proceeding with Claude review"
+            echo "proceed=true" >> $GITHUB_OUTPUT
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  claude-review:
+    needs: wait-for-ci
+    if: needs.wait-for-ci.outputs.should-proceed == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies for analysis tools
+        run: |
+          npm install -g typescript @vue/compiler-sfc
+
+      - name: Run Claude PR Review
+        uses: anthropics/claude-code-action@main
+        with:
+          label_trigger: "claude-review"
+          direct_prompt: |
+            Read the file .claude/commands/comprehensive-pr-review.md and follow ALL the instructions exactly. 
+            
+            CRITICAL: You must post individual inline comments using the gh api commands shown in the file. 
+            DO NOT create a summary comment. 
+            Each issue must be posted as a separate inline comment on the specific line of code.
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          max_turns: 256
+          timeout_minutes: 30
+          allowed_tools: "Bash(git:*),Bash(gh api:*),Bash(gh pr:*),Bash(gh repo:*),Bash(jq:*),Bash(echo:*),Read,Write,Edit,Glob,Grep,WebFetch"
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          REPOSITORY: ${{ github.repository }}

.github/workflows/eslint.yaml

@@ -2,7 +2,7 @@ name: ESLint
 
 on:
   pull_request:
-    branches: [ main, master, dev*, core/*, desktop/* ]
+    branches-ignore: [ wip/*, draft/*, temp/* ]
 
 jobs:
   eslint:

.github/workflows/format.yaml

@@ -2,7 +2,7 @@ name: Prettier Check
 
 on:
   pull_request:
-    branches: [ main, master, dev*, core/*, desktop/* ]
+    branches-ignore: [ wip/*, draft/*, temp/* ]
 
 jobs:
   prettier:

.github/workflows/pr-checks.yml

@@ -0,0 +1,154 @@
+name: PR Checks
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+
+permissions:
+  contents: read
+  pull-requests: read
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.check-changes.outputs.should_run }}
+      has_browser_tests: ${{ steps.check-coverage.outputs.has_browser_tests }}
+      has_screen_recording: ${{ steps.check-recording.outputs.has_recording }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Ensure base branch is available
+        run: |
+          # Fetch the specific base commit to ensure it's available for git diff
+          git fetch origin ${{ github.event.pull_request.base.sha }}
+
+      - name: Check if significant changes exist
+        id: check-changes
+        run: |
+          # Get list of changed files
+          CHANGED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }})
+          
+          # Filter for src/ files
+          SRC_FILES=$(echo "$CHANGED_FILES" | grep '^src/' || true)
+          
+          if [ -z "$SRC_FILES" ]; then
+            echo "No src/ files changed"
+            echo "should_run=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          
+          # Count lines changed in src files
+          TOTAL_LINES=0
+          for file in $SRC_FILES; do
+            if [ -f "$file" ]; then
+              # Count added lines (non-empty)
+              ADDED=$(git diff ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} -- "$file" | grep '^+' | grep -v '^+++' | grep -v '^+$' | wc -l)
+              # Count removed lines (non-empty)
+              REMOVED=$(git diff ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} -- "$file" | grep '^-' | grep -v '^---' | grep -v '^-$' | wc -l)
+              TOTAL_LINES=$((TOTAL_LINES + ADDED + REMOVED))
+            fi
+          done
+          
+          echo "Total lines changed in src/: $TOTAL_LINES"
+          
+          if [ $TOTAL_LINES -gt 3 ]; then
+            echo "should_run=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "should_run=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Check browser test coverage
+        id: check-coverage
+        if: steps.check-changes.outputs.should_run == 'true'
+        run: |
+          # Check if browser tests were updated
+          BROWSER_TEST_CHANGES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} | grep '^browser_tests/.*\.ts$' || true)
+          
+          if [ -n "$BROWSER_TEST_CHANGES" ]; then
+            echo "has_browser_tests=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_browser_tests=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Check for screen recording
+        id: check-recording
+        if: steps.check-changes.outputs.should_run == 'true'
+        env:
+          PR_BODY: ${{ github.event.pull_request.body }}
+        run: |
+          # Check PR body for screen recording
+          # Check for GitHub user attachments or YouTube links
+          if echo "$PR_BODY" | grep -qiE 'github\.com/user-attachments/assets/[a-f0-9-]+|youtube\.com/watch|youtu\.be/'; then
+            echo "has_recording=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_recording=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Final check and create results
+        id: final-check
+        if: always()
+        run: |
+          # Initialize results
+          WARNINGS_JSON=""
+          
+          # Only run checks if should_run is true
+          if [ "${{ steps.check-changes.outputs.should_run }}" == "true" ]; then
+            # Check browser test coverage
+            if [ "${{ steps.check-coverage.outputs.has_browser_tests }}" != "true" ]; then
+              if [ -n "$WARNINGS_JSON" ]; then
+                WARNINGS_JSON="${WARNINGS_JSON},"
+              fi
+              WARNINGS_JSON="${WARNINGS_JSON}{\"message\":\"⚠️ **Warning: E2E Test Coverage Missing**\\n\\nIf this PR modifies behavior that can be covered by browser-based E2E tests, those tests are required. PRs lacking applicable test coverage may not be reviewed until added. Please add or update browser tests to ensure code quality and prevent regressions.\"}"
+            fi
+            
+            # Check screen recording
+            if [ "${{ steps.check-recording.outputs.has_recording }}" != "true" ]; then
+              if [ -n "$WARNINGS_JSON" ]; then
+                WARNINGS_JSON="${WARNINGS_JSON},"
+              fi
+              WARNINGS_JSON="${WARNINGS_JSON}{\"message\":\"⚠️ **Warning: Visual Documentation Missing**\\n\\nIf this PR changes user-facing behavior, visual proof (screen recording or screenshot) is required. PRs without applicable visual documentation may not be reviewed until provided.\\nYou can add it by:\\n\\n- GitHub: Drag & drop media directly into the PR description\\n\\n- YouTube: Include a link to a short demo\"}"
+            fi
+          fi
+          
+          # Create results JSON
+          if [ -n "$WARNINGS_JSON" ]; then
+            # Create JSON with warnings
+            cat > pr-check-results.json << EOF
+          {
+            "fails": [],
+            "warnings": [$WARNINGS_JSON],
+            "messages": [],
+            "markdowns": []
+          }
+          EOF
+            echo "failed=false" >> "$GITHUB_OUTPUT"
+          else
+            # Create JSON with success
+            cat > pr-check-results.json << 'EOF'
+          {
+            "fails": [],
+            "warnings": [],
+            "messages": [],
+            "markdowns": []
+          }
+          EOF
+            echo "failed=false" >> "$GITHUB_OUTPUT"
+          fi
+          
+          # Write PR metadata
+          echo "${{ github.event.pull_request.number }}" > pr-number.txt
+          echo "${{ github.event.pull_request.head.sha }}" > pr-sha.txt
+
+      - name: Upload results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: pr-check-results-${{ github.run_id }}
+          path: |
+            pr-check-results.json
+            pr-number.txt
+            pr-sha.txt
+          retention-days: 1

.github/workflows/pr-comment.yml

@@ -0,0 +1,149 @@
+name: PR Comment
+on:
+  workflow_run:
+    workflows: ["PR Checks"]
+    types: [completed]
+
+permissions:
+  pull-requests: write
+  issues: write
+  statuses: write
+
+jobs:
+  comment:
+    if: github.event.workflow_run.event == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: pr-check-results-${{ github.event.workflow_run.id }}
+          path: /tmp/pr-artifacts
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+          
+      - name: Post results
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+            
+            // Helper function to safely read files
+            function safeReadFile(filePath) {
+              try {
+                if (!fs.existsSync(filePath)) return null;
+                return fs.readFileSync(filePath, 'utf8').trim();
+              } catch (e) {
+                console.error(`Error reading ${filePath}:`, e);
+                return null;
+              }
+            }
+            
+            // Read artifact files
+            const artifactDir = '/tmp/pr-artifacts';
+            const prNumber = safeReadFile(path.join(artifactDir, 'pr-number.txt'));
+            const prSha = safeReadFile(path.join(artifactDir, 'pr-sha.txt'));
+            const resultsJson = safeReadFile(path.join(artifactDir, 'pr-check-results.json'));
+            
+            // Validate PR number
+            if (!prNumber || isNaN(parseInt(prNumber))) {
+              throw new Error('Invalid or missing PR number');
+            }
+            
+            // Parse and validate results
+            let results;
+            try {
+              results = JSON.parse(resultsJson || '{}');
+            } catch (e) {
+              console.error('Failed to parse check results:', e);
+              
+              // Post error comment
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: parseInt(prNumber),
+                body: `⚠️ PR checks failed to complete properly. Error parsing results: ${e.message}`
+              });
+              return;
+            }
+            
+            // Format check messages
+            const messages = [];
+            
+            if (results.fails && results.fails.length > 0) {
+              messages.push('### ❌ Failures\n' + results.fails.map(f => f.message).join('\n\n'));
+            }
+            
+            if (results.warnings && results.warnings.length > 0) {
+              messages.push('### ⚠️ Warnings\n' + results.warnings.map(w => w.message).join('\n\n'));
+            }
+            
+            if (results.messages && results.messages.length > 0) {
+              messages.push('### 💬 Messages\n' + results.messages.map(m => m.message).join('\n\n'));
+            }
+            
+            if (results.markdowns && results.markdowns.length > 0) {
+              messages.push(...results.markdowns.map(m => m.message));
+            }
+            
+            // Find existing bot comment
+            const comments = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: parseInt(prNumber)
+            });
+            
+            const botComment = comments.data.find(comment => 
+              comment.user.type === 'Bot' && 
+              comment.body.includes('<!-- pr-checks-comment -->')
+            );
+            
+            // Post comment if there are any messages
+            if (messages.length > 0) {
+              const body = messages.join('\n\n');
+              const commentBody = `<!-- pr-checks-comment -->\n${body}`;
+              
+              if (botComment) {
+                await github.rest.issues.updateComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: botComment.id,
+                  body: commentBody
+                });
+              } else {
+                await github.rest.issues.createComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: parseInt(prNumber),
+                  body: commentBody
+                });
+              }
+            } else {
+              // No messages - delete existing comment if present
+              if (botComment) {
+                await github.rest.issues.deleteComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  comment_id: botComment.id
+                });
+              }
+            }
+            
+            // Set commit status based on failures
+            if (prSha) {
+              const hasFailures = results.fails && results.fails.length > 0;
+              const hasWarnings = results.warnings && results.warnings.length > 0;
+              await github.rest.repos.createCommitStatus({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                sha: prSha,
+                state: hasFailures ? 'failure' : 'success',
+                context: 'pr-checks',
+                description: hasFailures 
+                  ? `${results.fails.length} check(s) failed` 
+                  : hasWarnings 
+                    ? `${results.warnings.length} warning(s)` 
+                    : 'All checks passed'
+              });
+            }

.github/workflows/test-ui.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [main, master, core/*, desktop/*]
   pull_request:
-    branches: [main, master, dev*, core/*, desktop/*]
+    branches-ignore: [wip/*, draft/*, temp/*]
 
 jobs:
   setup:

.github/workflows/vitest.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main, master, dev*, core/*, desktop/* ]
   pull_request:
-    branches: [ main, master, dev*, core/*, desktop/* ]
+    branches-ignore: [ wip/*, draft/*, temp/* ]
 
 jobs:
   test:

README.md

@@ -686,6 +686,12 @@ Component test verifies Vue components in `src/components/`.
 
 Playwright test verifies the whole app. See <https://github.com/Comfy-Org/ComfyUI_frontend/blob/main/browser_tests/README.md> for details.
 
+### Custom Icons
+
+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.
+
+For detailed instructions on adding and using custom icons, see [src/assets/icons/README.md](src/assets/icons/README.md).
+
 ### litegraph.js
 
 This repo is using litegraph package hosted on <https://github.com/Comfy-Org/litegraph.js>. Any changes to litegraph should be submitted in that repo instead.

browser_tests/README.md

@@ -2,76 +2,133 @@
 
 This document outlines the setup, usage, and common patterns for Playwright browser tests in the ComfyUI_frontend project.
 
-## WARNING
+## Prerequisites
 
-The browser tests will change the ComfyUI backend state, such as user settings and saved workflows.
-If `TEST_COMFYUI_DIR` in `.env` isn't set to your `(Comfy Path)/ComfyUI` directory, these changes won't be automatically restored.
+**CRITICAL**: Start ComfyUI backend with `--multi-user` flag:
+
+```bash
+python main.py --multi-user
+```
+
+Without this flag, parallel tests will conflict and fail randomly.
 
 ## Setup
 
 ### ComfyUI devtools
+
 Clone <https://github.com/Comfy-Org/ComfyUI_devtools> to your `custom_nodes` directory.  
 _ComfyUI_devtools adds additional API endpoints and nodes to ComfyUI for browser testing._
 
 ### Node.js & Playwright Prerequisites
+
 Ensure you have Node.js v20 or v22 installed. Then, set up the Chromium test driver:
+
 ```bash
 npx playwright install chromium --with-deps
 ```
 
-### Environment Variables
-Ensure the environment variables in `.env` are set correctly according to your setup. 
+### Environment Configuration
 
-The `.env` file will not exist until you create it yourself.
+Create `.env` from the template:
 
-A template with helpful information can be found in `.env_example`.
+```bash
+cp .env_example .env
+```
 
-### Multiple Tests
-If you are running Playwright tests in parallel or running the same test multiple times, the flag `--multi-user` must be added to the main ComfyUI process.
+Key settings for debugging:
+
+```bash
+# Remove Vue dev overlay that blocks UI elements
+DISABLE_VUE_PLUGINS=true
+
+# Test against dev server (recommended) or backend directly
+PLAYWRIGHT_TEST_URL=http://localhost:5173  # Dev server
+# PLAYWRIGHT_TEST_URL=http://localhost:8188  # Direct backend
+
+# Path to ComfyUI for backing up user data/settings before tests
+TEST_COMFYUI_DIR=/path/to/your/ComfyUI
+```
+
+### Common Setup Issues
+
+**Most tests require the new menu system** - Add to your test:
+
+```typescript
+test.beforeEach(async ({ comfyPage }) => {
+  await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+})
+```
 
 ### Release API Mocking
+
 By default, all tests mock the release API (`api.comfy.org/releases`) to prevent release notification popups from interfering with test execution. This is necessary because the release notifications can appear over UI elements and block test interactions.
 
 To test with real release data, you can disable mocking:
+
 ```typescript
-await comfyPage.setup({ mockReleases: false });
+await comfyPage.setup({ mockReleases: false })
 ```
 
 For tests that specifically need to test release functionality, see the example in `tests/releaseNotifications.spec.ts`.
 
 ## Running Tests
 
-There are multiple ways to run the tests:
+**Always use UI mode for development:**
 
-1. **Headless mode with report generation:**
-   ```bash
-   npx playwright test
-   ```
-   This runs all tests without a visible browser and generates a comprehensive test report.
+```bash
+npx playwright test --ui
+```
 
-2. **UI mode for interactive testing:**
-   ```bash
-   npx playwright test --ui
-   ```
-   This opens a user interface where you can select specific tests to run and inspect the test execution timeline.
+UI mode features:
 
-   ![Playwright UI Mode](https://github.com/user-attachments/assets/6a1ebef0-90eb-4157-8694-f5ee94d03755)
+- **Locator picker**: Click the target icon, then click any element to get the exact locator code to use in your test. The code appears in the _Locator_ tab.
+- **Step debugging**: Step through your test line-by-line by clicking _Source_ tab
+- **Time travel**: In the _Actions_ tab/panel, click any step to see the browser state at that moment
+- **Console/Network Tabs**: View logs and API calls at each step
+- **Attachments Tab**: View all snapshots with expected and actual images
 
-3. **Running specific tests:**
-   ```bash
-   npx playwright test widget.spec.ts
-   ```
+![Playwright UI Mode](https://github.com/user-attachments/assets/c158c93f-b39a-44c5-a1a1-e0cc975ee9f2)
+
+For CI or headless testing:
+
+```bash
+npx playwright test                    # Run all tests
+npx playwright test widget.spec.ts     # Run specific test file
+```
+
+### Local Development Config
+
+For debugging, you can try adjusting these settings in `playwright.config.ts`:
+
+```typescript
+export default defineConfig({
+  // VERY HELPFUL: Skip screenshot tests locally
+  grep: process.env.CI ? undefined : /^(?!.*screenshot).*$/
+
+  retries: 0, // No retries while debugging. Increase if writing new tests. that may be flaky.
+  workers: 1, // Single worker for easier debugging. Increase to match CPU cores if you want to run a lot of tests in parallel.
+  timeout: 30000, // Longer timeout for breakpoints
+
+  use: {
+    trace: 'on', // Always capture traces (CI uses 'on-first-retry')
+    video: 'on' // Always record video (CI uses 'retain-on-failure')
+  },
+
+})
+```
 
 ## Test Structure
 
 Browser tests in this project follow a specific organization pattern:
 
 - **Fixtures**: Located in `fixtures/` - These provide test setup and utilities
+
   - `ComfyPage.ts` - The main fixture for interacting with ComfyUI
   - `ComfyMouse.ts` - Utility for mouse interactions with the canvas
   - Components fixtures in `fixtures/components/` - Page object models for UI components
 
 - **Tests**: Located in `tests/` - The actual test specifications
+
   - Organized by functionality (e.g., `widget.spec.ts`, `interaction.spec.ts`)
   - Snapshot directories (e.g., `widget.spec.ts-snapshots/`) contain reference screenshots
 
@@ -86,18 +143,18 @@ When writing new tests, follow these patterns:
 
 ```typescript
 // Import the test fixture
-import { comfyPageFixture as test } from '../fixtures/ComfyPage';
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.describe('Feature Name', () => {
   // Set up test environment if needed
   test.beforeEach(async ({ comfyPage }) => {
     // Common setup
-  });
+  })
 
   test('should do something specific', async ({ comfyPage }) => {
     // Test implementation
-  });
-});
+  })
+})
 ```
 
 ### Leverage Existing Fixtures and Helpers
@@ -119,66 +176,102 @@ Most common testing needs are already addressed by these helpers, which will mak
 
 1. **Focus elements explicitly**:
    Canvas-based elements often need explicit focus before interaction:
+
    ```typescript
    // Click the canvas first to focus it before pressing keys
-   await comfyPage.canvas.click();
-   await comfyPage.page.keyboard.press('a');
+   await comfyPage.canvas.click()
+   await comfyPage.page.keyboard.press('a')
    ```
 
 2. **Mark canvas as dirty if needed**:
    Some interactions need explicit canvas updates:
+
    ```typescript
    // After programmatically changing node state, mark canvas dirty
    await comfyPage.page.evaluate(() => {
-     window['app'].graph.setDirtyCanvas(true, true);
-   });
+     window['app'].graph.setDirtyCanvas(true, true)
+   })
    ```
 
-3. **Use node references over coordinates**: 
+3. **Use node references over coordinates**:
    Node references from `fixtures/utils/litegraphUtils.ts` provide stable ways to interact with nodes:
+
    ```typescript
    // Prefer this:
-   const node = await comfyPage.getNodeRefsByType('LoadImage')[0];
-   await node.click('title');
-   
+   const node = await comfyPage.getNodeRefsByType('LoadImage')[0]
+   await node.click('title')
+
    // Over this:
-   await comfyPage.canvas.click({ position: { x: 100, y: 100 } });
+   await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
    ```
 
 4. **Wait for canvas to render after UI interactions**:
+
    ```typescript
-   await comfyPage.nextFrame();
+   await comfyPage.nextFrame()
    ```
 
 5. **Clean up persistent server state**:
    While most state is reset between tests, anything stored on the server persists:
+
    ```typescript
    // Reset settings that affect other tests (these are stored on server)
-   await comfyPage.setSetting('Comfy.ColorPalette', 'dark');
-   await comfyPage.setSetting('Comfy.NodeBadge.NodeIdBadgeMode', 'None');
-   
+   await comfyPage.setSetting('Comfy.ColorPalette', 'dark')
+   await comfyPage.setSetting('Comfy.NodeBadge.NodeIdBadgeMode', 'None')
+
    // Clean up uploaded files if needed
-   await comfyPage.request.delete(`${comfyPage.url}/api/delete/image.png`);
+   await comfyPage.request.delete(`${comfyPage.url}/api/delete/image.png`)
    ```
 
 6. **Prefer functional assertions over screenshots**:
    Use screenshots only when visual verification is necessary:
+
    ```typescript
    // Prefer this:
-   expect(await node.isPinned()).toBe(true);
-   expect(await node.getProperty('title')).toBe('Expected Title');
-   
+   expect(await node.isPinned()).toBe(true)
+   expect(await node.getProperty('title')).toBe('Expected Title')
+
    // Over this - only use when needed:
-   await expect(comfyPage.canvas).toHaveScreenshot('state.png');
+   await expect(comfyPage.canvas).toHaveScreenshot('state.png')
    ```
 
 7. **Use minimal test workflows**:
    When creating test workflows, keep them as minimal as possible:
+
    ```typescript
    // Include only the components needed for the test
-   await comfyPage.loadWorkflow('single_ksampler');
+   await comfyPage.loadWorkflow('single_ksampler')
    ```
 
+8. **Debug helpers for visual debugging** (remove before committing):
+
+   ComfyPage includes temporary debug methods for troubleshooting:
+
+   ```typescript
+   test('debug failing interaction', async ({ comfyPage }, testInfo) => {
+     // Add visual markers to see click positions
+     await comfyPage.debugAddMarker({ x: 100, y: 200 })
+
+     // Attach screenshot with markers to test report
+     await comfyPage.debugAttachScreenshot(testInfo, 'node-positions', {
+       element: 'canvas',
+       markers: [{ position: { x: 100, y: 200 } }]
+     })
+
+     // Show canvas overlay for easier debugging
+     await comfyPage.debugShowCanvasOverlay()
+
+     // Remember to remove debug code before committing!
+   })
+   ```
+
+   Available debug methods:
+
+   - `debugAddMarker(position)` - Red circle at position
+   - `debugAttachScreenshot(testInfo, name)` - Attach to test report
+   - `debugShowCanvasOverlay()` - Show canvas as overlay
+   - `debugGetCanvasDataURL()` - Get canvas as base64
+
 ## Common Patterns and Utilities
 
 ### Page Object Pattern
@@ -192,7 +285,7 @@ test('Can toggle boolean widget', async ({ comfyPage }) => {
   const node = (await comfyPage.getFirstNodeRef())!
   const widget = await node.getWidget(0)
   await widget.click()
-});
+})
 ```
 
 ### Node References
@@ -232,8 +325,8 @@ Canvas operations use special helpers to ensure proper timing:
 ```typescript
 // Using ComfyMouse for drag and drop
 await comfyMouse.dragAndDrop(
-  { x: 100, y: 100 },  // From
-  { x: 200, y: 200 }   // To
+  { x: 100, y: 100 }, // From
+  { x: 200, y: 200 } // To
 )
 
 // Standard ComfyPage helpers
@@ -275,21 +368,52 @@ await expect(node).toBeCollapsed()
 - **Screenshots vary**: Ensure your OS and browser match the reference environment (Linux)
 - **Async / await**: Race conditions are a very common cause of test flakiness
 
-## Screenshot Expectations
+## Screenshot Testing
 
 Due to variations in system font rendering, screenshot expectations are platform-specific. Please note:
 
-- **DO NOT commit local screenshot expectations** to the repository
+- **Do not commit local screenshot expectations** to the repository
 - We maintain Linux screenshot expectations as our GitHub Action runner operates in a Linux environment
 - While developing, you can generate local screenshots for your tests, but these will differ from CI-generated ones
 
-To set new test expectations for PR:
+### Working with Screenshots Locally
 
-1. Write your test with screenshot assertions using `toHaveScreenshot(filename)`
-2. Create a pull request from a `Comfy-Org/ComfyUI_frontend` branch
-3. Add the `New Browser Test Expectation` tag to your pull request
-4. The GitHub CI will automatically generate and commit the reference screenshots
+Option 1 - Skip screenshot tests (add to `playwright.config.ts`):
 
-This approach ensures consistent screenshot expectations across all PRs and avoids issues with platform-specific rendering.
+```typescript
+export default defineConfig({
+  grep: process.env.CI ? undefined : /^(?!.*screenshot).*$/
+})
+```
 
-> **Note:** If you're making a pull request from a forked repository, the GitHub action won't be able to commit updated screenshot expectations directly to your PR branch.
+Option 2 - Generate local baselines for comparison:
+
+```bash
+npx playwright test --update-snapshots
+```
+
+### Getting Test Artifacts from GitHub Actions
+
+When tests fail in CI, you can download screenshots and traces:
+
+1. Go to the failed workflow run in GitHub Actions
+2. Scroll to "Artifacts" section at the bottom
+3. Download `playwright-report` or `test-results`
+4. Extract and open the HTML report locally
+5. View actual vs expected screenshots and execution traces
+
+### Creating New Screenshot Baselines
+
+For PRs from `Comfy-Org/ComfyUI_frontend` branches:
+
+1. Write test with `toHaveScreenshot('filename.png')`
+2. Create PR and add `New Browser Test Expectation` label
+3. CI will generate and commit the Linux baseline screenshots
+
+> **Note:** Fork PRs cannot auto-commit screenshots. A maintainer will need to commit the screenshots manually for you (don't worry, they'll do it).
+
+## Resources
+
+- [Playwright UI Mode](https://playwright.dev/docs/test-ui-mode) - Interactive test debugging
+- [Playwright Debugging Guide](https://playwright.dev/docs/debug)
+- [act](https://github.com/nektos/act) - Run GitHub Actions locally for CI debugging

browser_tests/assets/basic-subgraph.json

@@ -0,0 +1,244 @@
+{
+  "id": "fe4562c0-3a0b-4614-bdec-7039a58d75b8",
+  "revision": 0,
+  "last_node_id": 2,
+  "last_link_id": 0,
+  "nodes": [
+    {
+      "id": 2,
+      "type": "e5fb1765-9323-4548-801a-5aead34d879e",
+      "pos": [
+        627.5973510742188,
+        423.0972900390625
+      ],
+      "size": [
+        144.15234375,
+        46
+      ],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": null
+        }
+      ],
+      "properties": {},
+      "widgets_values": []
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "e5fb1765-9323-4548-801a-5aead34d879e",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 2,
+          "lastLinkId": 4,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [
+            347.90441582814213,
+            417.3822440655296,
+            120,
+            60
+          ]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [
+            892.5973510742188,
+            416.0972900390625,
+            120,
+            60
+          ]
+        },
+        "inputs": [
+          {
+            "id": "c5cc99d8-a2b6-4bf3-8be7-d4949ef736cd",
+            "name": "positive",
+            "type": "CONDITIONING",
+            "linkIds": [
+              1
+            ],
+            "pos": {
+              "0": 447.9044189453125,
+              "1": 437.3822326660156
+            }
+          }
+        ],
+        "outputs": [
+          {
+            "id": "9bd488b9-e907-4c95-a7a4-85c5597a87af",
+            "name": "LATENT",
+            "type": "LATENT",
+            "linkIds": [
+              2
+            ],
+            "pos": {
+              "0": 912.5973510742188,
+              "1": 436.0972900390625
+            }
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 1,
+            "type": "KSampler",
+            "pos": [
+              554.8743286132812,
+              100.95539093017578
+            ],
+            "size": [
+              270,
+              262
+            ],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "model",
+                "name": "model",
+                "type": "MODEL",
+                "link": null
+              },
+              {
+                "localized_name": "positive",
+                "name": "positive",
+                "type": "CONDITIONING",
+                "link": 1
+              },
+              {
+                "localized_name": "negative",
+                "name": "negative",
+                "type": "CONDITIONING",
+                "link": null
+              },
+              {
+                "localized_name": "latent_image",
+                "name": "latent_image",
+                "type": "LATENT",
+                "link": null
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "LATENT",
+                "name": "LATENT",
+                "type": "LATENT",
+                "links": [
+                  2
+                ]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "KSampler"
+            },
+            "widgets_values": [
+              0,
+              "randomize",
+              20,
+              8,
+              "euler",
+              "simple",
+              1
+            ]
+          },
+          {
+            "id": 2,
+            "type": "VAEEncode",
+            "pos": [
+              685.1265869140625,
+              439.1734619140625
+            ],
+            "size": [
+              140,
+              46
+            ],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "pixels",
+                "name": "pixels",
+                "type": "IMAGE",
+                "link": null
+              },
+              {
+                "localized_name": "vae",
+                "name": "vae",
+                "type": "VAE",
+                "link": null
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "LATENT",
+                "name": "LATENT",
+                "type": "LATENT",
+                "links": [
+                  4
+                ]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "VAEEncode"
+            }
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 1,
+            "target_slot": 1,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 2,
+            "origin_id": 1,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "LATENT"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 0.8894351682943402,
+      "offset": [
+        58.7671207025881,
+        137.7124650620126
+      ]
+    },
+    "frontendVersion": "1.24.1"
+  },
+  "version": 0.4
+}

browser_tests/assets/nested-subgraph.json

@@ -0,0 +1,716 @@
+{
+  "id": "976d6e9a-927d-42db-abd4-96bfc0ecf8d9",
+  "revision": 0,
+  "last_node_id": 10,
+  "last_link_id": 11,
+  "nodes": [
+    {
+      "id": 10,
+      "type": "8beb610f-ddd1-4489-ae0d-2f732a4042ae",
+      "pos": [
+        532,
+        412.5
+      ],
+      "size": [
+        140,
+        46
+      ],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [
+            10
+          ]
+        },
+        {
+          "name": "VAE",
+          "type": "VAE",
+          "links": [
+            11
+          ]
+        }
+      ],
+      "title": "subgraph 2",
+      "properties": {},
+      "widgets_values": []
+    },
+    {
+      "id": 8,
+      "type": "VAEDecode",
+      "pos": [
+        758.2109985351562,
+        398.3681335449219
+      ],
+      "size": [
+        210,
+        46
+      ],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "samples",
+          "type": "LATENT",
+          "link": 10
+        },
+        {
+          "name": "vae",
+          "type": "VAE",
+          "link": 11
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "slot_index": 0,
+          "links": [
+            9
+          ]
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "VAEDecode"
+      },
+      "widgets_values": []
+    },
+    {
+      "id": 9,
+      "type": "SaveImage",
+      "pos": [
+        1028.9615478515625,
+        381.83746337890625
+      ],
+      "size": [
+        210,
+        270
+      ],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 9
+        }
+      ],
+      "outputs": [],
+      "properties": {},
+      "widgets_values": [
+        "ComfyUI"
+      ]
+    }
+  ],
+  "links": [
+    [
+      9,
+      8,
+      0,
+      9,
+      0,
+      "IMAGE"
+    ],
+    [
+      10,
+      10,
+      0,
+      8,
+      0,
+      "LATENT"
+    ],
+    [
+      11,
+      10,
+      1,
+      8,
+      1,
+      "VAE"
+    ]
+  ],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "8beb610f-ddd1-4489-ae0d-2f732a4042ae",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 10,
+          "lastLinkId": 14,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "subgraph 2",
+        "inputNode": {
+          "id": -10,
+          "bounding": [
+            -154,
+            415.5,
+            120,
+            40
+          ]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [
+            1238,
+            395.5,
+            120,
+            80
+          ]
+        },
+        "inputs": [],
+        "outputs": [
+          {
+            "id": "4d6c7e4e-971e-4f78-9218-9a604db53a4b",
+            "name": "LATENT",
+            "type": "LATENT",
+            "linkIds": [
+              7
+            ],
+            "localized_name": "LATENT",
+            "pos": {
+              "0": 1258,
+              "1": 415.5
+            }
+          },
+          {
+            "id": "f8201d4f-7fc6-4a1b-b8c9-9f0716d9c09a",
+            "name": "VAE",
+            "type": "VAE",
+            "linkIds": [
+              14
+            ],
+            "localized_name": "VAE",
+            "pos": {
+              "0": 1258,
+              "1": 435.5
+            }
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 6,
+            "type": "CLIPTextEncode",
+            "pos": [
+              415,
+              186
+            ],
+            "size": [
+              422.84503173828125,
+              164.31304931640625
+            ],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "clip",
+                "name": "clip",
+                "type": "CLIP",
+                "link": 13
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "CONDITIONING",
+                "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": 3,
+            "type": "KSampler",
+            "pos": [
+              863,
+              186
+            ],
+            "size": [
+              315,
+              262
+            ],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "model",
+                "name": "model",
+                "type": "MODEL",
+                "link": 12
+              },
+              {
+                "localized_name": "positive",
+                "name": "positive",
+                "type": "CONDITIONING",
+                "link": 4
+              },
+              {
+                "localized_name": "negative",
+                "name": "negative",
+                "type": "CONDITIONING",
+                "link": 10
+              },
+              {
+                "localized_name": "latent_image",
+                "name": "latent_image",
+                "type": "LATENT",
+                "link": 11
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "LATENT",
+                "name": "LATENT",
+                "type": "LATENT",
+                "slot_index": 0,
+                "links": [
+                  7
+                ]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "KSampler"
+            },
+            "widgets_values": [
+              32115495257102,
+              "randomize",
+              20,
+              8,
+              "euler",
+              "normal",
+              1
+            ]
+          },
+          {
+            "id": 10,
+            "type": "dbe5763f-440b-47b4-82ac-454f1f98b0e3",
+            "pos": [
+              194.13900756835938,
+              657.3333740234375
+            ],
+            "size": [
+              140,
+              106
+            ],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "localized_name": "CONDITIONING",
+                "name": "CONDITIONING",
+                "type": "CONDITIONING",
+                "links": [
+                  10
+                ]
+              },
+              {
+                "localized_name": "LATENT",
+                "name": "LATENT",
+                "type": "LATENT",
+                "links": [
+                  11
+                ]
+              },
+              {
+                "localized_name": "MODEL",
+                "name": "MODEL",
+                "type": "MODEL",
+                "links": [
+                  12
+                ]
+              },
+              {
+                "localized_name": "CLIP",
+                "name": "CLIP",
+                "type": "CLIP",
+                "links": [
+                  13
+                ]
+              },
+              {
+                "localized_name": "VAE",
+                "name": "VAE",
+                "type": "VAE",
+                "links": [
+                  14
+                ]
+              }
+            ],
+            "title": "subgraph 3",
+            "properties": {},
+            "widgets_values": []
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 4,
+            "origin_id": 6,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 1,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 7,
+            "origin_id": 3,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "LATENT"
+          },
+          {
+            "id": 10,
+            "origin_id": 10,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 2,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 11,
+            "origin_id": 10,
+            "origin_slot": 1,
+            "target_id": 3,
+            "target_slot": 3,
+            "type": "LATENT"
+          },
+          {
+            "id": 12,
+            "origin_id": 10,
+            "origin_slot": 2,
+            "target_id": 3,
+            "target_slot": 0,
+            "type": "MODEL"
+          },
+          {
+            "id": 13,
+            "origin_id": 10,
+            "origin_slot": 3,
+            "target_id": 6,
+            "target_slot": 0,
+            "type": "CLIP"
+          },
+          {
+            "id": 14,
+            "origin_id": 10,
+            "origin_slot": 4,
+            "target_id": -20,
+            "target_slot": 1,
+            "type": "VAE"
+          }
+        ],
+        "extra": {}
+      },
+      {
+        "id": "dbe5763f-440b-47b4-82ac-454f1f98b0e3",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 9,
+          "lastLinkId": 9,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "subgraph 3",
+        "inputNode": {
+          "id": -10,
+          "bounding": [
+            -154,
+            517,
+            120,
+            40
+          ]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [
+            898.2780151367188,
+            467,
+            128.6640625,
+            140
+          ]
+        },
+        "inputs": [],
+        "outputs": [
+          {
+            "id": "b4882169-329b-43f6-a373-81abfbdea55b",
+            "name": "CONDITIONING",
+            "type": "CONDITIONING",
+            "linkIds": [
+              6
+            ],
+            "localized_name": "CONDITIONING",
+            "pos": {
+              "0": 918.2780151367188,
+              "1": 487
+            }
+          },
+          {
+            "id": "01f51f96-a741-428e-8772-9557ee50b609",
+            "name": "LATENT",
+            "type": "LATENT",
+            "linkIds": [
+              2
+            ],
+            "localized_name": "LATENT",
+            "pos": {
+              "0": 918.2780151367188,
+              "1": 507
+            }
+          },
+          {
+            "id": "47fa906e-d80b-45c3-a596-211a0e59d4a1",
+            "name": "MODEL",
+            "type": "MODEL",
+            "linkIds": [
+              1
+            ],
+            "localized_name": "MODEL",
+            "pos": {
+              "0": 918.2780151367188,
+              "1": 527
+            }
+          },
+          {
+            "id": "f03dccd7-10e8-4513-9994-15854a92d192",
+            "name": "CLIP",
+            "type": "CLIP",
+            "linkIds": [
+              3
+            ],
+            "localized_name": "CLIP",
+            "pos": {
+              "0": 918.2780151367188,
+              "1": 547
+            }
+          },
+          {
+            "id": "a666877f-e34f-49bc-8a78-b26156656b83",
+            "name": "VAE",
+            "type": "VAE",
+            "linkIds": [
+              8
+            ],
+            "localized_name": "VAE",
+            "pos": {
+              "0": 918.2780151367188,
+              "1": 567
+            }
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 7,
+            "type": "CLIPTextEncode",
+            "pos": [
+              413,
+              389
+            ],
+            "size": [
+              425.27801513671875,
+              180.6060791015625
+            ],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "clip",
+                "name": "clip",
+                "type": "CLIP",
+                "link": 5
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "CONDITIONING",
+                "name": "CONDITIONING",
+                "type": "CONDITIONING",
+                "slot_index": 0,
+                "links": [
+                  6
+                ]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "CLIPTextEncode"
+            },
+            "widgets_values": [
+              "text, watermark"
+            ]
+          },
+          {
+            "id": 5,
+            "type": "EmptyLatentImage",
+            "pos": [
+              473,
+              609
+            ],
+            "size": [
+              315,
+              106
+            ],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "localized_name": "LATENT",
+                "name": "LATENT",
+                "type": "LATENT",
+                "slot_index": 0,
+                "links": [
+                  2
+                ]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "EmptyLatentImage"
+            },
+            "widgets_values": [
+              512,
+              512,
+              1
+            ]
+          },
+          {
+            "id": 4,
+            "type": "CheckpointLoaderSimple",
+            "pos": [
+              26,
+              474
+            ],
+            "size": [
+              315,
+              98
+            ],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "localized_name": "MODEL",
+                "name": "MODEL",
+                "type": "MODEL",
+                "slot_index": 0,
+                "links": [
+                  1
+                ]
+              },
+              {
+                "localized_name": "CLIP",
+                "name": "CLIP",
+                "type": "CLIP",
+                "slot_index": 1,
+                "links": [
+                  3,
+                  5
+                ]
+              },
+              {
+                "localized_name": "VAE",
+                "name": "VAE",
+                "type": "VAE",
+                "slot_index": 2,
+                "links": [
+                  8
+                ]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "CheckpointLoaderSimple"
+            },
+            "widgets_values": [
+              "v1-5-pruned-emaonly-fp16.safetensors"
+            ]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 5,
+            "origin_id": 4,
+            "origin_slot": 1,
+            "target_id": 7,
+            "target_slot": 0,
+            "type": "CLIP"
+          },
+          {
+            "id": 6,
+            "origin_id": 7,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 2,
+            "origin_id": 5,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 1,
+            "type": "LATENT"
+          },
+          {
+            "id": 1,
+            "origin_id": 4,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 2,
+            "type": "MODEL"
+          },
+          {
+            "id": 3,
+            "origin_id": 4,
+            "origin_slot": 1,
+            "target_id": -20,
+            "target_slot": 3,
+            "type": "CLIP"
+          },
+          {
+            "id": 8,
+            "origin_id": 4,
+            "origin_slot": 2,
+            "target_id": -20,
+            "target_slot": 4,
+            "type": "VAE"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "frontendVersion": "1.24.0-1"
+  },
+  "version": 0.4
+}

browser_tests/assets/subgraph-with-multiple-promoted-widgets.json

@@ -0,0 +1,412 @@
+{
+  "id": "c4a254bb-935e-4013-b380-5e36954de4b0",
+  "revision": 0,
+  "last_node_id": 11,
+  "last_link_id": 9,
+  "nodes": [
+    {
+      "id": 11,
+      "type": "422723e8-4bf6-438c-823f-881ca81acead",
+      "pos": [
+        791.59912109375,
+        386.13336181640625
+      ],
+      "size": [
+        210,
+        202
+      ],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": null
+        },
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "negative",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "latent_image",
+          "type": "LATENT",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": null
+        }
+      ],
+      "properties": {},
+      "widgets_values": [
+        "",
+        ""
+      ]
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "422723e8-4bf6-438c-823f-881ca81acead",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 12,
+          "lastLinkId": 16,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [
+            481.59912109375,
+            379.13336181640625,
+            120,
+            160
+          ]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [
+            1121.59912109375,
+            379.13336181640625,
+            128.6640625,
+            60
+          ]
+        },
+        "inputs": [
+          {
+            "id": "0f07c10e-5705-4764-9b24-b69606c6dbcc",
+            "name": "text",
+            "type": "STRING",
+            "linkIds": [
+              10
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 399.13336181640625
+            }
+          },
+          {
+            "id": "736e5a03-0f7f-4e48-93e4-fd66ea6c30f1",
+            "name": "text_1",
+            "type": "STRING",
+            "linkIds": [
+              11
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 419.13336181640625
+            }
+          },
+          {
+            "id": "b62e7a0b-cc7e-4ca5-a4e1-c81607a13f58",
+            "name": "model",
+            "type": "MODEL",
+            "linkIds": [
+              13
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 439.13336181640625
+            }
+          },
+          {
+            "id": "7a2628da-4879-4f82-a7d3-7b1c00db50a5",
+            "name": "positive",
+            "type": "CONDITIONING",
+            "linkIds": [
+              14
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 459.13336181640625
+            }
+          },
+          {
+            "id": "651cf4ad-e8bf-47f6-b181-8f8aeacd6669",
+            "name": "negative",
+            "type": "CONDITIONING",
+            "linkIds": [
+              15
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 479.13336181640625
+            }
+          },
+          {
+            "id": "c41765ea-61ef-4a77-8cc6-74113903078f",
+            "name": "latent_image",
+            "type": "LATENT",
+            "linkIds": [
+              16
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 499.13336181640625
+            }
+          }
+        ],
+        "outputs": [
+          {
+            "id": "55dd1505-12bd-4cb4-8e75-031a97bb4387",
+            "name": "CONDITIONING",
+            "type": "CONDITIONING",
+            "linkIds": [
+              12
+            ],
+            "pos": {
+              "0": 1141.59912109375,
+              "1": 399.13336181640625
+            }
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 10,
+            "type": "CLIPTextEncode",
+            "pos": [
+              661.59912109375,
+              314.13336181640625
+            ],
+            "size": [
+              400,
+              200
+            ],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "clip",
+                "name": "clip",
+                "type": "CLIP",
+                "link": null
+              },
+              {
+                "localized_name": "text",
+                "name": "text",
+                "type": "STRING",
+                "widget": {
+                  "name": "text"
+                },
+                "link": 10
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "CONDITIONING",
+                "name": "CONDITIONING",
+                "type": "CONDITIONING",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "CLIPTextEncode"
+            },
+            "widgets_values": [
+              ""
+            ]
+          },
+          {
+            "id": 11,
+            "type": "CLIPTextEncode",
+            "pos": [
+              668.755859375,
+              571.7766723632812
+            ],
+            "size": [
+              400,
+              200
+            ],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "clip",
+                "name": "clip",
+                "type": "CLIP",
+                "link": null
+              },
+              {
+                "localized_name": "text",
+                "name": "text",
+                "type": "STRING",
+                "widget": {
+                  "name": "text"
+                },
+                "link": 11
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "CONDITIONING",
+                "name": "CONDITIONING",
+                "type": "CONDITIONING",
+                "links": [
+                  12
+                ]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "CLIPTextEncode"
+            },
+            "widgets_values": [
+              ""
+            ]
+          },
+          {
+            "id": 12,
+            "type": "KSampler",
+            "pos": [
+              671.7379760742188,
+              1.621593713760376
+            ],
+            "size": [
+              270,
+              262
+            ],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "model",
+                "name": "model",
+                "type": "MODEL",
+                "link": 13
+              },
+              {
+                "localized_name": "positive",
+                "name": "positive",
+                "type": "CONDITIONING",
+                "link": 14
+              },
+              {
+                "localized_name": "negative",
+                "name": "negative",
+                "type": "CONDITIONING",
+                "link": 15
+              },
+              {
+                "localized_name": "latent_image",
+                "name": "latent_image",
+                "type": "LATENT",
+                "link": 16
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "LATENT",
+                "name": "LATENT",
+                "type": "LATENT",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "KSampler"
+            },
+            "widgets_values": [
+              0,
+              "randomize",
+              20,
+              8,
+              "euler",
+              "simple",
+              1
+            ]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 10,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 10,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 11,
+            "origin_id": -10,
+            "origin_slot": 1,
+            "target_id": 11,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 12,
+            "origin_id": 11,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 13,
+            "origin_id": -10,
+            "origin_slot": 2,
+            "target_id": 12,
+            "target_slot": 0,
+            "type": "MODEL"
+          },
+          {
+            "id": 14,
+            "origin_id": -10,
+            "origin_slot": 3,
+            "target_id": 12,
+            "target_slot": 1,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 15,
+            "origin_id": -10,
+            "origin_slot": 4,
+            "target_id": 12,
+            "target_slot": 2,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 16,
+            "origin_id": -10,
+            "origin_slot": 5,
+            "target_id": 12,
+            "target_slot": 3,
+            "type": "LATENT"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 0.9581355200690549,
+      "offset": [
+        184.687451089395,
+        80.38288288288285
+      ]
+    },
+    "frontendVersion": "1.24.1"
+  },
+  "version": 0.4
+}

browser_tests/assets/subgraph-with-promoted-text-widget.json

@@ -0,0 +1,341 @@
+{
+  "id": "c4a254bb-935e-4013-b380-5e36954de4b0",
+  "revision": 0,
+  "last_node_id": 11,
+  "last_link_id": 9,
+  "nodes": [
+    {
+      "id": 11,
+      "type": "422723e8-4bf6-438c-823f-881ca81acead",
+      "pos": [
+        400,
+        300
+      ],
+      "size": [
+        210,
+        168
+      ],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "clip",
+          "type": "CLIP",
+          "link": null
+        },
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": null
+        },
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "negative",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "latent_image",
+          "type": "LATENT",
+          "link": null
+        }
+      ],
+      "outputs": [],
+      "properties": {},
+      "widgets_values": [
+        ""
+      ]
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "422723e8-4bf6-438c-823f-881ca81acead",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 11,
+          "lastLinkId": 15,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [
+            481.59912109375,
+            379.13336181640625,
+            120,
+            160
+          ]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [
+            1121.59912109375,
+            379.13336181640625,
+            120,
+            40
+          ]
+        },
+        "inputs": [
+          {
+            "id": "0f07c10e-5705-4764-9b24-b69606c6dbcc",
+            "name": "text",
+            "type": "STRING",
+            "linkIds": [
+              10
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 399.13336181640625
+            }
+          },
+          {
+            "id": "214a5060-24dd-4299-ab78-8027dc5b9c59",
+            "name": "clip",
+            "type": "CLIP",
+            "linkIds": [
+              11
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 419.13336181640625
+            }
+          },
+          {
+            "id": "8ab94c5d-e7df-433c-9177-482a32340552",
+            "name": "model",
+            "type": "MODEL",
+            "linkIds": [
+              12
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 439.13336181640625
+            }
+          },
+          {
+            "id": "8a4cd719-8c67-473b-9b44-ac0582d02641",
+            "name": "positive",
+            "type": "CONDITIONING",
+            "linkIds": [
+              13
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 459.13336181640625
+            }
+          },
+          {
+            "id": "a78d6b3a-ad40-4300-b0a5-2cdbdb8dc135",
+            "name": "negative",
+            "type": "CONDITIONING",
+            "linkIds": [
+              14
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 479.13336181640625
+            }
+          },
+          {
+            "id": "4c7abe0c-902d-49ef-a5b0-cbf02b50b693",
+            "name": "latent_image",
+            "type": "LATENT",
+            "linkIds": [
+              15
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 499.13336181640625
+            }
+          }
+        ],
+        "outputs": [],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 10,
+            "type": "CLIPTextEncode",
+            "pos": [
+              661.59912109375,
+              314.13336181640625
+            ],
+            "size": [
+              400,
+              200
+            ],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "clip",
+                "name": "clip",
+                "type": "CLIP",
+                "link": 11
+              },
+              {
+                "localized_name": "text",
+                "name": "text",
+                "type": "STRING",
+                "widget": {
+                  "name": "text"
+                },
+                "link": 10
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "CONDITIONING",
+                "name": "CONDITIONING",
+                "type": "CONDITIONING",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "CLIPTextEncode"
+            },
+            "widgets_values": [
+              ""
+            ]
+          },
+          {
+            "id": 11,
+            "type": "KSampler",
+            "pos": [
+              674.1234741210938,
+              570.5839233398438
+            ],
+            "size": [
+              270,
+              262
+            ],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "model",
+                "name": "model",
+                "type": "MODEL",
+                "link": 12
+              },
+              {
+                "localized_name": "positive",
+                "name": "positive",
+                "type": "CONDITIONING",
+                "link": 13
+              },
+              {
+                "localized_name": "negative",
+                "name": "negative",
+                "type": "CONDITIONING",
+                "link": 14
+              },
+              {
+                "localized_name": "latent_image",
+                "name": "latent_image",
+                "type": "LATENT",
+                "link": 15
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "LATENT",
+                "name": "LATENT",
+                "type": "LATENT",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "KSampler"
+            },
+            "widgets_values": [
+              0,
+              "randomize",
+              20,
+              8,
+              "euler",
+              "simple",
+              1
+            ]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 10,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 10,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 11,
+            "origin_id": -10,
+            "origin_slot": 1,
+            "target_id": 10,
+            "target_slot": 0,
+            "type": "CLIP"
+          },
+          {
+            "id": 12,
+            "origin_id": -10,
+            "origin_slot": 2,
+            "target_id": 11,
+            "target_slot": 0,
+            "type": "MODEL"
+          },
+          {
+            "id": 13,
+            "origin_id": -10,
+            "origin_slot": 3,
+            "target_id": 11,
+            "target_slot": 1,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 14,
+            "origin_id": -10,
+            "origin_slot": 4,
+            "target_id": 11,
+            "target_slot": 2,
+            "type": "CONDITIONING"
+          },
+          {
+            "id": 15,
+            "origin_id": -10,
+            "origin_slot": 5,
+            "target_id": 11,
+            "target_slot": 3,
+            "type": "LATENT"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 0.9581355200690549,
+      "offset": [
+        258.6405769416877,
+        147.17927927927929
+      ]
+    },
+    "frontendVersion": "1.24.1"
+  },
+  "version": 0.4
+}

browser_tests/assets/subgraph-with-text-widget.json

@@ -0,0 +1,153 @@
+{
+  "id": "c4a254bb-935e-4013-b380-5e36954de4b0",
+  "revision": 0,
+  "last_node_id": 11,
+  "last_link_id": 9,
+  "nodes": [
+    {
+      "id": 11,
+      "type": "422723e8-4bf6-438c-823f-881ca81acead",
+      "pos": [
+        791.59912109375,
+        386.13336181640625
+      ],
+      "size": [
+        140,
+        26
+      ],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "clip",
+          "type": "CLIP",
+          "link": null
+        }
+      ],
+      "outputs": [],
+      "properties": {},
+      "widgets_values": []
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "422723e8-4bf6-438c-823f-881ca81acead",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 10,
+          "lastLinkId": 10,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [
+            481.59912109375,
+            379.13336181640625,
+            120,
+            60
+          ]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [
+            1121.59912109375,
+            379.13336181640625,
+            120,
+            40
+          ]
+        },
+        "inputs": [
+          {
+            "id": "79e69fca-ad12-499b-8d9b-9f1656b85354",
+            "name": "clip",
+            "type": "CLIP",
+            "linkIds": [
+              10
+            ],
+            "pos": {
+              "0": 581.59912109375,
+              "1": 399.13336181640625
+            }
+          }
+        ],
+        "outputs": [],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 10,
+            "type": "CLIPTextEncode",
+            "pos": [
+              661.59912109375,
+              314.13336181640625
+            ],
+            "size": [
+              400,
+              200
+            ],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "clip",
+                "name": "clip",
+                "type": "CLIP",
+                "link": 10
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "CONDITIONING",
+                "name": "CONDITIONING",
+                "type": "CONDITIONING",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "CLIPTextEncode"
+            },
+            "widgets_values": [
+              ""
+            ]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 10,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 10,
+            "target_slot": 0,
+            "type": "CLIP"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "frontendVersion": "1.24.1",
+    "VHS_latentpreview": false,
+    "VHS_latentpreviewrate": 0,
+    "VHS_MetadataImage": true,
+    "VHS_KeepIntermediate": true,
+    "ds": {
+      "scale": 0.9581355200690549,
+      "offset": [
+        258.6405769416877,
+        147.17927927927929
+      ]
+    }
+  },
+  "version": 0.4
+}

browser_tests/fixtures/ComfyPage.ts

@@ -21,7 +21,7 @@ import {
 } from './components/SidebarTab'
 import { Topbar } from './components/Topbar'
 import type { Position, Size } from './types'
-import { NodeReference } from './utils/litegraphUtils'
+import { NodeReference, SubgraphSlotReference } from './utils/litegraphUtils'
 import TaskHistory from './utils/taskHistory'
 
 dotenv.config()
@@ -168,7 +168,7 @@ export class ComfyPage {
     this.menu = new ComfyMenu(page)
     this.actionbar = new ComfyActionbar(page)
     this.templates = new ComfyTemplates(page)
-    this.settingDialog = new SettingDialog(page)
+    this.settingDialog = new SettingDialog(page, this)
     this.confirmDialog = new ConfirmDialog(page)
   }
 
@@ -563,6 +563,7 @@ export class ComfyPage {
         if (fileName.endsWith('.webm')) return 'video/webm'
         if (fileName.endsWith('.json')) return 'application/json'
         if (fileName.endsWith('.glb')) return 'model/gltf-binary'
+        if (fileName.endsWith('.avif')) return 'image/avif'
         return 'application/octet-stream'
       }
 
@@ -776,11 +777,524 @@ export class ComfyPage {
     await this.nextFrame()
   }
 
+  /**
+   * Clicks on a litegraph context menu item (uses .litemenu-entry selector).
+   * Use this for canvas/node context menus, not PrimeVue menus.
+   */
+  async clickLitegraphContextMenuItem(name: string): Promise<void> {
+    await this.page.locator(`.litemenu-entry:has-text("${name}")`).click()
+    await this.nextFrame()
+  }
+
+  /**
+   * Right-clicks on a subgraph input slot to open the context menu.
+   * Must be called when inside a subgraph.
+   *
+   * This method uses the actual slot positions from the subgraph.inputs array,
+   * which contain the correct coordinates for each input slot. These positions
+   * are different from the visual node positions and are specifically where
+   * the slots are rendered on the input node.
+   *
+   * @param inputName Optional name of the specific input slot to target (e.g., 'text').
+   *                  If not provided, tries all available input slots until one works.
+   * @returns Promise that resolves when the context menu appears
+   */
+  async rightClickSubgraphInputSlot(inputName?: string): Promise<void> {
+    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
+    })
+  }
+
+  /**
+   * Right-clicks on a subgraph output slot to open the context menu.
+   * Must be called when inside a subgraph.
+   *
+   * Similar to rightClickSubgraphInputSlot but for output slots.
+   *
+   * @param outputName Optional name of the specific output slot to target.
+   *                   If not provided, tries all available output slots until one works.
+   * @returns Promise that resolves when the context menu appears
+   */
+  async rightClickSubgraphOutputSlot(outputName?: string): Promise<void> {
+    const foundSlot = await this.page.evaluate(async (targetOutputName) => {
+      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 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
+    })
+  }
+
+  /**
+   * Get a reference to a subgraph input slot
+   */
+  async getSubgraphInputSlot(
+    slotName?: string
+  ): Promise<SubgraphSlotReference> {
+    return new SubgraphSlotReference('input', slotName || '', this)
+  }
+
+  /**
+   * Get a reference to a subgraph output slot
+   */
+  async getSubgraphOutputSlot(
+    slotName?: string
+  ): Promise<SubgraphSlotReference> {
+    return new SubgraphSlotReference('output', slotName || '', this)
+  }
+
+  /**
+   * Connect a regular node output to a subgraph input.
+   * This creates a new input slot on the subgraph if targetInputName is not provided.
+   */
+  async connectToSubgraphInput(
+    sourceNode: NodeReference,
+    sourceSlotIndex: number,
+    targetInputName?: string
+  ): Promise<void> {
+    const sourceSlot = await sourceNode.getOutput(sourceSlotIndex)
+    const targetSlot = await this.getSubgraphInputSlot(targetInputName)
+
+    const targetPosition = targetInputName
+      ? await targetSlot.getPosition() // Connect to existing slot
+      : await targetSlot.getOpenSlotPosition() // Create new slot
+
+    await this.dragAndDrop(await sourceSlot.getPosition(), targetPosition)
+    await this.nextFrame()
+  }
+
+  /**
+   * Connect a subgraph input to a regular node input.
+   * This creates a new input slot on the subgraph if sourceInputName is not provided.
+   */
+  async connectFromSubgraphInput(
+    targetNode: NodeReference,
+    targetSlotIndex: number,
+    sourceInputName?: string
+  ): Promise<void> {
+    const sourceSlot = await this.getSubgraphInputSlot(sourceInputName)
+    const targetSlot = await targetNode.getInput(targetSlotIndex)
+
+    const sourcePosition = sourceInputName
+      ? await sourceSlot.getPosition() // Connect from existing slot
+      : await sourceSlot.getOpenSlotPosition() // Create new slot
+
+    const targetPosition = await targetSlot.getPosition()
+
+    // Debug: Log the positions we're trying to use
+    console.log('Drag positions:', {
+      source: sourcePosition,
+      target: targetPosition
+    })
+
+    await this.dragAndDrop(sourcePosition, targetPosition)
+    await this.nextFrame()
+  }
+
+  /**
+   * Connect a regular node output to a subgraph output.
+   * This creates a new output slot on the subgraph if targetOutputName is not provided.
+   */
+  async connectToSubgraphOutput(
+    sourceNode: NodeReference,
+    sourceSlotIndex: number,
+    targetOutputName?: string
+  ): Promise<void> {
+    const sourceSlot = await sourceNode.getOutput(sourceSlotIndex)
+    const targetSlot = await this.getSubgraphOutputSlot(targetOutputName)
+
+    const targetPosition = targetOutputName
+      ? await targetSlot.getPosition() // Connect to existing slot
+      : await targetSlot.getOpenSlotPosition() // Create new slot
+
+    await this.dragAndDrop(await sourceSlot.getPosition(), targetPosition)
+    await this.nextFrame()
+  }
+
+  /**
+   * Connect a subgraph output to a regular node input.
+   * This creates a new output slot on the subgraph if sourceOutputName is not provided.
+   */
+  async connectFromSubgraphOutput(
+    targetNode: NodeReference,
+    targetSlotIndex: number,
+    sourceOutputName?: string
+  ): Promise<void> {
+    const sourceSlot = await this.getSubgraphOutputSlot(sourceOutputName)
+    const targetSlot = await targetNode.getInput(targetSlotIndex)
+
+    const sourcePosition = sourceOutputName
+      ? await sourceSlot.getPosition() // Connect from existing slot
+      : await sourceSlot.getOpenSlotPosition() // Create new slot
+
+    await this.dragAndDrop(sourcePosition, await targetSlot.getPosition())
+    await this.nextFrame()
+  }
+
+  /**
+   * Add a visual marker at a position for debugging
+   */
+  async debugAddMarker(
+    position: Position,
+    id: string = 'debug-marker'
+  ): Promise<void> {
+    await this.page.evaluate(
+      ([pos, markerId]) => {
+        // Remove existing marker if present
+        const existing = document.getElementById(markerId)
+        if (existing) existing.remove()
+
+        // Create marker
+        const marker = document.createElement('div')
+        marker.id = markerId
+        marker.style.position = 'fixed'
+        marker.style.left = `${pos.x - 10}px`
+        marker.style.top = `${pos.y - 10}px`
+        marker.style.width = '20px'
+        marker.style.height = '20px'
+        marker.style.border = '2px solid red'
+        marker.style.borderRadius = '50%'
+        marker.style.backgroundColor = 'rgba(255, 0, 0, 0.3)'
+        marker.style.pointerEvents = 'none'
+        marker.style.zIndex = '10000'
+        document.body.appendChild(marker)
+      },
+      [position, id] as const
+    )
+  }
+
+  /**
+   * Remove debug markers
+   */
+  async debugRemoveMarkers(): Promise<void> {
+    await this.page.evaluate(() => {
+      document
+        .querySelectorAll('[id^="debug-marker"]')
+        .forEach((el) => el.remove())
+    })
+  }
+
+  /**
+   * Take a screenshot and attach it to the test report for debugging
+   * This is a convenience method that combines screenshot capture and test attachment
+   *
+   * @param testInfo The Playwright TestInfo object (from test parameters)
+   * @param name Name for the attachment
+   * @param options Optional screenshot options (defaults to page screenshot)
+   */
+  async debugAttachScreenshot(
+    testInfo: any,
+    name: string,
+    options?: {
+      fullPage?: boolean
+      element?: 'canvas' | 'page'
+      markers?: Array<{ position: Position; id?: string }>
+    }
+  ): Promise<void> {
+    // Add markers if requested
+    if (options?.markers) {
+      for (const marker of options.markers) {
+        await this.debugAddMarker(marker.position, marker.id)
+      }
+    }
+
+    // Take screenshot - default to page if not specified
+    let screenshot: Buffer
+    const targetElement = options?.element || 'page'
+
+    if (targetElement === 'canvas') {
+      screenshot = await this.canvas.screenshot()
+    } else if (options?.fullPage) {
+      screenshot = await this.page.screenshot({ fullPage: true })
+    } else {
+      screenshot = await this.page.screenshot()
+    }
+
+    // Attach to test report
+    await testInfo.attach(name, {
+      body: screenshot,
+      contentType: 'image/png'
+    })
+
+    // Clean up markers if we added any
+    if (options?.markers) {
+      await this.debugRemoveMarkers()
+    }
+  }
+
   async doubleClickCanvas() {
     await this.page.mouse.dblclick(10, 10, { delay: 5 })
     await this.nextFrame()
   }
 
+  /**
+   * Capture the canvas as a PNG and save it for debugging
+   */
+  async debugSaveCanvasScreenshot(filename: string): Promise<void> {
+    await this.page.evaluate(async (filename) => {
+      const canvas = document.getElementById(
+        'graph-canvas'
+      ) as HTMLCanvasElement
+      if (!canvas) {
+        throw new Error('Canvas not found')
+      }
+
+      // Convert canvas to blob
+      return new Promise<void>((resolve) => {
+        canvas.toBlob(async (blob) => {
+          if (!blob) {
+            throw new Error('Failed to create blob from canvas')
+          }
+
+          // Create a download link and trigger it
+          const url = URL.createObjectURL(blob)
+          const a = document.createElement('a')
+          a.href = url
+          a.download = filename
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+          URL.revokeObjectURL(url)
+          resolve()
+        }, 'image/png')
+      })
+    }, filename)
+
+    // Wait a bit for the download to process
+    await this.page.waitForTimeout(500)
+  }
+
+  /**
+   * Capture canvas as base64 data URL for inspection
+   */
+  async debugGetCanvasDataURL(): Promise<string> {
+    return await this.page.evaluate(() => {
+      const canvas = document.getElementById(
+        'graph-canvas'
+      ) as HTMLCanvasElement
+      if (!canvas) {
+        throw new Error('Canvas not found')
+      }
+      return canvas.toDataURL('image/png')
+    })
+  }
+
+  /**
+   * Create an overlay div with the canvas image for easier Playwright screenshot
+   */
+  async debugShowCanvasOverlay(): Promise<void> {
+    await this.page.evaluate(() => {
+      const canvas = document.getElementById(
+        'graph-canvas'
+      ) as HTMLCanvasElement
+      if (!canvas) {
+        throw new Error('Canvas not found')
+      }
+
+      // Remove existing overlay if present
+      const existingOverlay = document.getElementById('debug-canvas-overlay')
+      if (existingOverlay) {
+        existingOverlay.remove()
+      }
+
+      // Create overlay div
+      const overlay = document.createElement('div')
+      overlay.id = 'debug-canvas-overlay'
+      overlay.style.position = 'fixed'
+      overlay.style.top = '0'
+      overlay.style.left = '0'
+      overlay.style.zIndex = '9999'
+      overlay.style.backgroundColor = 'white'
+      overlay.style.padding = '10px'
+      overlay.style.border = '2px solid red'
+
+      // Create image from canvas
+      const img = document.createElement('img')
+      img.src = canvas.toDataURL('image/png')
+      img.style.maxWidth = '800px'
+      img.style.maxHeight = '600px'
+      overlay.appendChild(img)
+
+      document.body.appendChild(overlay)
+    })
+  }
+
+  /**
+   * Remove the debug canvas overlay
+   */
+  async debugHideCanvasOverlay(): Promise<void> {
+    await this.page.evaluate(() => {
+      const overlay = document.getElementById('debug-canvas-overlay')
+      if (overlay) {
+        overlay.remove()
+      }
+    })
+  }
+
   async clickEmptyLatentNode() {
     await this.canvas.click({
       position: {

browser_tests/fixtures/components/SettingDialog.ts

@@ -1,15 +1,19 @@
 import { Page } from '@playwright/test'
 
+import { ComfyPage } from '../ComfyPage'
+
 export class SettingDialog {
-  constructor(public readonly page: Page) {}
+  constructor(
+    public readonly page: Page,
+    public readonly comfyPage: ComfyPage
+  ) {}
 
   get root() {
     return this.page.locator('div.settings-container')
   }
 
   async open() {
-    const button = this.page.locator('button.comfy-settings-btn:visible')
-    await button.click()
+    await this.comfyPage.executeCommand('Comfy.ShowSettingsDialog')
     await this.page.waitForSelector('div.settings-container')
   }
 

browser_tests/fixtures/components/Topbar.ts

@@ -15,10 +15,6 @@ export class Topbar {
       .innerText()
   }
 
-  async openSubmenuMobile() {
-    await this.page.locator('.p-menubar-mobile .p-menubar-button').click()
-  }
-
   getMenuItem(itemLabel: string): Locator {
     return this.page.locator(`.p-menubar-item-label:text-is("${itemLabel}")`)
   }
@@ -68,31 +64,41 @@ export class Topbar {
     await this.getSaveDialog().waitFor({ state: 'hidden', timeout: 500 })
   }
 
+  async openTopbarMenu() {
+    await this.page.locator('.comfyui-logo-wrapper').click()
+    const menu = this.page.locator('.comfy-command-menu')
+    await menu.waitFor({ state: 'visible' })
+    return menu
+  }
+
   async triggerTopbarCommand(path: string[]) {
     if (path.length < 2) {
       throw new Error('Path is too short')
     }
 
+    const menu = await this.openTopbarMenu()
     const tabName = path[0]
-    const topLevelMenu = this.page.locator(
-      `.top-menubar .p-menubar-item-label:text-is("${tabName}")`
+    const topLevelMenuItem = this.page.locator(
+      `.p-menubar-item-label:text-is("${tabName}")`
     )
+    const topLevelMenu = menu
+      .locator('.p-tieredmenu-item')
+      .filter({ has: topLevelMenuItem })
     await topLevelMenu.waitFor({ state: 'visible' })
-    await topLevelMenu.click()
+    await topLevelMenu.hover()
 
+    let currentMenu = topLevelMenu
     for (let i = 1; i < path.length; i++) {
       const commandName = path[i]
-      const menuItem = this.page
+      const menuItem = currentMenu
         .locator(
-          `.top-menubar .p-menubar-submenu .p-menubar-item:has-text("${commandName}")`
+          `.p-tieredmenu-submenu .p-tieredmenu-item:has-text("${commandName}")`
         )
         .first()
       await menuItem.waitFor({ state: 'visible' })
       await menuItem.hover()
-
-      if (i === path.length - 1) {
-        await menuItem.click()
-      }
+      currentMenu = menuItem
     }
+    await currentMenu.click()
   }
 }

browser_tests/fixtures/utils/litegraphUtils.ts

@@ -12,6 +12,128 @@ export const getMiddlePoint = (pos1: Position, pos2: Position) => {
   }
 }
 
+export class SubgraphSlotReference {
+  constructor(
+    readonly type: 'input' | 'output',
+    readonly slotName: string,
+    readonly comfyPage: ComfyPage
+  ) {}
+
+  async getPosition(): Promise<Position> {
+    const pos: [number, number] = await this.comfyPage.page.evaluate(
+      ([type, slotName]) => {
+        const currentGraph = window['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'
+          )
+        }
+
+        const slots =
+          type === 'input' ? currentGraph.inputs : currentGraph.outputs
+        if (!slots || slots.length === 0) {
+          throw new Error(`No ${type} slots found in subgraph`)
+        }
+
+        // Find the specific slot or use the first one if no name specified
+        const slot = slotName
+          ? slots.find((s) => s.name === slotName)
+          : slots[0]
+
+        if (!slot) {
+          throw new Error(`${type} slot '${slotName}' not found`)
+        }
+
+        if (!slot.pos) {
+          throw new Error(`${type} slot '${slotName}' has no position`)
+        }
+
+        // Convert from offset to canvas coordinates
+        const canvasPos = window['app'].canvas.ds.convertOffsetToCanvas([
+          slot.pos[0],
+          slot.pos[1]
+        ])
+        return canvasPos
+      },
+      [this.type, this.slotName] as const
+    )
+
+    return {
+      x: pos[0],
+      y: pos[1]
+    }
+  }
+
+  async getOpenSlotPosition(): Promise<Position> {
+    const pos: [number, number] = await this.comfyPage.page.evaluate(
+      ([type]) => {
+        const currentGraph = window['app'].canvas.graph
+
+        if (currentGraph.constructor.name !== 'Subgraph') {
+          throw new Error(
+            'Not in a subgraph - this method only works inside subgraphs'
+          )
+        }
+
+        const node =
+          type === 'input' ? currentGraph.inputNode : currentGraph.outputNode
+        const slots =
+          type === 'input' ? currentGraph.inputs : currentGraph.outputs
+
+        if (!node) {
+          throw new Error(`No ${type} node found in subgraph`)
+        }
+
+        // Calculate position for next available slot
+        // const nextSlotIndex = slots?.length || 0
+        // const slotHeight = 20
+        // const slotY = node.pos[1] + 30 + nextSlotIndex * slotHeight
+
+        // Find last slot position
+        const lastSlot = slots.at(-1)
+        let slotX: number
+        let slotY: number
+
+        if (lastSlot) {
+          // If there are existing slots, position the new one below the last one
+          const gapHeight = 20
+          slotX = lastSlot.pos[0]
+          slotY = lastSlot.pos[1] + gapHeight
+        } else {
+          // No existing slots - use slotAnchorX if available, otherwise calculate from node position
+          if (currentGraph.slotAnchorX !== undefined) {
+            // The actual slot X position seems to be slotAnchorX - 10
+            slotX = currentGraph.slotAnchorX - 10
+          } else {
+            // Fallback: calculate from node edge
+            slotX =
+              type === 'input'
+                ? node.pos[0] + node.size[0] - 10 // Right edge for input node
+                : node.pos[0] + 10 // Left edge for output node
+          }
+          // For Y position when no slots exist, use middle of node
+          slotY = node.pos[1] + node.size[1] / 2
+        }
+
+        // Convert from offset to canvas coordinates
+        const canvasPos = window['app'].canvas.ds.convertOffsetToCanvas([
+          slotX,
+          slotY
+        ])
+        return canvasPos
+      },
+      [this.type] as const
+    )
+
+    return {
+      x: pos[0],
+      y: pos[1]
+    }
+  }
+}
+
 export class NodeSlotReference {
   constructor(
     readonly type: 'input' | 'output',
@@ -21,11 +143,27 @@ export class NodeSlotReference {
   async getPosition() {
     const pos: [number, number] = await this.node.comfyPage.page.evaluate(
       ([type, id, index]) => {
-        const node = window['app'].graph.getNodeById(id)
+        // Use canvas.graph to get the current graph (works in both main graph and subgraphs)
+        const node = window['app'].canvas.graph.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
-        return window['app'].canvas.ds.convertOffsetToCanvas(
-          node.getConnectionPos(type === 'input', index)
+
+        const rawPos = node.getConnectionPos(type === 'input', index)
+        const convertedPos =
+          window['app'].canvas.ds.convertOffsetToCanvas(rawPos)
+
+        // Debug logging - convert Float32Arrays to regular arrays for visibility
+        console.log(
+          `NodeSlotReference debug for ${type} slot ${index} on node ${id}:`,
+          {
+            nodePos: [node.pos[0], node.pos[1]],
+            nodeSize: [node.size[0], node.size[1]],
+            rawConnectionPos: [rawPos[0], rawPos[1]],
+            convertedPos: [convertedPos[0], convertedPos[1]],
+            currentGraphType: window['app'].canvas.graph.constructor.name
+          }
         )
+
+        return convertedPos
       },
       [this.type, this.node.id, this.index] as const
     )
@@ -37,7 +175,7 @@ export class NodeSlotReference {
   async getLinkCount() {
     return await this.node.comfyPage.page.evaluate(
       ([type, id, index]) => {
-        const node = window['app'].graph.getNodeById(id)
+        const node = window['app'].canvas.graph.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
         if (type === 'input') {
           return node.inputs[index].link == null ? 0 : 1
@@ -50,7 +188,7 @@ export class NodeSlotReference {
   async removeLinks() {
     await this.node.comfyPage.page.evaluate(
       ([type, id, index]) => {
-        const node = window['app'].graph.getNodeById(id)
+        const node = window['app'].canvas.graph.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
         if (type === 'input') {
           node.disconnectInput(index)
@@ -75,7 +213,7 @@ export class NodeWidgetReference {
   async getPosition(): Promise<Position> {
     const pos: [number, number] = await this.node.comfyPage.page.evaluate(
       ([id, index]) => {
-        const node = window['app'].graph.getNodeById(id)
+        const node = window['app'].canvas.graph.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
         const widget = node.widgets[index]
         if (!widget) throw new Error(`Widget ${index} not found.`)
@@ -134,7 +272,7 @@ export class NodeWidgetReference {
     const pos = await this.getPosition()
     const canvas = this.node.comfyPage.canvas
     const canvasPos = (await canvas.boundingBox())!
-    this.node.comfyPage.dragAndDrop(
+    await this.node.comfyPage.dragAndDrop(
       {
         x: canvasPos.x + pos.x,
         y: canvasPos.y + pos.y
@@ -166,7 +304,7 @@ export class NodeReference {
   ) {}
   async exists(): Promise<boolean> {
     return await this.comfyPage.page.evaluate((id) => {
-      const node = window['app'].graph.getNodeById(id)
+      const node = window['app'].canvas.graph.getNodeById(id)
       return !!node
     }, this.id)
   }
@@ -185,7 +323,7 @@ export class NodeReference {
   async getBounding(): Promise<Position & Size> {
     const [x, y, width, height]: [number, number, number, number] =
       await this.comfyPage.page.evaluate((id) => {
-        const node = window['app'].graph.getNodeById(id)
+        const node = window['app'].canvas.graph.getNodeById(id)
         if (!node) throw new Error('Node not found')
         return node.getBounding()
       }, this.id)
@@ -218,7 +356,7 @@ export class NodeReference {
   async getProperty<T>(prop: string): Promise<T> {
     return await this.comfyPage.page.evaluate(
       ([id, prop]) => {
-        const node = window['app'].graph.getNodeById(id)
+        const node = window['app'].canvas.graph.getNodeById(id)
         if (!node) throw new Error('Node not found')
         return node[prop]
       },
@@ -259,7 +397,8 @@ export class NodeReference {
 
     await this.comfyPage.canvas.click({
       ...options,
-      position: clickPos
+      position: clickPos,
+      force: true
     })
     await this.comfyPage.nextFrame()
     if (moveMouseToEmptyArea) {
@@ -319,6 +458,18 @@ export class NodeReference {
     }
     return nodes[0]
   }
+  async convertToSubgraph() {
+    await this.clickContextMenuOption('Convert to Subgraph')
+    await this.comfyPage.nextFrame()
+    await this.comfyPage.page.waitForTimeout(256)
+    const nodes = await this.comfyPage.getNodeRefsByTitle('New Subgraph')
+    if (nodes.length !== 1) {
+      throw new Error(
+        `Did not find single subgraph node (found=${nodes.length})`
+      )
+    }
+    return nodes[0]
+  }
   async manageGroupNode() {
     await this.clickContextMenuOption('Manage Group Node')
     await this.comfyPage.nextFrame()
@@ -327,4 +478,58 @@ export class NodeReference {
       this.comfyPage.page.locator('.comfy-group-manage')
     )
   }
+  async navigateIntoSubgraph() {
+    const titleHeight = await this.comfyPage.page.evaluate(() => {
+      return window['LiteGraph']['NODE_TITLE_HEIGHT']
+    })
+    const nodePos = await this.getPosition()
+    const nodeSize = await this.getSize()
+
+    // Try multiple positions to avoid DOM widget interference
+    const clickPositions = [
+      { x: nodePos.x + nodeSize.width / 2, y: nodePos.y + titleHeight + 5 },
+      { x: nodePos.x + nodeSize.width / 2, y: nodePos.y + nodeSize.height / 2 },
+      { x: nodePos.x + 20, y: nodePos.y + titleHeight + 5 }
+    ]
+
+    let isInSubgraph = false
+    let attempts = 0
+    const maxAttempts = 3
+
+    while (!isInSubgraph && attempts < maxAttempts) {
+      attempts++
+
+      for (const position of clickPositions) {
+        // Clear any selection first
+        await this.comfyPage.canvas.click({
+          position: { x: 50, y: 50 },
+          force: true
+        })
+        await this.comfyPage.nextFrame()
+
+        // Double-click to enter subgraph
+        await this.comfyPage.canvas.dblclick({ position, force: true })
+        await this.comfyPage.nextFrame()
+        await this.comfyPage.page.waitForTimeout(500)
+
+        // Check if we successfully entered the subgraph
+        isInSubgraph = await this.comfyPage.page.evaluate(() => {
+          const graph = window['app'].canvas.graph
+          return graph?.constructor?.name === 'Subgraph'
+        })
+
+        if (isInSubgraph) break
+      }
+
+      if (!isInSubgraph && attempts < maxAttempts) {
+        await this.comfyPage.page.waitForTimeout(500)
+      }
+    }
+
+    if (!isInSubgraph) {
+      throw new Error(
+        'Failed to navigate into subgraph after ' + attempts + ' attempts'
+      )
+    }
+  }
 }

browser_tests/tests/domWidget.spec.ts

@@ -47,4 +47,42 @@ test.describe('DOM Widget', () => {
     const finalCount = await comfyPage.getDOMWidgetCount()
     expect(finalCount).toBe(initialCount + 1)
   })
+
+  test('should reposition when layout changes', async ({ comfyPage }) => {
+    // --- setup ---
+
+    const textareaWidget = comfyPage.page
+      .locator('.comfy-multiline-input')
+      .first()
+    await expect(textareaWidget).toBeVisible()
+
+    await comfyPage.setSetting('Comfy.Sidebar.Size', 'small')
+    await comfyPage.setSetting('Comfy.Sidebar.Location', 'left')
+    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.nextFrame()
+
+    let oldPos: [number, number]
+    const checkBboxChange = async () => {
+      const boudningBox = (await textareaWidget.boundingBox())!
+      expect(boudningBox).not.toBeNull()
+      const position: [number, number] = [boudningBox.x, boudningBox.y]
+      expect(position).not.toEqual(oldPos)
+      oldPos = position
+    }
+    await checkBboxChange()
+
+    // --- test ---
+
+    await comfyPage.setSetting('Comfy.Sidebar.Size', 'normal')
+    await comfyPage.nextFrame()
+    await checkBboxChange()
+
+    await comfyPage.setSetting('Comfy.Sidebar.Location', 'right')
+    await comfyPage.nextFrame()
+    await checkBboxChange()
+
+    await comfyPage.setSetting('Comfy.UseNewMenu', 'Bottom')
+    await comfyPage.nextFrame()
+    await checkBboxChange()
+  })
 })

browser_tests/tests/featureFlags.spec.ts

@@ -0,0 +1,382 @@
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+test.describe('Feature Flags', () => {
+  test('Client and server exchange feature flags on connection', async ({
+    comfyPage
+  }) => {
+    // Navigate to a new page to capture the initial WebSocket connection
+    const newPage = await comfyPage.page.context().newPage()
+
+    // Set up monitoring before navigation
+    await newPage.addInitScript(() => {
+      // This runs before any page scripts
+      window.__capturedMessages = {
+        clientFeatureFlags: null,
+        serverFeatureFlags: null
+      }
+
+      // Capture outgoing client messages
+      const originalSend = WebSocket.prototype.send
+      WebSocket.prototype.send = function (data) {
+        try {
+          const parsed = JSON.parse(data)
+          if (parsed.type === 'feature_flags') {
+            window.__capturedMessages.clientFeatureFlags = parsed
+          }
+        } catch (e) {
+          // Not JSON, ignore
+        }
+        return originalSend.call(this, data)
+      }
+
+      // Monitor for server feature flags
+      const checkInterval = setInterval(() => {
+        if (
+          window['app']?.api?.serverFeatureFlags &&
+          Object.keys(window['app'].api.serverFeatureFlags).length > 0
+        ) {
+          window.__capturedMessages.serverFeatureFlags =
+            window['app'].api.serverFeatureFlags
+          clearInterval(checkInterval)
+        }
+      }, 100)
+
+      // Clear after 10 seconds
+      setTimeout(() => clearInterval(checkInterval), 10000)
+    })
+
+    // Navigate to the app
+    await newPage.goto(comfyPage.url)
+
+    // Wait for both client and server feature flags
+    await newPage.waitForFunction(
+      () =>
+        window.__capturedMessages.clientFeatureFlags !== null &&
+        window.__capturedMessages.serverFeatureFlags !== null,
+      { timeout: 10000 }
+    )
+
+    // Get the captured messages
+    const messages = await newPage.evaluate(() => window.__capturedMessages)
+
+    // Verify client sent feature flags
+    expect(messages.clientFeatureFlags).toBeTruthy()
+    expect(messages.clientFeatureFlags).toHaveProperty('type', 'feature_flags')
+    expect(messages.clientFeatureFlags).toHaveProperty('data')
+    expect(messages.clientFeatureFlags.data).toHaveProperty(
+      'supports_preview_metadata'
+    )
+    expect(
+      typeof messages.clientFeatureFlags.data.supports_preview_metadata
+    ).toBe('boolean')
+
+    // Verify server sent feature flags back
+    expect(messages.serverFeatureFlags).toBeTruthy()
+    expect(messages.serverFeatureFlags).toHaveProperty(
+      'supports_preview_metadata'
+    )
+    expect(typeof messages.serverFeatureFlags.supports_preview_metadata).toBe(
+      'boolean'
+    )
+    expect(messages.serverFeatureFlags).toHaveProperty('max_upload_size')
+    expect(typeof messages.serverFeatureFlags.max_upload_size).toBe('number')
+    expect(Object.keys(messages.serverFeatureFlags).length).toBeGreaterThan(0)
+
+    await newPage.close()
+  })
+
+  test('Server feature flags are received and accessible', async ({
+    comfyPage
+  }) => {
+    // Wait for connection to establish
+    await comfyPage.page.waitForTimeout(1000)
+
+    // Get the actual server feature flags from the backend
+    const serverFlags = await comfyPage.page.evaluate(() => {
+      return window['app'].api.serverFeatureFlags
+    })
+
+    // Verify we received real feature flags from the backend
+    expect(serverFlags).toBeTruthy()
+    expect(Object.keys(serverFlags).length).toBeGreaterThan(0)
+
+    // The backend should send feature flags
+    expect(serverFlags).toHaveProperty('supports_preview_metadata')
+    expect(typeof serverFlags.supports_preview_metadata).toBe('boolean')
+    expect(serverFlags).toHaveProperty('max_upload_size')
+    expect(typeof serverFlags.max_upload_size).toBe('number')
+  })
+
+  test('serverSupportsFeature method works with real backend flags', async ({
+    comfyPage
+  }) => {
+    // Wait for connection
+    await comfyPage.page.waitForTimeout(1000)
+
+    // Test serverSupportsFeature with real backend flags
+    const supportsPreviewMetadata = await comfyPage.page.evaluate(() => {
+      return window['app'].api.serverSupportsFeature(
+        'supports_preview_metadata'
+      )
+    })
+    // The method should return a boolean based on the backend's value
+    expect(typeof supportsPreviewMetadata).toBe('boolean')
+
+    // Test non-existent feature - should always return false
+    const supportsNonExistent = await comfyPage.page.evaluate(() => {
+      return window['app'].api.serverSupportsFeature('non_existent_feature_xyz')
+    })
+    expect(supportsNonExistent).toBe(false)
+
+    // Test that the method only returns true for boolean true values
+    const testResults = await comfyPage.page.evaluate(() => {
+      // Temporarily modify serverFeatureFlags to test behavior
+      const original = window['app'].api.serverFeatureFlags
+      window['app'].api.serverFeatureFlags = {
+        bool_true: true,
+        bool_false: false,
+        string_value: 'yes',
+        number_value: 1,
+        null_value: null
+      }
+
+      const results = {
+        bool_true: window['app'].api.serverSupportsFeature('bool_true'),
+        bool_false: window['app'].api.serverSupportsFeature('bool_false'),
+        string_value: window['app'].api.serverSupportsFeature('string_value'),
+        number_value: window['app'].api.serverSupportsFeature('number_value'),
+        null_value: window['app'].api.serverSupportsFeature('null_value')
+      }
+
+      // Restore original
+      window['app'].api.serverFeatureFlags = original
+      return results
+    })
+
+    // serverSupportsFeature should only return true for boolean true values
+    expect(testResults.bool_true).toBe(true)
+    expect(testResults.bool_false).toBe(false)
+    expect(testResults.string_value).toBe(false)
+    expect(testResults.number_value).toBe(false)
+    expect(testResults.null_value).toBe(false)
+  })
+
+  test('getServerFeature method works with real backend data', async ({
+    comfyPage
+  }) => {
+    // Wait for connection
+    await comfyPage.page.waitForTimeout(1000)
+
+    // Test getServerFeature method
+    const previewMetadataValue = await comfyPage.page.evaluate(() => {
+      return window['app'].api.getServerFeature('supports_preview_metadata')
+    })
+    expect(typeof previewMetadataValue).toBe('boolean')
+
+    // Test getting max_upload_size
+    const maxUploadSize = await comfyPage.page.evaluate(() => {
+      return window['app'].api.getServerFeature('max_upload_size')
+    })
+    expect(typeof maxUploadSize).toBe('number')
+    expect(maxUploadSize).toBeGreaterThan(0)
+
+    // Test getServerFeature with default value for non-existent feature
+    const defaultValue = await comfyPage.page.evaluate(() => {
+      return window['app'].api.getServerFeature(
+        'non_existent_feature_xyz',
+        'default'
+      )
+    })
+    expect(defaultValue).toBe('default')
+  })
+
+  test('getServerFeatures returns all backend feature flags', async ({
+    comfyPage
+  }) => {
+    // Wait for connection
+    await comfyPage.page.waitForTimeout(1000)
+
+    // Test getServerFeatures returns all flags
+    const allFeatures = await comfyPage.page.evaluate(() => {
+      return window['app'].api.getServerFeatures()
+    })
+
+    expect(allFeatures).toBeTruthy()
+    expect(allFeatures).toHaveProperty('supports_preview_metadata')
+    expect(typeof allFeatures.supports_preview_metadata).toBe('boolean')
+    expect(allFeatures).toHaveProperty('max_upload_size')
+    expect(Object.keys(allFeatures).length).toBeGreaterThan(0)
+  })
+
+  test('Client feature flags are immutable', async ({ comfyPage }) => {
+    // Test that getClientFeatureFlags returns a copy
+    const immutabilityTest = await comfyPage.page.evaluate(() => {
+      const flags1 = window['app'].api.getClientFeatureFlags()
+      const flags2 = window['app'].api.getClientFeatureFlags()
+
+      // Modify the first object
+      flags1.test_modification = true
+
+      // Get flags again to check if original was modified
+      const flags3 = window['app'].api.getClientFeatureFlags()
+
+      return {
+        areEqual: flags1 === flags2,
+        hasModification: flags3.test_modification !== undefined,
+        hasSupportsPreview: flags1.supports_preview_metadata !== undefined,
+        supportsPreviewValue: flags1.supports_preview_metadata
+      }
+    })
+
+    // Verify they are different objects (not the same reference)
+    expect(immutabilityTest.areEqual).toBe(false)
+
+    // Verify modification didn't affect the original
+    expect(immutabilityTest.hasModification).toBe(false)
+
+    // Verify the flags contain expected properties
+    expect(immutabilityTest.hasSupportsPreview).toBe(true)
+    expect(typeof immutabilityTest.supportsPreviewValue).toBe('boolean') // From clientFeatureFlags.json
+  })
+
+  test('Server features are immutable when accessed via getServerFeatures', async ({
+    comfyPage
+  }) => {
+    // Wait for connection to establish
+    await comfyPage.page.waitForTimeout(1000)
+
+    const immutabilityTest = await comfyPage.page.evaluate(() => {
+      // Get a copy of server features
+      const features1 = window['app'].api.getServerFeatures()
+
+      // Try to modify it
+      features1.supports_preview_metadata = false
+      features1.new_feature = 'added'
+
+      // Get another copy
+      const features2 = window['app'].api.getServerFeatures()
+
+      return {
+        modifiedValue: features1.supports_preview_metadata,
+        originalValue: features2.supports_preview_metadata,
+        hasNewFeature: features2.new_feature !== undefined,
+        hasSupportsPreview: features2.supports_preview_metadata !== undefined
+      }
+    })
+
+    // The modification should only affect the copy
+    expect(immutabilityTest.modifiedValue).toBe(false)
+    expect(typeof immutabilityTest.originalValue).toBe('boolean') // Backend sends boolean for supports_preview_metadata
+    expect(immutabilityTest.hasNewFeature).toBe(false)
+    expect(immutabilityTest.hasSupportsPreview).toBe(true)
+  })
+
+  test('Feature flags are negotiated early in connection lifecycle', async ({
+    comfyPage
+  }) => {
+    // This test verifies that feature flags are available early in the app lifecycle
+    // which is important for protocol negotiation
+
+    // Create a new page to ensure clean state
+    const newPage = await comfyPage.page.context().newPage()
+
+    // Set up monitoring before navigation
+    await newPage.addInitScript(() => {
+      // Track when various app components are ready
+      ;(window as any).__appReadiness = {
+        featureFlagsReceived: false,
+        apiInitialized: false,
+        appInitialized: false
+      }
+
+      // Monitor when feature flags arrive by checking periodically
+      const checkFeatureFlags = setInterval(() => {
+        if (
+          window['app']?.api?.serverFeatureFlags?.supports_preview_metadata !==
+          undefined
+        ) {
+          ;(window as any).__appReadiness.featureFlagsReceived = true
+          clearInterval(checkFeatureFlags)
+        }
+      }, 10)
+
+      // Monitor API initialization
+      const checkApi = setInterval(() => {
+        if (window['app']?.api) {
+          ;(window as any).__appReadiness.apiInitialized = true
+          clearInterval(checkApi)
+        }
+      }, 10)
+
+      // Monitor app initialization
+      const checkApp = setInterval(() => {
+        if (window['app']?.graph) {
+          ;(window as any).__appReadiness.appInitialized = true
+          clearInterval(checkApp)
+        }
+      }, 10)
+
+      // Clean up after 10 seconds
+      setTimeout(() => {
+        clearInterval(checkFeatureFlags)
+        clearInterval(checkApi)
+        clearInterval(checkApp)
+      }, 10000)
+    })
+
+    // Navigate to the app
+    await newPage.goto(comfyPage.url)
+
+    // Wait for feature flags to be received
+    await newPage.waitForFunction(
+      () =>
+        window['app']?.api?.serverFeatureFlags?.supports_preview_metadata !==
+        undefined,
+      {
+        timeout: 10000
+      }
+    )
+
+    // Get readiness state
+    const readiness = await newPage.evaluate(() => {
+      return {
+        ...(window as any).__appReadiness,
+        currentFlags: window['app'].api.serverFeatureFlags
+      }
+    })
+
+    // Verify feature flags are available
+    expect(readiness.currentFlags).toHaveProperty('supports_preview_metadata')
+    expect(typeof readiness.currentFlags.supports_preview_metadata).toBe(
+      'boolean'
+    )
+    expect(readiness.currentFlags).toHaveProperty('max_upload_size')
+
+    // Verify feature flags were received (we detected them via polling)
+    expect(readiness.featureFlagsReceived).toBe(true)
+
+    // Verify API was initialized (feature flags require API)
+    expect(readiness.apiInitialized).toBe(true)
+
+    await newPage.close()
+  })
+
+  test('Backend /features endpoint returns feature flags', async ({
+    comfyPage
+  }) => {
+    // Test the HTTP endpoint directly
+    const response = await comfyPage.page.request.get(
+      `${comfyPage.url}/api/features`
+    )
+    expect(response.ok()).toBe(true)
+
+    const features = await response.json()
+    expect(features).toBeTruthy()
+    expect(features).toHaveProperty('supports_preview_metadata')
+    expect(typeof features.supports_preview_metadata).toBe('boolean')
+    expect(features).toHaveProperty('max_upload_size')
+    expect(Object.keys(features).length).toBeGreaterThan(0)
+  })
+})

browser_tests/tests/groupNode.spec.ts

@@ -264,10 +264,15 @@ test.describe('Group Node', () => {
     test('Copies and pastes group node after clearing workflow', async ({
       comfyPage
     }) => {
+      // Set setting
+      await comfyPage.setSetting('Comfy.ConfirmClear', false)
+
+      // Clear workflow
       await comfyPage.menu.topbar.triggerTopbarCommand([
         'Edit',
         'Clear Workflow'
       ])
+
       await comfyPage.ctrlV()
       await verifyNodeLoaded(comfyPage, 1)
     })

browser_tests/tests/interaction.spec.ts

@@ -768,8 +768,14 @@ test.describe('Viewport settings', () => {
     comfyMouse
   }) => {
     // Screenshot the canvas element
+    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', true)
+    const toggleButton = comfyPage.page.getByTestId('toggle-minimap-button')
+
+    await toggleButton.click()
+
     await comfyPage.menu.topbar.saveWorkflow('Workflow A')
-    await expect(comfyPage.canvas).toHaveScreenshot('viewport-workflow-a.png')
+    await comfyPage.nextFrame()
+    const screenshotA = (await comfyPage.canvas.screenshot()).toString('base64')
 
     // Save workflow as a new file, then zoom out before screen shot
     await comfyPage.menu.topbar.saveWorkflowAs('Workflow B')
@@ -777,7 +783,12 @@ test.describe('Viewport settings', () => {
     for (let i = 0; i < 4; i++) {
       await comfyMouse.wheel(0, 60)
     }
-    await expect(comfyPage.canvas).toHaveScreenshot('viewport-workflow-b.png')
+
+    await comfyPage.nextFrame()
+    const screenshotB = (await comfyPage.canvas.screenshot()).toString('base64')
+
+    // Ensure that the screenshots are different due to zoom level
+    expect(screenshotB).not.toBe(screenshotA)
 
     const tabA = comfyPage.menu.topbar.getWorkflowTab('Workflow A')
     const tabB = comfyPage.menu.topbar.getWorkflowTab('Workflow B')
@@ -785,11 +796,269 @@ test.describe('Viewport settings', () => {
     // Go back to Workflow A
     await tabA.click()
     await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('viewport-workflow-a.png')
+    expect((await comfyPage.canvas.screenshot()).toString('base64')).toBe(
+      screenshotA
+    )
 
     // And back to Workflow B
     await tabB.click()
     await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('viewport-workflow-b.png')
+    expect((await comfyPage.canvas.screenshot()).toString('base64')).toBe(
+      screenshotB
+    )
+  })
+})
+
+test.describe('Canvas Navigation', () => {
+  test.describe('Legacy Mode', () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.setSetting('Comfy.Canvas.NavigationMode', 'legacy')
+    })
+
+    test('Left-click drag in empty area should pan canvas', async ({
+      comfyPage
+    }) => {
+      await comfyPage.dragAndDrop({ x: 50, y: 50 }, { x: 150, y: 150 })
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'legacy-left-drag-pan.png'
+      )
+    })
+
+    test('Middle-click drag should pan canvas', async ({ comfyPage }) => {
+      await comfyPage.page.mouse.move(50, 50)
+      await comfyPage.page.mouse.down({ button: 'middle' })
+      await comfyPage.page.mouse.move(150, 150)
+      await comfyPage.page.mouse.up({ button: 'middle' })
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'legacy-middle-drag-pan.png'
+      )
+    })
+
+    test('Mouse wheel should zoom in/out', async ({ comfyPage }) => {
+      await comfyPage.page.mouse.move(400, 300)
+      await comfyPage.page.mouse.wheel(0, -120)
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'legacy-wheel-zoom-in.png'
+      )
+
+      await comfyPage.page.mouse.wheel(0, 240)
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'legacy-wheel-zoom-out.png'
+      )
+    })
+
+    test('Left-click on node should not pan canvas', async ({ comfyPage }) => {
+      await comfyPage.clickTextEncodeNode1()
+      const selectedCount = await comfyPage.getSelectedGraphNodesCount()
+      expect(selectedCount).toBe(1)
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'legacy-click-node-select.png'
+      )
+    })
+  })
+
+  test.describe('Standard Mode', () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.setSetting('Comfy.Canvas.NavigationMode', 'standard')
+    })
+
+    test('Left-click drag in empty area should select nodes', async ({
+      comfyPage
+    }) => {
+      const clipNodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+      const clipNode1Pos = await clipNodes[0].getPosition()
+      const clipNode2Pos = await clipNodes[1].getPosition()
+      const offset = 64
+
+      await comfyPage.dragAndDrop(
+        {
+          x: Math.min(clipNode1Pos.x, clipNode2Pos.x) - offset,
+          y: Math.min(clipNode1Pos.y, clipNode2Pos.y) - offset
+        },
+        {
+          x: Math.max(clipNode1Pos.x, clipNode2Pos.x) + offset,
+          y: Math.max(clipNode1Pos.y, clipNode2Pos.y) + offset
+        }
+      )
+
+      const selectedCount = await comfyPage.getSelectedGraphNodesCount()
+      expect(selectedCount).toBe(clipNodes.length)
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'standard-left-drag-select.png'
+      )
+    })
+
+    test('Middle-click drag should pan canvas', async ({ comfyPage }) => {
+      await comfyPage.page.mouse.move(50, 50)
+      await comfyPage.page.mouse.down({ button: 'middle' })
+      await comfyPage.page.mouse.move(150, 150)
+      await comfyPage.page.mouse.up({ button: 'middle' })
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'standard-middle-drag-pan.png'
+      )
+    })
+
+    test('Ctrl + mouse wheel should zoom in/out', async ({ comfyPage }) => {
+      await comfyPage.page.mouse.move(400, 300)
+      await comfyPage.page.keyboard.down('Control')
+      await comfyPage.page.mouse.wheel(0, -120)
+      await comfyPage.page.keyboard.up('Control')
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'standard-ctrl-wheel-zoom-in.png'
+      )
+
+      await comfyPage.page.keyboard.down('Control')
+      await comfyPage.page.mouse.wheel(0, 240)
+      await comfyPage.page.keyboard.up('Control')
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'standard-ctrl-wheel-zoom-out.png'
+      )
+    })
+
+    test('Left-click on node should select node (not start selection box)', async ({
+      comfyPage
+    }) => {
+      await comfyPage.clickTextEncodeNode1()
+      const selectedCount = await comfyPage.getSelectedGraphNodesCount()
+      expect(selectedCount).toBe(1)
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'standard-click-node-select.png'
+      )
+    })
+
+    test('Space + left-click drag should pan canvas', async ({ comfyPage }) => {
+      // Click canvas to focus it
+      await comfyPage.page.click('canvas')
+      await comfyPage.nextFrame()
+
+      await comfyPage.page.keyboard.down('Space')
+      await comfyPage.dragAndDrop({ x: 50, y: 50 }, { x: 150, y: 150 })
+      await comfyPage.page.keyboard.up('Space')
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'standard-space-drag-pan.png'
+      )
+    })
+
+    test('Space key overrides default left-click behavior', async ({
+      comfyPage
+    }) => {
+      const clipNodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+      const clipNode1Pos = await clipNodes[0].getPosition()
+      const offset = 64
+
+      await comfyPage.dragAndDrop(
+        {
+          x: clipNode1Pos.x - offset,
+          y: clipNode1Pos.y - offset
+        },
+        {
+          x: clipNode1Pos.x + offset,
+          y: clipNode1Pos.y + offset
+        }
+      )
+
+      const selectedCountAfterDrag =
+        await comfyPage.getSelectedGraphNodesCount()
+      expect(selectedCountAfterDrag).toBeGreaterThan(0)
+
+      await comfyPage.clickEmptySpace()
+      const selectedCountAfterClear =
+        await comfyPage.getSelectedGraphNodesCount()
+      expect(selectedCountAfterClear).toBe(0)
+
+      await comfyPage.page.keyboard.down('Space')
+      await comfyPage.dragAndDrop(
+        {
+          x: clipNode1Pos.x - offset,
+          y: clipNode1Pos.y - offset
+        },
+        {
+          x: clipNode1Pos.x + offset,
+          y: clipNode1Pos.y + offset
+        }
+      )
+      await comfyPage.page.keyboard.up('Space')
+
+      const selectedCountAfterSpaceDrag =
+        await comfyPage.getSelectedGraphNodesCount()
+      expect(selectedCountAfterSpaceDrag).toBe(0)
+    })
+  })
+
+  test('Shift + mouse wheel should pan canvas horizontally', async ({
+    comfyPage
+  }) => {
+    await comfyPage.page.click('canvas')
+    await comfyPage.nextFrame()
+
+    await expect(comfyPage.canvas).toHaveScreenshot('standard-initial.png')
+
+    await comfyPage.page.mouse.move(400, 300)
+
+    await comfyPage.page.keyboard.down('Shift')
+    await comfyPage.page.mouse.wheel(0, 120)
+    await comfyPage.page.keyboard.up('Shift')
+    await comfyPage.nextFrame()
+    await expect(comfyPage.canvas).toHaveScreenshot(
+      'standard-shift-wheel-pan-right.png'
+    )
+
+    await comfyPage.page.keyboard.down('Shift')
+    await comfyPage.page.mouse.wheel(0, -240)
+    await comfyPage.page.keyboard.up('Shift')
+    await comfyPage.nextFrame()
+    await expect(comfyPage.canvas).toHaveScreenshot(
+      'standard-shift-wheel-pan-left.png'
+    )
+
+    await comfyPage.page.keyboard.down('Shift')
+    await comfyPage.page.mouse.wheel(0, 120)
+    await comfyPage.page.keyboard.up('Shift')
+    await comfyPage.nextFrame()
+    await expect(comfyPage.canvas).toHaveScreenshot(
+      'standard-shift-wheel-pan-center.png'
+    )
+  })
+
+  test.describe('Edge Cases', () => {
+    test('Multiple modifier keys work correctly in legacy mode', async ({
+      comfyPage
+    }) => {
+      await comfyPage.setSetting('Comfy.Canvas.NavigationMode', 'legacy')
+
+      await comfyPage.page.keyboard.down('Alt')
+      await comfyPage.page.keyboard.down('Shift')
+      await comfyPage.dragAndDrop({ x: 50, y: 50 }, { x: 150, y: 150 })
+      await comfyPage.page.keyboard.up('Shift')
+      await comfyPage.page.keyboard.up('Alt')
+
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'legacy-alt-shift-drag.png'
+      )
+    })
+
+    test('Cursor changes appropriately in different modes', async ({
+      comfyPage
+    }) => {
+      const getCursorStyle = async () => {
+        return await comfyPage.page.evaluate(() => {
+          return (
+            document.getElementById('graph-canvas')!.style.cursor || 'default'
+          )
+        })
+      }
+
+      await comfyPage.setSetting('Comfy.Canvas.NavigationMode', 'legacy')
+      await comfyPage.page.mouse.move(50, 50)
+      await comfyPage.page.mouse.down()
+      expect(await getCursorStyle()).toBe('grabbing')
+      await comfyPage.page.mouse.up()
+    })
   })
 })

browser_tests/tests/loadWorkflowInMedia.spec.ts

@@ -15,7 +15,8 @@ test.describe('Load Workflow in Media', () => {
     'workflow.mp4',
     'workflow.mov',
     'workflow.m4v',
-    'workflow.svg'
+    'workflow.svg',
+    'workflow.avif'
   ]
   fileNames.forEach(async (fileName) => {
     test(`Load workflow in ${fileName} (drop from filesystem)`, async ({

browser_tests/tests/menu.spec.ts

@@ -63,7 +63,7 @@ test.describe('Menu', () => {
     test('@mobile Items fully visible on mobile screen width', async ({
       comfyPage
     }) => {
-      await comfyPage.menu.topbar.openSubmenuMobile()
+      await comfyPage.menu.topbar.openTopbarMenu()
       const topLevelMenuItem = comfyPage.page
         .locator('a.p-menubar-item-link')
         .first()
@@ -74,8 +74,9 @@ test.describe('Menu', () => {
     })
 
     test('Displays keybinding next to item', async ({ comfyPage }) => {
+      await comfyPage.menu.topbar.openTopbarMenu()
       const workflowMenuItem = comfyPage.menu.topbar.getMenuItem('Workflow')
-      await workflowMenuItem.click()
+      await workflowMenuItem.hover()
       const exportTag = comfyPage.page.locator('.keybinding-tag', {
         hasText: 'Ctrl + s'
       })

browser_tests/tests/minimap.spec.ts

@@ -0,0 +1,77 @@
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+test.describe('Minimap', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.setSetting('Comfy.Minimap.Visible', true)
+    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', true)
+    await comfyPage.loadWorkflow('default')
+    await comfyPage.page.waitForFunction(
+      () => window['app'] && window['app'].canvas
+    )
+  })
+
+  test('Validate minimap is visible by default', async ({ comfyPage }) => {
+    const minimapContainer = comfyPage.page.locator('.litegraph-minimap')
+
+    await expect(minimapContainer).toBeVisible()
+
+    const minimapCanvas = minimapContainer.locator('.minimap-canvas')
+    await expect(minimapCanvas).toBeVisible()
+
+    const minimapViewport = minimapContainer.locator('.minimap-viewport')
+    await expect(minimapViewport).toBeVisible()
+
+    await expect(minimapContainer).toHaveCSS('position', 'absolute')
+    await expect(minimapContainer).toHaveCSS('z-index', '1000')
+  })
+
+  test('Validate minimap toggle button state', async ({ comfyPage }) => {
+    const toggleButton = comfyPage.page.getByTestId('toggle-minimap-button')
+
+    await expect(toggleButton).toBeVisible()
+
+    await expect(toggleButton).toHaveClass(/minimap-active/)
+
+    const minimapContainer = comfyPage.page.locator('.litegraph-minimap')
+    await expect(minimapContainer).toBeVisible()
+  })
+
+  test('Validate minimap can be toggled off and on', async ({ comfyPage }) => {
+    const minimapContainer = comfyPage.page.locator('.litegraph-minimap')
+    const toggleButton = comfyPage.page.getByTestId('toggle-minimap-button')
+
+    await expect(minimapContainer).toBeVisible()
+    await expect(toggleButton).toHaveClass(/minimap-active/)
+
+    await toggleButton.click()
+    await comfyPage.nextFrame()
+
+    await expect(minimapContainer).not.toBeVisible()
+    await expect(toggleButton).not.toHaveClass(/minimap-active/)
+
+    await toggleButton.click()
+    await comfyPage.nextFrame()
+
+    await expect(minimapContainer).toBeVisible()
+    await expect(toggleButton).toHaveClass(/minimap-active/)
+  })
+
+  test('Validate minimap keyboard shortcut Alt+M', async ({ comfyPage }) => {
+    const minimapContainer = comfyPage.page.locator('.litegraph-minimap')
+
+    await expect(minimapContainer).toBeVisible()
+
+    await comfyPage.page.keyboard.press('Alt+KeyM')
+    await comfyPage.nextFrame()
+
+    await expect(minimapContainer).not.toBeVisible()
+
+    await comfyPage.page.keyboard.press('Alt+KeyM')
+    await comfyPage.nextFrame()
+
+    await expect(minimapContainer).toBeVisible()
+  })
+})

browser_tests/tests/nodeSearchBox.spec.ts

@@ -27,6 +27,21 @@ test.describe('Node search box', () => {
     await expect(comfyPage.searchBox.input).toHaveCount(1)
   })
 
+  test('New user (1.24.1+) gets search box by default on link release', async ({
+    comfyPage
+  }) => {
+    // Start fresh to test new user behavior
+    await comfyPage.setup({ clearStorage: true })
+    // Simulate new user with 1.24.1+ installed version
+    await comfyPage.setSetting('Comfy.InstalledVersion', '1.24.1')
+    await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+    // Don't set LinkRelease settings explicitly to test versioned defaults
+
+    await comfyPage.disconnectEdge()
+    await expect(comfyPage.searchBox.input).toHaveCount(1)
+    await expect(comfyPage.searchBox.input).toBeVisible()
+  })
+
   test('Can add node', async ({ comfyPage }) => {
     await comfyPage.doubleClickCanvas()
     await expect(comfyPage.searchBox.input).toHaveCount(1)
@@ -172,10 +187,10 @@ test.describe('Node search box', () => {
       await comfyPage.page.mouse.click(panelBounds!.x - 10, panelBounds!.y - 10)
 
       // Verify the filter selection panel is hidden
-      expect(panel.header).not.toBeVisible()
+      await expect(panel.header).not.toBeVisible()
 
       // Verify the node search dialog is still visible
-      expect(comfyPage.searchBox.input).toBeVisible()
+      await expect(comfyPage.searchBox.input).toBeVisible()
     })
 
     test('Can add multiple filters', async ({ comfyPage }) => {
@@ -264,4 +279,38 @@ test.describe('Release context menu', () => {
       'link-context-menu-search.png'
     )
   })
+
+  test('Existing user (pre-1.24.1) gets context menu by default on link release', async ({
+    comfyPage
+  }) => {
+    // Start fresh to test existing user behavior
+    await comfyPage.setup({ clearStorage: true })
+    // Simulate existing user with pre-1.24.1 version
+    await comfyPage.setSetting('Comfy.InstalledVersion', '1.23.0')
+    await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+    // Don't set LinkRelease settings explicitly to test versioned defaults
+
+    await comfyPage.disconnectEdge()
+    // Context menu should appear, search box should not
+    await expect(comfyPage.searchBox.input).toHaveCount(0)
+    const contextMenu = comfyPage.page.locator('.litecontextmenu')
+    await expect(contextMenu).toBeVisible()
+  })
+
+  test('Explicit setting overrides versioned defaults', async ({
+    comfyPage
+  }) => {
+    // Start fresh and simulate new user who should get search box by default
+    await comfyPage.setup({ clearStorage: true })
+    await comfyPage.setSetting('Comfy.InstalledVersion', '1.24.1')
+    // But explicitly set to context menu (overriding versioned default)
+    await comfyPage.setSetting('Comfy.LinkRelease.Action', 'context menu')
+    await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+
+    await comfyPage.disconnectEdge()
+    // Context menu should appear due to explicit setting, not search box
+    await expect(comfyPage.searchBox.input).toHaveCount(0)
+    const contextMenu = comfyPage.page.locator('.litecontextmenu')
+    await expect(contextMenu).toBeVisible()
+  })
 })

browser_tests/tests/subgraph.spec.ts

@@ -0,0 +1,469 @@
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+// Constants
+const RENAMED_INPUT_NAME = 'renamed_input'
+const NEW_SUBGRAPH_TITLE = 'New Subgraph'
+const UPDATED_SUBGRAPH_TITLE = 'Updated Subgraph Title'
+const TEST_WIDGET_CONTENT = 'Test content that should persist'
+
+// Common selectors
+const SELECTORS = {
+  breadcrumb: '.subgraph-breadcrumb',
+  promptDialog: '.graphdialog input',
+  nodeSearchContainer: '.node-search-container',
+  domWidget: '.comfy-multiline-input'
+} as const
+
+test.describe('Subgraph Operations', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  })
+
+  // Helper to get subgraph slot count
+  async function getSubgraphSlotCount(
+    comfyPage: typeof test.prototype.comfyPage,
+    type: 'inputs' | 'outputs'
+  ): Promise<number> {
+    return await comfyPage.page.evaluate((slotType) => {
+      return window['app'].canvas.graph[slotType]?.length || 0
+    }, type)
+  }
+
+  // Helper to get current graph node count
+  async function getGraphNodeCount(
+    comfyPage: typeof test.prototype.comfyPage
+  ): Promise<number> {
+    return await comfyPage.page.evaluate(() => {
+      return window['app'].canvas.graph.nodes?.length || 0
+    })
+  }
+
+  // Helper to verify we're in a subgraph
+  async function isInSubgraph(
+    comfyPage: typeof test.prototype.comfyPage
+  ): Promise<boolean> {
+    return await comfyPage.page.evaluate(() => {
+      const graph = window['app'].canvas.graph
+      return graph?.constructor?.name === 'Subgraph'
+    })
+  }
+
+  test.describe('I/O Slot Management', () => {
+    test('Can add input slots to subgraph', async ({ comfyPage }) => {
+      await comfyPage.loadWorkflow('basic-subgraph')
+
+      const subgraphNode = await comfyPage.getNodeRefById('2')
+      await subgraphNode.navigateIntoSubgraph()
+
+      const initialCount = await getSubgraphSlotCount(comfyPage, 'inputs')
+      const vaeEncodeNode = await comfyPage.getNodeRefById('2')
+
+      await comfyPage.connectFromSubgraphInput(vaeEncodeNode, 0)
+      await comfyPage.nextFrame()
+
+      const finalCount = await getSubgraphSlotCount(comfyPage, 'inputs')
+      expect(finalCount).toBe(initialCount + 1)
+    })
+
+    test('Can add output slots to subgraph', async ({ comfyPage }) => {
+      await comfyPage.loadWorkflow('basic-subgraph')
+
+      const subgraphNode = await comfyPage.getNodeRefById('2')
+      await subgraphNode.navigateIntoSubgraph()
+
+      const initialCount = await getSubgraphSlotCount(comfyPage, 'outputs')
+      const vaeEncodeNode = await comfyPage.getNodeRefById('2')
+
+      await comfyPage.connectToSubgraphOutput(vaeEncodeNode, 0)
+      await comfyPage.nextFrame()
+
+      const finalCount = await getSubgraphSlotCount(comfyPage, 'outputs')
+      expect(finalCount).toBe(initialCount + 1)
+    })
+
+    test('Can remove input slots from subgraph', async ({ comfyPage }) => {
+      await comfyPage.loadWorkflow('basic-subgraph')
+
+      const subgraphNode = await comfyPage.getNodeRefById('2')
+      await subgraphNode.navigateIntoSubgraph()
+
+      const initialCount = await getSubgraphSlotCount(comfyPage, 'inputs')
+      expect(initialCount).toBeGreaterThan(0)
+
+      await comfyPage.rightClickSubgraphInputSlot()
+      await comfyPage.clickLitegraphContextMenuItem('Remove Slot')
+
+      // Force re-render
+      await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
+      await comfyPage.nextFrame()
+
+      const finalCount = await getSubgraphSlotCount(comfyPage, 'inputs')
+      expect(finalCount).toBe(initialCount - 1)
+    })
+
+    test('Can remove output slots from subgraph', async ({ comfyPage }) => {
+      await comfyPage.loadWorkflow('basic-subgraph')
+
+      const subgraphNode = await comfyPage.getNodeRefById('2')
+      await subgraphNode.navigateIntoSubgraph()
+
+      const initialCount = await getSubgraphSlotCount(comfyPage, 'outputs')
+      expect(initialCount).toBeGreaterThan(0)
+
+      await comfyPage.rightClickSubgraphOutputSlot()
+      await comfyPage.clickLitegraphContextMenuItem('Remove Slot')
+
+      // Force re-render
+      await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
+      await comfyPage.nextFrame()
+
+      const finalCount = await getSubgraphSlotCount(comfyPage, 'outputs')
+      expect(finalCount).toBe(initialCount - 1)
+    })
+
+    test('Can rename I/O slots', 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.rightClickSubgraphInputSlot(initialInputLabel)
+      await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
+
+      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.describe('Subgraph Creation and Deletion', () => {
+    test('Can create subgraph from selected nodes', async ({ comfyPage }) => {
+      await comfyPage.loadWorkflow('default')
+
+      const initialNodeCount = await getGraphNodeCount(comfyPage)
+
+      await comfyPage.ctrlA()
+      await comfyPage.nextFrame()
+
+      const node = await comfyPage.getNodeRefById('5')
+      await node.convertToSubgraph()
+      await comfyPage.nextFrame()
+
+      const subgraphNodes =
+        await comfyPage.getNodeRefsByTitle(NEW_SUBGRAPH_TITLE)
+      expect(subgraphNodes.length).toBe(1)
+
+      const finalNodeCount = await getGraphNodeCount(comfyPage)
+      expect(finalNodeCount).toBe(1)
+    })
+
+    test('Can delete subgraph node', async ({ comfyPage }) => {
+      await comfyPage.loadWorkflow('basic-subgraph')
+
+      const subgraphNode = await comfyPage.getNodeRefById('2')
+      expect(await subgraphNode.exists()).toBe(true)
+
+      const initialNodeCount = await getGraphNodeCount(comfyPage)
+
+      await subgraphNode.click('title')
+      await comfyPage.page.keyboard.press('Delete')
+      await comfyPage.nextFrame()
+
+      const finalNodeCount = await getGraphNodeCount(comfyPage)
+      expect(finalNodeCount).toBe(initialNodeCount - 1)
+
+      const deletedNode = await comfyPage.getNodeRefById('2')
+      expect(await deletedNode.exists()).toBe(false)
+    })
+  })
+
+  test.describe('Operations Inside Subgraphs', () => {
+    test('Can copy and paste nodes in subgraph', async ({ comfyPage }) => {
+      await comfyPage.loadWorkflow('basic-subgraph')
+
+      const subgraphNode = await comfyPage.getNodeRefById('2')
+      await subgraphNode.navigateIntoSubgraph()
+
+      const initialNodeCount = await getGraphNodeCount(comfyPage)
+
+      const nodesInSubgraph = await comfyPage.page.evaluate(() => {
+        const nodes = window['app'].canvas.graph.nodes
+        return nodes?.[0]?.id || null
+      })
+
+      expect(nodesInSubgraph).not.toBeNull()
+
+      const nodeToClone = await comfyPage.getNodeRefById(
+        String(nodesInSubgraph)
+      )
+      await nodeToClone.click('title')
+      await comfyPage.nextFrame()
+
+      await comfyPage.page.keyboard.press('Control+c')
+      await comfyPage.nextFrame()
+
+      await comfyPage.page.keyboard.press('Control+v')
+      await comfyPage.nextFrame()
+
+      const finalNodeCount = await getGraphNodeCount(comfyPage)
+      expect(finalNodeCount).toBe(initialNodeCount + 1)
+    })
+
+    test('Can undo and redo operations in subgraph', async ({ comfyPage }) => {
+      await comfyPage.loadWorkflow('basic-subgraph')
+
+      const subgraphNode = await comfyPage.getNodeRefById('2')
+      await subgraphNode.navigateIntoSubgraph()
+
+      // Add a node
+      await comfyPage.doubleClickCanvas()
+      await comfyPage.searchBox.fillAndSelectFirstNode('Note')
+      await comfyPage.nextFrame()
+
+      // Get initial node count
+      const initialCount = await getGraphNodeCount(comfyPage)
+
+      // Undo
+      await comfyPage.ctrlZ()
+      await comfyPage.nextFrame()
+
+      const afterUndoCount = await getGraphNodeCount(comfyPage)
+      expect(afterUndoCount).toBe(initialCount - 1)
+
+      // Redo
+      await comfyPage.ctrlY()
+      await comfyPage.nextFrame()
+
+      const afterRedoCount = await getGraphNodeCount(comfyPage)
+      expect(afterRedoCount).toBe(initialCount)
+    })
+  })
+
+  test.describe('Subgraph Navigation and UI', () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    })
+
+    test('Breadcrumb updates when subgraph node title is changed', async ({
+      comfyPage
+    }) => {
+      await comfyPage.loadWorkflow('nested-subgraph')
+      await comfyPage.nextFrame()
+
+      const subgraphNode = await comfyPage.getNodeRefById('10')
+      const nodePos = await subgraphNode.getPosition()
+      const nodeSize = await subgraphNode.getSize()
+
+      // Navigate into subgraph
+      await subgraphNode.navigateIntoSubgraph()
+
+      await comfyPage.page.waitForSelector(SELECTORS.breadcrumb, {
+        state: 'visible',
+        timeout: 20000
+      })
+
+      const breadcrumb = comfyPage.page.locator(SELECTORS.breadcrumb)
+      const initialBreadcrumbText = await breadcrumb.textContent()
+
+      // Go back and edit title
+      await comfyPage.page.keyboard.press('Escape')
+      await comfyPage.nextFrame()
+
+      await comfyPage.canvas.dblclick({
+        position: {
+          x: nodePos.x + nodeSize.width / 2,
+          y: nodePos.y - 10
+        },
+        delay: 5
+      })
+
+      await expect(comfyPage.page.locator('.node-title-editor')).toBeVisible()
+
+      await comfyPage.page.keyboard.press('Control+a')
+      await comfyPage.page.keyboard.type(UPDATED_SUBGRAPH_TITLE)
+      await comfyPage.page.keyboard.press('Enter')
+      await comfyPage.nextFrame()
+
+      // Navigate back into subgraph
+      await subgraphNode.navigateIntoSubgraph()
+
+      await comfyPage.page.waitForSelector(SELECTORS.breadcrumb)
+
+      const updatedBreadcrumbText = await breadcrumb.textContent()
+      expect(updatedBreadcrumbText).toContain(UPDATED_SUBGRAPH_TITLE)
+      expect(updatedBreadcrumbText).not.toBe(initialBreadcrumbText)
+    })
+  })
+
+  test.describe('DOM Widget Promotion', () => {
+    test('DOM widget visibility persists through subgraph navigation', async ({
+      comfyPage
+    }) => {
+      await comfyPage.loadWorkflow('subgraph-with-promoted-text-widget')
+      await comfyPage.nextFrame()
+
+      // Verify promoted widget is visible in parent graph
+      const parentTextarea = comfyPage.page.locator(SELECTORS.domWidget)
+      await expect(parentTextarea).toBeVisible()
+      await expect(parentTextarea).toHaveCount(1)
+
+      const subgraphNode = await comfyPage.getNodeRefById('11')
+      expect(await subgraphNode.exists()).toBe(true)
+
+      await subgraphNode.navigateIntoSubgraph()
+
+      // Verify widget is visible in subgraph
+      const subgraphTextarea = comfyPage.page.locator(SELECTORS.domWidget)
+      await expect(subgraphTextarea).toBeVisible()
+      await expect(subgraphTextarea).toHaveCount(1)
+
+      // Navigate back
+      await comfyPage.page.keyboard.press('Escape')
+      await comfyPage.nextFrame()
+
+      // Verify widget is still visible
+      const backToParentTextarea = comfyPage.page.locator(SELECTORS.domWidget)
+      await expect(backToParentTextarea).toBeVisible()
+      await expect(backToParentTextarea).toHaveCount(1)
+    })
+
+    test('DOM widget content is preserved through navigation', async ({
+      comfyPage
+    }) => {
+      await comfyPage.loadWorkflow('subgraph-with-promoted-text-widget')
+
+      const textarea = comfyPage.page.locator(SELECTORS.domWidget)
+      await textarea.fill(TEST_WIDGET_CONTENT)
+
+      const subgraphNode = await comfyPage.getNodeRefById('11')
+      await subgraphNode.navigateIntoSubgraph()
+
+      const subgraphTextarea = comfyPage.page.locator(SELECTORS.domWidget)
+      await expect(subgraphTextarea).toHaveValue(TEST_WIDGET_CONTENT)
+
+      await comfyPage.page.keyboard.press('Escape')
+      await comfyPage.nextFrame()
+
+      const parentTextarea = comfyPage.page.locator(SELECTORS.domWidget)
+      await expect(parentTextarea).toHaveValue(TEST_WIDGET_CONTENT)
+    })
+
+    test('DOM elements are cleaned up when subgraph node is removed', async ({
+      comfyPage
+    }) => {
+      await comfyPage.loadWorkflow('subgraph-with-promoted-text-widget')
+
+      const initialCount = await comfyPage.page
+        .locator(SELECTORS.domWidget)
+        .count()
+      expect(initialCount).toBe(1)
+
+      const subgraphNode = await comfyPage.getNodeRefById('11')
+
+      await subgraphNode.click('title')
+      await comfyPage.page.keyboard.press('Delete')
+      await comfyPage.nextFrame()
+
+      const finalCount = await comfyPage.page
+        .locator(SELECTORS.domWidget)
+        .count()
+      expect(finalCount).toBe(0)
+    })
+
+    test('DOM elements are cleaned up when widget is disconnected from I/O', async ({
+      comfyPage
+    }) => {
+      // Enable new menu for breadcrumb navigation
+      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+
+      const workflowName = 'subgraph-with-promoted-text-widget'
+      await comfyPage.loadWorkflow(workflowName)
+
+      const textareaCount = await comfyPage.page
+        .locator(SELECTORS.domWidget)
+        .count()
+      expect(textareaCount).toBe(1)
+
+      const subgraphNode = await comfyPage.getNodeRefById('11')
+
+      // Navigate into subgraph (method now handles retries internally)
+      await subgraphNode.navigateIntoSubgraph()
+
+      await comfyPage.rightClickSubgraphInputSlot('text')
+      await comfyPage.clickLitegraphContextMenuItem('Remove Slot')
+      await comfyPage.page.waitForTimeout(200)
+
+      // Wait for breadcrumb to be visible
+      await comfyPage.page.waitForSelector(SELECTORS.breadcrumb, {
+        state: 'visible',
+        timeout: 5000
+      })
+
+      // Click breadcrumb to navigate back to parent graph
+      const homeBreadcrumb = comfyPage.page.getByRole('link', {
+        // In the subgraph navigation breadcrumbs, the home/top level
+        // breadcrumb is just the workflow name
+        name: workflowName
+      })
+      await homeBreadcrumb.waitFor({ state: 'visible' })
+      await homeBreadcrumb.click()
+      await comfyPage.nextFrame()
+      await comfyPage.page.waitForTimeout(300)
+
+      // Check that the subgraph node has no widgets after removing the text slot
+      const widgetCount = await comfyPage.page.evaluate(() => {
+        return window['app'].canvas.graph.nodes[0].widgets?.length || 0
+      })
+
+      expect(widgetCount).toBe(0)
+    })
+
+    test('Multiple promoted widgets are handled correctly', async ({
+      comfyPage
+    }) => {
+      await comfyPage.loadWorkflow('subgraph-with-multiple-promoted-widgets')
+
+      const parentCount = await comfyPage.page
+        .locator(SELECTORS.domWidget)
+        .count()
+      expect(parentCount).toBeGreaterThan(1)
+
+      const subgraphNode = await comfyPage.getNodeRefById('11')
+      await subgraphNode.navigateIntoSubgraph()
+
+      const subgraphCount = await comfyPage.page
+        .locator(SELECTORS.domWidget)
+        .count()
+      expect(subgraphCount).toBe(parentCount)
+
+      await comfyPage.page.keyboard.press('Escape')
+      await comfyPage.nextFrame()
+
+      const finalCount = await comfyPage.page
+        .locator(SELECTORS.domWidget)
+        .count()
+      expect(finalCount).toBe(parentCount)
+    })
+  })
+})

browser_tests/tests/versionMismatchWarnings.spec.ts

@@ -0,0 +1,117 @@
+import { expect } from '@playwright/test'
+
+import { SystemStats } from '../../src/schemas/apiSchema'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+test.describe('Version Mismatch Warnings', () => {
+  const ALWAYS_AHEAD_OF_INSTALLED_VERSION = '100.100.100'
+  const ALWAYS_BEHIND_INSTALLED_VERSION = '0.0.0'
+
+  const createMockSystemStatsRes = (
+    requiredFrontendVersion: string
+  ): SystemStats => {
+    return {
+      system: {
+        os: 'posix',
+        ram_total: 67235385344,
+        ram_free: 13464207360,
+        comfyui_version: '0.3.46',
+        required_frontend_version: requiredFrontendVersion,
+        python_version: '3.12.3 (main, Jun 18 2025, 17:59:45) [GCC 13.3.0]',
+        pytorch_version: '2.6.0+cu124',
+        embedded_python: false,
+        argv: ['main.py']
+      },
+      devices: [
+        {
+          name: 'cuda:0 NVIDIA GeForce RTX 4070 : cudaMallocAsync',
+          type: 'cuda',
+          index: 0,
+          vram_total: 12557156352,
+          vram_free: 2439249920,
+          torch_vram_total: 0,
+          torch_vram_free: 0
+        }
+      ]
+    }
+  }
+
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
+  test('should show version mismatch warnings when installed version lower than required', async ({
+    comfyPage
+  }) => {
+    // Mock system_stats route to indicate that the installed version is always ahead of the required version
+    await comfyPage.page.route('**/system_stats**', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(
+          createMockSystemStatsRes(ALWAYS_AHEAD_OF_INSTALLED_VERSION)
+        )
+      })
+    })
+    await comfyPage.setup()
+
+    // Expect a warning toast to be shown
+    await expect(
+      comfyPage.page.getByText('Version Compatibility Warning')
+    ).toBeVisible()
+  })
+
+  test('should not show version mismatch warnings when installed version is ahead of required', async ({
+    comfyPage
+  }) => {
+    // Mock system_stats route to indicate that the installed version is always ahead of the required version
+    await comfyPage.page.route('**/system_stats**', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(
+          createMockSystemStatsRes(ALWAYS_BEHIND_INSTALLED_VERSION)
+        )
+      })
+    })
+    await comfyPage.setup()
+
+    // Expect no warning toast to be shown
+    await expect(
+      comfyPage.page.getByText('Version Compatibility Warning')
+    ).not.toBeVisible()
+  })
+
+  test('should persist dismissed state across sessions', async ({
+    comfyPage
+  }) => {
+    // Mock system_stats route to indicate that the installed version is always ahead of the required version
+    await comfyPage.page.route('**/system_stats**', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(
+          createMockSystemStatsRes(ALWAYS_AHEAD_OF_INSTALLED_VERSION)
+        )
+      })
+    })
+    await comfyPage.setup()
+
+    // Locate the warning toast and dismiss it
+    const warningToast = comfyPage.page
+      .locator('div')
+      .filter({ hasText: 'Version Compatibility' })
+      .nth(3)
+    await warningToast.waitFor({ state: 'visible' })
+    const dismissButton = warningToast.getByRole('button', { name: 'Close' })
+    await dismissButton.click()
+
+    // Reload the page, keeping local storage
+    await comfyPage.setup({ clearStorage: false })
+
+    // The same warning from same versions should not be shown to the user again
+    await expect(
+      comfyPage.page.getByText('Version Compatibility Warning')
+    ).not.toBeVisible()
+  })
+})

browser_tests/tests/widget.spec.ts

@@ -48,7 +48,7 @@ test.describe('Combo text widget', () => {
     await comfyPage.page.keyboard.press('r')
 
     // Wait for nodes' widgets to be updated
-    await comfyPage.nextFrame()
+    await comfyPage.page.waitForTimeout(500)
 
     const refreshedComboValues = await getComboValues()
     expect(refreshedComboValues).not.toEqual(initialComboValues)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comfyorg/comfyui-frontend",
   "private": true,
-  "version": "1.24.1",
+  "version": "1.25.3",
   "type": "module",
   "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
   "homepage": "https://comfy.org",
@@ -40,6 +40,7 @@
     "@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",
     "@vitejs/plugin-vue": "^5.1.4",
     "@vue/test-utils": "^2.4.6",
@@ -62,8 +63,8 @@
     "tsx": "^4.15.6",
     "typescript": "^5.4.5",
     "typescript-eslint": "^8.0.0",
-    "unplugin-icons": "^0.19.3",
-    "unplugin-vue-components": "^0.27.4",
+    "unplugin-icons": "^0.22.0",
+    "unplugin-vue-components": "^0.28.0",
     "vite": "^5.4.19",
     "vite-plugin-dts": "^4.3.0",
     "vite-plugin-html": "^3.2.2",
@@ -77,7 +78,7 @@
     "@alloc/quick-lru": "^5.2.0",
     "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
     "@comfyorg/comfyui-electron-types": "^0.4.43",
-    "@comfyorg/litegraph": "^0.16.7",
+    "@comfyorg/litegraph": "^0.16.20",
     "@primevue/forms": "^4.2.5",
     "@primevue/themes": "^4.2.5",
     "@sentry/vue": "^8.48.0",
@@ -96,6 +97,8 @@
     "axios": "^1.8.2",
     "dompurify": "^3.2.5",
     "dotenv": "^16.4.5",
+    "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",
@@ -105,6 +108,7 @@
     "pinia": "^2.1.7",
     "primeicons": "^7.0.0",
     "primevue": "^4.2.5",
+    "semver": "^7.7.2",
     "three": "^0.170.0",
     "tiptap-markdown": "^0.8.10",
     "vue": "^3.5.13",

src/assets/icons/README.md

@@ -0,0 +1,184 @@
+# ComfyUI Custom Icons Guide
+
+This guide explains how to add and use custom SVG icons in the ComfyUI frontend.
+
+## Overview
+
+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
+
+Custom icons are powered by [unplugin-icons](https://github.com/unplugin/unplugin-icons) and integrate seamlessly with Vue's component system.
+
+## Quick Start
+
+### 1. Add Your SVG Icon
+
+Place your SVG file in the `custom/` directory:
+```
+src/assets/icons/custom/
+└── your-icon.svg
+```
+
+### 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">
+  <path d="..." />
+</svg>
+```
+
+**Important:**
+- Use `viewBox` for proper scaling (24x24 is standard)
+- Don't include `width` or `height` attributes
+- Use `currentColor` for theme-aware icons
+- Keep SVGs optimized and simple
+
+### Color Theming
+
+For icons that adapt to the current theme, use `currentColor`:
+
+```xml
+<!-- ✅ Good: Uses currentColor -->
+<svg viewBox="0 0 24 24">
+  <path stroke="currentColor" fill="none" d="..." />
+</svg>
+
+<!-- ❌ Bad: Hardcoded colors -->
+<svg viewBox="0 0 24 24">
+  <path stroke="white" fill="black" d="..." />
+</svg>
+```
+
+## Usage Examples
+
+### Basic Icon
+```vue
+<i-comfy:workflow />
+```
+
+### With Classes
+```vue
+<i-comfy:workflow class="text-2xl text-blue-500" />
+```
+
+### 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
+
+### How It Works
+
+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
+
+The icon system is configured in `vite.config.mts`:
+
+```typescript
+Icons({
+  compiler: 'vue3',
+  customCollections: {
+    'comfy': FileSystemIconLoader('src/assets/icons/custom'),
+  }
+})
+```
+
+### TypeScript Support
+
+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
+
+### Icon Not Showing
+1. **Check filename**: Must be kebab-case without special characters
+2. **Restart dev server**: Required after adding new icons
+3. **Verify SVG**: Ensure it's valid SVG syntax
+4. **Check console**: Look for Vue component resolution errors
+
+### Icon Wrong Color
+- Replace hardcoded colors with `currentColor`
+- Use `stroke="currentColor"` for outlines
+- Use `fill="currentColor"` for filled shapes
+
+### Icon Wrong Size
+- Remove `width` and `height` from SVG
+- Ensure `viewBox` is present
+- Use CSS classes for sizing: `class="w-6 h-6"`
+
+## Best Practices
+
+1. **Optimize SVGs**: Use tools like [SVGO](https://jakearchibald.github.io/svgomg/) to minimize file size
+2. **Consistent viewBox**: Stick to 24x24 or 16x16 for consistency
+3. **Semantic names**: Use descriptive names like `workflow-duplicate` not `icon1`
+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:
+
+1. Install the icon package
+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.

src/assets/icons/custom/workflow.svg

@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 5V3C14 2.44772 13.5523 2 13 2H11C10.4477 2 10 2.44772 10 3V5C10 5.55228 10.4477 6 11 6H13C13.5523 6 14 5.55228 14 5Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5V3C6 2.44772 5.55228 2 5 2H3C2.44772 2 2 2.44772 2 3V5C2 5.55228 2.44772 6 3 6H5C5.55228 6 6 5.55228 6 5Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M14 13V11C14 10.4477 13.5523 10 13 10H11C10.4477 10 10 10.4477 10 11V13C10 13.5523 10.4477 14 11 14H13C13.5523 14 14 13.5523 14 13Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M10 4H6" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M10 12H8C5.79086 12 4 10.2091 4 8V6" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

src/components/actionbar/ComfyActionbar.vue

@@ -30,10 +30,11 @@ import ComfyQueueButton from './ComfyQueueButton.vue'
 
 const settingsStore = useSettingStore()
 
-const visible = computed(
-  () => settingsStore.get('Comfy.UseNewMenu') !== 'Disabled'
-)
+const position = computed(() => settingsStore.get('Comfy.UseNewMenu'))
 
+const visible = computed(() => position.value !== 'Disabled')
+
+const topMenuRef = inject<Ref<HTMLDivElement | null>>('topMenuRef')
 const panelRef = ref<HTMLElement | null>(null)
 const dragHandleRef = ref<HTMLElement | null>(null)
 const isDocked = useLocalStorage('Comfy.MenuPosition.Docked', false)
@@ -49,7 +50,16 @@ const {
 } = useDraggable(panelRef, {
   initialValue: { x: 0, y: 0 },
   handle: dragHandleRef,
-  containerElement: document.body
+  containerElement: document.body,
+  onMove: (event) => {
+    // Prevent dragging the menu over the top of the tabs
+    if (position.value === 'Top') {
+      const minY = topMenuRef?.value?.getBoundingClientRect().top ?? 40
+      if (event.y < minY) {
+        event.y = minY
+      }
+    }
+  }
 })
 
 // Update storedPosition when x or y changes
@@ -182,7 +192,6 @@ const adjustMenuPosition = () => {
 
 useEventListener(window, 'resize', adjustMenuPosition)
 
-const topMenuRef = inject<Ref<HTMLDivElement | null>>('topMenuRef')
 const topMenuBounds = useElementBounding(topMenuRef)
 const overlapThreshold = 20 // pixels
 const isOverlappingWithTopMenu = computed(() => {

src/components/breadcrumb/SubgraphBreadcrumb.vue

@@ -1,47 +1,95 @@
 <template>
-  <div v-if="workflowStore.isSubgraphActive" class="p-2 subgraph-breadcrumb">
+  <div
+    class="subgraph-breadcrumb w-auto"
+    :class="{
+      'subgraph-breadcrumb-collapse': collapseTabs,
+      'subgraph-breadcrumb-overflow': overflowingTabs
+    }"
+    :style="{
+      '--p-breadcrumb-gap': `${ITEM_GAP}px`,
+      '--p-breadcrumb-item-min-width': `${MIN_WIDTH}px`,
+      '--p-breadcrumb-item-padding': `${ITEM_PADDING}px`,
+      '--p-breadcrumb-icon-width': `${ICON_WIDTH}px`
+    }"
+  >
     <Breadcrumb
-      class="bg-transparent"
-      :home="home"
+      ref="breadcrumbRef"
+      class="bg-transparent p-0"
       :model="items"
       aria-label="Graph navigation"
-      @item-click="handleItemClick"
-    />
+    >
+      <template #item="{ item }">
+        <SubgraphBreadcrumbItem
+          :item="item"
+          :is-active="item === items.at(-1)"
+        />
+      </template>
+      <template #separator
+        ><span style="transform: scale(1.5)"> / </span></template
+      >
+    </Breadcrumb>
   </div>
 </template>
 
 <script setup lang="ts">
 import { useEventListener } from '@vueuse/core'
 import Breadcrumb from 'primevue/breadcrumb'
-import type { MenuItem, MenuItemCommandEvent } from 'primevue/menuitem'
-import { computed } from 'vue'
+import type { MenuItem } from 'primevue/menuitem'
+import { computed, onUpdated, ref, watch } from 'vue'
 
+import SubgraphBreadcrumbItem from '@/components/breadcrumb/SubgraphBreadcrumbItem.vue'
+import { useOverflowObserver } from '@/composables/element/useOverflowObserver'
 import { useCanvasStore } from '@/stores/graphStore'
 import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
 import { useWorkflowStore } from '@/stores/workflowStore'
+import { forEachSubgraphNode } from '@/utils/graphTraversalUtil'
+
+const MIN_WIDTH = 28
+const ITEM_GAP = 8
+const ITEM_PADDING = 8
+const ICON_WIDTH = 20
 
 const workflowStore = useWorkflowStore()
 const navigationStore = useSubgraphNavigationStore()
-
+const breadcrumbRef = ref<InstanceType<typeof Breadcrumb>>()
 const workflowName = computed(() => workflowStore.activeWorkflow?.filename)
+const collapseTabs = ref(false)
+const overflowingTabs = ref(false)
+
+const breadcrumbElement = computed(() => {
+  if (!breadcrumbRef.value) return null
+
+  const el = (breadcrumbRef.value as unknown as { $el: HTMLElement }).$el
+  const list = el?.querySelector('.p-breadcrumb-list') as HTMLElement
+  return list
+})
 
 const items = computed(() => {
-  if (!navigationStore.navigationStack.length) return []
-
-  return navigationStore.navigationStack.map<MenuItem>((subgraph) => ({
+  const items = navigationStore.navigationStack.map<MenuItem>((subgraph) => ({
     label: subgraph.name,
     command: () => {
       const canvas = useCanvasStore().getCanvas()
       if (!canvas.graph) throw new TypeError('Canvas has no graph')
 
       canvas.setGraph(subgraph)
+    },
+    updateTitle: (title: string) => {
+      const rootGraph = useCanvasStore().getCanvas().graph?.rootGraph
+      if (!rootGraph) return
+
+      forEachSubgraphNode(rootGraph, subgraph.id, (node) => {
+        node.title = title
+      })
     }
   }))
+
+  return [home.value, ...items]
 })
 
 const home = computed(() => ({
   label: workflowName.value,
   icon: 'pi pi-home',
+  key: 'root',
   command: () => {
     const canvas = useCanvasStore().getCanvas()
     if (!canvas.graph) throw new TypeError('Canvas has no graph')
@@ -50,10 +98,6 @@ const home = computed(() => ({
   }
 }))
 
-const handleItemClick = (event: MenuItemCommandEvent) => {
-  event.item.command?.(event)
-}
-
 // Escape exits from the current subgraph.
 useEventListener(document, 'keydown', (event) => {
   if (event.key === 'Escape') {
@@ -65,21 +109,116 @@ useEventListener(document, 'keydown', (event) => {
     )
   }
 })
+
+// Check for overflow on breadcrumb items and collapse/expand the breadcrumb to fit
+let overflowObserver: ReturnType<typeof useOverflowObserver> | undefined
+watch(breadcrumbElement, (el) => {
+  overflowObserver?.dispose()
+  overflowObserver = undefined
+
+  if (!el) return
+
+  overflowObserver = useOverflowObserver(el, {
+    onCheck: (isOverflowing) => {
+      overflowingTabs.value = isOverflowing
+
+      if (collapseTabs.value) {
+        // Items are currently hidden, check if we can show them
+        if (!isOverflowing) {
+          const items = [
+            ...el.querySelectorAll('.p-breadcrumb-item')
+          ] as HTMLElement[]
+
+          if (items.length < 3) return
+
+          const itemsWithIcon = items.filter((item) =>
+            item.querySelector('.p-breadcrumb-item-link-icon-visible')
+          ).length
+          const separators = el.querySelectorAll(
+            '.p-breadcrumb-separator'
+          ) as NodeListOf<HTMLElement>
+          const separator = separators[separators.length - 1] as HTMLElement
+          const separatorWidth = separator.offsetWidth
+
+          // items + separators + gaps + icons
+          const itemsWidth =
+            (MIN_WIDTH + ITEM_PADDING + ITEM_PADDING) * items.length +
+            itemsWithIcon * ICON_WIDTH
+          const separatorsWidth = (items.length - 1) * separatorWidth
+          const gapsWidth = (items.length - 1) * (ITEM_GAP * 2)
+          const totalWidth = itemsWidth + separatorsWidth + gapsWidth
+          const containerWidth = el.clientWidth
+
+          if (totalWidth <= containerWidth) {
+            collapseTabs.value = false
+          }
+        }
+      } else if (isOverflowing) {
+        collapseTabs.value = true
+      }
+    }
+  })
+})
+
+// If e.g. the workflow name changes, we need to check the overflow again
+onUpdated(() => {
+  if (!overflowObserver?.disposed.value) {
+    overflowObserver?.checkOverflow()
+  }
+})
 </script>
 
-<style>
-.subgraph-breadcrumb {
-  .p-breadcrumb-item-link,
-  .p-breadcrumb-item-icon {
-    @apply select-none;
+<style scoped>
+.subgraph-breadcrumb:not(:empty) {
+  flex: auto;
+  flex-shrink: 10000;
+  min-width: 120px;
+}
 
-    color: #d26565;
-    text-shadow:
-      1px 1px 0 #000,
-      -1px -1px 0 #000,
-      1px -1px 0 #000,
-      -1px 1px 0 #000,
-      0 0 0.375rem #000;
+.subgraph-breadcrumb,
+:deep(.p-breadcrumb) {
+  @apply overflow-hidden;
+}
+
+:deep(.p-breadcrumb-item) {
+  @apply flex items-center rounded-lg overflow-hidden;
+  min-width: calc(var(--p-breadcrumb-item-min-width) + 1rem);
+  /* Collapse middle items first */
+  flex-shrink: 10000;
+}
+
+:deep(.p-breadcrumb-item:has(.p-breadcrumb-item-link-icon-visible)) {
+  min-width: calc(var(--p-breadcrumb-item-min-width) + 1rem + 20px);
+}
+
+:deep(.p-breadcrumb-item:first-child) {
+  /* Then collapse the root workflow */
+  flex-shrink: 5000;
+}
+
+:deep(.p-breadcrumb-item:last-child) {
+  /* Then collapse the active item */
+  flex-shrink: 1;
+}
+
+:deep(.p-breadcrumb-item:hover),
+:deep(.p-breadcrumb-item:has(.p-breadcrumb-item-link-menu-visible)) {
+  background-color: color-mix(in srgb, var(--fg-color) 10%, transparent);
+  color: var(--fg-color);
+}
+</style>
+
+<style>
+.subgraph-breadcrumb-collapse .p-breadcrumb-list {
+  .p-breadcrumb-item,
+  .p-breadcrumb-separator {
+    @apply hidden;
+  }
+
+  .p-breadcrumb-item:nth-last-child(3),
+  .p-breadcrumb-separator:nth-last-child(2),
+  .p-breadcrumb-item:nth-last-child(1) {
+    @apply block;
   }
 }
 </style>

src/components/breadcrumb/SubgraphBreadcrumbItem.vue

@@ -0,0 +1,215 @@
+<template>
+  <a
+    ref="wrapperRef"
+    v-tooltip.bottom="{
+      value: item.label,
+      showDelay: 512
+    }"
+    href="#"
+    class="cursor-pointer p-breadcrumb-item-link"
+    :class="{
+      'flex items-center gap-1': isActive,
+      'p-breadcrumb-item-link-menu-visible': menu?.overlayVisible,
+      'p-breadcrumb-item-link-icon-visible': isActive
+    }"
+    @click="handleClick"
+  >
+    <span class="p-breadcrumb-item-label">{{ item.label }}</span>
+    <i v-if="isActive" class="pi pi-angle-down text-[10px]"></i>
+  </a>
+  <Menu
+    v-if="isActive"
+    ref="menu"
+    :model="menuItems"
+    :popup="true"
+    :pt="{
+      root: {
+        style: 'background-color: var(--comfy-menu-secondary-bg)'
+      },
+      itemLink: {
+        class: 'py-2'
+      }
+    }"
+  />
+  <InputText
+    v-if="isEditing"
+    ref="itemInputRef"
+    v-model="itemLabel"
+    class="fixed z-[10000] text-[.8rem] px-2 py-2"
+    @blur="inputBlur(true)"
+    @click.stop
+    @keydown.enter="inputBlur(true)"
+    @keydown.esc="inputBlur(false)"
+  />
+</template>
+
+<script setup lang="ts">
+import InputText from 'primevue/inputtext'
+import Menu, { MenuState } from 'primevue/menu'
+import type { MenuItem } from 'primevue/menuitem'
+import { computed, nextTick, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useDialogService } from '@/services/dialogService'
+import { useWorkflowService } from '@/services/workflowService'
+import { useCommandStore } from '@/stores/commandStore'
+import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
+import { ComfyWorkflow, useWorkflowStore } from '@/stores/workflowStore'
+import { appendJsonExt } from '@/utils/formatUtil'
+
+interface Props {
+  item: MenuItem
+  isActive?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  isActive: false
+})
+
+const { t } = useI18n()
+const menu = ref<InstanceType<typeof Menu> & MenuState>()
+const dialogService = useDialogService()
+const workflowStore = useWorkflowStore()
+const workflowService = useWorkflowService()
+const isEditing = ref(false)
+const itemLabel = ref<string>()
+const itemInputRef = ref<{ $el?: HTMLInputElement }>()
+const wrapperRef = ref<HTMLAnchorElement>()
+
+const rename = async (
+  newName: string | null | undefined,
+  initialName: string
+) => {
+  if (newName && newName !== initialName) {
+    // Synchronize the node titles with the new name
+    props.item.updateTitle?.(newName)
+
+    if (workflowStore.activeSubgraph) {
+      workflowStore.activeSubgraph.name = newName
+    } else if (workflowStore.activeWorkflow) {
+      try {
+        await workflowService.renameWorkflow(
+          workflowStore.activeWorkflow,
+          ComfyWorkflow.basePath + appendJsonExt(newName)
+        )
+      } catch (error) {
+        console.error(error)
+        dialogService.showErrorDialog(error)
+        return
+      }
+    }
+
+    // Force the navigation stack to recompute the labels
+    // TODO: investigate if there is a better way to do this
+    const navigationStore = useSubgraphNavigationStore()
+    navigationStore.restoreState(navigationStore.exportState())
+  }
+}
+
+const menuItems = computed<MenuItem[]>(() => {
+  return [
+    {
+      label: t('g.rename'),
+      icon: 'pi pi-pencil',
+      command: async () => {
+        let initialName =
+          workflowStore.activeSubgraph?.name ??
+          workflowStore.activeWorkflow?.filename
+
+        if (!initialName) return
+
+        const newName = await dialogService.prompt({
+          title: t('g.rename'),
+          message: t('breadcrumbsMenu.enterNewName'),
+          defaultValue: initialName
+        })
+
+        await rename(newName, initialName)
+      }
+    },
+    {
+      label: t('breadcrumbsMenu.duplicate'),
+      icon: 'pi pi-copy',
+      command: async () => {
+        await workflowService.duplicateWorkflow(workflowStore.activeWorkflow!)
+      },
+      visible: props.item.key === 'root'
+    },
+    {
+      separator: true
+    },
+    {
+      label: t('breadcrumbsMenu.clearWorkflow'),
+      icon: 'pi pi-trash',
+      command: async () => {
+        await useCommandStore().execute('Comfy.ClearWorkflow')
+      }
+    },
+    {
+      separator: true,
+      visible: props.item.key === 'root'
+    },
+    {
+      label: t('breadcrumbsMenu.deleteWorkflow'),
+      icon: 'pi pi-times',
+      command: async () => {
+        await workflowService.deleteWorkflow(workflowStore.activeWorkflow!)
+      },
+      visible: props.item.key === 'root'
+    }
+  ]
+})
+
+const handleClick = (event: MouseEvent) => {
+  if (isEditing.value) {
+    return
+  }
+
+  if (event.detail === 1) {
+    if (props.isActive) {
+      menu.value?.toggle(event)
+    } else {
+      props.item.command?.({ item: props.item, originalEvent: event })
+    }
+  } else if (props.isActive && event.detail === 2) {
+    menu.value?.hide()
+    event.stopPropagation()
+    event.preventDefault()
+    isEditing.value = true
+    itemLabel.value = props.item.label as string
+    void nextTick(() => {
+      if (itemInputRef.value?.$el) {
+        itemInputRef.value.$el.focus()
+        itemInputRef.value.$el.select()
+        if (wrapperRef.value) {
+          itemInputRef.value.$el.style.width = `${Math.max(200, wrapperRef.value.offsetWidth)}px`
+        }
+      }
+    })
+  }
+}
+
+const inputBlur = async (doRename: boolean) => {
+  if (doRename) {
+    await rename(itemLabel.value, props.item.label as string)
+  }
+
+  isEditing.value = false
+}
+</script>
+
+<style scoped>
+.p-breadcrumb-item-link,
+.p-breadcrumb-item-icon {
+  @apply select-none;
+}
+
+.p-breadcrumb-item-link {
+  @apply overflow-hidden;
+  padding: var(--p-breadcrumb-item-padding);
+}
+
+.p-breadcrumb-item-label {
+  @apply whitespace-nowrap text-ellipsis overflow-hidden;
+}
+</style>

src/components/common/LazyImage.vue

@@ -0,0 +1,124 @@
+<template>
+  <div
+    ref="containerRef"
+    class="relative overflow-hidden w-full h-full flex items-center justify-center"
+  >
+    <Skeleton
+      v-if="!isImageLoaded"
+      width="100%"
+      height="100%"
+      class="absolute inset-0"
+    />
+    <img
+      v-show="isImageLoaded"
+      ref="imageRef"
+      :src="cachedSrc"
+      :alt="alt"
+      draggable="false"
+      :class="imageClass"
+      :style="imageStyle"
+      @load="onImageLoad"
+      @error="onImageError"
+    />
+    <div
+      v-if="hasError"
+      class="absolute inset-0 flex items-center justify-center bg-surface-50 dark-theme:bg-surface-800 text-muted"
+    >
+      <i class="pi pi-image text-2xl" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Skeleton from 'primevue/skeleton'
+import { computed, onUnmounted, ref, watch } from 'vue'
+
+import { useIntersectionObserver } from '@/composables/useIntersectionObserver'
+import { useMediaCache } from '@/services/mediaCacheService'
+
+const {
+  src,
+  alt = '',
+  imageClass = '',
+  imageStyle,
+  rootMargin = '300px'
+} = defineProps<{
+  src: string
+  alt?: string
+  imageClass?: string | string[] | Record<string, boolean>
+  imageStyle?: Record<string, any>
+  rootMargin?: string
+}>()
+
+const containerRef = ref<HTMLElement | null>(null)
+const imageRef = ref<HTMLImageElement | null>(null)
+const isIntersecting = ref(false)
+const isImageLoaded = ref(false)
+const hasError = ref(false)
+const cachedSrc = ref<string | undefined>(undefined)
+
+const { getCachedMedia, acquireUrl, releaseUrl } = useMediaCache()
+
+// Use intersection observer to detect when the image container comes into view
+useIntersectionObserver(
+  containerRef,
+  (entries) => {
+    const entry = entries[0]
+    isIntersecting.value = entry?.isIntersecting ?? false
+  },
+  {
+    rootMargin,
+    threshold: 0.1
+  }
+)
+
+// Only start loading the image when it's in view
+const shouldLoad = computed(() => isIntersecting.value)
+
+watch(
+  shouldLoad,
+  async (shouldLoad) => {
+    if (shouldLoad && src && !cachedSrc.value && !hasError.value) {
+      try {
+        const cachedMedia = await getCachedMedia(src)
+        if (cachedMedia.error) {
+          hasError.value = true
+        } else if (cachedMedia.objectUrl) {
+          const acquiredUrl = acquireUrl(src)
+          cachedSrc.value = acquiredUrl || cachedMedia.objectUrl
+        } else {
+          cachedSrc.value = src
+        }
+      } catch (error) {
+        console.warn('Failed to load cached media:', error)
+        cachedSrc.value = src
+      }
+    } else if (!shouldLoad) {
+      if (cachedSrc.value?.startsWith('blob:')) {
+        releaseUrl(src)
+      }
+      // Hide image when out of view
+      isImageLoaded.value = false
+      cachedSrc.value = undefined
+      hasError.value = false
+    }
+  },
+  { immediate: true }
+)
+
+const onImageLoad = () => {
+  isImageLoaded.value = true
+  hasError.value = false
+}
+
+const onImageError = () => {
+  hasError.value = true
+  isImageLoaded.value = false
+}
+
+onUnmounted(() => {
+  if (cachedSrc.value?.startsWith('blob:')) {
+    releaseUrl(src)
+  }
+})
+</script>

src/components/dialog/content/LoadWorkflowWarning.vue

@@ -2,7 +2,7 @@
   <NoResultsPlaceholder
     class="pb-0"
     icon="pi pi-exclamation-circle"
-    title="Missing Node Types"
+    title="Some Nodes Are Missing"
     message="When loading the graph, the following node types were not found"
   />
   <MissingCoreNodesMessage :missing-core-nodes="missingCoreNodes" />

src/components/graph/DomWidgets.vue

@@ -11,7 +11,6 @@
 </template>
 
 <script setup lang="ts">
-import type { LGraphNode } from '@comfyorg/litegraph'
 import { whenever } from '@vueuse/core'
 import { computed } from 'vue'
 
@@ -21,24 +20,35 @@ import { useDomWidgetStore } from '@/stores/domWidgetStore'
 import { useCanvasStore } from '@/stores/graphStore'
 
 const domWidgetStore = useDomWidgetStore()
-const widgetStates = computed(() => domWidgetStore.activeWidgetStates)
+
+const widgetStates = computed(() => [...domWidgetStore.widgetStates.values()])
 
 const updateWidgets = () => {
   const lgCanvas = canvasStore.canvas
   if (!lgCanvas) return
 
   const lowQuality = lgCanvas.low_quality
+  const currentGraph = lgCanvas.graph
+
   for (const widgetState of widgetStates.value) {
     const widget = widgetState.widget
-    const node = widget.node as LGraphNode
 
-    const visible =
+    // Early exit for non-visible widgets
+    if (!widget.isVisible()) {
+      widgetState.visible = false
+      continue
+    }
+
+    // Check if the widget's node is in the current graph
+    const node = widget.node
+    const isInCorrectGraph = currentGraph?.nodes.includes(node)
+
+    widgetState.visible =
+      !!isInCorrectGraph &&
       lgCanvas.isNodeVisible(node) &&
-      !(widget.options.hideOnZoom && lowQuality) &&
-      widget.isVisible()
+      !(widget.options.hideOnZoom && lowQuality)
 
-    widgetState.visible = visible
-    if (visible) {
+    if (widgetState.visible && node) {
       const margin = widget.margin
       widgetState.pos = [node.pos[0] + margin, node.pos[1] + margin + widget.y]
       widgetState.size = [

src/components/graph/GraphCanvas.vue

@@ -16,9 +16,14 @@
         <SecondRowWorkflowTabs
           v-if="workflowTabsPosition === 'Topbar (2nd-row)'"
         />
-        <SubgraphBreadcrumb />
       </div>
       <GraphCanvasMenu v-if="canvasMenuEnabled" class="pointer-events-auto" />
+
+      <MiniMap
+        v-if="comfyAppReady && minimapEnabled"
+        ref="minimapRef"
+        class="pointer-events-auto"
+      />
     </template>
   </LiteGraphCanvasSplitterOverlay>
   <GraphCanvasMenu v-if="!betaMenuEnabled && canvasMenuEnabled" />
@@ -50,9 +55,9 @@ import { computed, onMounted, ref, watch, watchEffect } from 'vue'
 
 import LiteGraphCanvasSplitterOverlay from '@/components/LiteGraphCanvasSplitterOverlay.vue'
 import BottomPanel from '@/components/bottomPanel/BottomPanel.vue'
-import SubgraphBreadcrumb from '@/components/breadcrumb/SubgraphBreadcrumb.vue'
 import DomWidgets from '@/components/graph/DomWidgets.vue'
 import GraphCanvasMenu from '@/components/graph/GraphCanvasMenu.vue'
+import MiniMap from '@/components/graph/MiniMap.vue'
 import NodeTooltip from '@/components/graph/NodeTooltip.vue'
 import SelectionOverlay from '@/components/graph/SelectionOverlay.vue'
 import SelectionToolbox from '@/components/graph/SelectionToolbox.vue'
@@ -67,12 +72,12 @@ import { useContextMenuTranslation } from '@/composables/useContextMenuTranslati
 import { useCopy } from '@/composables/useCopy'
 import { useGlobalLitegraph } from '@/composables/useGlobalLitegraph'
 import { useLitegraphSettings } from '@/composables/useLitegraphSettings'
+import { useMinimap } from '@/composables/useMinimap'
 import { usePaste } from '@/composables/usePaste'
 import { useWorkflowAutoSave } from '@/composables/useWorkflowAutoSave'
 import { useWorkflowPersistence } from '@/composables/useWorkflowPersistence'
 import { CORE_SETTINGS } from '@/constants/coreSettings'
 import { i18n, t } from '@/i18n'
-import type { NodeId } from '@/schemas/comfyWorkflowSchema'
 import { UnauthorizedError, api } from '@/scripts/api'
 import { app as comfyApp } from '@/scripts/app'
 import { ChangeTracker } from '@/scripts/changeTracker'
@@ -114,6 +119,10 @@ const selectionToolboxEnabled = computed(() =>
   settingStore.get('Comfy.Canvas.SelectionToolbox')
 )
 
+const minimapRef = ref<InstanceType<typeof MiniMap>>()
+const minimapEnabled = computed(() => settingStore.get('Comfy.Minimap.Visible'))
+const minimap = useMinimap()
+
 watchEffect(() => {
   nodeDefStore.showDeprecated = settingStore.get('Comfy.Node.ShowDeprecated')
 })
@@ -192,22 +201,26 @@ watch(
   }
 )
 
-// Update the progress of the executing node
+// Update the progress of executing nodes
 watch(
   () =>
-    [
-      executionStore.executingNodeId,
-      executionStore.executingNodeProgress
-    ] satisfies [NodeId | null, number | null],
-  ([executingNodeId, executingNodeProgress]) => {
-    for (const node of comfyApp.graph.nodes) {
-      if (node.id == executingNodeId) {
-        node.progress = executingNodeProgress ?? undefined
+    [executionStore.nodeLocationProgressStates, canvasStore.canvas] as const,
+  ([nodeLocationProgressStates, canvas]) => {
+    if (!canvas?.graph) return
+    for (const node of canvas.graph.nodes) {
+      const nodeLocatorId = useWorkflowStore().nodeIdToNodeLocatorId(node.id)
+      const progressState = nodeLocationProgressStates[nodeLocatorId]
+      if (progressState && progressState.state === 'running') {
+        node.progress = progressState.value / progressState.max
       } else {
         node.progress = undefined
       }
     }
-  }
+
+    // Force canvas redraw to ensure progress updates are visible
+    canvas.graph.setDirtyCanvas(true, false)
+  },
+  { deep: true }
 )
 
 // Update node slot errors
@@ -345,6 +358,13 @@ onMounted(async () => {
     }
   )
 
+  whenever(
+    () => minimapRef.value,
+    (ref) => {
+      minimap.setMinimapRef(ref)
+    }
+  )
+
   whenever(
     () => useCanvasStore().canvas,
     (canvas) => {

src/components/graph/GraphCanvasMenu.vue

@@ -1,6 +1,7 @@
 <template>
   <ButtonGroup
     class="p-buttongroup-vertical absolute bottom-[10px] right-[10px] z-[1000]"
+    @wheel="canvasInteractions.handleWheel"
   >
     <Button
       v-tooltip.left="t('graphCanvasMenu.zoomIn')"
@@ -56,6 +57,15 @@
       data-testid="toggle-link-visibility-button"
       @click="() => commandStore.execute('Comfy.Canvas.ToggleLinkVisibility')"
     />
+    <Button
+      v-tooltip.left="t('graphCanvasMenu.toggleMinimap') + ' (Alt + m)'"
+      severity="secondary"
+      :icon="'pi pi-map'"
+      :aria-label="$t('graphCanvasMenu.toggleMinimap')"
+      :class="{ 'minimap-active': minimapVisible }"
+      data-testid="toggle-minimap-button"
+      @click="() => commandStore.execute('Comfy.Canvas.ToggleMinimap')"
+    />
   </ButtonGroup>
 </template>
 
@@ -66,6 +76,7 @@ import ButtonGroup from 'primevue/buttongroup'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { useCanvasInteractions } from '@/composables/graph/useCanvasInteractions'
 import { useCommandStore } from '@/stores/commandStore'
 import { useCanvasStore } from '@/stores/graphStore'
 import { useSettingStore } from '@/stores/settingStore'
@@ -74,7 +85,9 @@ const { t } = useI18n()
 const commandStore = useCommandStore()
 const canvasStore = useCanvasStore()
 const settingStore = useSettingStore()
+const canvasInteractions = useCanvasInteractions()
 
+const minimapVisible = computed(() => settingStore.get('Comfy.Minimap.Visible'))
 const linkHidden = computed(
   () => settingStore.get('Comfy.LinkRenderMode') === LiteGraph.HIDDEN_LINK
 )
@@ -107,4 +120,15 @@ const stopRepeat = () => {
   margin: 0;
   border-radius: 0;
 }
+
+.p-button.minimap-active {
+  background-color: var(--p-button-primary-background);
+  border-color: var(--p-button-primary-border-color);
+  color: var(--p-button-primary-color);
+}
+
+.p-button.minimap-active:hover {
+  background-color: var(--p-button-primary-hover-background);
+  border-color: var(--p-button-primary-hover-border-color);
+}
 </style>

src/components/graph/MiniMap.vue

@@ -0,0 +1,88 @@
+<template>
+  <div
+    v-if="visible && initialized"
+    ref="containerRef"
+    class="litegraph-minimap absolute bottom-[20px] right-[90px] z-[1000]"
+    :style="containerStyles"
+    @mousedown="handleMouseDown"
+    @mousemove="handleMouseMove"
+    @mouseup="handleMouseUp"
+    @mouseleave="handleMouseUp"
+    @wheel="handleWheel"
+  >
+    <canvas
+      ref="canvasRef"
+      :width="width"
+      :height="height"
+      class="minimap-canvas"
+    />
+    <div class="minimap-viewport" :style="viewportStyles" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, onUnmounted, watch } from 'vue'
+
+import { useMinimap } from '@/composables/useMinimap'
+import { useCanvasStore } from '@/stores/graphStore'
+
+const minimap = useMinimap()
+const canvasStore = useCanvasStore()
+
+const {
+  initialized,
+  visible,
+  containerRef,
+  canvasRef,
+  containerStyles,
+  viewportStyles,
+  width,
+  height,
+  init,
+  destroy,
+  handleMouseDown,
+  handleMouseMove,
+  handleMouseUp,
+  handleWheel
+} = minimap
+
+watch(
+  () => canvasStore.canvas,
+  async (canvas) => {
+    if (canvas && !initialized.value) {
+      await init()
+    }
+  },
+  { immediate: true }
+)
+
+onMounted(async () => {
+  if (canvasStore.canvas) {
+    await init()
+  }
+})
+
+onUnmounted(() => {
+  destroy()
+})
+</script>
+
+<style scoped>
+.litegraph-minimap {
+  overflow: hidden;
+}
+
+.minimap-canvas {
+  display: block;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+}
+
+.minimap-viewport {
+  position: absolute;
+  top: 0;
+  left: 0;
+  pointer-events: none;
+}
+</style>

src/components/graph/SelectionOverlay.vue

@@ -17,26 +17,28 @@ import { createBounds } from '@comfyorg/litegraph'
 import { whenever } from '@vueuse/core'
 import { ref, watch } from 'vue'
 
+import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteGraphItems'
 import { useAbsolutePosition } from '@/composables/element/useAbsolutePosition'
 import { useCanvasStore } from '@/stores/graphStore'
 
 const canvasStore = useCanvasStore()
 const { style, updatePosition } = useAbsolutePosition()
+const { getSelectableItems } = useSelectedLiteGraphItems()
 
 const visible = ref(false)
 const showBorder = ref(false)
 
 const positionSelectionOverlay = () => {
-  const { selectedItems } = canvasStore.getCanvas()
-  showBorder.value = selectedItems.size > 1
+  const selectableItems = getSelectableItems()
+  showBorder.value = selectableItems.size > 1
 
-  if (!selectedItems.size) {
+  if (!selectableItems.size) {
     visible.value = false
     return
   }
 
   visible.value = true
-  const bounds = createBounds(selectedItems)
+  const bounds = createBounds(selectableItems)
   if (bounds) {
     updatePosition({
       pos: [bounds[0], bounds[1]],
@@ -45,7 +47,6 @@ const positionSelectionOverlay = () => {
   }
 }
 
-// Register listener on canvas creation.
 whenever(
   () => canvasStore.getCanvas().state.selectionChanged,
   () => {

src/components/graph/SelectionToolbox.vue

@@ -5,6 +5,7 @@
       header: 'hidden',
       content: 'p-0 flex flex-row'
     }"
+    @wheel="canvasInteractions.handleWheel"
   >
     <ExecuteButton />
     <ColorPickerButton />
@@ -39,6 +40,7 @@ import HelpButton from '@/components/graph/selectionToolbox/HelpButton.vue'
 import MaskEditorButton from '@/components/graph/selectionToolbox/MaskEditorButton.vue'
 import PinButton from '@/components/graph/selectionToolbox/PinButton.vue'
 import RefreshButton from '@/components/graph/selectionToolbox/RefreshButton.vue'
+import { useCanvasInteractions } from '@/composables/graph/useCanvasInteractions'
 import { useExtensionService } from '@/services/extensionService'
 import { type ComfyCommandImpl, useCommandStore } from '@/stores/commandStore'
 import { useCanvasStore } from '@/stores/graphStore'
@@ -46,6 +48,7 @@ import { useCanvasStore } from '@/stores/graphStore'
 const commandStore = useCommandStore()
 const canvasStore = useCanvasStore()
 const extensionService = useExtensionService()
+const canvasInteractions = useCanvasInteractions()
 
 const extensionToolboxCommands = computed<ComfyCommandImpl[]>(() => {
   const commandIds = new Set<string>(

src/components/graph/TitleEditor.vue

@@ -41,7 +41,15 @@ const previousCanvasDraggable = ref(true)
 
 const onEdit = (newValue: string) => {
   if (titleEditorStore.titleEditorTarget && newValue.trim() !== '') {
-    titleEditorStore.titleEditorTarget.title = newValue.trim()
+    const trimmedTitle = newValue.trim()
+    titleEditorStore.titleEditorTarget.title = trimmedTitle
+
+    // If this is a subgraph node, sync the runtime subgraph name for breadcrumb reactivity
+    const target = titleEditorStore.titleEditorTarget
+    if (target instanceof LGraphNode && target.isSubgraphNode?.()) {
+      target.subgraph.name = trimmedTitle
+    }
+
     app.graph.setDirtyCanvas(true, true)
   }
   showInput.value = false

src/components/graph/selectionToolbox/ColorPickerButton.spec.ts

@@ -0,0 +1,122 @@
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import PrimeVue from 'primevue/config'
+import Tooltip from 'primevue/tooltip'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+// Import after mocks
+import ColorPickerButton from '@/components/graph/selectionToolbox/ColorPickerButton.vue'
+import { useCanvasStore } from '@/stores/graphStore'
+import { useWorkflowStore } from '@/stores/workflowStore'
+
+// Mock the litegraph module
+vi.mock('@comfyorg/litegraph', async () => {
+  const actual = await vi.importActual('@comfyorg/litegraph')
+  return {
+    ...actual,
+    LGraphCanvas: {
+      node_colors: {
+        red: { bgcolor: '#ff0000' },
+        green: { bgcolor: '#00ff00' },
+        blue: { bgcolor: '#0000ff' }
+      }
+    },
+    LiteGraph: {
+      NODE_DEFAULT_BGCOLOR: '#353535'
+    },
+    isColorable: vi.fn(() => true)
+  }
+})
+
+// Mock the colorUtil module
+vi.mock('@/utils/colorUtil', () => ({
+  adjustColor: vi.fn((color: string) => color + '_light')
+}))
+
+// Mock the litegraphUtil module
+vi.mock('@/utils/litegraphUtil', () => ({
+  getItemsColorOption: vi.fn(() => null),
+  isLGraphNode: vi.fn((item) => item?.type === 'LGraphNode'),
+  isLGraphGroup: vi.fn((item) => item?.type === 'LGraphGroup'),
+  isReroute: vi.fn(() => false)
+}))
+
+describe('ColorPickerButton', () => {
+  let canvasStore: ReturnType<typeof useCanvasStore>
+  let workflowStore: ReturnType<typeof useWorkflowStore>
+
+  const i18n = createI18n({
+    legacy: false,
+    locale: 'en',
+    messages: {
+      en: {
+        color: {
+          noColor: 'No Color',
+          red: 'Red',
+          green: 'Green',
+          blue: 'Blue'
+        }
+      }
+    }
+  })
+
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    canvasStore = useCanvasStore()
+    workflowStore = useWorkflowStore()
+
+    // Set up default store state
+    canvasStore.selectedItems = []
+
+    // Mock workflow store
+    workflowStore.activeWorkflow = {
+      changeTracker: {
+        checkState: vi.fn()
+      }
+    } as any
+  })
+
+  const createWrapper = () => {
+    return mount(ColorPickerButton, {
+      global: {
+        plugins: [PrimeVue, i18n],
+        directives: {
+          tooltip: Tooltip
+        }
+      }
+    })
+  }
+
+  it('should render when nodes are selected', () => {
+    // Add a mock node to selectedItems
+    canvasStore.selectedItems = [{ type: 'LGraphNode' } as any]
+    const wrapper = createWrapper()
+    expect(wrapper.find('button').exists()).toBe(true)
+  })
+
+  it('should not render when nothing is selected', () => {
+    // Keep selectedItems empty
+    canvasStore.selectedItems = []
+    const wrapper = createWrapper()
+    // The button exists but is hidden with v-show
+    expect(wrapper.find('button').exists()).toBe(true)
+    expect(wrapper.find('button').attributes('style')).toContain(
+      'display: none'
+    )
+  })
+
+  it('should toggle color picker visibility on button click', async () => {
+    canvasStore.selectedItems = [{ type: 'LGraphNode' } as any]
+    const wrapper = createWrapper()
+    const button = wrapper.find('button')
+
+    expect(wrapper.find('.color-picker-container').exists()).toBe(false)
+
+    await button.trigger('click')
+    expect(wrapper.find('.color-picker-container').exists()).toBe(true)
+
+    await button.trigger('click')
+    expect(wrapper.find('.color-picker-container').exists()).toBe(false)
+  })
+})

src/components/graph/selectionToolbox/ColorPickerButton.vue

@@ -2,6 +2,10 @@
   <div class="relative">
     <Button
       v-show="canvasStore.nodeSelected || canvasStore.groupSelected"
+      v-tooltip.top="{
+        value: localizedCurrentColorName ?? t('color.noColor'),
+        showDelay: 512
+      }"
       severity="secondary"
       text
       @click="() => (showColorPicker = !showColorPicker)"
@@ -123,6 +127,16 @@ const currentColor = computed(() =>
     : null
 )
 
+const localizedCurrentColorName = computed(() => {
+  if (!currentColorOption.value?.bgcolor) return null
+  const colorOption = colorOptions.find(
+    (option) =>
+      option.value.dark === currentColorOption.value?.bgcolor ||
+      option.value.light === currentColorOption.value?.bgcolor
+  )
+  return colorOption?.localizedName ?? NO_COLOR_OPTION.localizedName
+})
+
 watch(
   () => canvasStore.selectedItems,
   (newSelectedItems) => {

src/components/graph/selectionToolbox/ConvertToSubgraphButton.vue

@@ -7,9 +7,12 @@
     }"
     severity="secondary"
     text
-    icon="pi pi-box"
     @click="() => commandStore.execute('Comfy.Graph.ConvertToSubgraph')"
-  />
+  >
+    <template #icon>
+      <i-lucide:shrink />
+    </template>
+  </Button>
 </template>
 
 <script setup lang="ts">

src/components/graph/widgets/DomWidget.vue

@@ -19,7 +19,7 @@
 
 <script setup lang="ts">
 import { useElementBounding, useEventListener } from '@vueuse/core'
-import { CSSProperties, computed, onMounted, ref, watch } from 'vue'
+import { CSSProperties, computed, nextTick, onMounted, ref, watch } from 'vue'
 
 import { useAbsolutePosition } from '@/composables/element/useAbsolutePosition'
 import { useDomClipping } from '@/composables/element/useDomClipping'
@@ -61,10 +61,13 @@ const updateDomClipping = () => {
   if (!lgCanvas || !widgetElement.value) return
 
   const selectedNode = Object.values(lgCanvas.selected_nodes ?? {})[0]
-  if (!selectedNode) return
+  if (!selectedNode) {
+    // Clear clipping when no node is selected
+    updateClipPath(widgetElement.value, lgCanvas.canvas, false, undefined)
+    return
+  }
 
-  const node = widget.node
-  const isSelected = selectedNode === node
+  const isSelected = selectedNode === widget.node
   const renderArea = selectedNode?.renderArea
   const offset = lgCanvas.ds.offset
   const scale = lgCanvas.ds.scale
@@ -122,7 +125,10 @@ watch(
   }
 )
 
-if (isDOMWidget(widget)) {
+// Set up event listeners only after the widget is mounted and visible
+const setupDOMEventListeners = () => {
+  if (!isDOMWidget(widget) || !widgetState.visible) return
+
   if (widget.element.blur) {
     useEventListener(document, 'mousedown', (event) => {
       if (!widget.element.contains(event.target as HTMLElement)) {
@@ -140,14 +146,46 @@ if (isDOMWidget(widget)) {
   }
 }
 
+// Set up event listeners when widget becomes visible
+watch(
+  () => widgetState.visible,
+  (visible) => {
+    if (visible) {
+      setupDOMEventListeners()
+    }
+  },
+  { immediate: true }
+)
+
 const inputSpec = widget.node.constructor.nodeData
 const tooltip = inputSpec?.inputs?.[widget.name]?.tooltip
 
-onMounted(() => {
-  if (isDOMWidget(widget) && widgetElement.value) {
-    widgetElement.value.appendChild(widget.element)
+// Mount DOM element when widget is or becomes visible
+const mountElementIfVisible = () => {
+  if (widgetState.visible && isDOMWidget(widget) && widgetElement.value) {
+    // Only append if not already a child
+    if (!widgetElement.value.contains(widget.element)) {
+      widgetElement.value.appendChild(widget.element)
+    }
   }
+}
+
+// Check on mount - but only after next tick to ensure visibility is calculated
+onMounted(() => {
+  nextTick(() => {
+    mountElementIfVisible()
+  }).catch((error) => {
+    console.error('Error mounting DOM widget element:', error)
+  })
 })
+
+// And watch for visibility changes
+watch(
+  () => widgetState.visible,
+  () => {
+    mountElementIfVisible()
+  }
+)
 </script>
 
 <style scoped>

src/components/graph/widgets/TextPreviewWidget.vue

@@ -20,33 +20,44 @@ import { useExecutionStore } from '@/stores/executionStore'
 import { linkifyHtml, nl2br } from '@/utils/formatUtil'
 
 const modelValue = defineModel<string>({ required: true })
-defineProps<{
+const props = defineProps<{
   widget?: object
+  nodeId: NodeId
 }>()
 
 const executionStore = useExecutionStore()
 const isParentNodeExecuting = ref(true)
 const formattedText = computed(() => nl2br(linkifyHtml(modelValue.value)))
 
-let executingNodeId: NodeId | null = null
+let parentNodeId: NodeId | null = null
 onMounted(() => {
-  executingNodeId = executionStore.executingNodeId
+  // Get the parent node ID from props if provided
+  // For backward compatibility, fall back to the first executing node
+  parentNodeId = props.nodeId
 })
 
 // Watch for either a new node has starting execution or overall execution ending
 const stopWatching = watch(
-  [() => executionStore.executingNode, () => executionStore.isIdle],
+  [() => executionStore.executingNodeIds, () => executionStore.isIdle],
   () => {
+    if (executionStore.isIdle) {
+      isParentNodeExecuting.value = false
+      stopWatching()
+      return
+    }
+
+    // Check if parent node is no longer in the executing nodes list
     if (
-      executionStore.isIdle ||
-      (executionStore.executingNode &&
-        executionStore.executingNode.id !== executingNodeId)
+      parentNodeId &&
+      !executionStore.executingNodeIds.includes(parentNodeId)
     ) {
       isParentNodeExecuting.value = false
       stopWatching()
     }
-    if (!executingNodeId) {
-      executingNodeId = executionStore.executingNodeId
+
+    // Set parent node ID if not set yet
+    if (!parentNodeId && executionStore.executingNodeIds.length > 0) {
+      parentNodeId = executionStore.executingNodeIds[0]
     }
   }
 )

src/components/helpcenter/WhatsNewPopup.vue

@@ -217,7 +217,8 @@ defineExpose({
   display: flex;
   flex-direction: column;
   gap: 24px;
-  overflow: hidden;
+  max-height: 80vh;
+  overflow-y: auto;
   padding: 32px 32px 24px;
   border-radius: 12px;
 }

src/components/load3d/Load3D.vue

@@ -55,7 +55,6 @@
       @update-up-direction="handleUpdateUpDirection"
       @update-material-mode="handleUpdateMaterialMode"
       @update-edge-threshold="handleUpdateEdgeThreshold"
-      @upload-texture="handleUploadTexture"
       @export-model="handleExportModel"
     />
     <div
@@ -215,30 +214,6 @@ const handleBackgroundImageUpdate = async (file: File | null) => {
   node.properties['Background Image'] = backgroundImage.value
 }
 
-const handleUploadTexture = async (file: File) => {
-  if (!load3DSceneRef.value?.load3d) {
-    useToastStore().addAlert(t('toastMessages.no3dScene'))
-    return
-  }
-
-  try {
-    const resourceFolder = (node.properties['Resource Folder'] as string) || ''
-
-    const subfolder = resourceFolder.trim()
-      ? `3d/${resourceFolder.trim()}`
-      : '3d'
-
-    const texturePath = await Load3dUtils.uploadFile(file, subfolder)
-
-    await load3DSceneRef.value.load3d.applyTexture(texturePath)
-
-    node.properties['Texture'] = texturePath
-  } catch (error) {
-    console.error('Error applying texture:', error)
-    useToastStore().addAlert(t('toastMessages.failedToApplyTexture'))
-  }
-}
-
 const handleUpdateFOV = (value: number) => {
   fov.value = value
 

src/components/load3d/Load3DControls.vue

@@ -51,7 +51,6 @@
         @update-up-direction="handleUpdateUpDirection"
         @update-material-mode="handleUpdateMaterialMode"
         @update-edge-threshold="handleUpdateEdgeThreshold"
-        @upload-texture="handleUploadTexture"
       />
 
       <CameraControls
@@ -183,7 +182,6 @@ const emit = defineEmits<{
   (e: 'updateMaterialMode', mode: MaterialMode): void
   (e: 'updateEdgeThreshold', value: number): void
   (e: 'exportModel', format: string): void
-  (e: 'uploadTexture', file: File): void
 }>()
 
 const backgroundColor = ref(props.backgroundColor)
@@ -232,10 +230,6 @@ const handleUpdateEdgeThreshold = (value: number) => {
   emit('updateEdgeThreshold', value)
 }
 
-const handleUploadTexture = (file: File) => {
-  emit('uploadTexture', file)
-}
-
 const handleUpdateLightIntensity = (value: number) => {
   emit('updateLightIntensity', value)
 }

src/components/load3d/Load3DScene.vue

@@ -69,9 +69,6 @@ const eventConfig = {
   exportLoadingEnd: () => {
     loadingOverlayRef.value?.endLoading()
   },
-  textureLoadingStart: () =>
-    loadingOverlayRef.value?.startLoading(t('load3d.applyingTexture')),
-  textureLoadingEnd: () => loadingOverlayRef.value?.endLoading(),
   recordingStatusChange: (value: boolean) =>
     emit('recordingStatusChange', value)
 } as const

src/components/load3d/controls/ModelControls.vue

@@ -59,32 +59,6 @@
       </div>
     </div>
 
-    <div
-      v-if="
-        materialMode === 'original' &&
-        !props.inputSpec.isAnimation &&
-        !props.inputSpec.isPreview
-      "
-      class="relative show-texture-upload"
-    >
-      <Button class="p-button-rounded p-button-text" @click="openTextureUpload">
-        <i
-          v-tooltip.right="{
-            value: t('load3d.uploadTexture'),
-            showDelay: 300
-          }"
-          class="pi pi-image text-white text-lg"
-        />
-        <input
-          ref="texturePickerRef"
-          type="file"
-          accept="image/*"
-          class="absolute opacity-0 w-0 h-0 p-0 m-0 pointer-events-none"
-          @change="uploadTexture"
-        />
-      </Button>
-    </div>
-
     <div v-if="materialMode === 'lineart'" class="relative show-edge-threshold">
       <Button
         class="p-button-rounded p-button-text"
@@ -142,7 +116,6 @@ const emit = defineEmits<{
   (e: 'updateUpDirection', direction: UpDirection): void
   (e: 'updateMaterialMode', mode: MaterialMode): void
   (e: 'updateEdgeThreshold', value: number): void
-  (e: 'uploadTexture', file: File): void
 }>()
 
 const upDirection = ref(props.upDirection || 'original')
@@ -151,7 +124,6 @@ const edgeThreshold = ref(props.edgeThreshold || 85)
 const showUpDirection = ref(false)
 const showMaterialMode = ref(false)
 const showEdgeThreshold = ref(false)
-const texturePickerRef = ref<HTMLInputElement | null>(null)
 
 const upDirections: UpDirection[] = [
   'original',
@@ -247,18 +219,6 @@ const updateEdgeThreshold = () => {
   emit('updateEdgeThreshold', edgeThreshold.value)
 }
 
-const openTextureUpload = () => {
-  texturePickerRef.value?.click()
-}
-
-const uploadTexture = (event: Event) => {
-  const input = event.target as HTMLInputElement
-
-  if (input.files && input.files[0]) {
-    emit('uploadTexture', input.files[0])
-  }
-}
-
 const closeSceneSlider = (e: MouseEvent) => {
   const target = e.target as HTMLElement
 

src/components/node/NodePreview.spec.ts

@@ -0,0 +1,132 @@
+import { mount } from '@vue/test-utils'
+import { createPinia } from 'pinia'
+import PrimeVue from 'primevue/config'
+import { beforeAll, describe, expect, it } from 'vitest'
+import { createApp } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2'
+
+import NodePreview from './NodePreview.vue'
+
+describe('NodePreview', () => {
+  let i18n: ReturnType<typeof createI18n>
+  let pinia: ReturnType<typeof createPinia>
+
+  beforeAll(() => {
+    // Create a Vue app instance for PrimeVue
+    const app = createApp({})
+    app.use(PrimeVue)
+
+    // Create i18n instance
+    i18n = createI18n({
+      legacy: false,
+      locale: 'en',
+      messages: {
+        en: {
+          g: {
+            preview: 'Preview'
+          }
+        }
+      }
+    })
+
+    // Create pinia instance
+    pinia = createPinia()
+  })
+
+  const mockNodeDef: ComfyNodeDefV2 = {
+    name: 'TestNode',
+    display_name:
+      'Test Node With A Very Long Display Name That Should Overflow',
+    category: 'test',
+    output_node: false,
+    inputs: {
+      test_input: {
+        name: 'test_input',
+        type: 'STRING',
+        tooltip: 'Test input'
+      }
+    },
+    outputs: [],
+    python_module: 'test_module',
+    description: 'Test node description'
+  }
+
+  const mountComponent = (nodeDef: ComfyNodeDefV2 = mockNodeDef) => {
+    return mount(NodePreview, {
+      global: {
+        plugins: [PrimeVue, i18n, pinia],
+        stubs: {
+          // Stub stores if needed
+        }
+      },
+      props: {
+        nodeDef
+      }
+    })
+  }
+
+  it('renders node preview with correct structure', () => {
+    const wrapper = mountComponent()
+
+    expect(wrapper.find('._sb_node_preview').exists()).toBe(true)
+    expect(wrapper.find('.node_header').exists()).toBe(true)
+    expect(wrapper.find('._sb_preview_badge').text()).toBe('Preview')
+  })
+
+  it('applies overflow-ellipsis class to node header for text truncation', () => {
+    const wrapper = mountComponent()
+    const nodeHeader = wrapper.find('.node_header')
+
+    expect(nodeHeader.classes()).toContain('overflow-ellipsis')
+    expect(nodeHeader.classes()).toContain('mr-4')
+  })
+
+  it('sets title attribute on node header with full display name', () => {
+    const wrapper = mountComponent()
+    const nodeHeader = wrapper.find('.node_header')
+
+    expect(nodeHeader.attributes('title')).toBe(mockNodeDef.display_name)
+  })
+
+  it('displays truncated long node names with ellipsis', () => {
+    const longNameNodeDef: ComfyNodeDefV2 = {
+      ...mockNodeDef,
+      display_name:
+        'This Is An Extremely Long Node Name That Should Definitely Be Truncated With Ellipsis To Prevent Layout Issues'
+    }
+
+    const wrapper = mountComponent(longNameNodeDef)
+    const nodeHeader = wrapper.find('.node_header')
+
+    // Verify the title attribute contains the full name
+    expect(nodeHeader.attributes('title')).toBe(longNameNodeDef.display_name)
+
+    // Verify overflow handling classes are applied
+    expect(nodeHeader.classes()).toContain('overflow-ellipsis')
+
+    // The actual text content should still be the full name (CSS handles truncation)
+    expect(nodeHeader.text()).toContain(longNameNodeDef.display_name)
+  })
+
+  it('handles short node names without issues', () => {
+    const shortNameNodeDef: ComfyNodeDefV2 = {
+      ...mockNodeDef,
+      display_name: 'Short'
+    }
+
+    const wrapper = mountComponent(shortNameNodeDef)
+    const nodeHeader = wrapper.find('.node_header')
+
+    expect(nodeHeader.attributes('title')).toBe('Short')
+    expect(nodeHeader.text()).toContain('Short')
+  })
+
+  it('applies proper spacing to the dot element', () => {
+    const wrapper = mountComponent()
+    const headdot = wrapper.find('.headdot')
+
+    expect(headdot.classes()).toContain('pr-3')
+  })
+})

src/components/node/NodePreview.vue

@@ -6,13 +6,14 @@ https://github.com/Nuked88/ComfyUI-N-Sidebar/blob/7ae7da4a9761009fb6629bc04c6830
   <div class="_sb_node_preview">
     <div class="_sb_table">
       <div
-        class="node_header"
+        class="node_header overflow-ellipsis mr-4"
+        :title="nodeDef.display_name"
         :style="{
           backgroundColor: litegraphColors.NODE_DEFAULT_COLOR,
           color: litegraphColors.NODE_TITLE_COLOR
         }"
       >
-        <div class="_sb_dot headdot" />
+        <div class="_sb_dot headdot pr-3" />
         {{ nodeDef.display_name }}
       </div>
       <div class="_sb_preview_badge">{{ $t('g.preview') }}</div>

src/components/sidebar/SideToolbar.vue

@@ -14,9 +14,8 @@
       />
       <div class="side-tool-bar-end">
         <SidebarLogoutIcon v-if="userStore.isMultiUserServer" />
-        <SidebarThemeToggleIcon />
         <SidebarHelpCenterIcon />
-        <SidebarSettingsToggleIcon />
+        <SidebarBottomPanelToggleButton />
       </div>
     </nav>
   </teleport>
@@ -32,6 +31,7 @@
 import { computed } from 'vue'
 
 import ExtensionSlot from '@/components/common/ExtensionSlot.vue'
+import SidebarBottomPanelToggleButton from '@/components/sidebar/SidebarBottomPanelToggleButton.vue'
 import { useKeybindingStore } from '@/stores/keybindingStore'
 import { useSettingStore } from '@/stores/settingStore'
 import { useUserStore } from '@/stores/userStore'
@@ -41,8 +41,6 @@ import type { SidebarTabExtension } from '@/types/extensionTypes'
 import SidebarHelpCenterIcon from './SidebarHelpCenterIcon.vue'
 import SidebarIcon from './SidebarIcon.vue'
 import SidebarLogoutIcon from './SidebarLogoutIcon.vue'
-import SidebarSettingsToggleIcon from './SidebarSettingsToggleIcon.vue'
-import SidebarThemeToggleIcon from './SidebarThemeToggleIcon.vue'
 
 const workspaceStore = useWorkspaceStore()
 const settingStore = useSettingStore()

src/components/sidebar/SidebarBottomPanelToggleButton.vue

@@ -0,0 +1,19 @@
+<template>
+  <SidebarIcon
+    :tooltip="$t('menu.toggleBottomPanel')"
+    :selected="bottomPanelStore.bottomPanelVisible"
+    @click="bottomPanelStore.toggleBottomPanel"
+  >
+    <template #icon>
+      <i-ph:terminal-bold />
+    </template>
+  </SidebarIcon>
+</template>
+
+<script setup lang="ts">
+import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
+
+import SidebarIcon from './SidebarIcon.vue'
+
+const bottomPanelStore = useBottomPanelStore()
+</script>

src/components/sidebar/SidebarIcon.vue

@@ -19,10 +19,12 @@
     @click="emit('click', $event)"
   >
     <template #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 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>

src/components/sidebar/SidebarSettingsToggleIcon.vue

@@ -1,25 +0,0 @@
-<template>
-  <SidebarIcon
-    icon="pi pi-cog"
-    class="comfy-settings-btn"
-    :tooltip="$t('g.settings')"
-    @click="showSetting"
-  />
-</template>
-
-<script setup lang="ts">
-import SettingDialogContent from '@/components/dialog/content/SettingDialogContent.vue'
-import SettingDialogHeader from '@/components/dialog/header/SettingDialogHeader.vue'
-import { useDialogStore } from '@/stores/dialogStore'
-
-import SidebarIcon from './SidebarIcon.vue'
-
-const dialogStore = useDialogStore()
-const showSetting = () => {
-  dialogStore.showDialog({
-    key: 'global-settings',
-    headerComponent: SettingDialogHeader,
-    component: SettingDialogContent
-  })
-}
-</script>

src/components/sidebar/SidebarThemeToggleIcon.vue

@@ -1,29 +0,0 @@
-<template>
-  <SidebarIcon
-    :icon="icon"
-    :tooltip="$t('sideToolbar.themeToggle')"
-    class="comfy-vue-theme-toggle"
-    @click="toggleTheme"
-  />
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-
-import { useCommandStore } from '@/stores/commandStore'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
-
-import SidebarIcon from './SidebarIcon.vue'
-
-const colorPaletteStore = useColorPaletteStore()
-const icon = computed(() =>
-  colorPaletteStore.completedActivePalette.light_theme
-    ? 'pi pi-sun'
-    : 'pi pi-moon'
-)
-
-const commandStore = useCommandStore()
-const toggleTheme = async () => {
-  await commandStore.execute('Comfy.ToggleTheme')
-}
-</script>

src/components/templates/TemplateSearchBar.vue

@@ -0,0 +1,195 @@
+<template>
+  <div class="relative w-full p-4">
+    <div class="h-12 flex items-center gap-4 justify-between">
+      <div class="flex-1 max-w-md">
+        <div class="relative w-full">
+          <div
+            class="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none z-10"
+          >
+            <i class="pi pi-search text-surface-400"></i>
+          </div>
+          <AutoComplete
+            v-model.lazy="searchQuery"
+            :placeholder="$t('templateWorkflows.searchPlaceholder')"
+            :complete-on-focus="false"
+            :delay="200"
+            class="w-full"
+            :pt="{
+              pcInputText: {
+                root: {
+                  class: 'w-full rounded-md pl-10 pr-10'
+                }
+              },
+              loader: {
+                style: 'display: none'
+              }
+            }"
+            :show-empty-message="false"
+            @complete="() => {}"
+          />
+          <div
+            v-if="searchQuery"
+            class="absolute inset-y-0 right-0 flex items-center pr-3 z-10"
+          >
+            <button
+              type="button"
+              class="text-surface-400 hover:text-surface-600 bg-transparent border-none p-0 cursor-pointer"
+              @click="searchQuery = ''"
+            >
+              <i class="pi pi-times"></i>
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <div class="flex items-center gap-3">
+        <!-- Model Filter Dropdown -->
+        <div class="relative">
+          <Button
+            ref="modelFilterButton"
+            :label="modelFilterLabel"
+            icon="pi pi-filter"
+            outlined
+            class="rounded-2xl"
+            @click="toggleModelFilter"
+          />
+          <Popover
+            ref="modelFilterPopover"
+            :pt="{
+              root: { class: 'w-64 max-h-80 overflow-auto' }
+            }"
+          >
+            <div class="p-3">
+              <div class="font-medium mb-2">
+                {{ $t('templateWorkflows.modelFilter') }}
+              </div>
+              <div class="flex flex-col gap-2">
+                <div
+                  v-for="model in availableModels"
+                  :key="model"
+                  class="flex items-center"
+                >
+                  <Checkbox
+                    :model-value="selectedModels.includes(model)"
+                    :binary="true"
+                    @change="toggleModel(model)"
+                  />
+                  <label class="ml-2 text-sm">{{ model }}</label>
+                </div>
+              </div>
+            </div>
+          </Popover>
+        </div>
+
+        <!-- Sort Dropdown -->
+        <Select
+          v-model="sortBy"
+          :options="sortOptions"
+          option-label="label"
+          option-value="value"
+          :placeholder="$t('templateWorkflows.sort')"
+          class="rounded-2xl"
+          :pt="{
+            root: { class: 'min-w-32' }
+          }"
+        />
+      </div>
+    </div>
+
+    <!-- Filter Tags Row -->
+    <div
+      v-if="selectedModels.length > 0"
+      class="flex items-center gap-2 mt-3 overflow-x-auto pb-2"
+    >
+      <div class="flex gap-2">
+        <Tag
+          v-for="model in selectedModels"
+          :key="model"
+          :value="model"
+          severity="secondary"
+        >
+          <template #icon>
+            <button
+              type="button"
+              class="text-surface-400 hover:text-surface-600 bg-transparent border-none p-0 cursor-pointer ml-1"
+              @click="removeModel(model)"
+            >
+              <i class="pi pi-times text-xs"></i>
+            </button>
+          </template>
+        </Tag>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import AutoComplete from 'primevue/autocomplete'
+import Button from 'primevue/button'
+import Checkbox from 'primevue/checkbox'
+import Popover from 'primevue/popover'
+import Select from 'primevue/select'
+import Tag from 'primevue/tag'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import type { SortOption } from '@/composables/useTemplateFiltering'
+
+const { t } = useI18n()
+
+const { availableModels } = defineProps<{
+  filteredCount?: number | null
+  availableModels: string[]
+}>()
+
+const searchQuery = defineModel<string>('searchQuery', { default: '' })
+const selectedModels = defineModel<string[]>('selectedModels', {
+  default: () => []
+})
+const sortBy = defineModel<SortOption>('sortBy', { default: 'recommended' })
+
+// emit removed - no longer needed since clearFilters was removed
+
+const modelFilterButton = ref<HTMLElement>()
+const modelFilterPopover = ref()
+
+const sortOptions = [
+  { label: t('templateWorkflows.sortRecommended'), value: 'recommended' },
+  { label: t('templateWorkflows.sortAlphabetical'), value: 'alphabetical' },
+  { label: t('templateWorkflows.sortNewest'), value: 'newest' }
+]
+
+const modelFilterLabel = computed(() => {
+  if (selectedModels.value.length === 0) {
+    return t('templateWorkflows.modelFilter')
+  } else if (selectedModels.value.length === 1) {
+    return selectedModels.value[0]
+  } else {
+    return t('templateWorkflows.modelsSelected', {
+      count: selectedModels.value.length
+    })
+  }
+})
+
+const toggleModelFilter = (event: Event) => {
+  modelFilterPopover.value.toggle(event)
+}
+
+const toggleModel = (model: string) => {
+  const index = selectedModels.value.indexOf(model)
+  if (index > -1) {
+    selectedModels.value.splice(index, 1)
+  } else {
+    selectedModels.value.push(model)
+  }
+}
+
+const removeModel = (model: string) => {
+  const index = selectedModels.value.indexOf(model)
+  if (index > -1) {
+    selectedModels.value.splice(index, 1)
+  }
+}
+
+// clearFilters function removed - no longer used since we removed the clear button
+</script>

src/components/templates/TemplateWorkflowCard.vue

@@ -62,14 +62,49 @@
       </div>
     </template>
     <template #content>
-      <div class="flex items-center px-4 py-3">
+      <div class="flex items-center px-4 py-3 relative">
         <div class="flex-1 flex flex-col">
           <h3 class="line-clamp-2 text-lg font-normal mb-0" :title="title">
             {{ title }}
           </h3>
-          <p class="line-clamp-2 text-sm text-muted grow" :title="description">
-            {{ description }}
-          </p>
+
+          <!-- Description / Action Buttons Container -->
+          <div class="relative grow">
+            <!-- Description Text -->
+            <p
+              class="line-clamp-2 text-sm text-muted grow transition-opacity duration-200"
+              :class="{ 'opacity-0': isHovered }"
+              :title="description"
+            >
+              {{ description }}
+            </p>
+
+            <!-- Action Buttons (visible on hover) -->
+            <div
+              v-if="isHovered"
+              class="absolute inset-0 flex items-center gap-2 transition-opacity duration-200"
+            >
+              <Button
+                v-if="template.tutorialUrl"
+                size="small"
+                severity="secondary"
+                outlined
+                class="flex-1 rounded-lg"
+                @click.stop="openTutorial"
+              >
+                {{ $t('templateWorkflows.tutorial') }}
+              </Button>
+              <Button
+                size="small"
+                severity="primary"
+                :class="template.tutorialUrl ? 'flex-1' : 'w-full'"
+                class="rounded-lg"
+                @click.stop="$emit('loadWorkflow', template.name)"
+              >
+                {{ $t('templateWorkflows.useTemplate') }}
+              </Button>
+            </div>
+          </div>
         </div>
       </div>
     </template>
@@ -78,6 +113,7 @@
 
 <script setup lang="ts">
 import { useElementHover } from '@vueuse/core'
+import Button from 'primevue/button'
 import Card from 'primevue/card'
 import ProgressSpinner from 'primevue/progressspinner'
 import { computed, ref } from 'vue'
@@ -133,6 +169,12 @@ const title = computed(() =>
   getTemplateTitle(template, effectiveSourceModule.value)
 )
 
+const openTutorial = () => {
+  if (template.tutorialUrl) {
+    window.open(template.tutorialUrl, '_blank', 'noopener,noreferrer')
+  }
+}
+
 defineEmits<{
   loadWorkflow: [name: string]
 }>()

src/components/templates/TemplateWorkflowCardSkeleton.vue

@@ -0,0 +1,30 @@
+<template>
+  <Card
+    class="w-64 template-card rounded-2xl overflow-hidden shadow-elevation-2 dark-theme:bg-dark-elevation-1.5 h-full"
+    :pt="{
+      body: { class: 'p-0 h-full flex flex-col' }
+    }"
+  >
+    <template #header>
+      <div class="flex items-center justify-center">
+        <div class="relative overflow-hidden rounded-t-lg">
+          <Skeleton width="16rem" height="12rem" />
+        </div>
+      </div>
+    </template>
+    <template #content>
+      <div class="flex items-center px-4 py-3">
+        <div class="flex-1 flex flex-col">
+          <Skeleton width="80%" height="1.25rem" class="mb-2" />
+          <Skeleton width="100%" height="0.875rem" class="mb-1" />
+          <Skeleton width="90%" height="0.875rem" />
+        </div>
+      </div>
+    </template>
+  </Card>
+</template>
+
+<script setup lang="ts">
+import Card from 'primevue/card'
+import Skeleton from 'primevue/skeleton'
+</script>

src/components/templates/TemplateWorkflowView.spec.ts

@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils'
 import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
 
 import TemplateWorkflowView from '@/components/templates/TemplateWorkflowView.vue'
 import { TemplateInfo } from '@/types/workflowTemplateTypes'
@@ -28,6 +29,15 @@ vi.mock('primevue/selectbutton', () => ({
   }
 }))
 
+vi.mock('primevue/button', () => ({
+  default: {
+    name: 'Button',
+    template: '<button class="p-button"><slot></slot></button>',
+    props: ['severity', 'outlined', 'size', 'class'],
+    emits: ['click']
+  }
+}))
+
 vi.mock('@/components/templates/TemplateWorkflowCard.vue', () => ({
   default: {
     template: `
@@ -53,10 +63,63 @@ vi.mock('@/components/templates/TemplateWorkflowList.vue', () => ({
   }
 }))
 
+vi.mock('@/components/templates/TemplateSearchBar.vue', () => ({
+  default: {
+    template: '<div class="mock-search-bar"></div>',
+    props: [
+      'searchQuery',
+      'filteredCount',
+      'availableModels',
+      'selectedModels',
+      'sortBy'
+    ],
+    emits: [
+      'update:searchQuery',
+      'update:selectedModels',
+      'update:sortBy',
+      'clearFilters'
+    ]
+  }
+}))
+
+vi.mock('@/components/templates/TemplateWorkflowCardSkeleton.vue', () => ({
+  default: {
+    template: '<div class="mock-skeleton"></div>'
+  }
+}))
+
 vi.mock('@vueuse/core', () => ({
   useLocalStorage: () => 'grid'
 }))
 
+vi.mock('@/composables/useIntersectionObserver', () => ({
+  useIntersectionObserver: vi.fn()
+}))
+
+vi.mock('@/composables/useLazyPagination', () => ({
+  useLazyPagination: (items: any) => ({
+    paginatedItems: items,
+    isLoading: { value: false },
+    hasMoreItems: { value: false },
+    loadNextPage: vi.fn(),
+    reset: vi.fn()
+  })
+}))
+
+vi.mock('@/composables/useTemplateFiltering', () => ({
+  useTemplateFiltering: (templates: any) => ({
+    searchQuery: { value: '' },
+    selectedModels: { value: [] },
+    selectedSubcategory: { value: null },
+    sortBy: { value: 'recommended' },
+    availableSubcategories: { value: [] },
+    availableModels: { value: [] },
+    filteredTemplates: templates,
+    filteredCount: { value: templates.value?.length || 0 },
+    resetFilters: vi.fn()
+  })
+}))
+
 describe('TemplateWorkflowView', () => {
   const createTemplate = (name: string): TemplateInfo => ({
     name,
@@ -67,6 +130,18 @@ describe('TemplateWorkflowView', () => {
   })
 
   const mountView = (props = {}) => {
+    const i18n = createI18n({
+      legacy: false,
+      locale: 'en',
+      messages: {
+        en: {
+          templateWorkflows: {
+            loadingMore: 'Loading more...'
+          }
+        }
+      }
+    })
+
     return mount(TemplateWorkflowView, {
       props: {
         title: 'Test Templates',
@@ -78,7 +153,12 @@ describe('TemplateWorkflowView', () => {
           createTemplate('template-3')
         ],
         loading: null,
+        availableSubcategories: [],
+        selectedSubcategory: null,
         ...props
+      },
+      global: {
+        plugins: [i18n]
       }
     })
   }

src/components/templates/TemplateWorkflowView.vue

@@ -1,24 +1,57 @@
 <template>
   <DataView
-    :value="templates"
+    :value="finalDisplayTemplates"
     :layout="layout"
     data-key="name"
     :lazy="true"
-    pt:root="h-full grid grid-rows-[auto_1fr]"
+    pt:root="h-full grid grid-rows-[auto_1fr_auto]"
     pt:content="p-2 overflow-auto"
   >
     <template #header>
-      <div class="flex justify-between items-center">
-        <h2 class="text-lg">{{ title }}</h2>
-        <SelectButton
-          v-model="layout"
-          :options="['grid', 'list']"
-          :allow-empty="false"
+      <div class="flex flex-col">
+        <div class="flex justify-between items-center mb-4">
+          <h2 class="text-lg">{{ title }}</h2>
+          <SelectButton
+            v-model="layout"
+            :options="['grid', 'list']"
+            :allow-empty="false"
+          >
+            <template #option="{ option }">
+              <i :class="[option === 'list' ? 'pi pi-bars' : 'pi pi-table']" />
+            </template>
+          </SelectButton>
+        </div>
+
+        <!-- Subcategory Navigation -->
+        <div
+          v-if="availableSubcategories.length > 0"
+          class="mb-4 overflow-x-scroll flex max-w-[1000px]"
         >
-          <template #option="{ option }">
-            <i :class="[option === 'list' ? 'pi pi-bars' : 'pi pi-table']" />
-          </template>
-        </SelectButton>
+          <div class="flex gap-2 pb-2">
+            <Button
+              :severity="selectedSubcategory === null ? 'primary' : 'secondary'"
+              :outlined="selectedSubcategory !== null"
+              size="small"
+              class="rounded-2xl whitespace-nowrap"
+              @click="$emit('update:selectedSubcategory', null)"
+            >
+              {{ $t('templateWorkflows.allSubcategories') }}
+            </Button>
+            <Button
+              v-for="subcategory in availableSubcategories"
+              :key="subcategory"
+              :severity="
+                selectedSubcategory === subcategory ? 'primary' : 'secondary'
+              "
+              :outlined="selectedSubcategory !== subcategory"
+              size="small"
+              class="rounded-2xl whitespace-nowrap"
+              @click="$emit('update:selectedSubcategory', subcategory)"
+            >
+              {{ subcategory }}
+            </Button>
+          </div>
+        </div>
       </div>
     </template>
 
@@ -33,18 +66,35 @@
     </template>
 
     <template #grid="{ items }">
-      <div
-        class="grid grid-cols-[repeat(auto-fill,minmax(16rem,1fr))] gap-x-4 gap-y-8 px-4 justify-items-center"
-      >
-        <TemplateWorkflowCard
-          v-for="template in items"
-          :key="template.name"
-          :source-module="sourceModule"
-          :template="template"
-          :loading="loading === template.name"
-          :category-title="categoryTitle"
-          @load-workflow="onLoadWorkflow"
-        />
+      <div>
+        <div
+          class="grid grid-cols-[repeat(auto-fill,minmax(16rem,1fr))] gap-x-4 gap-y-8 px-4 justify-items-center"
+        >
+          <TemplateWorkflowCard
+            v-for="template in items"
+            :key="template.name"
+            :source-module="sourceModule"
+            :template="template"
+            :loading="loading === template.name"
+            :category-title="categoryTitle"
+            @load-workflow="onLoadWorkflow"
+          />
+          <TemplateWorkflowCardSkeleton
+            v-for="n in shouldUsePagination && isLoadingMore
+              ? skeletonCount
+              : 0"
+            :key="`skeleton-${n}`"
+          />
+        </div>
+        <div
+          v-if="shouldUsePagination && hasMoreTemplates"
+          ref="loadTrigger"
+          class="w-full h-4 flex justify-center items-center"
+        >
+          <div v-if="isLoadingMore" class="text-sm text-muted">
+            {{ t('templateWorkflows.loadingMore') }}
+          </div>
+        </div>
       </div>
     </template>
   </DataView>
@@ -52,19 +102,37 @@
 
 <script setup lang="ts">
 import { useLocalStorage } from '@vueuse/core'
+import Button from 'primevue/button'
 import DataView from 'primevue/dataview'
 import SelectButton from 'primevue/selectbutton'
+import { computed, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import TemplateWorkflowCard from '@/components/templates/TemplateWorkflowCard.vue'
+import TemplateWorkflowCardSkeleton from '@/components/templates/TemplateWorkflowCardSkeleton.vue'
 import TemplateWorkflowList from '@/components/templates/TemplateWorkflowList.vue'
+import { useIntersectionObserver } from '@/composables/useIntersectionObserver'
+import { useLazyPagination } from '@/composables/useLazyPagination'
 import type { TemplateInfo } from '@/types/workflowTemplateTypes'
 
-defineProps<{
+const { t } = useI18n()
+
+const {
+  title,
+  sourceModule,
+  categoryTitle,
+  loading,
+  templates,
+  availableSubcategories,
+  selectedSubcategory
+} = defineProps<{
   title: string
   sourceModule: string
   categoryTitle: string
   loading: string | null
   templates: TemplateInfo[]
+  availableSubcategories: string[]
+  selectedSubcategory: string | null
 }>()
 
 const layout = useLocalStorage<'grid' | 'list'>(
@@ -72,8 +140,59 @@ const layout = useLocalStorage<'grid' | 'list'>(
   'grid'
 )
 
+const skeletonCount = 6
+const loadTrigger = ref<HTMLElement | null>(null)
+
+// Since filtering is now handled at parent level, we just use the templates directly
+const displayTemplates = computed(() => templates || [])
+
+// Simplified pagination - only show pagination when we have lots of templates
+const shouldUsePagination = computed(() => templates.length > 12)
+
+// Lazy pagination setup using templates directly
+const {
+  paginatedItems: paginatedTemplates,
+  isLoading: isLoadingMore,
+  hasMoreItems: hasMoreTemplates,
+  loadNextPage,
+  reset: resetPagination
+} = useLazyPagination(displayTemplates, {
+  itemsPerPage: 12
+})
+
+// Final templates to display with pagination
+const finalDisplayTemplates = computed(() => {
+  return shouldUsePagination.value
+    ? paginatedTemplates.value
+    : displayTemplates.value
+})
+// Intersection observer for auto-loading (only when not searching)
+useIntersectionObserver(
+  loadTrigger,
+  (entries) => {
+    const entry = entries[0]
+    if (
+      entry?.isIntersecting &&
+      shouldUsePagination.value &&
+      hasMoreTemplates.value &&
+      !isLoadingMore.value
+    ) {
+      void loadNextPage()
+    }
+  },
+  {
+    rootMargin: '200px',
+    threshold: 0.1
+  }
+)
+
+watch([() => templates], () => {
+  resetPagination()
+})
+
 const emit = defineEmits<{
   loadWorkflow: [name: string]
+  'update:selectedSubcategory': [value: string | null]
 }>()
 
 const onLoadWorkflow = (name: string) => {

src/components/templates/TemplateWorkflowsContent.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex flex-col h-[83vh] w-[90vw] relative pb-6"
+    class="flex flex-col h-[83vh] w-[90vw] relative pb-6 px-8 mx-auto"
     data-testid="template-workflows-content"
   >
     <Button
@@ -12,12 +12,13 @@
       @click="toggleSideNav"
     />
     <Divider
-      class="m-0 [&::before]:border-surface-border/70 [&::before]:border-t-2"
+      class="my-0 w-[90vw] -mx-8 relative [&::before]:border-surface-border/70 [&::before]:border-t-2"
     />
+
     <div class="flex flex-1 relative overflow-hidden">
       <aside
         v-if="isSideNavOpen"
-        class="absolute translate-x-0 top-0 left-0 h-full w-80 shadow-md z-5 transition-transform duration-300 ease-in-out"
+        class="absolute translate-x-0 top-0 left-0 h-full w-60 shadow-md z-5 transition-transform duration-300 ease-in-out"
       >
         <ProgressSpinner
           v-if="!isTemplatesLoaded || !isReady"
@@ -25,27 +26,64 @@
         />
         <TemplateWorkflowsSideNav
           :tabs="allTemplateGroups"
-          :selected-tab="selectedTemplate"
-          @update:selected-tab="handleTabSelection"
+          :selected-subcategory="selectedSubcategory"
+          :selected-view="selectedView"
+          @update:selected-subcategory="handleSubcategory"
+          @update:selected-view="handleViewSelection"
         />
       </aside>
       <div
         class="flex-1 transition-all duration-300"
         :class="{
-          'pl-80': isSideNavOpen || !isSmallScreen,
+          'pl-60': isSideNavOpen || !isSmallScreen,
           'pl-8': !isSideNavOpen && isSmallScreen
         }"
       >
-        <TemplateWorkflowView
-          v-if="isReady && selectedTemplate"
-          class="px-12 py-4"
-          :title="selectedTemplate.title"
-          :source-module="selectedTemplate.moduleName"
-          :templates="selectedTemplate.templates"
-          :loading="loadingTemplateId"
-          :category-title="selectedTemplate.title"
-          @load-workflow="handleLoadWorkflow"
-        />
+        <div
+          v-if="
+            isReady &&
+            (selectedView === 'all' ||
+              selectedView === 'recent' ||
+              selectedSubcategory)
+          "
+          class="flex flex-col h-full"
+        >
+          <div class="px-8 sm:px-12 py-4 border-b border-surface-border/20">
+            <TemplateSearchBar
+              v-model:search-query="searchQuery"
+              v-model:selected-models="selectedModels"
+              v-model:sort-by="sortBy"
+              :filtered-count="filteredCount"
+              :available-models="availableModels"
+              @clear-filters="resetFilters"
+            />
+          </div>
+
+          <TemplateWorkflowView
+            class="px-8 sm:px-12 flex-1"
+            :title="
+              selectedSubcategory
+                ? selectedSubcategory.label
+                : selectedView === 'all'
+                  ? $t('templateWorkflows.view.allTemplates', 'All Templates')
+                  : selectedTemplate?.title || ''
+            "
+            :source-module="selectedTemplate?.moduleName || 'all'"
+            :templates="filteredTemplates"
+            :available-subcategories="availableSubcategories"
+            :selected-subcategory="filterSubcategory"
+            :loading="loadingTemplateId"
+            :category-title="
+              selectedSubcategory
+                ? selectedSubcategory.label
+                : selectedView === 'all'
+                  ? $t('templateWorkflows.view.allTemplates', 'All Templates')
+                  : selectedTemplate?.title || ''
+            "
+            @load-workflow="handleLoadWorkflow"
+            @update:selected-subcategory="filterSubcategory = $event"
+          />
+        </div>
       </div>
     </div>
   </div>
@@ -56,13 +94,15 @@ import { useAsyncState } from '@vueuse/core'
 import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import ProgressSpinner from 'primevue/progressspinner'
-import { watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 
+import TemplateSearchBar from '@/components/templates/TemplateSearchBar.vue'
 import TemplateWorkflowView from '@/components/templates/TemplateWorkflowView.vue'
 import TemplateWorkflowsSideNav from '@/components/templates/TemplateWorkflowsSideNav.vue'
 import { useResponsiveCollapse } from '@/composables/element/useResponsiveCollapse'
+import { useTemplateFiltering } from '@/composables/useTemplateFiltering'
 import { useTemplateWorkflows } from '@/composables/useTemplateWorkflows'
-import type { WorkflowTemplates } from '@/types/workflowTemplateTypes'
+import type { TemplateSubcategory } from '@/types/workflowTemplateTypes'
 
 const {
   isSmallScreen,
@@ -76,34 +116,78 @@ const {
   isTemplatesLoaded,
   allTemplateGroups,
   loadTemplates,
-  selectFirstTemplateCategory,
-  selectTemplateCategory,
   loadWorkflowTemplate
 } = useTemplateWorkflows()
 
 const { isReady } = useAsyncState(loadTemplates, null)
 
+// State for subcategory selection
+const selectedSubcategory = ref<TemplateSubcategory | null>(null)
+
+// State for view selection (all vs recent)
+const selectedView = ref<'all' | 'recent'>('all')
+
+// Template filtering for the top-level search
+const templatesRef = computed(() => {
+  // If a subcategory is selected, use all templates from that subcategory
+  if (selectedSubcategory.value) {
+    return selectedSubcategory.value.modules.flatMap(
+      (module) => module.templates
+    )
+  }
+
+  // If "All Templates" view is selected and no subcategory, show all templates across all groups
+  if (selectedView.value === 'all') {
+    return allTemplateGroups.value.flatMap((group) =>
+      group.subcategories.flatMap((subcategory) =>
+        subcategory.modules.flatMap((module) => module.templates)
+      )
+    )
+  }
+
+  // Otherwise, use the selected template's templates (for recent view or fallback)
+  return selectedTemplate.value?.templates || []
+})
+
+const {
+  searchQuery,
+  selectedModels,
+  selectedSubcategory: filterSubcategory,
+  sortBy,
+  availableSubcategories,
+  availableModels,
+  filteredTemplates,
+  filteredCount,
+  resetFilters
+} = useTemplateFiltering(templatesRef)
+
 watch(
   isReady,
   () => {
     if (isReady.value) {
-      selectFirstTemplateCategory()
+      // Start with "All Templates" view by default instead of selecting first subcategory
+      selectedView.value = 'all'
+      selectedSubcategory.value = null
     }
   },
   { once: true }
 )
 
-const handleTabSelection = (selection: WorkflowTemplates | null) => {
-  if (selection !== null) {
-    selectTemplateCategory(selection)
+const handleSubcategory = (subcategory: TemplateSubcategory) => {
+  selectedSubcategory.value = subcategory
 
-    // On small screens, close the sidebar when a category is selected
-    if (isSmallScreen.value) {
-      isSideNavOpen.value = false
-    }
+  // On small screens, close the sidebar when a subcategory is selected
+  if (isSmallScreen.value) {
+    isSideNavOpen.value = false
   }
 }
 
+const handleViewSelection = (view: 'all' | 'recent') => {
+  selectedView.value = view
+  // Clear subcategory selection when switching to header views
+  selectedSubcategory.value = null
+}
+
 const handleLoadWorkflow = async (id: string) => {
   if (!isReady.value || !selectedTemplate.value) return false
 

src/components/templates/TemplateWorkflowsDialogHeader.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <h3 class="px-4">
+    <h3 class="px-8 text-base font-medium">
       <span>{{ $t('templateWorkflows.title') }}</span>
     </h3>
   </div>

src/components/templates/TemplateWorkflowsSideNav.vue

@@ -1,50 +1,142 @@
 <template>
-  <ScrollPanel class="w-80" style="height: calc(83vh - 48px)">
-    <Listbox
-      :model-value="selectedTab"
-      :options="tabs"
-      option-group-label="label"
-      option-label="localizedTitle"
-      option-group-children="modules"
-      class="w-full border-0 bg-transparent shadow-none"
-      :pt="{
-        list: { class: 'p-0' },
-        option: { class: 'px-12 py-3 text-lg' },
-        optionGroup: { class: 'p-0 text-left text-inherit' }
-      }"
-      list-style="max-height:unset"
-      @update:model-value="handleTabSelection"
+  <ScrollPanel class="w-60" style="height: calc(83vh - 48px)">
+    <!-- View Selection Header -->
+    <div
+      class="text-left py-3 border-b border-surface-200 dark-theme:border-surface-700"
     >
-      <template #optiongroup="slotProps">
-        <div class="text-left py-3 px-12">
-          <h2 class="text-lg">
-            {{ slotProps.option.label }}
-          </h2>
+      <Listbox
+        :model-value="selectedView"
+        :options="viewOptions"
+        option-label="label"
+        option-value="value"
+        :multiple="false"
+        class="w-full border-0 bg-transparent shadow-none"
+        :pt="{
+          list: { class: 'p-0' },
+          header: { class: 'px-0' },
+          option: {
+            class: 'px-0 py-2 text-sm font-medium flex items-center gap-1'
+          }
+        }"
+        @update:model-value="handleViewSelection"
+      >
+        <template #option="slotProps">
+          <div class="flex self-center items-center gap-1 py-1 px-4">
+            <i :class="slotProps.option.icon"></i>
+            <div>{{ slotProps.option.label }}</div>
+          </div>
+        </template>
+      </Listbox>
+    </div>
+
+    <!-- Template Groups and Subcategories -->
+    <div class="w-full">
+      <div v-for="group in props.tabs" :key="group.label" class="mb-2">
+        <!-- Group Header -->
+        <div class="text-left py-1">
+          <h3
+            class="text-muted text-xs font-bold uppercase tracking-wide text-surface-600 dark-theme:text-surface-400 px-4"
+          >
+            {{ group.label }}
+          </h3>
         </div>
-      </template>
-    </Listbox>
+
+        <!-- Subcategories as Listbox -->
+        <Listbox
+          :model-value="selectedSubcategory"
+          :options="group.subcategories"
+          option-label="label"
+          class="w-full border-0 bg-transparent shadow-none"
+          :pt="{
+            list: { class: 'p-0' },
+            option: { class: 'px-4 py-3 text-sm' }
+          }"
+          @update:model-value="handleSubcategorySelection"
+        >
+          <template #option="slotProps">
+            <div class="flex items-center">
+              <div>{{ slotProps.option.label }}</div>
+            </div>
+          </template>
+        </Listbox>
+      </div>
+    </div>
   </ScrollPanel>
 </template>
 
 <script setup lang="ts">
 import Listbox from 'primevue/listbox'
 import ScrollPanel from 'primevue/scrollpanel'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import type {
   TemplateGroup,
-  WorkflowTemplates
+  TemplateSubcategory
 } from '@/types/workflowTemplateTypes'
 
-defineProps<{
+const { t } = useI18n()
+
+const props = defineProps<{
   tabs: TemplateGroup[]
-  selectedTab: WorkflowTemplates | null
+  selectedSubcategory: TemplateSubcategory | null
+  selectedView: 'all' | 'recent' | null
 }>()
 
 const emit = defineEmits<{
-  (e: 'update:selectedTab', tab: WorkflowTemplates): void
+  (e: 'update:selectedSubcategory', subcategory: TemplateSubcategory): void
+  (e: 'update:selectedView', view: 'all' | 'recent'): void
 }>()
 
-const handleTabSelection = (tab: WorkflowTemplates) => {
-  emit('update:selectedTab', tab)
+const viewOptions = computed(() => {
+  // Create a comprehensive "All Templates" subcategory that aggregates all modules
+  const allTemplatesSubcategory = {
+    label: t('templateWorkflows.view.allTemplates', 'All Templates'),
+    modules: props.tabs.flatMap((group: TemplateGroup) =>
+      group.subcategories.flatMap(
+        (subcategory: TemplateSubcategory) => subcategory.modules
+      )
+    )
+  }
+
+  const recentItemsSubcategory = {
+    label: t('templateWorkflows.view.recentItems', 'Recent Items'),
+    modules: [] // Could be populated with recent templates if needed
+  }
+
+  return [
+    {
+      ...allTemplatesSubcategory,
+      icon: 'pi pi-list mr-2'
+    },
+    {
+      ...recentItemsSubcategory,
+      icon: 'pi pi-clock mr-2'
+    }
+  ]
+})
+
+const handleSubcategorySelection = (subcategory: TemplateSubcategory) => {
+  emit('update:selectedSubcategory', subcategory)
+}
+
+const handleViewSelection = (subcategory: TemplateSubcategory | null) => {
+  // Prevent deselection - always keep a view selected
+  if (subcategory !== null) {
+    // Emit as subcategory selection since these now have comprehensive module data
+    emit('update:selectedSubcategory', subcategory)
+
+    // Also emit view selection for backward compatibility
+    const viewValue = subcategory.label.includes('All Templates')
+      ? 'all'
+      : 'recent'
+    emit('update:selectedView', viewValue)
+  }
+  // If subcategory is null, we don't emit anything, keeping the current selection
 }
 </script>
+<style scoped>
+:deep(.p-listbox-header) {
+  padding: 0;
+}
+</style>

src/components/templates/thumbnails/CompareSliderThumbnail.spec.ts

@@ -12,6 +12,15 @@ vi.mock('@/components/templates/thumbnails/BaseThumbnail.vue', () => ({
   }
 }))
 
+vi.mock('@/components/common/LazyImage.vue', () => ({
+  default: {
+    name: 'LazyImage',
+    template:
+      '<img :src="src" :alt="alt" :class="imageClass" :style="imageStyle" draggable="false" />',
+    props: ['src', 'alt', 'imageClass', 'imageStyle']
+  }
+}))
+
 vi.mock('@vueuse/core', () => ({
   useMouseInElement: () => ({
     elementX: ref(50),
@@ -35,23 +44,24 @@ describe('CompareSliderThumbnail', () => {
 
   it('renders both base and overlay images', () => {
     const wrapper = mountThumbnail()
-    const images = wrapper.findAll('img')
-    expect(images.length).toBe(2)
-    expect(images[0].attributes('src')).toBe('/base-image.jpg')
-    expect(images[1].attributes('src')).toBe('/overlay-image.jpg')
+    const lazyImages = wrapper.findAllComponents({ name: 'LazyImage' })
+    expect(lazyImages.length).toBe(2)
+    expect(lazyImages[0].props('src')).toBe('/base-image.jpg')
+    expect(lazyImages[1].props('src')).toBe('/overlay-image.jpg')
   })
 
   it('applies correct alt text to both images', () => {
     const wrapper = mountThumbnail({ alt: 'Custom Alt Text' })
-    const images = wrapper.findAll('img')
-    expect(images[0].attributes('alt')).toBe('Custom Alt Text')
-    expect(images[1].attributes('alt')).toBe('Custom Alt Text')
+    const lazyImages = wrapper.findAllComponents({ name: 'LazyImage' })
+    expect(lazyImages[0].props('alt')).toBe('Custom Alt Text')
+    expect(lazyImages[1].props('alt')).toBe('Custom Alt Text')
   })
 
   it('applies clip-path style to overlay image', () => {
     const wrapper = mountThumbnail()
-    const overlay = wrapper.findAll('img')[1]
-    expect(overlay.attributes('style')).toContain('clip-path')
+    const overlayLazyImage = wrapper.findAllComponents({ name: 'LazyImage' })[1]
+    const imageStyle = overlayLazyImage.props('imageStyle')
+    expect(imageStyle.clipPath).toContain('inset')
   })
 
   it('renders slider divider', () => {

src/components/templates/thumbnails/CompareSliderThumbnail.vue

@@ -1,24 +1,24 @@
 <template>
   <BaseThumbnail :is-hovered="isHovered">
-    <img
+    <LazyImage
       :src="baseImageSrc"
       :alt="alt"
-      :class="
+      :image-class="
         isVideoType
           ? 'w-full h-full object-cover'
           : 'max-w-full max-h-64 object-contain'
       "
     />
     <div ref="containerRef" class="absolute inset-0">
-      <img
+      <LazyImage
         :src="overlayImageSrc"
         :alt="alt"
-        :class="
+        :image-class="
           isVideoType
             ? 'w-full h-full object-cover'
             : 'max-w-full max-h-64 object-contain'
         "
-        :style="{
+        :image-style="{
           clipPath: `inset(0 ${100 - sliderPosition}% 0 0)`
         }"
       />
@@ -36,6 +36,7 @@
 import { useMouseInElement } from '@vueuse/core'
 import { ref, watch } from 'vue'
 
+import LazyImage from '@/components/common/LazyImage.vue'
 import BaseThumbnail from '@/components/templates/thumbnails/BaseThumbnail.vue'
 
 const SLIDER_START_POSITION = 50

src/components/templates/thumbnails/DefaultThumbnail.spec.ts

@@ -11,6 +11,15 @@ vi.mock('@/components/templates/thumbnails/BaseThumbnail.vue', () => ({
   }
 }))
 
+vi.mock('@/components/common/LazyImage.vue', () => ({
+  default: {
+    name: 'LazyImage',
+    template:
+      '<img :src="src" :alt="alt" :class="imageClass" :style="imageStyle" draggable="false" />',
+    props: ['src', 'alt', 'imageClass', 'imageStyle']
+  }
+}))
+
 describe('DefaultThumbnail', () => {
   const mountThumbnail = (props = {}) => {
     return mount(DefaultThumbnail, {
@@ -25,9 +34,9 @@ describe('DefaultThumbnail', () => {
 
   it('renders image with correct src and alt', () => {
     const wrapper = mountThumbnail()
-    const img = wrapper.find('img')
-    expect(img.attributes('src')).toBe('/test-image.jpg')
-    expect(img.attributes('alt')).toBe('Test Image')
+    const lazyImage = wrapper.findComponent({ name: 'LazyImage' })
+    expect(lazyImage.props('src')).toBe('/test-image.jpg')
+    expect(lazyImage.props('alt')).toBe('Test Image')
   })
 
   it('applies scale transform when hovered', () => {
@@ -35,35 +44,43 @@ describe('DefaultThumbnail', () => {
       isHovered: true,
       hoverZoom: 10
     })
-    const img = wrapper.find('img')
-    expect(img.attributes('style')).toContain('scale(1.1)')
+    const lazyImage = wrapper.findComponent({ name: 'LazyImage' })
+    expect(lazyImage.props('imageStyle')).toEqual({ transform: 'scale(1.1)' })
   })
 
   it('does not apply scale transform when not hovered', () => {
     const wrapper = mountThumbnail({
       isHovered: false
     })
-    const img = wrapper.find('img')
-    expect(img.attributes('style')).toBeUndefined()
+    const lazyImage = wrapper.findComponent({ name: 'LazyImage' })
+    expect(lazyImage.props('imageStyle')).toBeUndefined()
   })
 
   it('applies video styling for video type', () => {
     const wrapper = mountThumbnail({
       isVideo: true
     })
-    const img = wrapper.find('img')
-    expect(img.classes()).toContain('w-full')
-    expect(img.classes()).toContain('h-full')
-    expect(img.classes()).toContain('object-cover')
+    const lazyImage = wrapper.findComponent({ name: 'LazyImage' })
+    const imageClass = lazyImage.props('imageClass')
+    const classString = Array.isArray(imageClass)
+      ? imageClass.join(' ')
+      : imageClass
+    expect(classString).toContain('w-full')
+    expect(classString).toContain('h-full')
+    expect(classString).toContain('object-cover')
   })
 
   it('applies image styling for non-video type', () => {
     const wrapper = mountThumbnail({
       isVideo: false
     })
-    const img = wrapper.find('img')
-    expect(img.classes()).toContain('max-w-full')
-    expect(img.classes()).toContain('object-contain')
+    const lazyImage = wrapper.findComponent({ name: 'LazyImage' })
+    const imageClass = lazyImage.props('imageClass')
+    const classString = Array.isArray(imageClass)
+      ? imageClass.join(' ')
+      : imageClass
+    expect(classString).toContain('max-w-full')
+    expect(classString).toContain('object-contain')
   })
 
   it('applies correct styling for webp images', () => {
@@ -71,8 +88,12 @@ describe('DefaultThumbnail', () => {
       src: '/test-video.webp',
       isVideo: true
     })
-    const img = wrapper.find('img')
-    expect(img.classes()).toContain('object-cover')
+    const lazyImage = wrapper.findComponent({ name: 'LazyImage' })
+    const imageClass = lazyImage.props('imageClass')
+    const classString = Array.isArray(imageClass)
+      ? imageClass.join(' ')
+      : imageClass
+    expect(classString).toContain('object-cover')
   })
 
   it('image is not draggable', () => {
@@ -83,11 +104,15 @@ describe('DefaultThumbnail', () => {
 
   it('applies transition classes', () => {
     const wrapper = mountThumbnail()
-    const img = wrapper.find('img')
-    expect(img.classes()).toContain('transform-gpu')
-    expect(img.classes()).toContain('transition-transform')
-    expect(img.classes()).toContain('duration-300')
-    expect(img.classes()).toContain('ease-out')
+    const lazyImage = wrapper.findComponent({ name: 'LazyImage' })
+    const imageClass = lazyImage.props('imageClass')
+    const classString = Array.isArray(imageClass)
+      ? imageClass.join(' ')
+      : imageClass
+    expect(classString).toContain('transform-gpu')
+    expect(classString).toContain('transition-transform')
+    expect(classString).toContain('duration-300')
+    expect(classString).toContain('ease-out')
   })
 
   it('passes correct props to BaseThumbnail', () => {

src/components/templates/thumbnails/DefaultThumbnail.vue

@@ -1,25 +1,23 @@
 <template>
   <BaseThumbnail :hover-zoom="hoverZoom" :is-hovered="isHovered">
-    <div class="overflow-hidden w-full h-full flex items-center justify-center">
-      <img
-        :src="src"
-        :alt="alt"
-        draggable="false"
-        :class="[
-          'transform-gpu transition-transform duration-300 ease-out',
-          isVideoType
-            ? 'w-full h-full object-cover'
-            : 'max-w-full max-h-64 object-contain'
-        ]"
-        :style="
-          isHovered ? { transform: `scale(${1 + hoverZoom / 100})` } : undefined
-        "
-      />
-    </div>
+    <LazyImage
+      :src="src"
+      :alt="alt"
+      :image-class="[
+        'transform-gpu transition-transform duration-300 ease-out',
+        isVideoType
+          ? 'w-full h-full object-cover'
+          : 'max-w-full max-h-64 object-contain'
+      ]"
+      :image-style="
+        isHovered ? { transform: `scale(${1 + hoverZoom / 100})` } : undefined
+      "
+    />
   </BaseThumbnail>
 </template>
 
 <script setup lang="ts">
+import LazyImage from '@/components/common/LazyImage.vue'
 import BaseThumbnail from '@/components/templates/thumbnails/BaseThumbnail.vue'
 
 const { src, isVideo } = defineProps<{