fix: favorite subgraphs

Amp-Thread-ID: https://ampcode.com/threads/T-019c7e35-c7f6-722f-8289-dff29a926487

.github/workflows/ci-oss-assets-validation.yaml

@@ -1,118 +0,0 @@
-name: 'CI: OSS Assets Validation'
-
-on:
-  pull_request:
-    branches-ignore: [wip/*, draft/*, temp/*]
-  push:
-    branches: [main, dev*]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  validate-fonts:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@9fd676a19091d4595eefd76e4bd31c97133911f1 # v4.2.0
-        with:
-          version: 10
-
-      - name: Use Node.js
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
-        with:
-          node-version: 'lts/*'
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Build project
-        run: pnpm build
-        env:
-          DISTRIBUTION: localhost
-
-      - name: Check for proprietary fonts in dist
-        run: |
-          set -euo pipefail
-          echo '🔍 Checking dist for proprietary ABCROM fonts...'
-
-          if [ ! -d "dist" ] || [ -z "$(ls -A dist)" ]; then
-            echo '❌ ERROR: dist/ directory missing or empty!'
-            exit 1
-          fi
-
-          # Check for ABCROM font files
-          if find dist/ -type f -iname '*abcrom*' \
-            \( -name '*.woff' -o -name '*.woff2' -o -name '*.ttf' -o -name '*.otf' \) \
-            -print -quit | grep -q .; then
-            echo ''
-            echo '❌ ERROR: Found proprietary ABCROM font files in dist!'
-            echo ''
-            find dist/ -type f -iname '*abcrom*' \
-              \( -name '*.woff' -o -name '*.woff2' -o -name '*.ttf' -o -name '*.otf' \)
-            echo ''
-            echo 'ABCROM fonts are proprietary and should not ship to OSS builds.'
-            echo ''
-            echo 'To fix this:'
-            echo '1. Use conditional font loading based on isCloud'
-            echo '2. Ensure fonts are dynamically imported, not bundled'
-            echo '3. Check vite config for font handling'
-            exit 1
-          fi
-
-          echo '✅ No proprietary fonts found in dist'
-
-  validate-licenses:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@9fd676a19091d4595eefd76e4bd31c97133911f1 # v4.2.0
-        with:
-          version: 10
-
-      - name: Use Node.js
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
-        with:
-          node-version: 'lts/*'
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Validate production dependency licenses
-        run: |
-          set -euo pipefail
-          echo '🔍 Checking production dependency licenses...'
-
-          # Use license-checker-rseidelsohn (actively maintained fork, handles monorepos)
-          # Exclude internal @comfyorg packages from license check
-          # Run in if condition to capture exit code
-          if npx license-checker-rseidelsohn@4 \
-            --production \
-            --summary \
-            --excludePackages '@comfyorg/comfyui-frontend;@comfyorg/design-system;@comfyorg/registry-types;@comfyorg/shared-frontend-utils;@comfyorg/tailwind-utils;@comfyorg/comfyui-electron-types' \
-            --onlyAllow 'MIT;MIT*;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;0BSD;BlueOak-1.0.0;Python-2.0;CC0-1.0;Unlicense;(MIT OR Apache-2.0);(MIT OR GPL-3.0);(Apache-2.0 OR MIT);(MPL-2.0 OR Apache-2.0);CC-BY-4.0;CC-BY-3.0;GPL-3.0-only'; then
-            echo ''
-            echo '✅ All production dependency licenses are approved!'
-          else
-            echo ''
-            echo '❌ ERROR: Found dependencies with non-approved licenses!'
-            echo ''
-            echo 'To fix this:'
-            echo '1. Check the license of the problematic package'
-            echo '2. Find an alternative package with an approved license'
-            echo '3. If the license is safe and OSI-approved, add it to the --onlyAllow list'
-            echo ''
-            echo 'For more info on OSI-approved licenses:'
-            echo 'https://opensource.org/licenses'
-            exit 1
-          fi

.github/workflows/ci-tests-e2e-forks.yaml

@@ -6,6 +6,9 @@ on:
     workflows: ['CI: Tests E2E']
     types: [requested, completed]
 
+env:
+  DATE_FORMAT: '+%m/%d/%Y, %I:%M:%S %p'
+
 jobs:
   deploy-and-comment-forked-pr:
     runs-on: ubuntu-latest
@@ -60,7 +63,8 @@ jobs:
           ./scripts/cicd/pr-playwright-deploy-and-comment.sh \
             "${{ steps.pr.outputs.result }}" \
             "${{ github.event.workflow_run.head_branch }}" \
-            "starting"
+            "starting" \
+            "$(date -u '${{ env.DATE_FORMAT }}')"
 
       - name: Download and Deploy Reports
         if: steps.pr.outputs.result != 'null' && github.event.action == 'completed'

.github/workflows/ci-tests-e2e.yaml

@@ -182,6 +182,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
+      - name: Get start time
+        id: start-time
+        run: echo "time=$(date -u '+%m/%d/%Y, %I:%M:%S %p')" >> $GITHUB_OUTPUT
+
       - name: Post starting comment
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -190,7 +194,8 @@ jobs:
           ./scripts/cicd/pr-playwright-deploy-and-comment.sh \
             "${{ github.event.pull_request.number }}" \
             "${{ github.head_ref }}" \
-            "starting"
+            "starting" \
+            "${{ steps.start-time.outputs.time }}"
 
   # Deploy and comment for non-forked PRs only
   deploy-and-comment:

.github/workflows/ci-tests-storybook-forks.yaml

@@ -6,6 +6,9 @@ on:
     workflows: ['CI: Tests Storybook']
     types: [requested, completed]
 
+env:
+  DATE_FORMAT: '+%m/%d/%Y, %I:%M:%S %p'
+
 jobs:
   deploy-and-comment-forked-pr:
     runs-on: ubuntu-latest
@@ -60,7 +63,8 @@ jobs:
           ./scripts/cicd/pr-storybook-deploy-and-comment.sh \
             "${{ steps.pr.outputs.result }}" \
             "${{ github.event.workflow_run.head_branch }}" \
-            "starting"
+            "starting" \
+            "$(date -u '${{ env.DATE_FORMAT }}')"
 
       - name: Download and Deploy Storybook
         if: steps.pr.outputs.result != 'null' && github.event.action == 'completed' && github.event.workflow_run.conclusion == 'success'

.github/workflows/ci-tests-storybook.yaml

@@ -24,7 +24,8 @@ jobs:
           ./scripts/cicd/pr-storybook-deploy-and-comment.sh \
             "${{ github.event.pull_request.number }}" \
             "${{ github.head_ref }}" \
-            "starting"
+            "starting" \
+            "$(date -u '+%m/%d/%Y, %I:%M:%S %p')"
 
   # Build Storybook for all PRs (free Cloudflare deployment)
   storybook-build:

.gitignore

@@ -64,7 +64,6 @@ browser_tests/local/
 dist.zip
 
 /temp/
-/tmp/
 
 # Generated JSON Schemas
 /schemas/

.storybook/main.ts

@@ -100,8 +100,7 @@ const config: StorybookConfig = {
         rolldownOptions: {
           treeshake: false,
           output: {
-            keepNames: true,
-            strictExecutionOrder: true
+            keepNames: true
           },
           onwarn: (warning, warn) => {
             // Suppress specific warnings

.storybook/preview.ts

@@ -90,6 +90,7 @@ const preview: Preview = {
           { value: 'light', icon: 'sun', title: 'Light' },
           { value: 'dark', icon: 'moon', title: 'Dark' }
         ],
+        showName: true,
         dynamicTitle: true
       }
     }

browser_tests/assets/subgraphs/subgraph-duplicate-links.json

@@ -1,183 +0,0 @@
-{
-  "id": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
-  "revision": 0,
-  "last_node_id": 2,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 2,
-      "type": "e5fb1765-aaaa-bbbb-cccc-ddddeeee0001",
-      "pos": [600, 400],
-      "size": [200, 100],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "LATENT",
-          "type": "LATENT",
-          "links": null
-        }
-      ],
-      "properties": {},
-      "widgets_values": []
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "definitions": {
-    "subgraphs": [
-      {
-        "id": "e5fb1765-aaaa-bbbb-cccc-ddddeeee0001",
-        "version": 1,
-        "state": {
-          "lastGroupId": 0,
-          "lastNodeId": 2,
-          "lastLinkId": 5,
-          "lastRerouteId": 0
-        },
-        "revision": 0,
-        "config": {},
-        "name": "Subgraph With Duplicate Links",
-        "inputNode": {
-          "id": -10,
-          "bounding": [200, 400, 120, 60]
-        },
-        "outputNode": {
-          "id": -20,
-          "bounding": [900, 400, 120, 60]
-        },
-        "inputs": [],
-        "outputs": [
-          {
-            "id": "out-latent-1",
-            "name": "LATENT",
-            "type": "LATENT",
-            "linkIds": [2],
-            "pos": [920, 420]
-          }
-        ],
-        "widgets": [],
-        "nodes": [
-          {
-            "id": 1,
-            "type": "KSampler",
-            "pos": [400, 100],
-            "size": [270, 262],
-            "flags": {},
-            "order": 1,
-            "mode": 0,
-            "inputs": [
-              {
-                "name": "model",
-                "type": "MODEL",
-                "link": null
-              },
-              {
-                "name": "positive",
-                "type": "CONDITIONING",
-                "link": null
-              },
-              {
-                "name": "negative",
-                "type": "CONDITIONING",
-                "link": null
-              },
-              {
-                "name": "latent_image",
-                "type": "LATENT",
-                "link": 1
-              }
-            ],
-            "outputs": [
-              {
-                "name": "LATENT",
-                "type": "LATENT",
-                "links": [2]
-              }
-            ],
-            "properties": {
-              "Node name for S&R": "KSampler"
-            },
-            "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
-          },
-          {
-            "id": 2,
-            "type": "EmptyLatentImage",
-            "pos": [100, 200],
-            "size": [200, 106],
-            "flags": {},
-            "order": 0,
-            "mode": 0,
-            "inputs": [],
-            "outputs": [
-              {
-                "name": "LATENT",
-                "type": "LATENT",
-                "links": [1, 3, 4, 5]
-              }
-            ],
-            "properties": {
-              "Node name for S&R": "EmptyLatentImage"
-            },
-            "widgets_values": [512, 512, 1]
-          }
-        ],
-        "groups": [],
-        "links": [
-          {
-            "id": 1,
-            "origin_id": 2,
-            "origin_slot": 0,
-            "target_id": 1,
-            "target_slot": 3,
-            "type": "LATENT"
-          },
-          {
-            "id": 2,
-            "origin_id": 1,
-            "origin_slot": 0,
-            "target_id": -20,
-            "target_slot": 0,
-            "type": "LATENT"
-          },
-          {
-            "id": 3,
-            "origin_id": 2,
-            "origin_slot": 0,
-            "target_id": 1,
-            "target_slot": 3,
-            "type": "LATENT"
-          },
-          {
-            "id": 4,
-            "origin_id": 2,
-            "origin_slot": 0,
-            "target_id": 1,
-            "target_slot": 3,
-            "type": "LATENT"
-          },
-          {
-            "id": 5,
-            "origin_id": 2,
-            "origin_slot": 0,
-            "target_id": 1,
-            "target_slot": 3,
-            "type": "LATENT"
-          }
-        ],
-        "extra": {}
-      }
-    ]
-  },
-  "config": {},
-  "extra": {
-    "ds": {
-      "scale": 1,
-      "offset": [0, 0]
-    },
-    "frontendVersion": "1.38.14"
-  },
-  "version": 0.4
-}

browser_tests/fixtures/ComfyPage.ts

@@ -26,6 +26,7 @@ import { Topbar } from './components/Topbar'
 import { CanvasHelper } from './helpers/CanvasHelper'
 import { ClipboardHelper } from './helpers/ClipboardHelper'
 import { CommandHelper } from './helpers/CommandHelper'
+import { DebugHelper } from './helpers/DebugHelper'
 import { DragDropHelper } from './helpers/DragDropHelper'
 import { KeyboardHelper } from './helpers/KeyboardHelper'
 import { NodeOperationsHelper } from './helpers/NodeOperationsHelper'
@@ -173,6 +174,7 @@ export class ComfyPage {
   public readonly settingDialog: SettingDialog
   public readonly confirmDialog: ConfirmDialog
   public readonly vueNodes: VueNodeHelpers
+  public readonly debug: DebugHelper
   public readonly subgraph: SubgraphHelper
   public readonly canvasOps: CanvasHelper
   public readonly nodeOps: NodeOperationsHelper
@@ -217,6 +219,7 @@ export class ComfyPage {
     this.settingDialog = new SettingDialog(page, this)
     this.confirmDialog = new ConfirmDialog(page)
     this.vueNodes = new VueNodeHelpers(page)
+    this.debug = new DebugHelper(page, this.canvas)
     this.subgraph = new SubgraphHelper(this)
     this.canvasOps = new CanvasHelper(page, this.canvas, this.resetViewButton)
     this.nodeOps = new NodeOperationsHelper(this)

browser_tests/fixtures/helpers/DebugHelper.ts

@@ -0,0 +1,167 @@
+import type { Locator, Page, TestInfo } from '@playwright/test'
+
+import type { Position } from '../types'
+
+export interface DebugScreenshotOptions {
+  fullPage?: boolean
+  element?: 'canvas' | 'page'
+  markers?: Array<{ position: Position; id?: string }>
+}
+
+export class DebugHelper {
+  constructor(
+    private page: Page,
+    private canvas: Locator
+  ) {}
+
+  async addMarker(
+    position: Position,
+    id: string = 'debug-marker'
+  ): Promise<void> {
+    await this.page.evaluate(
+      ([pos, markerId]) => {
+        const existing = document.getElementById(markerId)
+        if (existing) existing.remove()
+
+        const marker = document.createElement('div')
+        marker.id = markerId
+        marker.style.position = 'fixed'
+        marker.style.left = `${pos.x - 10}px`
+        marker.style.top = `${pos.y - 10}px`
+        marker.style.width = '20px'
+        marker.style.height = '20px'
+        marker.style.border = '2px solid red'
+        marker.style.borderRadius = '50%'
+        marker.style.backgroundColor = 'rgba(255, 0, 0, 0.3)'
+        marker.style.pointerEvents = 'none'
+        marker.style.zIndex = '10000'
+        document.body.appendChild(marker)
+      },
+      [position, id] as const
+    )
+  }
+
+  async removeMarkers(): Promise<void> {
+    await this.page.evaluate(() => {
+      document
+        .querySelectorAll('[id^="debug-marker"]')
+        .forEach((el) => el.remove())
+    })
+  }
+
+  async attachScreenshot(
+    testInfo: TestInfo,
+    name: string,
+    options?: DebugScreenshotOptions
+  ): Promise<void> {
+    if (options?.markers) {
+      for (const marker of options.markers) {
+        await this.addMarker(marker.position, marker.id)
+      }
+    }
+
+    let screenshot: Buffer
+    const targetElement = options?.element || 'page'
+
+    if (targetElement === 'canvas') {
+      screenshot = await this.canvas.screenshot()
+    } else if (options?.fullPage) {
+      screenshot = await this.page.screenshot({ fullPage: true })
+    } else {
+      screenshot = await this.page.screenshot()
+    }
+
+    await testInfo.attach(name, {
+      body: screenshot,
+      contentType: 'image/png'
+    })
+
+    if (options?.markers) {
+      await this.removeMarkers()
+    }
+  }
+
+  async saveCanvasScreenshot(filename: string): Promise<void> {
+    await this.page.evaluate(async (filename) => {
+      const canvas = document.getElementById(
+        'graph-canvas'
+      ) as HTMLCanvasElement
+      if (!canvas) {
+        throw new Error('Canvas not found')
+      }
+
+      return new Promise<void>((resolve) => {
+        canvas.toBlob(async (blob) => {
+          if (!blob) {
+            throw new Error('Failed to create blob from canvas')
+          }
+
+          const url = URL.createObjectURL(blob)
+          const a = document.createElement('a')
+          a.href = url
+          a.download = filename
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+          URL.revokeObjectURL(url)
+          resolve()
+        }, 'image/png')
+      })
+    }, filename)
+  }
+
+  async getCanvasDataURL(): Promise<string> {
+    return await this.page.evaluate(() => {
+      const canvas = document.getElementById(
+        'graph-canvas'
+      ) as HTMLCanvasElement
+      if (!canvas) {
+        throw new Error('Canvas not found')
+      }
+      return canvas.toDataURL('image/png')
+    })
+  }
+
+  async showCanvasOverlay(): Promise<void> {
+    await this.page.evaluate(() => {
+      const canvas = document.getElementById(
+        'graph-canvas'
+      ) as HTMLCanvasElement
+      if (!canvas) {
+        throw new Error('Canvas not found')
+      }
+
+      const existingOverlay = document.getElementById('debug-canvas-overlay')
+      if (existingOverlay) {
+        existingOverlay.remove()
+      }
+
+      const overlay = document.createElement('div')
+      overlay.id = 'debug-canvas-overlay'
+      overlay.style.position = 'fixed'
+      overlay.style.top = '0'
+      overlay.style.left = '0'
+      overlay.style.zIndex = '9999'
+      overlay.style.backgroundColor = 'white'
+      overlay.style.padding = '10px'
+      overlay.style.border = '2px solid red'
+
+      const img = document.createElement('img')
+      img.src = canvas.toDataURL('image/png')
+      img.style.maxWidth = '800px'
+      img.style.maxHeight = '600px'
+      overlay.appendChild(img)
+
+      document.body.appendChild(overlay)
+    })
+  }
+
+  async hideCanvasOverlay(): Promise<void> {
+    await this.page.evaluate(() => {
+      const overlay = document.getElementById('debug-canvas-overlay')
+      if (overlay) {
+        overlay.remove()
+      }
+    })
+  }
+}

browser_tests/tests/colorPalette.spec.ts

@@ -244,9 +244,21 @@ test.describe(
       await comfyPage.settings.setSetting('Comfy.Node.Opacity', 0.5)
       await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light')
       await comfyPage.nextFrame()
-      const parsed = await comfyPage.page.evaluate(() => {
-        return window['app'].graph.serialize()
-      })
+      const parsed = await (
+        await comfyPage.page.waitForFunction(
+          () => {
+            const workflow = localStorage.getItem('workflow')
+            if (!workflow) return null
+            try {
+              const data = JSON.parse(workflow)
+              return Array.isArray(data?.nodes) ? data : null
+            } catch {
+              return null
+            }
+          },
+          { timeout: 3000 }
+        )
+      ).jsonValue()
       expect(parsed.nodes).toBeDefined()
       expect(Array.isArray(parsed.nodes)).toBe(true)
       for (const node of parsed.nodes) {

browser_tests/tests/featureFlags.spec.ts

@@ -37,9 +37,12 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
 
       // Monitor for server feature flags
       const checkInterval = setInterval(() => {
-        const flags = window.app?.api?.serverFeatureFlags?.value
-        if (flags && Object.keys(flags).length > 0) {
-          window.__capturedMessages!.serverFeatureFlags = flags
+        if (
+          window.app?.api?.serverFeatureFlags &&
+          Object.keys(window.app.api.serverFeatureFlags).length > 0
+        ) {
+          window.__capturedMessages!.serverFeatureFlags =
+            window.app.api.serverFeatureFlags
           clearInterval(checkInterval)
         }
       }, 100)
@@ -93,7 +96,7 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
   }) => {
     // Get the actual server feature flags from the backend
     const serverFlags = await comfyPage.page.evaluate(() => {
-      return window.app!.api.serverFeatureFlags.value
+      return window.app!.api.serverFeatureFlags
     })
 
     // Verify we received real feature flags from the backend
@@ -126,8 +129,8 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
     // Test that the method only returns true for boolean true values
     const testResults = await comfyPage.page.evaluate(() => {
       // Temporarily modify serverFeatureFlags to test behavior
-      const original = window.app!.api.serverFeatureFlags.value
-      window.app!.api.serverFeatureFlags.value = {
+      const original = window.app!.api.serverFeatureFlags
+      window.app!.api.serverFeatureFlags = {
         bool_true: true,
         bool_false: false,
         string_value: 'yes',
@@ -144,7 +147,7 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
       }
 
       // Restore original
-      window.app!.api.serverFeatureFlags.value = original
+      window.app!.api.serverFeatureFlags = original
       return results
     })
 
@@ -279,8 +282,8 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
       // Monitor when feature flags arrive by checking periodically
       const checkFeatureFlags = setInterval(() => {
         if (
-          window.app?.api?.serverFeatureFlags?.value
-            ?.supports_preview_metadata !== undefined
+          window.app?.api?.serverFeatureFlags?.supports_preview_metadata !==
+          undefined
         ) {
           window.__appReadiness!.featureFlagsReceived = true
           clearInterval(checkFeatureFlags)
@@ -317,8 +320,8 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
     // Wait for feature flags to be received
     await newPage.waitForFunction(
       () =>
-        window.app?.api?.serverFeatureFlags?.value
-          ?.supports_preview_metadata !== undefined,
+        window.app?.api?.serverFeatureFlags?.supports_preview_metadata !==
+        undefined,
       {
         timeout: 10000
       }
@@ -328,7 +331,7 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
     const readiness = await newPage.evaluate(() => {
       return {
         ...window.__appReadiness,
-        currentFlags: window.app!.api.serverFeatureFlags.value
+        currentFlags: window.app!.api.serverFeatureFlags
       }
     })
 

browser_tests/tests/interaction.spec.ts

@@ -736,25 +736,6 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
     await expect(comfyPage.canvas).toHaveScreenshot(
       'single_ksampler_modified.png'
     )
-    // Wait for V2 persistence debounce to save the modified workflow
-    const start = Date.now()
-    await comfyPage.page.waitForFunction((since) => {
-      for (let i = 0; i < window.localStorage.length; i++) {
-        const key = window.localStorage.key(i)
-        if (!key?.startsWith('Comfy.Workflow.DraftIndex.v2:')) continue
-        const json = window.localStorage.getItem(key)
-        if (!json) continue
-        try {
-          const index = JSON.parse(json)
-          if (typeof index.updatedAt === 'number' && index.updatedAt >= since) {
-            return true
-          }
-        } catch {
-          // ignore
-        }
-      }
-      return false
-    }, start)
     await comfyPage.setup({ clearStorage: false })
     await expect(comfyPage.canvas).toHaveScreenshot(
       'single_ksampler_modified.png'
@@ -777,17 +758,10 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
       await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
       await comfyPage.menu.topbar.saveWorkflow(workflowB)
 
-      // Wait for sessionStorage to persist the workflow paths before reloading
-      // V2 persistence uses sessionStorage with client-scoped keys
-      await comfyPage.page.waitForFunction(() => {
-        for (let i = 0; i < window.sessionStorage.length; i++) {
-          const key = window.sessionStorage.key(i)
-          if (key?.startsWith('Comfy.Workflow.OpenPaths:')) {
-            return true
-          }
-        }
-        return false
-      })
+      // Wait for localStorage to persist the workflow paths before reloading
+      await comfyPage.page.waitForFunction(
+        () => !!window.localStorage.getItem('Comfy.OpenWorkflowsPaths')
+      )
       await comfyPage.setup({ clearStorage: false })
     })
 

browser_tests/tests/subgraph.spec.ts

@@ -375,45 +375,6 @@ test.describe('Subgraph Operations', { tag: ['@slow', '@subgraph'] }, () => {
     })
   })
 
-  test.describe('Subgraph Unpacking', () => {
-    test('Unpacking subgraph with duplicate links does not create extra links', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow(
-        'subgraphs/subgraph-duplicate-links'
-      )
-
-      const result = await comfyPage.page.evaluate(() => {
-        const graph = window.app!.graph!
-        const subgraphNode = graph.nodes.find((n) => n.isSubgraphNode())
-        if (!subgraphNode || !subgraphNode.isSubgraphNode()) {
-          return { error: 'No subgraph node found' }
-        }
-
-        graph.unpackSubgraph(subgraphNode)
-
-        const linkCount = graph.links.size
-        const nodes = graph.nodes
-        const ksampler = nodes.find((n) => n.type === 'KSampler')
-        if (!ksampler) return { error: 'No KSampler found after unpack' }
-
-        const linkedInputCount = ksampler.inputs.filter(
-          (i) => i.link != null
-        ).length
-
-        return { linkCount, linkedInputCount, nodeCount: nodes.length }
-      })
-
-      expect(result).not.toHaveProperty('error')
-      // Should have exactly 1 link (EmptyLatentImage→KSampler)
-      // not 4 (with 3 duplicates). The KSampler→output link is dropped
-      // because the subgraph output has no downstream connection.
-      expect(result.linkCount).toBe(1)
-      // KSampler should have exactly 1 linked input (latent_image)
-      expect(result.linkedInputCount).toBe(1)
-    })
-  })
-
   test.describe('Subgraph Creation and Deletion', () => {
     test('Can create subgraph from selected nodes', async ({ comfyPage }) => {
       await comfyPage.workflow.loadWorkflow('default')

browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts

@@ -1,22 +1,23 @@
 import { expect } from '@playwright/test'
 
-import type { ComfyPage } from '../../../../fixtures/ComfyPage'
 import { comfyPageFixture as test } from '../../../../fixtures/ComfyPage'
 
 test.describe('Vue Nodes Image Preview', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
-    await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.loadWorkflow('widgets/load_image_widget')
     await comfyPage.vueNodes.waitForNodes()
   })
 
-  async function loadImageOnNode(comfyPage: ComfyPage) {
-    const loadImageNode = (
-      await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
-    )[0]
+  async function loadImageOnNode(
+    comfyPage: Awaited<
+      ReturnType<(typeof test)['info']>
+    >['fixtures']['comfyPage']
+  ) {
+    const loadImageNode = (await comfyPage.getNodeRefsByType('LoadImage'))[0]
     const { x, y } = await loadImageNode.getPosition()
 
-    await comfyPage.dragDrop.dragAndDropFile('image64x64.webp', {
+    await comfyPage.dragAndDropFile('image64x64.webp', {
       dropPosition: { x, y }
     })
 
@@ -28,7 +29,6 @@ test.describe('Vue Nodes Image Preview', () => {
     return imagePreview
   }
 
-  // TODO(#8143): Re-enable after image preview sync is working in CI
   test.fixme('opens mask editor from image preview button', async ({
     comfyPage
   }) => {
@@ -40,7 +40,6 @@ test.describe('Vue Nodes Image Preview', () => {
     await expect(comfyPage.page.locator('.mask-editor-dialog')).toBeVisible()
   })
 
-  // TODO(#8143): Re-enable after image preview sync is working in CI
   test.fixme('shows image context menu options', async ({ comfyPage }) => {
     await loadImageOnNode(comfyPage)
 

docs/WIDGET_SERIALIZATION.md

@@ -1,33 +0,0 @@
-# Widget Serialization: `widget.serialize` vs `widget.options.serialize`
-
-Two properties named `serialize` exist at different levels of a widget object. They control different serialization layers and are checked by completely different code paths.
-
-**`widget.serialize`** — Controls **workflow persistence**. Checked by `LGraphNode.serialize()` and `configure()` when reading/writing `widgets_values` in the workflow JSON. When `false`, the widget is skipped in both serialization and deserialization. Used for UI-only widgets (image previews, progress text, audio players). Typed as `IBaseWidget.serialize` in `src/lib/litegraph/src/types/widgets.ts`.
-
-**`widget.options.serialize`** — Controls **prompt/API serialization**. Checked by `executionUtil.ts` when building the API payload sent to the backend. When `false`, the widget is excluded from prompt inputs. Used for client-side-only controls (`control_after_generate`, combo filter lists) that the server doesn't need. Typed as `IWidgetOptions.serialize` in `src/lib/litegraph/src/types/widgets.ts`.
-
-These correspond to the two data formats in `ComfyMetadata` embedded in output files (PNG, GLTF, WebM, AVIF, etc.): `widget.serialize` → `ComfyMetadataTags.WORKFLOW`, `widget.options.serialize` → `ComfyMetadataTags.PROMPT`.
-
-## Permutation table
-
-| `widget.serialize` | `widget.options.serialize` | In workflow? | In prompt? | Examples                                                             |
-| ------------------ | -------------------------- | ------------ | ---------- | -------------------------------------------------------------------- |
-| ✅ default         | ✅ default                 | Yes          | Yes        | seed, cfg, sampler_name                                              |
-| ✅ default         | ❌ false                   | Yes          | No         | control_after_generate, combo filter list                            |
-| ❌ false           | ✅ default                 | No           | Yes        | No current usage (would be a transient value computed at queue time) |
-| ❌ false           | ❌ false                   | No           | No         | Image/video previews, audio players, progress text                   |
-
-## Gotchas
-
-- `addWidget('combo', name, value, cb, { serialize: false })` puts `serialize` into `widget.options`, **not** onto `widget` directly. These are different properties consumed by different systems.
-- `LGraphNode.serialize()` checks `widget.serialize === false` (line 967). It does **not** check `widget.options.serialize`. A widget with `options.serialize = false` is still included in `widgets_values`.
-- `LGraphNode.serialize()` only writes `widgets_values` if `this.widgets` is truthy. Nodes that create widgets dynamically (like `PrimitiveNode`) will have no `widgets_values` in serialized output if serialized before widget creation — even if `this.widgets_values` exists on the instance from a prior `configure()` call.
-- `widget.options.serialize` is typed as `IWidgetOptions.serialize` — both properties share the name `serialize` but live at different levels of the widget object.
-
-## Code references
-
-- `widget.serialize` checked: `src/lib/litegraph/src/LGraphNode.ts` serialize() and configure()
-- `widget.options.serialize` checked: `src/utils/executionUtil.ts`
-- `widget.options.serialize` set: `src/scripts/widgets.ts` addValueControlWidgets()
-- `widget.serialize` set: `src/composables/node/useNodeImage.ts`, `src/extensions/core/previewAny.ts`, etc.
-- Metadata types: `src/types/metadataTypes.ts`

knip.config.ts

@@ -39,9 +39,7 @@ const config: KnipConfig = {
     'src/workbench/extensions/manager/types/generatedManagerTypes.ts',
     'packages/registry-types/src/comfyRegistryTypes.ts',
     // Used by a custom node (that should move off of this)
-    'src/scripts/ui/components/splitButton.ts',
-    // Workflow files contain license names that knip misinterprets as binaries
-    '.github/workflows/ci-oss-assets-validation.yaml'
+    'src/scripts/ui/components/splitButton.ts'
   ],
   compilers: {
     // https://github.com/webpro-nl/knip/issues/1008#issuecomment-3207756199

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.41.3",
+  "version": "1.40.8",
   "private": true,
   "description": "Official front-end implementation of ComfyUI",
   "homepage": "https://comfy.org",
@@ -70,14 +70,13 @@
     "@primevue/themes": "catalog:",
     "@sentry/vue": "catalog:",
     "@sparkjsdev/spark": "catalog:",
-    "@tiptap/core": "catalog:",
-    "@tiptap/extension-link": "catalog:",
-    "@tiptap/extension-table": "catalog:",
-    "@tiptap/extension-table-cell": "catalog:",
-    "@tiptap/extension-table-header": "catalog:",
-    "@tiptap/extension-table-row": "catalog:",
-    "@tiptap/pm": "catalog:",
-    "@tiptap/starter-kit": "catalog:",
+    "@tiptap/core": "^2.10.4",
+    "@tiptap/extension-link": "^2.10.4",
+    "@tiptap/extension-table": "^2.10.4",
+    "@tiptap/extension-table-cell": "^2.10.4",
+    "@tiptap/extension-table-header": "^2.10.4",
+    "@tiptap/extension-table-row": "^2.10.4",
+    "@tiptap/starter-kit": "^2.10.4",
     "@vueuse/core": "catalog:",
     "@vueuse/integrations": "catalog:",
     "@xterm/addon-fit": "^0.10.0",
@@ -94,9 +93,9 @@
     "extendable-media-recorder-wav-encoder": "^7.0.129",
     "firebase": "catalog:",
     "fuse.js": "^7.0.0",
-    "glob": "catalog:",
+    "glob": "^11.0.3",
     "jsonata": "catalog:",
-    "jsondiffpatch": "catalog:",
+    "jsondiffpatch": "^0.6.0",
     "loglevel": "^1.9.2",
     "marked": "^15.0.11",
     "pinia": "catalog:",

packages/design-system/src/css/style.css

@@ -1192,7 +1192,7 @@ button.comfy-queue-btn {
 .graphdialog {
   min-height: 1em;
   background-color: var(--comfy-menu-bg);
-  z-index: 1500;
+  z-index: 41; /* z-index is set to 41 here in order to appear over selection-overlay-container which should have a z-index of 40 */
 }
 
 .graphdialog .name {

packages/shared-frontend-utils/src/formatUtil.test.ts

@@ -3,7 +3,6 @@ import { describe, expect, it } from 'vitest'
 import {
   getMediaTypeFromFilename,
   highlightQuery,
-  isPreviewableMediaType,
   truncateFilename
 } from './formatUtil'
 
@@ -57,8 +56,7 @@ describe('formatUtil', () => {
         { filename: 'image.jpeg', expected: 'image' },
         { filename: 'animation.gif', expected: 'image' },
         { filename: 'web.webp', expected: 'image' },
-        { filename: 'bitmap.bmp', expected: 'image' },
-        { filename: 'modern.avif', expected: 'image' }
+        { filename: 'bitmap.bmp', expected: 'image' }
       ]
 
       it.for(imageTestCases)(
@@ -98,37 +96,26 @@ describe('formatUtil', () => {
         expect(getMediaTypeFromFilename('scene.fbx')).toBe('3D')
         expect(getMediaTypeFromFilename('asset.gltf')).toBe('3D')
         expect(getMediaTypeFromFilename('binary.glb')).toBe('3D')
-        expect(getMediaTypeFromFilename('apple.usdz')).toBe('3D')
-      })
-    })
-
-    describe('text files', () => {
-      it('should identify text file extensions correctly', () => {
-        expect(getMediaTypeFromFilename('notes.txt')).toBe('text')
-        expect(getMediaTypeFromFilename('readme.md')).toBe('text')
-        expect(getMediaTypeFromFilename('data.json')).toBe('text')
-        expect(getMediaTypeFromFilename('table.csv')).toBe('text')
-        expect(getMediaTypeFromFilename('config.yaml')).toBe('text')
       })
     })
 
     describe('edge cases', () => {
       it('should handle empty strings', () => {
-        expect(getMediaTypeFromFilename('')).toBe('other')
+        expect(getMediaTypeFromFilename('')).toBe('image')
       })
 
       it('should handle files without extensions', () => {
-        expect(getMediaTypeFromFilename('README')).toBe('other')
+        expect(getMediaTypeFromFilename('README')).toBe('image')
       })
 
       it('should handle unknown extensions', () => {
-        expect(getMediaTypeFromFilename('document.pdf')).toBe('other')
-        expect(getMediaTypeFromFilename('archive.bin')).toBe('other')
+        expect(getMediaTypeFromFilename('document.pdf')).toBe('image')
+        expect(getMediaTypeFromFilename('data.json')).toBe('image')
       })
 
       it('should handle files with multiple dots', () => {
         expect(getMediaTypeFromFilename('my.file.name.png')).toBe('image')
-        expect(getMediaTypeFromFilename('archive.tar.gz')).toBe('other')
+        expect(getMediaTypeFromFilename('archive.tar.gz')).toBe('image')
       })
 
       it('should handle paths with directories', () => {
@@ -137,8 +124,8 @@ describe('formatUtil', () => {
       })
 
       it('should handle null and undefined gracefully', () => {
-        expect(getMediaTypeFromFilename(null)).toBe('other')
-        expect(getMediaTypeFromFilename(undefined)).toBe('other')
+        expect(getMediaTypeFromFilename(null)).toBe('image')
+        expect(getMediaTypeFromFilename(undefined)).toBe('image')
       })
 
       it('should handle special characters in filenames', () => {
@@ -197,18 +184,4 @@ describe('formatUtil', () => {
       )
     })
   })
-
-  describe('isPreviewableMediaType', () => {
-    it('returns true for image/video/audio/3D', () => {
-      expect(isPreviewableMediaType('image')).toBe(true)
-      expect(isPreviewableMediaType('video')).toBe(true)
-      expect(isPreviewableMediaType('audio')).toBe(true)
-      expect(isPreviewableMediaType('3D')).toBe(true)
-    })
-
-    it('returns false for text/other', () => {
-      expect(isPreviewableMediaType('text')).toBe(false)
-      expect(isPreviewableMediaType('other')).toBe(false)
-    })
-  })
 })

packages/shared-frontend-utils/src/formatUtil.ts

@@ -494,41 +494,19 @@ export function formatDuration(milliseconds: number): string {
   return parts.join(' ')
 }
 
-const IMAGE_EXTENSIONS = [
-  'png',
-  'jpg',
-  'jpeg',
-  'gif',
-  'webp',
-  'bmp',
-  'avif',
-  'tif',
-  'tiff'
-] as const
+const IMAGE_EXTENSIONS = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'] as const
 const VIDEO_EXTENSIONS = ['mp4', 'webm', 'mov', 'avi'] as const
 const AUDIO_EXTENSIONS = ['mp3', 'wav', 'ogg', 'flac'] as const
-const THREE_D_EXTENSIONS = ['obj', 'fbx', 'gltf', 'glb', 'usdz'] as const
-const TEXT_EXTENSIONS = [
-  'txt',
-  'md',
-  'markdown',
-  'json',
-  'csv',
-  'yaml',
-  'yml',
-  'xml',
-  'log'
-] as const
+const THREE_D_EXTENSIONS = ['obj', 'fbx', 'gltf', 'glb'] as const
 
-const MEDIA_TYPES = ['image', 'video', 'audio', '3D', 'text', 'other'] as const
-export type MediaType = (typeof MEDIA_TYPES)[number]
+const MEDIA_TYPES = ['image', 'video', 'audio', '3D'] as const
+type MediaType = (typeof MEDIA_TYPES)[number]
 
 // Type guard helper for checking array membership
 type ImageExtension = (typeof IMAGE_EXTENSIONS)[number]
 type VideoExtension = (typeof VIDEO_EXTENSIONS)[number]
 type AudioExtension = (typeof AUDIO_EXTENSIONS)[number]
 type ThreeDExtension = (typeof THREE_D_EXTENSIONS)[number]
-type TextExtension = (typeof TEXT_EXTENSIONS)[number]
 
 /**
  * Truncates a filename while preserving the extension
@@ -565,30 +543,20 @@ export function truncateFilename(
 /**
  * Determines the media type from a filename's extension (singular form)
  * @param filename The filename to analyze
- * @returns The media type: 'image', 'video', 'audio', '3D', 'text', or 'other'
+ * @returns The media type: 'image', 'video', 'audio', or '3D'
  */
 export function getMediaTypeFromFilename(
   filename: string | null | undefined
 ): MediaType {
-  if (!filename) return 'other'
+  if (!filename) return 'image'
   const ext = filename.split('.').pop()?.toLowerCase()
-  if (!ext) return 'other'
+  if (!ext) return 'image'
 
   // Type-safe array includes check using type assertion
   if (IMAGE_EXTENSIONS.includes(ext as ImageExtension)) return 'image'
   if (VIDEO_EXTENSIONS.includes(ext as VideoExtension)) return 'video'
   if (AUDIO_EXTENSIONS.includes(ext as AudioExtension)) return 'audio'
   if (THREE_D_EXTENSIONS.includes(ext as ThreeDExtension)) return '3D'
-  if (TEXT_EXTENSIONS.includes(ext as TextExtension)) return 'text'
 
-  return 'other'
-}
-
-export function isPreviewableMediaType(mediaType: MediaType): boolean {
-  return (
-    mediaType === 'image' ||
-    mediaType === 'video' ||
-    mediaType === 'audio' ||
-    mediaType === '3D'
-  )
+  return 'image'
 }

pnpm-workspace.yaml

@@ -9,12 +9,12 @@ catalog:
   '@iconify-json/lucide': ^1.1.178
   '@iconify/json': ^2.2.380
   '@iconify/tailwind4': ^1.2.0
-  '@intlify/eslint-plugin-vue-i18n': ^4.1.1
+  '@intlify/eslint-plugin-vue-i18n': ^4.1.0
   '@lobehub/i18n-cli': ^1.26.1
-  '@nx/eslint': 22.5.2
-  '@nx/playwright': 22.5.2
-  '@nx/storybook': 22.5.2
-  '@nx/vite': 22.5.2
+  '@nx/eslint': 22.2.6
+  '@nx/playwright': 22.2.6
+  '@nx/storybook': 22.2.4
+  '@nx/vite': 22.2.6
   '@pinia/testing': ^1.0.3
   '@playwright/test': ^1.58.1
   '@primeuix/forms': 0.0.2
@@ -27,19 +27,11 @@ catalog:
   '@sentry/vite-plugin': ^4.6.0
   '@sentry/vue': ^10.32.1
   '@sparkjsdev/spark': ^0.1.10
-  '@storybook/addon-docs': ^10.2.10
+  '@storybook/addon-docs': ^10.1.9
   '@storybook/addon-mcp': 0.1.6
-  '@storybook/vue3': ^10.2.10
-  '@storybook/vue3-vite': ^10.2.10
-  '@tailwindcss/vite': ^4.2.0
-  '@tiptap/core': ^2.27.2
-  '@tiptap/extension-link': ^2.27.2
-  '@tiptap/extension-table': ^2.27.2
-  '@tiptap/extension-table-cell': ^2.27.2
-  '@tiptap/extension-table-header': ^2.27.2
-  '@tiptap/extension-table-row': ^2.27.2
-  '@tiptap/pm': 2.27.2
-  '@tiptap/starter-kit': ^2.27.2
+  '@storybook/vue3': ^10.1.9
+  '@storybook/vue3-vite': ^10.1.9
+  '@tailwindcss/vite': ^4.1.12
   '@types/fs-extra': ^11.0.4
   '@types/jsdom': ^21.1.7
   '@types/node': ^24.1.0
@@ -53,7 +45,7 @@ catalog:
   '@vueuse/integrations': ^14.2.0
   '@webgpu/types': ^0.1.66
   algoliasearch: ^5.21.0
-  axios: ^1.13.5
+  axios: ^1.8.2
   cross-env: ^10.1.0
   cva: 1.0.0-beta.4
   dompurify: ^3.3.1
@@ -63,26 +55,24 @@ catalog:
   eslint-import-resolver-typescript: ^4.4.4
   eslint-plugin-import-x: ^4.16.1
   eslint-plugin-oxlint: 1.25.0
-  eslint-plugin-storybook: ^10.2.10
+  eslint-plugin-storybook: ^10.1.9
   eslint-plugin-unused-imports: ^4.3.0
   eslint-plugin-vue: ^10.6.2
   firebase: ^11.6.0
-  glob: ^13.0.6
   globals: ^16.5.0
   happy-dom: ^20.0.11
   husky: ^9.1.7
   jiti: 2.6.1
   jsdom: ^27.4.0
   jsonata: ^2.1.0
-  jsondiffpatch: ^0.7.3
   knip: ^5.75.1
   lint-staged: ^16.2.7
   markdown-table: ^3.0.4
   mixpanel-browser: ^2.71.0
-  nx: 22.5.2
-  oxfmt: ^0.34.0
-  oxlint: ^1.49.0
-  oxlint-tsgolint: ^0.14.2
+  nx: 22.2.6
+  oxfmt: ^0.26.0
+  oxlint: ^1.33.0
+  oxlint-tsgolint: ^0.9.1
   picocolors: ^1.1.1
   pinia: ^3.0.4
   postcss-html: ^1.8.0
@@ -91,9 +81,9 @@ catalog:
   primevue: ^4.2.5
   reka-ui: ^2.5.0
   rollup-plugin-visualizer: ^6.0.4
-  storybook: ^10.2.10
+  storybook: ^10.1.9
   stylelint: ^16.26.1
-  tailwindcss: ^4.2.0
+  tailwindcss: ^4.1.12
   tailwindcss-primeui: ^0.6.1
   tsx: ^4.15.6
   tw-animate-css: ^1.3.8
@@ -110,10 +100,10 @@ catalog:
   vitest: ^4.0.16
   vue: ^3.5.13
   vue-component-type-helpers: ^3.2.1
-  vue-eslint-parser: ^10.4.0
-  vue-i18n: ^9.14.5
+  vue-eslint-parser: ^10.2.0
+  vue-i18n: ^9.14.3
   vue-router: ^4.4.3
-  vue-tsc: ^3.2.5
+  vue-tsc: ^3.2.1
   vuefire: ^3.2.1
   wwobjloader2: ^6.2.1
   yjs: ^13.6.27
@@ -140,5 +130,4 @@ onlyBuiltDependencies:
   - oxc-resolver
 
 overrides:
-  '@tiptap/pm': 2.27.2
   '@types/eslint': '-'

scripts/cicd/pr-playwright-deploy-and-comment.sh

@@ -2,7 +2,7 @@
 set -e
 
 # Deploy Playwright test reports to Cloudflare Pages and comment on PR
-# Usage: ./pr-playwright-deploy-and-comment.sh <pr_number> <branch_name> <status>
+# Usage: ./pr-playwright-deploy-and-comment.sh <pr_number> <branch_name> <status> [start_time]
 
 # Input validation
 # Validate PR number is numeric
@@ -31,6 +31,8 @@ case "$STATUS" in
         ;;
 esac
 
+START_TIME="${4:-$(date -u '+%m/%d/%Y, %I:%M:%S %p')}"
+
 # Required environment variables
 : "${GITHUB_TOKEN:?GITHUB_TOKEN is required}"
 : "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
@@ -133,8 +135,23 @@ post_comment() {
 # Main execution
 if [ "$STATUS" = "starting" ]; then
     # Post concise starting comment
-    comment="$COMMENT_MARKER
-## 🎭 Playwright: ⏳ Running..."
+    comment=$(cat <<EOF
+$COMMENT_MARKER
+## 🎭 Playwright Tests: ⏳ Running...
+
+Tests started at $START_TIME UTC
+
+<details>
+<summary>📊 Browser Tests</summary>
+
+- **chromium**: Running...
+- **chromium-0.5x**: Running...
+- **chromium-2x**: Running...
+- **mobile-chrome**: Running...
+
+</details>
+EOF
+)
     post_comment "$comment"
     
 else
@@ -283,7 +300,7 @@ else
     
     # Generate compact single-line comment
     comment="$COMMENT_MARKER
-## 🎭 Playwright: $status_icon $total_passed passed, $total_failed failed$flaky_note"
+**Playwright:** $status_icon $total_passed passed, $total_failed failed$flaky_note"
 
     # Extract and display failed tests from all browsers (flaky tests are treated as passing)
     if [ $total_failed -gt 0 ]; then

scripts/cicd/pr-storybook-deploy-and-comment.sh

@@ -2,7 +2,7 @@
 set -e
 
 # Deploy Storybook to Cloudflare Pages and comment on PR
-# Usage: ./pr-storybook-deploy-and-comment.sh <pr_number> <branch_name> <status>
+# Usage: ./pr-storybook-deploy-and-comment.sh <pr_number> <branch_name> <status> [start_time]
 
 # Input validation
 # Validate PR number is numeric
@@ -31,6 +31,7 @@ case "$STATUS" in
         ;;
 esac
 
+START_TIME="${4:-$(date -u '+%m/%d/%Y, %I:%M:%S %p')}"
 
 # Required environment variables
 : "${GITHUB_TOKEN:?GITHUB_TOKEN is required}"
@@ -119,9 +120,50 @@ post_comment() {
 
 # Main execution
 if [ "$STATUS" = "starting" ]; then
-    # Post starting comment
-    comment="$COMMENT_MARKER
-## 🎨 Storybook: <img alt='loading' src='https://github.com/user-attachments/assets/755c86ee-e445-4ea8-bc2c-cca85df48686' width='14px' height='14px'/> Building..."
+    # Check if this is a version-bump branch
+    IS_VERSION_BUMP="false"
+    if echo "$BRANCH_NAME" | grep -q "^version-bump-"; then
+        IS_VERSION_BUMP="true"
+    fi
+    
+    # Post starting comment with appropriate message
+    if [ "$IS_VERSION_BUMP" = "true" ]; then
+        comment=$(cat <<EOF
+$COMMENT_MARKER
+## 🎨 Storybook Build Status
+
+<img alt='loading' src='https://github.com/user-attachments/assets/755c86ee-e445-4ea8-bc2c-cca85df48686' width='14px' height='14px'/> **Build is starting...**
+
+⏰ Started at: $START_TIME UTC
+
+### 🚀 Building Storybook
+- 📦 Installing dependencies...
+- 🔧 Building Storybook components...
+- 🎨 Running Chromatic visual tests...
+
+---
+⏱️ Please wait while the Storybook build is in progress...
+EOF
+)
+    else
+        comment=$(cat <<EOF
+$COMMENT_MARKER
+## 🎨 Storybook Build Status
+
+<img alt='loading' src='https://github.com/user-attachments/assets/755c86ee-e445-4ea8-bc2c-cca85df48686' width='14px' height='14px'/> **Build is starting...**
+
+⏰ Started at: $START_TIME UTC
+
+### 🚀 Building Storybook
+- 📦 Installing dependencies...
+- 🔧 Building Storybook components...
+- 🌐 Preparing deployment to Cloudflare Pages...
+
+---
+⏱️ Please wait while the Storybook build is in progress...
+EOF
+)
+    fi
     post_comment "$comment"
     
 elif [ "$STATUS" = "completed" ]; then
@@ -150,57 +192,56 @@ elif [ "$STATUS" = "completed" ]; then
     WORKFLOW_CONCLUSION="${WORKFLOW_CONCLUSION:-success}"
     WORKFLOW_URL="${WORKFLOW_URL:-}"
     
-    # Generate compact header based on conclusion
+    # Generate completion comment based on conclusion
     if [ "$WORKFLOW_CONCLUSION" = "success" ]; then
         status_icon="✅"
-        status_text="Built"
+        status_text="Build completed successfully!"
+        footer_text="🎉 Your Storybook is ready for review!"
     elif [ "$WORKFLOW_CONCLUSION" = "skipped" ]; then
         status_icon="⏭️"
-        status_text="Skipped"
+        status_text="Build skipped."
+        footer_text="ℹ️ Chromatic was skipped for this PR."
     elif [ "$WORKFLOW_CONCLUSION" = "cancelled" ]; then
         status_icon="🚫"
-        status_text="Cancelled"
+        status_text="Build cancelled."
+        footer_text="ℹ️ The Chromatic run was cancelled."
     else
         status_icon="❌"
-        status_text="Failed"
+        status_text="Build failed!"
+        footer_text="⚠️ Please check the workflow logs for error details."
     fi
+    
+    comment="$COMMENT_MARKER
+## 🎨 Storybook Build Status
 
-    # Build compact header with optional storybook link
-    header="## 🎨 Storybook: $status_icon $status_text"
-    if [ "$deployment_url" != "Not deployed" ] && [ "$deployment_url" != "Deployment failed" ] && [ "$WORKFLOW_CONCLUSION" = "success" ]; then
-        header="$header — $deployment_url"
-    fi
-
-    # Build details section
-    details="<details>
-<summary>Details</summary>
+$status_icon **$status_text**
 
 ⏰ Completed at: $(date -u '+%m/%d/%Y, %I:%M:%S %p') UTC
 
-**Links**
+### 🔗 Links
 - [📊 View Workflow Run]($WORKFLOW_URL)"
-
+    
+    # Add deployment status
     if [ "$deployment_url" != "Not deployed" ]; then
         if [ "$deployment_url" = "Deployment failed" ]; then
-            details="$details
+            comment="$comment
 - ❌ Storybook deployment failed"
-        elif [ "$WORKFLOW_CONCLUSION" != "success" ]; then
-            details="$details
-- ⚠️ Build failed — $deployment_url"
+        elif [ "$WORKFLOW_CONCLUSION" = "success" ]; then
+            comment="$comment
+- 🎨 $deployment_url"
+        else
+            comment="$comment
+- ⚠️ Build failed - $deployment_url"
         fi
     elif [ "$WORKFLOW_CONCLUSION" != "success" ]; then
-        details="$details
+        comment="$comment
 - ⏭️ Storybook deployment skipped (build did not succeed)"
     fi
+    
+    comment="$comment
 
-    details="$details
-
-</details>"
-
-    comment="$COMMENT_MARKER
-$header
-
-$details"
+---
+$footer_text"
     
     post_comment "$comment"
 fi

src/components/TopMenuSection.vue

@@ -169,7 +169,6 @@ import { useSettingStore } from '@/platform/settings/settingStore'
 import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
-import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { useQueueStore, useQueueUIStore } from '@/stores/queueStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
@@ -190,7 +189,6 @@ const { toastErrorHandler } = useErrorHandling()
 const commandStore = useCommandStore()
 const queueStore = useQueueStore()
 const executionStore = useExecutionStore()
-const executionErrorStore = useExecutionErrorStore()
 const queueUIStore = useQueueUIStore()
 const sidebarTabStore = useSidebarTabStore()
 const { activeJobsCount } = storeToRefs(queueStore)
@@ -264,7 +262,7 @@ const shouldShowRedDot = computed((): boolean => {
   return shouldShowConflictRedDot.value
 })
 
-const { hasAnyError } = storeToRefs(executionErrorStore)
+const { hasAnyError } = storeToRefs(executionStore)
 
 // Right side panel toggle
 const { isOpen: isRightSidePanelOpen } = storeToRefs(rightSidePanelStore)

src/components/common/ScrubableNumberInput.vue

@@ -6,7 +6,7 @@
     <slot name="background" />
     <Button
       v-if="!hideButtons"
-      :aria-label="t('g.decrement')"
+      :aria-label="t('g.ariaLabel.decrement')"
       data-testid="decrement"
       class="h-full w-8 rounded-r-none hover:bg-base-foreground/20 disabled:opacity-30"
       variant="muted-textonly"
@@ -51,7 +51,7 @@
     <slot />
     <Button
       v-if="!hideButtons"
-      :aria-label="t('g.increment')"
+      :aria-label="t('g.ariaLabel.increment')"
       data-testid="increment"
       class="h-full w-8 rounded-l-none hover:bg-base-foreground/20 disabled:opacity-30"
       variant="muted-textonly"

src/components/common/SystemStatsPanel.vue

@@ -6,12 +6,10 @@
       </h2>
       <div class="grid grid-cols-2 gap-2">
         <template v-for="col in systemColumns" :key="col.field">
-          <div :class="cn('font-medium', isOutdated(col) && 'text-danger-100')">
+          <div class="font-medium">
             {{ col.header }}
           </div>
-          <div :class="cn(isOutdated(col) && 'text-danger-100')">
-            {{ getDisplayValue(col) }}
-          </div>
+          <div>{{ getDisplayValue(col) }}</div>
         </template>
       </div>
     </div>
@@ -49,7 +47,6 @@ import DeviceInfo from '@/components/common/DeviceInfo.vue'
 import { isCloud } from '@/platform/distribution/types'
 import type { SystemStats } from '@/schemas/apiSchema'
 import { formatCommitHash, formatSize } from '@/utils/formatUtil'
-import { cn } from '@/utils/tailwindUtil'
 
 const props = defineProps<{
   stats: SystemStats
@@ -79,8 +76,7 @@ const localColumns: ColumnDef[] = [
   { field: 'pytorch_version', header: 'Pytorch Version' },
   { field: 'argv', header: 'Arguments' },
   { field: 'ram_total', header: 'RAM Total', formatNumber: formatSize },
-  { field: 'ram_free', header: 'RAM Free', formatNumber: formatSize },
-  { field: 'installed_templates_version', header: 'Templates Version' }
+  { field: 'ram_free', header: 'RAM Free', formatNumber: formatSize }
 ]
 
 /** Columns for cloud distribution */
@@ -101,13 +97,6 @@ const cloudColumns: ColumnDef[] = [
 
 const systemColumns = computed(() => (isCloud ? cloudColumns : localColumns))
 
-function isOutdated(column: ColumnDef): boolean {
-  if (column.field !== 'installed_templates_version') return false
-  const installed = props.stats.system.installed_templates_version
-  const required = props.stats.system.required_templates_version
-  return !!installed && !!required && installed !== required
-}
-
 const getDisplayValue = (column: ColumnDef) => {
   const value = systemInfo.value[column.field]
   if (column.formatNumber && typeof value === 'number') {

src/components/common/VirtualGrid.test.ts

@@ -1,189 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Ref } from 'vue'
-import { nextTick, ref } from 'vue'
-
-import VirtualGrid from './VirtualGrid.vue'
-
-type TestItem = { key: string; name: string }
-
-let mockedWidth: Ref<number>
-let mockedHeight: Ref<number>
-let mockedScrollY: Ref<number>
-
-vi.mock('@vueuse/core', async () => {
-  const actual = await vi.importActual<Record<string, unknown>>('@vueuse/core')
-  return {
-    ...actual,
-    useElementSize: () => ({ width: mockedWidth, height: mockedHeight }),
-    useScroll: () => ({ y: mockedScrollY })
-  }
-})
-
-beforeEach(() => {
-  mockedWidth = ref(400)
-  mockedHeight = ref(200)
-  mockedScrollY = ref(0)
-})
-
-function createItems(count: number): TestItem[] {
-  return Array.from({ length: count }, (_, i) => ({
-    key: `item-${i}`,
-    name: `Item ${i}`
-  }))
-}
-
-describe('VirtualGrid', () => {
-  const defaultGridStyle = {
-    display: 'grid',
-    gridTemplateColumns: 'repeat(4, 1fr)',
-    gap: '1rem'
-  }
-
-  it('renders items within the visible range', async () => {
-    const items = createItems(100)
-    mockedWidth.value = 400
-    mockedHeight.value = 200
-    mockedScrollY.value = 0
-
-    const wrapper = mount(VirtualGrid<TestItem>, {
-      props: {
-        items,
-        gridStyle: defaultGridStyle,
-        defaultItemHeight: 100,
-        defaultItemWidth: 100,
-        maxColumns: 4,
-        bufferRows: 1
-      },
-      slots: {
-        item: `<template #item="{ item }">
-          <div class="test-item">{{ item.name }}</div>
-        </template>`
-      },
-      attachTo: document.body
-    })
-
-    await nextTick()
-
-    const renderedItems = wrapper.findAll('.test-item')
-    expect(renderedItems.length).toBeGreaterThan(0)
-    expect(renderedItems.length).toBeLessThan(items.length)
-
-    wrapper.unmount()
-  })
-
-  it('provides correct index in slot props', async () => {
-    const items = createItems(20)
-    const receivedIndices: number[] = []
-    mockedWidth.value = 400
-    mockedHeight.value = 200
-    mockedScrollY.value = 0
-
-    const wrapper = mount(VirtualGrid<TestItem>, {
-      props: {
-        items,
-        gridStyle: defaultGridStyle,
-        defaultItemHeight: 50,
-        defaultItemWidth: 100,
-        maxColumns: 1,
-        bufferRows: 0
-      },
-      slots: {
-        item: ({ index }: { index: number }) => {
-          receivedIndices.push(index)
-          return null
-        }
-      },
-      attachTo: document.body
-    })
-
-    await nextTick()
-
-    expect(receivedIndices.length).toBeGreaterThan(0)
-    expect(receivedIndices[0]).toBe(0)
-    for (let i = 1; i < receivedIndices.length; i++) {
-      expect(receivedIndices[i]).toBe(receivedIndices[i - 1] + 1)
-    }
-
-    wrapper.unmount()
-  })
-
-  it('respects maxColumns prop', async () => {
-    const items = createItems(10)
-    mockedWidth.value = 400
-    mockedHeight.value = 200
-    mockedScrollY.value = 0
-
-    const wrapper = mount(VirtualGrid<TestItem>, {
-      props: {
-        items,
-        gridStyle: defaultGridStyle,
-        maxColumns: 2
-      },
-      attachTo: document.body
-    })
-
-    await nextTick()
-
-    const gridElement = wrapper.find('[style*="display: grid"]')
-    expect(gridElement.exists()).toBe(true)
-
-    const gridEl = gridElement.element as HTMLElement
-    expect(gridEl.style.gridTemplateColumns).toBe('repeat(2, minmax(0, 1fr))')
-
-    wrapper.unmount()
-  })
-
-  it('renders empty when no items provided', async () => {
-    const wrapper = mount(VirtualGrid<TestItem>, {
-      props: {
-        items: [],
-        gridStyle: defaultGridStyle
-      },
-      slots: {
-        item: `<template #item="{ item }">
-          <div class="test-item">{{ item.name }}</div>
-        </template>`
-      }
-    })
-
-    await nextTick()
-
-    const renderedItems = wrapper.findAll('.test-item')
-    expect(renderedItems.length).toBe(0)
-
-    wrapper.unmount()
-  })
-
-  it('forces cols to maxColumns when maxColumns is finite', async () => {
-    mockedWidth.value = 100
-    mockedHeight.value = 200
-    mockedScrollY.value = 0
-
-    const items = createItems(20)
-    const wrapper = mount(VirtualGrid<TestItem>, {
-      props: {
-        items,
-        gridStyle: defaultGridStyle,
-        defaultItemHeight: 50,
-        defaultItemWidth: 200,
-        maxColumns: 4,
-        bufferRows: 0
-      },
-      slots: {
-        item: `<template #item="{ item }">
-          <div class="test-item">{{ item.name }}</div>
-        </template>`
-      },
-      attachTo: document.body
-    })
-
-    await nextTick()
-
-    const renderedItems = wrapper.findAll('.test-item')
-    expect(renderedItems.length).toBeGreaterThan(0)
-    expect(renderedItems.length % 4).toBe(0)
-
-    wrapper.unmount()
-  })
-})

src/components/common/VirtualGrid.vue

@@ -1,16 +1,17 @@
 <template>
   <div
     ref="container"
-    class="h-full overflow-y-auto [overflow-anchor:none] [scrollbar-gutter:stable] scrollbar-thin scrollbar-track-transparent scrollbar-thumb-(--dialog-surface)"
+    class="h-full overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-(--dialog-surface)"
   >
     <div :style="topSpacerStyle" />
     <div :style="mergedGridStyle">
       <div
-        v-for="(item, i) in renderedItems"
+        v-for="item in renderedItems"
         :key="item.key"
+        class="transition-[width] duration-150 ease-out"
         data-virtual-grid-item
       >
-        <slot name="item" :item :index="state.start + i" />
+        <slot name="item" :item="item" />
       </div>
     </div>
     <div :style="bottomSpacerStyle" />
@@ -65,10 +66,9 @@ const { y: scrollY } = useScroll(container, {
   eventListenerOptions: { passive: true }
 })
 
-const cols = computed(() => {
-  if (maxColumns !== Infinity) return maxColumns
-  return Math.floor(width.value / itemWidth.value) || 1
-})
+const cols = computed(() =>
+  Math.min(Math.floor(width.value / itemWidth.value) || 1, maxColumns)
+)
 
 const mergedGridStyle = computed<CSSProperties>(() => {
   if (maxColumns === Infinity) return gridStyle
@@ -101,9 +101,8 @@ const renderedItems = computed(() =>
   isValidGrid.value ? items.slice(state.value.start, state.value.end) : []
 )
 
-function rowsToHeight(itemsCount: number): string {
-  const rows = Math.ceil(itemsCount / cols.value)
-  return `${rows * itemHeight.value}px`
+function rowsToHeight(rows: number): string {
+  return `${(rows / cols.value) * itemHeight.value}px`
 }
 const topSpacerStyle = computed<CSSProperties>(() => ({
   height: rowsToHeight(state.value.start)
@@ -119,10 +118,11 @@ whenever(
   }
 )
 
-function updateItemSize(): void {
+const updateItemSize = () => {
   if (container.value) {
     const firstItem = container.value.querySelector('[data-virtual-grid-item]')
 
+    // Don't update item size if the first item is not rendered yet
     if (!firstItem?.clientHeight || !firstItem?.clientWidth) return
 
     if (itemHeight.value !== firstItem.clientHeight) {

src/components/dialog/content/setting/AboutPanel.vue

@@ -13,7 +13,7 @@
         class="about-badge inline-flex items-center no-underline"
         :title="badge.url"
       >
-        <Tag class="mr-2" :severity="badge.severity">
+        <Tag class="mr-2">
           <template #icon>
             <i :class="[badge.icon, 'mr-2 text-xl']" />
           </template>

src/components/error/ErrorOverlay.vue

@@ -64,17 +64,17 @@ import { useI18n } from 'vue-i18n'
 import { storeToRefs } from 'pinia'
 
 import Button from '@/components/ui/button/Button.vue'
-import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useExecutionStore } from '@/stores/executionStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useErrorGroups } from '@/components/rightSidePanel/errors/useErrorGroups'
 
 const { t } = useI18n()
-const executionErrorStore = useExecutionErrorStore()
+const executionStore = useExecutionStore()
 const rightSidePanelStore = useRightSidePanelStore()
 const canvasStore = useCanvasStore()
 
-const { totalErrorCount, isErrorOverlayOpen } = storeToRefs(executionErrorStore)
+const { totalErrorCount, isErrorOverlayOpen } = storeToRefs(executionStore)
 const { groupedErrorMessages } = useErrorGroups(ref(''), t)
 
 const errorCountLabel = computed(() =>
@@ -90,7 +90,7 @@ const isVisible = computed(
 )
 
 function dismiss() {
-  executionErrorStore.dismissErrorOverlay()
+  executionStore.dismissErrorOverlay()
 }
 
 function seeErrors() {
@@ -100,6 +100,6 @@ function seeErrors() {
   }
 
   rightSidePanelStore.openPanel('errors')
-  executionErrorStore.dismissErrorOverlay()
+  executionStore.dismissErrorOverlay()
 }
 </script>

src/components/graph/GraphCanvas.vue

@@ -70,7 +70,7 @@
       :key="nodeData.id"
       :node-data="nodeData"
       :error="
-        executionErrorStore.lastExecutionError?.node_id === nodeData.id
+        executionStore.lastExecutionError?.node_id === nodeData.id
           ? 'Execution error'
           : null
       "
@@ -152,7 +152,7 @@ import { useToastStore } from '@/platform/updates/common/toastStore'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useWorkflowAutoSave } from '@/platform/workflow/persistence/composables/useWorkflowAutoSave'
-import { useWorkflowPersistenceV2 as useWorkflowPersistence } from '@/platform/workflow/persistence/composables/useWorkflowPersistenceV2'
+import { useWorkflowPersistence } from '@/platform/workflow/persistence/composables/useWorkflowPersistence'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions'
 import TransformPane from '@/renderer/core/layout/transform/TransformPane.vue'
@@ -170,7 +170,6 @@ import { storeToRefs } from 'pinia'
 import { useBootstrapStore } from '@/stores/bootstrapStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
-import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
@@ -197,7 +196,6 @@ const workspaceStore = useWorkspaceStore()
 const canvasStore = useCanvasStore()
 const workflowStore = useWorkflowStore()
 const executionStore = useExecutionStore()
-const executionErrorStore = useExecutionErrorStore()
 const toastStore = useToastStore()
 const colorPaletteStore = useColorPaletteStore()
 const colorPaletteService = useColorPaletteService()
@@ -378,7 +376,7 @@ watch(
 // Update node slot errors for LiteGraph nodes
 // (Vue nodes read from store directly)
 watch(
-  () => executionErrorStore.lastNodeErrors,
+  () => executionStore.lastNodeErrors,
   (lastNodeErrors) => {
     if (!comfyApp.graph) return
 

src/components/queue/QueueOverlayExpanded.test.ts

@@ -1,85 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { describe, expect, it, vi } from 'vitest'
-
-import type { JobListItem } from '@/composables/queue/useJobList'
-
-vi.mock('@/composables/queue/useJobMenu', () => ({
-  useJobMenu: () => ({ jobMenuEntries: [] })
-}))
-
-vi.mock('@/composables/useErrorHandling', () => ({
-  useErrorHandling: () => ({
-    wrapWithErrorHandlingAsync: <T extends (...args: never[]) => unknown>(
-      fn: T
-    ) => fn
-  })
-}))
-
-import QueueOverlayExpanded from '@/components/queue/QueueOverlayExpanded.vue'
-
-const QueueOverlayHeaderStub = {
-  template: '<div />'
-}
-
-const JobFiltersBarStub = {
-  template: '<div />'
-}
-
-const JobAssetsListStub = {
-  name: 'JobAssetsList',
-  template: '<div class="job-assets-list-stub" />'
-}
-
-const JobContextMenuStub = {
-  template: '<div />'
-}
-
-const createJob = (): JobListItem => ({
-  id: 'job-1',
-  title: 'Job 1',
-  meta: 'meta',
-  state: 'pending'
-})
-
-const mountComponent = () =>
-  mount(QueueOverlayExpanded, {
-    props: {
-      headerTitle: 'Jobs',
-      queuedCount: 1,
-      selectedJobTab: 'All',
-      selectedWorkflowFilter: 'all',
-      selectedSortMode: 'mostRecent',
-      displayedJobGroups: [],
-      hasFailedJobs: false
-    },
-    global: {
-      stubs: {
-        QueueOverlayHeader: QueueOverlayHeaderStub,
-        JobFiltersBar: JobFiltersBarStub,
-        JobAssetsList: JobAssetsListStub,
-        JobContextMenu: JobContextMenuStub
-      }
-    }
-  })
-
-describe('QueueOverlayExpanded', () => {
-  it('renders JobAssetsList', () => {
-    const wrapper = mountComponent()
-    expect(wrapper.find('.job-assets-list-stub').exists()).toBe(true)
-  })
-
-  it('re-emits list item actions from JobAssetsList', async () => {
-    const wrapper = mountComponent()
-    const job = createJob()
-    const jobAssetsList = wrapper.findComponent({ name: 'JobAssetsList' })
-
-    jobAssetsList.vm.$emit('cancel-item', job)
-    jobAssetsList.vm.$emit('delete-item', job)
-    jobAssetsList.vm.$emit('view-item', job)
-    await wrapper.vm.$nextTick()
-
-    expect(wrapper.emitted('cancelItem')?.[0]).toEqual([job])
-    expect(wrapper.emitted('deleteItem')?.[0]).toEqual([job])
-    expect(wrapper.emitted('viewItem')?.[0]).toEqual([job])
-  })
-})

src/components/queue/QueueOverlayExpanded.vue

@@ -2,6 +2,8 @@
   <div class="flex w-full flex-col gap-4">
     <QueueOverlayHeader
       :header-title="headerTitle"
+      :show-concurrent-indicator="showConcurrentIndicator"
+      :concurrent-workflow-count="concurrentWorkflowCount"
       :queued-count="queuedCount"
       @clear-history="$emit('clearHistory')"
       @clear-queued="$emit('clearQueued')"
@@ -21,7 +23,7 @@
     />
 
     <div class="flex-1 min-h-0 overflow-y-auto">
-      <JobAssetsList
+      <JobGroupsList
         :displayed-job-groups="displayedJobGroups"
         @cancel-item="onCancelItemEvent"
         @delete-item="onDeleteItemEvent"
@@ -53,11 +55,13 @@ import { useErrorHandling } from '@/composables/useErrorHandling'
 
 import QueueOverlayHeader from './QueueOverlayHeader.vue'
 import JobContextMenu from './job/JobContextMenu.vue'
-import JobAssetsList from './job/JobAssetsList.vue'
 import JobFiltersBar from './job/JobFiltersBar.vue'
+import JobGroupsList from './job/JobGroupsList.vue'
 
 defineProps<{
   headerTitle: string
+  showConcurrentIndicator: boolean
+  concurrentWorkflowCount: number
   queuedCount: number
   selectedJobTab: JobTab
   selectedWorkflowFilter: 'all' | 'current'

src/components/queue/QueueOverlayHeader.test.ts

@@ -51,10 +51,9 @@ const i18n = createI18n({
       g: { more: 'More' },
       sideToolbar: {
         queueProgressOverlay: {
+          running: 'running',
           queuedSuffix: 'queued',
           clearQueued: 'Clear queued',
-          clearQueueTooltip: 'Clear queue',
-          clearAllJobsTooltip: 'Cancel all running jobs',
           moreOptions: 'More options',
           clearHistory: 'Clear history',
           dockedJobHistory: 'Docked Job History'
@@ -68,6 +67,8 @@ const mountHeader = (props = {}) =>
   mount(QueueOverlayHeader, {
     props: {
       headerTitle: 'Job queue',
+      showConcurrentIndicator: true,
+      concurrentWorkflowCount: 2,
       queuedCount: 3,
       ...props
     },
@@ -83,28 +84,40 @@ describe('QueueOverlayHeader', () => {
     mockSetSetting.mockClear()
   })
 
-  it('renders header title', () => {
-    const wrapper = mountHeader()
+  it('renders header title and concurrent indicator when enabled', () => {
+    const wrapper = mountHeader({ concurrentWorkflowCount: 3 })
+
     expect(wrapper.text()).toContain('Job queue')
+    const indicator = wrapper.find('.inline-flex.items-center.gap-1')
+    expect(indicator.exists()).toBe(true)
+    expect(indicator.text()).toContain('3')
+    expect(indicator.text()).toContain('running')
   })
 
-  it('shows clear queue text and emits clear queued', async () => {
+  it('hides concurrent indicator when flag is false', () => {
+    const wrapper = mountHeader({ showConcurrentIndicator: false })
+
+    expect(wrapper.text()).toContain('Job queue')
+    expect(wrapper.find('.inline-flex.items-center.gap-1').exists()).toBe(false)
+  })
+
+  it('shows queued summary and emits clear queued', async () => {
     const wrapper = mountHeader({ queuedCount: 4 })
 
-    expect(wrapper.text()).toContain('Clear queue')
-    expect(wrapper.text()).not.toContain('4 queued')
+    expect(wrapper.text()).toContain('4')
+    expect(wrapper.text()).toContain('queued')
 
     const clearQueuedButton = wrapper.get('button[aria-label="Clear queued"]')
     await clearQueuedButton.trigger('click')
     expect(wrapper.emitted('clearQueued')).toHaveLength(1)
   })
 
-  it('disables clear queued button when queued count is zero', () => {
+  it('hides clear queued button when queued count is zero', () => {
     const wrapper = mountHeader({ queuedCount: 0 })
-    const clearQueuedButton = wrapper.get('button[aria-label="Clear queued"]')
 
-    expect(clearQueuedButton.attributes('disabled')).toBeDefined()
-    expect(wrapper.text()).toContain('Clear queue')
+    expect(wrapper.find('button[aria-label="Clear queued"]').exists()).toBe(
+      false
+    )
   })
 
   it('emits clear history from the menu', async () => {

src/components/queue/QueueOverlayHeader.vue

@@ -4,19 +4,34 @@
   >
     <div class="min-w-0 flex-1 px-2 text-[14px] font-normal text-text-primary">
       <span>{{ headerTitle }}</span>
+      <span
+        v-if="showConcurrentIndicator"
+        class="ml-4 inline-flex items-center gap-1 text-blue-100"
+      >
+        <span class="inline-block size-2 rounded-full bg-blue-100" />
+        <span>
+          <span class="font-bold">{{ concurrentWorkflowCount }}</span>
+          <span class="ml-1">{{
+            t('sideToolbar.queueProgressOverlay.running')
+          }}</span>
+        </span>
+      </span>
     </div>
     <div
       class="inline-flex h-6 items-center gap-2 text-[12px] leading-none text-text-primary"
     >
-      <span :class="{ 'opacity-50': queuedCount === 0 }">{{
-        t('sideToolbar.queueProgressOverlay.clearQueueTooltip')
-      }}</span>
+      <span class="opacity-90">
+        <span class="font-bold">{{ queuedCount }}</span>
+        <span class="ml-1">{{
+          t('sideToolbar.queueProgressOverlay.queuedSuffix')
+        }}</span>
+      </span>
       <Button
+        v-if="queuedCount > 0"
         v-tooltip.top="clearAllJobsTooltip"
         variant="destructive"
         size="icon"
         :aria-label="t('sideToolbar.queueProgressOverlay.clearQueued')"
-        :disabled="queuedCount === 0"
         @click="$emit('clearQueued')"
       >
         <i class="icon-[lucide--list-x] size-4" />
@@ -36,6 +51,8 @@ import { buildTooltipConfig } from '@/composables/useTooltipConfig'
 
 defineProps<{
   headerTitle: string
+  showConcurrentIndicator: boolean
+  concurrentWorkflowCount: number
   queuedCount: number
 }>()
 

src/components/queue/QueueProgressOverlay.vue

@@ -17,6 +17,8 @@
         v-model:selected-sort-mode="selectedSortMode"
         class="flex-1 min-h-0"
         :header-title="headerTitle"
+        :show-concurrent-indicator="showConcurrentIndicator"
+        :concurrent-workflow-count="concurrentWorkflowCount"
         :queued-count="queuedCount"
         :displayed-job-groups="displayedJobGroups"
         :has-failed-jobs="hasFailedJobs"
@@ -181,6 +183,13 @@ const headerTitle = computed(() => {
   })
 })
 
+const concurrentWorkflowCount = computed(
+  () => executionStore.runningWorkflowCount
+)
+const showConcurrentIndicator = computed(
+  () => concurrentWorkflowCount.value > 1
+)
+
 const {
   selectedJobTab,
   selectedWorkflowFilter,

src/components/rightSidePanel/RightSidePanel.vue

@@ -14,7 +14,7 @@ import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useExecutionStore } from '@/stores/executionStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import type { RightSidePanelTab } from '@/stores/workspace/rightSidePanelStore'
 import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
@@ -36,12 +36,12 @@ import SubgraphEditor from './subgraph/SubgraphEditor.vue'
 import TabErrors from './errors/TabErrors.vue'
 
 const canvasStore = useCanvasStore()
-const executionErrorStore = useExecutionErrorStore()
+const executionStore = useExecutionStore()
 const rightSidePanelStore = useRightSidePanelStore()
 const settingStore = useSettingStore()
 const { t } = useI18n()
 
-const { hasAnyError, allErrorExecutionIds } = storeToRefs(executionErrorStore)
+const { hasAnyError, allErrorExecutionIds } = storeToRefs(executionStore)
 
 const { findParentGroup } = useGraphHierarchy()
 
@@ -98,7 +98,7 @@ type RightSidePanelTabList = Array<{
 
 const hasDirectNodeError = computed(() =>
   selectedNodes.value.some((node) =>
-    executionErrorStore.activeGraphErrorNodeIds.has(String(node.id))
+    executionStore.activeGraphErrorNodeIds.has(String(node.id))
   )
 )
 
@@ -106,7 +106,7 @@ const hasContainerInternalError = computed(() => {
   if (allErrorExecutionIds.value.length === 0) return false
   return selectedNodes.value.some((node) => {
     if (!(node instanceof SubgraphNode || isGroupNode(node))) return false
-    return executionErrorStore.hasInternalErrorForNode(node.id)
+    return executionStore.hasInternalErrorForNode(node.id)
   })
 })
 

src/components/rightSidePanel/errors/TabErrors.test.ts

@@ -94,7 +94,7 @@ describe('TabErrors.vue', () => {
 
   it('renders prompt-level errors (Group title = error message)', async () => {
     const wrapper = mountComponent({
-      executionError: {
+      execution: {
         lastPromptError: {
           type: 'prompt_no_outputs',
           message: 'Server Error: No outputs',
@@ -118,7 +118,7 @@ describe('TabErrors.vue', () => {
     } as ReturnType<typeof getNodeByExecutionId>)
 
     const wrapper = mountComponent({
-      executionError: {
+      execution: {
         lastNodeErrors: {
           '6': {
             class_type: 'CLIPTextEncode',
@@ -143,7 +143,7 @@ describe('TabErrors.vue', () => {
     } as ReturnType<typeof getNodeByExecutionId>)
 
     const wrapper = mountComponent({
-      executionError: {
+      execution: {
         lastExecutionError: {
           prompt_id: 'abc',
           node_id: '10',
@@ -167,7 +167,7 @@ describe('TabErrors.vue', () => {
     vi.mocked(getNodeByExecutionId).mockReturnValue(null)
 
     const wrapper = mountComponent({
-      executionError: {
+      execution: {
         lastNodeErrors: {
           '1': {
             class_type: 'CLIPTextEncode',
@@ -198,7 +198,7 @@ describe('TabErrors.vue', () => {
     vi.mocked(useCopyToClipboard).mockReturnValue({ copyToClipboard: mockCopy })
 
     const wrapper = mountComponent({
-      executionError: {
+      execution: {
         lastNodeErrors: {
           '1': {
             class_type: 'TestNode',

src/components/rightSidePanel/errors/useErrorGroups.ts

@@ -3,14 +3,13 @@ import type { Ref } from 'vue'
 import Fuse from 'fuse.js'
 import type { IFuseOptions } from 'fuse.js'
 
-import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useExecutionStore } from '@/stores/executionStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 
 import { app } from '@/scripts/app'
 import { isCloud } from '@/platform/distribution/types'
 import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-
 import {
   getNodeByExecutionId,
   getRootParentNode
@@ -193,7 +192,7 @@ export function useErrorGroups(
   searchQuery: Ref<string>,
   t: (key: string) => string
 ) {
-  const executionErrorStore = useExecutionErrorStore()
+  const executionStore = useExecutionStore()
   const canvasStore = useCanvasStore()
   const collapseState = reactive<Record<string, boolean>>({})
 
@@ -224,7 +223,7 @@ export function useErrorGroups(
 
   const errorNodeCache = computed(() => {
     const map = new Map<string, LGraphNode>()
-    for (const execId of executionErrorStore.allErrorExecutionIds) {
+    for (const execId of executionStore.allErrorExecutionIds) {
       const node = getNodeByExecutionId(app.rootGraph, execId)
       if (node) map.set(execId, node)
     }
@@ -263,10 +262,10 @@ export function useErrorGroups(
   }
 
   function processPromptError(groupsMap: Map<string, GroupEntry>) {
-    if (selectedNodeInfo.value.nodeIds || !executionErrorStore.lastPromptError)
+    if (selectedNodeInfo.value.nodeIds || !executionStore.lastPromptError)
       return
 
-    const error = executionErrorStore.lastPromptError
+    const error = executionStore.lastPromptError
     const groupTitle = error.message
     const cards = getOrCreateGroup(groupsMap, groupTitle, 0)
     const isKnown = KNOWN_PROMPT_ERROR_TYPES.has(error.type)
@@ -294,10 +293,10 @@ export function useErrorGroups(
     groupsMap: Map<string, GroupEntry>,
     filterBySelection = false
   ) {
-    if (!executionErrorStore.lastNodeErrors) return
+    if (!executionStore.lastNodeErrors) return
 
     for (const [nodeId, nodeError] of Object.entries(
-      executionErrorStore.lastNodeErrors
+      executionStore.lastNodeErrors
     )) {
       addNodeErrorToGroup(
         groupsMap,
@@ -317,9 +316,9 @@ export function useErrorGroups(
     groupsMap: Map<string, GroupEntry>,
     filterBySelection = false
   ) {
-    if (!executionErrorStore.lastExecutionError) return
+    if (!executionStore.lastExecutionError) return
 
-    const e = executionErrorStore.lastExecutionError
+    const e = executionStore.lastExecutionError
     addNodeErrorToGroup(
       groupsMap,
       String(e.node_id),

src/components/rightSidePanel/parameters/SectionWidgets.vue

@@ -9,7 +9,7 @@ import type { LGraphGroup, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useExecutionStore } from '@/stores/executionStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { cn } from '@/utils/tailwindUtil'
@@ -62,7 +62,7 @@ watchEffect(() => (widgets.value = widgetsProp))
 provide(HideLayoutFieldKey, true)
 
 const canvasStore = useCanvasStore()
-const executionErrorStore = useExecutionErrorStore()
+const executionStore = useExecutionStore()
 const rightSidePanelStore = useRightSidePanelStore()
 const nodeDefStore = useNodeDefStore()
 const { t } = useI18n()
@@ -110,9 +110,7 @@ const targetNode = computed<LGraphNode | null>(() => {
 
 const hasDirectError = computed(() => {
   if (!targetNode.value) return false
-  return executionErrorStore.activeGraphErrorNodeIds.has(
-    String(targetNode.value.id)
-  )
+  return executionStore.activeGraphErrorNodeIds.has(String(targetNode.value.id))
 })
 
 const hasContainerInternalError = computed(() => {
@@ -121,7 +119,7 @@ const hasContainerInternalError = computed(() => {
     targetNode.value instanceof SubgraphNode || isGroupNode(targetNode.value)
   if (!isContainer) return false
 
-  return executionErrorStore.hasInternalErrorForNode(targetNode.value.id)
+  return executionStore.hasInternalErrorForNode(targetNode.value.id)
 })
 
 const nodeHasError = computed(() => {

src/components/searchbox/v2/NodeSearchCategorySidebar.vue

@@ -53,7 +53,6 @@ import NodeSearchCategoryTreeNode, {
   CATEGORY_UNSELECTED_CLASS
 } from '@/components/searchbox/v2/NodeSearchCategoryTreeNode.vue'
 import type { CategoryNode } from '@/components/searchbox/v2/NodeSearchCategoryTreeNode.vue'
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { nodeOrganizationService } from '@/services/nodeOrganizationService'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { NodeSourceType } from '@/types/nodeSource'
@@ -65,7 +64,6 @@ const selectedCategory = defineModel<string>('selectedCategory', {
 })
 
 const { t } = useI18n()
-const { flags } = useFeatureFlags()
 const nodeDefStore = useNodeDefStore()
 
 const topCategories = computed(() => [
@@ -81,7 +79,7 @@ const hasEssentialNodes = computed(() =>
 
 const sourceCategories = computed(() => {
   const categories = []
-  if (flags.nodeLibraryEssentialsEnabled && hasEssentialNodes.value) {
+  if (hasEssentialNodes.value) {
     categories.push({ id: 'essentials', label: t('g.essentials') })
   }
   categories.push({ id: 'custom', label: t('g.custom') })

src/components/sidebar/SidebarIcon.vue

@@ -41,7 +41,7 @@
         </div>
       </slot>
       <span v-if="label && !isSmall" class="side-bar-button-label">{{
-        st(label, label)
+        t(label)
       }}</span>
     </div>
   </Button>
@@ -50,10 +50,12 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import type { Component } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
-import { st } from '@/i18n'
 import { cn } from '@/utils/tailwindUtil'
+
+const { t } = useI18n()
 const {
   icon = '',
   selected = false,
@@ -81,7 +83,7 @@ const overlayValue = computed(() =>
   typeof iconBadge === 'function' ? (iconBadge() ?? '') : iconBadge
 )
 const shouldShowBadge = computed(() => !!overlayValue.value)
-const computedTooltip = computed(() => st(tooltip, tooltip) + tooltipSuffix)
+const computedTooltip = computed(() => t(tooltip) + tooltipSuffix)
 </script>
 
 <style>

src/components/sidebar/tabs/AssetsSidebarListView.stories.ts

@@ -112,22 +112,6 @@ const sampleAssets: AssetItem[] = [
     created_at: baseTimestamp,
     size: 134217728,
     tags: []
-  },
-  {
-    id: 'asset-text-1',
-    name: 'generation-notes.txt',
-    created_at: baseTimestamp,
-    preview_url: '/assets/images/default-template.png',
-    size: 2048,
-    tags: []
-  },
-  {
-    id: 'asset-other-1',
-    name: 'workflow-payload.bin',
-    created_at: baseTimestamp,
-    preview_url: '/assets/images/default-template.png',
-    size: 4096,
-    tags: []
   }
 ]
 
@@ -150,16 +134,6 @@ export const RunningAndGenerated: Story = {
   render: renderAssetsSidebarListView
 }
 
-export const TextAndMiscGeneratedAssets: Story = {
-  args: {
-    assets: sampleAssets.filter((asset) =>
-      ['.txt', '.bin'].some((suffix) => asset.name.endsWith(suffix))
-    ),
-    jobs: []
-  },
-  render: renderAssetsSidebarListView
-}
-
 function renderAssetsSidebarListView(args: StoryArgs) {
   return {
     components: { AssetsSidebarListView },

src/components/sidebar/tabs/AssetsSidebarListView.test.ts

@@ -2,8 +2,8 @@ import { mount } from '@vue/test-utils'
 import { defineComponent } from 'vue'
 import { describe, expect, it, vi } from 'vitest'
 
-import type { OutputStackListItem } from '@/platform/assets/composables/useOutputStacks'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type { OutputStackListItem } from '@/platform/assets/composables/useOutputStacks'
 
 import AssetsSidebarListView from './AssetsSidebarListView.vue'
 
@@ -72,38 +72,4 @@ describe('AssetsSidebarListView', () => {
 
     expect(wrapper.text()).not.toContain('sideToolbar.generatedAssetsHeader')
   })
-
-  it('marks mp4 assets as video previews', () => {
-    const videoAsset = {
-      ...buildAsset('video-asset', 'clip.mp4'),
-      preview_url: '/api/view/clip.mp4',
-      user_metadata: {}
-    } satisfies AssetItem
-
-    const wrapper = mountListView([buildOutputItem(videoAsset)])
-
-    const listItems = wrapper.findAllComponents({ name: 'AssetsListItem' })
-    const assetListItem = listItems.at(-1)
-
-    expect(assetListItem).toBeDefined()
-    expect(assetListItem?.props('previewUrl')).toBe('/api/view/clip.mp4')
-    expect(assetListItem?.props('isVideoPreview')).toBe(true)
-  })
-
-  it('uses icon fallback for text assets even when preview_url exists', () => {
-    const textAsset = {
-      ...buildAsset('text-asset', 'notes.txt'),
-      preview_url: '/api/view/notes.txt',
-      user_metadata: {}
-    } satisfies AssetItem
-
-    const wrapper = mountListView([buildOutputItem(textAsset)])
-
-    const listItems = wrapper.findAllComponents({ name: 'AssetsListItem' })
-    const assetListItem = listItems.at(-1)
-
-    expect(assetListItem).toBeDefined()
-    expect(assetListItem?.props('previewUrl')).toBe('')
-    expect(assetListItem?.props('isVideoPreview')).toBe(false)
-  })
 })

src/components/sidebar/tabs/AssetsSidebarListView.vue

@@ -34,7 +34,7 @@
             :aria-label="
               t('assetBrowser.ariaLabel.assetCard', {
                 name: item.asset.name,
-                type: getAssetMediaType(item.asset)
+                type: getMediaTypeFromFilename(item.asset.name)
               })
             "
             :class="
@@ -43,10 +43,11 @@
                 item.isChild && 'pl-6'
               )
             "
-            :preview-url="getAssetPreviewUrl(item.asset)"
+            :preview-url="item.asset.preview_url"
             :preview-alt="item.asset.name"
-            :icon-name="iconForMediaType(getAssetMediaType(item.asset))"
-            :is-video-preview="isVideoAsset(item.asset)"
+            :icon-name="
+              iconForMediaType(getMediaTypeFromFilename(item.asset.name))
+            "
             :primary-text="getAssetPrimaryText(item.asset)"
             :secondary-text="getAssetSecondaryText(item.asset)"
             :stack-count="getStackCount(item.asset)"
@@ -134,22 +135,6 @@ function getAssetPrimaryText(asset: AssetItem): string {
   return truncateFilename(asset.name)
 }
 
-function getAssetMediaType(asset: AssetItem) {
-  return getMediaTypeFromFilename(asset.name)
-}
-
-function isVideoAsset(asset: AssetItem): boolean {
-  return getAssetMediaType(asset) === 'video'
-}
-
-function getAssetPreviewUrl(asset: AssetItem): string {
-  const mediaType = getAssetMediaType(asset)
-  if (mediaType === 'image' || mediaType === 'video') {
-    return asset.preview_url || ''
-  }
-  return ''
-}
-
 function getAssetSecondaryText(asset: AssetItem): string {
   const metadata = getOutputAssetMetadata(asset.user_metadata)
   if (typeof metadata?.executionTimeInSeconds === 'number') {

src/components/sidebar/tabs/AssetsSidebarTab.vue

@@ -199,27 +199,17 @@ import {
   useDebounceFn,
   useElementHover,
   useResizeObserver,
-  useStorage,
-  useTimeoutFn
+  useStorage
 } from '@vueuse/core'
 import Divider from 'primevue/divider'
 import { useToast } from 'primevue/usetoast'
-import {
-  computed,
-  defineAsyncComponent,
-  nextTick,
-  onMounted,
-  onUnmounted,
-  ref,
-  watch
-} from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 // Lazy-loaded to avoid pulling THREE.js into the main bundle
-const Load3dViewerContent = defineAsyncComponent(
-  () => import('@/components/load3d/Load3dViewerContent.vue')
-)
+const Load3dViewerContent = () =>
+  import('@/components/load3d/Load3dViewerContent.vue')
 import AssetsSidebarGridView from '@/components/sidebar/tabs/AssetsSidebarGridView.vue'
 import AssetsSidebarListView from '@/components/sidebar/tabs/AssetsSidebarListView.vue'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
@@ -244,11 +234,7 @@ import { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil
 import { isCloud } from '@/platform/distribution/types'
 import { useDialogStore } from '@/stores/dialogStore'
 import { ResultItemImpl } from '@/stores/queueStore'
-import {
-  formatDuration,
-  getMediaTypeFromFilename,
-  isPreviewableMediaType
-} from '@/utils/formatUtil'
+import { formatDuration, getMediaTypeFromFilename } from '@/utils/formatUtil'
 import { cn } from '@/utils/tailwindUtil'
 
 const { t } = useI18n()
@@ -409,12 +395,6 @@ const visibleAssets = computed(() => {
   return listViewSelectableAssets.value
 })
 
-const previewableVisibleAssets = computed(() =>
-  visibleAssets.value.filter((asset) =>
-    isPreviewableMediaType(getMediaTypeFromFilename(asset.name))
-  )
-)
-
 const selectedAssets = computed(() => getSelectedAssets(visibleAssets.value))
 
 const isBulkMode = computed(
@@ -440,10 +420,12 @@ watch(visibleAssets, (newAssets) => {
   // so selection stays consistent with what this view can act on.
   reconcileSelection(newAssets)
   if (currentGalleryAssetId.value && galleryActiveIndex.value !== -1) {
-    const newIndex = previewableVisibleAssets.value.findIndex(
+    const newIndex = newAssets.findIndex(
       (asset) => asset.id === currentGalleryAssetId.value
     )
-    galleryActiveIndex.value = newIndex
+    if (newIndex !== -1) {
+      galleryActiveIndex.value = newIndex
+    }
   }
 })
 
@@ -454,7 +436,7 @@ watch(galleryActiveIndex, (index) => {
 })
 
 const galleryItems = computed(() => {
-  return previewableVisibleAssets.value.map((asset) => {
+  return visibleAssets.value.map((asset) => {
     const mediaType = getMediaTypeFromFilename(asset.name)
     const resultItem = new ResultItemImpl({
       filename: asset.name,
@@ -501,16 +483,7 @@ function handleAssetSelect(asset: AssetItem, assets?: AssetItem[]) {
   handleAssetClick(asset, index, assetList)
 }
 
-const { start: scheduleCleanup, stop: cancelCleanup } = useTimeoutFn(
-  () => {
-    contextMenuAsset.value = null
-  },
-  0,
-  { immediate: false }
-)
-
 function handleAssetContextMenu(event: MouseEvent, asset: AssetItem) {
-  cancelCleanup()
   contextMenuAsset.value = asset
   void nextTick(() => {
     contextMenuRef.value?.show(event)
@@ -518,7 +491,10 @@ function handleAssetContextMenu(event: MouseEvent, asset: AssetItem) {
 }
 
 function handleContextMenuHide() {
-  scheduleCleanup()
+  // Delay clearing to allow command callbacks to emit before component unmounts
+  requestAnimationFrame(() => {
+    contextMenuAsset.value = null
+  })
 }
 
 const handleBulkDownload = (assets: AssetItem[]) => {
@@ -560,9 +536,6 @@ const handleDeleteSelected = async () => {
 
 const handleZoomClick = (asset: AssetItem) => {
   const mediaType = getMediaTypeFromFilename(asset.name)
-  if (!isPreviewableMediaType(mediaType)) {
-    return
-  }
 
   if (mediaType === '3D') {
     const dialogStore = useDialogStore()
@@ -582,9 +555,7 @@ const handleZoomClick = (asset: AssetItem) => {
   }
 
   currentGalleryAssetId.value = asset.id
-  const index = previewableVisibleAssets.value.findIndex(
-    (a) => a.id === asset.id
-  )
+  const index = visibleAssets.value.findIndex((a) => a.id === asset.id)
   if (index !== -1) {
     galleryActiveIndex.value = index
   }

src/components/sidebar/tabs/NodeLibrarySidebarTab.vue

@@ -154,7 +154,6 @@ import {
   render
 } from 'vue'
 
-import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames'
 import SearchBox from '@/components/common/SearchBox.vue'
 import type { SearchFilter } from '@/components/common/SearchFilterChip.vue'
 import TreeExplorer from '@/components/common/TreeExplorer.vue'
@@ -277,9 +276,7 @@ const renderedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(() => {
 
     return {
       key: node.key,
-      label: node.leaf
-        ? (resolveEssentialsDisplayName(node.data) ?? node.data.display_name)
-        : node.label,
+      label: node.leaf ? node.data.display_name : node.label,
       leaf: node.leaf,
       data: node.data,
       getIcon() {

src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue

@@ -52,7 +52,7 @@
             :value="tab.value"
             :class="
               cn(
-                'flex-1 text-center select-none border-none outline-none px-3 py-2 rounded-lg cursor-pointer',
+                'select-none border-none outline-none px-3 py-2 rounded-lg cursor-pointer',
                 'text-sm text-foreground transition-colors',
                 selectedTab === tab.value
                   ? 'bg-comfy-input font-bold'
@@ -70,9 +70,7 @@
       <!-- Tab content (scrollable) -->
       <TabsRoot v-model="selectedTab" class="h-full">
         <EssentialNodesPanel
-          v-if="
-            flags.nodeLibraryEssentialsEnabled && selectedTab === 'essentials'
-          "
+          v-if="selectedTab === 'essentials'"
           v-model:expanded-keys="expandedKeys"
           :root="renderedEssentialRoot"
           @node-click="handleNodeClick"
@@ -111,12 +109,10 @@ import {
   TabsRoot,
   TabsTrigger
 } from 'reka-ui'
-import { computed, nextTick, onMounted, ref, watchEffect } from 'vue'
+import { computed, nextTick, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames'
 import SearchBox from '@/components/common/SearchBoxV2.vue'
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas'
 import { usePerTabState } from '@/composables/usePerTabState'
 import {
@@ -140,22 +136,11 @@ import EssentialNodesPanel from './nodeLibrary/EssentialNodesPanel.vue'
 import NodeDragPreview from './nodeLibrary/NodeDragPreview.vue'
 import SidebarTabTemplate from './SidebarTabTemplate.vue'
 
-const { flags } = useFeatureFlags()
-
 const selectedTab = useLocalStorage<TabId>(
   'Comfy.NodeLibrary.Tab',
   DEFAULT_TAB_ID
 )
 
-watchEffect(() => {
-  if (
-    !flags.nodeLibraryEssentialsEnabled &&
-    selectedTab.value === 'essentials'
-  ) {
-    selectedTab.value = DEFAULT_TAB_ID
-  }
-})
-
 const sortOrderByTab = useLocalStorage<Record<TabId, SortingStrategyId>>(
   'Comfy.NodeLibrary.SortByTab',
   {
@@ -231,23 +216,16 @@ function findFirstLeaf(node: TreeNode): TreeNode | undefined {
 }
 
 function fillNodeInfo(
-  node: TreeNode,
-  { useEssentialsLabels = false }: { useEssentialsLabels?: boolean } = {}
+  node: TreeNode
 ): RenderedTreeExplorerNode<ComfyNodeDefImpl> {
-  const children = node.children?.map((child) =>
-    fillNodeInfo(child, { useEssentialsLabels })
-  )
+  const children = node.children?.map(fillNodeInfo)
   const totalLeaves = node.leaf
     ? 1
     : (children?.reduce((acc, child) => acc + child.totalLeaves, 0) ?? 0)
 
   return {
     key: node.key,
-    label: node.leaf
-      ? useEssentialsLabels
-        ? (resolveEssentialsDisplayName(node.data) ?? node.data?.display_name)
-        : node.data?.display_name
-      : node.label,
+    label: node.leaf ? node.data?.display_name : node.label,
     leaf: node.leaf,
     data: node.data,
     icon: node.leaf ? 'icon-[comfy--node]' : getFolderIcon(node),
@@ -282,7 +260,7 @@ const essentialSections = computed(() => {
 const renderedEssentialRoot = computed(() => {
   const section = essentialSections.value[0]
   return section
-    ? fillNodeInfo(applySorting(section.tree), { useEssentialsLabels: true })
+    ? fillNodeInfo(applySorting(section.tree))
     : fillNodeInfo({ key: 'root', label: '', children: [] })
 })
 
@@ -346,21 +324,11 @@ async function handleSearch() {
   expandedKeys.value = allKeys
 }
 
-const tabs = computed(() => {
-  const baseTabs: Array<{ value: TabId; label: string }> = [
-    { value: 'all', label: t('sideToolbar.nodeLibraryTab.allNodes') },
-    { value: 'custom', label: t('sideToolbar.nodeLibraryTab.custom') }
-  ]
-  return flags.nodeLibraryEssentialsEnabled
-    ? [
-        {
-          value: 'essentials' as TabId,
-          label: t('sideToolbar.nodeLibraryTab.essentials')
-        },
-        ...baseTabs
-      ]
-    : baseTabs
-})
+const tabs = computed(() => [
+  { value: 'essentials', label: t('sideToolbar.nodeLibraryTab.essentials') },
+  { value: 'all', label: t('sideToolbar.nodeLibraryTab.allNodes') },
+  { value: 'custom', label: t('sideToolbar.nodeLibraryTab.custom') }
+])
 
 onMounted(() => {
   searchBoxRef.value?.focus()

src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts

@@ -44,7 +44,7 @@ describe('EssentialNodeCard', () => {
 
     return {
       key: 'test-key',
-      label: data.display_name,
+      label: 'Test Node',
       icon: 'icon-[comfy--node]',
       type: 'node',
       totalLeaves: 1,

src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="group relative flex flex-col items-center justify-center py-4 px-2 rounded-2xl cursor-pointer select-none transition-colors duration-150 box-content bg-component-node-background hover:bg-secondary-background-hover border border-component-node-border aspect-square"
-    :data-node-name="node.label"
+    :data-node-name="node.data?.display_name"
     draggable="true"
     @click="handleClick"
     @dragstart="handleDragStart"
@@ -16,7 +16,7 @@
     <TextTickerMultiLine
       class="shrink-0 h-8 w-full text-xs font-bold text-foreground leading-4"
     >
-      {{ node.label }}
+      {{ node.data?.display_name }}
     </TextTickerMultiLine>
   </div>
 

src/components/ui/textarea/Textarea.stories.ts

@@ -1,54 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-import { ref } from 'vue'
-
-import Textarea from './Textarea.vue'
-
-const meta: Meta<typeof Textarea> = {
-  title: 'UI/Textarea',
-  component: Textarea,
-  tags: ['autodocs']
-}
-
-export default meta
-type Story = StoryObj<typeof Textarea>
-
-export const Default: Story = {
-  render: () => ({
-    components: { Textarea },
-    setup() {
-      const value = ref('Hello world')
-      return { value }
-    },
-    template:
-      '<Textarea v-model="value" placeholder="Type something..." class="max-w-sm" />'
-  })
-}
-
-export const Disabled: Story = {
-  render: () => ({
-    components: { Textarea },
-    template:
-      '<Textarea model-value="Disabled textarea" disabled class="max-w-sm" />'
-  })
-}
-
-export const WithLabel: Story = {
-  render: () => ({
-    components: { Textarea },
-    setup() {
-      const value = ref('Content that sits below the label')
-      return { value }
-    },
-    template: `
-      <div class="relative max-w-sm rounded-lg bg-component-node-widget-background">
-        <label class="pointer-events-none absolute left-3 top-1.5 text-xxs text-muted-foreground z-10">
-          Prompt
-        </label>
-        <Textarea
-          v-model="value"
-          class="size-full resize-none border-none bg-transparent pt-5 text-xs"
-        />
-      </div>
-    `
-  })
-}

src/components/ui/textarea/Textarea.vue

@@ -1,24 +0,0 @@
-<script setup lang="ts">
-import type { HTMLAttributes } from 'vue'
-
-import { cn } from '@/utils/tailwindUtil'
-
-const { class: className, ...restAttrs } = defineProps<{
-  class?: HTMLAttributes['class']
-}>()
-
-const modelValue = defineModel<string | number>()
-</script>
-
-<template>
-  <textarea
-    v-bind="restAttrs"
-    v-model="modelValue"
-    :class="
-      cn(
-        'flex min-h-16 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-xs placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50',
-        className
-      )
-    "
-  />
-</template>

src/composables/auth/useFirebaseAuthActions.ts

@@ -9,7 +9,6 @@ import { t } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useToastStore } from '@/platform/updates/common/toastStore'
-import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useDialogService } from '@/services/dialogService'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 import type { BillingPortalTargetTier } from '@/stores/firebaseAuthStore'
@@ -52,17 +51,6 @@ export const useFirebaseAuthActions = () => {
   }
 
   const logout = wrapWithErrorHandlingAsync(async () => {
-    const workflowStore = useWorkflowStore()
-    if (workflowStore.modifiedWorkflows.length > 0) {
-      const dialogService = useDialogService()
-      const confirmed = await dialogService.confirm({
-        title: t('auth.signOut.unsavedChangesTitle'),
-        message: t('auth.signOut.unsavedChangesMessage'),
-        type: 'dirtyClose'
-      })
-      if (!confirmed) return
-    }
-
     await authStore.logout()
     toastStore.add({
       severity: 'success',

src/composables/graph/useSelectionMenuOptions.test.ts

@@ -100,7 +100,7 @@ describe('useSelectionMenuOptions - subgraph options', () => {
     expect(options[0]?.action).toBe(mocks.convertToSubgraph)
   })
 
-  it('includes convert and unpack but hides add to library when multiple items with subgraphs are selected', () => {
+  it('includes convert, add to library, and unpack when subgraphs are selected', () => {
     const { getSubgraphOptions } = useSelectionMenuOptions()
     const options = getSubgraphOptions({
       hasSubgraphs: true,
@@ -109,11 +109,16 @@ describe('useSelectionMenuOptions - subgraph options', () => {
     const labels = options.map((option) => option.label)
 
     expect(labels).toContain('contextMenu.Convert to Subgraph')
-    expect(labels).not.toContain('contextMenu.Add Subgraph to Library')
+    expect(labels).toContain('contextMenu.Add Subgraph to Library')
     expect(labels).toContain('contextMenu.Unpack Subgraph')
+
+    const convertOption = options.find(
+      (option) => option.label === 'contextMenu.Convert to Subgraph'
+    )
+    expect(convertOption?.action).toBe(mocks.convertToSubgraph)
   })
 
-  it('shows add to library and unpack when a single subgraph is selected', () => {
+  it('hides convert option when only a single subgraph is selected', () => {
     const { getSubgraphOptions } = useSelectionMenuOptions()
     const options = getSubgraphOptions({
       hasSubgraphs: true,
@@ -126,10 +131,5 @@ describe('useSelectionMenuOptions - subgraph options', () => {
       'contextMenu.Add Subgraph to Library',
       'contextMenu.Unpack Subgraph'
     ])
-
-    const addToLibraryOption = options.find(
-      (option) => option.label === 'contextMenu.Add Subgraph to Library'
-    )
-    expect(addToLibraryOption?.action).toBe(mocks.addSubgraphToLibrary)
   })
 })

src/composables/graph/useSelectionMenuOptions.ts

@@ -85,18 +85,18 @@ export function useSelectionMenuOptions() {
     }
 
     if (hasSubgraphs) {
-      if (!hasMultipleSelection) {
-        options.push({
+      options.push(
+        {
           label: t('contextMenu.Add Subgraph to Library'),
           icon: 'icon-[lucide--folder-plus]',
           action: addSubgraphToLibrary
-        })
-      }
-      options.push({
-        label: t('contextMenu.Unpack Subgraph'),
-        icon: 'icon-[lucide--expand]',
-        action: unpackSubgraph
-      })
+        },
+        {
+          label: t('contextMenu.Unpack Subgraph'),
+          icon: 'icon-[lucide--expand]',
+          action: unpackSubgraph
+        }
+      )
     }
 
     return options

src/composables/graph/useSubgraphOperations.test.ts

@@ -1,90 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
-
-const mocks = vi.hoisted(() => ({
-  publishSubgraph: vi.fn(),
-  selectedItems: [] as unknown[]
-}))
-
-vi.mock('@/composables/canvas/useSelectedLiteGraphItems', () => ({
-  useSelectedLiteGraphItems: () => ({
-    getSelectedNodes: vi.fn(() => [])
-  })
-}))
-
-vi.mock('@/renderer/core/canvas/canvasStore', () => ({
-  useCanvasStore: () => ({
-    getCanvas: vi.fn(),
-    get selectedItems() {
-      return mocks.selectedItems
-    },
-    updateSelectedItems: vi.fn()
-  })
-}))
-
-vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
-  useWorkflowStore: () => ({
-    activeWorkflow: null
-  })
-}))
-
-vi.mock('@/stores/imagePreviewStore', () => ({
-  useNodeOutputStore: () => ({
-    revokeSubgraphPreviews: vi.fn()
-  })
-}))
-
-vi.mock('@/stores/subgraphStore', () => ({
-  useSubgraphStore: () => ({
-    publishSubgraph: mocks.publishSubgraph
-  })
-}))
-
-function createSubgraphNode(): SubgraphNode {
-  const node = Object.create(SubgraphNode.prototype)
-  return node
-}
-
-describe('useSubgraphOperations', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mocks.selectedItems = []
-  })
-
-  it('addSubgraphToLibrary calls publishSubgraph when single SubgraphNode selected', async () => {
-    mocks.selectedItems = [createSubgraphNode()]
-
-    const { useSubgraphOperations } =
-      await import('@/composables/graph/useSubgraphOperations')
-    const { addSubgraphToLibrary } = useSubgraphOperations()
-
-    await addSubgraphToLibrary()
-
-    expect(mocks.publishSubgraph).toHaveBeenCalledOnce()
-  })
-
-  it('addSubgraphToLibrary does not call publishSubgraph when no items selected', async () => {
-    mocks.selectedItems = []
-
-    const { useSubgraphOperations } =
-      await import('@/composables/graph/useSubgraphOperations')
-    const { addSubgraphToLibrary } = useSubgraphOperations()
-
-    await addSubgraphToLibrary()
-
-    expect(mocks.publishSubgraph).not.toHaveBeenCalled()
-  })
-
-  it('addSubgraphToLibrary does not call publishSubgraph when multiple items selected', async () => {
-    mocks.selectedItems = [createSubgraphNode(), createSubgraphNode()]
-
-    const { useSubgraphOperations } =
-      await import('@/composables/graph/useSubgraphOperations')
-    const { addSubgraphToLibrary } = useSubgraphOperations()
-
-    await addSubgraphToLibrary()
-
-    expect(mocks.publishSubgraph).not.toHaveBeenCalled()
-  })
-})

src/composables/graph/useSubgraphOperations.ts

@@ -3,7 +3,9 @@ import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useNodeOutputStore } from '@/stores/imagePreviewStore'
-import { useSubgraphStore } from '@/stores/subgraphStore'
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { isLGraphNode } from '@/utils/litegraphUtil'
 
 /**
  * Composable for handling subgraph-related operations
@@ -13,7 +15,8 @@ export function useSubgraphOperations() {
   const canvasStore = useCanvasStore()
   const workflowStore = useWorkflowStore()
   const nodeOutputStore = useNodeOutputStore()
-  const subgraphStore = useSubgraphStore()
+  const nodeDefStore = useNodeDefStore()
+  const nodeBookmarkStore = useNodeBookmarkStore()
 
   const convertToSubgraph = () => {
     const canvas = canvasStore.getCanvas()
@@ -70,13 +73,48 @@ export function useSubgraphOperations() {
 
   const addSubgraphToLibrary = async () => {
     const selectedItems = Array.from(canvasStore.selectedItems)
-    const subgraphNodes = selectedItems.filter(
-      (item): item is SubgraphNode => item instanceof SubgraphNode
-    )
-    if (subgraphNodes.length !== 1) {
+
+    // Handle single node selection like BookmarkButton.vue
+    if (selectedItems.length === 1) {
+      const item = selectedItems[0]
+      if (isLGraphNode(item)) {
+        const nodeDef = nodeDefStore.fromLGraphNode(item)
+        if (nodeDef) {
+          await nodeBookmarkStore.addBookmark(nodeDef.nodePath)
+          return
+        }
+      }
+    }
+
+    // Handle multiple nodes - convert to subgraph first then bookmark
+    const selectedNodes = getSelectedNodes()
+
+    if (selectedNodes.length === 0) {
       return
     }
-    await subgraphStore.publishSubgraph()
+
+    // Check if selection contains subgraph nodes
+    const hasSubgraphs = selectedNodes.some(
+      (node) => node instanceof SubgraphNode
+    )
+
+    if (!hasSubgraphs) {
+      // Convert regular nodes to subgraph first
+      convertToSubgraph()
+      return
+    }
+
+    // For subgraph nodes, bookmark them
+    let bookmarkedCount = 0
+    for (const node of selectedNodes) {
+      if (node instanceof SubgraphNode) {
+        const nodeDef = nodeDefStore.fromLGraphNode(node)
+        if (nodeDef) {
+          await nodeBookmarkStore.addBookmark(nodeDef.nodePath)
+          bookmarkedCount++
+        }
+      }
+    }
   }
 
   const isSubgraphSelected = (): boolean => {

src/composables/sidebarTabs/useAssetsSidebarTab.test.ts

@@ -2,9 +2,9 @@ import { describe, expect, it, vi } from 'vitest'
 
 import { useAssetsSidebarTab } from '@/composables/sidebarTabs/useAssetsSidebarTab'
 
-const { mockGetSetting, mockUnseenAddedAssetsCount } = vi.hoisted(() => ({
+const { mockGetSetting, mockActiveJobsCount } = vi.hoisted(() => ({
   mockGetSetting: vi.fn(),
-  mockUnseenAddedAssetsCount: { value: 0 }
+  mockActiveJobsCount: { value: 0 }
 }))
 
 vi.mock('@/platform/settings/settingStore', () => ({
@@ -17,16 +17,16 @@ vi.mock('@/components/sidebar/tabs/AssetsSidebarTab.vue', () => ({
   default: {}
 }))
 
-vi.mock('@/stores/workspace/assetsSidebarBadgeStore', () => ({
-  useAssetsSidebarBadgeStore: () => ({
-    unseenAddedAssetsCount: mockUnseenAddedAssetsCount.value
+vi.mock('@/stores/queueStore', () => ({
+  useQueueStore: () => ({
+    activeJobsCount: mockActiveJobsCount.value
   })
 }))
 
 describe('useAssetsSidebarTab', () => {
   it('hides icon badge when QPO V2 is disabled', () => {
     mockGetSetting.mockReturnValue(false)
-    mockUnseenAddedAssetsCount.value = 3
+    mockActiveJobsCount.value = 3
 
     const sidebarTab = useAssetsSidebarTab()
 
@@ -34,9 +34,9 @@ describe('useAssetsSidebarTab', () => {
     expect((sidebarTab.iconBadge as () => string | null)()).toBeNull()
   })
 
-  it('shows unseen added assets count when QPO V2 is enabled', () => {
+  it('shows active job count when QPO V2 is enabled', () => {
     mockGetSetting.mockReturnValue(true)
-    mockUnseenAddedAssetsCount.value = 3
+    mockActiveJobsCount.value = 3
 
     const sidebarTab = useAssetsSidebarTab()
 
@@ -44,9 +44,9 @@ describe('useAssetsSidebarTab', () => {
     expect((sidebarTab.iconBadge as () => string | null)()).toBe('3')
   })
 
-  it('hides badge when there are no unseen added assets', () => {
+  it('hides badge when no active jobs', () => {
     mockGetSetting.mockReturnValue(true)
-    mockUnseenAddedAssetsCount.value = 0
+    mockActiveJobsCount.value = 0
 
     const sidebarTab = useAssetsSidebarTab()
 

src/composables/sidebarTabs/useAssetsSidebarTab.ts

@@ -2,7 +2,7 @@ import { markRaw } from 'vue'
 
 import AssetsSidebarTab from '@/components/sidebar/tabs/AssetsSidebarTab.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
-import { useAssetsSidebarBadgeStore } from '@/stores/workspace/assetsSidebarBadgeStore'
+import { useQueueStore } from '@/stores/queueStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
 
 export const useAssetsSidebarTab = (): SidebarTabExtension => {
@@ -21,8 +21,8 @@ export const useAssetsSidebarTab = (): SidebarTabExtension => {
         return null
       }
 
-      const assetsSidebarBadgeStore = useAssetsSidebarBadgeStore()
-      const count = assetsSidebarBadgeStore.unseenAddedAssetsCount
+      const queueStore = useQueueStore()
+      const count = queueStore.activeJobsCount
       return count > 0 ? count.toString() : null
     }
   }

src/composables/sidebarTabs/useJobHistorySidebarTab.test.ts

@@ -1,59 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { useJobHistorySidebarTab } from '@/composables/sidebarTabs/useJobHistorySidebarTab'
-
-const { mockActiveJobsCount, mockActiveSidebarTabId } = vi.hoisted(() => ({
-  mockActiveJobsCount: { value: 0 },
-  mockActiveSidebarTabId: { value: null as string | null }
-}))
-
-vi.mock('@/components/sidebar/tabs/JobHistorySidebarTab.vue', () => ({
-  default: {}
-}))
-
-vi.mock('@/stores/queueStore', () => ({
-  useQueueStore: () => ({
-    activeJobsCount: mockActiveJobsCount.value
-  })
-}))
-
-vi.mock('@/stores/workspace/sidebarTabStore', () => ({
-  useSidebarTabStore: () => ({
-    activeSidebarTabId: mockActiveSidebarTabId.value
-  })
-}))
-
-describe('useJobHistorySidebarTab', () => {
-  beforeEach(() => {
-    mockActiveSidebarTabId.value = null
-    mockActiveJobsCount.value = 0
-  })
-
-  it('shows active jobs count while the panel is closed', () => {
-    mockActiveSidebarTabId.value = 'assets'
-    mockActiveJobsCount.value = 3
-
-    const sidebarTab = useJobHistorySidebarTab()
-
-    expect(typeof sidebarTab.iconBadge).toBe('function')
-    expect((sidebarTab.iconBadge as () => string | null)()).toBe('3')
-  })
-
-  it('hides badge while the job history panel is open', () => {
-    mockActiveSidebarTabId.value = 'job-history'
-    mockActiveJobsCount.value = 3
-
-    const sidebarTab = useJobHistorySidebarTab()
-
-    expect((sidebarTab.iconBadge as () => string | null)()).toBeNull()
-  })
-
-  it('hides badge when there are no active jobs', () => {
-    mockActiveSidebarTabId.value = null
-    mockActiveJobsCount.value = 0
-
-    const sidebarTab = useJobHistorySidebarTab()
-
-    expect((sidebarTab.iconBadge as () => string | null)()).toBeNull()
-  })
-})

src/composables/sidebarTabs/useJobHistorySidebarTab.ts

@@ -1,8 +1,6 @@
 import { markRaw } from 'vue'
 
 import JobHistorySidebarTab from '@/components/sidebar/tabs/JobHistorySidebarTab.vue'
-import { useQueueStore } from '@/stores/queueStore'
-import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
 
 export const useJobHistorySidebarTab = (): SidebarTabExtension => {
@@ -13,16 +11,6 @@ export const useJobHistorySidebarTab = (): SidebarTabExtension => {
     tooltip: 'queue.jobHistory',
     label: 'queue.jobHistory',
     component: markRaw(JobHistorySidebarTab),
-    type: 'vue',
-    iconBadge: () => {
-      const sidebarTabStore = useSidebarTabStore()
-      if (sidebarTabStore.activeSidebarTabId === 'job-history') {
-        return null
-      }
-
-      const queueStore = useQueueStore()
-      const count = queueStore.activeJobsCount
-      return count > 0 ? count.toString() : null
-    }
+    type: 'vue'
   }
 }

src/composables/useFeatureFlags.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { isReactive, isReadonly } from 'vue'
 
 import {
@@ -175,49 +175,4 @@ describe('useFeatureFlags', () => {
       expect(flags.linearToggleEnabled).toBe(false)
     })
   })
-
-  describe('dev override via localStorage', () => {
-    afterEach(() => {
-      localStorage.clear()
-    })
-
-    it('resolveFlag returns localStorage override over remoteConfig and server value', () => {
-      vi.mocked(api.getServerFeature).mockReturnValue(false)
-      localStorage.setItem('ff:model_upload_button_enabled', 'true')
-
-      const { flags } = useFeatureFlags()
-      expect(flags.modelUploadButtonEnabled).toBe(true)
-    })
-
-    it('resolveFlag falls through to server when no override is set', () => {
-      vi.mocked(api.getServerFeature).mockImplementation(
-        (path, defaultValue) => {
-          if (path === ServerFeatureFlag.ASSET_RENAME_ENABLED) return true
-          return defaultValue
-        }
-      )
-
-      const { flags } = useFeatureFlags()
-      expect(flags.assetRenameEnabled).toBe(true)
-    })
-
-    it('direct server flags delegate override to api.getServerFeature', () => {
-      vi.mocked(api.getServerFeature).mockImplementation((path) => {
-        if (path === ServerFeatureFlag.SUPPORTS_PREVIEW_METADATA)
-          return 'overridden'
-        return undefined
-      })
-
-      const { flags } = useFeatureFlags()
-      expect(flags.supportsPreviewMetadata).toBe('overridden')
-    })
-
-    it('teamWorkspacesEnabled override bypasses isCloud and isAuthenticatedConfigLoaded guards', () => {
-      vi.mocked(distributionTypes).isCloud = false
-      localStorage.setItem('ff:team_workspaces_enabled', 'true')
-
-      const { flags } = useFeatureFlags()
-      expect(flags.teamWorkspacesEnabled).toBe(true)
-    })
-  })
 })

src/composables/useFeatureFlags.ts

@@ -6,7 +6,6 @@ import {
   remoteConfig
 } from '@/platform/remoteConfig/remoteConfig'
 import { api } from '@/scripts/api'
-import { getDevOverride } from '@/utils/devFeatureFlagOverride'
 
 /**
  * Known server feature flags (top-level, not extensions)
@@ -22,21 +21,7 @@ export enum ServerFeatureFlag {
   LINEAR_TOGGLE_ENABLED = 'linear_toggle_enabled',
   TEAM_WORKSPACES_ENABLED = 'team_workspaces_enabled',
   USER_SECRETS_ENABLED = 'user_secrets_enabled',
-  NODE_REPLACEMENTS = 'node_replacements',
-  NODE_LIBRARY_ESSENTIALS_ENABLED = 'node_library_essentials_enabled'
-}
-
-/**
- * Resolves a feature flag value with dev override > remoteConfig > serverFeature priority.
- */
-function resolveFlag<T>(
-  flagKey: string,
-  remoteConfigValue: T | undefined,
-  defaultValue: T
-): T {
-  const override = getDevOverride<T>(flagKey)
-  if (override !== undefined) return override
-  return remoteConfigValue ?? api.getServerFeature(flagKey, defaultValue)
+  NODE_REPLACEMENTS = 'node_replacements'
 }
 
 /**
@@ -54,40 +39,38 @@ export function useFeatureFlags() {
       return api.getServerFeature(ServerFeatureFlag.MANAGER_SUPPORTS_V4)
     },
     get modelUploadButtonEnabled() {
-      return resolveFlag(
-        ServerFeatureFlag.MODEL_UPLOAD_BUTTON_ENABLED,
-        remoteConfig.value.model_upload_button_enabled,
-        false
+      return (
+        remoteConfig.value.model_upload_button_enabled ??
+        api.getServerFeature(
+          ServerFeatureFlag.MODEL_UPLOAD_BUTTON_ENABLED,
+          false
+        )
       )
     },
     get assetRenameEnabled() {
-      return resolveFlag(
-        ServerFeatureFlag.ASSET_RENAME_ENABLED,
-        remoteConfig.value.asset_rename_enabled,
-        false
+      return (
+        remoteConfig.value.asset_rename_enabled ??
+        api.getServerFeature(ServerFeatureFlag.ASSET_RENAME_ENABLED, false)
       )
     },
     get privateModelsEnabled() {
-      return resolveFlag(
-        ServerFeatureFlag.PRIVATE_MODELS_ENABLED,
-        remoteConfig.value.private_models_enabled,
-        false
+      return (
+        remoteConfig.value.private_models_enabled ??
+        api.getServerFeature(ServerFeatureFlag.PRIVATE_MODELS_ENABLED, false)
       )
     },
     get onboardingSurveyEnabled() {
-      return resolveFlag(
-        ServerFeatureFlag.ONBOARDING_SURVEY_ENABLED,
-        remoteConfig.value.onboarding_survey_enabled,
-        false
+      return (
+        remoteConfig.value.onboarding_survey_enabled ??
+        api.getServerFeature(ServerFeatureFlag.ONBOARDING_SURVEY_ENABLED, false)
       )
     },
     get linearToggleEnabled() {
       if (isNightly) return true
 
-      return resolveFlag(
-        ServerFeatureFlag.LINEAR_TOGGLE_ENABLED,
-        remoteConfig.value.linear_toggle_enabled,
-        false
+      return (
+        remoteConfig.value.linear_toggle_enabled ??
+        api.getServerFeature(ServerFeatureFlag.LINEAR_TOGGLE_ENABLED, false)
       )
     },
     /**
@@ -97,12 +80,11 @@ export function useFeatureFlags() {
      * and prevents race conditions during initialization.
      */
     get teamWorkspacesEnabled() {
-      const override = getDevOverride<boolean>(
-        ServerFeatureFlag.TEAM_WORKSPACES_ENABLED
-      )
-      if (override !== undefined) return override
-
       if (!isCloud) return false
+
+      // Only return true if authenticated config has been loaded.
+      // This prevents race conditions where code checks this flag before
+      // WorkspaceAuthGate has refreshed the config with auth.
       if (!isAuthenticatedConfigLoaded.value) return false
 
       return (
@@ -111,25 +93,13 @@ export function useFeatureFlags() {
       )
     },
     get userSecretsEnabled() {
-      return resolveFlag(
-        ServerFeatureFlag.USER_SECRETS_ENABLED,
-        remoteConfig.value.user_secrets_enabled,
-        false
+      return (
+        remoteConfig.value.user_secrets_enabled ??
+        api.getServerFeature(ServerFeatureFlag.USER_SECRETS_ENABLED, false)
       )
     },
     get nodeReplacementsEnabled() {
       return api.getServerFeature(ServerFeatureFlag.NODE_REPLACEMENTS, false)
-    },
-    get nodeLibraryEssentialsEnabled() {
-      if (isNightly || import.meta.env.DEV) return true
-
-      return (
-        remoteConfig.value.node_library_essentials_enabled ??
-        api.getServerFeature(
-          ServerFeatureFlag.NODE_LIBRARY_ESSENTIALS_ENABLED,
-          false
-        )
-      )
     }
   })
 

src/constants/essentialsDisplayNames.test.ts

@@ -1,105 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-vi.mock('@/i18n', () => ({
-  t: vi.fn((key: string) => key)
-}))
-
-import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames'
-
-describe('resolveEssentialsDisplayName', () => {
-  describe('exact name matches', () => {
-    it.each([
-      ['LoadImage', 'essentials.loadImage'],
-      ['SaveImage', 'essentials.saveImage'],
-      ['PrimitiveStringMultiline', 'essentials.text'],
-      ['ImageScale', 'essentials.resizeImage'],
-      ['LoraLoader', 'essentials.loadStyleLora'],
-      ['OpenAIChatNode', 'essentials.textGenerationLLM'],
-      ['RecraftRemoveBackgroundNode', 'essentials.removeBackground'],
-      ['ImageCompare', 'essentials.imageCompare'],
-      ['StabilityTextToAudio', 'essentials.musicGeneration'],
-      ['BatchImagesNode', 'essentials.batchImage'],
-      ['Video Slice', 'essentials.extractFrame'],
-      ['KlingLipSyncAudioToVideoNode', 'essentials.lipsync'],
-      ['KlingLipSyncTextToVideoNode', 'essentials.lipsync']
-    ])('%s -> %s', (name, expected) => {
-      expect(resolveEssentialsDisplayName({ name })).toBe(expected)
-    })
-  })
-
-  describe('3D API node alternatives', () => {
-    it.each([
-      ['TencentTextToModelNode', 'essentials.textTo3DModel'],
-      ['MeshyTextToModelNode', 'essentials.textTo3DModel'],
-      ['TripoTextToModelNode', 'essentials.textTo3DModel'],
-      ['TencentImageToModelNode', 'essentials.imageTo3DModel'],
-      ['MeshyImageToModelNode', 'essentials.imageTo3DModel'],
-      ['TripoImageToModelNode', 'essentials.imageTo3DModel']
-    ])('%s -> %s', (name, expected) => {
-      expect(resolveEssentialsDisplayName({ name })).toBe(expected)
-    })
-  })
-
-  describe('blueprint prefix matches', () => {
-    it.each([
-      [
-        'SubgraphBlueprint.text_to_image_flux_schnell.json',
-        'essentials.textToImage'
-      ],
-      ['SubgraphBlueprint.text_to_image_sd15.json', 'essentials.textToImage'],
-      [
-        'SubgraphBlueprint.image_edit_something.json',
-        'essentials.imageToImage'
-      ],
-      ['SubgraphBlueprint.pose_to_image_v2.json', 'essentials.poseToImage'],
-      [
-        'SubgraphBlueprint.canny_to_image_z_image_turbo.json',
-        'essentials.cannyToImage'
-      ],
-      [
-        'SubgraphBlueprint.depth_to_image_z_image_turbo.json',
-        'essentials.depthToImage'
-      ],
-      ['SubgraphBlueprint.text_to_video_ltx.json', 'essentials.textToVideo'],
-      ['SubgraphBlueprint.image_to_video_wan.json', 'essentials.imageToVideo'],
-      [
-        'SubgraphBlueprint.pose_to_video_ltx_2_0.json',
-        'essentials.poseToVideo'
-      ],
-      [
-        'SubgraphBlueprint.canny_to_video_ltx_2_0.json',
-        'essentials.cannyToVideo'
-      ],
-      [
-        'SubgraphBlueprint.depth_to_video_ltx_2_0.json',
-        'essentials.depthToVideo'
-      ],
-      [
-        'SubgraphBlueprint.image_inpainting_qwen_image_instantx.json',
-        'essentials.inpaintImage'
-      ],
-      [
-        'SubgraphBlueprint.image_outpainting_qwen_image_instantx.json',
-        'essentials.outpaintImage'
-      ]
-    ])('%s -> %s', (name, expected) => {
-      expect(resolveEssentialsDisplayName({ name })).toBe(expected)
-    })
-  })
-
-  describe('unmapped nodes', () => {
-    it('returns undefined for unknown node names', () => {
-      expect(resolveEssentialsDisplayName({ name: 'SomeRandomNode' })).toBe(
-        undefined
-      )
-    })
-
-    it('returns undefined for unknown blueprint prefixes', () => {
-      expect(
-        resolveEssentialsDisplayName({
-          name: 'SubgraphBlueprint.unknown_workflow.json'
-        })
-      ).toBe(undefined)
-    })
-  })
-})

src/constants/essentialsDisplayNames.ts

@@ -1,108 +0,0 @@
-import { t } from '@/i18n'
-import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-
-const BLUEPRINT_PREFIX = 'SubgraphBlueprint.'
-
-/**
- * Static mapping of node names to their Essentials tab display name i18n keys.
- */
-const EXACT_NAME_MAP: Record<string, string> = {
-  // Basics
-  LoadImage: 'essentials.loadImage',
-  SaveImage: 'essentials.saveImage',
-  LoadVideo: 'essentials.loadVideo',
-  SaveVideo: 'essentials.saveVideo',
-  Load3D: 'essentials.load3DModel',
-  SaveGLB: 'essentials.save3DModel',
-  PrimitiveStringMultiline: 'essentials.text',
-
-  // Image Tools
-  BatchImagesNode: 'essentials.batchImage',
-  ImageCrop: 'essentials.cropImage',
-  ImageScale: 'essentials.resizeImage',
-  ImageRotate: 'essentials.rotate',
-  ImageInvert: 'essentials.invert',
-  Canny: 'essentials.canny',
-  RecraftRemoveBackgroundNode: 'essentials.removeBackground',
-  ImageCompare: 'essentials.imageCompare',
-
-  // Video Tools
-  'Video Slice': 'essentials.extractFrame',
-
-  // Image Generation
-  LoraLoader: 'essentials.loadStyleLora',
-
-  // Video Generation
-  KlingLipSyncAudioToVideoNode: 'essentials.lipsync',
-  KlingLipSyncTextToVideoNode: 'essentials.lipsync',
-
-  // Text Generation
-  OpenAIChatNode: 'essentials.textGenerationLLM',
-
-  // 3D
-  TencentTextToModelNode: 'essentials.textTo3DModel',
-  TencentImageToModelNode: 'essentials.imageTo3DModel',
-  MeshyTextToModelNode: 'essentials.textTo3DModel',
-  MeshyImageToModelNode: 'essentials.imageTo3DModel',
-  TripoTextToModelNode: 'essentials.textTo3DModel',
-  TripoImageToModelNode: 'essentials.imageTo3DModel',
-
-  // Audio
-  StabilityTextToAudio: 'essentials.musicGeneration',
-  LoadAudio: 'essentials.loadAudio',
-  SaveAudio: 'essentials.saveAudio'
-}
-
-/**
- * Blueprint prefix patterns mapped to display name i18n keys.
- * Entries are matched by checking if the blueprint filename
- * (after removing the SubgraphBlueprint. prefix) starts with the key.
- * Ordered longest-first so more specific prefixes match before shorter ones.
- */
-const BLUEPRINT_PREFIX_MAP: [prefix: string, displayNameKey: string][] = [
-  // Image Generation
-  ['image_inpainting_', 'essentials.inpaintImage'],
-  ['image_outpainting_', 'essentials.outpaintImage'],
-  ['image_edit', 'essentials.imageToImage'],
-  ['text_to_image', 'essentials.textToImage'],
-  ['pose_to_image', 'essentials.poseToImage'],
-  ['canny_to_image', 'essentials.cannyToImage'],
-  ['depth_to_image', 'essentials.depthToImage'],
-
-  // Video Generation
-  ['text_to_video', 'essentials.textToVideo'],
-  ['image_to_video', 'essentials.imageToVideo'],
-  ['pose_to_video', 'essentials.poseToVideo'],
-  ['canny_to_video', 'essentials.cannyToVideo'],
-  ['depth_to_video', 'essentials.depthToVideo']
-]
-
-function resolveBlueprintDisplayName(
-  blueprintName: string
-): string | undefined {
-  for (const [prefix, displayNameKey] of BLUEPRINT_PREFIX_MAP) {
-    if (blueprintName.startsWith(prefix)) {
-      return t(displayNameKey)
-    }
-  }
-  return undefined
-}
-
-/**
- * Resolves the Essentials tab display name for a given node definition.
- * Returns `undefined` if the node has no Essentials display name mapping.
- */
-export function resolveEssentialsDisplayName(
-  nodeDef: Pick<ComfyNodeDefImpl, 'name'> | undefined
-): string | undefined {
-  if (!nodeDef) return undefined
-  const { name } = nodeDef
-
-  if (name.startsWith(BLUEPRINT_PREFIX)) {
-    const blueprintName = name.slice(BLUEPRINT_PREFIX.length)
-    return resolveBlueprintDisplayName(blueprintName)
-  }
-
-  const key = EXACT_NAME_MAP[name]
-  return key ? t(key) : undefined
-}

src/constants/toolkitNodes.ts

@@ -1,38 +0,0 @@
-/**
- * Toolkit (Essentials) node detection constants.
- *
- * Used by telemetry to track toolkit node adoption and popularity.
- * Only novel nodes — basic nodes (LoadImage, SaveImage, etc.) are excluded.
- *
- * Source: https://www.notion.so/comfy-org/2fe6d73d365080d0a951d14cdf540778
- */
-
-/**
- * Canonical node type names for individual toolkit nodes.
- */
-export const TOOLKIT_NODE_NAMES: ReadonlySet<string> = new Set([
-  // Image Tools
-  'ImageCrop',
-  'ImageRotate',
-  'ImageBlur',
-  'ImageInvert',
-  'ImageCompare',
-  'Canny',
-
-  // Video Tools
-  'Video Slice',
-
-  // API Nodes
-  'RecraftRemoveBackgroundNode',
-  'RecraftVectorizeImageNode',
-  'KlingOmniProEditVideoNode'
-])
-
-/**
- * python_module values that identify toolkit blueprint nodes.
- * Essentials blueprints are registered with node_pack 'comfy_essentials',
- * which maps to python_module on the node def.
- */
-export const TOOLKIT_BLUEPRINT_MODULES: ReadonlySet<string> = new Set([
-  'comfy_essentials'
-])

src/core/graph/subgraph/proxyWidget.test.ts

@@ -5,8 +5,8 @@ import { beforeEach, describe, expect, test, vi } from 'vitest'
 import { registerProxyWidgets } from '@/core/graph/subgraph/proxyWidget'
 import { promoteWidget } from '@/core/graph/subgraph/proxyWidgetUtils'
 import { parseProxyWidgets } from '@/core/schemas/proxyWidget'
-import { LGraph, LGraphNode, SubgraphNode } from '@/lib/litegraph/src/litegraph'
-import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { LGraphCanvas, SubgraphNode } from '@/lib/litegraph/src/litegraph'
 
 import {
   createTestSubgraph,
@@ -125,94 +125,6 @@ describe('Subgraph proxyWidgets', () => {
     subgraphNode.widgets[0].computedHeight = 10
     expect(subgraphNode.widgets[0].value).toBe('value')
   })
-  test('Proxy widget label shows widgetName, not "nodeId: widgetName"', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'seed', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [['1', 'seed']]
-
-    const proxyWidget = subgraphNode.widgets[0]
-    expect(proxyWidget.label).toBe('seed')
-    expect(proxyWidget.name).toBe('1: seed')
-  })
-
-  test('Proxy widget label reflects linked widget label', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'seed', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [['1', 'seed']]
-
-    const proxyWidget = subgraphNode.widgets[0]
-    expect(proxyWidget.label).toBe('seed')
-
-    innerNodes[0].widgets![0].label = 'My Inner Label'
-    // Trigger re-resolve of linked widget
-    proxyWidget.computedHeight = 10
-    expect(proxyWidget.label).toBe('My Inner Label')
-  })
-
-  test('Proxy widget user rename takes priority over linked widget label', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'seed', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [['1', 'seed']]
-
-    const proxyWidget = subgraphNode.widgets[0]
-    proxyWidget.label = 'My Custom Seed'
-    expect(proxyWidget.label).toBe('My Custom Seed')
-
-    innerNodes[0].widgets![0].label = 'Inner Override'
-    proxyWidget.computedHeight = 10
-    expect(proxyWidget.label).toBe('My Custom Seed')
-  })
-
-  test('Proxy widget label resets to linked widget on undefined', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'seed', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [['1', 'seed']]
-
-    const proxyWidget = subgraphNode.widgets[0]
-    proxyWidget.label = 'Custom'
-    expect(proxyWidget.label).toBe('Custom')
-
-    proxyWidget.label = undefined
-    innerNodes[0].widgets![0].label = 'Inner Label'
-    proxyWidget.computedHeight = 10
-    expect(proxyWidget.label).toBe('Inner Label')
-  })
-
-  test('Proxy widget labels are correct when loaded from serialized data', () => {
-    // Intentionally constructs SubgraphNode via constructor (not setupSubgraph)
-    // to exercise the deserialization/onConfigure path from blueprint JSON.
-    const subgraph = createTestSubgraph()
-    const innerNode = new LGraphNode('InnerNode')
-    subgraph.add(innerNode)
-    innerNode.addWidget('text', 'seed', 'value', () => {})
-    innerNode.addWidget('text', 'steps', 'value', () => {})
-
-    const parentGraph = new LGraph()
-    const subgraphNode = new SubgraphNode(parentGraph, subgraph, {
-      id: 1,
-      type: subgraph.id,
-      pos: [100, 100],
-      size: [200, 100],
-      inputs: [],
-      outputs: [],
-      properties: {
-        proxyWidgets: [
-          ['1', 'seed'],
-          ['1', 'steps']
-        ]
-      },
-      flags: {},
-      mode: 0,
-      order: 0
-    })
-
-    expect(subgraphNode.widgets).toHaveLength(2)
-    expect(subgraphNode.widgets[0].label).toBe('seed')
-    expect(subgraphNode.widgets[0].name).toBe('1: seed')
-    expect(subgraphNode.widgets[1].label).toBe('steps')
-    expect(subgraphNode.widgets[1].name).toBe('1: steps')
-  })
-
   test('Prevents duplicate promotion', () => {
     const [subgraphNode, innerNodes] = setupSubgraph(1)
     innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})

src/core/graph/subgraph/proxyWidget.ts

@@ -154,6 +154,7 @@ function newProxyWidget(
     computedHeight: undefined,
     isProxyWidget: true,
     last_y: undefined,
+    label: name,
     name,
     node: subgraphNode,
     onRemove: undefined,
@@ -201,15 +202,12 @@ function newProxyFromOverlay(subgraphNode: SubgraphNode, overlay: Overlay) {
    *   and the value used as 'this' if property is a get/set method
    * @param {unknown} value - only used on set calls. The thing being assigned
    */
-  let userLabel: string | undefined
   const handler = {
     get(_t: IBaseWidget, property: string, receiver: object) {
       let redirectedTarget: object = backingWidget
       let redirectedReceiver = receiver
       if (property == '_overlay') return overlay
       else if (property == 'value') redirectedReceiver = backingWidget
-      else if (property == 'label')
-        return userLabel ?? linkedWidget?.label ?? overlay.widgetName
       if (Object.prototype.hasOwnProperty.call(overlay, property)) {
         redirectedTarget = overlay
         redirectedReceiver = overlay
@@ -217,10 +215,6 @@ function newProxyFromOverlay(subgraphNode: SubgraphNode, overlay: Overlay) {
       return Reflect.get(redirectedTarget, property, redirectedReceiver)
     },
     set(_t: IBaseWidget, property: string, value: unknown) {
-      if (property == 'label') {
-        userLabel = value as string | undefined
-        return true
-      }
       let redirectedTarget: object = backingWidget
       if (property == 'computedHeight') {
         if (overlay.widgetName.startsWith('$$') && linkedNode) {

src/core/graph/widgets/dynamicWidgets.ts

@@ -277,7 +277,6 @@ function withComfyMatchType(node: LGraphNode): asserts node is MatchTypeNode {
     ) {
       const input = this.inputs[slot]
       if (contype !== LiteGraph.INPUT || !this.graph || !input) return
-      if (app.configuringGraph) return
       const [matchKey, matchGroup] = Object.entries(
         this.comfyDynamic.matchType
       ).find(([, group]) => input.name in group) ?? ['', undefined]

src/core/graph/widgets/matchTypeConfiguring.test.ts

@@ -1,129 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, test, vi } from 'vitest'
-
-import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
-import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration'
-import { app } from '@/scripts/app'
-import { useLitegraphService } from '@/services/litegraphService'
-
-setActivePinia(createTestingPinia())
-
-const { addNodeInput } = useLitegraphService()
-
-function createMatchTypeNode(graph: LGraph) {
-  const node = new LGraphNode('switch')
-  ;(node.constructor as { nodeData: unknown }).nodeData = {
-    name: 'ComfySwitchAny',
-    output_matchtypes: ['a']
-  }
-  node.addOutput('out', '*')
-  graph.add(node)
-
-  addNodeInput(
-    node,
-    transformInputSpecV1ToV2(
-      [
-        'COMFY_MATCHTYPE_V3',
-        { template: { allowed_types: '*', template_id: 'a' } }
-      ],
-      { name: 'on_true', isOptional: false }
-    )
-  )
-  addNodeInput(
-    node,
-    transformInputSpecV1ToV2(
-      [
-        'COMFY_MATCHTYPE_V3',
-        { template: { allowed_types: '*', template_id: 'a' } }
-      ],
-      { name: 'on_false', isOptional: false }
-    )
-  )
-
-  return node
-}
-
-function createSourceNode(graph: LGraph, type: string) {
-  const node = new LGraphNode('source')
-  node.addOutput('out', type)
-  graph.add(node)
-  return node
-}
-
-describe('MatchType during configure', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  test('skips type recalculation when configuringGraph is true', () => {
-    const graph = new LGraph()
-    const switchNode = createMatchTypeNode(graph)
-    const source1 = createSourceNode(graph, 'IMAGE')
-    const source2 = createSourceNode(graph, 'IMAGE')
-
-    source1.connect(0, switchNode, 0)
-    source2.connect(0, switchNode, 1)
-
-    expect(switchNode.inputs[0].link).not.toBeNull()
-    expect(switchNode.inputs[1].link).not.toBeNull()
-
-    const link1Id = switchNode.inputs[0].link!
-    const link2Id = switchNode.inputs[1].link!
-
-    const outputTypeBefore = switchNode.outputs[0].type
-    ;(
-      app as unknown as { configuringGraphLevel: number }
-    ).configuringGraphLevel = 1
-
-    try {
-      const link1 = graph.links[link1Id]
-      switchNode.onConnectionsChange?.(
-        LiteGraph.INPUT,
-        0,
-        true,
-        link1,
-        switchNode.inputs[0]
-      )
-
-      expect(switchNode.inputs[0].link).toBe(link1Id)
-      expect(switchNode.inputs[1].link).toBe(link2Id)
-      expect(graph.links[link1Id]).toBeDefined()
-      expect(graph.links[link2Id]).toBeDefined()
-      expect(switchNode.outputs[0].type).toBe(outputTypeBefore)
-    } finally {
-      ;(
-        app as unknown as { configuringGraphLevel: number }
-      ).configuringGraphLevel = 0
-    }
-  })
-
-  test('performs type recalculation during normal operation', () => {
-    const graph = new LGraph()
-    const switchNode = createMatchTypeNode(graph)
-    const source1 = createSourceNode(graph, 'IMAGE')
-
-    expect(app.configuringGraph).toBe(false)
-
-    source1.connect(0, switchNode, 0)
-
-    expect(switchNode.inputs[0].link).not.toBeNull()
-    expect(switchNode.outputs[0].type).toBe('IMAGE')
-  })
-
-  test('connects both inputs with same type', () => {
-    const graph = new LGraph()
-    const switchNode = createMatchTypeNode(graph)
-    const source1 = createSourceNode(graph, 'IMAGE')
-    const source2 = createSourceNode(graph, 'IMAGE')
-
-    expect(app.configuringGraph).toBe(false)
-
-    source1.connect(0, switchNode, 0)
-    source2.connect(0, switchNode, 1)
-
-    expect(switchNode.inputs[0].link).not.toBeNull()
-    expect(switchNode.inputs[1].link).not.toBeNull()
-    expect(switchNode.outputs[0].type).toBe('IMAGE')
-  })
-})

src/lib/litegraph/AGENTS.md

@@ -6,10 +6,6 @@
 - Avoid repetition where possible, but not at expense of legibility
 - Prefer running single tests, not the whole suite, for performance
 
-## Widget Serialization
-
-See `docs/WIDGET_SERIALIZATION.md` for the distinction between `widget.serialize` (workflow persistence) and `widget.options.serialize` (API prompt). These are different properties checked by different code paths — a common source of confusion.
-
 ## Code Style
 
 - Prefer single line `if` syntax for concise expressions

src/lib/litegraph/src/LGraph.test.ts

@@ -484,110 +484,3 @@ describe('ensureGlobalIdUniqueness', () => {
     expect(subNode.id).toBe(subId)
   })
 })
-
-describe('Subgraph Unpacking', () => {
-  class TestNode extends LGraphNode {
-    constructor(title?: string) {
-      super(title ?? 'TestNode')
-      this.addInput('input_0', 'number')
-      this.addOutput('output_0', 'number')
-    }
-  }
-
-  class MultiInputNode extends LGraphNode {
-    constructor(title?: string) {
-      super(title ?? 'MultiInputNode')
-      this.addInput('input_0', 'number')
-      this.addInput('input_1', 'number')
-      this.addOutput('output_0', 'number')
-    }
-  }
-
-  function registerTestNodes() {
-    LiteGraph.registerNodeType('test/TestNode', TestNode)
-    LiteGraph.registerNodeType('test/MultiInputNode', MultiInputNode)
-  }
-
-  function createSubgraphOnGraph(rootGraph: LGraph) {
-    return rootGraph.createSubgraph(createTestSubgraphData())
-  }
-
-  it('deduplicates links when unpacking subgraph with duplicate links', () => {
-    registerTestNodes()
-    const rootGraph = new LGraph()
-    const subgraph = createSubgraphOnGraph(rootGraph)
-
-    const sourceNode = LiteGraph.createNode('test/TestNode', 'Source')!
-    const targetNode = LiteGraph.createNode('test/TestNode', 'Target')!
-    subgraph.add(sourceNode)
-    subgraph.add(targetNode)
-
-    // Create a legitimate link
-    sourceNode.connect(0, targetNode, 0)
-    expect(subgraph._links.size).toBe(1)
-
-    // Manually add duplicate links (simulating the bug)
-    const existingLink = subgraph._links.values().next().value!
-    for (let i = 0; i < 3; i++) {
-      const dupLink = new LLink(
-        ++subgraph.state.lastLinkId,
-        existingLink.type,
-        existingLink.origin_id,
-        existingLink.origin_slot,
-        existingLink.target_id,
-        existingLink.target_slot
-      )
-      subgraph._links.set(dupLink.id, dupLink)
-      sourceNode.outputs[0].links!.push(dupLink.id)
-    }
-    expect(subgraph._links.size).toBe(4)
-
-    const subgraphNode = createTestSubgraphNode(subgraph, { pos: [100, 100] })
-    rootGraph.add(subgraphNode)
-
-    rootGraph.unpackSubgraph(subgraphNode)
-
-    // After unpacking, there should be exactly 1 link (not 4)
-    expect(rootGraph.links.size).toBe(1)
-  })
-
-  it('preserves correct link connections when unpacking with duplicate links', () => {
-    registerTestNodes()
-    const rootGraph = new LGraph()
-    const subgraph = createSubgraphOnGraph(rootGraph)
-
-    const sourceNode = LiteGraph.createNode('test/MultiInputNode', 'Source')!
-    const targetNode = LiteGraph.createNode('test/MultiInputNode', 'Target')!
-    subgraph.add(sourceNode)
-    subgraph.add(targetNode)
-
-    // Connect source output 0 → target input 0
-    sourceNode.connect(0, targetNode, 0)
-
-    // Add duplicate links to the same connection
-    const existingLink = subgraph._links.values().next().value!
-    const dupLink = new LLink(
-      ++subgraph.state.lastLinkId,
-      existingLink.type,
-      existingLink.origin_id,
-      existingLink.origin_slot,
-      existingLink.target_id,
-      existingLink.target_slot
-    )
-    subgraph._links.set(dupLink.id, dupLink)
-    sourceNode.outputs[0].links!.push(dupLink.id)
-
-    const subgraphNode = createTestSubgraphNode(subgraph, { pos: [100, 100] })
-    rootGraph.add(subgraphNode)
-
-    rootGraph.unpackSubgraph(subgraphNode)
-
-    // Verify only 1 link exists
-    expect(rootGraph.links.size).toBe(1)
-
-    // Verify target input 1 does NOT have a link (no spurious connection)
-    const unpackedTarget = rootGraph.nodes.find((n) => n.title === 'Target')!
-    expect(unpackedTarget.inputs[0].link).not.toBeNull()
-    expect(unpackedTarget.inputs[1].link).toBeNull()
-  })
-})

src/lib/litegraph/src/LGraph.ts

@@ -1929,20 +1929,15 @@ export class LGraph
       node.id = this.last_node_id
       n_info.id = this.last_node_id
 
-      // Strip links from serialized data before configure to prevent
-      // onConnectionsChange from resolving subgraph-internal link IDs
-      // against the parent graph's link map (which may contain unrelated
-      // links with the same numeric IDs).
-      for (const input of n_info.inputs ?? []) {
-        input.link = null
-      }
-      for (const output of n_info.outputs ?? []) {
-        output.links = []
-      }
-
       this.add(node, true)
       node.configure(n_info)
       node.setPos(node.pos[0] + offsetX, node.pos[1] + offsetY)
+      for (const input of node.inputs) {
+        input.link = null
+      }
+      for (const output of node.outputs) {
+        output.links = []
+      }
       toSelect.push(node)
     }
     const groups = structuredClone(
@@ -2048,19 +2043,8 @@ export class LGraph
     }
     this.remove(subgraphNode)
     this.subgraphs.delete(subgraphNode.subgraph.id)
-
-    // Deduplicate links by (oid, oslot, tid, tslot) to prevent repeated
-    // disconnect/reconnect cycles on widget inputs that can shift slot indices.
-    const seenLinks = new Set<string>()
-    const dedupedNewLinks = newLinks.filter((link) => {
-      const key = `${link.oid}:${link.oslot}:${link.tid}:${link.tslot}`
-      if (seenLinks.has(key)) return false
-      seenLinks.add(key)
-      return true
-    })
-
     const linkIdMap = new Map<LinkId, LinkId[]>()
-    for (const newLink of dedupedNewLinks) {
+    for (const newLink of newLinks) {
       let created: LLink | null | undefined
       if (newLink.oid == SUBGRAPH_INPUT_ID) {
         if (!(this instanceof Subgraph)) {
@@ -2118,7 +2102,7 @@ export class LGraph
       toSelect.push(migratedReroute)
     }
     //iterate over newly created links to update reroute parentIds
-    for (const newLink of dedupedNewLinks) {
+    for (const newLink of newLinks) {
       const linkInstance = this.links.get(newLink.id)
       if (!linkInstance) {
         continue
@@ -2673,8 +2657,6 @@ export class Subgraph
 
   /** The display name of the subgraph. */
   name: string = 'Unnamed Subgraph'
-  /** Optional description shown as tooltip when hovering over the subgraph node. */
-  description?: string
 
   readonly inputNode = new SubgraphInputNode(this)
   readonly outputNode = new SubgraphOutputNode(this)
@@ -2725,10 +2707,9 @@ export class Subgraph
       | (ISerialisedGraph & ExportedSubgraph)
       | (SerialisableGraph & ExportedSubgraph)
   ): void {
-    const { name, description, inputs, outputs, widgets } = data
+    const { name, inputs, outputs, widgets } = data
 
     this.name = name
-    this.description = description
     if (inputs) {
       this.inputs.length = 0
       for (const input of inputs) {
@@ -2939,7 +2920,6 @@ export class Subgraph
       revision: this.revision,
       config: this.config,
       name: this.name,
-      ...(this.description && { description: this.description }),
       inputNode: this.inputNode.asSerialisable(),
       outputNode: this.outputNode.asSerialisable(),
       inputs: this.inputs.map((x) => x.asSerialisable()),

src/lib/litegraph/src/subgraph/SubgraphSerialization.test.ts

@@ -76,6 +76,7 @@ describe.skip('SubgraphSerialization - Basic Serialization', () => {
     // Verify core properties
     expect(restored.id).toBe(original.id)
     expect(restored.name).toBe(original.name)
+    // @ts-expect-error description property not in type definition
     expect(restored.description).toBe(original.description)
 
     // Verify I/O structure

src/lib/litegraph/src/types/serialisation.ts

@@ -137,10 +137,6 @@ export interface ISerialisedGraph extends BaseExportedGraph {
 export interface ExportedSubgraph extends SerialisableGraph {
   /** The display name of the subgraph. */
   name: string
-  /** Optional category for organizing subgraph blueprints in the node library. */
-  category?: string
-  /** Optional description shown as tooltip when hovering over the subgraph node. */
-  description?: string
   inputNode: ExportedSubgraphIONode
   outputNode: ExportedSubgraphIONode
   /** Ordered list of inputs to the subgraph itself. Similar to a reroute, with the input side in the graph, and the output side in the subgraph. */

src/lib/litegraph/src/types/widgets.ts

@@ -47,19 +47,6 @@ export interface IWidgetOptions<TValues = unknown> {
   /** Used as a temporary override for determining the asset type in vue mode*/
   nodeType?: string
 
-  /**
-   * Whether the widget value should be included in the API prompt sent to
-   * the backend for execution. Checked by {@link executionUtil} when
-   * building the prompt payload.
-   *
-   * This is distinct from {@link IBaseWidget.serialize}, which controls
-   * whether the value is persisted in the workflow JSON file.
-   *
-   * @default true
-   * @see IBaseWidget.serialize — workflow persistence
-   */
-  serialize?: boolean
-
   values?: TValues
   /** Optional function to format values for display (e.g., hash → human-readable name) */
   getOptionLabel?: (value?: string | null) => string
@@ -362,15 +349,8 @@ export interface IBaseWidget<
   vueTrack?: () => void
 
   /**
-   * Whether the widget value is persisted in the workflow JSON
-   * (`widgets_values`). Checked by {@link LGraphNode.serialize} and
-   * {@link LGraphNode.configure}.
-   *
-   * This is distinct from {@link IWidgetOptions.serialize}, which controls
-   * whether the value is included in the API prompt sent for execution.
-   *
+   * Whether the widget value should be serialized on node serialization.
    * @default true
-   * @see IWidgetOptions.serialize — API prompt inclusion
    */
   serialize?: boolean
 

src/locales/ar/commands.json

@@ -44,9 +44,6 @@
   "Comfy_BrowseTemplates": {
     "label": "تصفح القوالب"
   },
-  "Comfy_Canvas_CopySelected": {
-    "label": "نسخ"
-  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "حذف العناصر المحددة"
   },
@@ -68,18 +65,12 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "تحريك العقد المحددة للأعلى"
   },
-  "Comfy_Canvas_PasteFromClipboard": {
-    "label": "لصق"
-  },
   "Comfy_Canvas_ResetView": {
     "label": "إعادة تعيين العرض"
   },
   "Comfy_Canvas_Resize": {
     "label": "تغيير حجم العقد المحددة"
   },
-  "Comfy_Canvas_SelectAll": {
-    "label": "تحديد الكل"
-  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "تبديل رؤية الروابط في اللوحة"
   },

src/locales/ar/main.json

@@ -275,9 +275,7 @@
     "signOut": {
       "signOut": "تسجيل الخروج",
       "success": "تم تسجيل الخروج بنجاح",
-      "successDetail": "لقد تم تسجيل خروجك من حسابك.",
-      "unsavedChangesMessage": "لديك تغييرات غير محفوظة ستفقد عند تسجيل الخروج. هل ترغب في المتابعة؟",
-      "unsavedChangesTitle": "تغييرات غير محفوظة"
+      "successDetail": "لقد تم تسجيل خروجك من حسابك."
     },
     "signup": {
       "alreadyHaveAccount": "هل لديك حساب بالفعل؟",
@@ -622,7 +620,6 @@
     "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "تكييف",
     "CONTROL_NET": "ControlNet",
-    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
     "FILE_3D": "ملف ثلاثي الأبعاد",
     "FILE_3D_FBX": "ملف FBX ثلاثي الأبعاد",
     "FILE_3D_GLB": "ملف GLB ثلاثي الأبعاد",
@@ -731,68 +728,11 @@
     "noStackTrace": "لا توجد تتبع للمكدس متاحة",
     "promptExecutionError": "فشل تنفيذ الطلب"
   },
-  "errorOverlay": {
-    "errorCount": "{count} أخطاء | {count} خطأ | {count} أخطاء",
-    "seeErrors": "عرض الأخطاء"
-  },
-  "essentials": {
-    "batchImage": "معالجة صور دفعة واحدة",
-    "canny": "كانّي",
-    "cannyToImage": "تحويل كانّي إلى صورة",
-    "cannyToVideo": "تحويل كانّي إلى فيديو",
-    "cropImage": "قص الصورة",
-    "depthToImage": "تحويل العمق إلى صورة",
-    "depthToVideo": "تحويل العمق إلى فيديو",
-    "extractFrame": "استخراج إطار",
-    "imageCompare": "مقارنة الصور",
-    "imageTo3DModel": "تحويل الصورة إلى نموذج ثلاثي الأبعاد",
-    "imageToImage": "تحويل صورة إلى صورة",
-    "imageToVideo": "تحويل صورة إلى فيديو",
-    "inpaintImage": "ترميم الصورة",
-    "invert": "عكس",
-    "lipsync": "مزامنة الشفاه",
-    "load3DModel": "تحميل نموذج ثلاثي الأبعاد",
-    "loadAudio": "تحميل صوت",
-    "loadImage": "تحميل صورة",
-    "loadStyleLora": "تحميل نمط (LoRA)",
-    "loadVideo": "تحميل فيديو",
-    "musicGeneration": "توليد موسيقى",
-    "outpaintImage": "توسيع الصورة",
-    "poseToImage": "تحويل وضعية إلى صورة",
-    "poseToVideo": "تحويل وضعية إلى فيديو",
-    "removeBackground": "إزالة الخلفية",
-    "resizeImage": "تغيير حجم الصورة",
-    "rotate": "تدوير",
-    "save3DModel": "حفظ نموذج ثلاثي الأبعاد",
-    "saveAudio": "حفظ صوت",
-    "saveImage": "حفظ صورة",
-    "saveVideo": "حفظ فيديو",
-    "text": "نص",
-    "textGenerationLLM": "توليد نص (LLM)",
-    "textTo3DModel": "تحويل النص إلى نموذج ثلاثي الأبعاد",
-    "textToImage": "تحويل نص إلى صورة",
-    "textToVideo": "تحويل نص إلى فيديو"
-  },
-  "exportToast": {
-    "allExportsCompleted": "اكتملت جميع عمليات التصدير",
-    "downloadExport": "تحميل التصدير",
-    "downloadFailed": "فشل تحميل \"{name}\"",
-    "exportCompleted": "تحميل ZIP جاهز",
-    "exportError": "فشل التصدير",
-    "exportFailed": "{count} فشل في التصدير | {count} فشل في التصدير | {count} عمليات تصدير فشلت",
-    "exportFailedSingle": "فشل إنشاء تصدير ZIP",
-    "exportStarted": "يتم تجهيز تحميل ZIP...",
-    "exportingAssets": "جاري تصدير العناصر",
-    "noExportsInQueue": "لا يوجد {filter} عمليات تصدير في قائمة الانتظار",
-    "preparingExport": "جاري تجهيز التصدير...",
-    "retryDownload": "إعادة محاولة التحميل"
-  },
   "g": {
     "1x": "1x",
     "2x": "2x",
     "about": "حول",
     "add": "إضافة",
-    "addNode": "إضافة عقدة...",
     "addNodeFilterCondition": "إضافة شرط لتصفية العقد",
     "all": "الكل",
     "amount": "الكمية",
@@ -886,7 +826,6 @@
     "error": "خطأ",
     "errorLoadingImage": "حدث خطأ أثناء تحميل الصورة",
     "errorLoadingVideo": "حدث خطأ أثناء تحميل الفيديو",
-    "essentials": "الأساسيات",
     "experimental": "تجريبي",
     "export": "تصدير",
     "extensionName": "اسم الامتداد",
@@ -895,12 +834,9 @@
     "failedToCopyJobId": "فشل نسخ معرف المهمة",
     "failedToDownloadImage": "فشل في تنزيل الصورة",
     "failedToDownloadVideo": "فشل في تنزيل الفيديو",
-    "favorites": "المفضلة",
     "feedback": "ملاحظات",
     "file": "ملف",
     "filter": "تصفية",
-    "filterBy": "تصفية حسب:",
-    "filterByType": "تصفية حسب {type}...",
     "findIssues": "العثور على مشاكل",
     "frameNodes": "تأطير العقد",
     "frontendNewer": "إصدار الواجهة الأمامية {frontendVersion} قد لا يكون متوافقاً مع الإصدار الخلفي {backendVersion}.",
@@ -921,7 +857,6 @@
     "inProgress": "جارٍ التنفيذ",
     "increment": "زيادة",
     "info": "معلومات العقدة",
-    "input": "إدخال",
     "insert": "إدراج",
     "install": "تثبيت",
     "installed": "مثبت",
@@ -945,7 +880,6 @@
     "login": "تسجيل الدخول",
     "logoAlt": "شعار ComfyUI",
     "logs": "السجلات",
-    "manageExtensions": "إدارة الإضافات",
     "markdown": "ماركداون",
     "micPermissionDenied": "تم رفض إذن الميكروفون",
     "migrate": "ترحيل",
@@ -953,7 +887,6 @@
     "more": "المزيد",
     "moreOptions": "خيارات إضافية",
     "moreWorkflows": "المزيد من سير العمل",
-    "mostRelevant": "الأكثر صلة",
     "multiSelectDropdown": "قائمة منسدلة متعددة الاختيار",
     "name": "الاسم",
     "newFolder": "مجلد جديد",
@@ -984,7 +917,6 @@
     "openManager": "فتح المدير",
     "openNewIssue": "فتح مشكلة جديدة",
     "or": "أو",
-    "output": "إخراج",
     "overwrite": "الكتابة فوق",
     "playPause": "تشغيل/إيقاف مؤقت",
     "playRecording": "تشغيل التسجيل",
@@ -1011,7 +943,6 @@
     },
     "releaseTitle": "إصدار {package} {version}",
     "reloadToApplyChanges": "أعد التحميل لتطبيق التغييرات",
-    "remove": "إزالة",
     "removeImage": "إزالة الصورة",
     "removeTag": "إزالة الوسم",
     "removeVideo": "إزالة الفيديو",
@@ -1628,7 +1559,6 @@
       "downloadSelectedAll": "تحميل الكل",
       "downloadStarted": "جاري تحميل {count} ملف(ملفات)...",
       "downloadsStarted": "بدأ تنزيل {count} ملف(ملفات)",
-      "exportStarted": "يتم تجهيز تصدير ZIP لـ {count} ملف | يتم تجهيز تصدير ZIP لـ {count} ملفات",
       "exportWorkflowAll": "تصدير جميع سير العمل",
       "failedToAddNodes": "فشل في إضافة العقد إلى سير العمل",
       "failedToDeleteAssets": "فشل في حذف الأصول المحددة",
@@ -1680,8 +1610,6 @@
     "runWorkflowFront": "تشغيل سير العمل (انتظار في البداية)",
     "settings": "الإعدادات",
     "showMenu": "عرض القائمة",
-    "stopRunInstant": "إيقاف التشغيل (فوري)",
-    "stopRunInstantTooltip": "إيقاف التشغيل",
     "theme": "المظهر",
     "toggleBottomPanel": "تبديل اللوحة السفلية"
   },
@@ -1707,7 +1635,6 @@
     "Contact Support": "الاتصال بالدعم",
     "Convert Selection to Subgraph": "تحويل التحديد إلى رسم فرعي",
     "Convert selected nodes to group node": "تحويل العقد المحددة إلى عقدة مجموعة",
-    "Copy": "نسخ",
     "Custom Nodes (Legacy)": "العقد المخصصة (قديم)",
     "Custom Nodes Manager": "مدير العقد المخصصة",
     "Decrease Brush Size in MaskEditor": "تقليل حجم الفرشاة في محرر القناع",
@@ -1762,7 +1689,6 @@
     "Open Outputs Folder": "فتح مجلد المخرجات",
     "Open Sign In Dialog": "فتح نافذة تسجيل الدخول",
     "Open extra_model_paths_yaml": "فتح ملف extra_model_paths.yaml",
-    "Paste": "لصق",
     "Pin/Unpin Selected Items": "تثبيت/إلغاء تثبيت العناصر المحددة",
     "Pin/Unpin Selected Nodes": "تثبيت/إلغاء تثبيت العقد المحددة",
     "Previous Opened Workflow": "سير العمل السابق المفتوح",
@@ -1782,7 +1708,6 @@
     "Rotate Right in MaskEditor": "تدوير لليمين في محرر القناع",
     "Save": "حفظ",
     "Save As": "حفظ باسم",
-    "Select All": "تحديد الكل",
     "Set Subgraph Description": "تعيين وصف المخطط الفرعي",
     "Set Subgraph Search Aliases": "تعيين الأسماء المستعارة للبحث في المخطط الفرعي",
     "Show Keybindings Dialog": "عرض مربع حوار اختصارات لوحة المفاتيح",
@@ -1852,7 +1777,6 @@
     "BFL": "BFL",
     "Bria": "Bria",
     "ByteDance": "بايت دانس",
-    "ElevenLabs": "ElevenLabs",
     "Gemini": "جيميني",
     "Grok": "Grok",
     "HitPaw": "HitPaw",
@@ -1935,13 +1859,11 @@
     "scheduling": "الجدولة",
     "sd": "sd",
     "sd3": "sd3",
-    "shader": "shader",
     "sigmas": "سيجمات",
     "stable_cascade": "سلسلة ثابتة",
     "string": "سلسلة نصية",
     "style_model": "نموذج النمط",
     "text": "نص",
-    "textgen": "textgen",
     "training": "تدريب",
     "transform": "تحويل",
     "unet": "unet",
@@ -2099,7 +2021,6 @@
     "errorHelpGithub": "إرسال مشكلة على GitHub",
     "errorHelpSupport": "تواصل مع الدعم الفني",
     "errors": "الأخطاء",
-    "executionErrorOccurred": "حدث خطأ أثناء التنفيذ. تحقق من علامة تبويب الأخطاء لمزيد من التفاصيل.",
     "fallbackGroupTitle": "مجموعة",
     "fallbackNodeTitle": "عقدة",
     "favorites": "المدخلات المفضلة",
@@ -2149,12 +2070,6 @@
       },
       "prompt_no_outputs": {
         "desc": "سير العمل لا يحتوي على أي عقدة إخراج (مثل حفظ الصورة، معاينة الصورة) لإنتاج نتيجة."
-      },
-      "server_error_cloud": {
-        "desc": "واجه الخادم خطأ غير متوقع. يرجى المحاولة لاحقاً."
-      },
-      "server_error_local": {
-        "desc": "واجه الخادم خطأ غير متوقع. يرجى مراجعة سجلات الخادم."
       }
     },
     "properties": "الخصائص",
@@ -2403,7 +2318,6 @@
     "Menu": "القائمة",
     "ModelLibrary": "مكتبة النماذج",
     "Node": "العقدة",
-    "Node Library": "مكتبة العقد",
     "Node Search Box": "مربع بحث العقد",
     "Node Widget": "أداة العقدة",
     "NodeLibrary": "مكتبة العقد",
@@ -2462,10 +2376,6 @@
     "backToAssets": "العودة إلى جميع الأصول",
     "browseTemplates": "تصفح القوالب المثال",
     "downloads": "التنزيلات",
-    "folderView": {
-      "errorDetail": "تعذر استرجاع المخرجات لهذه المهمة. يرجى المحاولة مرة أخرى.",
-      "errorSummary": "فشل في تحميل المخرجات"
-    },
     "generatedAssetsHeader": "الأصول المُولدة",
     "helpCenter": "مركز المساعدة",
     "importedAssetsHeader": "الأصول المستوردة",
@@ -2491,9 +2401,6 @@
     "noImportedFiles": "لم يتم العثور على ملفات مستوردة",
     "nodeLibrary": "مكتبة العقد",
     "nodeLibraryTab": {
-      "allNodes": "جميع العقد",
-      "custom": "مخصص",
-      "essentials": "الأساسيات",
       "groupBy": "التجميع حسب",
       "groupStrategies": {
         "category": "الفئة",
@@ -2504,11 +2411,6 @@
         "sourceDesc": "التجميع حسب نوع المصدر (أساسي، مخصص، API)"
       },
       "resetView": "إعادة تعيين العرض إلى الافتراضي",
-      "sections": {
-        "favoriteNode": "العقدة المفضلة",
-        "favorites": "المفضلة",
-        "unfavoriteNode": "إزالة العقدة من المفضلة"
-      },
       "sortBy": {
         "alphabetical": "أبجدي",
         "alphabeticalDesc": "الفرز أبجدياً داخل المجموعات",
@@ -2517,7 +2419,6 @@
       },
       "sortMode": "طريقة الفرز"
     },
-    "nodes": "العقد",
     "openWorkflow": "فتح سير العمل من نظام الملفات المحلي",
     "queue": "قائمة الانتظار",
     "queueProgressOverlay": {
@@ -2525,17 +2426,14 @@
       "activeJobsShort": "{count} نشط | {count} نشط",
       "activeJobsSuffix": "مهام نشطة",
       "cancelJobTooltip": "إلغاء المهمة",
-      "clearAllJobsTooltip": "إلغاء جميع المهام الجارية",
       "clearHistory": "مسح سجل قائمة الانتظار",
       "clearHistoryDialogAssetsNote": "لن يتم حذف الأصول التي تم إنشاؤها بواسطة هذه المهام ويمكنك دائمًا عرضها من لوحة الأصول.",
       "clearHistoryDialogDescription": "سيتم حذف جميع المهام المنتهية أو الفاشلة أدناه من لوحة قائمة المهام.",
       "clearHistoryDialogTitle": "مسح سجل قائمة المهام؟",
-      "clearHistoryMenuAssetsNote": "لن يتم حذف الوسائط.",
       "clearQueueTooltip": "مسح القائمة",
       "clearQueued": "مسح قائمة الانتظار",
       "colonPercent": ": {percent}",
       "currentNode": "العقدة الحالية:",
-      "dockedJobHistory": "سجل المهام المثبت",
       "expandCollapsedQueue": "توسيع قائمة المهام",
       "filterAllWorkflows": "جميع سير العمل",
       "filterBy": "تصفية حسب",
@@ -2557,7 +2455,6 @@
       "running": "قيد التشغيل",
       "runningJobsLabel": "{count} قيد التشغيل",
       "runningQueuedSummary": "{running} قيد التشغيل، {queued} في الانتظار",
-      "searchJobs": "بحث...",
       "showAssets": "عرض الأصول",
       "showAssetsPanel": "عرض لوحة الأصول",
       "sortBy": "ترتيب حسب",
@@ -2978,14 +2875,9 @@
     "dropPrompt": "أسقط ملفك أو"
   },
   "widgets": {
-    "boolean": {
-      "false": "خطأ",
-      "true": "صحيح"
-    },
     "node2only": "فقط Node 2.0",
     "selectModel": "اختر نموذج",
     "uploadSelect": {
-      "maxSelectionReached": "تم الوصول إلى الحد الأقصى للاختيار",
       "placeholder": "اختر...",
       "placeholderAudio": "اختر صوت...",
       "placeholderImage": "اختر صورة...",