dom widget promotion

These locations differ from either local ids (like `5`) or execution ids
(like `3:4:5`) in that all nodes which are 'linked' such that changes to
one node will apply changes to other nodes will map to the same id. This
is specifically relevant for multiple instances of the same subgraph.

These IDs will actually get used in a followup commit

.github/workflows/danger.yaml

@@ -0,0 +1,27 @@
+name: Danger PR Review
+on:
+  pull_request:
+    types: [opened, edited, synchronize]
+
+jobs:
+  danger:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run Danger
+        run: npx danger ci
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr-checks.yml

@@ -1,154 +0,0 @@
-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'
-        run: |
-          # Check PR body for screen recording
-          PR_BODY="${{ github.event.pull_request.body }}"
-          
-          # 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

@@ -1,149 +0,0 @@
-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'
-              });
-            }

dangerfile.ts

@@ -0,0 +1,72 @@
+import { danger, fail } from 'danger'
+
+// Check if we should run the checks
+const shouldRunChecks = async () => {
+  const allChangedFiles = [
+    ...danger.git.modified_files,
+    ...danger.git.created_files
+  ]
+  const srcChanges = allChangedFiles.filter((file) => file.startsWith('src/'))
+
+  if (srcChanges.length === 0) {
+    return false
+  }
+
+  // Check total lines changed in src files
+  let totalLinesChanged = 0
+  for (const file of srcChanges) {
+    const diff = await danger.git.diffForFile(file)
+    if (diff) {
+      // Count only lines with actual content (non-empty after trimming whitespace)
+      // This excludes empty lines and lines containing only spaces/tabs
+      const additions =
+        diff.added?.split('\n').filter((line) => line.trim()).length || 0
+      const deletions =
+        diff.removed?.split('\n').filter((line) => line.trim()).length || 0
+      totalLinesChanged += additions + deletions
+    }
+  }
+
+  return totalLinesChanged > 3
+}
+
+// Check if browser tests were updated
+const checkBrowserTestCoverage = () => {
+  const allChangedFiles = [
+    ...danger.git.modified_files,
+    ...danger.git.created_files
+  ]
+  const hasBrowserTestChanges = allChangedFiles.some(
+    (file) => file.startsWith('browser_tests/') && file.endsWith('.ts')
+  )
+
+  if (!hasBrowserTestChanges) {
+    fail(`🧪 **E2E Test Coverage Missing**
+
+All changes should be covered under E2E testing. Please add or update browser tests.`)
+  }
+}
+
+// Check for screen recording in PR description
+const checkScreenRecording = () => {
+  const description = danger.github.pr.body || ''
+  const hasRecording =
+    /github\.com\/user-attachments\/assets\/[a-f0-9-]+/i.test(description) ||
+    /youtube\.com\/watch|youtu\.be\//i.test(description)
+
+  if (!hasRecording) {
+    fail(`📹 **Visual Documentation Missing**
+
+Please add a screen recording or screenshot:
+- GitHub: Drag & drop media to PR description  
+- YouTube: Add YouTube link`)
+  }
+}
+
+// Run the checks only if conditions are met
+shouldRunChecks().then((shouldRun) => {
+  if (shouldRun) {
+    checkBrowserTestCoverage()
+    checkScreenRecording()
+  }
+})

package.json

@@ -45,6 +45,7 @@
     "@vue/test-utils": "^2.4.6",
     "autoprefixer": "^10.4.19",
     "chalk": "^5.3.0",
+    "danger": "^13.0.4",
     "eslint": "^9.12.0",
     "eslint-config-prettier": "^10.1.2",
     "eslint-plugin-prettier": "^5.2.6",

src/components/common/DotSpinner.vue

@@ -1,130 +0,0 @@
-<template>
-  <div
-    class="inline-flex items-center justify-center"
-    :style="{ width: size + 'px', height: size + 'px' }"
-  >
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      :width="size"
-      :height="size"
-      viewBox="0 0 14 14"
-      fill="none"
-      class="animate-spin"
-      :style="{ animationDuration: duration }"
-    >
-      <g clip-path="url(#clip0_776_9582)">
-        <!-- Top dot -->
-        <path
-          class="dot-animation"
-          style="animation-delay: 0s"
-          fill-rule="evenodd"
-          clip-rule="evenodd"
-          d="M7 2.21053C7.61042 2.21053 8.10526 1.71568 8.10526 1.10526C8.10526 0.494843 7.61042 0 7 0C6.38958 0 5.89474 0.494843 5.89474 1.10526C5.89474 1.71568 6.38958 2.21053 7 2.21053Z"
-          :fill="color"
-        />
-        <!-- Left dot -->
-        <path
-          class="dot-animation"
-          style="animation-delay: 0.25s"
-          fill-rule="evenodd"
-          clip-rule="evenodd"
-          d="M2.21053 7C2.21053 7.61042 1.71568 8.10526 1.10526 8.10526C0.494843 8.10526 0 7.61042 0 7C0 6.38958 0.494843 5.89474 1.10526 5.89474C1.71568 5.89474 2.21053 6.38958 2.21053 7Z"
-          :fill="color"
-        />
-        <!-- Right dot -->
-        <path
-          class="dot-animation"
-          style="animation-delay: 0.5s"
-          fill-rule="evenodd"
-          clip-rule="evenodd"
-          d="M14 7C14 7.61042 13.5052 8.10526 12.8947 8.10526C12.2843 8.10526 11.7895 7.61042 11.7895 7C11.7895 6.38958 12.2843 5.89474 12.8947 5.89474C13.5052 5.89474 14 6.38958 14 7Z"
-          :fill="color"
-        />
-        <!-- Bottom dot -->
-        <path
-          class="dot-animation"
-          style="animation-delay: 0.75s"
-          fill-rule="evenodd"
-          clip-rule="evenodd"
-          d="M8.10526 12.8947C8.10526 13.5052 7.61041 14 6.99999 14C6.38957 14 5.89473 13.5052 5.89473 12.8947C5.89473 12.2843 6.38957 11.7895 6.99999 11.7895C7.61041 11.7895 8.10526 12.2843 8.10526 12.8947Z"
-          :fill="color"
-        />
-        <!-- Top-left dot -->
-        <path
-          class="dot-animation"
-          style="animation-delay: 0.125s"
-          fill-rule="evenodd"
-          clip-rule="evenodd"
-          d="M2.05039 3.61349C2.48203 4.04513 3.18184 4.04513 3.61347 3.61349C4.0451 3.18186 4.0451 2.48205 3.61347 2.05042C3.18184 1.61878 2.48203 1.61878 2.05039 2.05042C1.61876 2.48205 1.61876 3.18186 2.05039 3.61349Z"
-          :fill="color"
-        />
-        <!-- Bottom-right dot -->
-        <path
-          class="dot-animation"
-          style="animation-delay: 0.625s"
-          fill-rule="evenodd"
-          clip-rule="evenodd"
-          d="M11.9496 11.9496C11.518 12.3812 10.8182 12.3812 10.3865 11.9496C9.9549 11.5179 9.9549 10.8181 10.3865 10.3865C10.8182 9.95485 11.518 9.95485 11.9496 10.3865C12.3812 10.8181 12.3812 11.5179 11.9496 11.9496Z"
-          :fill="color"
-        />
-        <!-- Bottom-left dot -->
-        <path
-          class="dot-animation"
-          style="animation-delay: 0.875s"
-          fill-rule="evenodd"
-          clip-rule="evenodd"
-          d="M2.05039 11.9496C2.48203 12.3812 3.18184 12.3812 3.61347 11.9496C4.0451 11.5179 4.0451 10.8181 3.61347 10.3865C3.18184 9.95485 2.48203 9.95485 2.05039 10.3865C1.61876 10.8181 1.61876 11.5179 2.05039 11.9496Z"
-          :fill="color"
-        />
-        <!-- Top-right dot -->
-        <path
-          class="dot-animation"
-          style="animation-delay: 0.375s"
-          fill-rule="evenodd"
-          clip-rule="evenodd"
-          d="M11.9496 3.61349C11.518 4.04513 10.8182 4.04513 10.3865 3.61349C9.9549 3.18186 9.9549 2.48205 10.3865 2.05042C10.8182 1.61878 11.518 1.61878 11.9496 2.05042C12.3812 2.48205 12.3812 3.18186 11.9496 3.61349Z"
-          :fill="color"
-        />
-      </g>
-      <defs>
-        <clipPath id="clip0_776_9582">
-          <rect width="14" height="14" fill="white" />
-        </clipPath>
-      </defs>
-    </svg>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
-
-const { size = 24, duration = '2s' } = defineProps<{
-  size?: number
-  duration?: string
-}>()
-
-const colorPaletteStore = useColorPaletteStore()
-
-const color = computed(() =>
-  colorPaletteStore.completedActivePalette.light_theme ? '#2C2B30' : '#D4D4D4'
-)
-</script>
-
-<style scoped>
-.dot-animation {
-  animation: dot-pulse 1s ease-in-out infinite;
-}
-
-@keyframes dot-pulse {
-  0%,
-  80%,
-  100% {
-    opacity: 0.3;
-  }
-  40% {
-    opacity: 1;
-  }
-}
-</style>

src/components/dialog/content/LoadWorkflowWarning.vue

@@ -31,7 +31,7 @@
       </div>
     </template>
   </ListBox>
-  <div v-if="!isLegacyManager" class="flex justify-end py-3">
+  <div v-if="isManagerInstalled" class="flex justify-end py-3">
     <PackInstallButton
       :disabled="isLoading || !!error || missingNodePacks.length === 0"
       :node-packs="missingNodePacks"
@@ -45,12 +45,14 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import ListBox from 'primevue/listbox'
-import { computed, onMounted, ref } from 'vue'
+import { computed } from 'vue'
 
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
+import MissingCoreNodesMessage from '@/components/dialog/content/MissingCoreNodesMessage.vue'
+import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
 import { useMissingNodes } from '@/composables/nodePack/useMissingNodes'
-import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useDialogService } from '@/services/dialogService'
+import { useAboutPanelStore } from '@/stores/aboutPanelStore'
 import type { MissingNodeType } from '@/types/comfy'
 import { ManagerTab } from '@/types/comfyManagerTypes'
 
@@ -58,11 +60,22 @@ const props = defineProps<{
   missingNodeTypes: MissingNodeType[]
 }>()
 
+const aboutPanelStore = useAboutPanelStore()
+
 // Get missing node packs from workflow with loading and error states
 const { missingNodePacks, isLoading, error, missingCoreNodes } =
   useMissingNodes()
 
-const isLegacyManager = ref(false)
+// Determines if ComfyUI-Manager is installed by checking for its badge in the about panel
+// This allows us to conditionally show the Manager button only when the extension is available
+// TODO: Remove this check when Manager functionality is fully migrated into core
+const isManagerInstalled = computed(() => {
+  return aboutPanelStore.badges.some(
+    (badge) =>
+      badge.label.includes('ComfyUI-Manager') ||
+      badge.url.includes('ComfyUI-Manager')
+  )
+})
 
 const uniqueNodes = computed(() => {
   const seenTypes = new Set()
@@ -90,13 +103,6 @@ const openManager = () => {
     initialTab: ManagerTab.Missing
   })
 }
-
-onMounted(async () => {
-  const isLegacyResponse = await useComfyManagerService().isLegacyManagerUI()
-  if (isLegacyResponse?.is_legacy_manager_ui) {
-    isLegacyManager.value = true
-  }
-})
 </script>
 
 <style scoped>

src/components/dialog/content/ManagerProgressDialogContent.test.ts

@@ -30,20 +30,11 @@ const defaultMockTaskLogs = [
 
 vi.mock('@/stores/comfyManagerStore', () => ({
   useComfyManagerStore: vi.fn(() => ({
-    taskLogs: [...defaultMockTaskLogs],
-    succeededTasksLogs: [...defaultMockTaskLogs],
-    failedTasksLogs: [...defaultMockTaskLogs],
-    managerQueue: { historyCount: 2 },
-    isLoading: false
+    taskLogs: [...defaultMockTaskLogs]
   })),
   useManagerProgressDialogStore: vi.fn(() => ({
     isExpanded: true,
-    activeTabIndex: 0,
-    getActiveTabIndex: vi.fn(() => 0),
-    setActiveTabIndex: vi.fn(),
-    toggle: vi.fn(),
-    collapse: mockCollapse,
-    expand: vi.fn()
+    collapse: mockCollapse
   }))
 }))
 

src/components/dialog/content/ManagerProgressDialogContent.vue

@@ -18,7 +18,7 @@
         'max-h-0': !isExpanded
       }"
     >
-      <div v-for="(log, index) in focusedLogs" :key="index">
+      <div v-for="(panel, index) in taskPanels" :key="index">
         <Panel
           :expanded="collapsedPanels[index] || false"
           toggleable
@@ -27,7 +27,7 @@
           <template #header>
             <div class="flex items-center justify-between w-full py-2">
               <div class="flex flex-col text-sm font-medium leading-normal">
-                <span>{{ log.taskName }}</span>
+                <span>{{ panel.taskName }}</span>
                 <span class="text-muted">
                   {{
                     isInProgress(index)
@@ -52,24 +52,24 @@
           </template>
           <div
             :ref="
-              index === focusedLogs.length - 1
+              index === taskPanels.length - 1
                 ? (el) => (lastPanelRef = el as HTMLElement)
                 : undefined
             "
             class="overflow-y-auto h-64 rounded-lg bg-black"
             :class="{
-              'h-64': index !== focusedLogs.length - 1,
-              'flex-grow': index === focusedLogs.length - 1
+              'h-64': index !== taskPanels.length - 1,
+              'flex-grow': index === taskPanels.length - 1
             }"
             @scroll="handleScroll"
           >
             <div class="h-full">
               <div
-                v-for="(logLine, logIndex) in log.logs"
+                v-for="(log, logIndex) in panel.logs"
                 :key="logIndex"
                 class="text-neutral-400 dark-theme:text-muted"
               >
-                <pre class="whitespace-pre-wrap break-words">{{ logLine }}</pre>
+                <pre class="whitespace-pre-wrap break-words">{{ log }}</pre>
               </div>
             </div>
           </div>
@@ -90,23 +90,17 @@ import {
   useManagerProgressDialogStore
 } from '@/stores/comfyManagerStore'
 
-const comfyManagerStore = useComfyManagerStore()
+const { taskLogs } = useComfyManagerStore()
 const progressDialogContent = useManagerProgressDialogStore()
+const managerStore = useComfyManagerStore()
 
 const isInProgress = (index: number) =>
-  index === comfyManagerStore.managerQueue.historyCount - 1 &&
-  comfyManagerStore.isLoading
+  index === taskPanels.value.length - 1 && managerStore.uncompletedCount > 0
 
+const taskPanels = computed(() => taskLogs)
 const isExpanded = computed(() => progressDialogContent.isExpanded)
 const isCollapsed = computed(() => !isExpanded.value)
 
-const focusedLogs = computed(() => {
-  if (progressDialogContent.getActiveTabIndex() === 0) {
-    return comfyManagerStore.succeededTasksLogs
-  }
-  return comfyManagerStore.failedTasksLogs
-})
-
 const collapsedPanels = ref<Record<number, boolean>>({})
 const togglePanel = (index: number) => {
   collapsedPanels.value[index] = !collapsedPanels.value[index]
@@ -121,7 +115,7 @@ const { y: scrollY } = useScroll(sectionsContainerRef, {
 
 const lastPanelRef = ref<HTMLElement | null>(null)
 const isUserScrolling = ref(false)
-const lastPanelLogs = computed(() => focusedLogs.value?.at(-1)?.logs)
+const lastPanelLogs = computed(() => taskPanels.value?.at(-1)?.logs)
 
 const isAtBottom = (el: HTMLElement | null) => {
   if (!el) return false

src/components/dialog/content/manager/ManagerDialogContent.vue

@@ -34,7 +34,6 @@
             :suggestions="suggestions"
             :is-missing-tab="isMissingTab"
             :sort-options="sortOptions"
-            :is-update-available-tab="isUpdateAvailableTab"
           />
           <div class="flex-1 overflow-auto">
             <div

src/components/dialog/content/manager/ManagerHeader.vue

@@ -4,16 +4,6 @@
       <h2 class="text-lg font-normal text-left">
         {{ $t('manager.discoverCommunityContent') }}
       </h2>
-      <Tag
-        v-tooltip.left="$t('manager.legacyManagerUIDescription')"
-        severity="info"
-        icon="pi pi-info-circle"
-        :value="$t('manager.legacyManagerUI')"
-        class="cursor-help"
-        :pt="{
-          root: { class: 'text-xs' }
-        }"
-      />
     </div>
   </div>
 </template>

src/components/dialog/content/manager/PackVersionBadge.test.ts

@@ -6,6 +6,7 @@ import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import enMessages from '@/locales/en/main.json'
+import { SelectedVersion } from '@/types/comfyManagerTypes'
 
 import PackVersionBadge from './PackVersionBadge.vue'
 import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue'
@@ -119,7 +120,7 @@ describe('PackVersionBadge', () => {
 
     const badge = wrapper.find('[role="button"]')
     expect(badge.exists()).toBe(true)
-    expect(badge.find('span').text()).toBe('nightly')
+    expect(badge.find('span').text()).toBe(SelectedVersion.NIGHTLY)
   })
 
   it('falls back to NIGHTLY when nodePack.id is missing', () => {
@@ -133,7 +134,7 @@ describe('PackVersionBadge', () => {
 
     const badge = wrapper.find('[role="button"]')
     expect(badge.exists()).toBe(true)
-    expect(badge.find('span').text()).toBe('nightly')
+    expect(badge.find('span').text()).toBe(SelectedVersion.NIGHTLY)
   })
 
   it('toggles the popover when button is clicked', async () => {

src/components/dialog/content/manager/PackVersionBadge.vue

@@ -42,7 +42,8 @@ import { computed, ref, watch } from 'vue'
 import PackVersionSelectorPopover from '@/components/dialog/content/manager/PackVersionSelectorPopover.vue'
 import { usePackUpdateStatus } from '@/composables/nodePack/usePackUpdateStatus'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import type { components } from '@/types/comfyRegistryTypes'
+import { SelectedVersion } from '@/types/comfyManagerTypes'
+import { components } from '@/types/comfyRegistryTypes'
 import { isSemVer } from '@/utils/formatUtil'
 
 const TRUNCATED_HASH_LENGTH = 7
@@ -63,11 +64,11 @@ const popoverRef = ref()
 const managerStore = useComfyManagerStore()
 
 const installedVersion = computed(() => {
-  if (!nodePack.id) return 'nightly'
+  if (!nodePack.id) return SelectedVersion.NIGHTLY
   const version =
     managerStore.installedPacks[nodePack.id]?.ver ??
     nodePack.latest_version?.version ??
-    'nightly'
+    SelectedVersion.NIGHTLY
 
   // If Git hash, truncate to 7 characters
   return isSemVer(version) ? version : version.slice(0, TRUNCATED_HASH_LENGTH)

src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts

@@ -8,8 +8,7 @@ import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import enMessages from '@/locales/en/main.json'
-
-// SelectedVersion is now using direct strings instead of enum
+import { SelectedVersion } from '@/types/comfyManagerTypes'
 
 import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue'
 
@@ -124,8 +123,8 @@ describe('PackVersionSelectorPopover', () => {
     expect(options.length).toBe(defaultMockVersions.length + 2) // 2 special options + version options
 
     // Check that special options exist
-    expect(options.some((o) => o.value === 'nightly')).toBe(true)
-    expect(options.some((o) => o.value === 'latest')).toBe(true)
+    expect(options.some((o) => o.value === SelectedVersion.NIGHTLY)).toBe(true)
+    expect(options.some((o) => o.value === SelectedVersion.LATEST)).toBe(true)
 
     // Check that version options exist
     expect(options.some((o) => o.value === '1.0.0')).toBe(true)
@@ -305,7 +304,7 @@ describe('PackVersionSelectorPopover', () => {
       await waitForPromises()
       const listbox = wrapper.findComponent(Listbox)
       expect(listbox.exists()).toBe(true)
-      expect(listbox.props('modelValue')).toBe('nightly')
+      expect(listbox.props('modelValue')).toBe(SelectedVersion.NIGHTLY)
     })
 
     it('defaults to nightly when publisher name is "Unclaimed"', async () => {
@@ -326,7 +325,7 @@ describe('PackVersionSelectorPopover', () => {
       await waitForPromises()
       const listbox = wrapper.findComponent(Listbox)
       expect(listbox.exists()).toBe(true)
-      expect(listbox.props('modelValue')).toBe('nightly')
+      expect(listbox.props('modelValue')).toBe(SelectedVersion.NIGHTLY)
     })
   })
 })

src/components/dialog/content/manager/PackVersionSelectorPopover.vue

@@ -69,8 +69,12 @@ import ContentDivider from '@/components/common/ContentDivider.vue'
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import { useComfyRegistryService } from '@/services/comfyRegistryService'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import type { components } from '@/types/comfyRegistryTypes'
-import { components as ManagerComponents } from '@/types/generatedManagerTypes'
+import {
+  ManagerChannel,
+  ManagerDatabaseSource,
+  SelectedVersion
+} from '@/types/comfyManagerTypes'
+import { components } from '@/types/comfyRegistryTypes'
 import { isSemVer } from '@/utils/formatUtil'
 
 const { nodePack } = defineProps<{
@@ -88,20 +92,19 @@ const managerStore = useComfyManagerStore()
 
 const isQueueing = ref(false)
 
-const selectedVersion = ref<string>('latest')
+const selectedVersion = ref<string>(SelectedVersion.LATEST)
 onMounted(() => {
-  const initialVersion = getInitialSelectedVersion() ?? 'latest'
+  const initialVersion = getInitialSelectedVersion() ?? SelectedVersion.LATEST
   selectedVersion.value =
     // Use NIGHTLY when version is a Git hash
-    isSemVer(initialVersion) ? initialVersion : 'nightly'
+    isSemVer(initialVersion) ? initialVersion : SelectedVersion.NIGHTLY
 })
 
 const getInitialSelectedVersion = () => {
   if (!nodePack.id) return
 
   // If unclaimed, set selected version to nightly
-  if (nodePack.publisher?.name === 'Unclaimed')
-    return 'nightly' as ManagerComponents['schemas']['SelectedVersion']
+  if (nodePack.publisher?.name === 'Unclaimed') return SelectedVersion.NIGHTLY
 
   // If node pack is installed, set selected version to the installed version
   if (managerStore.isPackInstalled(nodePack.id))
@@ -140,7 +143,7 @@ const onNodePackChange = async () => {
   // Add Latest option
   const defaultVersions = [
     {
-      value: 'latest' as ManagerComponents['schemas']['SelectedVersion'],
+      value: SelectedVersion.LATEST,
       label: t('manager.latestVersion')
     }
   ]
@@ -148,7 +151,7 @@ const onNodePackChange = async () => {
   // Add Nightly option if there is a non-empty `repository` field
   if (nodePack.repository?.length) {
     defaultVersions.push({
-      value: 'nightly' as ManagerComponents['schemas']['SelectedVersion'],
+      value: SelectedVersion.NIGHTLY,
       label: t('manager.nightlyVersion')
     })
   }
@@ -169,16 +172,12 @@ whenever(
 
 const handleSubmit = async () => {
   isQueueing.value = true
-  if (!nodePack.id) {
-    throw new Error('Node ID is required for installation')
-  }
-
   await managerStore.installPack.call({
     id: nodePack.id,
-    version: selectedVersion.value,
     repository: nodePack.repository ?? '',
-    channel: 'default' as ManagerComponents['schemas']['ManagerChannel'],
-    mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
+    channel: ManagerChannel.DEFAULT,
+    mode: ManagerDatabaseSource.CACHE,
+    version: selectedVersion.value,
     selected_version: selectedVersion.value
   })
 

src/components/dialog/content/manager/button/PackActionButton.vue

@@ -28,7 +28,6 @@ import Button from 'primevue/button'
 
 const {
   label,
-  loading = false,
   loadingMessage,
   fullWidth = false,
   variant = 'default'

src/components/dialog/content/manager/button/PackEnableToggle.vue

@@ -15,8 +15,12 @@ import ToggleSwitch from 'primevue/toggleswitch'
 import { computed, ref } from 'vue'
 
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import {
+  InstallPackParams,
+  ManagerChannel,
+  SelectedVersion
+} from '@/types/comfyManagerTypes'
 import type { components } from '@/types/comfyRegistryTypes'
-import { components as ManagerComponents } from '@/types/generatedManagerTypes'
 
 const TOGGLE_DEBOUNCE_MS = 256
 
@@ -24,42 +28,37 @@ const { nodePack } = defineProps<{
   nodePack: components['schemas']['Node']
 }>()
 
-const { isPackEnabled, enablePack, disablePack } = useComfyManagerStore()
+const { isPackEnabled, enablePack, disablePack, installedPacks } =
+  useComfyManagerStore()
 
 const isLoading = ref(false)
 
 const isEnabled = computed(() => isPackEnabled(nodePack.id))
+const version = computed(() => {
+  const id = nodePack.id
+  if (!id) return SelectedVersion.NIGHTLY
+  return (
+    installedPacks[id]?.ver ??
+    nodePack.latest_version?.version ??
+    SelectedVersion.NIGHTLY
+  )
+})
 
-const handleEnable = () => {
-  if (!nodePack.id) {
-    throw new Error('Node ID is required for enabling')
-  }
-  return enablePack.call({
+const handleEnable = () =>
+  enablePack.call({
     id: nodePack.id,
-    version:
-      nodePack.latest_version?.version ??
-      ('latest' as ManagerComponents['schemas']['SelectedVersion']),
-    selected_version:
-      nodePack.latest_version?.version ??
-      ('latest' as ManagerComponents['schemas']['SelectedVersion']),
+    version: version.value,
+    selected_version: version.value,
     repository: nodePack.repository ?? '',
-    channel: 'default' as ManagerComponents['schemas']['ManagerChannel'],
-    mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
-    skip_post_install: false
+    channel: ManagerChannel.DEFAULT,
+    mode: 'default' as InstallPackParams['mode']
   })
-}
 
-const handleDisable = () => {
-  if (!nodePack.id) {
-    throw new Error('Node ID is required for disabling')
-  }
-  return disablePack({
+const handleDisable = () =>
+  disablePack({
     id: nodePack.id,
-    version:
-      nodePack.latest_version?.version ??
-      ('latest' as ManagerComponents['schemas']['SelectedVersion'])
+    version: version.value
   })
-}
 
 const handleToggle = async (enable: boolean) => {
   if (isLoading.value) return
@@ -68,16 +67,10 @@ const handleToggle = async (enable: boolean) => {
   if (enable) {
     await handleEnable()
   } else {
-    await handleDisable()
+    handleDisable()
   }
   isLoading.value = false
 }
 
-const onToggle = debounce(
-  (enable: boolean) => {
-    void handleToggle(enable)
-  },
-  TOGGLE_DEBOUNCE_MS,
-  { trailing: true }
-)
+const onToggle = debounce(handleToggle, TOGGLE_DEBOUNCE_MS, { trailing: true })
 </script>

src/components/dialog/content/manager/button/PackInstallButton.vue

@@ -19,9 +19,13 @@ import { inject, ref } from 'vue'
 
 import PackActionButton from '@/components/dialog/content/manager/button/PackActionButton.vue'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import { IsInstallingKey } from '@/types/comfyManagerTypes'
+import {
+  IsInstallingKey,
+  ManagerChannel,
+  ManagerDatabaseSource,
+  SelectedVersion
+} from '@/types/comfyManagerTypes'
 import type { components } from '@/types/comfyRegistryTypes'
-import { components as ManagerComponents } from '@/types/generatedManagerTypes'
 
 type NodePack = components['schemas']['Node']
 
@@ -39,26 +43,19 @@ const onClick = (): void => {
 
 const managerStore = useComfyManagerStore()
 
-const createPayload = (
-  installItem: NodePack
-): ManagerComponents['schemas']['InstallPackParams'] => {
-  if (!installItem.id) {
-    throw new Error('Node ID is required for installation')
-  }
-
+const createPayload = (installItem: NodePack) => {
   const isUnclaimedPack = installItem.publisher?.name === 'Unclaimed'
   const versionToInstall = isUnclaimedPack
-    ? ('nightly' as ManagerComponents['schemas']['SelectedVersion'])
-    : installItem.latest_version?.version ??
-      ('latest' as ManagerComponents['schemas']['SelectedVersion'])
+    ? SelectedVersion.NIGHTLY
+    : installItem.latest_version?.version ?? SelectedVersion.LATEST
 
   return {
     id: installItem.id,
-    version: versionToInstall,
     repository: installItem.repository ?? '',
-    channel: 'dev' as ManagerComponents['schemas']['ManagerChannel'],
-    mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
-    selected_version: versionToInstall
+    channel: ManagerChannel.DEV,
+    mode: ManagerDatabaseSource.CACHE,
+    selected_version: versionToInstall,
+    version: versionToInstall
   }
 }
 
@@ -68,7 +65,7 @@ const installPack = (item: NodePack) =>
 const installAllPacks = async () => {
   if (!nodePacks?.length) return
 
-  // isInstalling.value = true
+  isInstalling.value = true
 
   const uninstalledPacks = nodePacks.filter(
     (pack) => !managerStore.isPackInstalled(pack.id)

src/components/dialog/content/manager/button/PackUninstallButton.vue

@@ -15,6 +15,7 @@
 <script setup lang="ts">
 import PackActionButton from '@/components/dialog/content/manager/button/PackActionButton.vue'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import type { ManagerPackInfo } from '@/types/comfyManagerTypes'
 import type { components } from '@/types/comfyRegistryTypes'
 
 type NodePack = components['schemas']['Node']
@@ -25,16 +26,16 @@ const { nodePacks } = defineProps<{
 
 const managerStore = useComfyManagerStore()
 
-const uninstallPack = (item: NodePack) => {
-  if (!item.id) {
-    throw new Error('Node ID is required for uninstallation')
+const createPayload = (uninstallItem: NodePack): ManagerPackInfo => {
+  return {
+    id: uninstallItem.id,
+    version: uninstallItem.latest_version?.version
   }
-  return managerStore.uninstallPack({
-    id: item.id,
-    version: item.latest_version?.version ?? ''
-  })
 }
 
+const uninstallPack = (item: NodePack) =>
+  managerStore.uninstallPack(createPayload(item))
+
 const uninstallItems = async () => {
   if (!nodePacks?.length) return
   await Promise.all(nodePacks.map(uninstallPack))

src/components/dialog/content/manager/button/PackUpdateButton.vue

@@ -1,78 +0,0 @@
-<template>
-  <PackActionButton
-    v-bind="$attrs"
-    variant="black"
-    :label="$t('manager.updateAll')"
-    :loading="isUpdating"
-    :loading-message="$t('g.updating')"
-    @action="updateAllPacks"
-  />
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-
-import PackActionButton from '@/components/dialog/content/manager/button/PackActionButton.vue'
-import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import type { components } from '@/types/comfyRegistryTypes'
-
-type NodePack = components['schemas']['Node']
-
-const { nodePacks } = defineProps<{
-  nodePacks: NodePack[]
-}>()
-
-const isUpdating = ref<boolean>(false)
-
-const managerStore = useComfyManagerStore()
-
-const createPayload = (updateItem: NodePack) => {
-  return {
-    id: updateItem.id!,
-    version: updateItem.latest_version!.version!
-  }
-}
-
-const updatePack = async (item: NodePack) => {
-  if (!item.id || !item.latest_version?.version) {
-    console.warn('Pack missing required id or version:', item)
-    return
-  }
-  await managerStore.updatePack.call(createPayload(item))
-}
-
-const updateAllPacks = async () => {
-  if (!nodePacks?.length) {
-    console.warn('No packs provided for update')
-    return
-  }
-
-  isUpdating.value = true
-
-  const updatablePacks = nodePacks.filter((pack) =>
-    managerStore.isPackInstalled(pack.id)
-  )
-
-  if (!updatablePacks.length) {
-    console.info('No installed packs available for update')
-    isUpdating.value = false
-    return
-  }
-
-  console.info(`Starting update of ${updatablePacks.length} packs`)
-
-  try {
-    await Promise.all(updatablePacks.map(updatePack))
-    managerStore.updatePack.clear()
-    console.info('All packs updated successfully')
-  } catch (error) {
-    console.error('Pack update failed:', error)
-    console.error(
-      'Failed packs info:',
-      updatablePacks.map((p) => p.id)
-    )
-  } finally {
-    isUpdating.value = false
-  }
-}
-</script>

src/components/dialog/content/manager/packCard/PackCard.vue

@@ -119,21 +119,13 @@ provide(IsInstallingKey, isInstalling)
 
 const { isPackInstalled, isPackEnabled } = useComfyManagerStore()
 
-const isDisabled = ref(false)
-const managerStore = useComfyManagerStore()
-
-// Watch the installedPacks object directly (which gets updated from WebSocket)
-whenever(
-  () => managerStore.installedPacksIds,
-  () => {
-    const isInstalled = isPackInstalled(nodePack?.id)
-    isDisabled.value = isInstalled && !isPackEnabled(nodePack?.id)
-
-    // Update isInstalling state after installation is complete
-    if (isInstalling.value && isInstalled) isInstalling.value = false
-  }
+const isInstalled = computed(() => isPackInstalled(nodePack?.id))
+const isDisabled = computed(
+  () => isInstalled.value && !isPackEnabled(nodePack?.id)
 )
 
+whenever(isInstalled, () => (isInstalling.value = false))
+
 const nodesCount = computed(() =>
   isMergedNodePack(nodePack) ? nodePack.comfy_nodes?.length : undefined
 )

src/components/dialog/content/manager/registrySearchBar/RegistrySearchBar.vue

@@ -33,10 +33,6 @@
         :node-packs="missingNodePacks"
         :label="$t('manager.installAllMissingNodes')"
       />
-      <PackUpdateButton
-        v-if="isUpdateAvailableTab && hasUpdateAvailable"
-        :node-packs="updateAvailableNodePacks"
-      />
     </div>
     <div class="flex mt-3 text-sm">
       <div class="flex gap-6 ml-1">
@@ -69,10 +65,8 @@ import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
-import PackUpdateButton from '@/components/dialog/content/manager/button/PackUpdateButton.vue'
 import SearchFilterDropdown from '@/components/dialog/content/manager/registrySearchBar/SearchFilterDropdown.vue'
 import { useMissingNodes } from '@/composables/nodePack/useMissingNodes'
-import { useUpdateAvailableNodes } from '@/composables/nodePack/useUpdateAvailableNodes'
 import {
   type SearchOption,
   SortableAlgoliaField
@@ -89,7 +83,6 @@ const { searchResults, sortOptions } = defineProps<{
   suggestions?: QuerySuggestion[]
   sortOptions?: SortableField[]
   isMissingTab?: boolean
-  isUpdateAvailableTab?: boolean
 }>()
 
 const searchQuery = defineModel<string>('searchQuery')
@@ -103,10 +96,6 @@ const { t } = useI18n()
 // Get missing node packs from workflow with loading and error states
 const { missingNodePacks, isLoading, error } = useMissingNodes()
 
-// Use the composable to get update available nodes
-const { hasUpdateAvailable, updateAvailableNodePacks } =
-  useUpdateAvailableNodes()
-
 const hasResults = computed(
   () => searchQuery.value?.trim() && searchResults?.length
 )

src/components/dialog/footer/ManagerProgressFooter.vue

@@ -1,44 +1,41 @@
 <template>
   <div
-    class="w-full px-6 py-2 shadow-lg flex items-center justify-between"
+    class="w-full px-6 py-4 shadow-lg flex items-center justify-between"
     :class="{
       'rounded-t-none': progressDialogContent.isExpanded,
       'rounded-lg': !progressDialogContent.isExpanded
     }"
   >
-    <div class="flex items-center text-base leading-none">
+    <div class="justify-center text-sm font-bold leading-none">
       <div class="flex items-center">
         <template v-if="isInProgress">
-          <DotSpinner duration="1s" class="mr-2" />
-          <span>{{ currentTaskName }}</span>
-        </template>
-        <template v-else-if="isRestartCompleted">
-          <span class="mr-2">🎉</span>
+          <i class="pi pi-spin pi-spinner mr-2 text-3xl" />
           <span>{{ currentTaskName }}</span>
         </template>
         <template v-else>
-          <span class="mr-2">✅</span>
-          <span>{{ $t('manager.restartToApplyChanges') }}</span>
+          <i class="pi pi-check-circle mr-2 text-green-500" />
+          <span class="leading-none">{{
+            $t('manager.restartToApplyChanges')
+          }}</span>
         </template>
       </div>
     </div>
     <div class="flex items-center gap-4">
-      <span v-if="isInProgress" class="text-sm text-neutral-700">
-        {{ completedTasksCount }} {{ $t('g.progressCountOf') }}
+      <span v-if="isInProgress" class="text-xs font-bold text-neutral-600">
+        {{ comfyManagerStore.uncompletedCount }} {{ $t('g.progressCountOf') }}
         {{ comfyManagerStore.taskLogs.length }}
       </span>
       <div class="flex items-center">
         <Button
-          v-if="!isInProgress && !isRestartCompleted"
+          v-if="!isInProgress"
           rounded
           outlined
-          class="mr-4 rounded-md border-2 px-3 text-neutral-600 border-neutral-900 hover:bg-neutral-100 !dark-theme:bg-transparent dark-theme:text-white dark-theme:border-white dark-theme:hover:bg-neutral-800"
+          class="px-4 py-2 rounded-md mr-4"
           @click="handleRestart"
         >
-          {{ $t('manager.applyChanges') }}
+          {{ $t('g.restart') }}
         </Button>
         <Button
-          v-else-if="!isRestartCompleted"
           :icon="
             progressDialogContent.isExpanded
               ? 'pi pi-chevron-up'
@@ -47,7 +44,6 @@
           text
           rounded
           size="small"
-          class="font-bold"
           severity="secondary"
           :aria-label="progressDialogContent.isExpanded ? 'Collapse' : 'Expand'"
           @click.stop="progressDialogContent.toggle"
@@ -57,7 +53,6 @@
           text
           rounded
           size="small"
-          class="font-bold"
           severity="secondary"
           aria-label="Close"
           @click.stop="closeDialog"
@@ -70,10 +65,9 @@
 <script setup lang="ts">
 import { useEventListener } from '@vueuse/core'
 import Button from 'primevue/button'
-import { computed, ref } from 'vue'
+import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import DotSpinner from '@/components/common/DotSpinner.vue'
 import { api } from '@/scripts/api'
 import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useWorkflowService } from '@/services/workflowService'
@@ -83,93 +77,41 @@ import {
 } from '@/stores/comfyManagerStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useDialogStore } from '@/stores/dialogStore'
-import { useSettingStore } from '@/stores/settingStore'
 
 const { t } = useI18n()
 const dialogStore = useDialogStore()
 const progressDialogContent = useManagerProgressDialogStore()
 const comfyManagerStore = useComfyManagerStore()
-const settingStore = useSettingStore()
 
-// State management for restart process
-const isRestarting = ref<boolean>(false)
-const isRestartCompleted = ref<boolean>(false)
-
-const isInProgress = computed(
-  () => comfyManagerStore.isProcessingTasks || isRestarting.value
-)
-
-const completedTasksCount = computed(() => {
-  return (
-    comfyManagerStore.succeededTasksIds.length +
-    comfyManagerStore.failedTasksIds.length
-  )
-})
+const isInProgress = computed(() => comfyManagerStore.uncompletedCount > 0)
 
 const closeDialog = () => {
   dialogStore.closeDialog({ key: 'global-manager-progress-dialog' })
 }
 
-const fallbackTaskName = t('manager.installingDependencies')
+const fallbackTaskName = t('g.installing')
 const currentTaskName = computed(() => {
-  if (isRestarting.value) {
-    return t('manager.restartingBackend')
-  }
-  if (isRestartCompleted.value) {
-    return t('manager.extensionsSuccessfullyInstalled')
-  }
   if (!comfyManagerStore.taskLogs.length) return fallbackTaskName
   const task = comfyManagerStore.taskLogs.at(-1)
   return task?.taskName ?? fallbackTaskName
 })
 
 const handleRestart = async () => {
-  // Store original toast setting value
-  const originalToastSetting = settingStore.get(
-    'Comfy.Toast.DisableReconnectingToast'
-  )
+  const onReconnect = async () => {
+    // Refresh manager state
 
-  try {
-    await settingStore.set('Comfy.Toast.DisableReconnectingToast', true)
+    comfyManagerStore.clearLogs()
+    comfyManagerStore.setStale()
 
-    isRestarting.value = true
+    // Refresh node definitions
+    await useCommandStore().execute('Comfy.RefreshNodeDefinitions')
 
-    const onReconnect = async () => {
-      try {
-        comfyManagerStore.setStale()
-
-        await useCommandStore().execute('Comfy.RefreshNodeDefinitions')
-
-        await useWorkflowService().reloadCurrentWorkflow()
-      } finally {
-        await settingStore.set(
-          'Comfy.Toast.DisableReconnectingToast',
-          originalToastSetting
-        )
-
-        isRestarting.value = false
-        isRestartCompleted.value = true
-
-        setTimeout(() => {
-          closeDialog()
-          comfyManagerStore.resetTaskState()
-        }, 3000)
-      }
-    }
-
-    useEventListener(api, 'reconnected', onReconnect, { once: true })
-
-    await useComfyManagerService().rebootComfyUI()
-  } catch (error) {
-    // If restart fails, restore settings and reset state
-    await settingStore.set(
-      'Comfy.Toast.DisableReconnectingToast',
-      originalToastSetting
-    )
-    isRestarting.value = false
-    isRestartCompleted.value = false
-    closeDialog() // Close dialog on error
-    throw error
+    // Reload workflow
+    await useWorkflowService().reloadCurrentWorkflow()
   }
+  useEventListener(api, 'reconnected', onReconnect, { once: true })
+
+  await useComfyManagerService().rebootComfyUI()
+  closeDialog()
 }
 </script>

src/components/dialog/header/ManagerProgressHeader.vue

@@ -18,40 +18,16 @@
 
 <script setup lang="ts">
 import TabMenu from 'primevue/tabmenu'
-import { computed } from 'vue'
+import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import {
-  useComfyManagerStore,
-  useManagerProgressDialogStore
-} from '@/stores/comfyManagerStore'
+import { useManagerProgressDialogStore } from '@/stores/comfyManagerStore'
 
 const progressDialogContent = useManagerProgressDialogStore()
-const comfyManagerStore = useComfyManagerStore()
-const activeTabIndex = computed({
-  get: () => progressDialogContent.getActiveTabIndex(),
-  set: (value: number) => progressDialogContent.setActiveTabIndex(value)
-})
+const activeTabIndex = ref(0)
 const { t } = useI18n()
-
-const failedCount = computed(() => comfyManagerStore.failedTasksIds.length)
-
-const queueSuffix = computed(() => {
-  const queueLength = comfyManagerStore.managerQueue.queueLength
-  if (queueLength === 0) {
-    return ''
-  }
-  return ` (${queueLength})`
-})
-const failedSuffix = computed(() => {
-  if (failedCount.value === 0) {
-    return ''
-  }
-  return ` (${failedCount.value})`
-})
-
-const tabs = computed(() => [
-  { label: t('manager.installationQueue') + queueSuffix.value },
-  { label: t('manager.failed') + failedSuffix.value }
-])
+const tabs = [
+  { label: t('manager.installationQueue') },
+  { label: t('manager.failed', { count: 0 }) }
+]
 </script>

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,37 @@ import { useDomWidgetStore } from '@/stores/domWidgetStore'
 import { useCanvasStore } from '@/stores/graphStore'
 
 const domWidgetStore = useDomWidgetStore()
-const widgetStates = computed(() => domWidgetStore.activeWidgetStates)
+
+const widgetStates = computed(() => {
+  return [
+    ...domWidgetStore.activeWidgetStates,
+    ...domWidgetStore.inactiveWidgetStates
+  ]
+})
 
 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
+
+    // Use containerNode for promoted widgets, otherwise use widget.node
+    const node = widget.containerNode || widget.node
 
     const visible =
+      node &&
+      currentGraph?.nodes.includes(node) &&
       lgCanvas.isNodeVisible(node) &&
       !(widget.options.hideOnZoom && lowQuality) &&
       widget.isVisible()
 
-    widgetState.visible = visible
-    if (visible) {
+    widgetState.visible = visible ?? false
+
+    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

@@ -72,7 +72,6 @@ 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'
@@ -192,22 +191,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

src/components/graph/widgets/DomWidget.vue

@@ -61,10 +61,15 @@ 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
+  // Use containerNode for promoted widgets, otherwise use widget.node
+  const positioningNode = widget.containerNode || widget.node
+  const isSelected = selectedNode === positioningNode
   const renderArea = selectedNode?.renderArea
   const offset = lgCanvas.ds.offset
   const scale = lgCanvas.ds.scale
@@ -143,11 +148,28 @@ if (isDOMWidget(widget)) {
 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
+onMounted(() => {
+  mountElementIfVisible()
 })
+
+// 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,8 +217,7 @@ defineExpose({
   display: flex;
   flex-direction: column;
   gap: 24px;
-  max-height: 80vh;
-  overflow-y: auto;
+  overflow: hidden;
   padding: 32px 32px 24px;
   border-radius: 12px;
 }

src/composables/nodePack/useUpdateAvailableNodes.ts

@@ -1,65 +0,0 @@
-import { computed, onMounted } from 'vue'
-
-import { useInstalledPacks } from '@/composables/nodePack/useInstalledPacks'
-import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import type { components } from '@/types/comfyRegistryTypes'
-import { compareVersions, isSemVer } from '@/utils/formatUtil'
-
-/**
- * Composable to find NodePacks that have updates available
- * Uses the same filtering approach as ManagerDialogContent.vue
- * Automatically fetches installed pack data when initialized
- */
-export const useUpdateAvailableNodes = () => {
-  const comfyManagerStore = useComfyManagerStore()
-  const { installedPacks, isLoading, error, startFetchInstalled } =
-    useInstalledPacks()
-
-  // Check if a pack has updates available (same logic as usePackUpdateStatus)
-  const isOutdatedPack = (pack: components['schemas']['Node']) => {
-    const isInstalled = comfyManagerStore.isPackInstalled(pack?.id)
-    if (!isInstalled) return false
-
-    const installedVersion = comfyManagerStore.getInstalledPackVersion(
-      pack.id ?? ''
-    )
-    const latestVersion = pack.latest_version?.version
-
-    const isNightlyPack = !!installedVersion && !isSemVer(installedVersion)
-
-    if (isNightlyPack || !latestVersion) {
-      return false
-    }
-
-    return compareVersions(latestVersion, installedVersion) > 0
-  }
-
-  // Same filtering logic as ManagerDialogContent.vue
-  const filterOutdatedPacks = (packs: components['schemas']['Node'][]) =>
-    packs.filter(isOutdatedPack)
-
-  // Filter only outdated packs from installed packs
-  const updateAvailableNodePacks = computed(() => {
-    if (!installedPacks.value.length) return []
-    return filterOutdatedPacks(installedPacks.value)
-  })
-
-  // Check if there are any outdated packs
-  const hasUpdateAvailable = computed(() => {
-    return updateAvailableNodePacks.value.length > 0
-  })
-
-  // Automatically fetch installed pack data when composable is used
-  onMounted(async () => {
-    if (!installedPacks.value.length && !isLoading.value) {
-      await startFetchInstalled()
-    }
-  })
-
-  return {
-    updateAvailableNodePacks,
-    hasUpdateAvailable,
-    isLoading,
-    error
-  }
-}

src/composables/nodePack/useWorkflowPacks.ts

@@ -7,7 +7,7 @@ import { app } from '@/scripts/app'
 import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useSystemStatsStore } from '@/stores/systemStatsStore'
-import { UseNodePacksOptions } from '@/types/comfyManagerTypes'
+import { SelectedVersion, UseNodePacksOptions } from '@/types/comfyManagerTypes'
 import type { components } from '@/types/comfyRegistryTypes'
 
 type WorkflowPack = {
@@ -65,7 +65,8 @@ export const useWorkflowPacks = (options: UseNodePacksOptions = {}) => {
       return {
         id: CORE_NODES_PACK_NAME,
         version:
-          systemStatsStore.systemStats?.system?.comfyui_version ?? 'nightly'
+          systemStatsStore.systemStats?.system?.comfyui_version ??
+          SelectedVersion.NIGHTLY
       }
     }
 
@@ -75,7 +76,7 @@ export const useWorkflowPacks = (options: UseNodePacksOptions = {}) => {
     if (pack) {
       return {
         id: pack.id,
-        version: pack.latest_version?.version ?? 'nightly'
+        version: pack.latest_version?.version ?? SelectedVersion.NIGHTLY
       }
     }
 

src/composables/useBrowserTabTitle.ts

@@ -1,6 +1,7 @@
 import { useTitle } from '@vueuse/core'
 import { computed } from 'vue'
 
+import { t } from '@/i18n'
 import { useExecutionStore } from '@/stores/executionStore'
 import { useSettingStore } from '@/stores/settingStore'
 import { useWorkflowStore } from '@/stores/workflowStore'
@@ -36,11 +37,34 @@ export const useBrowserTabTitle = () => {
       : DEFAULT_TITLE
   })
 
-  const nodeExecutionTitle = computed(() =>
-    executionStore.executingNode && executionStore.executingNodeProgress
-      ? `${executionText.value}[${Math.round(executionStore.executingNodeProgress * 100)}%] ${executionStore.executingNode.type}`
-      : ''
-  )
+  const nodeExecutionTitle = computed(() => {
+    // Check if any nodes are in progress
+    const nodeProgressEntries = Object.entries(
+      executionStore.nodeProgressStates
+    )
+    const runningNodes = nodeProgressEntries.filter(
+      ([_, state]) => state.state === 'running'
+    )
+
+    if (runningNodes.length === 0) {
+      return ''
+    }
+
+    // If multiple nodes are running
+    if (runningNodes.length > 1) {
+      return `${executionText.value}[${runningNodes.length} ${t('g.nodesRunning', 'nodes running')}]`
+    }
+
+    // If only one node is running
+    const [nodeId, state] = runningNodes[0]
+    const progress = Math.round((state.value / state.max) * 100)
+    const nodeType =
+      executionStore.activePrompt?.workflow?.changeTracker?.activeState?.nodes.find(
+        (n) => String(n.id) === nodeId
+      )?.type || 'Node'
+
+    return `${executionText.value}[${progress}%] ${nodeType}`
+  })
 
   const workflowTitle = computed(
     () =>

src/composables/useCoreCommands.ts

@@ -15,11 +15,10 @@ import { t } from '@/i18n'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { addFluxKontextGroupNode } from '@/scripts/fluxKontextEditNode'
-import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useDialogService } from '@/services/dialogService'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useWorkflowService } from '@/services/workflowService'
-import { type ComfyCommand, useCommandStore } from '@/stores/commandStore'
+import type { ComfyCommand } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
 import { useCanvasStore, useTitleEditorStore } from '@/stores/graphStore'
 import { useQueueSettingsStore, useQueueStore } from '@/stores/queueStore'
@@ -30,7 +29,6 @@ import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { ManagerTab } from '@/types/comfyManagerTypes'
 
 const moveSelectedNodesVersionAdded = '1.22.2'
 
@@ -662,54 +660,12 @@ export function useCoreCommands(): ComfyCommand[] {
       }
     },
     {
-      id: 'Comfy.Manager.CustomNodesManager.ShowCustomNodesMenu',
-      icon: 'pi pi-objects-column',
-      label: 'Custom Nodes Manager',
+      id: 'Comfy.Manager.CustomNodesManager',
+      icon: 'pi pi-puzzle',
+      label: 'Toggle the Custom Nodes Manager',
       versionAdded: '1.12.10',
-      function: async () => {
-        const { is_legacy_manager_ui } =
-          (await useComfyManagerService().isLegacyManagerUI()) ?? {}
-
-        if (is_legacy_manager_ui === true) {
-          try {
-            await useCommandStore().execute(
-              'Comfy.Manager.Menu.ToggleVisibility' // This command is registered by legacy manager FE extension
-            )
-          } catch (error) {
-            console.error('error', error)
-            useToastStore().add({
-              severity: 'error',
-              summary: t('g.error'),
-              detail: t('manager.legacyMenuNotAvailable'),
-              life: 3000
-            })
-            dialogService.showManagerDialog()
-          }
-        } else {
-          dialogService.showManagerDialog()
-        }
-      }
-    },
-    {
-      id: 'Comfy.Manager.ShowUpdateAvailablePacks',
-      icon: 'pi pi-sync',
-      label: 'Check for Custom Node Updates',
-      versionAdded: '1.17.0',
       function: () => {
-        dialogService.showManagerDialog({
-          initialTab: ManagerTab.UpdateAvailable
-        })
-      }
-    },
-    {
-      id: 'Comfy.Manager.ShowMissingPacks',
-      icon: 'pi pi-exclamation-circle',
-      label: 'Install Missing Custom Nodes',
-      versionAdded: '1.17.0',
-      function: () => {
-        dialogService.showManagerDialog({
-          initialTab: ManagerTab.Missing
-        })
+        dialogService.toggleManagerDialog()
       }
     },
     {
@@ -798,88 +754,9 @@ export function useCoreCommands(): ComfyCommand[] {
           })
           return
         }
-
         const { node } = res
         canvas.select(node)
       }
-    },
-    {
-      id: 'Comfy.Manager.CustomNodesManager.ShowLegacyCustomNodesMenu',
-      icon: 'pi pi-bars',
-      label: 'Custom Nodes (Legacy)',
-      versionAdded: '1.16.4',
-      function: async () => {
-        try {
-          await useCommandStore().execute(
-            'Comfy.Manager.CustomNodesManager.ToggleVisibility'
-          )
-        } catch (error) {
-          useToastStore().add({
-            severity: 'error',
-            summary: t('g.error'),
-            detail: t('manager.legacyMenuNotAvailable'),
-            life: 3000
-          })
-        }
-      }
-    },
-    {
-      id: 'Comfy.Manager.ShowLegacyManagerMenu',
-      icon: 'mdi mdi-puzzle',
-      label: 'Manager Menu (Legacy)',
-      versionAdded: '1.16.4',
-      function: async () => {
-        try {
-          await useCommandStore().execute('Comfy.Manager.Menu.ToggleVisibility')
-        } catch (error) {
-          useToastStore().add({
-            severity: 'error',
-            summary: t('g.error'),
-            detail: t('manager.legacyMenuNotAvailable'),
-            life: 3000
-          })
-        }
-      }
-    },
-    {
-      id: 'Comfy.Memory.UnloadModels',
-      icon: 'mdi mdi-vacuum-outline',
-      label: 'Unload Models',
-      versionAdded: '1.16.4',
-      function: async () => {
-        if (!useSettingStore().get('Comfy.Memory.AllowManualUnload')) {
-          useToastStore().add({
-            severity: 'error',
-            summary: t('g.error'),
-            detail: t('g.commandProhibited', {
-              command: 'Comfy.Memory.UnloadModels'
-            }),
-            life: 3000
-          })
-          return
-        }
-        await api.freeMemory({ freeExecutionCache: false })
-      }
-    },
-    {
-      id: 'Comfy.Memory.UnloadModelsAndExecutionCache',
-      icon: 'mdi mdi-vacuum-outline',
-      label: 'Unload Models and Execution Cache',
-      versionAdded: '1.16.4',
-      function: async () => {
-        if (!useSettingStore().get('Comfy.Memory.AllowManualUnload')) {
-          useToastStore().add({
-            severity: 'error',
-            summary: t('g.error'),
-            detail: t('g.commandProhibited', {
-              command: 'Comfy.Memory.UnloadModelsAndExecutionCache'
-            }),
-            life: 3000
-          })
-          return
-        }
-        await api.freeMemory({ freeExecutionCache: true })
-      }
     }
   ]
 

src/composables/useManagerQueue.ts

@@ -1,145 +1,101 @@
 import { useEventListener, whenever } from '@vueuse/core'
-import { pickBy } from 'lodash'
-import { Ref, computed, ref } from 'vue'
+import { computed, readonly, ref } from 'vue'
 
-import { app } from '@/scripts/app'
-import { useDialogService } from '@/services/dialogService'
-import { components } from '@/types/generatedManagerTypes'
+import { api } from '@/scripts/api'
+import { ManagerWsQueueStatus } from '@/types/comfyManagerTypes'
 
-type ManagerTaskHistory = Record<
-  string,
-  components['schemas']['TaskHistoryItem']
->
-type ManagerTaskQueue = components['schemas']['TaskStateMessage']
-type ManagerWsTaskDoneMsg = components['schemas']['MessageTaskDone']
-type ManagerWsTaskStartedMsg = components['schemas']['MessageTaskStarted']
-type QueueTaskItem = components['schemas']['QueueTaskItem']
-type HistoryTaskItem = components['schemas']['TaskHistoryItem']
-type Task = QueueTaskItem | HistoryTaskItem
+type QueuedTask<T> = {
+  task: () => Promise<T>
+  onComplete?: () => void
+}
 
-const MANAGER_WS_TASK_DONE_NAME = 'cm-task-completed'
-const MANAGER_WS_TASK_STARTED_NAME = 'cm-task-started'
+const MANAGER_WS_MSG_TYPE = 'cm-queue-status'
 
-export const useManagerQueue = (
-  taskHistory: Ref<ManagerTaskHistory>,
-  taskQueue: Ref<ManagerTaskQueue>,
-  installedPacks: Ref<Record<string, any>>
-) => {
-  const { showManagerProgressDialog } = useDialogService()
-
-  // Task queue state (read-only from server)
-  const maxHistoryItems = ref(64)
-  const isLoading = ref(false)
-  const isProcessing = ref(false)
-
-  // Computed values
-  const currentQueueLength = computed(
-    () =>
-      taskQueue.value.running_queue.length +
-      taskQueue.value.pending_queue.length
+export const useManagerQueue = () => {
+  const clientQueueItems = ref<QueuedTask<unknown>[]>([])
+  const clientQueueLength = computed(() => clientQueueItems.value.length)
+  const onCompletedQueue = ref<((() => void) | undefined)[]>([])
+  const onCompleteWaitingCount = ref(0)
+  const uncompletedCount = computed(
+    () => clientQueueLength.value + onCompleteWaitingCount.value
   )
 
-  /**
-   * Update the processing state based on the current queue length.
-   * If the queue is empty, or all tasks in the queue are associated
-   * with different clients, then this client is not processing any tasks.
-   */
-  const updateProcessingState = (): void => {
-    isProcessing.value = currentQueueLength.value > 0
-  }
+  const serverQueueStatus = ref<ManagerWsQueueStatus>(ManagerWsQueueStatus.DONE)
+  const isServerIdle = computed(
+    () => serverQueueStatus.value === ManagerWsQueueStatus.DONE
+  )
 
-  const allTasksDone = computed(() => currentQueueLength.value === 0)
-  const historyCount = computed(() => Object.keys(taskHistory.value).length)
+  const allTasksDone = computed(
+    () => isServerIdle.value && clientQueueLength.value === 0
+  )
+  const nextTaskReady = computed(
+    () => isServerIdle.value && clientQueueLength.value > 0
+  )
 
-  /**
-   * Check if a task is associated with this client.
-   * Task can be from running queue, pending queue, or history.
-   * @param task - The task to check
-   * @returns True if the task belongs to this client
-   */
-  const isTaskFromThisClient = (task: Task): boolean =>
-    task.client_id === app.api.clientId
-
-  /**
-   * Filter queue tasks by client id.
-   * Ensures that only tasks associated with this client are processed and
-   * added to client state.
-   * @param tasks - Array of queue tasks to filter
-   * @returns Filtered array containing only tasks from this client
-   */
-  const filterQueueByClientId = (tasks: QueueTaskItem[]): QueueTaskItem[] =>
-    tasks.filter(isTaskFromThisClient)
-
-  /**
-   * Filter history tasks by client id using lodash pickBy for optimal performance.
-   * Returns a new object containing only tasks associated with this client.
-   * @param history - The history object to filter
-   * @returns Filtered history object containing only tasks from this client
-   */
-  const filterHistoryByClientId = (history: ManagerTaskHistory) =>
-    pickBy(history, isTaskFromThisClient)
-
-  /**
-   * Update task queue and history state with filtered data from server.
-   * Ensures only tasks from this client are stored in local state.
-   * @param state - The task state message from the server
-   */
-  const updateTaskState = (state: ManagerTaskQueue) => {
-    taskQueue.value.running_queue = filterQueueByClientId(state.running_queue)
-    taskQueue.value.pending_queue = filterQueueByClientId(state.pending_queue)
-    taskHistory.value = filterHistoryByClientId(state.history)
-
-    if (state.installed_packs) {
-      installedPacks.value = state.installed_packs
-    }
-    updateProcessingState()
-  }
-
-  // WebSocket event listener for task done
-  const cleanupTaskDoneListener = useEventListener(
-    app.api,
-    MANAGER_WS_TASK_DONE_NAME,
-    (event: CustomEvent<ManagerWsTaskDoneMsg>) => {
-      if (event?.type === MANAGER_WS_TASK_DONE_NAME) {
-        const { state } = event.detail
-        updateTaskState(state)
+  const cleanupListener = useEventListener(
+    api,
+    MANAGER_WS_MSG_TYPE,
+    (event: CustomEvent<{ status: ManagerWsQueueStatus }>) => {
+      if (event?.type === MANAGER_WS_MSG_TYPE && event.detail?.status) {
+        serverQueueStatus.value = event.detail.status
       }
     }
   )
 
-  // WebSocket event listener for task started
-  const cleanupTaskStartedListener = useEventListener(
-    app.api,
-    MANAGER_WS_TASK_STARTED_NAME,
-    (event: CustomEvent<ManagerWsTaskStartedMsg>) => {
-      if (event?.type === MANAGER_WS_TASK_STARTED_NAME) {
-        const { state } = event.detail
-        updateTaskState(state)
+  const startNextTask = () => {
+    const nextTask = clientQueueItems.value.shift()
+    if (!nextTask) return
+
+    const { task, onComplete } = nextTask
+    if (onComplete) {
+      // Set the task's onComplete to be executed the next time the server is idle
+      onCompletedQueue.value.push(onComplete)
+      onCompleteWaitingCount.value++
+    }
+
+    task().catch((e) => {
+      const message = `Error enqueuing task for ComfyUI Manager: ${e}`
+      console.error(message)
+    })
+  }
+
+  const enqueueTask = <T>(task: QueuedTask<T>): void => {
+    clientQueueItems.value.push(task)
+  }
+
+  const clearQueue = () => {
+    clientQueueItems.value = []
+    onCompletedQueue.value = []
+    onCompleteWaitingCount.value = 0
+  }
+
+  const cleanup = () => {
+    clearQueue()
+    cleanupListener()
+  }
+
+  whenever(nextTaskReady, startNextTask)
+  whenever(isServerIdle, () => {
+    if (onCompletedQueue.value?.length) {
+      while (
+        onCompleteWaitingCount.value > 0 &&
+        onCompletedQueue.value.length > 0
+      ) {
+        const onComplete = onCompletedQueue.value.shift()
+        onComplete?.()
+        onCompleteWaitingCount.value--
       }
     }
-  )
-
-  whenever(currentQueueLength, () => showManagerProgressDialog())
-
-  const stopListening = () => {
-    cleanupTaskDoneListener()
-    cleanupTaskStartedListener()
-  }
+  })
 
   return {
-    // Queue state (read-only from server)
-    taskHistory,
-    taskQueue,
-    maxHistoryItems,
-    isLoading,
-
-    // Computed state
     allTasksDone,
-    isProcessing,
-    queueLength: currentQueueLength,
-    historyCount,
+    statusMessage: readonly(serverQueueStatus),
+    queueLength: clientQueueLength,
+    uncompletedCount,
 
-    // Actions
-    stopListening
+    enqueueTask,
+    clearQueue,
+    cleanup
   }
 }

src/composables/useServerLogs.ts

@@ -1,34 +1,24 @@
 import { useEventListener } from '@vueuse/core'
-import { ref } from 'vue'
+import { onUnmounted, ref } from 'vue'
 
 import { LogsWsMessage } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
-import { components } from '@/types/generatedManagerTypes'
 
 const LOGS_MESSAGE_TYPE = 'logs'
-const MANAGER_WS_TASK_DONE_NAME = 'cm-task-completed'
-const MANAGER_WS_TASK_STARTED_NAME = 'cm-task-started'
-
-type ManagerWsTaskDoneMsg = components['schemas']['MessageTaskDone']
-type ManagerWsTaskStartedMsg = components['schemas']['MessageTaskStarted']
 
 interface UseServerLogsOptions {
-  ui_id: string
   immediate?: boolean
   messageFilter?: (message: string) => boolean
 }
 
-export const useServerLogs = (options: UseServerLogsOptions) => {
+export const useServerLogs = (options: UseServerLogsOptions = {}) => {
   const {
     immediate = false,
     messageFilter = (msg: string) => Boolean(msg.trim())
   } = options
 
   const logs = ref<string[]>([])
-  const isTaskStarted = ref(false)
-  let stopLogs: ReturnType<typeof useEventListener> | null = null
-  let stopTaskDone: ReturnType<typeof useEventListener> | null = null
-  let stopTaskStarted: ReturnType<typeof useEventListener> | null = null
+  let stop: ReturnType<typeof useEventListener> | null = null
 
   const isValidLogEvent = (event: CustomEvent<LogsWsMessage>) =>
     event?.type === LOGS_MESSAGE_TYPE && event.detail?.entries?.length > 0
@@ -37,81 +27,34 @@ export const useServerLogs = (options: UseServerLogsOptions) => {
     event.detail.entries.map((e) => e.m).filter(messageFilter)
 
   const handleLogMessage = (event: CustomEvent<LogsWsMessage>) => {
-    // Only capture logs if this task has started
-    if (!isTaskStarted.value) return
-
     if (isValidLogEvent(event)) {
-      const messages = parseLogMessage(event)
-      if (messages.length > 0) {
-        logs.value.push(...messages)
-      }
+      logs.value.push(...parseLogMessage(event))
     }
   }
 
-  const handleTaskStarted = (event: CustomEvent<ManagerWsTaskStartedMsg>) => {
-    if (event?.type === MANAGER_WS_TASK_STARTED_NAME) {
-      // Check if this is our task starting
-      const isOurTask = event.detail.ui_id === options.ui_id
-      if (isOurTask) {
-        isTaskStarted.value = true
-        void stopTaskStarted?.()
-      }
-    }
-  }
-
-  const handleTaskDone = (event: CustomEvent<ManagerWsTaskDoneMsg>) => {
-    if (event?.type === MANAGER_WS_TASK_DONE_NAME) {
-      const { state } = event.detail
-      // Check if our task is now in the history (completed)
-      const isOurTaskDone = state.history[options.ui_id]
-      if (isOurTaskDone) {
-        isTaskStarted.value = false
-        void stopListening()
-      }
-    }
-  }
-
-  const startListening = async () => {
+  const start = async () => {
     await api.subscribeLogs(true)
-    stopLogs = useEventListener(api, LOGS_MESSAGE_TYPE, handleLogMessage)
-    stopTaskStarted = useEventListener(
-      api,
-      MANAGER_WS_TASK_STARTED_NAME,
-      handleTaskStarted
-    )
-    stopTaskDone = useEventListener(
-      api,
-      MANAGER_WS_TASK_DONE_NAME,
-      handleTaskDone
-    )
+    stop = useEventListener(api, LOGS_MESSAGE_TYPE, handleLogMessage)
   }
 
   const stopListening = async () => {
-    stopLogs?.()
-    stopTaskStarted?.()
-    stopTaskDone?.()
-    stopLogs = null
-    stopTaskStarted = null
-    stopTaskDone = null
-    // TODO: move subscribe/unsubscribe logs to useManagerQueue. Subscribe when task starts if not already subscribed.
-    // Unsubscribe ONLY when there are no tasks running or queued up and the only remaining task finishes.
-    // await api.subscribeLogs(false)
+    stop?.()
+    stop = null
+    await api.subscribeLogs(false)
   }
 
   if (immediate) {
-    void startListening()
+    void start()
   }
 
-  const cleanup = async () => {
+  onUnmounted(async () => {
     await stopListening()
     logs.value = []
-    isTaskStarted.value = false
-  }
+  })
 
   return {
     logs,
-    startListening,
-    stopListening,
-    cleanup
+    startListening: start,
+    stopListening
   }
 }

src/composables/widgets/useProgressTextWidget.ts

@@ -23,6 +23,9 @@ export const useTextPreviewWidget = (
       name: inputSpec.name,
       component: TextPreviewWidget,
       inputSpec,
+      componentProps: {
+        nodeId: node.id
+      },
       options: {
         getValue: () => widgetValue.value,
         setValue: (value: string | object) => {

src/constants/coreMenuCommands.ts

@@ -11,24 +11,9 @@ export const CORE_MENU_COMMANDS = [
     ]
   ],
   [['Edit'], ['Comfy.Undo', 'Comfy.Redo']],
-  [
-    ['Edit'],
-    [
-      'Comfy.RefreshNodeDefinitions',
-      'Comfy.Memory.UnloadModels',
-      'Comfy.Memory.UnloadModelsAndExecutionCache'
-    ]
-  ],
+  [['Edit'], ['Comfy.RefreshNodeDefinitions']],
   [['Edit'], ['Comfy.ClearWorkflow']],
   [['Edit'], ['Comfy.OpenClipspace']],
-  [
-    ['Manager'],
-    [
-      'Comfy.Manager.CustomNodesManager.ShowCustomNodesMenu',
-      'Comfy.Manager.ShowMissingPacks',
-      'Comfy.Manager.ShowUpdateAvailablePacks'
-    ]
-  ],
   [
     ['Help'],
     [

src/constants/coreSettings.ts

@@ -14,13 +14,6 @@ import type { SettingParams } from '@/types/settingTypes'
  * when they are no longer needed.
  */
 export const CORE_SETTINGS: SettingParams[] = [
-  {
-    id: 'Comfy.Memory.AllowManualUnload',
-    name: 'Allow manual unload of models and execution cache via user command',
-    type: 'hidden',
-    defaultValue: true,
-    versionAdded: '1.18.0'
-  },
   {
     id: 'Comfy.Validation.Workflows',
     name: 'Validate workflows',
@@ -891,12 +884,5 @@ export const CORE_SETTINGS: SettingParams[] = [
     name: 'Release seen timestamp',
     type: 'hidden',
     defaultValue: 0
-  },
-  {
-    id: 'Comfy.Memory.AllowManualUnload',
-    name: 'Allow manual unload of models and execution cache via user command',
-    type: 'hidden',
-    defaultValue: true,
-    versionAdded: '1.18.0'
   }
 ]

src/extensions/core/groupNode.ts

@@ -15,6 +15,7 @@ import {
 } from '@/schemas/comfyWorkflowSchema'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 import { useDialogService } from '@/services/dialogService'
+import { useExecutionStore } from '@/stores/executionStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useToastStore } from '@/stores/toastStore'
 import { useWidgetStore } from '@/stores/widgetStore'
@@ -1224,9 +1225,10 @@ export class GroupNodeHandler {
     node.onDrawForeground = function (ctx) {
       // @ts-expect-error fixme ts strict error
       onDrawForeground?.apply?.(this, arguments)
+      const progressState = useExecutionStore().nodeProgressStates[this.id]
       if (
-        // @ts-expect-error fixme ts strict error
-        +app.runningNodeId === this.id &&
+        progressState &&
+        progressState.state === 'running' &&
         this.runningInternalNodeId !== null
       ) {
         // @ts-expect-error fixme ts strict error
@@ -1340,6 +1342,7 @@ export class GroupNodeHandler {
     this.node.onRemoved = function () {
       // @ts-expect-error fixme ts strict error
       onRemoved?.apply(this, arguments)
+      // api.removeEventListener('progress_state', progress_state)
       api.removeEventListener('executing', executing)
       api.removeEventListener('executed', executed)
     }

src/locales/en/commands.json

@@ -152,14 +152,8 @@
   "Comfy_LoadDefaultWorkflow": {
     "label": "Load Default Workflow"
   },
-  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
-    "label": "Custom Nodes Manager"
-  },
-  "Comfy_Manager_ShowMissingPacks": {
-    "label": "Install Missing"
-  },
-  "Comfy_Manager_ShowUpdateAvailablePacks": {
-    "label": "Check for Updates"
+  "Comfy_Manager_CustomNodesManager": {
+    "label": "Toggle the Custom Nodes Manager"
   },
   "Comfy_Manager_ToggleManagerProgressDialog": {
     "label": "Toggle the Custom Nodes Manager Progress Bar"
@@ -167,12 +161,6 @@
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Open Mask Editor for Selected Node"
   },
-  "Comfy_Memory_UnloadModels": {
-    "label": "Unload Models"
-  },
-  "Comfy_Memory_UnloadModelsAndExecutionCache": {
-    "label": "Unload Models and Execution Cache"
-  },
   "Comfy_NewBlankWorkflow": {
     "label": "New Blank Workflow"
   },

src/locales/en/main.json

@@ -134,13 +134,10 @@
     "releaseTitle": "{package} {version} Release",
     "progressCountOf": "of",
     "keybindingAlreadyExists": "Keybinding already exists on",
-    "commandProhibited": "Command {command} is prohibited. Contact an administrator for more information."
+    "nodesRunning": "nodes running"
   },
   "manager": {
     "title": "Custom Nodes Manager",
-    "legacyMenuNotAvailable": "Legacy manager menu is not available, defaulting to the new manager menu.",
-    "legacyManagerUI": "Use Legacy UI",
-    "legacyManagerUIDescription": "To use the legacy Manager UI, start ComfyUI with --enable-manager-legacy-ui",
     "failed": "Failed ({count})",
     "noNodesFound": "No nodes found",
     "noNodesFoundDescription": "The pack's nodes either could not be parsed, or the pack is a frontend extension only and doesn't have any nodes.",
@@ -917,7 +914,6 @@
   "menuLabels": {
     "Workflow": "Workflow",
     "Edit": "Edit",
-    "Manager": "Manager",
     "Help": "Help",
     "Check for Updates": "Check for Updates",
     "Open Custom Nodes Folder": "Open Custom Nodes Folder",
@@ -973,14 +969,6 @@
     "Toggle the Custom Nodes Manager": "Toggle the Custom Nodes Manager",
     "Toggle the Custom Nodes Manager Progress Bar": "Toggle the Custom Nodes Manager Progress Bar",
     "Open Mask Editor for Selected Node": "Open Mask Editor for Selected Node",
-    "Custom Nodes (Beta)": "Custom Nodes (Beta)",
-    "Custom Nodes (Legacy)": "Custom Nodes (Legacy)",
-    "Manager Menu (Legacy)": "Manager Menu (Legacy)",
-    "Custom Nodes Manager": "Custom Nodes Manager",
-    "Install Missing": "Install Missing",
-    "Toggle Progress Dialog": "Toggle Progress Dialog",
-    "Unload Models": "Unload Models",
-    "Unload Models and Execution Cache": "Unload Models and Execution Cache",
     "New": "New",
     "Clipspace": "Clipspace",
     "Open": "Open",

src/locales/es/commands.json

@@ -152,14 +152,8 @@
   "Comfy_LoadDefaultWorkflow": {
     "label": "Cargar flujo de trabajo predeterminado"
   },
-  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
-    "label": "Nodos personalizados (Beta)"
-  },
-  "Comfy_Manager_ShowMissingPacks": {
-    "label": "Instalar faltantes"
-  },
-  "Comfy_Manager_ShowUpdateAvailablePacks": {
-    "label": "Buscar actualizaciones"
+  "Comfy_Manager_CustomNodesManager": {
+    "label": "Administrador de nodos personalizados"
   },
   "Comfy_Manager_ToggleManagerProgressDialog": {
     "label": "Alternar diálogo de progreso del administrador"
@@ -167,12 +161,6 @@
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Abrir editor de máscara para el nodo seleccionado"
   },
-  "Comfy_Memory_UnloadModels": {
-    "label": "Descargar modelos"
-  },
-  "Comfy_Memory_UnloadModelsAndExecutionCache": {
-    "label": "Descargar modelos y caché de ejecución"
-  },
   "Comfy_NewBlankWorkflow": {
     "label": "Nuevo flujo de trabajo en blanco"
   },

src/locales/es/main.json

@@ -270,7 +270,6 @@
     "color": "Color",
     "comingSoon": "Próximamente",
     "command": "Comando",
-    "commandProhibited": "El comando {command} está prohibido. Contacta a un administrador para más información.",
     "community": "Comunidad",
     "completed": "Completado",
     "confirm": "Confirmar",
@@ -337,6 +336,7 @@
     "noTasksFoundMessage": "No hay tareas en la cola.",
     "noWorkflowsFound": "No se encontraron flujos de trabajo.",
     "nodes": "Nodos",
+    "nodesRunning": "nodos en ejecución",
     "ok": "OK",
     "openNewIssue": "Abrir nuevo problema",
     "overwrite": "Sobrescribir",
@@ -629,9 +629,6 @@
     "installationQueue": "Cola de Instalación",
     "lastUpdated": "Última Actualización",
     "latestVersion": "Última",
-    "legacyManagerUI": "Usar UI antigua",
-    "legacyManagerUIDescription": "Para usar la UI antigua del Manager, inicia ComfyUI con --enable-manager-legacy-ui",
-    "legacyMenuNotAvailable": "El menú del administrador antiguo no está disponible en esta versión de ComfyUI. Por favor, utiliza el nuevo menú del administrador en su lugar.",
     "license": "Licencia",
     "loadingVersions": "Cargando versiones...",
     "nightlyVersion": "Nocturna",
@@ -738,7 +735,6 @@
     "Contact Support": "Contactar soporte",
     "Convert Selection to Subgraph": "Convertir selección en subgrafo",
     "Convert selected nodes to group node": "Convertir nodos seleccionados en nodo de grupo",
-    "Custom Nodes Manager": "Administrador de Nodos Personalizados",
     "Delete Selected Items": "Eliminar elementos seleccionados",
     "Desktop User Guide": "Guía de usuario de escritorio",
     "Duplicate Current Workflow": "Duplicar flujo de trabajo actual",
@@ -750,7 +746,6 @@
     "Give Feedback": "Dar retroalimentación",
     "Group Selected Nodes": "Agrupar nodos seleccionados",
     "Help": "Ayuda",
-    "Install Missing": "Instalar Faltantes",
     "Interrupt": "Interrumpir",
     "Load Default Workflow": "Cargar flujo de trabajo predeterminado",
     "Manage group nodes": "Gestionar nodos de grupo",
@@ -758,7 +753,6 @@
     "Move Selected Nodes Left": "Mover nodos seleccionados hacia la izquierda",
     "Move Selected Nodes Right": "Mover nodos seleccionados hacia la derecha",
     "Move Selected Nodes Up": "Mover nodos seleccionados hacia arriba",
-    "Manager": "Administrador",
     "Mute/Unmute Selected Nodes": "Silenciar/Activar sonido de nodos seleccionados",
     "New": "Nuevo",
     "Next Opened Workflow": "Siguiente flujo de trabajo abierto",
@@ -803,8 +797,6 @@
     "Toggle the Custom Nodes Manager Progress Bar": "Alternar la Barra de Progreso del Administrador de Nodos Personalizados",
     "Undo": "Deshacer",
     "Ungroup selected group nodes": "Desagrupar nodos de grupo seleccionados",
-    "Unload Models": "Descargar modelos",
-    "Unload Models and Execution Cache": "Descargar modelos y caché de ejecución",
     "Workflow": "Flujo de trabajo",
     "Zoom In": "Acercar",
     "Zoom Out": "Alejar"

src/locales/fr/commands.json

@@ -152,14 +152,8 @@
   "Comfy_LoadDefaultWorkflow": {
     "label": "Charger le flux de travail par défaut"
   },
-  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
-    "label": "Nœuds personnalisés (Beta)"
-  },
-  "Comfy_Manager_ShowMissingPacks": {
-    "label": "Installer manquants"
-  },
-  "Comfy_Manager_ShowUpdateAvailablePacks": {
-    "label": "Vérifier les mises à jour"
+  "Comfy_Manager_CustomNodesManager": {
+    "label": "Gestionnaire de Nœuds Personnalisés"
   },
   "Comfy_Manager_ToggleManagerProgressDialog": {
     "label": "Basculer la boîte de dialogue de progression"
@@ -167,12 +161,6 @@
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Ouvrir l'éditeur de masque pour le nœud sélectionné"
   },
-  "Comfy_Memory_UnloadModels": {
-    "label": "Décharger les modèles"
-  },
-  "Comfy_Memory_UnloadModelsAndExecutionCache": {
-    "label": "Décharger les modèles et le cache d'exécution"
-  },
   "Comfy_NewBlankWorkflow": {
     "label": "Nouveau flux de travail vierge"
   },

src/locales/fr/main.json

@@ -270,7 +270,6 @@
     "color": "Couleur",
     "comingSoon": "Bientôt disponible",
     "command": "Commande",
-    "commandProhibited": "La commande {command} est interdite. Contactez un administrateur pour plus d'informations.",
     "community": "Communauté",
     "completed": "Terminé",
     "confirm": "Confirmer",
@@ -337,6 +336,7 @@
     "noTasksFoundMessage": "Il n'y a pas de tâches dans la file d'attente.",
     "noWorkflowsFound": "Aucun flux de travail trouvé.",
     "nodes": "Nœuds",
+    "nodesRunning": "nœuds en cours d’exécution",
     "ok": "OK",
     "openNewIssue": "Ouvrir un nouveau problème",
     "overwrite": "Écraser",
@@ -629,9 +629,6 @@
     "installationQueue": "File d'attente d'installation",
     "lastUpdated": "Dernière mise à jour",
     "latestVersion": "Dernière",
-    "legacyManagerUI": "Utiliser l'interface utilisateur héritée",
-    "legacyManagerUIDescription": "Pour utiliser l'interface utilisateur de gestion héritée, démarrez ComfyUI avec --enable-manager-legacy-ui",
-    "legacyMenuNotAvailable": "Le menu du gestionnaire de l'ancienne version n'est pas disponible dans cette version de ComfyUI. Veuillez utiliser le nouveau menu du gestionnaire à la place.",
     "license": "Licence",
     "loadingVersions": "Chargement des versions...",
     "nightlyVersion": "Nocturne",
@@ -725,7 +722,7 @@
     "Bypass/Unbypass Selected Nodes": "Contourner/Ne pas contourner les nœuds sélectionnés",
     "Canvas Toggle Link Visibility": "Basculer la visibilité du lien de la toile",
     "Canvas Toggle Lock": "Basculer le verrouillage de la toile",
-    "Check for Updates": "Vérifier les Mises à Jour",
+    "Check for Updates": "Vérifier les mises à jour",
     "Clear Pending Tasks": "Effacer les tâches en attente",
     "Clear Workflow": "Effacer le flux de travail",
     "Clipspace": "Espace de clip",
@@ -738,7 +735,6 @@
     "Contact Support": "Contacter le support",
     "Convert Selection to Subgraph": "Convertir la sélection en sous-graphe",
     "Convert selected nodes to group node": "Convertir les nœuds sélectionnés en nœud de groupe",
-    "Custom Nodes Manager": "Gestionnaire de Nœuds Personnalisés",
     "Delete Selected Items": "Supprimer les éléments sélectionnés",
     "Desktop User Guide": "Guide de l'utilisateur de bureau",
     "Duplicate Current Workflow": "Dupliquer le flux de travail actuel",
@@ -750,7 +746,6 @@
     "Give Feedback": "Donnez votre avis",
     "Group Selected Nodes": "Grouper les nœuds sélectionnés",
     "Help": "Aide",
-    "Install Missing": "Installer Manquants",
     "Interrupt": "Interrompre",
     "Load Default Workflow": "Charger le flux de travail par défaut",
     "Manage group nodes": "Gérer les nœuds de groupe",
@@ -758,7 +753,6 @@
     "Move Selected Nodes Left": "Déplacer les nœuds sélectionnés vers la gauche",
     "Move Selected Nodes Right": "Déplacer les nœuds sélectionnés vers la droite",
     "Move Selected Nodes Up": "Déplacer les nœuds sélectionnés vers le haut",
-    "Manager": "Gestionnaire",
     "Mute/Unmute Selected Nodes": "Mettre en sourdine/Activer le son des nœuds sélectionnés",
     "New": "Nouveau",
     "Next Opened Workflow": "Prochain flux de travail ouvert",
@@ -803,8 +797,6 @@
     "Toggle the Custom Nodes Manager Progress Bar": "Basculer la barre de progression du gestionnaire de nœuds personnalisés",
     "Undo": "Annuler",
     "Ungroup selected group nodes": "Dégrouper les nœuds de groupe sélectionnés",
-    "Unload Models": "Décharger les modèles",
-    "Unload Models and Execution Cache": "Décharger les modèles et le cache d'exécution",
     "Workflow": "Flux de travail",
     "Zoom In": "Zoom avant",
     "Zoom Out": "Zoom arrière"

src/locales/ja/commands.json

@@ -152,14 +152,8 @@
   "Comfy_LoadDefaultWorkflow": {
     "label": "デフォルトのワークフローを読み込む"
   },
-  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
-    "label": "カスタムノード（ベータ版）"
-  },
-  "Comfy_Manager_ShowMissingPacks": {
-    "label": "不足しているパックをインストール"
-  },
-  "Comfy_Manager_ShowUpdateAvailablePacks": {
-    "label": "更新を確認"
+  "Comfy_Manager_CustomNodesManager": {
+    "label": "カスタムノードマネージャ"
   },
   "Comfy_Manager_ToggleManagerProgressDialog": {
     "label": "プログレスダイアログの切り替え"
@@ -167,12 +161,6 @@
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "選択したノードのマスクエディタを開く"
   },
-  "Comfy_Memory_UnloadModels": {
-    "label": "モデルのアンロード"
-  },
-  "Comfy_Memory_UnloadModelsAndExecutionCache": {
-    "label": "モデルと実行キャッシュのアンロード"
-  },
   "Comfy_NewBlankWorkflow": {
     "label": "新しい空のワークフロー"
   },

src/locales/ja/main.json

@@ -270,7 +270,6 @@
     "color": "色",
     "comingSoon": "近日公開",
     "command": "コマンド",
-    "commandProhibited": "コマンド {command} は禁止されています。詳細は管理者にお問い合わせください。",
     "community": "コミュニティ",
     "completed": "完了",
     "confirm": "確認",
@@ -337,6 +336,7 @@
     "noTasksFoundMessage": "キューにタスクがありません。",
     "noWorkflowsFound": "ワークフローが見つかりません。",
     "nodes": "ノード",
+    "nodesRunning": "ノードが実行中",
     "ok": "OK",
     "openNewIssue": "新しい問題を開く",
     "overwrite": "上書き",
@@ -629,9 +629,6 @@
     "installationQueue": "インストールキュー",
     "lastUpdated": "最終更新日",
     "latestVersion": "最新",
-    "legacyManagerUI": "レガシーUIを使用する",
-    "legacyManagerUIDescription": "レガシーManager UIを使用するには、--enable-manager-legacy-uiを付けてComfyUIを起動してください",
-    "legacyMenuNotAvailable": "このバージョンのComfyUIでは、レガシーマネージャーメニューは利用できません。新しいマネージャーメニューを使用してください。",
     "license": "ライセンス",
     "loadingVersions": "バージョンを読み込んでいます...",
     "nightlyVersion": "ナイトリー",
@@ -725,7 +722,7 @@
     "Bypass/Unbypass Selected Nodes": "選択したノードのバイパス/バイパス解除",
     "Canvas Toggle Link Visibility": "キャンバスのリンク表示を切り替え",
     "Canvas Toggle Lock": "キャンバスのロックを切り替え",
-    "Check for Updates": "更新を確認",
+    "Check for Updates": "更新を確認する",
     "Clear Pending Tasks": "保留中のタスクをクリア",
     "Clear Workflow": "ワークフローをクリア",
     "Clipspace": "クリップスペース",
@@ -738,7 +735,6 @@
     "Contact Support": "サポートに連絡",
     "Convert Selection to Subgraph": "選択範囲をサブグラフに変換",
     "Convert selected nodes to group node": "選択したノードをグループノードに変換",
-    "Custom Nodes Manager": "カスタムノードマネージャ",
     "Delete Selected Items": "選択したアイテムを削除",
     "Desktop User Guide": "デスクトップユーザーガイド",
     "Duplicate Current Workflow": "現在のワークフローを複製",
@@ -750,7 +746,6 @@
     "Give Feedback": "フィードバックを送る",
     "Group Selected Nodes": "選択したノードをグループ化",
     "Help": "ヘルプ",
-    "Install Missing": "不足しているものをインストール",
     "Interrupt": "中断",
     "Load Default Workflow": "デフォルトワークフローを読み込む",
     "Manage group nodes": "グループノードを管理",
@@ -758,7 +753,6 @@
     "Move Selected Nodes Left": "選択したノードを左へ移動",
     "Move Selected Nodes Right": "選択したノードを右へ移動",
     "Move Selected Nodes Up": "選択したノードを上へ移動",
-    "Manager": "マネージャー",
     "Mute/Unmute Selected Nodes": "選択したノードのミュート/ミュート解除",
     "New": "新規",
     "Next Opened Workflow": "次に開いたワークフロー",
@@ -803,8 +797,6 @@
     "Toggle the Custom Nodes Manager Progress Bar": "カスタムノードマネージャーの進行状況バーを切り替え",
     "Undo": "元に戻す",
     "Ungroup selected group nodes": "選択したグループノードのグループ解除",
-    "Unload Models": "モデルのアンロード",
-    "Unload Models and Execution Cache": "モデルと実行キャッシュのアンロード",
     "Workflow": "ワークフロー",
     "Zoom In": "ズームイン",
     "Zoom Out": "ズームアウト"

src/locales/ko/commands.json

@@ -152,14 +152,8 @@
   "Comfy_LoadDefaultWorkflow": {
     "label": "기본 워크플로 로드"
   },
-  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
-    "label": "사용자 정의 노드 (베타)"
-  },
-  "Comfy_Manager_ShowMissingPacks": {
-    "label": "누락된 팩 설치"
-  },
-  "Comfy_Manager_ShowUpdateAvailablePacks": {
-    "label": "업데이트 확인"
+  "Comfy_Manager_CustomNodesManager": {
+    "label": "사용자 정의 노드 관리자"
   },
   "Comfy_Manager_ToggleManagerProgressDialog": {
     "label": "진행 상황 대화 상자 전환"
@@ -167,12 +161,6 @@
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "선택한 노드 마스크 편집기 열기"
   },
-  "Comfy_Memory_UnloadModels": {
-    "label": "모델 언로드"
-  },
-  "Comfy_Memory_UnloadModelsAndExecutionCache": {
-    "label": "모델 및 실행 캐시 언로드"
-  },
   "Comfy_NewBlankWorkflow": {
     "label": "새로운 빈 워크플로"
   },

src/locales/ko/main.json

@@ -270,7 +270,6 @@
     "color": "색상",
     "comingSoon": "곧 출시 예정",
     "command": "명령",
-    "commandProhibited": "명령 {command}은 금지되었습니다. 자세한 정보는 관리자에게 문의하십시오.",
     "community": "커뮤니티",
     "completed": "완료됨",
     "confirm": "확인",
@@ -337,6 +336,7 @@
     "noTasksFoundMessage": "대기열에 작업이 없습니다.",
     "noWorkflowsFound": "워크플로를 찾을 수 없습니다.",
     "nodes": "노드",
+    "nodesRunning": "노드 실행 중",
     "ok": "확인",
     "openNewIssue": "새 문제 열기",
     "overwrite": "덮어쓰기",
@@ -629,9 +629,6 @@
     "installationQueue": "설치 대기열",
     "lastUpdated": "마지막 업데이트",
     "latestVersion": "최신",
-    "legacyManagerUI": "레거시 UI 사용",
-    "legacyManagerUIDescription": "레거시 매니저 UI를 사용하려면, ComfyUI를 --enable-manager-legacy-ui로 시작하세요",
-    "legacyMenuNotAvailable": "이 버전의 ComfyUI에서는 레거시 매니저 메뉴를 사용할 수 없습니다. 대신 새로운 매니저 메뉴를 사용하십시오.",
     "license": "라이선스",
     "loadingVersions": "버전 로딩 중...",
     "nightlyVersion": "최신 테스트 버전(nightly)",
@@ -738,7 +735,6 @@
     "Contact Support": "고객 지원 문의",
     "Convert Selection to Subgraph": "선택 영역을 서브그래프로 변환",
     "Convert selected nodes to group node": "선택한 노드를 그룹 노드로 변환",
-    "Custom Nodes Manager": "사용자 정의 노드 관리자",
     "Delete Selected Items": "선택한 항목 삭제",
     "Desktop User Guide": "데스크톱 사용자 가이드",
     "Duplicate Current Workflow": "현재 워크플로 복제",
@@ -750,7 +746,6 @@
     "Give Feedback": "피드백 제공",
     "Group Selected Nodes": "선택한 노드 그룹화",
     "Help": "도움말",
-    "Install Missing": "누락된 설치",
     "Interrupt": "중단",
     "Load Default Workflow": "기본 워크플로 불러오기",
     "Manage group nodes": "그룹 노드 관리",
@@ -758,7 +753,6 @@
     "Move Selected Nodes Left": "선택한 노드 왼쪽으로 이동",
     "Move Selected Nodes Right": "선택한 노드 오른쪽으로 이동",
     "Move Selected Nodes Up": "선택한 노드 위로 이동",
-    "Manager": "매니저",
     "Mute/Unmute Selected Nodes": "선택한 노드 활성화/비활성화",
     "New": "새로 만들기",
     "Next Opened Workflow": "다음 열린 워크플로",
@@ -803,8 +797,6 @@
     "Toggle the Custom Nodes Manager Progress Bar": "커스텀 노드 매니저 진행률 표시줄 전환",
     "Undo": "실행 취소",
     "Ungroup selected group nodes": "선택한 그룹 노드 그룹 해제",
-    "Unload Models": "모델 언로드",
-    "Unload Models and Execution Cache": "모델 및 실행 캐시 언로드",
     "Workflow": "워크플로",
     "Zoom In": "확대",
     "Zoom Out": "축소"

src/locales/ru/commands.json

@@ -152,14 +152,8 @@
   "Comfy_LoadDefaultWorkflow": {
     "label": "Загрузить стандартный рабочий процесс"
   },
-  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
-    "label": "Пользовательские узлы (Бета)"
-  },
-  "Comfy_Manager_ShowMissingPacks": {
-    "label": "Установить отсутствующие"
-  },
-  "Comfy_Manager_ShowUpdateAvailablePacks": {
-    "label": "Проверить наличие обновлений"
+  "Comfy_Manager_CustomNodesManager": {
+    "label": "Менеджер Пользовательских Узлов"
   },
   "Comfy_Manager_ToggleManagerProgressDialog": {
     "label": "Переключить диалоговое окно прогресса"
@@ -167,12 +161,6 @@
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Открыть редактор масок для выбранной ноды"
   },
-  "Comfy_Memory_UnloadModels": {
-    "label": "Выгрузить модели"
-  },
-  "Comfy_Memory_UnloadModelsAndExecutionCache": {
-    "label": "Выгрузить модели и кэш выполнения"
-  },
   "Comfy_NewBlankWorkflow": {
     "label": "Новый пустой рабочий процесс"
   },

src/locales/ru/main.json

@@ -270,7 +270,6 @@
     "color": "Цвет",
     "comingSoon": "Скоро будет",
     "command": "Команда",
-    "commandProhibited": "Команда {command} запрещена. Свяжитесь с администратором для получения дополнительной информации.",
     "community": "Сообщество",
     "completed": "Завершено",
     "confirm": "Подтвердить",
@@ -337,6 +336,7 @@
     "noTasksFoundMessage": "В очереди нет задач.",
     "noWorkflowsFound": "Рабочие процессы не найдены.",
     "nodes": "Узлы",
+    "nodesRunning": "запущено узлов",
     "ok": "ОК",
     "openNewIssue": "Открыть новую проблему",
     "overwrite": "Перезаписать",
@@ -629,9 +629,6 @@
     "installationQueue": "Очередь установки",
     "lastUpdated": "Последнее обновление",
     "latestVersion": "Последняя",
-    "legacyManagerUI": "Использовать устаревший UI",
-    "legacyManagerUIDescription": "Чтобы использовать устаревший UI менеджера, запустите ComfyUI с --enable-manager-legacy-ui",
-    "legacyMenuNotAvailable": "Устаревшее меню менеджера недоступно в этой версии ComfyUI. Пожалуйста, используйте новое меню менеджера.",
     "license": "Лицензия",
     "loadingVersions": "Загрузка версий...",
     "nightlyVersion": "Ночная",
@@ -725,7 +722,7 @@
     "Bypass/Unbypass Selected Nodes": "Обойти/восстановить выбранные ноды",
     "Canvas Toggle Link Visibility": "Переключение видимости ссылки на холст",
     "Canvas Toggle Lock": "Переключение блокировки холста",
-    "Check for Updates": "Проверить Обновления",
+    "Check for Updates": "Проверить наличие обновлений",
     "Clear Pending Tasks": "Очистить ожидающие задачи",
     "Clear Workflow": "Очистить рабочий процесс",
     "Clipspace": "Клиппространство",
@@ -738,7 +735,6 @@
     "Contact Support": "Связаться с поддержкой",
     "Convert Selection to Subgraph": "Преобразовать выделенное в подграф",
     "Convert selected nodes to group node": "Преобразовать выбранные ноды в групповую ноду",
-    "Custom Nodes Manager": "Менеджер Пользовательских Узлов",
     "Delete Selected Items": "Удалить выбранные элементы",
     "Desktop User Guide": "Руководство пользователя для настольных ПК",
     "Duplicate Current Workflow": "Дублировать текущий рабочий процесс",
@@ -750,7 +746,6 @@
     "Give Feedback": "Оставить отзыв",
     "Group Selected Nodes": "Сгруппировать выбранные ноды",
     "Help": "Помощь",
-    "Install Missing": "Установить Отсутствующие",
     "Interrupt": "Прервать",
     "Load Default Workflow": "Загрузить стандартный рабочий процесс",
     "Manage group nodes": "Управление групповыми нодами",
@@ -758,7 +753,6 @@
     "Move Selected Nodes Left": "Переместить выбранные узлы влево",
     "Move Selected Nodes Right": "Переместить выбранные узлы вправо",
     "Move Selected Nodes Up": "Переместить выбранные узлы вверх",
-    "Manager": "Менеджер",
     "Mute/Unmute Selected Nodes": "Отключить/включить звук для выбранных нод",
     "New": "Новый",
     "Next Opened Workflow": "Следующий открытый рабочий процесс",
@@ -803,8 +797,6 @@
     "Toggle the Custom Nodes Manager Progress Bar": "Переключить индикатор выполнения менеджера пользовательских узлов",
     "Undo": "Отменить",
     "Ungroup selected group nodes": "Разгруппировать выбранные групповые ноды",
-    "Unload Models": "Выгрузить модели",
-    "Unload Models and Execution Cache": "Выгрузить модели и кэш выполнения",
     "Workflow": "Рабочий процесс",
     "Zoom In": "Увеличить",
     "Zoom Out": "Уменьшить"

src/locales/zh-TW/commands.json

@@ -152,20 +152,8 @@
   "Comfy_LoadDefaultWorkflow": {
     "label": "載入預設工作流程"
   },
-  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
-    "label": "顯示自訂節點管理器"
-  },
-  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
-    "label": "自訂節點（舊版）"
-  },
-  "Comfy_Manager_ShowLegacyManagerMenu": {
-    "label": "管理選單（舊版）"
-  },
-  "Comfy_Manager_ShowMissingPacks": {
-    "label": "安裝缺少的自訂節點"
-  },
-  "Comfy_Manager_ShowUpdateAvailablePacks": {
-    "label": "檢查自訂節點更新"
+  "Comfy_Manager_CustomNodesManager": {
+    "label": "切換自訂節點管理器"
   },
   "Comfy_Manager_ToggleManagerProgressDialog": {
     "label": "切換自訂節點管理器進度條"
@@ -173,12 +161,6 @@
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "為選取的節點開啟 Mask 編輯器"
   },
-  "Comfy_Memory_UnloadModels": {
-    "label": "卸載模型"
-  },
-  "Comfy_Memory_UnloadModelsAndExecutionCache": {
-    "label": "卸載模型與執行快取"
-  },
   "Comfy_NewBlankWorkflow": {
     "label": "新增空白工作流程"
   },

src/locales/zh-TW/main.json

@@ -270,7 +270,6 @@
     "color": "顏色",
     "comingSoon": "即將推出",
     "command": "指令",
-    "commandProhibited": "指令 {command} 已被禁止。如需更多資訊，請聯絡管理員。",
     "community": "社群",
     "completed": "已完成",
     "confirm": "確認",
@@ -337,6 +336,7 @@
     "noTasksFoundMessage": "佇列中沒有任務。",
     "noWorkflowsFound": "找不到工作流程。",
     "nodes": "節點",
+    "nodesRunning": "節點執行中",
     "ok": "確定",
     "openNewIssue": "開啟新問題",
     "overwrite": "覆蓋",
@@ -610,14 +610,12 @@
     "title": "維護"
   },
   "manager": {
-    "applyChanges": "套用變更",
     "changingVersion": "正在將版本從 {from} 變更為 {to}",
     "createdBy": "建立者",
     "dependencies": "相依套件",
     "discoverCommunityContent": "探索社群製作的節點包、擴充功能等...",
     "downloads": "下載次數",
     "errorConnecting": "連線至 Comfy Node Registry 時發生錯誤。",
-    "extensionsSuccessfullyInstalled": "擴充功能安裝成功，已可使用！",
     "failed": "失敗（{count}）",
     "filter": {
       "disabled": "已停用",
@@ -629,12 +627,8 @@
     "installAllMissingNodes": "安裝所有缺少的節點",
     "installSelected": "安裝所選項目",
     "installationQueue": "安裝佇列",
-    "installingDependencies": "正在安裝相依套件……",
     "lastUpdated": "最後更新",
     "latestVersion": "最新版本",
-    "legacyManagerUI": "使用舊版介面",
-    "legacyManagerUIDescription": "若要使用舊版管理介面，請以 --enable-manager-legacy-ui 啟動 ComfyUI",
-    "legacyMenuNotAvailable": "舊版管理選單不可用，已預設切換至新版管理選單。",
     "license": "授權條款",
     "loadingVersions": "正在載入版本...",
     "nightlyVersion": "每夜建置版",
@@ -646,7 +640,6 @@
     "packsSelected": "已選擇套件",
     "repository": "儲存庫",
     "restartToApplyChanges": "請重新啟動 ComfyUI 以套用變更",
-    "restartingBackend": "正在重新啟動後端以套用變更……",
     "searchPlaceholder": "搜尋",
     "selectVersion": "選擇版本",
     "sort": {
@@ -671,8 +664,6 @@
     "uninstallSelected": "解除安裝所選項目",
     "uninstalling": "正在解除安裝",
     "update": "更新",
-    "updateAll": "全部更新",
-    "updateSelected": "更新所選項目",
     "updatingAllPacks": "正在更新所有套件",
     "version": "版本"
   },
@@ -731,7 +722,6 @@
     "Bypass/Unbypass Selected Nodes": "繞過/取消繞過選取節點",
     "Canvas Toggle Link Visibility": "切換連結可見性",
     "Canvas Toggle Lock": "切換畫布鎖定",
-    "Check for Custom Node Updates": "檢查自訂節點更新",
     "Check for Updates": "檢查更新",
     "Clear Pending Tasks": "清除待處理任務",
     "Clear Workflow": "清除工作流程",
@@ -745,7 +735,6 @@
     "Contact Support": "聯絡支援",
     "Convert Selection to Subgraph": "將選取內容轉為子圖",
     "Convert selected nodes to group node": "將選取節點轉為群組節點",
-    "Custom Nodes (Legacy)": "自訂節點（舊版）",
     "Delete Selected Items": "刪除選取項目",
     "Desktop User Guide": "桌面應用程式使用指南",
     "Duplicate Current Workflow": "複製目前工作流程",
@@ -757,12 +746,9 @@
     "Give Feedback": "提供意見回饋",
     "Group Selected Nodes": "群組選取節點",
     "Help": "說明",
-    "Install Missing Custom Nodes": "安裝缺少的自訂節點",
     "Interrupt": "中斷",
     "Load Default Workflow": "載入預設工作流程",
     "Manage group nodes": "管理群組節點",
-    "Manager": "管理員",
-    "Manager Menu (Legacy)": "管理員選單（舊版）",
     "Move Selected Nodes Down": "選取節點下移",
     "Move Selected Nodes Left": "選取節點左移",
     "Move Selected Nodes Right": "選取節點右移",
@@ -796,7 +782,6 @@
     "Save": "儲存",
     "Save As": "另存新檔",
     "Show Settings Dialog": "顯示設定對話框",
-    "Show the Custom Nodes Manager": "顯示自訂節點管理員",
     "Sign Out": "登出",
     "Toggle Bottom Panel": "切換下方面板",
     "Toggle Focus Mode": "切換專注模式",
@@ -808,11 +793,10 @@
     "Toggle Terminal Bottom Panel": "切換終端機底部面板",
     "Toggle Theme (Dark/Light)": "切換主題（深色/淺色）",
     "Toggle Workflows Sidebar": "切換工作流程側邊欄",
+    "Toggle the Custom Nodes Manager": "切換自訂節點管理器",
     "Toggle the Custom Nodes Manager Progress Bar": "切換自訂節點管理器進度條",
     "Undo": "復原",
     "Ungroup selected group nodes": "取消群組選取的群組節點",
-    "Unload Models": "卸載模型",
-    "Unload Models and Execution Cache": "卸載模型與執行快取",
     "Workflow": "工作流程",
     "Zoom In": "放大",
     "Zoom Out": "縮小"

src/locales/zh/commands.json

@@ -152,14 +152,8 @@
   "Comfy_LoadDefaultWorkflow": {
     "label": "加载默认工作流"
   },
-  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
-    "label": "自定义节点（测试版）"
-  },
-  "Comfy_Manager_ShowMissingPacks": {
-    "label": "安装缺失的包"
-  },
-  "Comfy_Manager_ShowUpdateAvailablePacks": {
-    "label": "检查更新"
+  "Comfy_Manager_CustomNodesManager": {
+    "label": "自定义节点管理器"
   },
   "Comfy_Manager_ToggleManagerProgressDialog": {
     "label": "切换进度对话框"
@@ -167,12 +161,6 @@
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "打开选中节点的遮罩编辑器"
   },
-  "Comfy_Memory_UnloadModels": {
-    "label": "卸载模型"
-  },
-  "Comfy_Memory_UnloadModelsAndExecutionCache": {
-    "label": "卸载模型和执行缓存"
-  },
   "Comfy_NewBlankWorkflow": {
     "label": "新建空白工作流"
   },

src/locales/zh/main.json

@@ -270,7 +270,6 @@
     "color": "颜色",
     "comingSoon": "即将推出",
     "command": "指令",
-    "commandProhibited": "命令 {command} 被禁止。请联系管理员获取更多信息。",
     "community": "社区",
     "completed": "已完成",
     "confirm": "确认",
@@ -337,6 +336,7 @@
     "noTasksFoundMessage": "队列中没有任务。",
     "noWorkflowsFound": "未找到工作流。",
     "nodes": "节点",
+    "nodesRunning": "节点正在运行",
     "ok": "确定",
     "openNewIssue": "打开新问题",
     "overwrite": "覆盖",
@@ -629,9 +629,6 @@
     "installationQueue": "安装队列",
     "lastUpdated": "最后更新",
     "latestVersion": "最新",
-    "legacyManagerUI": "使用旧版UI",
-    "legacyManagerUIDescription": "要使用旧版的管理器UI，请启动ComfyUI并使用 --enable-manager-legacy-ui",
-    "legacyMenuNotAvailable": "在此版本的ComfyUI中，不提供旧版的管理器菜单。请使用新的管理器菜单。",
     "license": "许可证",
     "loadingVersions": "正在加载版本...",
     "nightlyVersion": "每夜",
@@ -738,7 +735,6 @@
     "Contact Support": "联系支持",
     "Convert Selection to Subgraph": "将选中内容转换为子图",
     "Convert selected nodes to group node": "将选中节点转换为组节点",
-    "Custom Nodes Manager": "自定义节点管理器",
     "Delete Selected Items": "删除选定的项目",
     "Desktop User Guide": "桌面端用户指南",
     "Duplicate Current Workflow": "复制当前工作流",
@@ -750,7 +746,6 @@
     "Give Feedback": "提供反馈",
     "Group Selected Nodes": "将选中节点转换为组节点",
     "Help": "帮助",
-    "Install Missing": "安装缺失",
     "Interrupt": "中断",
     "Load Default Workflow": "加载默认工作流",
     "Manage group nodes": "管理组节点",
@@ -758,7 +753,6 @@
     "Move Selected Nodes Left": "左移所选节点",
     "Move Selected Nodes Right": "右移所选节点",
     "Move Selected Nodes Up": "上移所选节点",
-    "Manager": "管理器",
     "Mute/Unmute Selected Nodes": "静音/取消静音选定节点",
     "New": "新建",
     "Next Opened Workflow": "下一个打开的工作流",
@@ -792,19 +786,17 @@
     "Toggle Bottom Panel": "切换底部面板",
     "Toggle Focus Mode": "切换专注模式",
     "Toggle Logs Bottom Panel": "切换日志底部面板",
-    "Toggle Model Library Sidebar": "切换模型库侧边栏",
-    "Toggle Node Library Sidebar": "切换节点库侧边栏",
-    "Toggle Queue Sidebar": "切换队列侧边栏",
+    "Toggle Model Library Sidebar": "切換模型庫側邊欄",
+    "Toggle Node Library Sidebar": "切換節點庫側邊欄",
+    "Toggle Queue Sidebar": "切換佇列側邊欄",
     "Toggle Search Box": "切换搜索框",
     "Toggle Terminal Bottom Panel": "切换终端底部面板",
     "Toggle Theme (Dark/Light)": "切换主题（暗/亮）",
-    "Toggle Workflows Sidebar": "切换工作流侧边栏",
+    "Toggle Workflows Sidebar": "切換工作流程側邊欄",
     "Toggle the Custom Nodes Manager": "切换自定义节点管理器",
     "Toggle the Custom Nodes Manager Progress Bar": "切换自定义节点管理器进度条",
     "Undo": "撤销",
     "Ungroup selected group nodes": "解散选中组节点",
-    "Unload Models": "卸载模型",
-    "Unload Models and Execution Cache": "卸载模型和执行缓存",
     "Workflow": "工作流",
     "Zoom In": "放大画面",
     "Zoom Out": "缩小画面"

src/schemas/apiSchema.ts

@@ -48,6 +48,22 @@ const zProgressWsMessage = z.object({
   node: zNodeId
 })
 
+const zNodeProgressState = z.object({
+  value: z.number(),
+  max: z.number(),
+  state: z.enum(['pending', 'running', 'finished', 'error']),
+  node_id: zNodeId,
+  prompt_id: zPromptId,
+  display_node_id: zNodeId.optional(),
+  parent_node_id: zNodeId.optional(),
+  real_node_id: zNodeId.optional()
+})
+
+const zProgressStateWsMessage = z.object({
+  prompt_id: zPromptId,
+  nodes: z.record(zNodeId, zNodeProgressState)
+})
+
 const zExecutingWsMessage = z.object({
   node: zNodeId,
   display_node: zNodeId,
@@ -474,7 +490,6 @@ const zSettings = z.object({
   'Comfy.Load3D.LightIntensityMinimum': z.number(),
   'Comfy.Load3D.LightAdjustmentIncrement': z.number(),
   'Comfy.Load3D.CameraType': z.enum(['perspective', 'orthographic']),
-  'Comfy.Memory.AllowManualUnload': z.boolean(),
   'pysssss.SnapToGrid': z.boolean(),
   /** VHS setting is used for queue video preview support. */
   'VHS.AdvancedPreviews': z.string(),

src/scripts/api.ts

@@ -16,6 +16,7 @@ import type {
   HistoryTaskItem,
   LogsRawResponse,
   LogsWsMessage,
+  NodeProgressState,
   PendingTaskItem,
   ProgressTextWsMessage,
   ProgressWsMessage,
@@ -37,7 +38,6 @@ import {
   type ComfyNodeDef,
   validateComfyNodeDef
 } from '@/schemas/nodeDefSchema'
-import { useToastStore } from '@/stores/toastStore'
 import { WorkflowTemplates } from '@/types/workflowTemplateTypes'
 
 interface QueuePromptRequestBody {
@@ -106,7 +106,17 @@ interface BackendApiCalls {
   logs: LogsWsMessage
   /** Binary preview/progress data */
   b_preview: Blob
+  /** Binary preview with metadata (node_id, prompt_id) */
+  b_preview_with_metadata: {
+    blob: Blob
+    nodeId: string
+    parentNodeId: string
+    displayNodeId: string
+    realNodeId: string
+    promptId: string
+  }
   progress_text: ProgressTextWsMessage
+  progress_state: NodeProgressState
   display_component: DisplayComponentWsMessage
   feature_flags: FeatureFlagsWsMessage
 }
@@ -458,6 +468,33 @@ export class ComfyApi extends EventTarget {
               })
               this.dispatchCustomEvent('b_preview', imageBlob)
               break
+            case 4:
+              // PREVIEW_IMAGE_WITH_METADATA
+              const decoder4 = new TextDecoder()
+              const metadataLength = view.getUint32(4)
+              const metadataBytes = event.data.slice(8, 8 + metadataLength)
+              const metadata = JSON.parse(decoder4.decode(metadataBytes))
+              const imageData4 = event.data.slice(8 + metadataLength)
+
+              let imageMime4 = metadata.image_type
+
+              const imageBlob4 = new Blob([imageData4], {
+                type: imageMime4
+              })
+
+              // Dispatch enhanced preview event with metadata
+              this.dispatchCustomEvent('b_preview_with_metadata', {
+                blob: imageBlob4,
+                nodeId: metadata.node_id,
+                displayNodeId: metadata.display_node_id,
+                parentNodeId: metadata.parent_node_id,
+                realNodeId: metadata.real_node_id,
+                promptId: metadata.prompt_id
+              })
+
+              // Also dispatch legacy b_preview for backward compatibility
+              this.dispatchCustomEvent('b_preview', imageBlob4)
+              break
             default:
               throw new Error(
                 `Unknown binary websocket message of type ${eventType}`
@@ -487,6 +524,7 @@ export class ComfyApi extends EventTarget {
             case 'execution_cached':
             case 'execution_success':
             case 'progress':
+            case 'progress_state':
             case 'executed':
             case 'graphChanged':
             case 'promptQueued':
@@ -988,56 +1026,6 @@ export class ComfyApi extends EventTarget {
     return (await axios.get(this.internalURL('/folder_paths'))).data
   }
 
-  /* Frees memory by unloading models and optionally freeing execution cache
-   * @param {Object} options - The options object
-   * @param {boolean} options.freeExecutionCache - If true, also frees execution cache
-   */
-  async freeMemory(options: { freeExecutionCache: boolean }) {
-    try {
-      let mode = ''
-      if (options.freeExecutionCache) {
-        mode = '{"unload_models": true, "free_memory": true}'
-      } else {
-        mode = '{"unload_models": true}'
-      }
-
-      const res = await this.fetchApi(`/free`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: mode
-      })
-
-      if (res.status === 200) {
-        if (options.freeExecutionCache) {
-          useToastStore().add({
-            severity: 'success',
-            summary: 'Models and Execution Cache have been cleared.',
-            life: 3000
-          })
-        } else {
-          useToastStore().add({
-            severity: 'success',
-            summary: 'Models have been unloaded.',
-            life: 3000
-          })
-        }
-      } else {
-        useToastStore().add({
-          severity: 'error',
-          summary:
-            'Unloading of models failed. Installed ComfyUI may be an outdated version.',
-          life: 5000
-        })
-      }
-    } catch (error) {
-      useToastStore().add({
-        severity: 'error',
-        summary: 'An error occurred while trying to unload models.',
-        life: 5000
-      })
-    }
-  }
-
   /**
    * Gets the custom nodes i18n data from the server.
    *

src/scripts/app.ts

@@ -194,6 +194,8 @@ export class ComfyApp {
 
   /**
    * @deprecated Use useExecutionStore().executingNodeId instead
+   * TODO: Update to support multiple executing nodes. This getter returns only the first executing node.
+   * Consider updating consumers to handle multiple nodes or use executingNodeIds array.
    */
   get runningNodeId(): NodeId | null {
     return useExecutionStore().executingNodeId
@@ -635,10 +637,6 @@ export class ComfyApp {
 
     api.addEventListener('executing', () => {
       this.graph.setDirtyCanvas(true, false)
-      // @ts-expect-error fixme ts strict error
-      this.revokePreviews(this.runningNodeId)
-      // @ts-expect-error fixme ts strict error
-      delete this.nodePreviewImages[this.runningNodeId]
     })
 
     api.addEventListener('executed', ({ detail }) => {
@@ -689,15 +687,13 @@ export class ComfyApp {
       this.canvas.draw(true, true)
     })
 
-    api.addEventListener('b_preview', ({ detail }) => {
-      const id = this.runningNodeId
-      if (id == null) return
-
-      const blob = detail
+    api.addEventListener('b_preview_with_metadata', ({ detail }) => {
+      // Enhanced preview with explicit node context
+      const { blob, displayNodeId } = detail
+      this.revokePreviews(displayNodeId)
       const blobUrl = URL.createObjectURL(blob)
-      // Ensure clean up if `executing` event is missed.
-      this.revokePreviews(id)
-      this.nodePreviewImages[id] = [blobUrl]
+      // Preview cleanup is now handled in progress_state event to support multiple concurrent previews
+      this.nodePreviewImages[displayNodeId] = [blobUrl]
     })
 
     api.init()

src/scripts/domWidget.ts

@@ -237,6 +237,7 @@ export class ComponentWidgetImpl<
     component: Component
     inputSpec: InputSpec
     props?: P
+    componentProps?: Partial<P>
     options: DOMWidgetOptions<V>
   }) {
     super({
@@ -245,7 +246,9 @@ export class ComponentWidgetImpl<
     })
     this.component = obj.component
     this.inputSpec = obj.inputSpec
-    this.props = obj.props
+    this.props = obj.componentProps
+      ? ({ ...obj.props, ...obj.componentProps } as P)
+      : obj.props
   }
 
   override computeLayoutSize() {

src/services/comfyManagerService.ts

@@ -1,18 +1,17 @@
 import axios, { AxiosError, AxiosResponse } from 'axios'
-import { v4 as uuidv4 } from 'uuid'
 import { ref } from 'vue'
 
 import { api } from '@/scripts/api'
-import { components } from '@/types/generatedManagerTypes'
+import {
+  type InstallPackParams,
+  type InstalledPacksResponse,
+  type ManagerPackInfo,
+  type ManagerQueueStatus,
+  SelectedVersion,
+  type UpdateAllPacksParams
+} from '@/types/comfyManagerTypes'
 import { isAbortError } from '@/utils/typeGuardUtil'
 
-type ManagerQueueStatus = components['schemas']['QueueStatus']
-type InstallPackParams = components['schemas']['InstallPackParams']
-type InstalledPacksResponse = components['schemas']['InstalledPacksResponse']
-type UpdateAllPacksParams = components['schemas']['UpdateAllPacksParams']
-type ManagerTaskHistory = components['schemas']['HistoryResponse']
-type QueueTaskItem = components['schemas']['QueueTaskItem']
-
 const GENERIC_SECURITY_ERR_MSG =
   'Forbidden: A security error has occurred. Please check the terminal logs'
 
@@ -20,23 +19,20 @@ const GENERIC_SECURITY_ERR_MSG =
  * API routes for ComfyUI Manager
  */
 enum ManagerRoute {
-  START_QUEUE = 'v2/manager/queue/start',
-  RESET_QUEUE = 'v2/manager/queue/reset',
-  QUEUE_STATUS = 'v2/manager/queue/status',
-  INSTALL = 'v2/manager/queue/install',
-  UPDATE = 'v2/manager/queue/update',
-  UPDATE_ALL = 'v2/manager/queue/update_all',
-  UNINSTALL = 'v2/manager/queue/uninstall',
-  DISABLE = 'v2/manager/queue/disable',
-  FIX_NODE = 'v2/manager/queue/fix',
-  LIST_INSTALLED = 'v2/customnode/installed',
-  GET_NODES = 'v2/customnode/getmappings',
-  GET_PACKS = 'v2/customnode/getlist',
-  IMPORT_FAIL_INFO = 'v2/customnode/import_fail_info',
-  REBOOT = 'v2/manager/reboot',
-  IS_LEGACY_MANAGER_UI = 'v2/manager/is_legacy_manager_ui',
-  TASK_HISTORY = 'v2/manager/queue/history',
-  QUEUE_TASK = 'v2/manager/queue/task'
+  START_QUEUE = 'manager/queue/start',
+  RESET_QUEUE = 'manager/queue/reset',
+  QUEUE_STATUS = 'manager/queue/status',
+  INSTALL = 'manager/queue/install',
+  UPDATE = 'manager/queue/update',
+  UPDATE_ALL = 'manager/queue/update_all',
+  UNINSTALL = 'manager/queue/uninstall',
+  DISABLE = 'manager/queue/disable',
+  FIX_NODE = 'manager/queue/fix',
+  LIST_INSTALLED = 'customnode/installed',
+  GET_NODES = 'customnode/getmappings',
+  GET_PACKS = 'customnode/getlist',
+  IMPORT_FAIL_INFO = 'customnode/import_fail_info',
+  REBOOT = 'manager/reboot'
 }
 
 const managerApiClient = axios.create({
@@ -53,6 +49,7 @@ const managerApiClient = axios.create({
 export const useComfyManagerService = () => {
   const isLoading = ref(false)
   const error = ref<string | null>(null)
+  const didStartQueue = ref(false)
 
   const handleRequestError = (
     err: unknown,
@@ -113,21 +110,28 @@ export const useComfyManagerService = () => {
       201: 'Created: ComfyUI-Manager job queue is already running'
     }
 
+    didStartQueue.value = true
+
     return executeRequest<null>(
       () => managerApiClient.get(ManagerRoute.START_QUEUE, { signal }),
       { errorContext, routeSpecificErrors }
     )
   }
 
-  const getQueueStatus = async (client_id?: string, signal?: AbortSignal) => {
+  const getQueueStatus = async (signal?: AbortSignal) => {
     const errorContext = 'Getting ComfyUI-Manager queue status'
 
     return executeRequest<ManagerQueueStatus>(
-      () =>
-        managerApiClient.get(ManagerRoute.QUEUE_STATUS, {
-          params: client_id ? { client_id } : undefined,
-          signal
-        }),
+      () => managerApiClient.get(ManagerRoute.QUEUE_STATUS, { signal }),
+      { errorContext }
+    )
+  }
+
+  const resetQueue = async (signal?: AbortSignal) => {
+    const errorContext = 'Resetting ComfyUI-Manager queue'
+
+    return executeRequest<null>(
+      () => managerApiClient.get(ManagerRoute.RESET_QUEUE, { signal }),
       { errorContext }
     )
   }
@@ -150,66 +154,73 @@ export const useComfyManagerService = () => {
     )
   }
 
-  const queueTask = async (
-    kind: QueueTaskItem['kind'],
-    params: QueueTaskItem['params'],
-    ui_id?: string,
+  const installPack = async (
+    params: InstallPackParams,
     signal?: AbortSignal
   ) => {
-    const task: QueueTaskItem = {
-      kind,
-      params,
-      ui_id: ui_id || uuidv4(),
-      client_id: api.clientId ?? api.initialClientId ?? 'unknown'
-    }
-
-    const errorContext = `Queueing ${task.kind} task`
+    const errorContext = `Installing pack ${params.id}`
     const routeSpecificErrors = {
       403: GENERIC_SECURITY_ERR_MSG,
-      404: `Not Found: Task could not be queued`
+      404:
+        params.selected_version === SelectedVersion.NIGHTLY
+          ? `Not Found: Node pack ${params.id} does not provide nightly version`
+          : GENERIC_SECURITY_ERR_MSG
     }
 
     return executeRequest<null>(
-      () => managerApiClient.post(ManagerRoute.QUEUE_TASK, task, { signal }),
+      () => managerApiClient.post(ManagerRoute.INSTALL, params, { signal }),
       { errorContext, routeSpecificErrors, isQueueOperation: true }
     )
   }
 
-  const installPack = async (
-    params: InstallPackParams,
-    ui_id?: string,
-    signal?: AbortSignal
-  ) => {
-    return queueTask('install', params, ui_id, signal)
-  }
-
   const uninstallPack = async (
-    params: components['schemas']['UninstallPackParams'],
-    ui_id?: string,
+    params: ManagerPackInfo,
     signal?: AbortSignal
   ) => {
-    return queueTask('uninstall', params, ui_id, signal)
+    const errorContext = `Uninstalling pack ${params.id}`
+    const routeSpecificErrors = {
+      403: GENERIC_SECURITY_ERR_MSG
+    }
+
+    return executeRequest<null>(
+      () => managerApiClient.post(ManagerRoute.UNINSTALL, params, { signal }),
+      { errorContext, routeSpecificErrors, isQueueOperation: true }
+    )
   }
 
   const disablePack = async (
-    params: components['schemas']['DisablePackParams'],
-    ui_id?: string,
+    params: ManagerPackInfo,
     signal?: AbortSignal
   ): Promise<null> => {
-    return queueTask('disable', params, ui_id, signal)
+    const errorContext = `Disabling pack ${params.id}`
+    const routeSpecificErrors = {
+      404: `Pack ${params.id} not found or not installed`,
+      409: `Pack ${params.id} is already disabled`
+    }
+
+    return executeRequest<null>(
+      () => managerApiClient.post(ManagerRoute.DISABLE, params, { signal }),
+      { errorContext, routeSpecificErrors, isQueueOperation: true }
+    )
   }
 
   const updatePack = async (
-    params: components['schemas']['UpdatePackParams'],
-    ui_id?: string,
+    params: ManagerPackInfo,
     signal?: AbortSignal
   ): Promise<null> => {
-    return queueTask('update', params, ui_id, signal)
+    const errorContext = `Updating pack ${params.id}`
+    const routeSpecificErrors = {
+      403: GENERIC_SECURITY_ERR_MSG
+    }
+
+    return executeRequest<null>(
+      () => managerApiClient.post(ManagerRoute.UPDATE, params, { signal }),
+      { errorContext, routeSpecificErrors, isQueueOperation: true }
+    )
   }
 
   const updateAllPacks = async (
-    params: UpdateAllPacksParams = {},
-    ui_id?: string,
+    params?: UpdateAllPacksParams,
     signal?: AbortSignal
   ) => {
     const errorContext = 'Updating all packs'
@@ -218,18 +229,8 @@ export const useComfyManagerService = () => {
       401: 'Unauthorized: ComfyUI-Manager job queue is busy'
     }
 
-    const queryParams = {
-      mode: params.mode,
-      client_id: api.clientId ?? api.initialClientId ?? 'unknown',
-      ui_id: ui_id || uuidv4()
-    }
-
     return executeRequest<null>(
-      () =>
-        managerApiClient.get(ManagerRoute.UPDATE_ALL, {
-          params: queryParams,
-          signal
-        }),
+      () => managerApiClient.get(ManagerRoute.UPDATE_ALL, { params, signal }),
       { errorContext, routeSpecificErrors, isQueueOperation: true }
     )
   }
@@ -246,36 +247,6 @@ export const useComfyManagerService = () => {
     )
   }
 
-  const isLegacyManagerUI = async (signal?: AbortSignal) => {
-    const errorContext = 'Checking if user set Manager to use the legacy UI'
-
-    return executeRequest<{ is_legacy_manager_ui: boolean }>(
-      () => managerApiClient.get(ManagerRoute.IS_LEGACY_MANAGER_UI, { signal }),
-      { errorContext }
-    )
-  }
-
-  const getTaskHistory = async (
-    options: {
-      ui_id?: string
-      max_items?: number
-      client_id?: string
-      offset?: number
-    } = {},
-    signal?: AbortSignal
-  ) => {
-    const errorContext = 'Getting ComfyUI-Manager task history'
-
-    return executeRequest<ManagerTaskHistory>(
-      () =>
-        managerApiClient.get(ManagerRoute.TASK_HISTORY, {
-          params: options,
-          signal
-        }),
-      { errorContext }
-    )
-  }
-
   return {
     // State
     isLoading,
@@ -283,8 +254,8 @@ export const useComfyManagerService = () => {
 
     // Queue operations
     startQueue,
+    resetQueue,
     getQueueStatus,
-    getTaskHistory,
 
     // Pack management
     listInstalledPacks,
@@ -297,7 +268,6 @@ export const useComfyManagerService = () => {
     updateAllPacks,
 
     // System operations
-    rebootComfyUI,
-    isLegacyManagerUI
+    rebootComfyUI
   }
 }

src/services/litegraphService.ts

@@ -33,6 +33,8 @@ import type {
 import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema'
 import { ComfyApp, app } from '@/scripts/app'
 import { $el } from '@/scripts/ui'
+import { useDomWidgetStore } from '@/stores/domWidgetStore'
+import { useExecutionStore } from '@/stores/executionStore'
 import { useCanvasStore } from '@/stores/graphStore'
 import { useNodeOutputStore } from '@/stores/imagePreviewStore'
 import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
@@ -87,6 +89,14 @@ export const useLitegraphService = () => {
       constructor() {
         super(app.graph, subgraph, instanceData)
 
+        // Set up callback for promoted widget registration
+        this.onPromotedWidgetAdded = (widget) => {
+          const domWidgetStore = useDomWidgetStore()
+          if (!domWidgetStore.widgetStates.has(widget.id)) {
+            domWidgetStore.registerWidget(widget)
+          }
+        }
+
         this.#setupStrokeStyles()
         this.#addInputs(ComfyNode.nodeData.inputs)
         this.#addOutputs(ComfyNode.nodeData.outputs)
@@ -107,7 +117,11 @@ export const useLitegraphService = () => {
        */
       #setupStrokeStyles() {
         this.strokeStyles['running'] = function (this: LGraphNode) {
-          if (this.id == app.runningNodeId) {
+          const nodeId = String(this.id)
+          const nodeLocatorId = useWorkflowStore().nodeIdToNodeLocatorId(nodeId)
+          const state =
+            useExecutionStore().nodeLocationProgressStates[nodeLocatorId]?.state
+          if (state === 'running') {
             return { color: '#0f0' }
           }
         }
@@ -362,7 +376,11 @@ export const useLitegraphService = () => {
        */
       #setupStrokeStyles() {
         this.strokeStyles['running'] = function (this: LGraphNode) {
-          if (this.id == app.runningNodeId) {
+          const nodeId = String(this.id)
+          const nodeLocatorId = useWorkflowStore().nodeIdToNodeLocatorId(nodeId)
+          const state =
+            useExecutionStore().nodeLocationProgressStates[nodeLocatorId]?.state
+          if (state === 'running') {
             return { color: '#0f0' }
           }
         }

src/stores/comfyManagerStore.ts

@@ -1,28 +1,21 @@
 import { whenever } from '@vueuse/core'
 import { defineStore } from 'pinia'
-import { v4 as uuidv4 } from 'uuid'
 import { ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { useCachedRequest } from '@/composables/useCachedRequest'
 import { useManagerQueue } from '@/composables/useManagerQueue'
 import { useServerLogs } from '@/composables/useServerLogs'
-import { api } from '@/scripts/api'
 import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useDialogService } from '@/services/dialogService'
-import { TaskLog } from '@/types/comfyManagerTypes'
-import { components } from '@/types/generatedManagerTypes'
-
-type InstallPackParams = components['schemas']['InstallPackParams']
-type InstalledPacksResponse = components['schemas']['InstalledPacksResponse']
-type ManagerPackInfo = components['schemas']['ManagerPackInfo']
-type ManagerPackInstalled = components['schemas']['ManagerPackInstalled']
-type ManagerTaskHistory = Record<
-  string,
-  components['schemas']['TaskHistoryItem']
->
-type ManagerTaskQueue = components['schemas']['TaskStateMessage']
-type UpdateAllPacksParams = components['schemas']['UpdateAllPacksParams']
+import {
+  InstallPackParams,
+  InstalledPacksResponse,
+  ManagerPackInfo,
+  ManagerPackInstalled,
+  TaskLog,
+  UpdateAllPacksParams
+} from '@/types/comfyManagerTypes'
 
 /**
  * Store for state of installed node packs
@@ -38,62 +31,14 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
   const installedPacksIds = ref<Set<string>>(new Set())
   const isStale = ref(true)
   const taskLogs = ref<TaskLog[]>([])
-  const succeededTasksLogs = ref<TaskLog[]>([])
-  const failedTasksLogs = ref<TaskLog[]>([])
 
-  const taskHistory = ref<ManagerTaskHistory>({})
-  const succeededTasksIds = ref<string[]>([])
-  const failedTasksIds = ref<string[]>([])
-  const taskQueue = ref<ManagerTaskQueue>({
-    history: {},
-    running_queue: [],
-    pending_queue: [],
-    installed_packs: {}
-  })
-
-  const managerQueue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+  const { statusMessage, allTasksDone, enqueueTask, uncompletedCount } =
+    useManagerQueue()
 
   const setStale = () => {
     isStale.value = true
   }
 
-  const partitionTaskLogs = () => {
-    const successTaskLogs: TaskLog[] = []
-    const failTaskLogs: TaskLog[] = []
-    for (const log of taskLogs.value) {
-      if (failedTasksIds.value.includes(log.taskId)) {
-        failTaskLogs.push(log)
-      } else {
-        successTaskLogs.push(log)
-      }
-    }
-    succeededTasksLogs.value = successTaskLogs
-    failedTasksLogs.value = failTaskLogs
-  }
-
-  const partitionTasks = () => {
-    const successTasksIds = []
-    const failTasksIds = []
-    for (const task of Object.values(taskHistory.value)) {
-      if (task.status?.status_str === 'success') {
-        successTasksIds.push(task.ui_id)
-      } else {
-        failTasksIds.push(task.ui_id)
-      }
-    }
-    succeededTasksIds.value = successTasksIds
-    failedTasksIds.value = failTasksIds
-  }
-
-  whenever(
-    taskHistory,
-    () => {
-      partitionTasks()
-      partitionTaskLogs()
-    },
-    { deep: true }
-  )
-
   const getPackId = (pack: ManagerPackInstalled) => pack.cnr_id || pack.aux_id
 
   const isInstalledPackId = (packName: string | undefined): boolean =>
@@ -152,13 +97,11 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
   }
 
   const updateInstalledIds = (packs: ManagerPackInstalled[]) => {
-    const newIds = packsToIdSet(packs)
-    installedPacksIds.value = newIds
+    installedPacksIds.value = packsToIdSet(packs)
   }
 
   const onPacksChanged = () => {
     const packs = Object.values(installedPacks.value)
-
     updateDisabledIds(packs)
     updateInstalledIds(packs)
   }
@@ -172,46 +115,23 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
   }
 
   whenever(isStale, refreshInstalledList, { immediate: true })
+  whenever(uncompletedCount, () => showManagerProgressDialog())
 
-  const enqueueTaskWithLogs = async (
-    task: (taskId: string) => Promise<null>,
-    taskName: string
-  ) => {
-    const taskId = uuidv4()
-    const { logs } = useServerLogs({
-      ui_id: taskId,
-      immediate: true
-    })
+  const withLogs = (task: () => Promise<null>, taskName: string) => {
+    const { startListening, stopListening, logs } = useServerLogs()
 
-    try {
-      // Show progress dialog immediately when task is queued
-      showManagerProgressDialog()
-      managerQueue.isProcessing.value = true
-
-      // Prepare logging hook
-      taskLogs.value.push({ taskName, taskId, logs: logs.value })
-
-      // Queue the task to the server
-      await task(taskId)
-    } catch (error) {
-      // Reset processing state on error
-      managerQueue.isProcessing.value = false
-
-      // The server has authority over task history in general, but in rare
-      // case of client-side error, we add that to failed tasks from the client side
-      taskHistory.value[taskId] = {
-        ui_id: taskId,
-        client_id: api.clientId || 'unknown',
-        kind: 'error',
-        result: 'failed',
-        status: {
-          status_str: 'error',
-          completed: false,
-          messages: [error instanceof Error ? error.message : String(error)]
-        },
-        timestamp: new Date().toISOString()
-      }
+    const loggedTask = async () => {
+      taskLogs.value.push({ taskName, logs: logs.value })
+      await startListening()
+      return task()
     }
+
+    const onComplete = async () => {
+      await stopListening()
+      setStale()
+    }
+
+    return { task: loggedTask, onComplete }
   }
 
   const installPack = useCachedRequest<InstallPackParams, void>(
@@ -232,62 +152,39 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
         }
       }
 
-      const task = (taskId: string) =>
-        managerService.installPack(params, taskId, signal)
-      await enqueueTaskWithLogs(task, `${actionDescription} ${params.id}`)
+      const task = () => managerService.installPack(params, signal)
+      enqueueTask(withLogs(task, `${actionDescription} ${params.id}`))
     },
     { maxSize: 1 }
   )
 
-  const uninstallPack = async (
-    params: ManagerPackInfo,
-    signal?: AbortSignal
-  ) => {
+  const uninstallPack = (params: ManagerPackInfo, signal?: AbortSignal) => {
     installPack.clear()
     installPack.cancel()
-    const uninstallParams: components['schemas']['UninstallPackParams'] = {
-      node_name: params.id,
-      is_unknown: false
-    }
-    const task = (taskId: string) =>
-      managerService.uninstallPack(uninstallParams, taskId, signal)
-    await enqueueTaskWithLogs(
-      task,
-      t('manager.uninstalling', { id: params.id })
-    )
+    const task = () => managerService.uninstallPack(params, signal)
+    enqueueTask(withLogs(task, t('manager.uninstalling', { id: params.id })))
   }
 
   const updatePack = useCachedRequest<ManagerPackInfo, void>(
     async (params: ManagerPackInfo, signal?: AbortSignal) => {
       updateAllPacks.cancel()
-      const updateParams: components['schemas']['UpdatePackParams'] = {
-        node_name: params.id,
-        node_ver: params.version
-      }
-      const task = (taskId: string) =>
-        managerService.updatePack(updateParams, taskId, signal)
-      await enqueueTaskWithLogs(task, t('g.updating', { id: params.id }))
+      const task = () => managerService.updatePack(params, signal)
+      enqueueTask(withLogs(task, t('g.updating', { id: params.id })))
     },
     { maxSize: 1 }
   )
 
   const updateAllPacks = useCachedRequest<UpdateAllPacksParams, void>(
     async (params: UpdateAllPacksParams, signal?: AbortSignal) => {
-      const task = (taskId: string) =>
-        managerService.updateAllPacks(params, taskId, signal)
-      await enqueueTaskWithLogs(task, t('manager.updatingAllPacks'))
+      const task = () => managerService.updateAllPacks(params, signal)
+      enqueueTask(withLogs(task, t('manager.updatingAllPacks')))
     },
     { maxSize: 1 }
   )
 
-  const disablePack = async (params: ManagerPackInfo, signal?: AbortSignal) => {
-    const disableParams: components['schemas']['DisablePackParams'] = {
-      node_name: params.id,
-      is_unknown: false
-    }
-    const task = (taskId: string) =>
-      managerService.disablePack(disableParams, taskId, signal)
-    await enqueueTaskWithLogs(task, t('g.disabling', { id: params.id }))
+  const disablePack = (params: ManagerPackInfo, signal?: AbortSignal) => {
+    const task = () => managerService.disablePack(params, signal)
+    enqueueTask(withLogs(task, t('g.disabling', { id: params.id })))
   }
 
   const getInstalledPackVersion = (packId: string) => {
@@ -299,31 +196,15 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
     taskLogs.value = []
   }
 
-  const resetTaskState = () => {
-    // Clear all task-related reactive state for fresh start after restart
-    taskLogs.value = []
-    taskHistory.value = {}
-    succeededTasksIds.value = []
-    failedTasksIds.value = []
-    succeededTasksLogs.value = []
-    failedTasksLogs.value = []
-
-    // Reset task queue to initial state
-    taskQueue.value = {
-      history: {},
-      running_queue: [],
-      pending_queue: [],
-      installed_packs: {}
-    }
-  }
-
   return {
     // Manager state
     isLoading: managerService.isLoading,
     error: managerService.error,
+    statusMessage,
+    allTasksDone,
+    uncompletedCount,
     taskLogs,
     clearLogs,
-    resetTaskState,
     setStale,
 
     // Installed packs state
@@ -334,15 +215,6 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
     getInstalledPackVersion,
     refreshInstalledList,
 
-    // Task queue state and actions
-    taskHistory,
-    isProcessingTasks: managerQueue.isProcessing,
-    succeededTasksIds,
-    failedTasksIds,
-    succeededTasksLogs,
-    failedTasksLogs,
-    managerQueue,
-
     // Pack actions
     installPack,
     uninstallPack,
@@ -362,15 +234,6 @@ export const useManagerProgressDialogStore = defineStore(
   'managerProgressDialog',
   () => {
     const isExpanded = ref(false)
-    const activeTabIndex = ref(0)
-
-    const setActiveTabIndex = (index: number) => {
-      activeTabIndex.value = index
-    }
-
-    const getActiveTabIndex = () => {
-      return activeTabIndex.value
-    }
 
     const toggle = () => {
       isExpanded.value = !isExpanded.value
@@ -387,9 +250,7 @@ export const useManagerProgressDialogStore = defineStore(
       isExpanded,
       toggle,
       collapse,
-      expand,
-      setActiveTabIndex,
-      getActiveTabIndex
+      expand
     }
   }
 )

src/stores/executionStore.ts

@@ -12,6 +12,8 @@ import type {
   ExecutionErrorWsMessage,
   ExecutionStartWsMessage,
   NodeError,
+  NodeProgressState,
+  ProgressStateWsMessage,
   ProgressTextWsMessage,
   ProgressWsMessage
 } from '@/schemas/apiSchema'
@@ -21,6 +23,9 @@ import type {
   NodeId
 } from '@/schemas/comfyWorkflowSchema'
 import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import type { NodeLocatorId } from '@/types/nodeIdentification'
+import { createNodeLocatorId } from '@/types/nodeIdentification'
 
 import { useCanvasStore } from './graphStore'
 import { ComfyWorkflow, useWorkflowStore } from './workflowStore'
@@ -46,7 +51,97 @@ export const useExecutionStore = defineStore('execution', () => {
   const queuedPrompts = ref<Record<NodeId, QueuedPrompt>>({})
   const lastNodeErrors = ref<Record<NodeId, NodeError> | null>(null)
   const lastExecutionError = ref<ExecutionErrorWsMessage | null>(null)
-  const executingNodeId = ref<NodeId | null>(null)
+  // This is the progress of all nodes in the currently executing workflow
+  const nodeProgressStates = ref<Record<string, NodeProgressState>>({})
+
+  /**
+   * Convert execution context node IDs to NodeLocatorIds
+   * @param nodeId The node ID from execution context (could be execution ID)
+   * @returns The NodeLocatorId
+   */
+  const executionIdToNodeLocatorId = (
+    nodeId: string | number
+  ): NodeLocatorId => {
+    const nodeIdStr = String(nodeId)
+
+    if (!nodeIdStr.includes(':')) {
+      // It's a top-level node ID
+      return nodeIdStr as NodeLocatorId
+    }
+
+    // It's an execution node ID
+    const parts = nodeIdStr.split(':')
+    const localNodeId = parts[parts.length - 1]
+    const subgraphs = getSubgraphsFromInstanceIds(app.graph, parts)
+    const nodeLocatorId = createNodeLocatorId(subgraphs.at(-1)!.id, localNodeId)
+    return nodeLocatorId
+  }
+
+  const mergeExecutionProgressStates = (
+    currentState: NodeProgressState | undefined,
+    newState: NodeProgressState
+  ): NodeProgressState => {
+    if (currentState === undefined) {
+      return newState
+    }
+
+    const mergedState = { ...currentState }
+    if (mergedState.state === 'error') {
+      return mergedState
+    } else if (newState.state === 'running') {
+      const newPerc = newState.max > 0 ? newState.value / newState.max : 0.0
+      const oldPerc =
+        mergedState.max > 0 ? mergedState.value / mergedState.max : 0.0
+      if (
+        mergedState.state !== 'running' ||
+        oldPerc === 0.0 ||
+        newPerc < oldPerc
+      ) {
+        mergedState.value = newState.value
+        mergedState.max = newState.max
+      }
+      mergedState.state = 'running'
+    }
+
+    return mergedState
+  }
+
+  const nodeLocationProgressStates = computed<
+    Record<NodeLocatorId, NodeProgressState>
+  >(() => {
+    const result: Record<NodeLocatorId, NodeProgressState> = {}
+
+    const states = nodeProgressStates.value // Apparently doing this inside `Object.entries` causes issues
+    for (const [_, state] of Object.entries(states)) {
+      const parts = String(state.display_node_id).split(':')
+      for (let i = 0; i < parts.length; i++) {
+        const executionId = parts.slice(0, i + 1).join(':')
+        const locatorId = executionIdToNodeLocatorId(executionId)
+        if (!locatorId) continue
+
+        result[locatorId] = mergeExecutionProgressStates(
+          result[locatorId],
+          state
+        )
+      }
+    }
+
+    return result
+  })
+
+  // Easily access all currently executing node IDs
+  const executingNodeIds = computed<NodeId[]>(() => {
+    return Object.entries(nodeProgressStates)
+      .filter(([_, state]) => state.state === 'running')
+      .map(([nodeId, _]) => nodeId)
+  })
+
+  // @deprecated For backward compatibility - stores the primary executing node ID
+  const executingNodeId = computed<NodeId | null>(() => {
+    return executingNodeIds.value.length > 0 ? executingNodeIds.value[0] : null
+  })
+
+  // For backward compatibility - returns the primary executing node
   const executingNode = computed<ComfyNode | null>(() => {
     if (!executingNodeId.value) return null
 
@@ -93,30 +188,7 @@ export const useExecutionStore = defineStore('execution', () => {
     return getSubgraphsFromInstanceIds(subgraph, subgraphNodeIds, subgraphs)
   }
 
-  const executionIdToCurrentId = (id: string) => {
-    const subgraph = workflowStore.activeSubgraph
-
-    // Short-circuit: ID belongs to the parent workflow / no active subgraph
-    if (!id.includes(':')) {
-      return !subgraph ? id : undefined
-    } else if (!subgraph) {
-      return
-    }
-
-    // Parse the hierarchical ID (e.g., "123:456:789")
-    const subgraphNodeIds = id.split(':')
-
-    // If the last subgraph is the active subgraph, return the node ID
-    const subgraphs = getSubgraphsFromInstanceIds(
-      subgraph.rootGraph,
-      subgraphNodeIds
-    )
-    if (subgraphs.at(-1) === subgraph) {
-      return subgraphNodeIds.at(-1)
-    }
-  }
-
-  // This is the progress of the currently executing node, if any
+  // This is the progress of the currently executing node (for backward compatibility)
   const _executingNodeProgress = ref<ProgressWsMessage | null>(null)
   const executingNodeProgress = computed(() =>
     _executingNodeProgress.value
@@ -153,6 +225,7 @@ export const useExecutionStore = defineStore('execution', () => {
     api.addEventListener('executed', handleExecuted)
     api.addEventListener('executing', handleExecuting)
     api.addEventListener('progress', handleProgress)
+    api.addEventListener('progress_state', handleProgressState)
     api.addEventListener('status', handleStatus)
     api.addEventListener('execution_error', handleExecutionError)
   }
@@ -165,6 +238,7 @@ export const useExecutionStore = defineStore('execution', () => {
     api.removeEventListener('executed', handleExecuted)
     api.removeEventListener('executing', handleExecuting)
     api.removeEventListener('progress', handleProgress)
+    api.removeEventListener('progress_state', handleProgressState)
     api.removeEventListener('status', handleStatus)
     api.removeEventListener('execution_error', handleExecutionError)
     api.removeEventListener('progress_text', handleProgressText)
@@ -194,19 +268,42 @@ export const useExecutionStore = defineStore('execution', () => {
 
     if (!activePrompt.value) return
 
-    if (executingNodeId.value && activePrompt.value) {
-      // Seems sometimes nodes that are cached fire executing but not executed
-      activePrompt.value.nodes[executingNodeId.value] = true
+    // Update the executing nodes list
+    if (typeof e.detail !== 'string') {
+      if (activePromptId.value) {
+        delete queuedPrompts.value[activePromptId.value]
+      }
+      activePromptId.value = null
     }
-    if (typeof e.detail === 'string') {
-      executingNodeId.value = executionIdToCurrentId(e.detail) ?? null
-    } else {
-      executingNodeId.value = e.detail
-      if (executingNodeId.value === null) {
-        if (activePromptId.value) {
-          delete queuedPrompts.value[activePromptId.value]
-        }
-        activePromptId.value = null
+  }
+
+  function handleProgressState(e: CustomEvent<ProgressStateWsMessage>) {
+    const { nodes } = e.detail
+
+    // Revoke previews for nodes that are starting to execute
+    for (const nodeId in nodes) {
+      const nodeState = nodes[nodeId]
+      if (nodeState.state === 'running' && !nodeProgressStates.value[nodeId]) {
+        // This node just started executing, revoke its previews
+        // Note that we're doing the *actual* node id instead of the display node id
+        // here intentionally. That way, we don't clear the preview every time a new node
+        // within an expanded graph starts executing.
+        app.revokePreviews(nodeId)
+        delete app.nodePreviewImages[nodeId]
+      }
+    }
+
+    // Update the progress states for all nodes
+    nodeProgressStates.value = nodes
+
+    // If we have progress for the currently executing node, update it for backwards compatibility
+    if (executingNodeId.value && nodes[executingNodeId.value]) {
+      const nodeState = nodes[executingNodeId.value]
+      _executingNodeProgress.value = {
+        value: nodeState.value,
+        max: nodeState.max,
+        prompt_id: nodeState.prompt_id,
+        node: nodeState.display_node_id || nodeState.node_id
       }
     }
   }
@@ -239,7 +336,7 @@ export const useExecutionStore = defineStore('execution', () => {
     const { nodeId, text } = e.detail
     if (!text || !nodeId) return
 
-    // Handle hierarchical node IDs for subgraphs
+    // Handle execution node IDs for subgraphs
     const currentId = getNodeIdIfExecuting(nodeId)
     const node = canvasStore.getCanvas().graph?.getNodeById(currentId)
     if (!node) return
@@ -250,7 +347,7 @@ export const useExecutionStore = defineStore('execution', () => {
   function handleDisplayComponent(e: CustomEvent<DisplayComponentWsMessage>) {
     const { node_id: nodeId, component, props = {} } = e.detail
 
-    // Handle hierarchical node IDs for subgraphs
+    // Handle execution node IDs for subgraphs
     const currentId = getNodeIdIfExecuting(nodeId)
     const node = canvasStore.getCanvas().graph?.getNodeById(currentId)
     if (!node) return
@@ -290,6 +387,18 @@ export const useExecutionStore = defineStore('execution', () => {
     )
   }
 
+  /**
+   * Convert a NodeLocatorId to an execution context ID
+   * @param locatorId The NodeLocatorId
+   * @returns The execution ID or null if conversion fails
+   */
+  const nodeLocatorIdToExecutionId = (
+    locatorId: NodeLocatorId | string
+  ): string | null => {
+    const executionId = workflowStore.nodeLocatorIdToNodeExecutionId(locatorId)
+    return executionId
+  }
+
   return {
     isIdle,
     clientId,
@@ -310,9 +419,13 @@ export const useExecutionStore = defineStore('execution', () => {
      */
     lastExecutionError,
     /**
-     * The id of the node that is currently being executed
+     * The id of the node that is currently being executed (backward compatibility)
      */
     executingNodeId,
+    /**
+     * The list of all nodes that are currently executing
+     */
+    executingNodeIds,
     /**
      * The prompt that is currently being executed
      */
@@ -330,17 +443,25 @@ export const useExecutionStore = defineStore('execution', () => {
      */
     executionProgress,
     /**
-     * The node that is currently being executed
+     * The node that is currently being executed (backward compatibility)
      */
     executingNode,
     /**
-     * The progress of the executing node (if the node reports progress)
+     * The progress of the executing node (backward compatibility)
      */
     executingNodeProgress,
+    /**
+     * All node progress states from progress_state events
+     */
+    nodeProgressStates,
+    nodeLocationProgressStates,
     bindExecutionEvents,
     unbindExecutionEvents,
     storePrompt,
     // Raw executing progress data for backward compatibility in ComfyApp.
-    _executingNodeProgress
+    _executingNodeProgress,
+    // NodeLocatorId conversion helpers
+    executionIdToNodeLocatorId,
+    nodeLocatorIdToExecutionId
   }
 })

src/stores/workflowStore.ts

@@ -4,10 +4,18 @@ import { defineStore } from 'pinia'
 import { type Raw, computed, markRaw, ref, shallowRef, watch } from 'vue'
 
 import { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
+import type { NodeId } from '@/schemas/comfyWorkflowSchema'
 import { api } from '@/scripts/api'
 import { app as comfyApp } from '@/scripts/app'
 import { ChangeTracker } from '@/scripts/changeTracker'
 import { defaultGraphJSON } from '@/scripts/defaultGraph'
+import type { NodeExecutionId, NodeLocatorId } from '@/types/nodeIdentification'
+import {
+  createNodeExecutionId,
+  createNodeLocatorId,
+  parseNodeExecutionId,
+  parseNodeLocatorId
+} from '@/types/nodeIdentification'
 import { getPathDetails } from '@/utils/formatUtil'
 import { syncEntities } from '@/utils/syncUtil'
 import { isSubgraph } from '@/utils/typeGuardUtil'
@@ -163,6 +171,15 @@ export interface WorkflowStore {
   /** Updates the {@link subgraphNamePath} and {@link isSubgraphActive} values. */
   updateActiveGraph: () => void
   executionIdToCurrentId: (id: string) => any
+  nodeIdToNodeLocatorId: (nodeId: NodeId, subgraph?: Subgraph) => NodeLocatorId
+  nodeExecutionIdToNodeLocatorId: (
+    nodeExecutionId: NodeExecutionId | string
+  ) => NodeLocatorId | null
+  nodeLocatorIdToNodeId: (locatorId: NodeLocatorId | string) => NodeId | null
+  nodeLocatorIdToNodeExecutionId: (
+    locatorId: NodeLocatorId | string,
+    targetSubgraph?: Subgraph
+  ) => NodeExecutionId | null
 }
 
 export const useWorkflowStore = defineStore('workflow', () => {
@@ -473,7 +490,7 @@ export const useWorkflowStore = defineStore('workflow', () => {
       return
     }
 
-    // Parse the hierarchical ID (e.g., "123:456:789")
+    // Parse the execution ID (e.g., "123:456:789")
     const subgraphNodeIds = id.split(':')
 
     // Start from the root graph
@@ -488,6 +505,136 @@ export const useWorkflowStore = defineStore('workflow', () => {
 
   watch(activeWorkflow, updateActiveGraph)
 
+  /**
+   * Convert a node ID to a NodeLocatorId
+   * @param nodeId The local node ID
+   * @param subgraph The subgraph containing the node (defaults to active subgraph)
+   * @returns The NodeLocatorId (for root graph nodes, returns the node ID as-is)
+   */
+  const nodeIdToNodeLocatorId = (
+    nodeId: NodeId,
+    subgraph?: Subgraph
+  ): NodeLocatorId => {
+    const targetSubgraph = subgraph ?? activeSubgraph.value
+    if (!targetSubgraph) {
+      // Node is in the root graph, return the node ID as-is
+      return String(nodeId) as NodeLocatorId
+    }
+
+    return createNodeLocatorId(targetSubgraph.id, nodeId)
+  }
+
+  /**
+   * Convert an execution ID to a NodeLocatorId
+   * @param nodeExecutionId The execution node ID (e.g., "123:456:789")
+   * @returns The NodeLocatorId or null if conversion fails
+   */
+  const nodeExecutionIdToNodeLocatorId = (
+    nodeExecutionId: NodeExecutionId | string
+  ): NodeLocatorId | null => {
+    // Handle simple node IDs (root graph - no colons)
+    if (!nodeExecutionId.includes(':')) {
+      return nodeExecutionId as NodeLocatorId
+    }
+
+    const parts = parseNodeExecutionId(nodeExecutionId)
+    if (!parts || parts.length === 0) return null
+
+    const nodeId = parts[parts.length - 1]
+    const subgraphNodeIds = parts.slice(0, -1)
+
+    if (subgraphNodeIds.length === 0) {
+      // Node is in root graph, return the node ID as-is
+      return String(nodeId) as NodeLocatorId
+    }
+
+    try {
+      const subgraphs = getSubgraphsFromInstanceIds(
+        comfyApp.graph,
+        subgraphNodeIds.map((id) => String(id))
+      )
+      const immediateSubgraph = subgraphs[subgraphs.length - 1]
+      return createNodeLocatorId(immediateSubgraph.id, nodeId)
+    } catch {
+      return null
+    }
+  }
+
+  /**
+   * Extract the node ID from a NodeLocatorId
+   * @param locatorId The NodeLocatorId
+   * @returns The local node ID or null if invalid
+   */
+  const nodeLocatorIdToNodeId = (
+    locatorId: NodeLocatorId | string
+  ): NodeId | null => {
+    const parsed = parseNodeLocatorId(locatorId)
+    return parsed?.localNodeId ?? null
+  }
+
+  /**
+   * Convert a NodeLocatorId to an execution ID for a specific context
+   * @param locatorId The NodeLocatorId
+   * @param targetSubgraph The subgraph context (defaults to active subgraph)
+   * @returns The execution ID or null if the node is not accessible from the target context
+   */
+  const nodeLocatorIdToNodeExecutionId = (
+    locatorId: NodeLocatorId | string,
+    targetSubgraph?: Subgraph
+  ): NodeExecutionId | null => {
+    const parsed = parseNodeLocatorId(locatorId)
+    if (!parsed) return null
+
+    const { subgraphUuid, localNodeId } = parsed
+
+    // If no subgraph UUID, this is a root graph node
+    if (!subgraphUuid) {
+      return String(localNodeId) as NodeExecutionId
+    }
+
+    // Find the path from root to the subgraph with this UUID
+    const findSubgraphPath = (
+      graph: LGraph | Subgraph,
+      targetUuid: string,
+      path: NodeId[] = []
+    ): NodeId[] | null => {
+      if (isSubgraph(graph) && graph.id === targetUuid) {
+        return path
+      }
+
+      for (const node of graph._nodes) {
+        if (node.isSubgraphNode?.() && (node as any).subgraph) {
+          const result = findSubgraphPath((node as any).subgraph, targetUuid, [
+            ...path,
+            node.id
+          ])
+          if (result) return result
+        }
+      }
+
+      return null
+    }
+
+    const path = findSubgraphPath(comfyApp.graph, subgraphUuid)
+    if (!path) return null
+
+    // If we have a target subgraph, check if the path goes through it
+    if (
+      targetSubgraph &&
+      !path.some((_, idx) => {
+        const subgraphs = getSubgraphsFromInstanceIds(
+          comfyApp.graph,
+          path.slice(0, idx + 1).map((id) => String(id))
+        )
+        return subgraphs[subgraphs.length - 1] === targetSubgraph
+      })
+    ) {
+      return null
+    }
+
+    return createNodeExecutionId([...path, localNodeId])
+  }
+
   return {
     activeWorkflow,
     isActive,
@@ -514,7 +661,11 @@ export const useWorkflowStore = defineStore('workflow', () => {
     isSubgraphActive,
     activeSubgraph,
     updateActiveGraph,
-    executionIdToCurrentId
+    executionIdToCurrentId,
+    nodeIdToNodeLocatorId,
+    nodeExecutionIdToNodeLocatorId,
+    nodeLocatorIdToNodeId,
+    nodeLocatorIdToNodeExecutionId
   }
 }) satisfies () => WorkflowStore
 

src/types/comfyManagerTypes.ts

@@ -1,13 +1,25 @@
 import type { InjectionKey, Ref } from 'vue'
 
+import type { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
 import type { AlgoliaNodePack } from '@/types/algoliaTypes'
 import type { components } from '@/types/comfyRegistryTypes'
+import type { SearchMode } from '@/types/searchServiceTypes'
+
+type WorkflowNodeProperties = ComfyWorkflowJSON['nodes'][0]['properties']
+
+export type RegistryPack = components['schemas']['Node']
+export type MergedNodePack = RegistryPack & AlgoliaNodePack
+export const isMergedNodePack = (
+  nodePack: RegistryPack | AlgoliaNodePack
+): nodePack is MergedNodePack => 'comfy_nodes' in nodePack
+
+export type PackField = keyof RegistryPack | null
 
 export const IsInstallingKey: InjectionKey<Ref<boolean>> =
   Symbol('isInstalling')
 
 export enum ManagerWsQueueStatus {
-  DONE = 'all-done',
+  DONE = 'done',
   IN_PROGRESS = 'in_progress'
 }
 
@@ -40,7 +52,6 @@ export interface SearchOption<T> {
 
 export type TaskLog = {
   taskName: string
-  taskId: string
   logs: string[]
 }
 
@@ -49,25 +60,185 @@ export interface UseNodePacksOptions {
   maxConcurrent?: number
 }
 
-// Node pack types from different sources
-export type RegistryPack = components['schemas']['Node']
+enum ManagerPackState {
+  /** Pack is installed and enabled */
+  INSTALLED = 'installed',
+  /** Pack is installed but disabled */
+  DISABLED = 'disabled',
+  /** Pack is not installed */
+  NOT_INSTALLED = 'not_installed',
+  /** Pack failed to import */
+  IMPORT_FAILED = 'import_failed',
+  /** Pack has an update available */
+  NEEDS_UPDATE = 'needs_update'
+}
 
-// MergedNodePack is the intersection of AlgoliaNodePack and RegistryPack
-// created by lodash merge operation: merge({}, algoliaNodePack, registryPack)
-export type MergedNodePack = AlgoliaNodePack & RegistryPack
+enum ManagerPackInstallType {
+  /** Installed via git clone */
+  GIT = 'git-clone',
+  /** Installed via file copy */
+  COPY = 'copy',
+  /** Installed from the Comfy Registry */
+  REGISTRY = 'cnr'
+}
+
+export enum SelectedVersion {
+  /** Latest version of the pack from the registry */
+  LATEST = 'latest',
+  /** Latest commit of the pack from its GitHub repository */
+  NIGHTLY = 'nightly'
+}
+
+export enum ManagerChannel {
+  /** All packs except those with instability or security issues */
+  DEFAULT = 'default',
+  /** Packs that were recently updated */
+  RECENT = 'recent',
+  /** Packs that were superseded by distinct replacements of some type */
+  LEGACY = 'legacy',
+  /** Packs that were forked as a result of the original pack going unmaintained */
+  FORKED = 'forked',
+  /** Packs with instability or security issues suitable only for developers */
+  DEV = 'dev',
+  /** Packs suitable for beginners */
+  TUTORIAL = 'tutorial'
+}
+
+export enum ManagerDatabaseSource {
+  /** Get pack info from the Comfy Registry */
+  REMOTE = 'remote',
+  /** If set to `local`, the channel is ignored */
+  LOCAL = 'local',
+  /** Get pack info from the cached response from the Comfy Registry (1 day TTL) */
+  CACHE = 'cache'
+}
+
+export interface ManagerQueueStatus {
+  /** `done_count` + `in_progress_count` + number of items queued */
+  total_count: number
+  /** Task worker thread is alive, a queued operation is running */
+  is_processing: boolean
+  /** Number of items in the queue that have been completed */
+  done_count: number
+  /** Number of items in the queue that are currently running */
+  in_progress_count: number
+}
+
+export interface ManagerPackInfo {
+  /** Either github-author/github-repo or name of pack from the registry (not id) */
+  id: WorkflowNodeProperties['aux_id'] | WorkflowNodeProperties['cnr_id']
+  /** Semantic version or Git commit hash */
+  version: WorkflowNodeProperties['ver']
+}
+
+export interface ManagerPackInstalled {
+  /**
+   * The version of the pack that is installed.
+   * Git commit hash or semantic version.
+   */
+  ver: WorkflowNodeProperties['ver']
+  /**
+   * The name of the pack if the pack is installed from the registry.
+   * Corresponds to `Node#name` in comfy-api.
+   */
+  cnr_id: WorkflowNodeProperties['cnr_id']
+  /**
+   * The name of the pack if the pack is installed from github.
+   * In the format author/repo-name. If the pack is installed from the registry, this is `null`.
+   */
+  aux_id: WorkflowNodeProperties['aux_id'] | null
+  enabled: boolean
+}
 
 /**
- * Type guard to check if a node pack is from Algolia (has comfy_nodes)
+ * Returned by `/customnode/installed`
  */
-export function isMergedNodePack(
-  pack: MergedNodePack | RegistryPack
-): pack is MergedNodePack {
-  return 'comfy_nodes' in pack && Array.isArray(pack.comfy_nodes)
+export type InstalledPacksResponse = Record<
+  NonNullable<RegistryPack['name']>,
+  ManagerPackInstalled
+>
+
+/**
+ * Returned by `/customnode/getlist`
+ */
+export interface ManagerPack extends ManagerPackInfo {
+  /** Pack author name or 'Unclaimed' if the pack was added automatically via GitHub crawl. */
+  author: components['schemas']['Node']['author']
+  /** Files included in the pack */
+  files: string[]
+  /** The type of installation that was used to install the pack */
+  reference: string
+  /** The display name of the pack */
+  title: string
+  /** The latest version of the pack */
+  cnr_latest: SelectedVersion
+  /** The github link to the repository of the pack */
+  repository: string
+  /** The state of the pack */
+  state: ManagerPackState
+  /** The state of the pack update */
+  'update-state': 'false' | 'true' | null
+  /** The number of stars the pack has on GitHub. Distinct from registry stars */
+  stars: number
+  /**
+   * The last time the pack was updated. In ISO 8601 format.
+   * @example '2024-05-22 20:00:00'
+   */
+  last_update: string
+  health: string
+  description: string
+  trust: boolean
+  install_type: ManagerPackInstallType
+}
+
+/**
+ * Returned by `/customnode/getmappings`.
+ */
+export type ManagerMappings = Record<
+  NonNullable<components['schemas']['Node']['name']>,
+  [
+    /** List of ComfyNode names included in the pack */
+    Array<components['schemas']['ComfyNode']['comfy_node_name']>,
+    {
+      /** The display name of the pack */
+      title_aux: string
+    }
+  ]
+>
+
+/**
+ * Payload for `/manager/queue/install`
+ */
+export interface InstallPackParams extends ManagerPackInfo {
+  /**
+   * Semantic version, Git commit hash, `latest`, or `nightly`.
+   */
+  selected_version: WorkflowNodeProperties['ver'] | SelectedVersion
+  /**
+   * The GitHub link to the repository of the pack to install.
+   * Required if `selected_version` is `nightly`.
+   */
+  repository: string
+  /**
+   * List of PyPi dependency names associated with the pack.
+   * Used in coordination with pip package whitelist and version lock features.
+   */
+  pip?: string[]
+  mode: ManagerDatabaseSource
+  channel: ManagerChannel
+  skip_post_install?: boolean
+}
+
+/**
+ * Params for `/manager/queue/update_all`
+ */
+export interface UpdateAllPacksParams {
+  mode?: ManagerDatabaseSource
 }
 
 export interface ManagerState {
   selectedTabId: ManagerTab
   searchQuery: string
-  searchMode: 'nodes' | 'packs'
+  searchMode: SearchMode
   sortField: string
 }

src/types/comfyRegistryTypes.ts

@@ -699,27 +699,6 @@ export interface paths {
     patch?: never
     trace?: never
   }
-  '/publishers/{publisherId}/nodes/{nodeId}/claim-my-node': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /**
-     * Claim nodeId into publisherId for the authenticated publisher
-     * @description This endpoint allows a publisher to claim an unclaimed node that they own the repo, which is identified by the nodeId. The unclaimed node's repository must be owned by the authenticated user.
-     *
-     */
-    post: operations['claimMyNode']
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
   '/publishers/{publisherId}/nodes/v2': {
     parameters: {
       query?: never
@@ -1082,23 +1061,6 @@ export interface paths {
     patch?: never
     trace?: never
   }
-  '/bulk/nodes/versions': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /** Retrieve multiple node versions in a single request */
-    post: operations['getBulkNodeVersions']
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
   '/versions': {
     parameters: {
       query?: never
@@ -1133,26 +1095,6 @@ export interface paths {
     patch?: never
     trace?: never
   }
-  '/admin/nodes/{nodeId}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    /**
-     * Admin Update Node
-     * @description Only admins can update a node with admin privileges.
-     */
-    put: operations['adminUpdateNode']
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
   '/admin/nodes/{nodeId}/versions/{versionNumber}': {
     parameters: {
       query?: never
@@ -3009,7 +2951,7 @@ export interface paths {
     patch?: never
     trace?: never
   }
-  '/proxy/moonvalley/prompts/text-to-video': {
+  '/proxy/moonvalley/text-to-video': {
     parameters: {
       query?: never
       header?: never
@@ -3026,7 +2968,7 @@ export interface paths {
     patch?: never
     trace?: never
   }
-  '/proxy/moonvalley/prompts/text-to-image': {
+  '/proxy/moonvalley/text-to-image': {
     parameters: {
       query?: never
       header?: never
@@ -3115,37 +3057,6 @@ export interface paths {
 export type webhooks = Record<string, never>
 export interface components {
   schemas: {
-    ClaimMyNodeRequest: {
-      /** @description GitHub token to verify if the user owns the repo of the node */
-      GH_TOKEN: string
-    }
-    BulkNodeVersionsRequest: {
-      /** @description List of node ID and version pairs to retrieve */
-      node_versions: components['schemas']['NodeVersionIdentifier'][]
-    }
-    NodeVersionIdentifier: {
-      /** @description The unique identifier of the node */
-      node_id: string
-      /** @description The version of the node */
-      version: string
-    }
-    BulkNodeVersionsResponse: {
-      /** @description List of retrieved node versions with their status */
-      node_versions: components['schemas']['BulkNodeVersionResult'][]
-    }
-    BulkNodeVersionResult: {
-      /** @description The node and version identifier */
-      identifier: components['schemas']['NodeVersionIdentifier']
-      /**
-       * @description Status of the retrieval operation
-       * @enum {string}
-       */
-      status: 'success' | 'not_found' | 'error'
-      /** @description The retrieved node version data (only present if status is success) */
-      node_version?: components['schemas']['NodeVersion']
-      /** @description Error message if retrieval failed (only present if status is error) */
-      error_message?: string
-    }
     PersonalAccessToken: {
       /**
        * Format: uuid
@@ -8802,212 +8713,71 @@ export interface components {
       | 'computer-use-preview'
       | 'computer-use-preview-2025-03-11'
       | 'chatgpt-4o-latest'
-    MoonvalleyTextToVideoInferenceParams: {
-      /**
-       * @description Height of the generated video in pixels
-       * @default 1080
-       */
+    MoonvalleyInferenceParams: {
+      /** @default 1080 */
       height: number
-      /**
-       * @description Width of the generated video in pixels
-       * @default 1920
-       */
+      /** @default 1920 */
       width: number
-      /**
-       * @description Number of frames to generate
-       * @default 64
-       */
+      /** @default 64 */
       num_frames: number
-      /**
-       * @description Frames per second of the generated video
-       * @default 24
-       */
+      /** @default 24 */
       fps: number
       /**
        * Format: float
-       * @description Guidance scale for generation control
-       * @default 10
+       * @default 12.5
        */
       guidance_scale: number
-      /** @description Random seed for generation (default: random) */
       seed?: number
-      /**
-       * @description Number of denoising steps
-       * @default 80
-       */
+      /** @default 80 */
       steps: number
-      /**
-       * @description Whether to use timestep transformation
-       * @default true
-       */
+      /** @default true */
       use_timestep_transform: boolean
       /**
        * Format: float
-       * @description Shift value for generation control
        * @default 3
        */
       shift_value: number
-      /**
-       * @description Whether to use guidance scheduling
-       * @default true
-       */
+      /** @default true */
       use_guidance_schedule: boolean
-      /**
-       * @description Whether to add quality guidance
-       * @default true
-       */
+      /** @default true */
       add_quality_guidance: boolean
       /**
        * Format: float
-       * @description CLIP value for generation control
        * @default 3
        */
       clip_value: number
-      /**
-       * @description Whether to use negative prompts
-       * @default false
-       */
+      /** @default false */
       use_negative_prompts: boolean
-      /** @description Negative prompt text */
       negative_prompt?: string
-      /**
-       * @description Number of warmup steps (calculated based on num_frames)
-       * @default 0
-       */
-      warmup_steps: number
-      /**
-       * @description Number of cooldown steps (calculated based on num_frames)
-       * @default 75
-       */
-      cooldown_steps: number
+      warmup_steps?: number
+      cooldown_steps?: number
       /**
        * Format: float
-       * @description Caching coefficient for optimization
        * @default 0.3
        */
       caching_coefficient: number
-      /**
-       * @description Number of caching warmup steps
-       * @default 3
-       */
+      /** @default 3 */
       caching_warmup: number
-      /**
-       * @description Number of caching cooldown steps
-       * @default 3
-       */
+      /** @default 3 */
       caching_cooldown: number
-      /**
-       * @description Index of the conditioning frame
-       * @default 0
-       */
-      conditioning_frame_index: number
-    }
-    MoonvalleyVideoToVideoInferenceParams: {
-      /**
-       * Format: float
-       * @description Guidance scale for generation control
-       * @default 15
-       */
-      guidance_scale: number
-      /** @description Random seed for generation (default: random) */
-      seed?: number
-      /**
-       * @description Number of denoising steps
-       * @default 80
-       */
-      steps: number
-      /**
-       * @description Whether to use timestep transformation
-       * @default true
-       */
-      use_timestep_transform: boolean
-      /**
-       * Format: float
-       * @description Shift value for generation control
-       * @default 3
-       */
-      shift_value: number
-      /**
-       * @description Whether to use guidance scheduling
-       * @default true
-       */
-      use_guidance_schedule: boolean
-      /**
-       * @description Whether to add quality guidance
-       * @default true
-       */
-      add_quality_guidance: boolean
-      /**
-       * Format: float
-       * @description CLIP value for generation control
-       * @default 3
-       */
-      clip_value: number
-      /**
-       * @description Whether to use negative prompts
-       * @default false
-       */
-      use_negative_prompts: boolean
-      /** @description Negative prompt text */
-      negative_prompt?: string
-      /**
-       * @description Number of warmup steps (calculated based on num_frames)
-       * @default 24
-       */
-      warmup_steps: number
-      /**
-       * @description Number of cooldown steps (calculated based on num_frames)
-       * @default 36
-       */
-      cooldown_steps: number
-      /**
-       * Format: float
-       * @description Caching coefficient for optimization
-       * @default 0.3
-       */
-      caching_coefficient: number
-      /**
-       * @description Number of caching warmup steps
-       * @default 3
-       */
-      caching_warmup: number
-      /**
-       * @description Number of caching cooldown steps
-       * @default 3
-       */
-      caching_cooldown: number
-      /**
-       * @description Index of the conditioning frame
-       * @default 0
-       */
+      /** @default 0 */
       conditioning_frame_index: number
     }
     MoonvalleyTextToImageRequest: {
       prompt_text?: string
       image_url?: string
-      inference_params?: components['schemas']['MoonvalleyTextToVideoInferenceParams']
+      inference_params?: components['schemas']['MoonvalleyInferenceParams']
       webhook_url?: string
     }
     MoonvalleyTextToVideoRequest: {
       prompt_text?: string
       image_url?: string
-      inference_params?: components['schemas']['MoonvalleyTextToVideoInferenceParams']
+      inference_params?: components['schemas']['MoonvalleyInferenceParams']
       webhook_url?: string
     }
-    MoonvalleyVideoToVideoRequest: {
-      /** @description Describes the video to generate */
-      prompt_text: string
-      /** @description Url to control video */
+    MoonvalleyVideoToVideoRequest: components['schemas']['MoonvalleyTextToVideoRequest'] & {
       video_url: string
-      /**
-       * @description Supported types for video control
-       * @enum {string}
-       */
-      control_type: 'motion_control' | 'pose_control'
-      /** @description Parameters for video-to-video generation inference */
-      inference_params?: components['schemas']['MoonvalleyVideoToVideoInferenceParams']
-      /** @description Optional webhook URL for notifications */
-      webhook_url?: string
+      control_type: string
     }
     MoonvalleyPromptResponse: {
       id?: string
@@ -10651,89 +10421,6 @@ export interface operations {
       }
     }
   }
-  claimMyNode: {
-    parameters: {
-      query?: never
-      header?: never
-      path: {
-        publisherId: string
-        nodeId: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['ClaimMyNodeRequest']
-      }
-    }
-    responses: {
-      /** @description Node claimed successfully */
-      204: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Bad request, invalid input data */
-      400: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden - various authorization and permission issues
-       *     Includes:
-       *     - The authenticated user does not have permission to claim the node
-       *     - The node is already claimed by another publisher
-       *     - The GH_TOKEN is invalid
-       *     - The repository is not owned by the authenticated GitHub user
-       *      */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-      /** @description Too many requests - GitHub API rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-      /** @description Internal server error */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-      /** @description Service unavailable - GitHub API is currently unavailable */
-      503: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-    }
-  }
   listNodesForPublisherV2: {
     parameters: {
       query?: {
@@ -12022,48 +11709,6 @@ export interface operations {
       }
     }
   }
-  getBulkNodeVersions: {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['BulkNodeVersionsRequest']
-      }
-    }
-    responses: {
-      /** @description Successfully retrieved node versions */
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['BulkNodeVersionsResponse']
-        }
-      }
-      /** @description Bad request, invalid input */
-      400: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-      /** @description Internal server error */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-    }
-  }
   listAllNodeVersions: {
     parameters: {
       query?: {
@@ -12189,75 +11834,6 @@ export interface operations {
       }
     }
   }
-  adminUpdateNode: {
-    parameters: {
-      query?: never
-      header?: never
-      path: {
-        nodeId: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['Node']
-      }
-    }
-    responses: {
-      /** @description Node updated successfully */
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['Node']
-        }
-      }
-      /** @description Bad request, invalid input data. */
-      400: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-      /** @description Node not found */
-      404: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-      /** @description Internal server error */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ErrorResponse']
-        }
-      }
-    }
-  }
   adminUpdateNodeVersion: {
     parameters: {
       query?: never

src/types/index.ts

@@ -31,6 +31,16 @@ export type { ComfyApi } from '@/scripts/api'
 export type { ComfyApp } from '@/scripts/app'
 export type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 export type { InputSpec } from '@/schemas/nodeDefSchema'
+export type {
+  NodeLocatorId,
+  NodeExecutionId,
+  isNodeLocatorId,
+  isNodeExecutionId,
+  parseNodeLocatorId,
+  createNodeLocatorId,
+  parseNodeExecutionId,
+  createNodeExecutionId
+} from './nodeIdentification'
 export type {
   EmbeddingsResponse,
   ExtensionsResponse,

src/types/nodeIdentification.ts

@@ -0,0 +1,123 @@
+import type { NodeId } from '@/schemas/comfyWorkflowSchema'
+
+/**
+ * A globally unique identifier for nodes that maintains consistency across
+ * multiple instances of the same subgraph.
+ *
+ * Format:
+ * - For subgraph nodes: `<immediate-contained-subgraph-uuid>:<local-node-id>`
+ * - For root graph nodes: `<local-node-id>`
+ *
+ * Examples:
+ * - "a1b2c3d4-e5f6-7890-abcd-ef1234567890:123" (node in subgraph)
+ * - "456" (node in root graph)
+ *
+ * Unlike execution IDs which change based on the instance path,
+ * NodeLocatorId remains the same for all instances of a particular node.
+ */
+export type NodeLocatorId = string
+
+/**
+ * An execution identifier representing a node's position in nested subgraphs.
+ * Also known as ExecutionId in some contexts.
+ *
+ * Format: Colon-separated path of node IDs
+ * Example: "123:456:789" (node 789 in subgraph 456 in subgraph 123)
+ */
+export type NodeExecutionId = string
+
+/**
+ * Type guard to check if a value is a NodeLocatorId
+ */
+export function isNodeLocatorId(value: unknown): value is NodeLocatorId {
+  if (typeof value !== 'string') return false
+
+  // Check if it's a simple node ID (root graph node)
+  const parts = value.split(':')
+  if (parts.length === 1) {
+    // Simple node ID - must be non-empty
+    return value.length > 0
+  }
+
+  // Check for UUID:nodeId format
+  if (parts.length !== 2) return false
+
+  // Check that node ID part is not empty
+  if (!parts[1]) return false
+
+  // Basic UUID format check (8-4-4-4-12 hex characters)
+  const uuidPattern =
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+  return uuidPattern.test(parts[0])
+}
+
+/**
+ * Type guard to check if a value is a NodeExecutionId
+ */
+export function isNodeExecutionId(value: unknown): value is NodeExecutionId {
+  if (typeof value !== 'string') return false
+  // Must contain at least one colon to be an execution ID
+  return value.includes(':')
+}
+
+/**
+ * Parse a NodeLocatorId into its components
+ * @param id The NodeLocatorId to parse
+ * @returns The subgraph UUID and local node ID, or null if invalid
+ */
+export function parseNodeLocatorId(
+  id: string
+): { subgraphUuid: string | null; localNodeId: NodeId } | null {
+  if (!isNodeLocatorId(id)) return null
+
+  const parts = id.split(':')
+
+  if (parts.length === 1) {
+    // Simple node ID (root graph)
+    return {
+      subgraphUuid: null,
+      localNodeId: isNaN(Number(id)) ? id : Number(id)
+    }
+  }
+
+  const [subgraphUuid, localNodeId] = parts
+  return {
+    subgraphUuid,
+    localNodeId: isNaN(Number(localNodeId)) ? localNodeId : Number(localNodeId)
+  }
+}
+
+/**
+ * Create a NodeLocatorId from components
+ * @param subgraphUuid The UUID of the immediate containing subgraph
+ * @param localNodeId The local node ID within that subgraph
+ * @returns A properly formatted NodeLocatorId
+ */
+export function createNodeLocatorId(
+  subgraphUuid: string,
+  localNodeId: NodeId
+): NodeLocatorId {
+  return `${subgraphUuid}:${localNodeId}` as NodeLocatorId
+}
+
+/**
+ * Parse a NodeExecutionId into its component node IDs
+ * @param id The NodeExecutionId to parse
+ * @returns Array of node IDs from root to target, or null if not an execution ID
+ */
+export function parseNodeExecutionId(id: string): NodeId[] | null {
+  if (!isNodeExecutionId(id)) return null
+
+  return id
+    .split(':')
+    .map((part) => (isNaN(Number(part)) ? part : Number(part)))
+}
+
+/**
+ * Create a NodeExecutionId from an array of node IDs
+ * @param nodeIds Array of node IDs from root to target
+ * @returns A properly formatted NodeExecutionId
+ */
+export function createNodeExecutionId(nodeIds: NodeId[]): NodeExecutionId {
+  return nodeIds.join(':') as NodeExecutionId
+}

tests-ui/tests/composables/BrowserTabTitle.spec.ts

@@ -3,12 +3,20 @@ import { nextTick, reactive } from 'vue'
 
 import { useBrowserTabTitle } from '@/composables/useBrowserTabTitle'
 
+// Mock i18n module
+vi.mock('@/i18n', () => ({
+  t: (key: string, fallback: string) =>
+    key === 'g.nodesRunning' ? 'nodes running' : fallback
+}))
+
 // Mock the execution store
 const executionStore = reactive({
   isIdle: true,
   executionProgress: 0,
   executingNode: null as any,
-  executingNodeProgress: 0
+  executingNodeProgress: 0,
+  nodeProgressStates: {} as any,
+  activePrompt: null as any
 })
 vi.mock('@/stores/executionStore', () => ({
   useExecutionStore: () => executionStore
@@ -37,6 +45,8 @@ describe('useBrowserTabTitle', () => {
     executionStore.executionProgress = 0
     executionStore.executingNode = null as any
     executionStore.executingNodeProgress = 0
+    executionStore.nodeProgressStates = {}
+    executionStore.activePrompt = null
 
     // reset setting and workflow stores
     ;(settingStore.get as any).mockReturnValue('Enabled')
@@ -97,13 +107,41 @@ describe('useBrowserTabTitle', () => {
     expect(document.title).toBe('[30%]ComfyUI')
   })
 
-  it('shows node execution title when executing a node', async () => {
+  it('shows node execution title when executing a node using nodeProgressStates', async () => {
     executionStore.isIdle = false
     executionStore.executionProgress = 0.4
-    executionStore.executingNodeProgress = 0.5
-    executionStore.executingNode = { type: 'Foo' }
+    executionStore.nodeProgressStates = {
+      '1': { state: 'running', value: 5, max: 10, node: '1', prompt_id: 'test' }
+    }
+    executionStore.activePrompt = {
+      workflow: {
+        changeTracker: {
+          activeState: {
+            nodes: [{ id: 1, type: 'Foo' }]
+          }
+        }
+      }
+    }
     useBrowserTabTitle()
     await nextTick()
     expect(document.title).toBe('[40%][50%] Foo')
   })
+
+  it('shows multiple nodes running when multiple nodes are executing', async () => {
+    executionStore.isIdle = false
+    executionStore.executionProgress = 0.4
+    executionStore.nodeProgressStates = {
+      '1': {
+        state: 'running',
+        value: 5,
+        max: 10,
+        node: '1',
+        prompt_id: 'test'
+      },
+      '2': { state: 'running', value: 8, max: 10, node: '2', prompt_id: 'test' }
+    }
+    useBrowserTabTitle()
+    await nextTick()
+    expect(document.title).toBe('[40%][2 nodes running]')
+  })
 })

tests-ui/tests/composables/useServerLogs.test.ts

@@ -24,22 +24,22 @@ describe('useServerLogs', () => {
   })
 
   it('should initialize with empty logs array', () => {
-    const { logs } = useServerLogs({ ui_id: 'test-ui-id' })
+    const { logs } = useServerLogs()
     expect(logs.value).toEqual([])
   })
 
   it('should not subscribe to logs by default', () => {
-    useServerLogs({ ui_id: 'test-ui-id' })
+    useServerLogs()
     expect(api.subscribeLogs).not.toHaveBeenCalled()
   })
 
   it('should subscribe to logs when immediate is true', () => {
-    useServerLogs({ ui_id: 'test-ui-id', immediate: true })
+    useServerLogs({ immediate: true })
     expect(api.subscribeLogs).toHaveBeenCalledWith(true)
   })
 
   it('should start listening when startListening is called', async () => {
-    const { startListening } = useServerLogs({ ui_id: 'test-ui-id' })
+    const { startListening } = useServerLogs()
 
     await startListening()
 
@@ -47,21 +47,16 @@ describe('useServerLogs', () => {
   })
 
   it('should stop listening when stopListening is called', async () => {
-    const { startListening, stopListening } = useServerLogs({
-      ui_id: 'test-ui-id'
-    })
+    const { startListening, stopListening } = useServerLogs()
 
     await startListening()
     await stopListening()
 
-    // TODO: Update this test when subscribeLogs(false) is re-enabled
-    // Currently commented out in useServerLogs to prevent logs from stopping
-    // after 1st of multiple queue tasks
-    expect(api.subscribeLogs).toHaveBeenCalledWith(true)
+    expect(api.subscribeLogs).toHaveBeenCalledWith(false)
   })
 
   it('should register event listener when starting', async () => {
-    const { startListening } = useServerLogs({ ui_id: 'test-ui-id' })
+    const { startListening } = useServerLogs()
 
     await startListening()
 
@@ -73,30 +68,16 @@ describe('useServerLogs', () => {
   })
 
   it('should handle log messages correctly', async () => {
-    const { logs, startListening } = useServerLogs({ ui_id: 'test-ui-id' })
+    const { logs, startListening } = useServerLogs()
 
     await startListening()
 
-    // Get the callbacks that were registered with useEventListener
-    const mockCalls = vi.mocked(useEventListener).mock.calls
-    const logsCallback = mockCalls.find((call) => call[1] === 'logs')?.[2] as (
+    // Get the callback that was registered with useEventListener
+    const eventCallback = vi.mocked(useEventListener).mock.calls[0][2] as (
       event: CustomEvent<LogsWsMessage>
     ) => void
-    const taskStartedCallback = mockCalls.find(
-      (call) => call[1] === 'cm-task-started'
-    )?.[2] as (event: CustomEvent<any>) => void
 
-    // First, simulate task started event
-    const taskStartedEvent = new CustomEvent('cm-task-started', {
-      detail: {
-        type: 'cm-task-started',
-        ui_id: 'test-ui-id'
-      }
-    })
-    taskStartedCallback(taskStartedEvent)
-    await nextTick()
-
-    // Now simulate receiving a log event
+    // Simulate receiving a log event
     const mockEvent = new CustomEvent('logs', {
       detail: {
         type: 'logs',
@@ -104,7 +85,7 @@ describe('useServerLogs', () => {
       } as unknown as LogsWsMessage
     }) as CustomEvent<LogsWsMessage>
 
-    logsCallback(mockEvent)
+    eventCallback(mockEvent)
     await nextTick()
 
     expect(logs.value).toEqual(['Log message 1', 'Log message 2'])
@@ -112,32 +93,15 @@ describe('useServerLogs', () => {
 
   it('should use the message filter if provided', async () => {
     const { logs, startListening } = useServerLogs({
-      ui_id: 'test-ui-id',
       messageFilter: (msg) => msg !== 'remove me'
     })
 
     await startListening()
 
-    // Get the callbacks that were registered with useEventListener
-    const mockCalls = vi.mocked(useEventListener).mock.calls
-    const logsCallback = mockCalls.find((call) => call[1] === 'logs')?.[2] as (
+    const eventCallback = vi.mocked(useEventListener).mock.calls[0][2] as (
       event: CustomEvent<LogsWsMessage>
     ) => void
-    const taskStartedCallback = mockCalls.find(
-      (call) => call[1] === 'cm-task-started'
-    )?.[2] as (event: CustomEvent<any>) => void
 
-    // First, simulate task started event
-    const taskStartedEvent = new CustomEvent('cm-task-started', {
-      detail: {
-        type: 'cm-task-started',
-        ui_id: 'test-ui-id'
-      }
-    })
-    taskStartedCallback(taskStartedEvent)
-    await nextTick()
-
-    // Now simulate receiving a log event
     const mockEvent = new CustomEvent('logs', {
       detail: {
         type: 'logs',
@@ -149,7 +113,7 @@ describe('useServerLogs', () => {
       } as unknown as LogsWsMessage
     }) as CustomEvent<LogsWsMessage>
 
-    logsCallback(mockEvent)
+    eventCallback(mockEvent)
     await nextTick()
 
     expect(logs.value).toEqual(['Log message 1 dont remove me', ''])

tests-ui/tests/composables/useUpdateAvailableNodes.test.ts

@@ -1,360 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick, ref } from 'vue'
-
-import { useInstalledPacks } from '@/composables/nodePack/useInstalledPacks'
-import { useUpdateAvailableNodes } from '@/composables/nodePack/useUpdateAvailableNodes'
-import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-// Import mocked utils
-import { compareVersions, isSemVer } from '@/utils/formatUtil'
-
-// Mock Vue's onMounted to execute immediately for testing
-vi.mock('vue', async () => {
-  const actual = await vi.importActual('vue')
-  return {
-    ...actual,
-    onMounted: (cb: () => void) => cb()
-  }
-})
-
-// Mock the dependencies
-vi.mock('@/composables/nodePack/useInstalledPacks', () => ({
-  useInstalledPacks: vi.fn()
-}))
-
-vi.mock('@/stores/comfyManagerStore', () => ({
-  useComfyManagerStore: vi.fn()
-}))
-
-vi.mock('@/utils/formatUtil', () => ({
-  compareVersions: vi.fn(),
-  isSemVer: vi.fn()
-}))
-
-const mockUseInstalledPacks = vi.mocked(useInstalledPacks)
-const mockUseComfyManagerStore = vi.mocked(useComfyManagerStore)
-
-const mockCompareVersions = vi.mocked(compareVersions)
-const mockIsSemVer = vi.mocked(isSemVer)
-
-describe('useUpdateAvailableNodes', () => {
-  const mockInstalledPacks = [
-    {
-      id: 'pack-1',
-      name: 'Outdated Pack',
-      latest_version: { version: '2.0.0' }
-    },
-    {
-      id: 'pack-2',
-      name: 'Up to Date Pack',
-      latest_version: { version: '1.0.0' }
-    },
-    {
-      id: 'pack-3',
-      name: 'Nightly Pack',
-      latest_version: { version: '1.5.0' }
-    },
-    {
-      id: 'pack-4',
-      name: 'No Latest Version',
-      latest_version: null
-    }
-  ]
-
-  const mockStartFetchInstalled = vi.fn()
-  const mockIsPackInstalled = vi.fn()
-  const mockGetInstalledPackVersion = vi.fn()
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-
-    // Default setup
-    mockIsPackInstalled.mockReturnValue(true)
-    mockGetInstalledPackVersion.mockImplementation((id: string) => {
-      switch (id) {
-        case 'pack-1':
-          return '1.0.0' // outdated
-        case 'pack-2':
-          return '1.0.0' // up to date
-        case 'pack-3':
-          return 'nightly-abc123' // nightly
-        case 'pack-4':
-          return '1.0.0' // no latest version
-        default:
-          return '1.0.0'
-      }
-    })
-
-    mockIsSemVer.mockImplementation(
-      (version: string): version is `${number}.${number}.${number}` => {
-        return !version.includes('nightly')
-      }
-    )
-
-    mockCompareVersions.mockImplementation(
-      (latest: string | undefined, installed: string | undefined) => {
-        if (latest === '2.0.0' && installed === '1.0.0') return 1 // outdated
-        if (latest === '1.0.0' && installed === '1.0.0') return 0 // up to date
-        return 0
-      }
-    )
-
-    mockUseComfyManagerStore.mockReturnValue({
-      isPackInstalled: mockIsPackInstalled,
-      getInstalledPackVersion: mockGetInstalledPackVersion
-    } as any)
-
-    mockUseInstalledPacks.mockReturnValue({
-      installedPacks: ref([]),
-      isLoading: ref(false),
-      error: ref(null),
-      startFetchInstalled: mockStartFetchInstalled
-    } as any)
-  })
-
-  describe('core filtering logic', () => {
-    it('identifies outdated packs correctly', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref(mockInstalledPacks),
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      // Should only include pack-1 (outdated)
-      expect(updateAvailableNodePacks.value).toHaveLength(1)
-      expect(updateAvailableNodePacks.value[0].id).toBe('pack-1')
-    })
-
-    it('excludes up-to-date packs', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      expect(updateAvailableNodePacks.value).toHaveLength(0)
-    })
-
-    it('excludes nightly packs from updates', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      expect(updateAvailableNodePacks.value).toHaveLength(0)
-    })
-
-    it('excludes packs with no latest version', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[3]]), // pack-4: no latest version
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      expect(updateAvailableNodePacks.value).toHaveLength(0)
-    })
-
-    it('excludes uninstalled packs', () => {
-      mockIsPackInstalled.mockReturnValue(false)
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref(mockInstalledPacks),
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      expect(updateAvailableNodePacks.value).toHaveLength(0)
-    })
-
-    it('returns empty array when no installed packs exist', () => {
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      expect(updateAvailableNodePacks.value).toEqual([])
-    })
-  })
-
-  describe('hasUpdateAvailable computed', () => {
-    it('returns true when updates are available', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { hasUpdateAvailable } = useUpdateAvailableNodes()
-
-      expect(hasUpdateAvailable.value).toBe(true)
-    })
-
-    it('returns false when no updates are available', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { hasUpdateAvailable } = useUpdateAvailableNodes()
-
-      expect(hasUpdateAvailable.value).toBe(false)
-    })
-  })
-
-  describe('automatic data fetching', () => {
-    it('fetches installed packs automatically when none exist', () => {
-      useUpdateAvailableNodes()
-
-      expect(mockStartFetchInstalled).toHaveBeenCalledOnce()
-    })
-
-    it('does not fetch when packs already exist', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref(mockInstalledPacks),
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      useUpdateAvailableNodes()
-
-      expect(mockStartFetchInstalled).not.toHaveBeenCalled()
-    })
-
-    it('does not fetch when already loading', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([]),
-        isLoading: ref(true),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      useUpdateAvailableNodes()
-
-      expect(mockStartFetchInstalled).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('state management', () => {
-    it('exposes loading state from useInstalledPacks', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([]),
-        isLoading: ref(true),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { isLoading } = useUpdateAvailableNodes()
-
-      expect(isLoading.value).toBe(true)
-    })
-
-    it('exposes error state from useInstalledPacks', () => {
-      const testError = 'Failed to fetch installed packs'
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([]),
-        isLoading: ref(false),
-        error: ref(testError),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { error } = useUpdateAvailableNodes()
-
-      expect(error.value).toBe(testError)
-    })
-  })
-
-  describe('reactivity', () => {
-    it('updates when installed packs change', async () => {
-      const installedPacksRef = ref([])
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: installedPacksRef,
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks, hasUpdateAvailable } =
-        useUpdateAvailableNodes()
-
-      // Initially empty
-      expect(updateAvailableNodePacks.value).toEqual([])
-      expect(hasUpdateAvailable.value).toBe(false)
-
-      // Update installed packs
-      installedPacksRef.value = [mockInstalledPacks[0]] as any // pack-1: outdated
-      await nextTick()
-
-      // Should update available updates
-      expect(updateAvailableNodePacks.value).toHaveLength(1)
-      expect(hasUpdateAvailable.value).toBe(true)
-    })
-  })
-
-  describe('version comparison logic', () => {
-    it('calls compareVersions with correct parameters', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      // Access the computed to trigger the logic
-      expect(updateAvailableNodePacks.value).toBeDefined()
-
-      expect(mockCompareVersions).toHaveBeenCalledWith('2.0.0', '1.0.0')
-    })
-
-    it('calls isSemVer to check nightly versions', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      // Access the computed to trigger the logic
-      expect(updateAvailableNodePacks.value).toBeDefined()
-
-      expect(mockIsSemVer).toHaveBeenCalledWith('nightly-abc123')
-    })
-
-    it('calls isPackInstalled for each pack', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref(mockInstalledPacks),
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled
-      } as any)
-
-      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
-
-      // Access the computed to trigger the logic
-      expect(updateAvailableNodePacks.value).toBeDefined()
-
-      expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-1')
-      expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-2')
-      expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-3')
-      expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-4')
-    })
-  })
-})

tests-ui/tests/composables/widgets/useManagerQueue.test.ts

@@ -28,7 +28,7 @@ describe('useManagerQueue', () => {
   const getEventListenerCallback = () =>
     vi.mocked(api.addEventListener).mock.calls[0][1]
 
-  const simulateServerStatus = async (status: 'all-done' | 'in_progress') => {
+  const simulateServerStatus = async (status: 'done' | 'in_progress') => {
     const event = new CustomEvent('cm-queue-status', {
       detail: { status }
     })
@@ -49,7 +49,7 @@ describe('useManagerQueue', () => {
       const queue = useManagerQueue()
 
       expect(queue.queueLength.value).toBe(0)
-      expect(queue.statusMessage.value).toBe('all-done')
+      expect(queue.statusMessage.value).toBe('done')
       expect(queue.allTasksDone.value).toBe(true)
     })
   })
@@ -104,7 +104,7 @@ describe('useManagerQueue', () => {
       await nextTick()
 
       // Should maintain the default status
-      expect(queue.statusMessage.value).toBe('all-done')
+      expect(queue.statusMessage.value).toBe('done')
     })
 
     it('should handle missing status property gracefully', async () => {
@@ -119,7 +119,7 @@ describe('useManagerQueue', () => {
       await nextTick()
 
       // Should maintain the default status
-      expect(queue.statusMessage.value).toBe('all-done')
+      expect(queue.statusMessage.value).toBe('done')
     })
   })
 
@@ -127,7 +127,7 @@ describe('useManagerQueue', () => {
     it('should start the next task when server is idle and queue has items', async () => {
       const { queue, mockTask } = createQueueWithMockTask()
 
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
 
       // Task should have been started
       expect(mockTask.task).toHaveBeenCalled()
@@ -138,7 +138,7 @@ describe('useManagerQueue', () => {
       const { mockTask } = createQueueWithMockTask()
 
       // Start the task
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask.task).toHaveBeenCalled()
 
       // Simulate task completion
@@ -148,7 +148,7 @@ describe('useManagerQueue', () => {
       await simulateServerStatus('in_progress')
       expect(mockTask.onComplete).not.toHaveBeenCalled()
 
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask.onComplete).toHaveBeenCalled()
     })
 
@@ -159,7 +159,7 @@ describe('useManagerQueue', () => {
       queue.enqueueTask(mockTask)
 
       // Start the task
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask.task).toHaveBeenCalled()
 
       // Simulate task completion
@@ -167,7 +167,7 @@ describe('useManagerQueue', () => {
 
       // Simulate server cycle
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
 
       // Should not throw errors even without onComplete
       expect(queue.allTasksDone.value).toBe(true)
@@ -184,14 +184,14 @@ describe('useManagerQueue', () => {
       expect(queue.queueLength.value).toBe(2)
 
       // Process first task
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask1.task).toHaveBeenCalled()
       expect(queue.queueLength.value).toBe(1)
 
       // Complete first task
       await mockTask1.task.mock.results[0].value
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask1.onComplete).toHaveBeenCalled()
 
       // Process second task
@@ -201,7 +201,7 @@ describe('useManagerQueue', () => {
       // Complete second task
       await mockTask2.task.mock.results[0].value
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask2.onComplete).toHaveBeenCalled()
 
       // Queue should be empty and all tasks done
@@ -219,7 +219,7 @@ describe('useManagerQueue', () => {
       queue.enqueueTask(mockTask)
 
       // Start the task
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask.task).toHaveBeenCalled()
 
       // Let the promise rejection happen
@@ -231,7 +231,7 @@ describe('useManagerQueue', () => {
 
       // Simulate server cycle
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
 
       // onComplete should still be called for failed tasks
       expect(mockTask.onComplete).toHaveBeenCalled()
@@ -252,7 +252,7 @@ describe('useManagerQueue', () => {
       ])
 
       // Task 1
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask1.task).toHaveBeenCalled()
 
       // Verify state of onComplete callbacks
@@ -266,7 +266,7 @@ describe('useManagerQueue', () => {
 
       // Task 2
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask2.task).toHaveBeenCalled()
 
       // Verify state of onComplete callbacks
@@ -279,7 +279,7 @@ describe('useManagerQueue', () => {
 
       // Task 3
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
 
       // Verify state of onComplete callbacks
       expect(mockTask3.task).toHaveBeenCalled()
@@ -297,7 +297,7 @@ describe('useManagerQueue', () => {
 
       // Add first task and start processing
       queue.enqueueTask(mockTask1)
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       expect(mockTask1.task).toHaveBeenCalled()
 
       // Add second task while first is processing
@@ -307,7 +307,7 @@ describe('useManagerQueue', () => {
       // Complete first task
       await mockTask1.task.mock.results[0].value
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
 
       // Second task should now be processed
       expect(mockTask2.task).toHaveBeenCalled()
@@ -318,9 +318,9 @@ describe('useManagerQueue', () => {
 
       // Cycle server status without any tasks
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
       await simulateServerStatus('in_progress')
-      await simulateServerStatus('all-done')
+      await simulateServerStatus('done')
 
       // Should not cause any errors
       expect(queue.allTasksDone.value).toBe(true)

tests-ui/tests/store/comfyManagerStore.test.ts

@@ -4,10 +4,10 @@ import { nextTick, ref } from 'vue'
 
 import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import { components } from '@/types/generatedManagerTypes'
-
-type InstalledPacksResponse = components['schemas']['InstalledPacksResponse']
-type ManagerPackInstalled = components['schemas']['ManagerPackInstalled']
+import {
+  InstalledPacksResponse,
+  ManagerPackInstalled
+} from '@/types/comfyManagerTypes'
 
 vi.mock('@/services/comfyManagerService', () => ({
   useComfyManagerService: vi.fn()

tests-ui/tests/store/executionStore.test.ts

@@ -1,11 +1,22 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { app } from '@/scripts/app'
 import { useExecutionStore } from '@/stores/executionStore'
+import { useWorkflowStore } from '@/stores/workflowStore'
+
+// Mock the workflowStore
+vi.mock('@/stores/workflowStore', () => ({
+  useWorkflowStore: vi.fn(() => ({
+    nodeExecutionIdToNodeLocatorId: vi.fn(),
+    nodeIdToNodeLocatorId: vi.fn(),
+    nodeLocatorIdToNodeExecutionId: vi.fn()
+  }))
+}))
 
 // Remove any previous global types
 declare global {
-  // Empty interface to override any previous declarations
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
   interface Window {}
 }
 
@@ -22,12 +33,16 @@ vi.mock('@/composables/node/useNodeProgressText', () => ({
   })
 }))
 
-// Create a local mock instead of using global to avoid conflicts
-const mockApp = {
-  graph: {
-    getNodeById: vi.fn()
+// Mock the app import with proper implementation
+vi.mock('@/scripts/app', () => ({
+  app: {
+    graph: {
+      getNodeById: vi.fn()
+    },
+    revokePreviews: vi.fn(),
+    nodePreviewImages: {}
   }
-}
+}))
 
 describe('executionStore - display_component handling', () => {
   function createDisplayComponentEvent(
@@ -47,7 +62,7 @@ describe('executionStore - display_component handling', () => {
 
   function handleDisplayComponentMessage(event: CustomEvent) {
     const { node_id, component } = event.detail
-    const node = mockApp.graph.getNodeById(node_id)
+    const node = vi.mocked(app.graph.getNodeById)(node_id)
     if (node && component === 'ChatHistoryWidget') {
       mockShowChatHistory(node)
     }
@@ -60,23 +75,121 @@ describe('executionStore - display_component handling', () => {
   })
 
   it('handles ChatHistoryWidget display_component messages', () => {
-    const mockNode = { id: '123' }
-    mockApp.graph.getNodeById.mockReturnValue(mockNode)
+    const mockNode = { id: '123' } as any
+    vi.mocked(app.graph.getNodeById).mockReturnValue(mockNode)
 
     const event = createDisplayComponentEvent('123')
     handleDisplayComponentMessage(event)
 
-    expect(mockApp.graph.getNodeById).toHaveBeenCalledWith('123')
+    expect(app.graph.getNodeById).toHaveBeenCalledWith('123')
     expect(mockShowChatHistory).toHaveBeenCalledWith(mockNode)
   })
 
   it('does nothing if node is not found', () => {
-    mockApp.graph.getNodeById.mockReturnValue(null)
+    vi.mocked(app.graph.getNodeById).mockReturnValue(null)
 
     const event = createDisplayComponentEvent('non-existent')
     handleDisplayComponentMessage(event)
 
-    expect(mockApp.graph.getNodeById).toHaveBeenCalledWith('non-existent')
+    expect(app.graph.getNodeById).toHaveBeenCalledWith('non-existent')
     expect(mockShowChatHistory).not.toHaveBeenCalled()
   })
 })
+
+describe('useExecutionStore - NodeLocatorId conversions', () => {
+  let store: ReturnType<typeof useExecutionStore>
+  let workflowStore: ReturnType<typeof useWorkflowStore>
+
+  beforeEach(() => {
+    setActivePinia(createPinia())
+
+    // Create the mock workflowStore instance
+    const mockWorkflowStore = {
+      nodeExecutionIdToNodeLocatorId: vi.fn(),
+      nodeIdToNodeLocatorId: vi.fn(),
+      nodeLocatorIdToNodeExecutionId: vi.fn()
+    }
+
+    // Mock the useWorkflowStore function to return our mock
+    vi.mocked(useWorkflowStore).mockReturnValue(mockWorkflowStore as any)
+
+    workflowStore = mockWorkflowStore as any
+    store = useExecutionStore()
+    vi.clearAllMocks()
+  })
+
+  describe('executionIdToNodeLocatorId', () => {
+    it('should convert execution ID to NodeLocatorId', () => {
+      // Mock subgraph structure
+      const mockSubgraph = {
+        id: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
+        _nodes: []
+      }
+
+      const mockNode = {
+        id: 123,
+        isSubgraphNode: () => true,
+        subgraph: mockSubgraph
+      } as any
+
+      // Mock app.graph.getNodeById to return the mock node
+      vi.mocked(app.graph.getNodeById).mockReturnValue(mockNode)
+
+      const result = store.executionIdToNodeLocatorId('123:456')
+
+      expect(result).toBe('a1b2c3d4-e5f6-7890-abcd-ef1234567890:456')
+    })
+
+    it('should convert simple node ID to NodeLocatorId', () => {
+      const result = store.executionIdToNodeLocatorId('123')
+
+      // For simple node IDs, it should return the ID as-is
+      expect(result).toBe('123')
+    })
+
+    it('should handle numeric node IDs', () => {
+      const result = store.executionIdToNodeLocatorId(123)
+
+      // For numeric IDs, it should convert to string and return as-is
+      expect(result).toBe('123')
+    })
+
+    it('should return null when conversion fails', () => {
+      // Mock app.graph.getNodeById to return null (node not found)
+      vi.mocked(app.graph.getNodeById).mockReturnValue(null)
+
+      // This should throw an error as the node is not found
+      expect(() => store.executionIdToNodeLocatorId('999:456')).toThrow(
+        'Subgraph not found: 999'
+      )
+    })
+  })
+
+  describe('nodeLocatorIdToExecutionId', () => {
+    it('should convert NodeLocatorId to execution ID', () => {
+      const mockExecutionId = '123:456'
+      vi.spyOn(workflowStore, 'nodeLocatorIdToNodeExecutionId').mockReturnValue(
+        mockExecutionId as any
+      )
+
+      const result = store.nodeLocatorIdToExecutionId(
+        'a1b2c3d4-e5f6-7890-abcd-ef1234567890:456'
+      )
+
+      expect(workflowStore.nodeLocatorIdToNodeExecutionId).toHaveBeenCalledWith(
+        'a1b2c3d4-e5f6-7890-abcd-ef1234567890:456'
+      )
+      expect(result).toBe(mockExecutionId)
+    })
+
+    it('should return null when conversion fails', () => {
+      vi.spyOn(workflowStore, 'nodeLocatorIdToNodeExecutionId').mockReturnValue(
+        null
+      )
+
+      const result = store.nodeLocatorIdToExecutionId('invalid:format')
+
+      expect(result).toBeNull()
+    })
+  })
+})

tests-ui/tests/store/workflowStore.test.ts

@@ -1,3 +1,4 @@
+import type { Subgraph } from '@comfyorg/litegraph'
 import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
@@ -11,6 +12,7 @@ import {
   useWorkflowBookmarkStore,
   useWorkflowStore
 } from '@/stores/workflowStore'
+import { isSubgraph } from '@/utils/typeGuardUtil'
 
 // Add mock for api at the top of the file
 vi.mock('@/scripts/api', () => ({
@@ -26,10 +28,15 @@ vi.mock('@/scripts/api', () => ({
 // Mock comfyApp globally for the store setup
 vi.mock('@/scripts/app', () => ({
   app: {
-    canvas: null // Start with canvas potentially undefined or null
+    canvas: {} // Start with empty canvas object
   }
 }))
 
+// Mock isSubgraph
+vi.mock('@/utils/typeGuardUtil', () => ({
+  isSubgraph: vi.fn(() => false)
+}))
+
 describe('useWorkflowStore', () => {
   let store: ReturnType<typeof useWorkflowStore>
   let bookmarkStore: ReturnType<typeof useWorkflowBookmarkStore>
@@ -518,8 +525,13 @@ describe('useWorkflowStore', () => {
           { name: 'Level 1 Subgraph' },
           { name: 'Level 2 Subgraph' }
         ]
-      }
-      vi.mocked(comfyApp.canvas).subgraph = mockSubgraph as any
+      } as any
+      vi.mocked(comfyApp.canvas).subgraph = mockSubgraph
+
+      // Mock isSubgraph to return true for our mockSubgraph
+      vi.mocked(isSubgraph).mockImplementation(
+        (obj): obj is Subgraph => obj === mockSubgraph
+      )
 
       // Act: Trigger the update
       store.updateActiveGraph()
@@ -536,8 +548,13 @@ describe('useWorkflowStore', () => {
         name: 'Initial Subgraph',
         pathToRootGraph: [{ name: 'Root' }, { name: 'Initial Subgraph' }],
         isRootGraph: false
-      }
-      vi.mocked(comfyApp.canvas).subgraph = initialSubgraph as any
+      } as any
+      vi.mocked(comfyApp.canvas).subgraph = initialSubgraph
+
+      // Mock isSubgraph to return true for our initialSubgraph
+      vi.mocked(isSubgraph).mockImplementation(
+        (obj): obj is Subgraph => obj === initialSubgraph
+      )
 
       // Trigger initial update based on the *first* workflow opened in beforeEach
       store.updateActiveGraph()
@@ -561,6 +578,11 @@ describe('useWorkflowStore', () => {
       // This ensures the watcher *does* cause a state change we can assert
       vi.mocked(comfyApp.canvas).subgraph = undefined
 
+      // Mock isSubgraph to return false for undefined
+      vi.mocked(isSubgraph).mockImplementation(
+        (_obj): _obj is Subgraph => false
+      )
+
       await store.openWorkflow(workflow2) // This changes activeWorkflow and triggers the watch
       await nextTick() // Allow watcher and potential async operations in updateActiveGraph to complete
 
@@ -569,4 +591,131 @@ describe('useWorkflowStore', () => {
       expect(store.activeSubgraph).toBeUndefined()
     })
   })
+
+  describe('NodeLocatorId conversions', () => {
+    beforeEach(() => {
+      // Setup mock graph structure with subgraphs
+      const mockSubgraph = {
+        id: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
+        _nodes: []
+      }
+
+      const mockNode = {
+        id: 123,
+        isSubgraphNode: () => true,
+        subgraph: mockSubgraph
+      }
+
+      const mockRootGraph = {
+        _nodes: [mockNode],
+        subgraphs: new Map([[mockSubgraph.id, mockSubgraph]]),
+        getNodeById: (id: string | number) => {
+          if (String(id) === '123') return mockNode
+          return null
+        }
+      }
+
+      vi.mocked(comfyApp).graph = mockRootGraph as any
+      vi.mocked(comfyApp.canvas).subgraph = mockSubgraph as any
+      store.activeSubgraph = mockSubgraph as any
+    })
+
+    describe('nodeIdToNodeLocatorId', () => {
+      it('should convert node ID to NodeLocatorId for subgraph nodes', () => {
+        const result = store.nodeIdToNodeLocatorId(456)
+        expect(result).toBe('a1b2c3d4-e5f6-7890-abcd-ef1234567890:456')
+      })
+
+      it('should return simple node ID for root graph nodes', () => {
+        store.activeSubgraph = undefined
+        const result = store.nodeIdToNodeLocatorId(123)
+        expect(result).toBe('123')
+      })
+
+      it('should use provided subgraph instead of active one', () => {
+        const customSubgraph = {
+          id: 'custom-uuid-1234-5678-90ab-cdef12345678'
+        } as any
+        const result = store.nodeIdToNodeLocatorId(789, customSubgraph)
+        expect(result).toBe('custom-uuid-1234-5678-90ab-cdef12345678:789')
+      })
+    })
+
+    describe('nodeExecutionIdToNodeLocatorId', () => {
+      it('should convert execution ID to NodeLocatorId', () => {
+        const result = store.nodeExecutionIdToNodeLocatorId('123:456')
+        expect(result).toBe('a1b2c3d4-e5f6-7890-abcd-ef1234567890:456')
+      })
+
+      it('should return simple node ID for root level nodes', () => {
+        const result = store.nodeExecutionIdToNodeLocatorId('123')
+        expect(result).toBe('123')
+      })
+
+      it('should return null for invalid execution IDs', () => {
+        const result = store.nodeExecutionIdToNodeLocatorId('999:456')
+        expect(result).toBeNull()
+      })
+    })
+
+    describe('nodeLocatorIdToNodeId', () => {
+      it('should extract node ID from NodeLocatorId', () => {
+        const result = store.nodeLocatorIdToNodeId(
+          'a1b2c3d4-e5f6-7890-abcd-ef1234567890:456'
+        )
+        expect(result).toBe(456)
+      })
+
+      it('should handle string node IDs', () => {
+        const result = store.nodeLocatorIdToNodeId(
+          'a1b2c3d4-e5f6-7890-abcd-ef1234567890:node_1'
+        )
+        expect(result).toBe('node_1')
+      })
+
+      it('should handle simple node IDs (root graph)', () => {
+        const result = store.nodeLocatorIdToNodeId('123')
+        expect(result).toBe(123)
+
+        const stringResult = store.nodeLocatorIdToNodeId('node_1')
+        expect(stringResult).toBe('node_1')
+      })
+
+      it('should return null for invalid NodeLocatorId', () => {
+        const result = store.nodeLocatorIdToNodeId('invalid:format')
+        expect(result).toBeNull()
+      })
+    })
+
+    describe('nodeLocatorIdToNodeExecutionId', () => {
+      it('should convert NodeLocatorId to execution ID', () => {
+        // Need to mock isSubgraph to identify our mockSubgraph
+        vi.mocked(isSubgraph).mockImplementation((obj): obj is Subgraph => {
+          return obj === store.activeSubgraph
+        })
+
+        const result = store.nodeLocatorIdToNodeExecutionId(
+          'a1b2c3d4-e5f6-7890-abcd-ef1234567890:456'
+        )
+        expect(result).toBe('123:456')
+      })
+
+      it('should handle simple node IDs (root graph)', () => {
+        const result = store.nodeLocatorIdToNodeExecutionId('123')
+        expect(result).toBe('123')
+      })
+
+      it('should return null for unknown subgraph UUID', () => {
+        const result = store.nodeLocatorIdToNodeExecutionId(
+          'unknown-uuid-1234-5678-90ab-cdef12345678:456'
+        )
+        expect(result).toBeNull()
+      })
+
+      it('should return null for invalid NodeLocatorId', () => {
+        const result = store.nodeLocatorIdToNodeExecutionId('invalid:format')
+        expect(result).toBeNull()
+      })
+    })
+  })
 })

tests-ui/tests/types/nodeIdentification.test.ts

@@ -0,0 +1,207 @@
+import { describe, expect, it } from 'vitest'
+
+import type { NodeId } from '@/schemas/comfyWorkflowSchema'
+import {
+  type NodeLocatorId,
+  createNodeExecutionId,
+  createNodeLocatorId,
+  isNodeExecutionId,
+  isNodeLocatorId,
+  parseNodeExecutionId,
+  parseNodeLocatorId
+} from '@/types/nodeIdentification'
+
+describe('nodeIdentification', () => {
+  describe('NodeLocatorId', () => {
+    const validUuid = 'a1b2c3d4-e5f6-7890-abcd-ef1234567890'
+    const validNodeId = '123'
+    const validNodeLocatorId = `${validUuid}:${validNodeId}` as NodeLocatorId
+
+    describe('isNodeLocatorId', () => {
+      it('should return true for valid NodeLocatorId', () => {
+        expect(isNodeLocatorId(validNodeLocatorId)).toBe(true)
+        expect(isNodeLocatorId(`${validUuid}:456`)).toBe(true)
+        expect(isNodeLocatorId(`${validUuid}:node_1`)).toBe(true)
+        // Simple node IDs (root graph)
+        expect(isNodeLocatorId('123')).toBe(true)
+        expect(isNodeLocatorId('node_1')).toBe(true)
+        expect(isNodeLocatorId('5')).toBe(true)
+      })
+
+      it('should return false for invalid formats', () => {
+        expect(isNodeLocatorId('123:456')).toBe(false) // No UUID in first part
+        expect(isNodeLocatorId('not-a-uuid:123')).toBe(false)
+        expect(isNodeLocatorId('')).toBe(false) // Empty string
+        expect(isNodeLocatorId(':123')).toBe(false) // Empty UUID
+        expect(isNodeLocatorId(`${validUuid}:`)).toBe(false) // Empty node ID
+        expect(isNodeLocatorId(`${validUuid}:123:456`)).toBe(false) // Too many parts
+        expect(isNodeLocatorId(123)).toBe(false) // Not a string
+        expect(isNodeLocatorId(null)).toBe(false)
+        expect(isNodeLocatorId(undefined)).toBe(false)
+      })
+
+      it('should validate UUID format correctly', () => {
+        // Valid UUID formats
+        expect(
+          isNodeLocatorId('00000000-0000-0000-0000-000000000000:123')
+        ).toBe(true)
+        expect(
+          isNodeLocatorId('A1B2C3D4-E5F6-7890-ABCD-EF1234567890:123')
+        ).toBe(true)
+
+        // Invalid UUID formats
+        expect(isNodeLocatorId('00000000-0000-0000-0000-00000000000:123')).toBe(
+          false
+        ) // Too short
+        expect(
+          isNodeLocatorId('00000000-0000-0000-0000-0000000000000:123')
+        ).toBe(false) // Too long
+        expect(
+          isNodeLocatorId('00000000_0000_0000_0000_000000000000:123')
+        ).toBe(false) // Wrong separator
+        expect(
+          isNodeLocatorId('g0000000-0000-0000-0000-000000000000:123')
+        ).toBe(false) // Invalid hex
+      })
+    })
+
+    describe('parseNodeLocatorId', () => {
+      it('should parse valid NodeLocatorId', () => {
+        const result = parseNodeLocatorId(validNodeLocatorId)
+        expect(result).toEqual({
+          subgraphUuid: validUuid,
+          localNodeId: 123
+        })
+      })
+
+      it('should handle string node IDs', () => {
+        const stringNodeId = `${validUuid}:node_1`
+        const result = parseNodeLocatorId(stringNodeId)
+        expect(result).toEqual({
+          subgraphUuid: validUuid,
+          localNodeId: 'node_1'
+        })
+      })
+
+      it('should handle simple node IDs (root graph)', () => {
+        const result = parseNodeLocatorId('123')
+        expect(result).toEqual({
+          subgraphUuid: null,
+          localNodeId: 123
+        })
+
+        const stringResult = parseNodeLocatorId('node_1')
+        expect(stringResult).toEqual({
+          subgraphUuid: null,
+          localNodeId: 'node_1'
+        })
+      })
+
+      it('should return null for invalid formats', () => {
+        expect(parseNodeLocatorId('123:456')).toBeNull() // No UUID in first part
+        expect(parseNodeLocatorId('')).toBeNull()
+      })
+    })
+
+    describe('createNodeLocatorId', () => {
+      it('should create NodeLocatorId from components', () => {
+        const result = createNodeLocatorId(validUuid, 123)
+        expect(result).toBe(validNodeLocatorId)
+        expect(isNodeLocatorId(result)).toBe(true)
+      })
+
+      it('should handle string node IDs', () => {
+        const result = createNodeLocatorId(validUuid, 'node_1')
+        expect(result).toBe(`${validUuid}:node_1`)
+        expect(isNodeLocatorId(result)).toBe(true)
+      })
+    })
+  })
+
+  describe('NodeExecutionId', () => {
+    describe('isNodeExecutionId', () => {
+      it('should return true for execution IDs', () => {
+        expect(isNodeExecutionId('123:456')).toBe(true)
+        expect(isNodeExecutionId('123:456:789')).toBe(true)
+        expect(isNodeExecutionId('node_1:node_2')).toBe(true)
+      })
+
+      it('should return false for non-execution IDs', () => {
+        expect(isNodeExecutionId('123')).toBe(false)
+        expect(isNodeExecutionId('node_1')).toBe(false)
+        expect(isNodeExecutionId('')).toBe(false)
+        expect(isNodeExecutionId(123)).toBe(false)
+        expect(isNodeExecutionId(null)).toBe(false)
+        expect(isNodeExecutionId(undefined)).toBe(false)
+      })
+    })
+
+    describe('parseNodeExecutionId', () => {
+      it('should parse execution IDs correctly', () => {
+        expect(parseNodeExecutionId('123:456')).toEqual([123, 456])
+        expect(parseNodeExecutionId('123:456:789')).toEqual([123, 456, 789])
+        expect(parseNodeExecutionId('node_1:node_2')).toEqual([
+          'node_1',
+          'node_2'
+        ])
+        expect(parseNodeExecutionId('123:node_2:456')).toEqual([
+          123,
+          'node_2',
+          456
+        ])
+      })
+
+      it('should return null for non-execution IDs', () => {
+        expect(parseNodeExecutionId('123')).toBeNull()
+        expect(parseNodeExecutionId('')).toBeNull()
+      })
+    })
+
+    describe('createNodeExecutionId', () => {
+      it('should create execution IDs from node arrays', () => {
+        expect(createNodeExecutionId([123, 456])).toBe('123:456')
+        expect(createNodeExecutionId([123, 456, 789])).toBe('123:456:789')
+        expect(createNodeExecutionId(['node_1', 'node_2'])).toBe(
+          'node_1:node_2'
+        )
+        expect(createNodeExecutionId([123, 'node_2', 456])).toBe(
+          '123:node_2:456'
+        )
+      })
+
+      it('should handle single node ID', () => {
+        const result = createNodeExecutionId([123])
+        expect(result).toBe('123')
+        // Single node IDs are not execution IDs
+        expect(isNodeExecutionId(result)).toBe(false)
+      })
+
+      it('should handle empty array', () => {
+        expect(createNodeExecutionId([])).toBe('')
+      })
+    })
+  })
+
+  describe('Integration tests', () => {
+    it('should round-trip NodeLocatorId correctly', () => {
+      const uuid = 'a1b2c3d4-e5f6-7890-abcd-ef1234567890'
+      const nodeId: NodeId = 123
+
+      const locatorId = createNodeLocatorId(uuid, nodeId)
+      const parsed = parseNodeLocatorId(locatorId)
+
+      expect(parsed).toBeTruthy()
+      expect(parsed!.subgraphUuid).toBe(uuid)
+      expect(parsed!.localNodeId).toBe(nodeId)
+    })
+
+    it('should round-trip NodeExecutionId correctly', () => {
+      const nodeIds: NodeId[] = [123, 'node_2', 456]
+
+      const executionId = createNodeExecutionId(nodeIds)
+      const parsed = parseNodeExecutionId(executionId)
+
+      expect(parsed).toEqual(nodeIds)
+    })
+  })
+})