nit - fix TS type

[Refactor] Task state updates to TaskRunner
[Refactor] Task execution into task runner class
2026-03-17 02:47:35 +00:00 · 2025-01-22 08:26:22 +11:00 · 2025-01-22 08:18:42 +11:00 · 2025-01-22 08:18:42 +11:00 · 2025-01-21 16:10:15 -05:00 · 2025-01-21 10:32:46 -05:00
168 changed files with 6298 additions and 1810 deletions
--- a/.cursorrules
+++ b/.cursorrules
@@ -0,0 +1,43 @@
+// Vue 3 Composition API .cursorrules
+
+// Vue 3 Composition API best practices
+const vue3CompositionApiBestPractices = [
+  "Use setup() function for component logic",
+  "Utilize ref and reactive for reactive state",
+  "Implement computed properties with computed()",
+  "Use watch and watchEffect for side effects",
+  "Implement lifecycle hooks with onMounted, onUpdated, etc.",
+  "Utilize provide/inject for dependency injection",
+]
+
+// Folder structure
+const folderStructure = `
+src/
+  components/
+  constants/
+  hooks/
+  views/
+  stores/
+  services/
+  App.vue
+  main.ts
+`;
+
+// Tailwind CSS best practices
+const tailwindCssBestPractices = [
+  "Use Tailwind CSS for styling",
+  "Implement responsive design with Tailwind CSS",
+]
+
+// Additional instructions
+const additionalInstructions = `
+1. Leverage VueUse functions for performance-enhancing styles
+2. Use lodash for utility functions
+3. Use TypeScript for type safety
+4. Implement proper props and emits definitions
+5. Utilize Vue 3's Teleport component when needed
+6. Use Suspense for async components
+7. Implement proper error handling
+8. Follow Vue 3 style guide and naming conventions
+9. Use Vite for fast development and building
+`;
--- a/.github/workflows/i18n-node-defs.yaml
+++ b/.github/workflows/i18n-node-defs.yaml
@@ -0,0 +1,48 @@
+name: Update Node Definitions Locales
+
+on:
+  workflow_dispatch:
+    inputs:
+      trigger_type:
+        description: 'Type of trigger (manual or automatic)'
+        required: false
+        type: string
+        default: 'manual'
+
+jobs:
+  update-locales:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: Comfy-Org/ComfyUI_frontend_setup_action@v2.1
+    - name: Install Playwright Browsers
+      run: npx playwright install chromium --with-deps
+      working-directory: ComfyUI_frontend
+    - name: Start dev server
+      # Run electron dev server as it is a superset of the web dev server
+      # We do want electron specific UIs to be translated.
+      run: npm run dev:electron &
+      working-directory: ComfyUI_frontend
+    - name: Update en.json
+      run: npm run collect-i18n -- scripts/collect-i18n-node-defs.ts
+      env:
+        PLAYWRIGHT_TEST_URL: http://localhost:5173
+      working-directory: ComfyUI_frontend
+    - name: Update translations
+      run: npm run locale
+      env:
+        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+      working-directory: ComfyUI_frontend
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v7
+      with:
+        token: ${{ secrets.PR_GH_TOKEN }}
+        commit-message: "Update locales for node definitions"
+        title: "Update locales for node definitions"
+        body: |
+          Automated PR to update locales for node definitions
+
+          This PR was created automatically by the frontend update workflow.
+        branch: update-locales-node-defs-${{ github.event.inputs.trigger_type }}-${{ github.run_id }}
+        base: main
+        labels: dependencies
+        path: ComfyUI_frontend
--- a/.github/workflows/i18n.yaml
+++ b/.github/workflows/i18n.yaml
@@ -5,6 +5,8 @@ on:

 jobs:
  update-locales:
+    # Don't run on fork PRs
+    if: github.event.pull_request.head.repo.full_name == github.repository
    runs-on: ubuntu-latest
    steps:
    - uses: Comfy-Org/ComfyUI_frontend_setup_action@v2.1
@@ -17,13 +19,12 @@ jobs:
      run: npm run dev:electron &
      working-directory: ComfyUI_frontend
    - name: Update en.json
-      run: npm run collect-i18n
+      run: npm run collect-i18n -- scripts/collect-i18n-general.ts
      env:
        PLAYWRIGHT_TEST_URL: http://localhost:5173
      working-directory: ComfyUI_frontend
    - name: Update translations
-      # Pipe output so that it doesn't error out on stdout.clearLine
-      run: npm run locale 2>&1 | cat
+      run: npm run locale
      env:
        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
      working-directory: ComfyUI_frontend
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -25,6 +25,8 @@ jobs:
        id: current_version
        run: echo ::set-output name=version::$(node -p "require('./package.json').version")
      - name: Build project
+        env:
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
        run: |
          npm ci
          npm run build
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,8 @@ dist-ssr
 .vscode/*
 *.code-workspace
 !.vscode/extensions.json
+!.vscode/tailwind.json
+!.vscode/settings.json.default
 .idea
 .DS_Store
 *.suo
@@ -41,4 +43,7 @@ browser_tests/*/*-win32.png

 dist.zip

-/temp/
+/temp/
+
+# Generated JSON Schemas
+/schemas/
--- a/.prettierrc
+++ b/.prettierrc
@@ -6,5 +6,13 @@
  "printWidth": 80,
  "importOrder": ["^@core/(.*)$", "<THIRD_PARTY_MODULES>", "^@/(.*)$", "^[./]"],
  "importOrderSeparation": true,
-  "importOrderSortSpecifiers": true
-}
+  "importOrderSortSpecifiers": true,
+  "overrides": [
+    {
+      "files": "*.{js,cjs,mjs,ts,cts,mts,tsx,vue}",
+      "options": {
+        "plugins": ["@trivago/prettier-plugin-sort-imports"]
+      }
+    }
+  ]
+}
--- a/.vscode/settings.json.default
+++ b/.vscode/settings.json.default
@@ -0,0 +1,5 @@
+{
+  "css.customData": [
+    ".vscode/tailwind.json"
+  ]
+}
--- a/.vscode/tailwind.json
+++ b/.vscode/tailwind.json
@@ -0,0 +1,55 @@
+{
+  "version": 1.1,
+  "atDirectives": [
+    {
+      "name": "@tailwind",
+      "description": "Use the `@tailwind` directive to insert Tailwind's `base`, `components`, `utilities` and `screens` styles into your CSS.",
+      "references": [
+        {
+          "name": "Tailwind Documentation",
+          "url": "https://tailwindcss.com/docs/functions-and-directives#tailwind"
+        }
+      ]
+    },
+    {
+      "name": "@apply",
+      "description": "Use the `@apply` directive to inline any existing utility classes into your own custom CSS. This is useful when you find a common utility pattern in your HTML that you’d like to extract to a new component.",
+      "references": [
+        {
+          "name": "Tailwind Documentation",
+          "url": "https://tailwindcss.com/docs/functions-and-directives#apply"
+        }
+      ]
+    },
+    {
+      "name": "@responsive",
+      "description": "You can generate responsive variants of your own classes by wrapping their definitions in the `@responsive` directive:\n```css\n@responsive {\n  .alert {\n    background-color: #E53E3E;\n  }\n}\n```\n",
+      "references": [
+        {
+          "name": "Tailwind Documentation",
+          "url": "https://tailwindcss.com/docs/functions-and-directives#responsive"
+        }
+      ]
+    },
+    {
+      "name": "@screen",
+      "description": "The `@screen` directive allows you to create media queries that reference your breakpoints by **name** instead of duplicating their values in your own CSS:\n```css\n@screen sm {\n  /* ... */\n}\n```\n…gets transformed into this:\n```css\n@media (min-width: 640px) {\n  /* ... */\n}\n```\n",
+      "references": [
+        {
+          "name": "Tailwind Documentation",
+          "url": "https://tailwindcss.com/docs/functions-and-directives#screen"
+        }
+      ]
+    },
+    {
+      "name": "@variants",
+      "description": "Generate `hover`, `focus`, `active` and other **variants** of your own utilities by wrapping their definitions in the `@variants` directive:\n```css\n@variants hover, focus {\n   .btn-brand {\n    background-color: #3182CE;\n  }\n}\n```\n",
+      "references": [
+        {
+          "name": "Tailwind Documentation",
+          "url": "https://tailwindcss.com/docs/functions-and-directives#variants"
+        }
+      ]
+    }
+  ]
+}
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Stable releases are published bi-weekly in the ComfyUI main repository.

 ### Major features

-<details>
+<details id='feature-native-translation'>
  <summary>v1.5: Native translation (i18n)</summary>

  ComfyUI now includes built-in translation support, replacing the need for third-party translation extensions. Select your language
@@ -68,7 +68,7 @@ Stable releases are published bi-weekly in the ComfyUI main repository.
  More details available here: https://blog.comfy.org/p/native-localization-support-i18n
 </details>

-<details>
+<details id='feature-mask-editor'>
  <summary>v1.4: New mask editor</summary>

  https://github.com/Comfy-Org/ComfyUI_frontend/pull/1284 implements a new mask editor.
@@ -76,7 +76,7 @@ Stable releases are published bi-weekly in the ComfyUI main repository.
  ![image](https://github.com/user-attachments/assets/f0ea6ee5-00ee-4e5d-a09c-6938e86a1f17)
 </details>

-<details>
+<details id='feature-integrated-server-terminal'>
  <summary>v1.3.22: Integrated server terminal</summary>

 Press Ctrl + ` to toggle integrated terminal.
@@ -84,7 +84,7 @@ Press Ctrl + ` to toggle integrated terminal.
 https://github.com/user-attachments/assets/eddedc6a-07a3-4a83-9475-63b3977f6d94
 </details>

-<details>
+<details id='feature-keybinding-customization'>
  <summary>v1.3.7: Keybinding customization</summary>

 ## Basic UI
@@ -101,7 +101,7 @@ https://github.com/user-attachments/assets/eddedc6a-07a3-4a83-9475-63b3977f6d94

 </details>

-<details>
+<details id='feature-node-library-sidebar'>
  <summary>v1.2.4: Node library sidebar tab</summary>

  #### Drag & Drop
@@ -111,13 +111,13 @@ https://github.com/user-attachments/assets/853e20b7-bc0e-49c9-bbce-a2ba7566f92f
 https://github.com/user-attachments/assets/4bbca3ee-318f-4cf0-be32-a5a5541066cf
 </details>

-<details>
+<details id='feature-queue-sidebar'>
  <summary>v1.2.0: Queue/History sidebar tab</summary>

  https://github.com/user-attachments/assets/86e264fe-4d26-4f07-aa9a-83bdd2d02b8f
 </details>

-<details>
+<details id='feature-node-search'>
  <summary>v1.1.0: Node search box</summary>

  #### Fuzzy search & Node preview
@@ -129,26 +129,26 @@ https://github.com/user-attachments/assets/4bbca3ee-318f-4cf0-be32-a5a5541066cf

 ### QoL changes

-<details>
+<details id='feature-nested-group'>
  <summary>v1.3.32: **Litegraph** Nested group</summary>

 https://github.com/user-attachments/assets/f51adeb1-028e-40af-81e4-0ac13075198a
 </details>

-<details>
+<details id='feature-group-selection'>
  <summary>v1.3.24: **Litegraph** Group selection</summary>

 https://github.com/user-attachments/assets/e6230a94-411e-4fba-90cb-6c694200adaa
 </details>

-<details>
+<details id='feature-toggle-link-visibility'>
  <summary>v1.3.6: **Litegraph** Toggle link visibility</summary>

 [rec.webm](https://github.com/user-attachments/assets/34e460ac-fbbc-44ef-bfbb-99a84c2ae2be)

 </details>

-<details>
+<details id='feature-auto-widget-conversion'>
  <summary>v1.3.4: **Litegraph** Auto widget to input conversion</summary>

 Dropping a link of correct type on node widget will automatically convert the widget to input.
@@ -157,7 +157,7 @@ Dropping a link of correct type on node widget will automatically convert the wi

 </details>

-<details>
+<details id='feature-pan-mode'>
  <summary>v1.3.4: **Litegraph** Canvas pan mode</summary>

 The canvas becomes readonly in pan mode. Pan mode is activated by clicking the pan mode button on the canvas menu
@@ -167,42 +167,42 @@ or by holding the space key.

 </details>

-<details>
+<details id='feature-shift-drag-link-creation'>
  <summary>v1.3.1: **Litegraph** Shift drag link to create a new link</summary>

 [rec.webm](https://github.com/user-attachments/assets/7e73aaf9-79e2-4c3c-a26a-911cba3b85e4)

 </details>

-<details>
+<details id='feature-optional-input-donuts'>
  <summary>v1.2.62: **Litegraph** Show optional input slots as donuts</summary>

 ![GYEIRidb0AYGO-v](https://github.com/user-attachments/assets/e6cde0b6-654b-4afd-a117-133657a410b1)

 </details>

-<details>
+<details id='feature-group-title-edit'>
  <summary>v1.2.44: **Litegraph** Double click group title to edit</summary>

 https://github.com/user-attachments/assets/5bf0e2b6-8b3a-40a7-b44f-f0879e9ad26f

 </details>

-<details>
+<details id='feature-group-selection-shortcut'>
  <summary>v1.2.39: **Litegraph** Group selected nodes with Ctrl + G</summary>

 https://github.com/user-attachments/assets/7805dc54-0854-4a28-8bcd-4b007fa01151

 </details>

-<details>
+<details id='feature-node-title-edit'>
  <summary>v1.2.38: **Litegraph** Double click node title to edit</summary>

 https://github.com/user-attachments/assets/d61d5d0e-f200-4153-b293-3e3f6a212b30

 </details>

-<details>
+<details id='feature-drag-multi-link'>
  <summary>v1.2.7: **Litegraph** drags multiple links with shift pressed</summary>

 https://github.com/user-attachments/assets/68826715-bb55-4b2a-be6e-675cfc424afe
@@ -211,7 +211,7 @@ https://github.com/user-attachments/assets/c142c43f-2fe9-4030-8196-b3bfd4c6977d

 </details>

-<details>
+<details id='feature-auto-connect-link'>
  <summary>v1.2.2: **Litegraph** auto connects to correct slot</summary>

  #### Before
@@ -221,7 +221,7 @@ https://github.com/user-attachments/assets/c142c43f-2fe9-4030-8196-b3bfd4c6977d
  https://github.com/user-attachments/assets/b6360ac0-f0d2-447c-9daa-8a2e20c0dc1d
 </details>

-<details>
+<details id='feature-hide-text-overflow'>
  <summary>v1.1.8: **Litegraph** hides text overflow on widget value</summary>

  https://github.com/user-attachments/assets/5696a89d-4a47-4fcc-9e8c-71e1264943f2
@@ -298,7 +298,7 @@ app.registerExtension({

 </details>

-<details>
+<details id='extension-api-bottom-panel-tabs'>
  <summary>v1.3.22: Register bottom panel tabs</summary>

 ```js
@@ -321,7 +321,7 @@ app.registerExtension({

 </details>

-<details>
+<details id='extension-api-settings'>
  <summary>v1.3.22: New settings API</summary>

 Legacy settings API.
@@ -367,7 +367,7 @@ app.extensionManager.setting.set('TestSetting', 'Hello, universe!')

 </details>

-<details>
+<details id='extension-api-commands-keybindings'>
  <summary>v1.3.7: Register commands and keybindings</summary>

  Extensions can call the following API to register commands and keybindings. Do
@@ -396,7 +396,7 @@ app.extensionManager.setting.set('TestSetting', 'Hello, universe!')

 </details>

-<details>
+<details id='extension-api-topbar-menu'>
  <summary>v1.3.1: Extension API to register custom topbar menu items</summary>

  Extensions can call the following API to register custom topbar menu items.
@@ -425,7 +425,7 @@ app.extensionManager.setting.set('TestSetting', 'Hello, universe!')
 ![image](https://github.com/user-attachments/assets/ae7b082f-7ce9-4549-a446-4563567102fe)
 </details>

-<details>
+<details id='extension-api-toast'>
  <summary>v1.2.27: Extension API to add toast message</summary>i

  Extensions can call the following API to add toast messages.
@@ -443,7 +443,7 @@ Documentation of all supported options can be found here: <https://primevue.org/
 ![image](https://github.com/user-attachments/assets/de02cd7e-cd81-43d1-a0b0-bccef92ff487)
 </details>

-<details>
+<details id='extension-api-sidebar-tab'>
  <summary>v1.2.4: Extension API to register custom sidebar tab</summary>

  Extensions now can call the following API to register a sidebar tab.
@@ -626,10 +626,3 @@ You can switch languages by opening the ComfyUI Settings and selecting from the

 - Option 1: Set `DEPLOY_COMFYUI_DIR` in `.env` and run `npm run deploy`.
 - Option 2: Copy everything under `dist/` to `ComfyUI/web/` in your ComfyUI checkout manually.
-
-## Publish release to ComfyUI main repo
-
-Run following command to publish a release to ComfyUI main repo. The script will create a new branch and do a commit to `web/` folder by checkout `dist.zip`
-from GitHub release.
-
- `python scripts/main_repo_release.py <path_to_comfyui_main_repo> <version>`
--- a/browser_tests/assets/collapsed_multiline.json
+++ b/browser_tests/assets/collapsed_multiline.json
@@ -0,0 +1,37 @@
+{
+  "last_node_id": 1,
+  "last_link_id": 0,
+  "nodes": [
+    {
+      "id": 1,
+      "type": "CLIPTextEncode",
+      "pos": [20, 50],
+      "size": [400, 200],
+      "flags": { "collapsed": true },
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "clip",
+          "type": "CLIP",
+          "link": null,
+          "localized_name": "clip"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": null,
+          "localized_name": "CONDITIONING"
+        }
+      ],
+      "properties": {},
+      "widgets_values": ["Should not be displayed."]
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "config": {},
+  "version": 0.4
+}
--- a/browser_tests/assets/image32x32.webp
+++ b/browser_tests/assets/image32x32.webp
--- a/browser_tests/assets/image64x64.webp
+++ b/browser_tests/assets/image64x64.webp
--- a/browser_tests/colorPalette.spec.ts
+++ b/browser_tests/colorPalette.spec.ts
@@ -1,8 +1,9 @@
 import { expect } from '@playwright/test'

+import type { Palette } from '../src/types/colorPaletteTypes'
 import { comfyPageFixture as test } from './fixtures/ComfyPage'

-const customColorPalettes = {
+const customColorPalettes: Record<string, Palette> = {
  obsidian: {
    version: 102,
    id: 'obsidian',
@@ -128,6 +129,19 @@ const customColorPalettes = {
        'tr-odd-bg-color': 'rgba(19,19,19,.9)'
      }
    }
+  },
+  // A custom light theme with fg color red
+  light_red: {
+    id: 'light_red',
+    name: 'Light Red',
+    light_theme: true,
+    colors: {
+      node_slot: {},
+      litegraph_base: {},
+      comfy_base: {
+        'fg-color': '#ff0000'
+      }
+    }
  }
 }

@@ -136,12 +150,18 @@ test.describe('Color Palette', () => {
    await comfyPage.setSetting('Comfy.CustomColorPalettes', customColorPalettes)
    // Reload to apply the new setting. Setting Comfy.CustomColorPalettes directly
    // doesn't update the store immediately.
-    await comfyPage.reload()
+    await comfyPage.setup()

    await comfyPage.setSetting('Comfy.ColorPalette', 'obsidian_dark')
    await expect(comfyPage.canvas).toHaveScreenshot(
      'custom-color-palette-obsidian-dark.png'
    )
+    await comfyPage.setSetting('Comfy.ColorPalette', 'light_red')
+    await comfyPage.nextFrame()
+    await expect(comfyPage.canvas).toHaveScreenshot(
+      'custom-color-palette-light-red.png'
+    )
+
    await comfyPage.setSetting('Comfy.ColorPalette', 'dark')
    await comfyPage.nextFrame()
    await expect(comfyPage.canvas).toHaveScreenshot('default-color-palette.png')
--- a/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-2x-linux.png
+++ b/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-2x-linux.png
--- a/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-linux.png
+++ b/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-linux.png
--- a/browser_tests/copyPaste.spec.ts
+++ b/browser_tests/copyPaste.spec.ts
@@ -11,6 +11,14 @@ test.describe('Copy Paste', () => {
    await expect(comfyPage.canvas).toHaveScreenshot('copied-node.png')
  })

+  test('Can copy and paste node with link', async ({ comfyPage }) => {
+    await comfyPage.clickTextEncodeNode1()
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.ctrlC()
+    await comfyPage.page.keyboard.press('Control+Shift+V')
+    await expect(comfyPage.canvas).toHaveScreenshot('copied-node-with-link.png')
+  })
+
  test('Can copy and paste text', async ({ comfyPage }) => {
    const textBox = comfyPage.widgetTextBox
    await textBox.click()
--- a/browser_tests/copyPaste.spec.ts-snapshots/copied-node-with-link-chromium-2x-linux.png
+++ b/browser_tests/copyPaste.spec.ts-snapshots/copied-node-with-link-chromium-2x-linux.png
--- a/browser_tests/copyPaste.spec.ts-snapshots/copied-node-with-link-chromium-linux.png
+++ b/browser_tests/copyPaste.spec.ts-snapshots/copied-node-with-link-chromium-linux.png
--- a/browser_tests/dialog.spec.ts
+++ b/browser_tests/dialog.spec.ts
@@ -1,5 +1,6 @@
 import { expect } from '@playwright/test'

+import { Keybinding } from '../src/types/keyBindingTypes'
 import { comfyPageFixture as test } from './fixtures/ComfyPage'

 test.describe('Load workflow warning', () => {
@@ -43,6 +44,18 @@ test.describe('Execution error', () => {
    const executionError = comfyPage.page.locator('.comfy-error-report')
    await expect(executionError).toBeVisible()
  })
+
+  test('Can display Issue Report form', async ({ comfyPage }) => {
+    await comfyPage.loadWorkflow('execution_error')
+    await comfyPage.queueButton.click()
+    await comfyPage.nextFrame()
+
+    await comfyPage.page.getByLabel('Help Fix This').click()
+    const issueReportForm = comfyPage.page.getByText(
+      'Submit Error Report (Optional)'
+    )
+    await expect(issueReportForm).toBeVisible()
+  })
 })

 test.describe('Missing models warning', () => {
@@ -103,4 +116,86 @@ test.describe('Settings', () => {
      expect(await comfyPage.getSetting('Comfy.Graph.ZoomSpeed')).toBe(maxSpeed)
    })
  })
+
+  test('Should persist keybinding setting', async ({ comfyPage }) => {
+    // Open the settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    await comfyPage.page.waitForSelector('.settings-container')
+
+    // Open the keybinding tab
+    await comfyPage.page.getByLabel('Keybinding').click()
+    await comfyPage.page.waitForSelector(
+      '[placeholder="Search Keybindings..."]'
+    )
+
+    // Focus the 'New Blank Workflow' row
+    const newBlankWorkflowRow = comfyPage.page.locator('tr', {
+      has: comfyPage.page.getByRole('cell', { name: 'New Blank Workflow' })
+    })
+    await newBlankWorkflowRow.click()
+
+    // Click edit button
+    const editKeybindingButton = newBlankWorkflowRow.locator('.pi-pencil')
+    await editKeybindingButton.click()
+
+    // Set new keybinding
+    const input = comfyPage.page.getByPlaceholder('Press keys for new binding')
+    await input.press('Alt+n')
+
+    const requestPromise = comfyPage.page.waitForRequest(
+      '**/api/settings/Comfy.Keybinding.NewBindings'
+    )
+
+    // Save keybinding
+    const saveButton = comfyPage.page
+      .getByLabel('Comfy.NewBlankWorkflow')
+      .getByLabel('Save')
+    await saveButton.click()
+
+    const request = await requestPromise
+    const expectedSetting: Keybinding = {
+      commandId: 'Comfy.NewBlankWorkflow',
+      combo: {
+        key: 'n',
+        ctrl: false,
+        alt: true,
+        shift: false
+      }
+    }
+    expect(request.postData()).toContain(JSON.stringify(expectedSetting))
+  })
+})
+
+test.describe('Feedback dialog', () => {
+  test('Should open from topmenu help command', async ({ comfyPage }) => {
+    // Open feedback dialog from top menu
+    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.menu.topbar.triggerTopbarCommand(['Help', 'Feedback'])
+
+    // Verify feedback dialog content is visible
+    const feedbackHeader = comfyPage.page.getByRole('heading', {
+      name: 'Feedback'
+    })
+    await expect(feedbackHeader).toBeVisible()
+  })
+
+  test('Should close when close button clicked', async ({ comfyPage }) => {
+    // Open feedback dialog
+    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.menu.topbar.triggerTopbarCommand(['Help', 'Feedback'])
+
+    const feedbackHeader = comfyPage.page.getByRole('heading', {
+      name: 'Feedback'
+    })
+
+    // Close feedback dialog
+    await comfyPage.page
+      .getByLabel('', { exact: true })
+      .getByLabel('Close')
+      .click()
+    await feedbackHeader.waitFor({ state: 'hidden' })
+
+    // Verify dialog is closed
+    await expect(feedbackHeader).not.toBeVisible()
+  })
 })
--- a/browser_tests/domWidget.spec.ts
+++ b/browser_tests/domWidget.spec.ts
@@ -0,0 +1,27 @@
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture as test } from './fixtures/ComfyPage'
+
+test.describe('DOM Widget', () => {
+  test('Collapsed multiline textarea is not visible', async ({ comfyPage }) => {
+    await comfyPage.loadWorkflow('collapsed_multiline')
+
+    expect(comfyPage.page.locator('.comfy-multiline-input')).not.toBeVisible()
+  })
+
+  test('Multiline textarea correctly collapses', async ({ comfyPage }) => {
+    const multilineTextAreas = comfyPage.page.locator('.comfy-multiline-input')
+    const firstMultiline = multilineTextAreas.first()
+    const lastMultiline = multilineTextAreas.last()
+
+    await expect(firstMultiline).toBeVisible()
+    await expect(lastMultiline).toBeVisible()
+
+    const nodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+    for (const node of nodes) {
+      await node.click('collapse')
+    }
+    await expect(firstMultiline).not.toBeVisible()
+    await expect(lastMultiline).not.toBeVisible()
+  })
+})
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -27,6 +27,11 @@ dotenv.config()
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>

 class ComfyMenu {
+  private _nodeLibraryTab: NodeLibrarySidebarTab | null = null
+  private _workflowsTab: WorkflowsSidebarTab | null = null
+  private _queueTab: QueueSidebarTab | null = null
+  private _topbar: Topbar | null = null
+
  public readonly sideToolbar: Locator
  public readonly themeToggleButton: Locator
  public readonly saveButton: Locator
@@ -40,19 +45,23 @@ class ComfyMenu {
  }

  get nodeLibraryTab() {
-    return new NodeLibrarySidebarTab(this.page)
+    this._nodeLibraryTab ??= new NodeLibrarySidebarTab(this.page)
+    return this._nodeLibraryTab
  }

  get workflowsTab() {
-    return new WorkflowsSidebarTab(this.page)
+    this._workflowsTab ??= new WorkflowsSidebarTab(this.page)
+    return this._workflowsTab
  }

  get queueTab() {
-    return new QueueSidebarTab(this.page)
+    this._queueTab ??= new QueueSidebarTab(this.page)
+    return this._queueTab
  }

  get topbar() {
-    return new Topbar(this.page)
+    this._topbar ??= new Topbar(this.page)
+    return this._topbar
  }

  async toggleTheme() {
@@ -360,11 +369,6 @@ export class ComfyPage {
    }, settingId)
  }

-  async reload({ clearStorage = true }: { clearStorage?: boolean } = {}) {
-    await this.page.reload({ timeout: 15000 })
-    await this.setup({ clearStorage })
-  }
-
  async goto() {
    await this.page.goto(this.url)
  }
@@ -821,6 +825,11 @@ export class ComfyPage {
  async getNodeRefById(id: NodeId) {
    return new NodeReference(id, this)
  }
+  async getNodes() {
+    return await this.page.evaluate(() => {
+      return window['app'].graph.nodes
+    })
+  }
  async getNodeRefsByType(type: string): Promise<NodeReference[]> {
    return Promise.all(
      (
--- a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts
+++ b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts
@@ -3,6 +3,13 @@ import { Locator, Page } from '@playwright/test'
 export class ComfyNodeSearchFilterSelectionPanel {
  constructor(public readonly page: Page) {}

+  get header() {
+    return this.page
+      .getByRole('dialog')
+      .locator('div')
+      .filter({ hasText: 'Add node filter condition' })
+  }
+
  async selectFilterType(filterType: string) {
    await this.page
      .locator(
--- a/browser_tests/fixtures/components/SidebarTab.ts
+++ b/browser_tests/fixtures/components/SidebarTab.ts
@@ -152,6 +152,13 @@ export class WorkflowsSidebarTab extends SidebarTab {
    await this.page.keyboard.press('Enter')
    await this.page.waitForTimeout(300)
  }
+
+  async insertWorkflow(locator: Locator) {
+    await locator.click({ button: 'right' })
+    await this.page
+      .locator('.p-contextmenu-item-content', { hasText: 'Insert' })
+      .click()
+  }
 }

 export class QueueSidebarTab extends SidebarTab {
@@ -187,6 +194,10 @@ export class QueueSidebarTab extends SidebarTab {
    return this.root.locator('.no-results-placeholder')
  }

+  get galleryImage() {
+    return this.page.locator('.galleria-image')
+  }
+
  private getToggleExpandButton(isExpanded: boolean) {
    const iconSelector = isExpanded ? '.pi-image' : '.pi-images'
    return this.root.locator(`.toggle-expanded-button ${iconSelector}`)
@@ -249,14 +260,24 @@ export class QueueSidebarTab extends SidebarTab {

  async openTaskPreview(taskIndex: number) {
    const previewButton = this.getTaskPreviewButton(taskIndex)
-    await previewButton.hover()
    await previewButton.click()
-    return this.getGalleryImage(taskIndex).waitFor({ state: 'visible' })
+    return this.galleryImage.waitFor({ state: 'visible' })
  }

-  getGalleryImage(galleryItemIndex: number) {
-    // Aria labels of Galleria items are 1-based indices
-    const galleryLabel = `${galleryItemIndex + 1}`
-    return this.page.getByLabel(galleryLabel).locator('.galleria-image')
+  getGalleryImage(imageFilename: string) {
+    return this.galleryImage.and(this.page.getByAltText(imageFilename))
+  }
+
+  getTaskImage(imageFilename: string) {
+    return this.tasks.getByAltText(imageFilename)
+  }
+
+  /** Trigger the queue store and tasks to update */
+  async triggerTasksUpdate() {
+    await this.page.evaluate(() => {
+      window['app']['api'].dispatchCustomEvent('status', {
+        exec_info: { queue_remaining: 0 }
+      })
+    })
  }
 }
--- a/browser_tests/fixtures/components/Topbar.ts
+++ b/browser_tests/fixtures/components/Topbar.ts
@@ -9,6 +9,12 @@ export class Topbar {
      .allInnerTexts()
  }

+  async getActiveTabName(): Promise<string> {
+    return this.page
+      .locator('.workflow-tabs .p-togglebutton-checked')
+      .innerText()
+  }
+
  async openSubmenuMobile() {
    await this.page.locator('.p-menubar-mobile .p-menubar-button').click()
  }
--- a/browser_tests/fixtures/utils/taskHistory.ts
+++ b/browser_tests/fixtures/utils/taskHistory.ts
@@ -132,11 +132,12 @@ export default class TaskHistory {
  private addTask(task: HistoryTaskItem) {
    setPromptId(task)
    setQueueIndex(task)
-    this.tasks.push(task)
+    this.tasks.unshift(task) // Tasks are added to the front of the queue
  }

-  clearTasks() {
+  clearTasks(): this {
    this.tasks = []
+    return this
  }

  withTask(
@@ -155,7 +156,7 @@ export default class TaskHistory {
  /** Repeats the last task in the task history a specified number of times. */
  repeat(n: number): this {
    for (let i = 0; i < n; i++)
-      this.addTask(structuredClone(this.tasks.at(-1)) as HistoryTaskItem)
+      this.addTask(structuredClone(this.tasks.at(0)) as HistoryTaskItem)
    return this
  }
 }
--- a/browser_tests/interaction.spec.ts
+++ b/browser_tests/interaction.spec.ts
@@ -469,6 +469,43 @@ test.describe('Canvas Interaction', () => {
    expect(await getCursorStyle()).toBe('default')
  })

+  // https://github.com/Comfy-Org/litegraph.js/pull/424
+  test('Properly resets dragging state after pan mode sequence', async ({
+    comfyPage
+  }) => {
+    const getCursorStyle = async () => {
+      return await comfyPage.page.evaluate(() => {
+        return (
+          document.getElementById('graph-canvas')!.style.cursor || 'default'
+        )
+      })
+    }
+
+    // Initial state check
+    await comfyPage.page.mouse.move(10, 10)
+    expect(await getCursorStyle()).toBe('default')
+
+    // Click and hold
+    await comfyPage.page.mouse.down()
+    expect(await getCursorStyle()).toBe('grabbing')
+
+    // Press space while holding click
+    await comfyPage.page.keyboard.down('Space')
+    expect(await getCursorStyle()).toBe('grabbing')
+
+    // Release click while space is still down
+    await comfyPage.page.mouse.up()
+    expect(await getCursorStyle()).toBe('grab')
+
+    // Release space
+    await comfyPage.page.keyboard.up('Space')
+    expect(await getCursorStyle()).toBe('default')
+
+    // Move mouse - cursor should remain default
+    await comfyPage.page.mouse.move(20, 20)
+    expect(await getCursorStyle()).toBe('default')
+  })
+
  test('Can pan when dragging a link', async ({ comfyPage }) => {
    const posSlot1 = comfyPage.clipTextEncodeNode1InputSlot
    await comfyPage.page.mouse.move(posSlot1.x, posSlot1.y)
@@ -556,7 +593,7 @@ test.describe('Load workflow', () => {
  }) => {
    await comfyPage.loadWorkflow('single_ksampler')
    await expect(comfyPage.canvas).toHaveScreenshot('single_ksampler.png')
-    await comfyPage.reload({ clearStorage: false })
+    await comfyPage.setup({ clearStorage: false })
    await expect(comfyPage.canvas).toHaveScreenshot('single_ksampler.png')
  })

@@ -573,11 +610,72 @@ test.describe('Load workflow', () => {
    await expect(comfyPage.canvas).toHaveScreenshot(
      'single_ksampler_modified.png'
    )
-    await comfyPage.reload({ clearStorage: false })
+    await comfyPage.setup({ clearStorage: false })
    await expect(comfyPage.canvas).toHaveScreenshot(
      'single_ksampler_modified.png'
    )
  })
+
+  test.describe('Restore all open workflows on reload', () => {
+    let workflowA: string
+    let workflowB: string
+
+    const generateUniqueFilename = (extension = '') =>
+      `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}${extension}`
+
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+
+      workflowA = generateUniqueFilename()
+      await comfyPage.menu.topbar.saveWorkflow(workflowA)
+      workflowB = generateUniqueFilename()
+      await comfyPage.menu.topbar.triggerTopbarCommand(['Workflow', 'New'])
+      await comfyPage.menu.topbar.saveWorkflow(workflowB)
+
+      // Wait for localStorage to persist the workflow paths before reloading
+      await comfyPage.page.waitForFunction(
+        () => !!window.localStorage.getItem('Comfy.OpenWorkflowsPaths')
+      )
+      await comfyPage.setup({ clearStorage: false })
+    })
+
+    test('Restores topbar workflow tabs after reload', async ({
+      comfyPage
+    }) => {
+      await comfyPage.setSetting(
+        'Comfy.Workflow.WorkflowTabsPosition',
+        'Topbar'
+      )
+      const tabs = await comfyPage.menu.topbar.getTabNames()
+      const activeWorkflowName = await comfyPage.menu.topbar.getActiveTabName()
+
+      expect(tabs).toEqual(expect.arrayContaining([workflowA, workflowB]))
+      expect(tabs.indexOf(workflowA)).toBeLessThan(tabs.indexOf(workflowB))
+      expect(activeWorkflowName).toEqual(workflowB)
+    })
+
+    test('Restores sidebar workflows after reload', async ({ comfyPage }) => {
+      await comfyPage.setSetting(
+        'Comfy.Workflow.WorkflowTabsPosition',
+        'Sidebar'
+      )
+      await comfyPage.menu.workflowsTab.open()
+      const openWorkflows =
+        await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()
+      const activeWorkflowName =
+        await comfyPage.menu.workflowsTab.getActiveWorkflowName()
+      const workflowPathA = `${workflowA}.json`
+      const workflowPathB = `${workflowB}.json`
+
+      expect(openWorkflows).toEqual(
+        expect.arrayContaining([workflowPathA, workflowPathB])
+      )
+      expect(openWorkflows.indexOf(workflowPathA)).toBeLessThan(
+        openWorkflows.indexOf(workflowPathB)
+      )
+      expect(activeWorkflowName).toEqual(workflowPathB)
+    })
+  })
 })

 test.describe('Load duplicate workflow', () => {
--- a/browser_tests/menu.spec.ts
+++ b/browser_tests/menu.spec.ts
@@ -1,9 +1,6 @@
-import { expect, mergeTests } from '@playwright/test'
+import { expect } from '@playwright/test'

-import { comfyPageFixture } from './fixtures/ComfyPage'
-import { webSocketFixture } from './fixtures/ws'
-
-const test = mergeTests(comfyPageFixture, webSocketFixture)
+import { comfyPageFixture as test } from './fixtures/ComfyPage'

 test.describe('Menu', () => {
  test.beforeEach(async ({ comfyPage }) => {
@@ -21,7 +18,7 @@ test.describe('Menu', () => {
    expect(await comfyPage.menu.getThemeId()).toBe('light')

    // Theme id should persist after reload.
-    await comfyPage.reload()
+    await comfyPage.setup()
    expect(await comfyPage.menu.getThemeId()).toBe('light')

    await comfyPage.menu.toggleTheme()
@@ -292,6 +289,47 @@ test.describe('Menu', () => {
        }
      })
    })
+
+    test('Can customize bookmark color after interacting with color options', async ({
+      comfyPage
+    }) => {
+      // Open customization dialog
+      await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+      const tab = comfyPage.menu.nodeLibraryTab
+      await tab.getFolder('foo').click({ button: 'right' })
+      await comfyPage.page.getByLabel('Customize').click()
+
+      // Click a color option multiple times
+      const customColorOption = comfyPage.page.locator(
+        '.p-togglebutton-content > .pi-palette'
+      )
+      await customColorOption.click()
+      await customColorOption.click()
+
+      // Use the color picker
+      await comfyPage.page
+        .getByLabel('Customize Folder')
+        .getByRole('textbox')
+        .click()
+      await comfyPage.page.locator('.p-colorpicker-color-background').click()
+
+      // Finalize the customization
+      await comfyPage.page
+        .locator('.icon-field .p-selectbutton > *:nth-child(2)')
+        .click()
+      await comfyPage.page.getByLabel('Confirm').click()
+      await comfyPage.nextFrame()
+
+      // Verify the color selection is saved
+      const setting = await comfyPage.getSetting(
+        'Comfy.NodeLibrary.BookmarksCustomization'
+      )
+      await expect(setting).toHaveProperty(['foo/', 'color'])
+      await expect(setting['foo/'].color).not.toBeNull()
+      await expect(setting['foo/'].color).not.toBeUndefined()
+      await expect(setting['foo/'].color).not.toBe('')
+    })
+
    test('Can rename customized bookmark folder', async ({ comfyPage }) => {
      await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
      await comfyPage.setSetting('Comfy.NodeLibrary.BookmarksCustomization', {
@@ -429,6 +467,26 @@ test.describe('Menu', () => {
      ])
    })

+    test('Can open workflow after insert', async ({ comfyPage }) => {
+      await comfyPage.setupWorkflowsDirectory({
+        'workflow1.json': 'single_ksampler.json'
+      })
+      await comfyPage.setup()
+
+      const tab = comfyPage.menu.workflowsTab
+      await tab.open()
+      await comfyPage.executeCommand('Comfy.LoadDefaultWorkflow')
+      const originalNodeCount = (await comfyPage.getNodes()).length
+
+      await tab.insertWorkflow(tab.getPersistedItem('workflow1.json'))
+      await comfyPage.nextFrame()
+      expect((await comfyPage.getNodes()).length).toEqual(originalNodeCount + 1)
+
+      await tab.getPersistedItem('workflow1.json').click()
+      await comfyPage.nextFrame()
+      expect((await comfyPage.getNodes()).length).toEqual(1)
+    })
+
    test('Can rename nested workflow from opened workflow item', async ({
      comfyPage
    }) => {
@@ -508,7 +566,7 @@ test.describe('Menu', () => {
      })

      await comfyPage.setSetting('Comfy.Locale', 'zh')
-      await comfyPage.reload()
+      await comfyPage.setup()

      const downloadedContentZh = await comfyPage.getExportedWorkflow({
        api: false
@@ -604,6 +662,15 @@ test.describe('Menu', () => {
      ).toEqual(['*Unsaved Workflow.json'])
    })

+    test('Can close saved workflow with command', async ({ comfyPage }) => {
+      const tab = comfyPage.menu.workflowsTab
+      await comfyPage.menu.topbar.saveWorkflow('workflow1.json')
+      await comfyPage.executeCommand('Workspace.CloseWorkflow')
+      expect(await tab.getOpenedWorkflowNames()).toEqual([
+        '*Unsaved Workflow.json'
+      ])
+    })
+
    test('Can delete workflows (confirm disabled)', async ({ comfyPage }) => {
      await comfyPage.setSetting('Comfy.Workflow.ConfirmDelete', false)

@@ -738,7 +805,7 @@ test.describe('Menu', () => {
  })
 })

-test.describe('Queue sidebar', () => {
+test.describe.skip('Queue sidebar', () => {
  test.beforeEach(async ({ comfyPage }) => {
    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
  })
@@ -878,66 +945,61 @@ test.describe('Queue sidebar', () => {
  })

  test.describe('Gallery', () => {
+    const firstImage = 'example.webp'
+    const secondImage = 'image32x32.webp'
+
    test.beforeEach(async ({ comfyPage }) => {
      await comfyPage
        .setupHistory()
-        .withTask(['example.webp'])
-        .repeat(1)
+        .withTask([secondImage])
+        .withTask([firstImage])
        .setupRoutes()
      await comfyPage.menu.queueTab.open()
      await comfyPage.menu.queueTab.waitForTasks()
+      await comfyPage.menu.queueTab.openTaskPreview(0)
    })

    test('displays gallery image after opening task preview', async ({
      comfyPage
    }) => {
-      await comfyPage.menu.queueTab.openTaskPreview(0)
-      expect(comfyPage.menu.queueTab.getGalleryImage(0)).toBeVisible()
+      await comfyPage.nextFrame()
+      expect(comfyPage.menu.queueTab.getGalleryImage(firstImage)).toBeVisible()
    })

-    test('should maintain active gallery item when new tasks are added', async ({
-      comfyPage,
-      ws
+    test('maintains active gallery item when new tasks are added', async ({
+      comfyPage
    }) => {
-      const initialIndex = 0
-      await comfyPage.menu.queueTab.openTaskPreview(initialIndex)
-
      // Add a new task while the gallery is still open
-      comfyPage.setupHistory().withTask(['example.webp'])
-      await ws.trigger({
-        type: 'status',
-        data: {
-          status: { exec_info: { queue_remaining: 0 } }
-        }
-      })
-      await comfyPage.menu.queueTab.waitForTasks()
-
-      // The index of all tasks increments when a new task is prepended
-      const expectIndex = initialIndex + 1
-      expect(comfyPage.menu.queueTab.getGalleryImage(expectIndex)).toBeVisible()
+      const newImage = 'image64x64.webp'
+      comfyPage.setupHistory().withTask([newImage])
+      await comfyPage.menu.queueTab.triggerTasksUpdate()
+      await comfyPage.page.waitForTimeout(500)
+      const newTask = comfyPage.menu.queueTab.tasks.getByAltText(newImage)
+      await newTask.waitFor({ state: 'visible' })
+      // The active gallery item should still be the initial image
+      expect(comfyPage.menu.queueTab.getGalleryImage(firstImage)).toBeVisible()
    })

    test.describe('Gallery navigation', () => {
      const paths: {
        description: string
        path: ('Right' | 'Left')[]
-        expectIndex: number
+        end: string
      }[] = [
-        { description: 'Right', path: ['Right'], expectIndex: 1 },
-        { description: 'Left', path: ['Right', 'Left'], expectIndex: 0 },
-        { description: 'Right wrap', path: ['Right', 'Right'], expectIndex: 0 },
-        { description: 'Left wrap', path: ['Left'], expectIndex: 1 }
+        { description: 'Right', path: ['Right'], end: secondImage },
+        { description: 'Left', path: ['Right', 'Left'], end: firstImage },
+        { description: 'Left wrap', path: ['Left'], end: secondImage },
+        { description: 'Right wrap', path: ['Right', 'Right'], end: firstImage }
      ]

-      paths.forEach(({ description, path, expectIndex }) => {
+      paths.forEach(({ description, path, end }) => {
        test(`can navigate gallery ${description}`, async ({ comfyPage }) => {
-          await comfyPage.menu.queueTab.openTaskPreview(0)
          for (const direction of path)
-            await comfyPage.page.keyboard.press(`Arrow${direction}`)
-
-          expect(
-            comfyPage.menu.queueTab.getGalleryImage(expectIndex)
-          ).toBeVisible()
+            await comfyPage.page.keyboard.press(`Arrow${direction}`, {
+              delay: 256
+            })
+          await comfyPage.nextFrame()
+          expect(comfyPage.menu.queueTab.getGalleryImage(end)).toBeVisible()
        })
      })
    })
--- a/browser_tests/nodeSearchBox.spec.ts
+++ b/browser_tests/nodeSearchBox.spec.ts
@@ -82,10 +82,14 @@ test.describe('Node search box', () => {
  test('Has correct aria-labels on search results', async ({ comfyPage }) => {
    const node = 'Load Checkpoint'
    await comfyPage.doubleClickCanvas()
-    await comfyPage.searchBox.fillAndSelectFirstNode(node)
-    const firstResult = comfyPage.page
-      .locator('li.p-autocomplete-option')
-      .first()
+    await comfyPage.searchBox.input.waitFor({ state: 'visible' })
+    await comfyPage.searchBox.input.fill(node)
+    await comfyPage.searchBox.dropdown.waitFor({ state: 'visible' })
+    // Wait for some time for the auto complete list to update.
+    // The auto complete list is debounced and may take some time to update.
+    await comfyPage.page.waitForTimeout(500)
+
+    const firstResult = comfyPage.searchBox.dropdown.locator('li').first()
    await expect(firstResult).toHaveAttribute('aria-label', node)
  })

@@ -132,6 +136,48 @@ test.describe('Node search box', () => {
      await expectFilterChips(comfyPage, ['MODEL'])
    })

+    // Flaky test.
+    // Sample test failure:
+    // https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/12696912248/job/35391990861?pr=2210
+    /*
+    1) [chromium-2x] › nodeSearchBox.spec.ts:135:5 › Node search box › Filtering › Outer click dismisses filter panel but keeps search box visible
+
+    Error: expect(locator).not.toBeVisible()
+
+    Locator: getByRole('dialog').locator('div').filter({ hasText: 'Add node filter condition' })
+    Expected: not visible
+    Received: visible
+    Call log:
+      - expect.not.toBeVisible with timeout 5000ms
+      - waiting for getByRole('dialog').locator('div').filter({ hasText: 'Add node filter condition' })
+
+
+      143 |
+      144 |       // Verify the filter selection panel is hidden
+    > 145 |       expect(panel.header).not.toBeVisible()
+          |                                ^
+      146 |
+      147 |       // Verify the node search dialog is still visible
+      148 |       expect(comfyPage.searchBox.input).toBeVisible()
+
+        at /home/runner/work/ComfyUI_frontend/ComfyUI_frontend/ComfyUI_frontend/browser_tests/nodeSearchBox.spec.ts:145:32
+     */
+    test.skip('Outer click dismisses filter panel but keeps search box visible', async ({
+      comfyPage
+    }) => {
+      await comfyPage.searchBox.filterButton.click()
+      const panel = comfyPage.searchBox.filterSelectionPanel
+      await panel.header.waitFor({ state: 'visible' })
+      const panelBounds = await panel.header.boundingBox()
+      await comfyPage.page.mouse.click(panelBounds!.x - 10, panelBounds!.y - 10)
+
+      // Verify the filter selection panel is hidden
+      expect(panel.header).not.toBeVisible()
+
+      // Verify the node search dialog is still visible
+      expect(comfyPage.searchBox.input).toBeVisible()
+    })
+
    test('Can add multiple filters', async ({ comfyPage }) => {
      await comfyPage.searchBox.addFilter('MODEL', 'Input Type')
      await comfyPage.searchBox.addFilter('CLIP', 'Output Type')
--- a/global.d.ts
+++ b/global.d.ts
@@ -1 +1,3 @@
 declare const __COMFYUI_FRONTEND_VERSION__: string
+declare const __SENTRY_ENABLED__: boolean
+declare const __SENTRY_DSN__: string
--- a/lint-staged.config.js
+++ b/lint-staged.config.js
@@ -11,7 +11,7 @@ export default {

 function formatAndEslint(fileNames) {
  return [
-    `prettier --write ${fileNames.join(' ')} --plugin @trivago/prettier-plugin-sort-imports`,
+    `prettier --write ${fileNames.join(' ')}`,
    `eslint --fix ${fileNames.join(' ')}`
  ]
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,20 @@
 {
  "name": "@comfyorg/comfyui-frontend",
-  "version": "1.6.14",
+  "version": "1.8.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@comfyorg/comfyui-frontend",
-      "version": "1.6.14",
+      "version": "1.8.2",
      "license": "GPL-3.0-only",
      "dependencies": {
        "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-        "@comfyorg/comfyui-electron-types": "^0.4.3",
-        "@comfyorg/litegraph": "^0.8.58",
-        "@primevue/themes": "^4.0.5",
+        "@comfyorg/comfyui-electron-types": "^0.4.11",
+        "@comfyorg/litegraph": "^0.8.61",
+        "@primevue/forms": "^4.2.5",
+        "@primevue/themes": "^4.2.5",
+        "@sentry/vue": "^8.48.0",
        "@tiptap/core": "^2.10.4",
        "@tiptap/extension-link": "^2.10.4",
        "@tiptap/extension-table": "^2.10.4",
@@ -31,10 +33,10 @@
        "loglevel": "^1.9.2",
        "pinia": "^2.1.7",
        "primeicons": "^7.0.0",
-        "primevue": "^4.0.5",
+        "primevue": "^4.2.5",
        "three": "^0.170.0",
        "tiptap-markdown": "^0.8.10",
-        "vue": "^3.4.31",
+        "vue": "^3.5.13",
        "vue-i18n": "^9.13.1",
        "vue-router": "^4.4.3",
        "zod": "^3.23.8",
@@ -87,7 +89,8 @@
        "vite-plugin-static-copy": "^1.0.5",
        "vitest": "^2.0.5",
        "vue-tsc": "^2.1.10",
-        "zip-dir": "^2.0.0"
+        "zip-dir": "^2.0.0",
+        "zod-to-json-schema": "^3.24.1"
      }
    },
    "../litegraph.js": {
@@ -1934,15 +1937,15 @@
      "dev": true
    },
    "node_modules/@comfyorg/comfyui-electron-types": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.3.tgz",
-      "integrity": "sha512-hSM3mchpsYN0e7oZ7XLWjEvFDvE1rgzaB9YkCeqIiZYZgLL78T79ssM0n5ra17Zv7Mqwl6ErZblXvbQE/36RPw==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.11.tgz",
+      "integrity": "sha512-RGJeWwXjyv0Ojj7xkZKgcRxC1nFv1nh7qEWpNBiofxVgFiap9Ei79b/KJYxNE0no4BoYqRMaRg+sFtCE6yEukA==",
      "license": "GPL-3.0-only"
    },
    "node_modules/@comfyorg/litegraph": {
-      "version": "0.8.58",
-      "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.8.58.tgz",
-      "integrity": "sha512-V/4yC8i5QOpDV20ZiEMiZP6KnmYD5d15El3V4tmH/MkhjOxjc6owAFMyAVgpxphYdcBF2qj1QTNTrZLgC6x2VQ==",
+      "version": "0.8.61",
+      "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.8.61.tgz",
+      "integrity": "sha512-7DroJ0PLgI9TFvQR//6rf0NRXRvV60hapxVX5lmKzNn4Mn2Ni/JsB2ypNLKeSU5sacNyu8QT3W5Jdpafl7lcnA==",
      "license": "MIT"
    },
    "node_modules/@cspotcode/source-map-support": {
@@ -3959,63 +3962,129 @@
        "node": ">=12"
      }
    },
+    "node_modules/@primeuix/forms": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@primeuix/forms/-/forms-0.0.2.tgz",
+      "integrity": "sha512-DpecPQd/Qf/kav4LKCaIeGuT3AkwhJzuHCkLANTVlN/zBvo8KIj3OZHsCkm0zlIMVVnaJdtx1ULNlRQdudef+A==",
+      "dependencies": {
+        "@primeuix/utils": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=12.11.0"
+      }
+    },
+    "node_modules/@primeuix/forms/node_modules/@primeuix/utils": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.3.2.tgz",
+      "integrity": "sha512-B+nphqTQeq+i6JuICLdVWnDMjONome2sNz0xI65qIOyeB4EF12CoKRiCsxuZ5uKAkHi/0d1LqlQ9mIWRSdkavw==",
+      "engines": {
+        "node": ">=12.11.0"
+      }
+    },
    "node_modules/@primeuix/styled": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.0.5.tgz",
-      "integrity": "sha512-pVoGn/uPkVm/DyF3TR3EmH/pL/dP4nR42FcYbVduFq9VfO3KVeOEqvcCULHXos66RZO9MCbCFUoLy6ctf9GUGQ==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.3.2.tgz",
+      "integrity": "sha512-ColZes0+/WKqH4ob2x8DyNYf1NENpe5ZguOvx5yCLxaP8EIMVhLjWLO/3umJiDnQU4XXMLkn2mMHHw+fhTX/mw==",
      "license": "MIT",
      "dependencies": {
-        "@primeuix/utils": "^0.0.5"
+        "@primeuix/utils": "^0.3.2"
      },
      "engines": {
        "node": ">=12.11.0"
      }
    },
    "node_modules/@primeuix/utils": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.0.5.tgz",
-      "integrity": "sha512-ntUiUgtRtkF8KuaxHffzhYxQxoXk6LAPHm7CVlFjdqS8Rx8xRkLkZVyo84E+pO2hcNFkOGVP/GxHhQ2s94O8zA==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.3.2.tgz",
+      "integrity": "sha512-B+nphqTQeq+i6JuICLdVWnDMjONome2sNz0xI65qIOyeB4EF12CoKRiCsxuZ5uKAkHi/0d1LqlQ9mIWRSdkavw==",
      "license": "MIT",
      "engines": {
        "node": ">=12.11.0"
      }
    },
    "node_modules/@primevue/core": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@primevue/core/-/core-4.0.5.tgz",
-      "integrity": "sha512-DUCslDA93eUOVW0A1I3yoZgRLI4zmI2++loZQXbUF5jaXCwKiAza14+iyUU+cWH27VSq+jQnCEP9QJtPZiJJ0w==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@primevue/core/-/core-4.2.5.tgz",
+      "integrity": "sha512-+oWBIQs5dLd2Ini4KEVOlvPILk989EHAskiFS3R/dz3jeOllJDMZFcSp8V9ddV0R3yDaPdLVkfHm2Q5t42kU2Q==",
      "license": "MIT",
      "dependencies": {
-        "@primeuix/styled": "^0.0.5",
-        "@primeuix/utils": "^0.0.5"
+        "@primeuix/styled": "^0.3.2",
+        "@primeuix/utils": "^0.3.2"
      },
      "engines": {
        "node": ">=12.11.0"
      },
      "peerDependencies": {
-        "vue": "^3.0.0"
+        "vue": "^3.3.0"
+      }
+    },
+    "node_modules/@primevue/forms": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@primevue/forms/-/forms-4.2.5.tgz",
+      "integrity": "sha512-5jarJQ9Qv32bOo/0tY5bqR3JZI6+YmmoUQ2mjhVSbVElQsE4FNfhT7a7JwF+xgBPMPc8KWGNA1QB248HhPNVAg==",
+      "dependencies": {
+        "@primeuix/forms": "^0.0.2",
+        "@primeuix/utils": "^0.3.2",
+        "@primevue/core": "4.2.5"
+      },
+      "engines": {
+        "node": ">=12.11.0"
+      }
+    },
+    "node_modules/@primevue/forms/node_modules/@primeuix/styled": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.3.2.tgz",
+      "integrity": "sha512-ColZes0+/WKqH4ob2x8DyNYf1NENpe5ZguOvx5yCLxaP8EIMVhLjWLO/3umJiDnQU4XXMLkn2mMHHw+fhTX/mw==",
+      "dependencies": {
+        "@primeuix/utils": "^0.3.2"
+      },
+      "engines": {
+        "node": ">=12.11.0"
+      }
+    },
+    "node_modules/@primevue/forms/node_modules/@primeuix/utils": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.3.2.tgz",
+      "integrity": "sha512-B+nphqTQeq+i6JuICLdVWnDMjONome2sNz0xI65qIOyeB4EF12CoKRiCsxuZ5uKAkHi/0d1LqlQ9mIWRSdkavw==",
+      "engines": {
+        "node": ">=12.11.0"
+      }
+    },
+    "node_modules/@primevue/forms/node_modules/@primevue/core": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@primevue/core/-/core-4.2.5.tgz",
+      "integrity": "sha512-+oWBIQs5dLd2Ini4KEVOlvPILk989EHAskiFS3R/dz3jeOllJDMZFcSp8V9ddV0R3yDaPdLVkfHm2Q5t42kU2Q==",
+      "dependencies": {
+        "@primeuix/styled": "^0.3.2",
+        "@primeuix/utils": "^0.3.2"
+      },
+      "engines": {
+        "node": ">=12.11.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.3.0"
      }
    },
    "node_modules/@primevue/icons": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@primevue/icons/-/icons-4.0.5.tgz",
-      "integrity": "sha512-ZxR9W1wlAE2fTtUhrHyeMx5t0jNyAgxDcHPm0cNXpX8q1XF95rSM/qb48QKXIBDBrJ/xs57BcyCNADP/VDPY4g==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@primevue/icons/-/icons-4.2.5.tgz",
+      "integrity": "sha512-WFbUMZhQkXf/KmwcytkjGVeJ9aGEDXjP3uweOjQZMmRdEIxFnqYYpd90wE90JE1teZn3+TVnT4ZT7ejGyEXnFQ==",
      "license": "MIT",
      "dependencies": {
-        "@primeuix/utils": "^0.0.5",
-        "@primevue/core": "4.0.5"
+        "@primeuix/utils": "^0.3.2",
+        "@primevue/core": "4.2.5"
      },
      "engines": {
        "node": ">=12.11.0"
      }
    },
    "node_modules/@primevue/themes": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@primevue/themes/-/themes-4.0.5.tgz",
-      "integrity": "sha512-cRrAhOapOT8eFCTDwNdB/acg2ZEEkn7y6h6p188PYSjJsWnYK+D8eI1Js1ZB5HwWo4sWs3oR3Sy8bPwejnGbAw==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@primevue/themes/-/themes-4.2.5.tgz",
+      "integrity": "sha512-8F7yA36xYIKtNuAuyBdZZEks/bKDwlhH5WjpqGGB0FdwfAEoBYsynQ5sdqcT2Lb/NsajHmS5lc++Ttlvr1g1Lw==",
      "license": "MIT",
      "dependencies": {
-        "@primeuix/styled": "^0.0.5"
+        "@primeuix/styled": "^0.3.2"
      },
      "engines": {
        "node": ">=12.11.0"
@@ -4461,6 +4530,96 @@
        "string-argv": "~0.3.1"
      }
    },
+    "node_modules/@sentry-internal/browser-utils": {
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.48.0.tgz",
+      "integrity": "sha512-pLtu0Fa1Ou0v3M1OEO1MB1EONJVmXEGtoTwFRCO1RPQI2ulmkG6BikINClFG5IBpoYKZ33WkEXuM6U5xh+pdZg==",
+      "dependencies": {
+        "@sentry/core": "8.48.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
+    "node_modules/@sentry-internal/feedback": {
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.48.0.tgz",
+      "integrity": "sha512-6PwcJNHVPg0EfZxmN+XxVOClfQpv7MBAweV8t9i5l7VFr8sM/7wPNSeU/cG7iK19Ug9ZEkBpzMOe3G4GXJ5bpw==",
+      "dependencies": {
+        "@sentry/core": "8.48.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
+    "node_modules/@sentry-internal/replay": {
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.48.0.tgz",
+      "integrity": "sha512-csILVupc5RkrsTrncuUTGmlB56FQSFjXPYWG8I8yBTGlXEJ+o8oTuF6+55R4vbw3EIzBveXWi4kEBbnQlXW/eg==",
+      "dependencies": {
+        "@sentry-internal/browser-utils": "8.48.0",
+        "@sentry/core": "8.48.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
+    "node_modules/@sentry-internal/replay-canvas": {
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.48.0.tgz",
+      "integrity": "sha512-LdivLfBXXB9us1aAc6XaL7/L2Ob4vi3C/fEOXElehg3qHjX6q6pewiv5wBvVXGX1NfZTRvu+X11k6TZoxKsezw==",
+      "dependencies": {
+        "@sentry-internal/replay": "8.48.0",
+        "@sentry/core": "8.48.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
+    "node_modules/@sentry/browser": {
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.48.0.tgz",
+      "integrity": "sha512-fuuVULB5/1vI8NoIwXwR3xwhJJqk+y4RdSdajExGF7nnUDBpwUJyXsmYJnOkBO+oLeEs58xaCpotCKiPUNnE3g==",
+      "dependencies": {
+        "@sentry-internal/browser-utils": "8.48.0",
+        "@sentry-internal/feedback": "8.48.0",
+        "@sentry-internal/replay": "8.48.0",
+        "@sentry-internal/replay-canvas": "8.48.0",
+        "@sentry/core": "8.48.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
+    "node_modules/@sentry/core": {
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.48.0.tgz",
+      "integrity": "sha512-VGwYgTfLpvJ5LRO5A+qWo1gpo6SfqaGXL9TOzVgBucAdpzbrYHpZ87sEarDVq/4275uk1b0S293/mfsskFczyw==",
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
+    "node_modules/@sentry/vue": {
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-8.48.0.tgz",
+      "integrity": "sha512-hqm9X7hz1vMQQB1HBYezrDBQihZk6e/MxWIG1wMJoClcBnD1Sh7y+D36UwaQlR4Gr/Ftiz+Bb0DxuAYHoUS4ow==",
+      "dependencies": {
+        "@sentry/browser": "8.48.0",
+        "@sentry/core": "8.48.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      },
+      "peerDependencies": {
+        "pinia": "2.x",
+        "vue": "2.x || 3.x"
+      },
+      "peerDependenciesMeta": {
+        "pinia": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/@sinclair/typebox": {
      "version": "0.27.8",
      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -5634,49 +5793,53 @@
      }
    },
    "node_modules/@vue/compiler-core": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.31.tgz",
-      "integrity": "sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
+      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "license": "MIT",
      "dependencies": {
-        "@babel/parser": "^7.24.7",
-        "@vue/shared": "3.4.31",
+        "@babel/parser": "^7.25.3",
+        "@vue/shared": "3.5.13",
        "entities": "^4.5.0",
        "estree-walker": "^2.0.2",
        "source-map-js": "^1.2.0"
      }
    },
    "node_modules/@vue/compiler-dom": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz",
-      "integrity": "sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
+      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "license": "MIT",
      "dependencies": {
-        "@vue/compiler-core": "3.4.31",
-        "@vue/shared": "3.4.31"
+        "@vue/compiler-core": "3.5.13",
+        "@vue/shared": "3.5.13"
      }
    },
    "node_modules/@vue/compiler-sfc": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.31.tgz",
-      "integrity": "sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
+      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+      "license": "MIT",
      "dependencies": {
-        "@babel/parser": "^7.24.7",
-        "@vue/compiler-core": "3.4.31",
-        "@vue/compiler-dom": "3.4.31",
-        "@vue/compiler-ssr": "3.4.31",
-        "@vue/shared": "3.4.31",
+        "@babel/parser": "^7.25.3",
+        "@vue/compiler-core": "3.5.13",
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13",
        "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.10",
-        "postcss": "^8.4.38",
+        "magic-string": "^0.30.11",
+        "postcss": "^8.4.48",
        "source-map-js": "^1.2.0"
      }
    },
    "node_modules/@vue/compiler-ssr": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.31.tgz",
-      "integrity": "sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
+      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+      "license": "MIT",
      "dependencies": {
-        "@vue/compiler-dom": "3.4.31",
-        "@vue/shared": "3.4.31"
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/shared": "3.5.13"
      }
    },
    "node_modules/@vue/compiler-vue2": {
@@ -5720,38 +5883,6 @@
        }
      }
    },
-    "node_modules/@vue/language-core/node_modules/@vue/compiler-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
-      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.13",
-        "entities": "^4.5.0",
-        "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.0"
-      }
-    },
-    "node_modules/@vue/language-core/node_modules/@vue/compiler-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
-      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-core": "3.5.13",
-        "@vue/shared": "3.5.13"
-      }
-    },
-    "node_modules/@vue/language-core/node_modules/@vue/shared": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
-      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/@vue/language-core/node_modules/brace-expansion": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -5779,49 +5910,54 @@
      }
    },
    "node_modules/@vue/reactivity": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.31.tgz",
-      "integrity": "sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
+      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "license": "MIT",
      "dependencies": {
-        "@vue/shared": "3.4.31"
+        "@vue/shared": "3.5.13"
      }
    },
    "node_modules/@vue/runtime-core": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.31.tgz",
-      "integrity": "sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
+      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "license": "MIT",
      "dependencies": {
-        "@vue/reactivity": "3.4.31",
-        "@vue/shared": "3.4.31"
+        "@vue/reactivity": "3.5.13",
+        "@vue/shared": "3.5.13"
      }
    },
    "node_modules/@vue/runtime-dom": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.31.tgz",
-      "integrity": "sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
+      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "license": "MIT",
      "dependencies": {
-        "@vue/reactivity": "3.4.31",
-        "@vue/runtime-core": "3.4.31",
-        "@vue/shared": "3.4.31",
+        "@vue/reactivity": "3.5.13",
+        "@vue/runtime-core": "3.5.13",
+        "@vue/shared": "3.5.13",
        "csstype": "^3.1.3"
      }
    },
    "node_modules/@vue/server-renderer": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.31.tgz",
-      "integrity": "sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
+      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "license": "MIT",
      "dependencies": {
-        "@vue/compiler-ssr": "3.4.31",
-        "@vue/shared": "3.4.31"
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13"
      },
      "peerDependencies": {
-        "vue": "3.4.31"
+        "vue": "3.5.13"
      }
    },
    "node_modules/@vue/shared": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
-      "integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
+      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+      "license": "MIT"
    },
    "node_modules/@vue/test-utils": {
      "version": "2.4.6",
@@ -7755,7 +7891,8 @@
    "node_modules/csstype": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "license": "MIT"
    },
    "node_modules/data-urls": {
      "version": "3.0.2",
@@ -14335,15 +14472,16 @@
      }
    },
    "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
      "funding": [
        {
          "type": "github",
          "url": "https://github.com/sponsors/ai"
        }
      ],
+      "license": "MIT",
      "bin": {
        "nanoid": "bin/nanoid.cjs"
      },
@@ -15078,9 +15216,10 @@
      }
    },
    "node_modules/picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -15244,9 +15383,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.47",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
+      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
      "funding": [
        {
          "type": "opencollective",
@@ -15261,9 +15400,10 @@
          "url": "https://github.com/sponsors/ai"
        }
      ],
+      "license": "MIT",
      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.0",
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
        "source-map-js": "^1.2.1"
      },
      "engines": {
@@ -15436,15 +15576,15 @@
      "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw=="
    },
    "node_modules/primevue": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/primevue/-/primevue-4.0.5.tgz",
-      "integrity": "sha512-MALszGIZ5SnEQy1XeZLBFhpMXQ1OS7D1U7H+l/JAX5U46RQ1vufo7NAiWbbV5/ADjPGw4uLplqMQxujkksNY2g==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/primevue/-/primevue-4.2.5.tgz",
+      "integrity": "sha512-7UMOIJvdFz4jQyhC76yhNdSlHtXvVpmE2JSo2ndUTBWjWJOkYyT562rQ4ayO+bMdJLtzBGqgY64I9ZfEvNd7vQ==",
      "license": "MIT",
      "dependencies": {
-        "@primeuix/styled": "^0.0.5",
-        "@primeuix/utils": "^0.0.5",
-        "@primevue/core": "4.0.5",
-        "@primevue/icons": "4.0.5"
+        "@primeuix/styled": "^0.3.2",
+        "@primeuix/utils": "^0.3.2",
+        "@primevue/core": "4.2.5",
+        "@primevue/icons": "4.2.5"
      },
      "engines": {
        "node": ">=12.11.0"
@@ -18724,15 +18864,16 @@
      "license": "MIT"
    },
    "node_modules/vue": {
-      "version": "3.4.31",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.31.tgz",
-      "integrity": "sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
+      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+      "license": "MIT",
      "dependencies": {
-        "@vue/compiler-dom": "3.4.31",
-        "@vue/compiler-sfc": "3.4.31",
-        "@vue/runtime-dom": "3.4.31",
-        "@vue/server-renderer": "3.4.31",
-        "@vue/shared": "3.4.31"
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-sfc": "3.5.13",
+        "@vue/runtime-dom": "3.5.13",
+        "@vue/server-renderer": "3.5.13",
+        "@vue/shared": "3.5.13"
      },
      "peerDependencies": {
        "typescript": "*"
@@ -19440,21 +19581,22 @@
      }
    },
    "node_modules/zod": {
-      "version": "3.23.8",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
-      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
    },
    "node_modules/zod-to-json-schema": {
-      "version": "3.23.5",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.23.5.tgz",
-      "integrity": "sha512-5wlSS0bXfF/BrL4jPAbz9da5hDlDptdEppYfe+x4eIJ7jioqKG9uUxOwPzqof09u/XeVdrgFu29lZi+8XNDJtA==",
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.1.tgz",
+      "integrity": "sha512-3h08nf3Vw3Wl3PK+q3ow/lIil81IT2Oa7YpQyUUDsEWbXveMesdfK1xBd2RhCkynwZndAxixji/7SYJJowr62w==",
      "dev": true,
      "license": "ISC",
      "peerDependencies": {
-        "zod": "^3.23.3"
+        "zod": "^3.24.1"
      }
    },
    "node_modules/zod-validation-error": {
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@comfyorg/comfyui-frontend",
  "private": true,
-  "version": "1.6.14",
+  "version": "1.8.2",
  "type": "module",
  "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
  "homepage": "https://comfy.org",
@@ -17,8 +17,8 @@
    "update-litegraph": "node scripts/update-litegraph.js",
    "zipdist": "node scripts/zipdist.js",
    "typecheck": "vue-tsc --noEmit && tsc --noEmit && tsc-strict",
-    "format": "prettier --write './**/*.{js,ts,tsx,vue,mts}' --plugin @trivago/prettier-plugin-sort-imports",
-    "format:check": "prettier --check './**/*.{js,ts,tsx,vue,mts}' --plugin @trivago/prettier-plugin-sort-imports",
+    "format": "prettier --write './**/*.{js,ts,tsx,vue,mts}'",
+    "format:check": "prettier --check './**/*.{js,ts,tsx,vue,mts}'",
    "test:jest": "jest --config jest.config.ts",
    "test:generate": "npx tsx tests-ui/setup",
    "test:browser": "npx playwright test",
@@ -28,7 +28,8 @@
    "lint": "eslint src",
    "lint:fix": "eslint src --fix",
    "locale": "lobe-i18n locale",
-    "collect-i18n": "playwright test --config=playwright.i18n.config.ts"
+    "collect-i18n": "playwright test --config=playwright.i18n.config.ts",
+    "json-schema": "tsx scripts/generate-json-schema.ts"
  },
  "devDependencies": {
    "@babel/core": "^7.24.7",
@@ -77,13 +78,16 @@
    "vite-plugin-static-copy": "^1.0.5",
    "vitest": "^2.0.5",
    "vue-tsc": "^2.1.10",
-    "zip-dir": "^2.0.0"
+    "zip-dir": "^2.0.0",
+    "zod-to-json-schema": "^3.24.1"
  },
  "dependencies": {
    "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-    "@comfyorg/comfyui-electron-types": "^0.4.3",
-    "@comfyorg/litegraph": "^0.8.58",
-    "@primevue/themes": "^4.0.5",
+    "@comfyorg/comfyui-electron-types": "^0.4.11",
+    "@comfyorg/litegraph": "^0.8.61",
+    "@primevue/forms": "^4.2.5",
+    "@primevue/themes": "^4.2.5",
+    "@sentry/vue": "^8.48.0",
    "@tiptap/core": "^2.10.4",
    "@tiptap/extension-link": "^2.10.4",
    "@tiptap/extension-table": "^2.10.4",
@@ -102,10 +106,10 @@
    "loglevel": "^1.9.2",
    "pinia": "^2.1.7",
    "primeicons": "^7.0.0",
-    "primevue": "^4.0.5",
+    "primevue": "^4.2.5",
    "three": "^0.170.0",
    "tiptap-markdown": "^0.8.10",
-    "vue": "^3.4.31",
+    "vue": "^3.5.13",
    "vue-i18n": "^9.13.1",
    "vue-router": "^4.4.3",
    "zod": "^3.23.8",
--- a/playwright.i18n.config.ts
+++ b/playwright.i18n.config.ts
@@ -8,7 +8,7 @@ const config: PlaywrightTestConfig = {
  },
  reporter: 'list',
  timeout: 10000,
-  testMatch: /collect-i18n\.ts/
+  testMatch: /collect-i18n-.*\.ts/
 }

 export default config
--- a/scripts/collect-i18n-general.ts
+++ b/scripts/collect-i18n-general.ts
@@ -3,14 +3,11 @@ import * as fs from 'fs'
 import { comfyPageFixture as test } from '../browser_tests/fixtures/ComfyPage'
 import { CORE_MENU_COMMANDS } from '../src/constants/coreMenuCommands'
 import { SERVER_CONFIG_ITEMS } from '../src/constants/serverConfig'
-import type { ComfyApi } from '../src/scripts/api'
 import type { ComfyCommandImpl } from '../src/stores/commandStore'
-import { ComfyNodeDefImpl } from '../src/stores/nodeDefStore'
 import type { FormItem, SettingParams } from '../src/types/settingTypes'
 import { formatCamelCase, normalizeI18nKey } from '../src/utils/formatUtil'

 const localePath = './src/locales/en/main.json'
-const nodeDefsPath = './src/locales/en/nodeDefs.json'
 const commandsPath = './src/locales/en/commands.json'
 const settingsPath = './src/locales/en/settings.json'

@@ -22,7 +19,7 @@ const extractMenuCommandLocaleStrings = (): Set<string> => {
  return labels
 }

-test('collect-i18n', async ({ comfyPage }) => {
+test('collect-i18n-general', async ({ comfyPage }) => {
  const commands = (
    await comfyPage.page.evaluate(() => {
      const workspace = window['app'].extensionManager
@@ -129,105 +126,6 @@ test('collect-i18n', async ({ comfyPage }) => {
    ])
  )

-  // Node Definitions
-  const nodeDefs: ComfyNodeDefImpl[] = Object.values(
-    await comfyPage.page.evaluate(async () => {
-      const api = window['app'].api as ComfyApi
-      return await api.getNodeDefs()
-    })
-  ).map((def) => new ComfyNodeDefImpl(def))
-
-  console.log(`Collected ${nodeDefs.length} node definitions`)
-
-  const allDataTypesLocale = Object.fromEntries(
-    nodeDefs
-      .flatMap((nodeDef) => {
-        const inputDataTypes = Object.values(nodeDef.inputs.all).map(
-          (inputSpec) => inputSpec.type
-        )
-        const outputDataTypes = nodeDef.outputs.all.map((output) => output.type)
-        const allDataTypes = [...inputDataTypes, ...outputDataTypes].flatMap(
-          (type: string) => type.split(',')
-        )
-        return allDataTypes.map((dataType) => [
-          normalizeI18nKey(dataType),
-          dataType
-        ])
-      })
-      .sort((a, b) => a[0].localeCompare(b[0]))
-  )
-
-  function extractInputs(nodeDef: ComfyNodeDefImpl) {
-    const inputs = Object.fromEntries(
-      nodeDef.inputs.all.flatMap((input) => {
-        const name = input.name
-        const tooltip = input.tooltip
-
-        if (name === undefined && tooltip === undefined) {
-          return []
-        }
-
-        return [
-          [
-            normalizeI18nKey(input.name),
-            {
-              name,
-              tooltip
-            }
-          ]
-        ]
-      })
-    )
-    return Object.keys(inputs).length > 0 ? inputs : undefined
-  }
-
-  function extractOutputs(nodeDef: ComfyNodeDefImpl) {
-    const outputs = Object.fromEntries(
-      nodeDef.outputs.all.flatMap((output, i) => {
-        // Ignore data types if they are already translated in allDataTypesLocale.
-        const name = output.name in allDataTypesLocale ? undefined : output.name
-        const tooltip = output.tooltip
-
-        if (name === undefined && tooltip === undefined) {
-          return []
-        }
-
-        return [
-          [
-            i.toString(),
-            {
-              name,
-              tooltip
-            }
-          ]
-        ]
-      })
-    )
-    return Object.keys(outputs).length > 0 ? outputs : undefined
-  }
-
-  const allNodeDefsLocale = Object.fromEntries(
-    nodeDefs
-      .sort((a, b) => a.name.localeCompare(b.name))
-      .map((nodeDef) => [
-        normalizeI18nKey(nodeDef.name),
-        {
-          display_name: nodeDef.display_name ?? nodeDef.name,
-          description: nodeDef.description || undefined,
-          inputs: extractInputs(nodeDef),
-          outputs: extractOutputs(nodeDef)
-        }
-      ])
-  )
-
-  const allNodeCategoriesLocale = Object.fromEntries(
-    nodeDefs.flatMap((nodeDef) =>
-      nodeDef.category
-        .split('/')
-        .map((category) => [normalizeI18nKey(category), category])
-    )
-  )
-
  fs.writeFileSync(
    localePath,
    JSON.stringify(
@@ -241,16 +139,13 @@ test('collect-i18n', async ({ comfyPage }) => {
          ...allSettingCategoriesLocale
        },
        serverConfigItems: allServerConfigsLocale,
-        serverConfigCategories: allServerConfigCategoriesLocale,
-        dataTypes: allDataTypesLocale,
-        nodeCategories: allNodeCategoriesLocale
+        serverConfigCategories: allServerConfigCategoriesLocale
      },
      null,
      2
    )
  )

-  fs.writeFileSync(nodeDefsPath, JSON.stringify(allNodeDefsLocale, null, 2))
  fs.writeFileSync(commandsPath, JSON.stringify(allCommandsLocale, null, 2))
  fs.writeFileSync(settingsPath, JSON.stringify(allSettingsLocale, null, 2))
 })
--- a/scripts/collect-i18n-node-defs.ts
+++ b/scripts/collect-i18n-node-defs.ts
@@ -0,0 +1,125 @@
+import * as fs from 'fs'
+
+import { comfyPageFixture as test } from '../browser_tests/fixtures/ComfyPage'
+import type { ComfyApi } from '../src/scripts/api'
+import { ComfyNodeDefImpl } from '../src/stores/nodeDefStore'
+import { normalizeI18nKey } from '../src/utils/formatUtil'
+
+const localePath = './src/locales/en/main.json'
+const nodeDefsPath = './src/locales/en/nodeDefs.json'
+
+test('collect-i18n-node-defs', async ({ comfyPage }) => {
+  const nodeDefs: ComfyNodeDefImpl[] = Object.values(
+    await comfyPage.page.evaluate(async () => {
+      const api = window['app'].api as ComfyApi
+      return await api.getNodeDefs()
+    })
+  ).map((def) => new ComfyNodeDefImpl(def))
+
+  console.log(`Collected ${nodeDefs.length} node definitions`)
+
+  const allDataTypesLocale = Object.fromEntries(
+    nodeDefs
+      .flatMap((nodeDef) => {
+        const inputDataTypes = Object.values(nodeDef.inputs.all).map(
+          (inputSpec) => inputSpec.type
+        )
+        const outputDataTypes = nodeDef.outputs.all.map((output) => output.type)
+        const allDataTypes = [...inputDataTypes, ...outputDataTypes].flatMap(
+          (type: string) => type.split(',')
+        )
+        return allDataTypes.map((dataType) => [
+          normalizeI18nKey(dataType),
+          dataType
+        ])
+      })
+      .sort((a, b) => a[0].localeCompare(b[0]))
+  )
+
+  function extractInputs(nodeDef: ComfyNodeDefImpl) {
+    const inputs = Object.fromEntries(
+      nodeDef.inputs.all.flatMap((input) => {
+        const name = input.name
+        const tooltip = input.tooltip
+
+        if (name === undefined && tooltip === undefined) {
+          return []
+        }
+
+        return [
+          [
+            normalizeI18nKey(input.name),
+            {
+              name,
+              tooltip
+            }
+          ]
+        ]
+      })
+    )
+    return Object.keys(inputs).length > 0 ? inputs : undefined
+  }
+
+  function extractOutputs(nodeDef: ComfyNodeDefImpl) {
+    const outputs = Object.fromEntries(
+      nodeDef.outputs.all.flatMap((output, i) => {
+        // Ignore data types if they are already translated in allDataTypesLocale.
+        const name = output.name in allDataTypesLocale ? undefined : output.name
+        const tooltip = output.tooltip
+
+        if (name === undefined && tooltip === undefined) {
+          return []
+        }
+
+        return [
+          [
+            i.toString(),
+            {
+              name,
+              tooltip
+            }
+          ]
+        ]
+      })
+    )
+    return Object.keys(outputs).length > 0 ? outputs : undefined
+  }
+
+  const allNodeDefsLocale = Object.fromEntries(
+    nodeDefs
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .map((nodeDef) => [
+        normalizeI18nKey(nodeDef.name),
+        {
+          display_name: nodeDef.display_name ?? nodeDef.name,
+          description: nodeDef.description || undefined,
+          inputs: extractInputs(nodeDef),
+          outputs: extractOutputs(nodeDef)
+        }
+      ])
+  )
+
+  const allNodeCategoriesLocale = Object.fromEntries(
+    nodeDefs.flatMap((nodeDef) =>
+      nodeDef.category
+        .split('/')
+        .map((category) => [normalizeI18nKey(category), category])
+    )
+  )
+
+  const locale = JSON.parse(fs.readFileSync(localePath, 'utf-8'))
+  fs.writeFileSync(
+    localePath,
+    JSON.stringify(
+      {
+        ...locale,
+        dataTypes: allDataTypesLocale,
+        nodeCategories: allNodeCategoriesLocale
+      },
+      null,
+      2
+    )
+  )
+
+  fs.writeFileSync(nodeDefsPath, JSON.stringify(allNodeDefsLocale, null, 2))
+})
--- a/scripts/generate-json-schema.ts
+++ b/scripts/generate-json-schema.ts
@@ -0,0 +1,35 @@
+import fs from 'fs'
+import path from 'path'
+import { zodToJsonSchema } from 'zod-to-json-schema'
+
+import { zComfyWorkflow, zComfyWorkflow1 } from '../src/types/comfyWorkflow'
+
+// Convert both workflow schemas to JSON Schema
+const workflow04Schema = zodToJsonSchema(zComfyWorkflow, {
+  name: 'ComfyWorkflow0_4',
+  $refStrategy: 'none'
+})
+
+const workflow1Schema = zodToJsonSchema(zComfyWorkflow1, {
+  name: 'ComfyWorkflow1_0',
+  $refStrategy: 'none'
+})
+
+// Create output directory if it doesn't exist
+const outputDir = './schemas'
+if (!fs.existsSync(outputDir)) {
+  fs.mkdirSync(outputDir, { recursive: true })
+}
+
+// Write schemas to files
+fs.writeFileSync(
+  path.join(outputDir, 'workflow-0_4.json'),
+  JSON.stringify(workflow04Schema, null, 2)
+)
+
+fs.writeFileSync(
+  path.join(outputDir, 'workflow-1_0.json'),
+  JSON.stringify(workflow1Schema, null, 2)
+)
+
+console.log('JSON Schemas generated successfully!')
--- a/scripts/main_repo_release.py
+++ b/scripts/main_repo_release.py
@@ -1,71 +0,0 @@
-import os
-import sys
-import requests
-import zipfile
-import shutil
-import git
-import tempfile
-
-
-def download_and_extract(version, temp_dir):
-    url = f"https://github.com/Comfy-Org/ComfyUI_frontend/releases/download/v{version}/dist.zip"
-    response = requests.get(url)
-
-    if response.status_code == 200:
-        zip_path = os.path.join(temp_dir, "dist.zip")
-        with open(zip_path, "wb") as file:
-            file.write(response.content)
-
-        with zipfile.ZipFile(zip_path, "r") as zip_ref:
-            zip_ref.extractall(temp_dir)
-
-        # Clean up the zip file after extraction
-        os.remove(zip_path)
-    else:
-        raise Exception(
-            f"Failed to download release asset. Status code: {response.status_code}"
-        )
-
-
-def update_repo(repo_path, version, temp_dir):
-    repo = git.Repo(repo_path)
-
-    # Stash any changes
-    repo.git.stash()
-
-    # Create and checkout new branch
-    new_branch = f"release-{version}"
-    repo.git.checkout("-b", new_branch, "-t", "origin/master")
-
-    # Remove all files under web/ directory
-    web_dir = os.path.join(repo_path, "web")
-    if os.path.exists(web_dir):
-        shutil.rmtree(web_dir)
-
-    # Move content from temp_dir to web/
-    shutil.move(temp_dir, web_dir)
-
-    # Add changes and commit
-    repo.git.add(all=True)
-    commit_message = f"Update web content to release v{version}"
-    repo.git.commit("-m", commit_message)
-
-
-def main(repo_path: str, version: str):
-    with tempfile.TemporaryDirectory() as temp_dir:
-        try:
-            download_and_extract(version, temp_dir)
-            update_repo(repo_path, version, temp_dir)
-            print(f"Successfully updated repo to release v{version}")
-        except Exception as e:
-            print(f"An error occurred: {str(e)}")
-
-
-if __name__ == "__main__":
-    if len(sys.argv) != 3:
-        print("Usage: python script.py <repo_path> <version>")
-        sys.exit(1)
-
-    repo_path = sys.argv[1]
-    version = sys.argv[2]
-    main(repo_path, version)
--- a/scripts/update-electron-types.js
+++ b/scripts/update-electron-types.js
@@ -0,0 +1,43 @@
+import { execSync } from 'child_process'
+import { readFileSync } from 'fs'
+
+const packageName = '@comfyorg/comfyui-electron-types'
+const description = 'desktop API types'
+
+try {
+  // Create a new branch
+  console.log('Creating new branch...')
+  const date = new Date()
+  const isoDate = date.toISOString().split('T')[0]
+  const timestamp = date.getTime()
+  const branchName = `update-electron-types-${isoDate}-${timestamp}`
+  execSync(`git checkout -b ${branchName} -t origin/main`, { stdio: 'inherit' })
+
+  // Update npm package to latest version
+  console.log(`Updating ${description}...`)
+  execSync(`npm install ${packageName}@latest`, {
+    stdio: 'inherit'
+  })
+
+  // Get the new version from package.json
+  const packageLock = JSON.parse(readFileSync('./package-lock.json', 'utf8'))
+  const newVersion = packageLock.packages[`node_modules/${packageName}`].version
+
+  // Stage changes
+  const message = `[chore] Update electron-types to ${newVersion}`
+  execSync('git add package.json package-lock.json', { stdio: 'inherit' })
+  execSync(`git commit -m "${message}"`, { stdio: 'inherit' })
+
+  // Create the PR
+  console.log('Creating PR...')
+  execSync(
+    `gh pr create --title "${message}" --label "dependencies" --body "Automated update of ${description} to version ${newVersion}."`,
+    { stdio: 'inherit' }
+  )
+
+  console.log(
+    `✅ Successfully created PR for ${description} update to ${newVersion}`
+  )
+} catch (error) {
+  console.error('❌ Error during update process:', error.message)
+}
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,7 +18,7 @@ import GlobalDialog from '@/components/dialog/GlobalDialog.vue'
 import config from '@/config'
 import { useWorkspaceStore } from '@/stores/workspaceStore'

-import { isElectron, showNativeMenu } from './utils/envUtil'
+import { electronAPI, isElectron } from './utils/envUtil'

 const workspaceStore = useWorkspaceStore()
 const isLoading = computed<boolean>(() => workspaceStore.spinner)
@@ -34,7 +34,7 @@ const showContextMenu = (event: PointerEvent) => {
    case target instanceof HTMLTextAreaElement:
    case target instanceof HTMLInputElement && target.type === 'text':
      // TODO: Context input menu explicitly for text input
-      showNativeMenu({ type: 'text' })
+      electronAPI()?.showContextMenu({ type: 'text' })
      return
  }
 }
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -10,6 +10,7 @@
  --bg-color: #fff;
  --comfy-menu-bg: #353535;
  --comfy-menu-secondary-bg: #292929;
+  --comfy-topbar-height: 2.5rem;
  --comfy-input-bg: #222;
  --input-text: #ddd;
  --descrip-text: #999;
@@ -763,3 +764,17 @@ audio.comfy-audio.empty-audio-widget {
 .p-tree-node-content {
  padding: var(--comfy-tree-explorer-item-padding) !important;
 }
+
+/* [Desktop] Electron window specific styles */
+.app-drag {
+  app-region: drag;
+}
+
+.no-drag {
+  app-region: no-drag;
+}
+
+.window-actions-spacer {
+  width: calc(100vw - env(titlebar-area-width, 100vw));
+}
+/* End of [Desktop] Electron window specific styles */
--- a/src/assets/palettes/dark.json
+++ b/src/assets/palettes/dark.json
@@ -27,6 +27,7 @@
      "NODE_SELECTED_TITLE_COLOR": "#FFF",
      "NODE_TEXT_SIZE": 14,
      "NODE_TEXT_COLOR": "#AAA",
+      "NODE_TEXT_HIGHLIGHT_COLOR": "#FFF",
      "NODE_SUBTEXT_SIZE": 12,
      "NODE_DEFAULT_COLOR": "#333",
      "NODE_DEFAULT_BGCOLOR": "#353535",
--- a/src/assets/palettes/light.json
+++ b/src/assets/palettes/light.json
@@ -1,6 +1,7 @@
 {
  "id": "light",
  "name": "Light",
+  "light_theme": true,
  "colors": {
    "node_slot": {
      "CLIP": "#FFA726",
@@ -13,7 +14,12 @@
      "MASK": "#9CCC65",
      "MODEL": "#7E57C2",
      "STYLE_MODEL": "#D4E157",
-      "VAE": "#FF7043"
+      "VAE": "#FF7043",
+      "NOISE": "#B0B0B0",
+      "GUIDER": "#66FFFF",
+      "SAMPLER": "#ECB4B4",
+      "SIGMAS": "#CDFFCD",
+      "TAESD": "#DCC274"
    },
    "litegraph_base": {
      "BACKGROUND_IMAGE": "data:image/gif;base64,R0lGODlhZABkALMAAAAAAP///+vr6+rq6ujo6Ofn5+bm5uXl5d3d3f///wAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAABkAGQAAAT/UMhJq7046827HkcoHkYxjgZhnGG6si5LqnIM0/fL4qwwIMAg0CAsEovBIxKhRDaNy2GUOX0KfVFrssrNdpdaqTeKBX+dZ+jYvEaTf+y4W66mC8PUdrE879f9d2mBeoNLfH+IhYBbhIx2jkiHiomQlGKPl4uZe3CaeZifnnijgkESBqipqqusra6vsLGys62SlZO4t7qbuby7CLa+wqGWxL3Gv3jByMOkjc2lw8vOoNSi0czAncXW3Njdx9Pf48/Z4Kbbx+fQ5evZ4u3k1fKR6cn03vHlp7T9/v8A/8Gbp4+gwXoFryXMB2qgwoMMHyKEqA5fxX322FG8tzBcRnMW/zlulPbRncmQGidKjMjyYsOSKEF2FBlJQMCbOHP6c9iSZs+UnGYCdbnSo1CZI5F64kn0p1KnTH02nSoV3dGTV7FFHVqVq1dtWcMmVQZTbNGu72zqXMuW7danVL+6e4t1bEy6MeueBYLXrNO5Ze36jQtWsOG97wIj1vt3St/DjTEORss4nNq2mDP3e7w4r1bFkSET5hy6s2TRlD2/mSxXtSHQhCunXo26NevCpmvD/UU6tuullzULH76q92zdZG/Ltv1a+W+osI/nRmyc+fRi1Xdbh+68+0vv10dH3+77KD/i6IdnX669/frn5Zsjh4/2PXju8+8bzc9/6fj27LFnX11/+IUnXWl7BJfegm79FyB9JOl3oHgSklefgxAC+FmFGpqHIYcCfkhgfCohSKKJVo044YUMttggiBkmp6KFXw1oII24oYhjiDByaKOOHcp3Y5BD/njikSkO+eBREQAAOw==",
@@ -22,6 +28,7 @@
      "NODE_SELECTED_TITLE_COLOR": "#000",
      "NODE_TEXT_SIZE": 14,
      "NODE_TEXT_COLOR": "#444",
+      "NODE_TEXT_HIGHLIGHT_COLOR": "#1e293b",
      "NODE_SUBTEXT_SIZE": 12,
      "NODE_DEFAULT_COLOR": "#F7F7F7",
      "NODE_DEFAULT_BGCOLOR": "#F5F5F5",
--- a/src/components/MenuHamburger.vue
+++ b/src/components/MenuHamburger.vue
@@ -1,16 +1,22 @@
 <template>
-  <Button
+  <div
    v-show="workspaceState.focusMode"
-    class="comfy-menu-hamburger"
+    class="comfy-menu-hamburger no-drag"
    :style="positionCSS"
-    icon="pi pi-bars"
-    severity="secondary"
-    text
-    size="large"
-    v-tooltip="{ value: $t('menu.showMenu'), showDelay: 300 }"
-    @click="exitFocusMode"
-    @contextmenu="showNativeMenu"
-  />
+  >
+    <Button
+      icon="pi pi-bars"
+      severity="secondary"
+      text
+      size="large"
+      v-tooltip="{ value: $t('menu.showMenu'), showDelay: 300 }"
+      :aria-label="$t('menu.showMenu')"
+      aria-live="assertive"
+      @click="exitFocusMode"
+      @contextmenu="showNativeMenu"
+    />
+    <div v-show="menuSetting !== 'Bottom'" class="window-actions-spacer" />
+  </div>
 </template>

 <script setup lang="ts">
@@ -51,8 +57,6 @@ const positionCSS = computed<CSSProperties>(() =>

 <style scoped>
 .comfy-menu-hamburger {
-  pointer-events: auto;
-  position: fixed;
-  z-index: 9999;
+  @apply pointer-events-auto fixed z-[9999] flex flex-row;
 }
 </style>
--- a/src/components/actionbar/BatchCountEdit.vue
+++ b/src/components/actionbar/BatchCountEdit.vue
@@ -3,6 +3,7 @@
    class="batch-count"
    :class="props.class"
    v-tooltip.bottom="$t('menu.batchCount')"
+    :aria-label="$t('menu.batchCount')"
  >
    <InputNumber
      class="w-14"
--- a/src/components/actionbar/ComfyQueueButton.vue
+++ b/src/components/actionbar/ComfyQueueButton.vue
@@ -22,7 +22,7 @@
      </template>
      <template #item="{ item }">
        <Button
-          :label="item.label"
+          :label="String(item.label)"
          :icon="item.icon"
          :severity="item.key === queueMode ? 'primary' : 'secondary'"
          size="small"
@@ -39,6 +39,7 @@
        :severity="executingPrompt ? 'danger' : 'secondary'"
        :disabled="!executingPrompt"
        text
+        :aria-label="$t('menu.interrupt')"
        @click="() => commandStore.execute('Comfy.Interrupt')"
      >
      </Button>
@@ -48,6 +49,7 @@
        :severity="hasPendingTasks ? 'danger' : 'secondary'"
        :disabled="!hasPendingTasks"
        text
+        :aria-label="$t('sideToolbar.queueTab.clearPendingTasks')"
        @click="() => commandStore.execute('Comfy.ClearPendingTasks')"
      />
    </ButtonGroup>
--- a/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue
@@ -20,11 +20,16 @@ const terminalCreated = (
  let offData: IDisposable
  let offOutput: () => void

-  useAutoSize(root, true, true, () => {
-    // If we aren't visible, don't resize
-    if (!terminal.element?.offsetParent) return
+  useAutoSize({
+    root,
+    autoRows: true,
+    autoCols: true,
+    onResize: () => {
+      // If we aren't visible, don't resize
+      if (!terminal.element?.offsetParent) return

-    terminalApi.resize(terminal.cols, terminal.rows)
+      terminalApi.resize(terminal.cols, terminal.rows)
+    }
  })

  onMounted(async () => {
--- a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
@@ -29,7 +29,12 @@ const terminalCreated = (
  { terminal, useAutoSize }: ReturnType<typeof useTerminal>,
  root: Ref<HTMLElement>
 ) => {
-  useAutoSize(root, true, false)
+  // `autoCols` is false because we don't want the progress bar in the terminal
+  // to render incorrectly as the progress bar is rendered based on the
+  // server's terminal size.
+  // Apply a min cols of 80 for colab environments
+  // See https://github.com/comfyanonymous/ComfyUI/issues/6396
+  useAutoSize({ root, autoRows: true, autoCols: false, minCols: 80 })

  const update = (entries: Array<LogEntry>, size?: TerminalSize) => {
    if (size) {
--- a/src/components/common/ComfyImage.vue
+++ b/src/components/common/ComfyImage.vue
@@ -12,12 +12,14 @@
      :data-test="src"
      class="comfy-image-blur"
      :style="{ 'background-image': `url(${src})` }"
+      :alt="alt"
    />
    <img
      :src="src"
      @error="handleImageError"
      class="comfy-image-main"
      :class="[...classArray]"
+      :alt="alt"
    />
  </span>
  <div v-if="imageBroken" class="broken-image-placeholder">
@@ -34,9 +36,11 @@ const props = withDefaults(
    src: string
    class?: string | string[] | object
    contain: boolean
+    alt?: string
  }>(),
  {
-    contain: false
+    contain: false,
+    alt: 'Image content'
  }
 )

--- a/src/components/common/CustomizationDialog.vue
+++ b/src/components/common/CustomizationDialog.vue
@@ -26,6 +26,7 @@
            :options="colorOptions"
            optionLabel="name"
            dataKey="value"
+            :allow-empty="false"
          >
            <template #option="slotProps">
              <div
--- a/src/components/common/ElectronFileDownload.vue
+++ b/src/components/common/ElectronFileDownload.vue
@@ -18,7 +18,7 @@
          :label="$t('g.download') + ' (' + fileSize + ')'"
          size="small"
          outlined
-          :disabled="props.error"
+          :disabled="!!props.error"
          @click="triggerDownload"
          v-if="status === null || status === 'error'"
          icon="pi pi-download"
@@ -30,7 +30,7 @@
      v-if="status === 'in_progress' || status === 'paused'"
    >
      <!-- Temporary fix for issue when % only comes into view only if the progress bar is large enough
-           https://comfy-organization.slack.com/archives/C07H3GLKDPF/p1731551013385499     
+           https://comfy-organization.slack.com/archives/C07H3GLKDPF/p1731551013385499
      -->
      <ProgressBar
        class="flex-1"
@@ -42,7 +42,7 @@
        class="file-action-button"
        size="small"
        outlined
-        :disabled="props.error"
+        :disabled="!!props.error"
        @click="triggerPauseDownload"
        v-if="status === 'in_progress'"
        icon="pi pi-pause-circle"
@@ -53,7 +53,7 @@
        class="file-action-button"
        size="small"
        outlined
-        :disabled="props.error"
+        :disabled="!!props.error"
        @click="triggerResumeDownload"
        v-if="status === 'paused'"
        icon="pi pi-play-circle"
@@ -64,7 +64,7 @@
        class="file-action-button"
        size="small"
        outlined
-        :disabled="props.error"
+        :disabled="!!props.error"
        @click="triggerCancelDownload"
        icon="pi pi-times-circle"
        severity="danger"
--- a/src/components/common/FileDownload.vue
+++ b/src/components/common/FileDownload.vue
@@ -15,7 +15,7 @@
        :label="$t('g.download') + ' (' + fileSize + ')'"
        size="small"
        outlined
-        :disabled="props.error"
+        :disabled="!!props.error"
        :title="props.url"
        @click="download.triggerBrowserDownload"
      />
--- a/src/components/common/FormColorPicker.vue
+++ b/src/components/common/FormColorPicker.vue
@@ -1,35 +1,17 @@
 <template>
  <div class="color-picker-wrapper flex items-center gap-2">
-    <ColorPicker v-model="modelValue">
-      <template #header>
-        <div class="flex items-center justify-between p-2">
-          <span>{{ props.label }}</span>
-          <Button
-            v-if="props.defaultValue"
-            icon="pi pi-refresh"
-            text
-            size="small"
-            @click="resetColor"
-          />
-        </div>
-      </template>
-    </ColorPicker>
+    <ColorPicker v-model="modelValue" />
    <InputText v-model="modelValue" class="w-28" :placeholder="label" />
  </div>
 </template>

 <script setup lang="ts">
-import Button from 'primevue/button'
 import ColorPicker from 'primevue/colorpicker'
 import InputText from 'primevue/inputtext'

 const modelValue = defineModel<string>('modelValue')
-const props = defineProps<{
+defineProps<{
  defaultValue?: string
  label?: string
 }>()
-
-const resetColor = () => {
-  modelValue.value = props.defaultValue || '#000000'
-}
 </script>
--- a/src/components/common/LogTerminal.vue
+++ b/src/components/common/LogTerminal.vue
@@ -1,66 +0,0 @@
-<!-- A simple read-only terminal component that displays logs. -->
-<template>
-  <div class="p-terminal rounded-none h-full w-full">
-    <ScrollPanel class="h-full w-full" ref="scrollPanelRef">
-      <pre class="px-4 whitespace-pre-wrap">{{ log }}</pre>
-    </ScrollPanel>
-  </div>
-</template>
-
-<script setup lang="ts">
-import ScrollPanel from 'primevue/scrollpanel'
-import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
-
-const props = defineProps<{
-  fetchLogs: () => Promise<string>
-  fetchInterval: number
-}>()
-
-const log = ref<string>('')
-const scrollPanelRef = ref<InstanceType<typeof ScrollPanel> | null>(null)
-/**
- * Whether the user has scrolled to the bottom of the terminal.
- * This is used to prevent the terminal from scrolling to the bottom
- * when new logs are fetched.
- */
-const scrolledToBottom = ref(false)
-
-let intervalId: number = 0
-
-onMounted(async () => {
-  const element = scrollPanelRef.value?.$el
-  const scrollContainer = element?.querySelector('.p-scrollpanel-content')
-
-  if (scrollContainer) {
-    scrollContainer.addEventListener('scroll', () => {
-      scrolledToBottom.value =
-        scrollContainer.scrollTop + scrollContainer.clientHeight ===
-        scrollContainer.scrollHeight
-    })
-  }
-
-  const scrollToBottom = () => {
-    if (scrollContainer) {
-      scrollContainer.scrollTop = scrollContainer.scrollHeight
-    }
-  }
-
-  watch(log, () => {
-    if (scrolledToBottom.value) {
-      scrollToBottom()
-    }
-  })
-
-  const fetchLogs = async () => {
-    log.value = await props.fetchLogs()
-  }
-
-  await fetchLogs()
-  scrollToBottom()
-  intervalId = window.setInterval(fetchLogs, props.fetchInterval)
-})
-
-onBeforeUnmount(() => {
-  window.clearInterval(intervalId)
-})
-</script>
--- a/src/components/common/RefreshButton.vue
+++ b/src/components/common/RefreshButton.vue
@@ -0,0 +1,53 @@
+<!--
+  A refresh button that disables and shows a progress spinner whilst active.
+  
+  Usage:
+  ```vue
+    <RefreshButton
+      v-model="isRefreshing"
+      :outlined="false"
+      @refresh="refresh"
+    />
+  ```
+-->
+<template>
+  <Button
+    class="relative p-button-icon-only"
+    :outlined="props.outlined"
+    :severity="props.severity"
+    :disabled="active || props.disabled"
+    @click="(event) => $emit('refresh', event)"
+  >
+    <span
+      class="p-button-icon pi pi-refresh transition-all"
+      :class="{ 'opacity-0': active }"
+      data-pc-section="icon"
+    ></span>
+    <span class="p-button-label" data-pc-section="label">&nbsp;</span>
+    <ProgressSpinner v-show="active" class="absolute w-1/2 h-1/2" />
+  </Button>
+</template>
+
+<script setup lang="ts">
+import Button from 'primevue/button'
+import ProgressSpinner from 'primevue/progressspinner'
+
+import { VueSeverity } from '@/types/primeVueTypes'
+
+// Properties
+interface Props {
+  outlined?: boolean
+  disabled?: boolean
+  severity?: VueSeverity
+}
+const props = withDefaults(defineProps<Props>(), {
+  outlined: true,
+  severity: 'secondary'
+})
+
+// Model
+const active = defineModel<boolean>({ required: true })
+
+// Emits
+defineEmits(['refresh'])
+</script>
--- a/src/components/common/SearchBox.vue
+++ b/src/components/common/SearchBox.vue
@@ -1,10 +1,10 @@
 <template>
-  <div :class="props.class">
+  <div>
    <IconField>
      <Button
-        v-if="props.filterIcon"
+        v-if="filterIcon"
        class="p-inputicon filter-button"
-        :icon="props.filterIcon"
+        :icon="filterIcon"
        text
        severity="contrast"
        @click="$emit('showFilter', $event)"
@@ -12,12 +12,12 @@
      <InputText
        class="search-box-input w-full"
        @input="handleInput"
-        :modelValue="props.modelValue"
-        :placeholder="props.placeholder"
+        :modelValue="modelValue"
+        :placeholder="placeholder"
      />
-      <InputIcon v-if="!props.modelValue" :class="props.icon" />
+      <InputIcon v-if="!modelValue" :class="icon" />
      <Button
-        v-if="props.modelValue"
+        v-if="modelValue"
        class="p-inputicon clear-button"
        icon="pi pi-times"
        text
@@ -47,40 +47,36 @@ import Button from 'primevue/button'
 import IconField from 'primevue/iconfield'
 import InputIcon from 'primevue/inputicon'
 import InputText from 'primevue/inputtext'
-import { toRefs } from 'vue'

 import type { SearchFilter } from './SearchFilterChip.vue'
 import SearchFilterChip from './SearchFilterChip.vue'

-const props = withDefaults(
-  defineProps<{
-    class?: string
-    modelValue: string
-    placeholder?: string
-    icon?: string
-    debounceTime?: number
-    filterIcon?: string
-    filters?: TFilter[]
-  }>(),
-  {
-    placeholder: 'Search...',
-    icon: 'pi pi-search',
-    debounceTime: 300
-  }
-)
+const {
+  modelValue,
+  placeholder = 'Search...',
+  icon = 'pi pi-search',
+  debounceTime = 300,
+  filterIcon,
+  filters = []
+} = defineProps<{
+  modelValue: string
+  placeholder?: string
+  icon?: string
+  debounceTime?: number
+  filterIcon?: string
+  filters?: TFilter[]
+}>()

-const { filters } = toRefs(props)
-
-const emit = defineEmits([
-  'update:modelValue',
-  'search',
-  'showFilter',
-  'removeFilter'
-])
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: string): void
+  (e: 'search', value: string, filters: TFilter[]): void
+  (e: 'showFilter', event: Event): void
+  (e: 'removeFilter', filter: TFilter): void
+}>()

 const emitSearch = debounce((value: string) => {
-  emit('search', value, props.filters)
-}, props.debounceTime)
+  emit('search', value, filters)
+}, debounceTime)

 const handleInput = (event: Event) => {
  const target = event.target as HTMLInputElement
--- a/src/components/common/SystemStatsPanel.vue
+++ b/src/components/common/SystemStatsPanel.vue
@@ -19,6 +19,7 @@
          v-for="device in props.stats.devices"
          :key="device.index"
          :header="device.name"
+          :value="device.index"
        >
          <DeviceInfo :device="device" />
        </TabPanel>
--- a/src/components/common/TreeExplorer.vue
+++ b/src/components/common/TreeExplorer.vue
@@ -8,9 +8,11 @@
    selectionMode="single"
    :pt="{
      nodeLabel: 'tree-explorer-node-label',
-      nodeContent: ({ props }) => ({
-        onClick: (e: MouseEvent) => onNodeContentClick(e, props.node),
-        onContextmenu: (e: MouseEvent) => handleContextMenu(props.node, e)
+      nodeContent: ({ context }) => ({
+        onClick: (e: MouseEvent) =>
+          onNodeContentClick(e, context.node as RenderedTreeExplorerNode),
+        onContextmenu: (e: MouseEvent) =>
+          handleContextMenu(e, context.node as RenderedTreeExplorerNode)
      }),
      nodeToggleButton: () => ({
        onClick: (e: MouseEvent) => {
@@ -152,7 +154,7 @@ const menuItems = computed<MenuItem[]>(() =>
  }))
 )

-const handleContextMenu = (node: RenderedTreeExplorerNode, e: MouseEvent) => {
+const handleContextMenu = (e: MouseEvent, node: RenderedTreeExplorerNode) => {
  menuTargetNode.value = node
  emit('contextMenu', node, e)
  if (menuItems.value.filter((item) => item.visible).length > 0) {
--- a/src/components/dialog/UnloadWindowConfirmDialog.vue
+++ b/src/components/dialog/UnloadWindowConfirmDialog.vue
@@ -13,11 +13,16 @@
 import { onBeforeUnmount, onMounted } from 'vue'

 import { useSettingStore } from '@/stores/settingStore'
+import { useWorkflowStore } from '@/stores/workflowStore'

 const settingStore = useSettingStore()
+const workflowStore = useWorkflowStore()

 const handleBeforeUnload = (event: BeforeUnloadEvent) => {
-  if (settingStore.get('Comfy.Window.UnloadConfirmation')) {
+  if (
+    settingStore.get('Comfy.Window.UnloadConfirmation') &&
+    workflowStore.modifiedWorkflows.length > 0
+  ) {
    event.preventDefault()
    return true
  }
--- a/src/components/dialog/content/ExecutionErrorDialogContent.vue
+++ b/src/components/dialog/content/ExecutionErrorDialogContent.vue
@@ -5,12 +5,20 @@
    :message="props.error.exception_message"
  />
  <div class="comfy-error-report">
-    <Button
-      v-show="!reportOpen"
-      :label="$t('g.showReport')"
-      @click="showReport"
-      text
-    />
+    <div class="flex gap-2 justify-center">
+      <Button
+        v-show="!reportOpen"
+        text
+        :label="$t('g.showReport')"
+        @click="showReport"
+      />
+      <Button
+        v-show="!sendReportOpen"
+        text
+        :label="$t('issueReport.helpFix')"
+        @click="showSendReport"
+      />
+    </div>
    <template v-if="reportOpen">
      <Divider />
      <ScrollPanel style="width: 100%; height: 400px; max-width: 80vw">
@@ -18,9 +26,14 @@
      </ScrollPanel>
      <Divider />
    </template>
-
+    <ReportIssuePanel
+      v-if="sendReportOpen"
+      :title="$t('issueReport.submitErrorReport')"
+      error-type="graphExecutionError"
+      :extra-fields="[stackTraceField]"
+      :tags="{ exceptionMessage: props.error.exception_message }"
+    />
    <div class="action-container">
-      <ReportIssueButton v-if="showSendError" :error="props.error" />
      <FindIssueButton
        :errorMessage="props.error.exception_message"
        :repoOwner="repoOwner"
@@ -41,16 +54,18 @@ import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import ScrollPanel from 'primevue/scrollpanel'
 import { useToast } from 'primevue/usetoast'
-import { onMounted, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'

 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import FindIssueButton from '@/components/dialog/content/error/FindIssueButton.vue'
-import ReportIssueButton from '@/components/dialog/content/error/ReportIssueButton.vue'
 import { useCopyToClipboard } from '@/hooks/clipboardHooks'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import type { ExecutionErrorWsMessage, SystemStats } from '@/types/apiTypes'
-import { isElectron } from '@/utils/envUtil'
+import type { ReportField } from '@/types/issueReportTypes'
+
+import ReportIssuePanel from './error/ReportIssuePanel.vue'

 const props = defineProps<{
  error: ExecutionErrorWsMessage
@@ -63,9 +78,24 @@ const reportOpen = ref(false)
 const showReport = () => {
  reportOpen.value = true
 }
-const showSendError = isElectron()
-
+const sendReportOpen = ref(false)
+const showSendReport = () => {
+  sendReportOpen.value = true
+}
 const toast = useToast()
+const { t } = useI18n()
+
+const stackTraceField = computed<ReportField>(() => {
+  return {
+    label: t('issueReport.stackTrace'),
+    value: 'StackTrace',
+    optIn: true,
+    getData: () => ({
+      nodeType: props.error.node_type,
+      stackTrace: props.error.traceback?.join('\n')
+    })
+  }
+})

 onMounted(async () => {
  try {
--- a/src/components/dialog/content/IssueReportDialogContent.vue
+++ b/src/components/dialog/content/IssueReportDialogContent.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="p-2 h-full" aria-labelledby="issue-report-title">
+    <Panel
+      :pt="{
+        root: 'border-none',
+        content: 'p-0'
+      }"
+    >
+      <template #header>
+        <header class="flex flex-col items-center w-full">
+          <h2 id="issue-report-title" class="text-4xl">{{ title }}</h2>
+          <span v-if="subtitle" class="text-muted mt-0">{{ subtitle }}</span>
+        </header>
+      </template>
+      <ReportIssuePanel v-bind="panelProps" :pt="{ root: 'border-none' }" />
+    </Panel>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Panel from 'primevue/panel'
+
+import ReportIssuePanel from '@/components/dialog/content/error/ReportIssuePanel.vue'
+import type { IssueReportPanelProps } from '@/types/issueReportTypes'
+
+defineProps<{
+  title: string
+  subtitle?: string
+  panelProps: IssueReportPanelProps
+}>()
+</script>
--- a/src/components/dialog/content/SettingDialogContent.vue
+++ b/src/components/dialog/content/SettingDialogContent.vue
@@ -6,6 +6,7 @@
        v-model:modelValue="searchQuery"
        @search="handleSearch"
        :placeholder="$t('g.searchSettings') + '...'"
+        :debounce-time="128"
      />
      <Listbox
        v-model="activeCategory"
@@ -14,7 +15,7 @@
        scrollHeight="100%"
        :optionDisabled="
          (option: SettingTreeNode) =>
-            inSearch && !searchResultsCategories.has(option.label)
+            !queryIsEmpty && !searchResultsCategories.has(option.label)
        "
        class="border-none w-full"
      />
@@ -263,9 +264,8 @@ const handleSearch = (query: string) => {
  activeCategory.value = null
 }

-const inSearch = computed(
-  () => searchQuery.value.length > 0 && !searchInProgress.value
-)
+const queryIsEmpty = computed(() => searchQuery.value.length === 0)
+const inSearch = computed(() => !queryIsEmpty.value && !searchInProgress.value)
 const tabValue = computed(() =>
  inSearch.value ? 'Search Results' : activeCategory.value?.label
 )
--- a/src/components/dialog/content/error/ReportIssueButton.vue
+++ b/src/components/dialog/content/error/ReportIssueButton.vue
@@ -1,52 +0,0 @@
-<template>
-  <Button
-    @click="reportIssue"
-    :label="$t('g.reportIssue')"
-    :severity="submitted ? 'success' : 'secondary'"
-    :icon="icon"
-    :disabled="submitted"
-    v-tooltip="$t('g.reportIssueTooltip')"
-  >
-  </Button>
-</template>
-
-<script setup lang="ts">
-import Button from 'primevue/button'
-import { useToast } from 'primevue/usetoast'
-import { computed, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { ExecutionErrorWsMessage } from '@/types/apiTypes'
-import { electronAPI } from '@/utils/envUtil'
-
-const { error } = defineProps<{
-  error: ExecutionErrorWsMessage
-}>()
-
-const { t } = useI18n()
-const toast = useToast()
-const submitting = ref(false)
-const submitted = ref(false)
-const icon = computed(
-  () => `pi ${submitting.value ? 'pi-spin pi-spinner' : 'pi-send'}`
-)
-
-const reportIssue = async () => {
-  if (submitting.value) return
-  submitting.value = true
-  try {
-    await electronAPI().sendErrorToSentry(error.exception_message, {
-      stackTrace: error.traceback?.join('\n'),
-      nodeType: error.node_type
-    })
-    submitted.value = true
-    toast.add({
-      severity: 'success',
-      summary: t('g.reportSent'),
-      life: 3000
-    })
-  } finally {
-    submitting.value = false
-  }
-}
-</script>
--- a/src/components/dialog/content/error/ReportIssuePanel.vue
+++ b/src/components/dialog/content/error/ReportIssuePanel.vue
@@ -0,0 +1,251 @@
+<template>
+  <Form
+    v-slot="$form"
+    @submit="submit"
+    :resolver="zodResolver(issueReportSchema)"
+  >
+    <Panel :pt="$attrs.pt">
+      <template #header>
+        <div class="flex items-center gap-2">
+          <span class="font-bold">{{ title }}</span>
+        </div>
+      </template>
+      <template #footer>
+        <div class="flex justify-end gap-4">
+          <Button
+            v-tooltip="!submitted ? $t('g.reportIssueTooltip') : undefined"
+            :label="submitted ? $t('g.reportSent') : $t('g.reportIssue')"
+            :severity="submitted ? 'secondary' : 'primary'"
+            :icon="submitted ? 'pi pi-check' : 'pi pi-send'"
+            :disabled="submitted"
+            type="submit"
+          />
+        </div>
+      </template>
+      <div class="p-4 mt-2 border border-round surface-border shadow-1">
+        <div class="flex flex-row gap-3 mb-2">
+          <div v-for="field in fields" :key="field.value">
+            <FormField
+              v-if="field.optIn"
+              v-slot="$field"
+              :name="field.value"
+              class="flex space-x-1"
+            >
+              <Checkbox
+                v-bind="$field"
+                :inputId="field.value"
+                :value="field.value"
+                v-model="selection"
+              />
+              <label :for="field.value">{{ field.label }}</label>
+            </FormField>
+          </div>
+        </div>
+        <FormField class="mb-4" v-slot="$field" name="details">
+          <Textarea
+            v-bind="$field"
+            class="w-full"
+            rows="5"
+            :placeholder="$t('issueReport.provideAdditionalDetails')"
+            :aria-label="$t('issueReport.provideAdditionalDetails')"
+          />
+          <Message
+            v-if="$field?.error && $field.touched"
+            severity="error"
+            size="small"
+            variant="simple"
+          >
+            {{ t('issueReport.validation.maxLength') }}
+          </Message>
+        </FormField>
+        <FormField v-slot="$field" name="contactInfo">
+          <InputText
+            v-bind="$field"
+            class="w-full"
+            :placeholder="$t('issueReport.provideEmail')"
+          />
+          <Message
+            v-if="$field?.error && $field.touched && $field.value !== ''"
+            severity="error"
+            size="small"
+            variant="simple"
+          >
+            {{ t('issueReport.validation.invalidEmail') }}
+          </Message>
+        </FormField>
+
+        <div class="flex flex-row gap-3 mt-2">
+          <div v-for="checkbox in contactCheckboxes" :key="checkbox.value">
+            <FormField
+              v-slot="$field"
+              :name="checkbox.value"
+              class="flex space-x-1"
+            >
+              <Checkbox
+                v-bind="$field"
+                :inputId="checkbox.value"
+                :value="checkbox.value"
+                v-model="contactPrefs"
+                :disabled="
+                  $form.contactInfo?.error || !$form.contactInfo?.value
+                "
+              />
+              <label :for="checkbox.value">{{ checkbox.label }}</label>
+            </FormField>
+          </div>
+        </div>
+      </div>
+    </Panel>
+  </Form>
+</template>
+
+<script setup lang="ts">
+import { Form, FormField, type FormSubmitEvent } from '@primevue/forms'
+// @ts-expect-error https://github.com/primefaces/primevue/issues/6722
+import { zodResolver } from '@primevue/forms/resolvers/zod'
+import type { CaptureContext, User } from '@sentry/core'
+import { captureMessage } from '@sentry/core'
+import cloneDeep from 'lodash/cloneDeep'
+import Button from 'primevue/button'
+import Checkbox from 'primevue/checkbox'
+import InputText from 'primevue/inputtext'
+import Message from 'primevue/message'
+import Panel from 'primevue/panel'
+import Textarea from 'primevue/textarea'
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import {
+  type IssueReportFormData,
+  type ReportField,
+  issueReportSchema
+} from '@/types/issueReportTypes'
+import type {
+  DefaultField,
+  IssueReportPanelProps
+} from '@/types/issueReportTypes'
+import { isElectron } from '@/utils/envUtil'
+
+const ISSUE_NAME = 'User reported issue'
+
+const props = defineProps<IssueReportPanelProps>()
+const { defaultFields = ['Workflow', 'Logs', 'SystemStats', 'Settings'] } =
+  props
+
+const { t } = useI18n()
+const toast = useToast()
+
+const selection = ref<string[]>([])
+const contactPrefs = ref<string[]>([])
+const submitted = ref(false)
+
+const contactCheckboxes = [
+  { label: t('issueReport.contactFollowUp'), value: 'followUp' },
+  { label: t('issueReport.notifyResolve'), value: 'notifyOnResolution' }
+]
+
+const defaultFieldsConfig: ReportField[] = [
+  {
+    label: t('issueReport.systemStats'),
+    value: 'SystemStats',
+    getData: () => api.getSystemStats(),
+    optIn: true
+  },
+  {
+    label: t('g.workflow'),
+    value: 'Workflow',
+    getData: () => cloneDeep(app.graph.asSerialisable()),
+    optIn: true
+  },
+  {
+    label: t('g.logs'),
+    value: 'Logs',
+    getData: () => api.getLogs(),
+    optIn: true
+  },
+  {
+    label: t('g.settings'),
+    value: 'Settings',
+    getData: () => api.getSettings(),
+    optIn: true
+  }
+]
+
+const fields = computed(() => [
+  ...defaultFieldsConfig.filter(({ value }) =>
+    defaultFields.includes(value as DefaultField)
+  ),
+  ...(props.extraFields ?? [])
+])
+
+const createUser = (formData: IssueReportFormData): User => ({
+  email: formData.contactInfo || undefined
+})
+
+const createExtraData = async (formData: IssueReportFormData) => {
+  const result = {}
+  const isChecked = (fieldValue: string) => formData[fieldValue]
+
+  await Promise.all(
+    fields.value
+      .filter((field) => !field.optIn || isChecked(field.value))
+      .map(async (field) => {
+        try {
+          result[field.value] = await field.getData()
+        } catch (error) {
+          console.error(`Failed to collect ${field.value}:`, error)
+          result[field.value] = { error: String(error) }
+        }
+      })
+  )
+
+  return result
+}
+
+const createCaptureContext = async (
+  formData: IssueReportFormData
+): Promise<CaptureContext> => {
+  return {
+    user: createUser(formData),
+    level: 'error',
+    tags: {
+      errorType: props.errorType,
+      followUp: formData.contactInfo ? formData.followUp : false,
+      notifyOnResolution: formData.contactInfo
+        ? formData.notifyOnResolution
+        : false,
+      isElectron: isElectron(),
+      ...props.tags
+    },
+    extra: {
+      details: formData.details,
+      ...(await createExtraData(formData))
+    }
+  }
+}
+
+const submit = async (event: FormSubmitEvent) => {
+  if (event.valid) {
+    try {
+      const captureContext = await createCaptureContext(event.values)
+      captureMessage(ISSUE_NAME, captureContext)
+      submitted.value = true
+      toast.add({
+        severity: 'success',
+        summary: t('g.reportSent'),
+        life: 3000
+      })
+    } catch (error) {
+      toast.add({
+        severity: 'error',
+        summary: t('g.error'),
+        detail: error.message,
+        life: 3000
+      })
+    }
+  }
+}
+</script>
--- a/src/components/dialog/content/error/tests/ReportIssuePanel.spec.ts
+++ b/src/components/dialog/content/error/tests/ReportIssuePanel.spec.ts
@@ -0,0 +1,315 @@
+// @ts-strict-ignore
+import { Form } from '@primevue/forms'
+import { mount } from '@vue/test-utils'
+import Checkbox from 'primevue/checkbox'
+import PrimeVue from 'primevue/config'
+import InputText from 'primevue/inputtext'
+import Textarea from 'primevue/textarea'
+import Tooltip from 'primevue/tooltip'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import enMesages from '@/locales/en/main.json'
+import { IssueReportPanelProps } from '@/types/issueReportTypes'
+
+import ReportIssuePanel from '../ReportIssuePanel.vue'
+
+const DEFAULT_FIELDS = ['Workflow', 'Logs', 'Settings', 'SystemStats']
+const CUSTOM_FIELDS = [
+  {
+    label: 'Custom Field',
+    value: 'CustomField',
+    optIn: true,
+    getData: () => 'mock data'
+  }
+]
+
+async function getSubmittedContext() {
+  const { captureMessage } = (await import('@sentry/core')) as any
+  return captureMessage.mock.calls[0][1]
+}
+
+async function submitForm(wrapper: any) {
+  await wrapper.findComponent(Form).trigger('submit')
+  return getSubmittedContext()
+}
+
+async function findAndUpdateCheckbox(
+  wrapper: any,
+  value: string,
+  checked = true
+) {
+  const checkbox = wrapper
+    .findAllComponents(Checkbox)
+    .find((c: any) => c.props('value') === value)
+  if (!checkbox) throw new Error(`Checkbox with value "${value}" not found`)
+
+  await checkbox.vm.$emit('update:modelValue', checked)
+  return checkbox
+}
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: enMesages
+  }
+})
+
+vi.mock('primevue/usetoast', () => ({
+  useToast: vi.fn(() => ({
+    add: vi.fn()
+  }))
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getLogs: vi.fn().mockResolvedValue('mock logs'),
+    getSystemStats: vi.fn().mockResolvedValue('mock stats'),
+    getSettings: vi.fn().mockResolvedValue('mock settings')
+  }
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    graph: {
+      asSerialisable: vi.fn().mockReturnValue({})
+    }
+  }
+}))
+
+vi.mock('@sentry/core', () => ({
+  captureMessage: vi.fn()
+}))
+
+vi.mock('@primevue/forms', () => ({
+  Form: {
+    name: 'Form',
+    template:
+      '<form @submit.prevent="onSubmit"><slot :values="formValues" /></form>',
+    props: ['resolver'],
+    data() {
+      return {
+        formValues: {}
+      }
+    },
+    methods: {
+      onSubmit() {
+        this.$emit('submit', {
+          valid: true,
+          values: this.formValues
+        })
+      },
+      updateFieldValue(name: string, value: any) {
+        this.formValues[name] = value
+      }
+    }
+  },
+  FormField: {
+    name: 'FormField',
+    template:
+      '<div><slot :modelValue="modelValue" @update:modelValue="updateValue" /></div>',
+    props: ['name'],
+    data() {
+      return {
+        modelValue: ''
+      }
+    },
+    methods: {
+      updateValue(value) {
+        this.modelValue = value
+        let parent = this.$parent
+        while (parent && parent.$options.name !== 'Form') {
+          parent = parent.$parent
+        }
+        if (parent) {
+          parent.updateFieldValue(this.name, value)
+        }
+      }
+    }
+  }
+}))
+
+describe('ReportIssuePanel', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  const mountComponent = (props: IssueReportPanelProps, options = {}): any => {
+    return mount(ReportIssuePanel, {
+      global: {
+        plugins: [PrimeVue, i18n],
+        directives: { tooltip: Tooltip }
+      },
+      props,
+      ...options
+    })
+  }
+
+  it('renders the panel with all required components', () => {
+    const wrapper = mountComponent({ errorType: 'Test Error' })
+    expect(wrapper.find('.p-panel').exists()).toBe(true)
+    expect(wrapper.findAllComponents(Checkbox).length).toBe(6)
+    expect(wrapper.findComponent(InputText).exists()).toBe(true)
+    expect(wrapper.findComponent(Textarea).exists()).toBe(true)
+  })
+
+  it('updates selection when checkboxes are selected', async () => {
+    const wrapper = mountComponent({
+      errorType: 'Test Error'
+    })
+
+    const checkboxes = wrapper.findAllComponents(Checkbox)
+
+    for (const field of DEFAULT_FIELDS) {
+      const checkbox = checkboxes.find(
+        (checkbox) => checkbox.props('value') === field
+      )
+      expect(checkbox).toBeDefined()
+
+      await checkbox?.vm.$emit('update:modelValue', [field])
+      expect(wrapper.vm.selection).toContain(field)
+    }
+  })
+
+  it('updates contactInfo when input is changed', async () => {
+    const wrapper = mountComponent({ errorType: 'Test Error' })
+    const input = wrapper.findComponent(InputText)
+
+    await input.vm.$emit('update:modelValue', 'test@example.com')
+    const context = await submitForm(wrapper)
+    expect(context.user.email).toBe('test@example.com')
+  })
+
+  it('updates additional details when textarea is changed', async () => {
+    const wrapper = mountComponent({ errorType: 'Test Error' })
+    const textarea = wrapper.findComponent(Textarea)
+
+    await textarea.vm.$emit('update:modelValue', 'This is a test detail.')
+    const context = await submitForm(wrapper)
+    expect(context.extra.details).toBe('This is a test detail.')
+  })
+
+  it('set contact preferences back to false if email is removed', async () => {
+    const wrapper = mountComponent({ errorType: 'Test Error' })
+    const input = wrapper.findComponent(InputText)
+
+    // Set a valid email, enabling the contact preferences to be changed
+    await input.vm.$emit('update:modelValue', 'name@example.com')
+
+    // Enable both contact preferences
+    for (const pref of ['followUp', 'notifyOnResolution']) {
+      await findAndUpdateCheckbox(wrapper, pref)
+    }
+
+    // Change the email back to empty
+    await input.vm.$emit('update:modelValue', '')
+    const context = await submitForm(wrapper)
+
+    // Check that the contact preferences are back to false automatically
+    expect(context.tags.followUp).toBe(false)
+    expect(context.tags.notifyOnResolution).toBe(false)
+  })
+
+  it('renders with overridden default fields', () => {
+    const wrapper = mountComponent({
+      errorType: 'Test Error',
+      defaultFields: ['Settings']
+    })
+
+    // Filter out the contact preferences checkboxes
+    const fieldCheckboxes = wrapper
+      .findAllComponents(Checkbox)
+      .filter(
+        (checkbox) =>
+          !['followUp', 'notifyOnResolution'].includes(checkbox.props('value'))
+      )
+    expect(fieldCheckboxes.length).toBe(1)
+    expect(fieldCheckboxes.at(0)?.props('value')).toBe('Settings')
+  })
+
+  it('renders additional fields when extraFields prop is provided', () => {
+    const wrapper = mountComponent({
+      errorType: 'Test Error',
+      extraFields: CUSTOM_FIELDS
+    })
+    const customCheckbox = wrapper
+      .findAllComponents(Checkbox)
+      .find((checkbox) => checkbox.props('value') === 'CustomField')
+    expect(customCheckbox).toBeDefined()
+  })
+
+  it('allows custom fields to be selected', async () => {
+    const wrapper = mountComponent({
+      errorType: 'Test Error',
+      extraFields: CUSTOM_FIELDS
+    })
+
+    await findAndUpdateCheckbox(wrapper, 'CustomField')
+    const context = await submitForm(wrapper)
+    expect(context.extra.CustomField).toBe('mock data')
+  })
+
+  it('does not submit unchecked fields', async () => {
+    const wrapper = mountComponent({ errorType: 'Test Error' })
+    const textarea = wrapper.findComponent(Textarea)
+
+    // Set details but don't check any field checkboxes
+    await textarea.vm.$emit(
+      'update:modelValue',
+      'Report with only text but no fields selected'
+    )
+    const context = await submitForm(wrapper)
+
+    // Verify none of the optional fields were included
+    for (const field of DEFAULT_FIELDS) {
+      expect(context.extra[field]).toBeUndefined()
+    }
+  })
+
+  it.each([
+    {
+      checkbox: 'Logs',
+      apiMethod: 'getLogs',
+      expectedKey: 'Logs',
+      mockValue: 'mock logs'
+    },
+    {
+      checkbox: 'SystemStats',
+      apiMethod: 'getSystemStats',
+      expectedKey: 'SystemStats',
+      mockValue: 'mock stats'
+    },
+    {
+      checkbox: 'Settings',
+      apiMethod: 'getSettings',
+      expectedKey: 'Settings',
+      mockValue: 'mock settings'
+    }
+  ])(
+    'submits $checkbox data when checkbox is selected',
+    async ({ checkbox, apiMethod, expectedKey, mockValue }) => {
+      const wrapper = mountComponent({ errorType: 'Test Error' })
+
+      const { api } = (await import('@/scripts/api')) as any
+      vi.spyOn(api, apiMethod).mockResolvedValue(mockValue)
+
+      await findAndUpdateCheckbox(wrapper, checkbox)
+      const context = await submitForm(wrapper)
+      expect(context.extra[expectedKey]).toBe(mockValue)
+    }
+  )
+
+  it('submits workflow when the Workflow checkbox is selected', async () => {
+    const wrapper = mountComponent({ errorType: 'Test Error' })
+
+    const { app } = (await import('@/scripts/app')) as any
+    const mockWorkflow = { nodes: [], edges: [] }
+    vi.spyOn(app.graph, 'asSerialisable').mockReturnValue(mockWorkflow)
+
+    await findAndUpdateCheckbox(wrapper, 'Workflow')
+    const context = await submitForm(wrapper)
+
+    expect(context.extra.Workflow).toEqual(mockWorkflow)
+  })
+})
--- a/src/components/dialog/content/setting/ColorPaletteMessage.vue
+++ b/src/components/dialog/content/setting/ColorPaletteMessage.vue
@@ -13,13 +13,13 @@
          optionValue="id"
        />
        <Button
-          icon="pi pi-download"
+          icon="pi pi-file-export"
          text
-          :title="$t('g.download')"
+          :title="$t('g.export')"
          @click="colorPaletteService.exportColorPalette(activePaletteId)"
        />
        <Button
-          icon="pi pi-upload"
+          icon="pi pi-file-import"
          text
          :title="$t('g.import')"
          @click="importCustomPalette"
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -13,6 +13,9 @@
        <BottomPanel />
      </template>
      <template #graph-canvas-panel>
+        <SecondRowWorkflowTabs
+          v-if="workflowTabsPosition === 'Topbar (2nd-row)'"
+        />
        <GraphCanvasMenu v-if="canvasMenuEnabled" />
      </template>
    </LiteGraphCanvasSplitterOverlay>
@@ -48,12 +51,13 @@ import NodeTooltip from '@/components/graph/NodeTooltip.vue'
 import TitleEditor from '@/components/graph/TitleEditor.vue'
 import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue'
 import SideToolbar from '@/components/sidebar/SideToolbar.vue'
+import SecondRowWorkflowTabs from '@/components/topbar/SecondRowWorkflowTabs.vue'
 import { CORE_SETTINGS } from '@/constants/coreSettings'
 import { usePragmaticDroppable } from '@/hooks/dndHooks'
 import { api } from '@/scripts/api'
 import { app as comfyApp } from '@/scripts/app'
 import { ChangeTracker } from '@/scripts/changeTracker'
-import { setStorageValue } from '@/scripts/utils'
+import { getStorageValue, setStorageValue } from '@/scripts/utils'
 import { IS_CONTROL_WIDGET, updateControlWidgetLabel } from '@/scripts/widgets'
 import { useColorPaletteService } from '@/services/colorPaletteService'
 import { useLitegraphService } from '@/services/litegraphService'
@@ -83,11 +87,37 @@ const modelToNodeStore = useModelToNodeStore()
 const betaMenuEnabled = computed(
  () => settingStore.get('Comfy.UseNewMenu') !== 'Disabled'
 )
+const workflowTabsPosition = computed(() =>
+  settingStore.get('Comfy.Workflow.WorkflowTabsPosition')
+)
 const canvasMenuEnabled = computed(() =>
  settingStore.get('Comfy.Graph.CanvasMenu')
 )
 const tooltipEnabled = computed(() => settingStore.get('Comfy.EnableTooltips'))

+const storedWorkflows = JSON.parse(
+  getStorageValue('Comfy.OpenWorkflowsPaths') || '[]'
+)
+const storedActiveIndex = JSON.parse(
+  getStorageValue('Comfy.ActiveWorkflowIndex') || '-1'
+)
+const openWorkflows = computed(() => workspaceStore?.workflow?.openWorkflows)
+const activeWorkflow = computed(() => workspaceStore?.workflow?.activeWorkflow)
+const restoreState = computed<{ paths: string[]; activeIndex: number }>(() => {
+  if (!openWorkflows.value || !activeWorkflow.value) {
+    return { paths: [], activeIndex: -1 }
+  }
+
+  const paths = openWorkflows.value
+    .filter((workflow) => workflow?.isPersisted && !workflow.isModified)
+    .map((workflow) => workflow.path)
+  const activeIndex = openWorkflows.value.findIndex(
+    (workflow) => workflow.path === activeWorkflow.value?.path
+  )
+
+  return { paths, activeIndex }
+})
+
 watchEffect(() => {
  const canvasInfoEnabled = settingStore.get('Comfy.Graph.CanvasInfo')
  if (canvasStore.canvas) {
@@ -357,6 +387,18 @@ onMounted(async () => {
    'Comfy.CustomColorPalettes'
  )

+  const isRestorable = storedWorkflows?.length > 0 && storedActiveIndex >= 0
+  if (isRestorable)
+    workflowStore.openWorkflowsInBackground({
+      left: storedWorkflows.slice(0, storedActiveIndex),
+      right: storedWorkflows.slice(storedActiveIndex)
+    })
+
+  watch(restoreState, ({ paths, activeIndex }) => {
+    setStorageValue('Comfy.OpenWorkflowsPaths', JSON.stringify(paths))
+    setStorageValue('Comfy.ActiveWorkflowIndex', JSON.stringify(activeIndex))
+  })
+
  // Start watching for locale change after the initial value is loaded.
  watch(
    () => settingStore.get('Comfy.Locale'),
--- a/src/components/graph/GraphCanvasMenu.vue
+++ b/src/components/graph/GraphCanvasMenu.vue
@@ -6,6 +6,7 @@
      severity="secondary"
      icon="pi pi-plus"
      v-tooltip.left="t('graphCanvasMenu.zoomIn')"
+      :aria-label="$t('graphCanvasMenu.zoomIn')"
      @mousedown="repeat('Comfy.Canvas.ZoomIn')"
      @mouseup="stopRepeat"
    />
@@ -13,6 +14,7 @@
      severity="secondary"
      icon="pi pi-minus"
      v-tooltip.left="t('graphCanvasMenu.zoomOut')"
+      :aria-label="$t('graphCanvasMenu.zoomOut')"
      @mousedown="repeat('Comfy.Canvas.ZoomOut')"
      @mouseup="stopRepeat"
    />
@@ -20,6 +22,7 @@
      severity="secondary"
      icon="pi pi-expand"
      v-tooltip.left="t('graphCanvasMenu.fitView')"
+      :aria-label="$t('graphCanvasMenu.fitView')"
      @click="() => commandStore.execute('Comfy.Canvas.FitView')"
    />
    <Button
@@ -30,6 +33,12 @@
            (canvasStore.canvas?.read_only ? 'panMode' : 'selectMode')
        ) + ' (Space)'
      "
+      :aria-label="
+        t(
+          'graphCanvasMenu.' +
+            (canvasStore.canvas?.read_only ? 'panMode' : 'selectMode')
+        )
+      "
      @click="() => commandStore.execute('Comfy.Canvas.ToggleLock')"
    >
      <template #icon>
@@ -43,6 +52,7 @@
      severity="secondary"
      :icon="linkHidden ? 'pi pi-eye-slash' : 'pi pi-eye'"
      v-tooltip.left="t('graphCanvasMenu.toggleLinkVisibility')"
+      :aria-label="$t('graphCanvasMenu.toggleLinkVisibility')"
      @click="() => commandStore.execute('Comfy.Canvas.ToggleLinkVisibility')"
      data-testid="toggle-link-visibility-button"
    />
--- a/src/components/install/DesktopSettingsConfiguration.vue
+++ b/src/components/install/DesktopSettingsConfiguration.vue
@@ -59,10 +59,19 @@
        </h4>
        <ul class="list-disc pl-6 space-y-1">
          <li>
-            {{ $t('install.settings.dataCollectionDialog.errorReports') }}
+            {{
+              $t('install.settings.dataCollectionDialog.collect.errorReports')
+            }}
          </li>
          <li>
-            {{ $t('install.settings.dataCollectionDialog.systemInfo') }}
+            {{ $t('install.settings.dataCollectionDialog.collect.systemInfo') }}
+          </li>
+          <li>
+            {{
+              $t(
+                'install.settings.dataCollectionDialog.collect.userJourneyEvents'
+              )
+            }}
          </li>
        </ul>

@@ -72,25 +81,43 @@
        <ul class="list-disc pl-6 space-y-1">
          <li>
            {{
-              $t('install.settings.dataCollectionDialog.personalInformation')
-            }}
-          </li>
-          <li>
-            {{ $t('install.settings.dataCollectionDialog.workflowContents') }}
-          </li>
-          <li>
-            {{
-              $t('install.settings.dataCollectionDialog.fileSystemInformation')
+              $t(
+                'install.settings.dataCollectionDialog.doNotCollect.personalInformation'
+              )
            }}
          </li>
          <li>
            {{
              $t(
-                'install.settings.dataCollectionDialog.customNodeConfigurations'
+                'install.settings.dataCollectionDialog.doNotCollect.workflowContents'
+              )
+            }}
+          </li>
+          <li>
+            {{
+              $t(
+                'install.settings.dataCollectionDialog.doNotCollect.fileSystemInformation'
+              )
+            }}
+          </li>
+          <li>
+            {{
+              $t(
+                'install.settings.dataCollectionDialog.doNotCollect.customNodeConfigurations'
              )
            }}
          </li>
        </ul>
+
+        <div class="mt-4">
+          <a
+            href="https://comfy.org/privacy"
+            target="_blank"
+            class="text-blue-400 hover:text-blue-300 underline"
+          >
+            {{ $t('install.settings.dataCollectionDialog.viewFullPolicy') }}
+          </a>
+        </div>
      </div>
    </Dialog>
  </div>
@@ -103,8 +130,8 @@ import ToggleSwitch from 'primevue/toggleswitch'
 import { ref } from 'vue'

 const showDialog = ref(false)
-const autoUpdate = defineModel('autoUpdate', { required: true })
-const allowMetrics = defineModel('allowMetrics', { required: true })
+const autoUpdate = defineModel<boolean>('autoUpdate', { required: true })
+const allowMetrics = defineModel<boolean>('allowMetrics', { required: true })

 const showMetricsInfo = () => {
  showDialog.value = true
--- a/src/components/install/GpuPicker.vue
+++ b/src/components/install/GpuPicker.vue
@@ -130,12 +130,13 @@
 </template>

 <script setup lang="ts">
+import type { TorchDeviceType } from '@comfyorg/comfyui-electron-types'
 import Tag from 'primevue/tag'
 import ToggleSwitch from 'primevue/toggleswitch'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'

-import { TorchDeviceType, electronAPI } from '@/utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'

 const { t } = useI18n()

@@ -158,8 +159,8 @@ const pickGpu = (value: typeof selected.value) => {
 }
 </script>

-<style lang="postcss">
-:root {
+<style scoped>
+.p-tag {
  --p-tag-gap: 0.5rem;
 }

--- a/src/components/maintenance/StatusTag.vue
+++ b/src/components/maintenance/StatusTag.vue
@@ -0,0 +1,40 @@
+<template>
+  <Tag :icon :severity :value />
+</template>
+
+<script setup lang="ts">
+import { PrimeIcons, type PrimeIconsOptions } from '@primevue/core/api'
+import Tag, { TagProps } from 'primevue/tag'
+import { ref, watch } from 'vue'
+
+import { t } from '@/i18n'
+
+// Properties
+const props = defineProps<{
+  error: boolean
+  refreshing?: boolean
+}>()
+
+// Bindings
+const icon = ref<string>(null)
+const severity = ref<TagProps['severity']>(null)
+const value = ref<PrimeIconsOptions[keyof PrimeIconsOptions]>(null)
+
+const updateBindings = () => {
+  if (props.refreshing) {
+    icon.value = PrimeIcons.QUESTION
+    severity.value = 'info'
+    value.value = t('maintenance.refreshing')
+  } else if (props.error) {
+    icon.value = PrimeIcons.TIMES
+    severity.value = 'danger'
+    value.value = t('g.error')
+  } else {
+    icon.value = PrimeIcons.CHECK
+    severity.value = 'success'
+    value.value = t('maintenance.OK')
+  }
+}
+
+watch(props, updateBindings, { deep: true })
+</script>
--- a/src/components/maintenance/TaskCard.vue
+++ b/src/components/maintenance/TaskCard.vue
@@ -0,0 +1,127 @@
+<template>
+  <div
+    class="task-div max-w-48 min-h-52 grid relative"
+    :class="{ 'opacity-75': isLoading }"
+  >
+    <Card
+      class="max-w-48 relative h-full overflow-hidden"
+      :class="{ 'opacity-65': runner.state !== 'error' }"
+      v-bind="(({ onClick, ...rest }) => rest)($attrs)"
+    >
+      <template #header>
+        <i
+          v-if="runner.state === 'error'"
+          class="pi pi-exclamation-triangle text-red-500 absolute m-2 top-0 -right-14 opacity-15"
+          style="font-size: 10rem"
+        />
+        <img
+          v-if="task.headerImg"
+          :src="task.headerImg"
+          class="object-contain w-full h-full opacity-25 pt-4 px-4"
+        />
+      </template>
+      <template #title>{{ task.name }}</template>
+      <template #content>{{ description }}</template>
+      <template #footer>
+        <div class="flex gap-4 mt-1">
+          <Button
+            :icon="task.button?.icon"
+            :label="task.button?.text"
+            class="w-full"
+            raised
+            icon-pos="right"
+            @click="(event) => $emit('execute', event)"
+            :loading="isExecuting"
+          />
+        </div>
+      </template>
+    </Card>
+
+    <i
+      v-if="!isLoading && runner.state === 'OK'"
+      class="task-card-ok pi pi-check"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from 'primevue/button'
+import Card from 'primevue/card'
+import { computed } from 'vue'
+
+import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
+import type { MaintenanceTask } from '@/types/desktop/maintenanceTypes'
+import { useMinLoadingDurationRef } from '@/utils/refUtil'
+
+const taskStore = useMaintenanceTaskStore()
+const runner = computed(() => taskStore.getRunner(props.task))
+
+// Properties
+const props = defineProps<{
+  task: MaintenanceTask
+}>()
+
+// Events
+defineEmits<{
+  execute: [event: MouseEvent]
+}>()
+
+// Bindings
+const description = computed(() =>
+  runner.value.state === 'error'
+    ? props.task.errorDescription ?? props.task.shortDescription
+    : props.task.shortDescription
+)
+
+// Use a minimum run time to ensure tasks "feel" like they have run
+const reactiveLoading = computed(() => runner.value.refreshing)
+const reactiveExecuting = computed(() => runner.value.executing)
+
+const isLoading = useMinLoadingDurationRef(reactiveLoading, 250)
+const isExecuting = useMinLoadingDurationRef(reactiveExecuting, 250)
+</script>
+
+<style scoped>
+.task-card-ok {
+  @apply text-green-500 absolute -right-4 -bottom-4 opacity-100 row-span-full col-span-full transition-opacity;
+
+  font-size: 4rem;
+  text-shadow: 0.25rem 0 0.5rem black;
+  z-index: 10;
+}
+
+.p-card {
+  @apply transition-opacity;
+
+  --p-card-background: var(--p-button-secondary-background);
+  opacity: 0.9;
+
+  &.opacity-65 {
+    opacity: 0.4;
+  }
+
+  &:hover {
+    opacity: 1;
+  }
+}
+
+:deep(.p-card-header) {
+  z-index: 0;
+}
+
+:deep(.p-card-body) {
+  z-index: 1;
+  flex-grow: 1;
+  justify-content: space-between;
+}
+
+.task-div {
+  > i {
+    pointer-events: none;
+  }
+
+  &:hover > i {
+    opacity: 0.2;
+  }
+}
+</style>
--- a/src/components/maintenance/TaskListItem.vue
+++ b/src/components/maintenance/TaskListItem.vue
@@ -0,0 +1,86 @@
+<template>
+  <tr
+    class="border-neutral-700 border-solid border-y"
+    :class="{
+      'opacity-50': runner.resolved,
+      'opacity-75': isLoading && runner.resolved
+    }"
+  >
+    <td class="text-center w-16">
+      <TaskListStatusIcon :state="runner.state" :loading="isLoading" />
+    </td>
+    <td>
+      <p class="inline-block">{{ task.name }}</p>
+      <Button
+        class="inline-block mx-2"
+        type="button"
+        :icon="PrimeIcons.INFO_CIRCLE"
+        severity="secondary"
+        :text="true"
+        @click="toggle"
+      />
+
+      <Popover ref="infoPopover" class="block m-1 max-w-64 min-w-32">
+        <span class="whitespace-pre-line">{{ task.description }}</span>
+      </Popover>
+    </td>
+    <td class="text-right px-4">
+      <Button
+        :icon="task.button?.icon"
+        :label="task.button?.text"
+        :severity
+        icon-pos="right"
+        @click="(event) => $emit('execute', event)"
+        :loading="isExecuting"
+      />
+    </td>
+  </tr>
+</template>
+
+<script setup lang="ts">
+import { PrimeIcons } from '@primevue/core/api'
+import Button from 'primevue/button'
+import Popover from 'primevue/popover'
+import { computed, ref } from 'vue'
+
+import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
+import type { MaintenanceTask } from '@/types/desktop/maintenanceTypes'
+import { VueSeverity } from '@/types/primeVueTypes'
+import { useMinLoadingDurationRef } from '@/utils/refUtil'
+
+import TaskListStatusIcon from './TaskListStatusIcon.vue'
+
+const taskStore = useMaintenanceTaskStore()
+const runner = computed(() => taskStore.getRunner(props.task))
+
+// Properties
+const props = defineProps<{
+  task: MaintenanceTask
+}>()
+
+// Events
+defineEmits<{
+  execute: [event: MouseEvent]
+}>()
+
+// Binding
+const severity = computed<VueSeverity>(() =>
+  runner.value.state === 'error' || runner.value.state === 'warning'
+    ? 'primary'
+    : 'secondary'
+)
+
+// Use a minimum run time to ensure tasks "feel" like they have run
+const reactiveLoading = computed(() => runner.value.refreshing)
+const reactiveExecuting = computed(() => runner.value.executing)
+
+const isLoading = useMinLoadingDurationRef(reactiveLoading, 250)
+const isExecuting = useMinLoadingDurationRef(reactiveExecuting, 250)
+
+// Popover
+const infoPopover = ref()
+
+const toggle = (event: Event) => {
+  infoPopover.value.toggle(event)
+}
+</script>
--- a/src/components/maintenance/TaskListPanel.vue
+++ b/src/components/maintenance/TaskListPanel.vue
@@ -0,0 +1,115 @@
+<template>
+  <!-- Tasks -->
+  <section class="my-4">
+    <template v-if="filter.tasks.length === 0">
+      <!-- Empty filter -->
+      <Divider />
+      <p class="text-neutral-400 w-full text-center">
+        {{ $t('maintenance.allOk') }}
+      </p>
+    </template>
+
+    <template v-else>
+      <!-- Display: List -->
+      <table
+        v-if="displayAsList === PrimeIcons.LIST"
+        class="w-full border-collapse border-hidden"
+      >
+        <TaskListItem
+          v-for="task in filter.tasks"
+          :key="task.id"
+          :task
+          @execute="(event) => confirmButton(event, task)"
+        />
+      </table>
+
+      <!-- Display: Cards -->
+      <template v-else>
+        <div class="flex flex-wrap justify-evenly gap-8 pad-y my-4">
+          <TaskCard
+            v-for="task in filter.tasks"
+            :key="task.id"
+            :task
+            @execute="(event) => confirmButton(event, task)"
+          />
+        </div>
+      </template>
+    </template>
+    <ConfirmPopup />
+  </section>
+</template>
+
+<script setup lang="ts">
+import { PrimeIcons } from '@primevue/core/api'
+import { useConfirm, useToast } from 'primevue'
+import ConfirmPopup from 'primevue/confirmpopup'
+import Divider from 'primevue/divider'
+
+import { t } from '@/i18n'
+import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
+import type {
+  MaintenanceFilter,
+  MaintenanceTask
+} from '@/types/desktop/maintenanceTypes'
+
+import TaskCard from './TaskCard.vue'
+import TaskListItem from './TaskListItem.vue'
+
+const toast = useToast()
+const confirm = useConfirm()
+const taskStore = useMaintenanceTaskStore()
+
+// Properties
+const props = defineProps<{
+  displayAsList: string
+  filter: MaintenanceFilter
+  isRefreshing: boolean
+}>()
+
+const executeTask = async (task: MaintenanceTask) => {
+  let message: string | undefined
+
+  try {
+    // Success
+    if ((await taskStore.execute(task)) === true) return
+
+    message = t('maintenance.error.taskFailed')
+  } catch (error) {
+    message = (error as Error)?.message
+  }
+
+  toast.add({
+    severity: 'error',
+    summary: t('maintenance.error.toastTitle'),
+    detail: message ?? t('maintenance.error.defaultDescription'),
+    life: 10_000
+  })
+}
+
+// Commands
+const confirmButton = async (event: MouseEvent, task: MaintenanceTask) => {
+  if (!task.requireConfirm) {
+    await executeTask(task)
+    return
+  }
+
+  confirm.require({
+    target: event.currentTarget as HTMLElement,
+    message: task.confirmText ?? t('maintenance.confirmTitle'),
+    icon: 'pi pi-exclamation-circle',
+    rejectProps: {
+      label: t('g.cancel'),
+      severity: 'secondary',
+      outlined: true
+    },
+    acceptProps: {
+      label: task.button?.text ?? t('g.save'),
+      severity: task.severity ?? 'primary'
+    },
+    // TODO: Not awaited.
+    accept: async () => {
+      await executeTask(task)
+    }
+  })
+}
+</script>
--- a/src/components/maintenance/TaskListStatusIcon.vue
+++ b/src/components/maintenance/TaskListStatusIcon.vue
@@ -0,0 +1,45 @@
+<template>
+  <ProgressSpinner v-if="!state || loading" class="h-8 w-8" />
+  <template v-else>
+    <i :class="cssClasses" v-tooltip.top="{ value: tooltip, showDelay: 250 }" />
+  </template>
+</template>
+
+<script setup lang="ts">
+import { PrimeIcons } from '@primevue/core/api'
+import ProgressSpinner from 'primevue/progressspinner'
+import { MaybeRef, computed } from 'vue'
+
+import { t } from '@/i18n'
+import { MaintenanceTaskState } from '@/stores/maintenanceTaskStore'
+
+// Properties
+const tooltip = computed(() => {
+  if (props.state === 'error') {
+    return t('g.error')
+  } else if (props.state === 'OK') {
+    return t('maintenance.OK')
+  } else {
+    return t('maintenance.Skipped')
+  }
+})
+
+const cssClasses = computed(() => {
+  let classes: string
+  if (props.state === 'error') {
+    classes = `${PrimeIcons.EXCLAMATION_TRIANGLE} text-red-500`
+  } else if (props.state === 'OK') {
+    classes = `${PrimeIcons.CHECK} text-green-500`
+  } else {
+    classes = PrimeIcons.MINUS
+  }
+
+  return `text-3xl pi ${classes}`
+})
+
+// Model
+const props = defineProps<{
+  state?: MaintenanceTaskState
+  loading?: MaybeRef<boolean>
+}>()
+</script>
--- a/src/components/primevueOverride/AutoCompletePlus.vue
+++ b/src/components/primevueOverride/AutoCompletePlus.vue
@@ -6,11 +6,27 @@ export default {
  name: 'AutoCompletePlus',
  extends: AutoComplete,
  emits: ['focused-option-changed'],
+  data() {
+    return {
+      // Flag to determine if IME is active
+      isComposing: false
+    }
+  },
  mounted() {
    if (typeof AutoComplete.mounted === 'function') {
      AutoComplete.mounted.call(this)
    }

+    // Retrieve the actual <input> element and attach IME events
+    const inputEl = this.$el.querySelector('input')
+    if (inputEl) {
+      inputEl.addEventListener('compositionstart', () => {
+        this.isComposing = true
+      })
+      inputEl.addEventListener('compositionend', () => {
+        this.isComposing = false
+      })
+    }
    // Add a watcher on the focusedOptionIndex property
    this.$watch(
      () => this.focusedOptionIndex,
@@ -19,6 +35,18 @@ export default {
        this.$emit('focused-option-changed', newVal)
      }
    )
+  },
+  methods: {
+    // Override onKeyDown to block Enter when IME is active
+    onKeyDown(event) {
+      if (event.key === 'Enter' && this.isComposing) {
+        event.preventDefault()
+        event.stopPropagation()
+        return
+      }
+
+      AutoComplete.methods.onKeyDown.call(this, event)
+    }
  }
 }
 </script>
--- a/src/components/searchbox/NodeSearchBox.vue
+++ b/src/components/searchbox/NodeSearchBox.vue
@@ -19,7 +19,13 @@
      class="filter-button z-10"
      @click="nodeSearchFilterVisible = true"
    />
-    <Dialog v-model:visible="nodeSearchFilterVisible" class="min-w-96">
+    <Dialog
+      v-model:visible="nodeSearchFilterVisible"
+      class="min-w-96"
+      dismissable-mask
+      modal
+      @hide="reFocusInput"
+    >
      <template #header>
        <h3>Add node filter condition</h3>
      </template>
@@ -140,7 +146,6 @@ onMounted(reFocusInput)
 const onAddFilter = (filterAndValue: FilterAndValue) => {
  nodeSearchFilterVisible.value = false
  emit('addFilter', filterAndValue)
-  reFocusInput()
 }
 const onRemoveFilter = (event: Event, filterAndValue: FilterAndValue) => {
  event.stopPropagation()
--- a/src/components/searchbox/NodeSearchItem.vue
+++ b/src/components/searchbox/NodeSearchItem.vue
@@ -17,7 +17,7 @@
      </div>
      <div
        v-if="showCategory"
-        class="option-category font-light text-sm text-gray-400 overflow-hidden text-ellipsis whitespace-nowrap"
+        class="option-category font-light text-sm text-muted overflow-hidden text-ellipsis whitespace-nowrap"
      >
        {{ nodeDef.category.replaceAll('/', ' > ') }}
      </div>
--- a/src/components/sidebar/SideToolbar.vue
+++ b/src/components/sidebar/SideToolbar.vue
@@ -1,6 +1,6 @@
 <template>
  <teleport :to="teleportTarget">
-    <nav :class="'side-tool-bar-container' + (isSmall ? ' small-sidebar' : '')">
+    <nav class="side-tool-bar-container" :class="{ 'small-sidebar': isSmall }">
      <SidebarIcon
        v-for="tab in tabs"
        :key="tab.id"
@@ -69,17 +69,6 @@ const getTabTooltipSuffix = (tab: SidebarTabExtension) => {
 }
 </script>

-<style>
-:root {
-  --sidebar-width: 64px;
-  --sidebar-icon-size: 1.5rem;
-}
-:root .small-sidebar {
-  --sidebar-width: 40px;
-  --sidebar-icon-size: 1rem;
-}
-</style>
-
 <style scoped>
 .side-tool-bar-container {
  display: flex;
@@ -94,6 +83,14 @@ const getTabTooltipSuffix = (tab: SidebarTabExtension) => {
  background-color: var(--comfy-menu-secondary-bg);
  color: var(--fg-color);
  box-shadow: var(--bar-shadow);
+
+  --sidebar-width: 4rem;
+  --sidebar-icon-size: 1.5rem;
+}
+
+.side-tool-bar-container.small-sidebar {
+  --sidebar-width: 2.5rem;
+  --sidebar-icon-size: 1rem;
 }

 .side-tool-bar-end {
--- a/src/components/sidebar/SidebarThemeToggleIcon.vue
+++ b/src/components/sidebar/SidebarThemeToggleIcon.vue
@@ -11,14 +11,15 @@
 import { computed } from 'vue'

 import { useCommandStore } from '@/stores/commandStore'
-import { useSettingStore } from '@/stores/settingStore'
+import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'

 import SidebarIcon from './SidebarIcon.vue'

-const settingStore = useSettingStore()
-const currentTheme = computed(() => settingStore.get('Comfy.ColorPalette'))
+const colorPaletteStore = useColorPaletteStore()
 const icon = computed(() =>
-  currentTheme.value !== 'light' ? 'pi pi-moon' : 'pi pi-sun'
+  colorPaletteStore.completedActivePalette.light_theme
+    ? 'pi pi-sun'
+    : 'pi pi-moon'
 )

 const commandStore = useCommandStore()
--- a/src/components/sidebar/tabs/QueueSidebarTab.vue
+++ b/src/components/sidebar/tabs/QueueSidebarTab.vue
@@ -99,7 +99,7 @@ import type { MenuItem } from 'primevue/menuitem'
 import ProgressSpinner from 'primevue/progressspinner'
 import { useConfirm } from 'primevue/useconfirm'
 import { useToast } from 'primevue/usetoast'
-import { computed, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
+import { computed, ref, shallowRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'

 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
@@ -194,10 +194,6 @@ const confirmRemoveAll = (event: Event) => {
  })
 }

-const onStatus = async () => {
-  await queueStore.update()
-}
-
 const menu = ref(null)
 const menuTargetTask = ref<TaskItemImpl | null>(null)
 const menuTargetNode = ref<ComfyNode | null>(null)
@@ -267,13 +263,4 @@ watch(allTasks, () => {
  const newIndex = galleryActiveIndex.value + lengthChange
  galleryActiveIndex.value = Math.max(0, newIndex)
 })
-
-onMounted(() => {
-  api.addEventListener('status', onStatus)
-  queueStore.update()
-})
-
-onUnmounted(() => {
-  api.removeEventListener('status', onStatus)
-})
 </script>
--- a/src/components/sidebar/tabs/SidebarTabTemplate.vue
+++ b/src/components/sidebar/tabs/SidebarTabTemplate.vue
@@ -4,11 +4,11 @@
    :class="props.class"
  >
    <div class="comfy-vue-side-bar-header">
-      <Toolbar
-        class="flex-shrink-0 border-x-0 border-t-0 rounded-none px-2 py-1 min-h-8"
-      >
+      <Toolbar class="border-x-0 border-t-0 rounded-none px-2 py-1 min-h-8">
        <template #start>
-          <span class="text-sm">{{ props.title.toUpperCase() }}</span>
+          <span class="text-xs 2xl:text-sm truncate" :title="props.title">
+            {{ props.title.toUpperCase() }}
+          </span>
        </template>
        <template #end>
          <slot name="tool-buttons"></slot>
@@ -37,4 +37,8 @@ const props = defineProps<{
 :deep(.p-toolbar-end) .p-button {
  @apply py-1 2xl:py-2;
 }
+
+:deep(.p-toolbar-start) {
+  @apply min-w-0 flex-1 overflow-hidden;
+}
 </style>
--- a/src/components/sidebar/tabs/queue/ResultGallery.vue
+++ b/src/components/sidebar/tabs/queue/ResultGallery.vue
@@ -24,6 +24,7 @@
        :key="item.url"
        :src="item.url"
        :contain="false"
+        :alt="item.filename"
        class="galleria-image"
        v-if="item.isImage"
      />
--- a/src/components/sidebar/tabs/queue/ResultItem.vue
+++ b/src/components/sidebar/tabs/queue/ResultItem.vue
@@ -5,6 +5,7 @@
      :src="result.url"
      class="task-output-image"
      :contain="imageFit === 'contain'"
+      :alt="result.filename"
    />
    <ResultVideo v-else-if="result.isVideo" :result="result" />
    <div v-else class="task-result-preview">
--- a/src/components/templates/TemplateWorkflowCard.vue
+++ b/src/components/templates/TemplateWorkflowCard.vue
@@ -3,7 +3,7 @@
    <template #header>
      <div class="flex items-center justify-center">
        <div
-          class="relative overflow-hidden rounded-lg cursor-pointer w-64 h-64"
+          class="relative overflow-hidden rounded-t-lg cursor-pointer w-64 h-64"
        >
          <img
            v-if="!imageError"
@@ -13,7 +13,7 @@
                : `api/workflow_templates/${props.moduleName}/${props.workflowName}.jpg`
            "
            @error="imageError = true"
-            class="w-64 h-64 rounded-lg object-cover thumbnail"
+            class="w-64 h-64 rounded-t-lg object-cover thumbnail"
          />
          <div v-else class="w-64 h-64 content-center text-center">
            <i class="pi pi-file" style="font-size: 4rem"></i>
--- a/src/components/templates/TemplateWorkflowsContent.vue
+++ b/src/components/templates/TemplateWorkflowsContent.vue
@@ -24,7 +24,7 @@
      :key="selectedTab.moduleName"
    >
      <template #item="slotProps">
-        <div @click="loadWorkflow(slotProps.data)">
+        <div @click="loadWorkflow(slotProps.data)" class="p-2">
          <TemplateWorkflowCard
            :moduleName="selectedTab.moduleName"
            :workflowName="slotProps.data"
@@ -112,7 +112,7 @@ const loadWorkflow = async (id: string) => {
  let json
  if (selectedTab.value.moduleName === 'default') {
    // Default templates provided by frontend are served on this separate endpoint
-    json = await fetch(api.fileURL(`templates/${id}.json`)).then((r) =>
+    json = await fetch(api.fileURL(`/templates/${id}.json`)).then((r) =>
      r.json()
    )
  } else {
--- a/src/components/topbar/BottomPanelToggleButton.vue
+++ b/src/components/topbar/BottomPanelToggleButton.vue
@@ -3,6 +3,7 @@
    v-show="bottomPanelStore.bottomPanelTabs.length > 0"
    severity="secondary"
    text
+    :aria-label="$t('menu.toggleBottomPanel')"
    @click="bottomPanelStore.toggleBottomPanel"
    v-tooltip="{ value: $t('menu.toggleBottomPanel'), showDelay: 300 }"
  >
--- a/src/components/topbar/CommandMenubar.vue
+++ b/src/components/topbar/CommandMenubar.vue
@@ -19,7 +19,7 @@
        <span class="p-menubar-item-label">{{ item.label }}</span>
        <span
          v-if="item?.comfyCommand?.keybinding"
-          class="ml-auto border border-surface rounded text-muted text-xs p-1 keybinding-tag"
+          class="ml-auto border border-surface rounded text-muted text-xs text-nowrap p-1 keybinding-tag"
        >
          {{ item.comfyCommand.keybinding.combo.toString() }}
        </span>
--- a/src/components/topbar/SecondRowWorkflowTabs.vue
+++ b/src/components/topbar/SecondRowWorkflowTabs.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="absolute top-0 left-0 w-auto max-w-full pointer-events-auto">
+    <WorkflowTabs />
+  </div>
+</template>
+
+<script setup lang="ts">
+import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
+</script>
+
+<style scoped>
+:deep(.workflow-tabs) {
+  background-color: var(--comfy-menu-bg);
+}
+</style>
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -3,34 +3,44 @@
    <div
      ref="topMenuRef"
      class="comfyui-menu flex items-center"
-      v-show="betaMenuEnabled && !workspaceState.focusMode"
+      v-show="showTopMenu"
      :class="{ dropzone: isDropZone, 'dropzone-active': isDroppable }"
    >
-      <h1 class="comfyui-logo mx-2">ComfyUI</h1>
+      <h1 class="comfyui-logo mx-2 app-drag">ComfyUI</h1>
      <CommandMenubar />
-      <Divider layout="vertical" class="mx-2" />
-      <div class="flex-grow">
+      <div class="flex-grow min-w-0 app-drag h-full">
        <WorkflowTabs v-if="workflowTabsPosition === 'Topbar'" />
      </div>
      <div class="comfyui-menu-right" ref="menuRight"></div>
      <Actionbar />
-      <BottomPanelToggleButton />
+      <BottomPanelToggleButton class="flex-shrink-0" />
      <Button
+        class="flex-shrink-0"
        icon="pi pi-bars"
        severity="secondary"
        text
        v-tooltip="{ value: $t('menu.hideMenu'), showDelay: 300 }"
+        :aria-label="$t('menu.hideMenu')"
        @click="workspaceState.focusMode = true"
        @contextmenu="showNativeMenu"
      />
+      <div
+        v-show="menuSetting !== 'Bottom'"
+        class="window-actions-spacer flex-shrink-0"
+      />
    </div>
  </teleport>
+
+  <!-- Virtual top menu for native window (drag handle) -->
+  <div
+    v-show="isNativeWindow && !showTopMenu"
+    class="fixed top-0 left-0 app-drag w-full h-[var(--comfy-topbar-height)]"
+  />
 </template>

 <script setup lang="ts">
 import { useEventBus } from '@vueuse/core'
 import Button from 'primevue/button'
-import Divider from 'primevue/divider'
 import { computed, onMounted, provide, ref } from 'vue'

 import Actionbar from '@/components/actionbar/ComfyActionbar.vue'
@@ -40,21 +50,27 @@ import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import { app } from '@/scripts/app'
 import { useSettingStore } from '@/stores/settingStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { showNativeMenu } from '@/utils/envUtil'
+import { electronAPI, isElectron, showNativeMenu } from '@/utils/envUtil'

 const workspaceState = useWorkspaceStore()
 const settingStore = useSettingStore()
 const workflowTabsPosition = computed(() =>
  settingStore.get('Comfy.Workflow.WorkflowTabsPosition')
 )
-const betaMenuEnabled = computed(
-  () => settingStore.get('Comfy.UseNewMenu') !== 'Disabled'
-)
+const menuSetting = computed(() => settingStore.get('Comfy.UseNewMenu'))
+const betaMenuEnabled = computed(() => menuSetting.value !== 'Disabled')
 const teleportTarget = computed(() =>
  settingStore.get('Comfy.UseNewMenu') === 'Top'
    ? '.comfyui-body-top'
    : '.comfyui-body-bottom'
 )
+const isNativeWindow = computed(
+  () =>
+    isElectron() && settingStore.get('Comfy-Desktop.WindowStyle') === 'custom'
+)
+const showTopMenu = computed(
+  () => betaMenuEnabled.value && !workspaceState.focusMode
+)

 const menuRight = ref<HTMLDivElement | null>(null)
 // Menu-right holds legacy topbar elements attached by custom scripts
@@ -75,11 +91,20 @@ eventBus.on((event: string, payload: any) => {
    isDroppable.value = payload.isOverlapping && payload.isDragging
  }
 })
+
+onMounted(() => {
+  if (isElectron()) {
+    electronAPI().changeTheme({
+      height: topMenuRef.value.getBoundingClientRect().height
+    })
+  }
+})
 </script>

 <style scoped>
 .comfyui-menu {
  width: 100vw;
+  height: var(--comfy-topbar-height);
  background: var(--comfy-menu-bg);
  color: var(--fg-color);
  box-shadow: var(--bar-shadow);
@@ -89,7 +114,6 @@ eventBus.on((event: string, payload: any) => {
  z-index: 1000;
  order: 0;
  grid-column: 1/-1;
-  max-height: 90vh;
 }

 .comfyui-menu.dropzone {
--- a/src/components/topbar/WorkflowTabs.vue
+++ b/src/components/topbar/WorkflowTabs.vue
@@ -1,34 +1,48 @@
 <template>
-  <SelectButton
-    class="workflow-tabs bg-transparent inline"
-    :class="props.class"
-    :modelValue="selectedWorkflow"
-    @update:modelValue="onWorkflowChange"
-    :options="options"
-    optionLabel="label"
-    dataKey="value"
-  >
-    <template #option="{ option }">
-      <WorkflowTab
-        @contextmenu="showContextMenu($event, option)"
-        @click.middle="onCloseWorkflow(option)"
-        :workflow-option="option"
-      />
-    </template>
-  </SelectButton>
-  <Button
-    class="new-blank-workflow-button"
-    icon="pi pi-plus"
-    text
-    severity="secondary"
-    @click="() => commandStore.execute('Comfy.NewBlankWorkflow')"
-  />
-  <ContextMenu ref="menu" :model="contextMenuItems" />
+  <div class="workflow-tabs-container flex flex-row max-w-full h-full">
+    <ScrollPanel
+      class="overflow-hidden no-drag"
+      :pt:content="{
+        class: 'p-0 w-full',
+        onwheel: handleWheel
+      }"
+      pt:barX="h-1"
+    >
+      <SelectButton
+        class="workflow-tabs bg-transparent"
+        :class="props.class"
+        :modelValue="selectedWorkflow"
+        @update:modelValue="onWorkflowChange"
+        :options="options"
+        optionLabel="label"
+        dataKey="value"
+      >
+        <template #option="{ option }">
+          <WorkflowTab
+            @contextmenu="showContextMenu($event, option)"
+            @click.middle="onCloseWorkflow(option)"
+            :workflow-option="option"
+          />
+        </template>
+      </SelectButton>
+    </ScrollPanel>
+    <Button
+      v-tooltip="{ value: $t('sideToolbar.newBlankWorkflow'), showDelay: 300 }"
+      class="new-blank-workflow-button flex-shrink-0 no-drag"
+      icon="pi pi-plus"
+      text
+      severity="secondary"
+      :aria-label="$t('sideToolbar.newBlankWorkflow')"
+      @click="() => commandStore.execute('Comfy.NewBlankWorkflow')"
+    />
+    <ContextMenu ref="menu" :model="contextMenuItems" />
+  </div>
 </template>

 <script setup lang="ts">
 import Button from 'primevue/button'
 import ContextMenu from 'primevue/contextmenu'
+import ScrollPanel from 'primevue/scrollpanel'
 import SelectButton from 'primevue/selectbutton'
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
@@ -36,7 +50,7 @@ import { useI18n } from 'vue-i18n'
 import WorkflowTab from '@/components/topbar/WorkflowTab.vue'
 import { useWorkflowService } from '@/services/workflowService'
 import { useCommandStore } from '@/stores/commandStore'
-import { ComfyWorkflow } from '@/stores/workflowStore'
+import { ComfyWorkflow, useWorkflowBookmarkStore } from '@/stores/workflowStore'
 import { useWorkflowStore } from '@/stores/workflowStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'

@@ -53,6 +67,7 @@ const { t } = useI18n()
 const workspaceStore = useWorkspaceStore()
 const workflowStore = useWorkflowStore()
 const workflowService = useWorkflowService()
+const workflowBookmarkStore = useWorkflowBookmarkStore()
 const rightClickedTab = ref<WorkflowOption>(null)
 const menu = ref()

@@ -140,26 +155,56 @@ const contextMenuItems = computed(() => {
          ...options.value.slice(0, index)
        ]),
      disabled: options.value.length <= 1
+    },
+    {
+      label: workflowBookmarkStore.isBookmarked(tab.workflow.path)
+        ? t('tabMenu.removeFromBookmarks')
+        : t('tabMenu.addToBookmarks'),
+      command: () => workflowBookmarkStore.toggleBookmarked(tab.workflow.path),
+      disabled: tab.workflow.isTemporary
    }
  ]
 })
 const commandStore = useCommandStore()
+
+// Horizontal scroll on wheel
+const handleWheel = (event: WheelEvent) => {
+  const scrollElement = event.currentTarget as HTMLElement
+  const scrollAmount = event.deltaX || event.deltaY
+  scrollElement.scroll({
+    left: scrollElement.scrollLeft + scrollAmount
+  })
+}
 </script>

 <style scoped>
+:deep(.p-togglebutton) {
+  @apply p-0 bg-transparent rounded-none flex-shrink-0 relative border-0 border-r border-solid;
+  border-right-color: var(--border-color);
+}
+
 :deep(.p-togglebutton::before) {
  @apply hidden;
 }

-:deep(.p-togglebutton) {
-  @apply p-0 bg-transparent rounded-none flex-shrink-0 relative;
+:deep(.p-togglebutton:first-child) {
+  @apply border-l border-solid;
+  border-left-color: var(--border-color);
+}
+
+:deep(.p-togglebutton:not(:first-child)) {
+  @apply border-l-0;
 }

 :deep(.p-togglebutton.p-togglebutton-checked) {
-  @apply border-b-2;
+  @apply border-b border-solid h-full;
  border-bottom-color: var(--p-button-text-primary-color);
 }

+:deep(.p-togglebutton:not(.p-togglebutton-checked)) {
+  @apply opacity-75;
+}
+
 :deep(.p-togglebutton-checked) .close-button,
 :deep(.p-togglebutton:hover) .close-button {
  @apply visible;
@@ -172,4 +217,18 @@ const commandStore = useCommandStore()
 :deep(.p-togglebutton) .close-button {
  @apply invisible;
 }
+
+:deep(.p-scrollpanel-content) {
+  @apply h-full;
+}
+
+/* Scrollbar half opacity to avoid blocking the active tab bottom border */
+:deep(.p-scrollpanel:hover .p-scrollpanel-bar),
+:deep(.p-scrollpanel:active .p-scrollpanel-bar) {
+  @apply opacity-50;
+}
+
+:deep(.p-selectbutton) {
+  @apply rounded-none h-full;
+}
 </style>
--- a/src/constants/coreColorPalettes.ts
+++ b/src/constants/coreColorPalettes.ts
@@ -4,7 +4,7 @@ import github from '@/assets/palettes/github.json'
 import light from '@/assets/palettes/light.json'
 import nord from '@/assets/palettes/nord.json'
 import solarized from '@/assets/palettes/solarized.json'
-import type { ColorPalettes } from '@/types/colorPaletteTypes'
+import type { ColorPalettes, CompletedPalette } from '@/types/colorPaletteTypes'

 export const CORE_COLOR_PALETTES: ColorPalettes = {
  dark,
@@ -15,4 +15,6 @@ export const CORE_COLOR_PALETTES: ColorPalettes = {
  github
 } as const

-export const DEFAULT_COLOR_PALETTE = dark
+export const DEFAULT_COLOR_PALETTE: CompletedPalette = dark
+export const DEFAULT_DARK_COLOR_PALETTE: CompletedPalette = dark
+export const DEFAULT_LIGHT_COLOR_PALETTE: CompletedPalette = light
--- a/src/constants/coreKeybindings.ts
+++ b/src/constants/coreKeybindings.ts
@@ -95,7 +95,7 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
      alt: true
    },
    commandId: 'Comfy.Canvas.ZoomIn',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  {
    combo: {
@@ -104,7 +104,7 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
      shift: true
    },
    commandId: 'Comfy.Canvas.ZoomIn',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  // For number pad '+'
  {
@@ -113,7 +113,7 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
      alt: true
    },
    commandId: 'Comfy.Canvas.ZoomIn',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  {
    combo: {
@@ -121,21 +121,21 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
      alt: true
    },
    commandId: 'Comfy.Canvas.ZoomOut',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  {
    combo: {
      key: '.'
    },
    commandId: 'Comfy.Canvas.FitView',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  {
    combo: {
      key: 'p'
    },
    commandId: 'Comfy.Canvas.ToggleSelected.Pin',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  {
    combo: {
@@ -143,7 +143,7 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
      alt: true
    },
    commandId: 'Comfy.Canvas.ToggleSelectedNodes.Collapse',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  {
    combo: {
@@ -151,7 +151,7 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
      ctrl: true
    },
    commandId: 'Comfy.Canvas.ToggleSelectedNodes.Bypass',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  {
    combo: {
@@ -159,7 +159,7 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
      ctrl: true
    },
    commandId: 'Comfy.Canvas.ToggleSelectedNodes.Mute',
-    targetSelector: '#graph-canvas'
+    targetElementId: 'graph-canvas'
  },
  {
    combo: {
--- a/src/constants/coreMenuCommands.ts
+++ b/src/constants/coreMenuCommands.ts
@@ -19,8 +19,9 @@ export const CORE_MENU_COMMANDS = [
    [
      'Comfy.Help.OpenComfyUIIssues',
      'Comfy.Help.OpenComfyUIDocs',
-      'Comfy.Help.OpenComfyOrgDiscord'
+      'Comfy.Help.OpenComfyOrgDiscord',
+      'Comfy.Help.OpenComfyUIForum'
    ]
  ],
-  [['Help'], ['Comfy.Help.AboutComfyUI']]
+  [['Help'], ['Comfy.Help.AboutComfyUI', 'Comfy.Feedback']]
 ]
--- a/src/constants/coreSettings.ts
+++ b/src/constants/coreSettings.ts
@@ -85,7 +85,8 @@ export const CORE_SETTINGS: SettingParams[] = [
    name: 'Sidebar size',
    type: 'combo',
    options: ['normal', 'small'],
-    defaultValue: () => (window.innerWidth < 1600 ? 'small' : 'normal')
+    // Default to small if the window is less than 1536px(2xl) wide.
+    defaultValue: () => (window.innerWidth < 1536 ? 'small' : 'normal')
  },
  {
    id: 'Comfy.TextareaWidget.FontSize',
@@ -229,7 +230,8 @@ export const CORE_SETTINGS: SettingParams[] = [
    id: 'Comfy.Window.UnloadConfirmation',
    name: 'Show confirmation when closing window',
    type: 'boolean',
-    defaultValue: false
+    defaultValue: true,
+    versionModified: '1.7.12'
  },
  {
    id: 'Comfy.TreeExplorer.ItemPadding',
@@ -399,8 +401,10 @@ export const CORE_SETTINGS: SettingParams[] = [
    id: 'Comfy.Workflow.WorkflowTabsPosition',
    name: 'Opened workflows position',
    type: 'combo',
-    options: ['Sidebar', 'Topbar'],
-    defaultValue: 'Topbar'
+    options: ['Sidebar', 'Topbar', 'Topbar (2nd-row)'],
+    // Default to topbar (2nd-row) if the window is less than 1536px(2xl) wide.
+    defaultValue: () =>
+      window.innerWidth < 1536 ? 'Topbar (2nd-row)' : 'Topbar'
  },
  {
    id: 'Comfy.Graph.CanvasMenu',
@@ -423,7 +427,16 @@ export const CORE_SETTINGS: SettingParams[] = [
    name: 'Keybindings unset by the user',
    type: 'hidden',
    defaultValue: [] as Keybinding[],
-    versionAdded: '1.3.7'
+    versionAdded: '1.3.7',
+    versionModified: '1.7.3',
+    migrateDeprecatedValue: (value: any[]) => {
+      return value.map((keybinding) => {
+        if (keybinding['targetSelector'] === '#graph-canvas') {
+          keybinding['targetElementId'] = 'graph-canvas'
+        }
+        return keybinding
+      })
+    }
  },
  {
    id: 'Comfy.Keybinding.NewBindings',
--- a/src/constants/desktopMaintenanceTasks.ts
+++ b/src/constants/desktopMaintenanceTasks.ts
@@ -0,0 +1,144 @@
+import { PrimeIcons } from '@primevue/core'
+
+import type { MaintenanceTask } from '@/types/desktop/maintenanceTypes'
+import { electronAPI } from '@/utils/envUtil'
+
+const electron = electronAPI()
+
+const openUrl = (url: string) => {
+  window.open(url, '_blank')
+  return true
+}
+
+export const DESKTOP_MAINTENANCE_TASKS: Readonly<MaintenanceTask>[] = [
+  {
+    id: 'basePath',
+    execute: async () => await electron.setBasePath(),
+    name: 'Base path',
+    shortDescription: 'Change the application base path.',
+    errorDescription: 'Unable to open the base path.  Please select a new one.',
+    description:
+      'The base path is the default location where ComfyUI stores data. It is the location fo the python environment, and may also contain models, custom nodes, and other extensions.',
+    isInstallationFix: true,
+    button: {
+      icon: PrimeIcons.QUESTION,
+      text: 'Select'
+    }
+  },
+  {
+    id: 'git',
+    headerImg: '/assets/images/Git-Logo-White.svg',
+    execute: () => openUrl('https://git-scm.com/downloads/'),
+    name: 'Download git',
+    shortDescription: 'Open the git download page.',
+    description:
+      'Git is required to download and manage custom nodes and other extensions. This fixer simply opens the download page in your browser. You must download and install git manually.',
+    button: {
+      icon: PrimeIcons.EXTERNAL_LINK,
+      text: 'Download'
+    }
+  },
+  {
+    id: 'vcRedist',
+    execute: () => openUrl('https://aka.ms/vs/17/release/vc_redist.x64.exe'),
+    name: 'Download VC++ Redist',
+    shortDescription: 'Download the latest VC++ Redistributable runtime.',
+    description:
+      'The Visual C++ runtime libraries are required to run ComfyUI. You will need to download and install this file.',
+    button: {
+      icon: PrimeIcons.EXTERNAL_LINK,
+      text: 'Download'
+    }
+  },
+  {
+    id: 'reinstall',
+    severity: 'danger',
+    requireConfirm: true,
+    execute: async () => {
+      await electron.reinstall()
+      return true
+    },
+    name: 'Reinstall ComfyUI',
+    shortDescription:
+      'Deletes the desktop app config and load the welcome screen.',
+    description:
+      'Delete the desktop app config, restart the app, and load the installation screen.',
+    confirmText: 'Delete all saved config and reinstall?',
+    button: {
+      icon: PrimeIcons.EXCLAMATION_TRIANGLE,
+      text: 'Reinstall'
+    }
+  },
+  {
+    id: 'pythonPackages',
+    requireConfirm: true,
+    execute: async () => {
+      try {
+        await electron.uv.installRequirements()
+        return true
+      } catch (error) {
+        return false
+      }
+    },
+    name: 'Install python packages',
+    shortDescription:
+      'Installs the base python packages required to run ComfyUI.',
+    errorDescription:
+      'Python packages that are required to run ComfyUI are not installed.',
+    description:
+      'This will install the python packages required to run ComfyUI. This includes torch, torchvision, and other dependencies.',
+    usesTerminal: true,
+    isInstallationFix: true,
+    button: {
+      icon: PrimeIcons.DOWNLOAD,
+      text: 'Install'
+    }
+  },
+  {
+    id: 'uv',
+    execute: () =>
+      openUrl('https://docs.astral.sh/uv/getting-started/installation/'),
+    name: 'uv executable',
+    shortDescription: 'uv installs and maintains the python environment.',
+    description:
+      "This will open the download page for Astral's uv tool. uv is used to install python and manage python packages.",
+    button: {
+      icon: 'pi pi-asterisk',
+      text: 'Download'
+    }
+  },
+  {
+    id: 'uvCache',
+    severity: 'danger',
+    requireConfirm: true,
+    execute: async () => await electron.uv.clearCache(),
+    name: 'uv cache',
+    shortDescription: 'Remove the Astral uv cache of python packages.',
+    description:
+      'This will remove the uv cache directory and its contents. All downloaded python packages will need to be downloaded again.',
+    confirmText: 'Delete uv cache of python packages?',
+    isInstallationFix: true,
+    button: {
+      icon: PrimeIcons.TRASH,
+      text: 'Clear cache'
+    }
+  },
+  {
+    id: 'venvDirectory',
+    severity: 'danger',
+    requireConfirm: true,
+    execute: async () => await electron.uv.resetVenv(),
+    name: 'Reset virtual environment',
+    shortDescription:
+      'Remove and recreate the .venv directory. This removes all python packages.',
+    description:
+      'The python environment is where ComfyUI installs python and python packages. It is used to run the ComfyUI server.',
+    confirmText: 'Delete the .venv directory?',
+    usesTerminal: true,
+    isInstallationFix: true,
+    button: {
+      icon: PrimeIcons.FOLDER,
+      text: 'Recreate'
+    }
+  }
+] as const
--- a/src/extensions/core/electronAdapter.ts
+++ b/src/extensions/core/electronAdapter.ts
@@ -1,6 +1,8 @@
 import { t } from '@/i18n'
 import { app } from '@/scripts/app'
 import { useDialogService } from '@/services/dialogService'
+import { useSettingStore } from '@/stores/settingStore'
+import { useWorkflowStore } from '@/stores/workflowStore'
 import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'

 ;(async () => {
@@ -8,6 +10,7 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'

  const electronAPI = getElectronAPI()
  const desktopAppVersion = await electronAPI.getElectronVersion()
+  const workflowStore = useWorkflowStore()

  const onChangeRestartApp = (newValue: string, oldValue: string) => {
    // Add a delay to allow changes to take effect before restarting.
@@ -30,10 +33,28 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
      {
        id: 'Comfy-Desktop.SendStatistics',
        category: ['Comfy-Desktop', 'General', 'Send Statistics'],
-        name: 'Send anonymous crash reports',
+        name: 'Send anonymous usage metrics',
        type: 'boolean',
        defaultValue: true,
        onChange: onChangeRestartApp
+      },
+      {
+        id: 'Comfy-Desktop.WindowStyle',
+        category: ['Comfy-Desktop', 'General', 'Window Style'],
+        name: 'Window Style',
+        tooltip: "Custom: Replace the system title bar with ComfyUI's Top menu",
+        type: 'combo',
+        experimental: true,
+        defaultValue: 'default',
+        options: ['default', 'custom'],
+        onChange: (
+          newValue: 'default' | 'custom',
+          oldValue?: 'default' | 'custom'
+        ) => {
+          if (!oldValue) return
+
+          electronAPI.Config.setWindowStyle(newValue)
+        }
      }
    ],

@@ -94,14 +115,6 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
          electronAPI.openDevTools()
        }
      },
-      {
-        id: 'Comfy-Desktop.OpenFeedbackPage',
-        label: 'Feedback',
-        icon: 'pi pi-envelope',
-        function() {
-          window.open('https://forum.comfy.org/c/v1-feedback/', '_blank')
-        }
-      },
      {
        id: 'Comfy-Desktop.OpenUserGuide',
        label: 'Desktop User Guide',
@@ -131,16 +144,32 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
        function() {
          electronAPI.restartApp()
        }
+      },
+      {
+        id: 'Comfy-Desktop.Quit',
+        label: 'Quit',
+        icon: 'pi pi-sign-out',
+        async function() {
+          // Confirm if unsaved workflows are open
+          if (workflowStore.modifiedWorkflows.length > 0) {
+            const confirmed = await useDialogService().confirm({
+              message: t('desktopMenu.confirmQuit'),
+              title: t('desktopMenu.quit'),
+              type: 'default'
+            })
+
+            if (!confirmed) return
+          }
+
+          electronAPI.quit()
+        }
      }
    ],

    menuCommands: [
      {
        path: ['Help'],
-        commands: [
-          'Comfy-Desktop.OpenUserGuide',
-          'Comfy-Desktop.OpenFeedbackPage'
-        ]
+        commands: ['Comfy-Desktop.OpenUserGuide']
      },
      {
        path: ['Help'],
@@ -163,6 +192,16 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
      }
    ],

+    keybindings: [
+      {
+        commandId: 'Workspace.CloseWorkflow',
+        combo: {
+          key: 'w',
+          ctrl: true
+        }
+      }
+    ],
+
    aboutPageBadges: [
      {
        label: 'ComfyUI_desktop v' + desktopAppVersion,
--- a/src/extensions/core/index.ts
+++ b/src/extensions/core/index.ts
@@ -6,7 +6,6 @@ import './electronAdapter'
 import './groupNode'
 import './groupNodeManage'
 import './groupOptions'
-import './invertMenuScrolling'
 import './load3d'
 import './maskeditor'
 import './nodeTemplates'
--- a/src/extensions/core/invertMenuScrolling.ts
+++ b/src/extensions/core/invertMenuScrolling.ts
@@ -1,41 +0,0 @@
-// @ts-strict-ignore
-import { LiteGraph } from '@comfyorg/litegraph'
-
-import { app } from '../../scripts/app'
-
-// Inverts the scrolling of context menus
-
-const id = 'Comfy.InvertMenuScrolling'
-app.registerExtension({
-  name: id,
-  init() {
-    const ctxMenu = LiteGraph.ContextMenu
-    const replace = () => {
-      // @ts-expect-error
-      LiteGraph.ContextMenu = function (values, options) {
-        options = options || {}
-        if (options.scroll_speed) {
-          options.scroll_speed *= -1
-        } else {
-          options.scroll_speed = -0.1
-        }
-        return ctxMenu.call(this, values, options)
-      }
-      LiteGraph.ContextMenu.prototype = ctxMenu.prototype
-    }
-    app.ui.settings.addSetting({
-      id,
-      category: ['LiteGraph', 'Menu', 'InvertMenuScrolling'],
-      name: 'Invert Context Menu Scrolling',
-      type: 'boolean',
-      defaultValue: false,
-      onChange(value) {
-        if (value) {
-          replace()
-        } else {
-          LiteGraph.ContextMenu = ctxMenu
-        }
-      }
-    })
-  }
-})
--- a/src/extensions/core/load3d.ts
+++ b/src/extensions/core/load3d.ts
@@ -2,6 +2,7 @@
 import { IWidget } from '@comfyorg/litegraph'
 import * as THREE from 'three'
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+import { ViewHelper } from 'three/examples/jsm/helpers/ViewHelper'
 import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader'
 import { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
 import { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader'
@@ -115,8 +116,7 @@ class Load3d {
  stlLoader: STLLoader
  currentModel: THREE.Object3D | null = null
  originalModel: THREE.Object3D | THREE.BufferGeometry | GLTF | null = null
-  node: any
-  private animationFrameId: number | null = null
+  animationFrameId: number | null = null
  gridHelper: THREE.GridHelper
  lights: THREE.Light[] = []
  clock: THREE.Clock
@@ -131,6 +131,10 @@ class Load3d {
  currentUpDirection: 'original' | '-x' | '+x' | '-y' | '+y' | '-z' | '+z' =
    'original'
  originalRotation: THREE.Euler | null = null
+  viewHelper: ViewHelper
+  viewHelperContainer: HTMLDivElement
+  cameraSwitcherContainer: HTMLDivElement
+  gridSwitcherContainer: HTMLDivElement

  constructor(container: Element | HTMLElement) {
    this.scene = new THREE.Scene()
@@ -157,6 +161,7 @@ class Load3d {
    this.renderer = new THREE.WebGLRenderer({ alpha: true, antialias: true })
    this.renderer.setSize(300, 300)
    this.renderer.setClearColor(0x282828)
+    this.renderer.autoClear = false

    const rendererDomElement: HTMLCanvasElement = this.renderer.domElement

@@ -203,13 +208,143 @@ class Load3d {

    this.standardMaterial = this.createSTLMaterial()

-    this.animate()
+    this.createViewHelper(container)
+
+    this.createGridSwitcher(container)
+
+    this.createCameraSwitcher(container)

    this.handleResize()

    this.startAnimation()
  }

+  createViewHelper(container: Element | HTMLElement) {
+    this.viewHelperContainer = document.createElement('div')
+
+    this.viewHelperContainer.style.position = 'absolute'
+    this.viewHelperContainer.style.bottom = '0'
+    this.viewHelperContainer.style.left = '0'
+    this.viewHelperContainer.style.width = '128px'
+    this.viewHelperContainer.style.height = '128px'
+    this.viewHelperContainer.addEventListener('pointerup', (event) => {
+      event.stopPropagation()
+
+      this.viewHelper.handleClick(event)
+    })
+
+    this.viewHelperContainer.addEventListener('pointerdown', (event) => {
+      event.stopPropagation()
+    })
+
+    container.appendChild(this.viewHelperContainer)
+
+    this.viewHelper = new ViewHelper(
+      this.activeCamera,
+      this.viewHelperContainer
+    )
+
+    this.viewHelper.center = this.controls.target
+  }
+
+  createGridSwitcher(container: Element | HTMLElement) {
+    this.gridSwitcherContainer = document.createElement('div')
+    this.gridSwitcherContainer.style.position = 'absolute'
+    this.gridSwitcherContainer.style.top = '28px' // 修改这里，让按钮在相机按钮下方
+    this.gridSwitcherContainer.style.left = '3px' // 与相机按钮左对齐
+    this.gridSwitcherContainer.style.width = '20px'
+    this.gridSwitcherContainer.style.height = '20px'
+    this.gridSwitcherContainer.style.cursor = 'pointer'
+    this.gridSwitcherContainer.style.alignItems = 'center'
+    this.gridSwitcherContainer.style.justifyContent = 'center'
+    this.gridSwitcherContainer.style.transition = 'background-color 0.2s'
+
+    const gridIcon = document.createElement('div')
+    gridIcon.innerHTML = `
+    <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2">
+      <path d="M3 3h18v18H3z"/>
+      <path d="M3 9h18"/>
+      <path d="M3 15h18"/>
+      <path d="M9 3v18"/>
+      <path d="M15 3v18"/>
+    </svg>
+  `
+
+    const updateButtonState = () => {
+      if (this.gridHelper.visible) {
+        this.gridSwitcherContainer.style.backgroundColor =
+          'rgba(255, 255, 255, 0.2)'
+      } else {
+        this.gridSwitcherContainer.style.backgroundColor = 'transparent'
+      }
+    }
+
+    updateButtonState()
+
+    this.gridSwitcherContainer.addEventListener('mouseenter', () => {
+      if (!this.gridHelper.visible) {
+        this.gridSwitcherContainer.style.backgroundColor = 'rgba(0, 0, 0, 0.5)'
+      }
+    })
+
+    this.gridSwitcherContainer.addEventListener('mouseleave', () => {
+      if (!this.gridHelper.visible) {
+        this.gridSwitcherContainer.style.backgroundColor = 'transparent'
+      }
+    })
+
+    this.gridSwitcherContainer.title = 'Toggle Grid'
+
+    this.gridSwitcherContainer.addEventListener('click', (event) => {
+      event.stopPropagation()
+      this.toggleGrid(!this.gridHelper.visible)
+      updateButtonState()
+    })
+
+    this.gridSwitcherContainer.appendChild(gridIcon)
+    container.appendChild(this.gridSwitcherContainer)
+  }
+
+  createCameraSwitcher(container: Element | HTMLElement) {
+    this.cameraSwitcherContainer = document.createElement('div')
+    this.cameraSwitcherContainer.style.position = 'absolute'
+    this.cameraSwitcherContainer.style.top = '3px'
+    this.cameraSwitcherContainer.style.left = '3px'
+    this.cameraSwitcherContainer.style.width = '20px'
+    this.cameraSwitcherContainer.style.height = '20px'
+    this.cameraSwitcherContainer.style.cursor = 'pointer'
+    this.cameraSwitcherContainer.style.alignItems = 'center'
+    this.cameraSwitcherContainer.style.justifyContent = 'center'
+
+    const cameraIcon = document.createElement('div')
+    cameraIcon.innerHTML = `
+      <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2">
+        <path d="M18 4H6a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2Z"/>
+        <path d="m12 12 4-2.4"/>
+        <circle cx="12" cy="12" r="3"/>
+      </svg>
+    `
+    this.cameraSwitcherContainer.addEventListener('mouseenter', () => {
+      this.cameraSwitcherContainer.style.backgroundColor = 'rgba(0, 0, 0, 0.5)'
+    })
+
+    this.cameraSwitcherContainer.addEventListener('mouseleave', () => {
+      this.cameraSwitcherContainer.style.backgroundColor = 'rgba(0, 0, 0, 0.3)'
+    })
+
+    this.cameraSwitcherContainer.title =
+      'Switch Camera (Perspective/Orthographic)'
+
+    this.cameraSwitcherContainer.addEventListener('click', (event) => {
+      event.stopPropagation()
+      this.toggleCamera()
+    })
+
+    this.cameraSwitcherContainer.appendChild(cameraIcon)
+
+    container.appendChild(this.cameraSwitcherContainer)
+  }
+
  setFOV(fov: number) {
    if (this.activeCamera === this.perspectiveCamera) {
      this.perspectiveCamera.fov = fov
@@ -465,6 +600,13 @@ class Load3d {
    this.controls.target.copy(target)
    this.controls.update()

+    this.viewHelper.dispose()
+    this.viewHelper = new ViewHelper(
+      this.activeCamera,
+      this.viewHelperContainer
+    )
+    this.viewHelper.center = this.controls.target
+
    this.handleResize()
  }

@@ -501,8 +643,16 @@ class Load3d {
  startAnimation() {
    const animate = () => {
      this.animationFrameId = requestAnimationFrame(animate)
+      const delta = this.clock.getDelta()
+
+      if (this.viewHelper.animating) {
+        this.viewHelper.update(delta)
+      }
+
+      this.renderer.clear()
      this.controls.update()
      this.renderer.render(this.scene, this.activeCamera)
+      this.viewHelper.render(this.renderer)
    }
    animate()
  }
@@ -588,6 +738,7 @@ class Load3d {
    }

    this.controls.dispose()
+    this.viewHelper.dispose()
    this.renderer.dispose()
    this.renderer.domElement.remove()
    this.scene.clear()
@@ -818,10 +969,12 @@ class Load3d {
          this.orthographicCamera.updateProjectionMatrix()
        }

+        this.renderer.clear()
        this.renderer.render(this.scene, this.activeCamera)
        const sceneData = this.renderer.domElement.toDataURL('image/png')

        this.renderer.setClearColor(0x000000, 0)
+        this.renderer.clear()
        this.renderer.render(this.scene, this.activeCamera)
        const maskData = this.renderer.domElement.toDataURL('image/png')

@@ -846,44 +999,6 @@ class Load3d {
    })
  }

-  setViewPosition(position: 'front' | 'top' | 'right' | 'isometric') {
-    if (!this.currentModel) {
-      return
-    }
-
-    const box = new THREE.Box3()
-    let center = new THREE.Vector3()
-    let size = new THREE.Vector3()
-
-    if (this.currentModel) {
-      box.setFromObject(this.currentModel)
-      box.getCenter(center)
-      box.getSize(size)
-    }
-
-    const maxDim = Math.max(size.x, size.y, size.z)
-    const distance = maxDim * 2
-
-    switch (position) {
-      case 'front':
-        this.activeCamera.position.set(0, 0, distance)
-        break
-      case 'top':
-        this.activeCamera.position.set(0, distance, 0)
-        break
-      case 'right':
-        this.activeCamera.position.set(distance, 0, 0)
-        break
-      case 'isometric':
-        this.activeCamera.position.set(distance, distance, distance)
-        break
-    }
-
-    this.activeCamera.lookAt(center)
-    this.controls.target.copy(center)
-    this.controls.update()
-  }
-
  setBackgroundColor(color: string) {
    this.renderer.setClearColor(new THREE.Color(color))
    this.renderer.render(this.scene, this.activeCamera)
@@ -1020,16 +1135,28 @@ class Load3dAnimation extends Load3d {
    })
  }

-  animate = () => {
-    requestAnimationFrame(this.animate)
-
-    if (this.currentAnimation && this.isAnimationPlaying) {
+  startAnimation() {
+    const animate = () => {
+      this.animationFrameId = requestAnimationFrame(animate)
      const delta = this.clock.getDelta()
-      this.currentAnimation.update(delta)
-    }

-    this.controls.update()
-    this.renderer.render(this.scene, this.activeCamera)
+      if (this.currentAnimation && this.isAnimationPlaying) {
+        this.currentAnimation.update(delta)
+      }
+
+      this.controls.update()
+
+      this.renderer.clear()
+
+      this.renderer.render(this.scene, this.activeCamera)
+
+      if (this.viewHelper.animating) {
+        this.viewHelper.update(delta)
+      }
+
+      this.viewHelper.render(this.renderer)
+    }
+    animate()
  }
 }

@@ -1076,9 +1203,6 @@ function configureLoad3D(
  load3d: Load3d,
  loadFolder: 'input' | 'output',
  modelWidget: IWidget,
-  showGrid: IWidget,
-  cameraType: IWidget,
-  view: IWidget,
  material: IWidget,
  bgColor: IWidget,
  lightIntensity: IWidget,
@@ -1138,22 +1262,6 @@ function configureLoad3D(

  modelWidget.callback = onModelWidgetUpdate

-  load3d.toggleGrid(showGrid.value as boolean)
-
-  showGrid.callback = (value: boolean) => {
-    load3d.toggleGrid(value)
-  }
-
-  load3d.toggleCamera(cameraType.value as 'perspective' | 'orthographic')
-
-  cameraType.callback = (value: 'perspective' | 'orthographic') => {
-    load3d.toggleCamera(value)
-  }
-
-  view.callback = (value: 'front' | 'top' | 'right' | 'isometric') => {
-    load3d.setViewPosition(value)
-  }
-
  material.callback = (value: 'original' | 'normal' | 'wireframe') => {
    load3d.setMaterialMode(value)
  }
@@ -1312,14 +1420,6 @@ app.registerExtension({
      (w: IWidget) => w.name === 'model_file'
    )

-    const showGrid = node.widgets.find((w: IWidget) => w.name === 'show_grid')
-
-    const cameraType = node.widgets.find(
-      (w: IWidget) => w.name === 'camera_type'
-    )
-
-    const view = node.widgets.find((w: IWidget) => w.name === 'view')
-
    const material = node.widgets.find((w: IWidget) => w.name === 'material')

    const bgColor = node.widgets.find((w: IWidget) => w.name === 'bg_color')
@@ -1353,9 +1453,6 @@ app.registerExtension({
      load3d,
      'input',
      modelWidget,
-      showGrid,
-      cameraType,
-      view,
      material,
      bgColor,
      lightIntensity,
@@ -1569,14 +1666,6 @@ app.registerExtension({
      (w: IWidget) => w.name === 'model_file'
    )

-    const showGrid = node.widgets.find((w: IWidget) => w.name === 'show_grid')
-
-    const cameraType = node.widgets.find(
-      (w: IWidget) => w.name === 'camera_type'
-    )
-
-    const view = node.widgets.find((w: IWidget) => w.name === 'view')
-
    const material = node.widgets.find((w: IWidget) => w.name === 'material')

    const bgColor = node.widgets.find((w: IWidget) => w.name === 'bg_color')
@@ -1621,9 +1710,6 @@ app.registerExtension({
      load3d,
      'input',
      modelWidget,
-      showGrid,
-      cameraType,
-      view,
      material,
      bgColor,
      lightIntensity,
@@ -1652,6 +1738,8 @@ app.registerExtension({
    sceneWidget.serializeValue = async () => {
      node.properties['Camera Info'] = JSON.stringify(load3d.getCameraState())

+      load3d.toggleAnimation(false)
+
      const { scene: imageData, mask: maskData } = await load3d.captureScene(
        w.value,
        h.value
@@ -1758,14 +1846,6 @@ app.registerExtension({
      (w: IWidget) => w.name === 'model_file'
    )

-    const showGrid = node.widgets.find((w: IWidget) => w.name === 'show_grid')
-
-    const cameraType = node.widgets.find(
-      (w: IWidget) => w.name === 'camera_type'
-    )
-
-    const view = node.widgets.find((w: IWidget) => w.name === 'view')
-
    const material = node.widgets.find((w: IWidget) => w.name === 'material')

    const bgColor = node.widgets.find((w: IWidget) => w.name === 'bg_color')
@@ -1801,9 +1881,6 @@ app.registerExtension({
        load3d,
        'output',
        modelWidget,
-        showGrid,
-        cameraType,
-        view,
        material,
        bgColor,
        lightIntensity,
--- a/src/extensions/core/maskeditor.ts
+++ b/src/extensions/core/maskeditor.ts
@@ -1,7 +1,10 @@
+import { debounce } from 'lodash'
+
 import { api } from '../../scripts/api'
 import { app } from '../../scripts/app'
 import { ComfyApp } from '../../scripts/app'
 import { $el, ComfyDialog } from '../../scripts/ui'
+import { getStorageValue, setStorageValue } from '../../scripts/utils'
 import { ClipspaceDialog } from './clipspace'
 import { MaskEditorDialogOld } from './maskEditorOld'

@@ -262,15 +265,15 @@ var styles = `
  }
  #maskEditor_toolPanel {
    height: 100%;
-    width: var(--sidebar-width);
+    width: 4rem;
    z-index: 8888;
    background: var(--comfy-menu-bg);
    display: flex;
    flex-direction: column;
  }
  .maskEditor_toolPanelContainer {
-    width: var(--sidebar-width);
-    height: var(--sidebar-width);
+    width: 4rem;
+    height: 4rem;
    display: flex;
    justify-content: center;
    align-items: center;
@@ -331,7 +334,7 @@ var styles = `
    margin-bottom: 5px;
  }
  #maskEditor_pointerZone {
-    width: calc(100% - var(--sidebar-width) - 220px);
+    width: calc(100% - 4rem - 220px);
    height: 100%;
  }
  #maskEditor_uiContainer {
@@ -703,8 +706,8 @@ var styles = `
  }

  .maskEditor_toolPanelZoomIndicator {
-    width: var(--sidebar-width);
-    height: var(--sidebar-width);
+    width: 4rem;
+    height: 4rem;
    display: flex;
    flex-direction: column;
    justify-content: center;
@@ -776,10 +779,37 @@ interface Offset {
 }

 export interface Brush {
+  type: BrushShape
  size: number
  opacity: number
  hardness: number
-  type: BrushShape
+  smoothingPrecision: number
+}
+
+const saveBrushToCache = debounce(function (key: string, brush: Brush): void {
+  try {
+    const brushString = JSON.stringify(brush)
+    setStorageValue(key, brushString)
+  } catch (error) {
+    console.error('Failed to save brush to cache:', error)
+  }
+}, 300)
+
+function loadBrushFromCache(key: string): Brush | null {
+  try {
+    const brushString = getStorageValue(key)
+    if (brushString) {
+      const brush = JSON.parse(brushString) as Brush
+      console.log('Loaded brush from cache:', brush)
+      return brush
+    } else {
+      console.log('No brush found in cache.')
+      return null
+    }
+  } catch (error) {
+    console.error('Failed to load brush from cache:', error)
+    return null
+  }
 }

 type Callback = (data?: any) => void
@@ -1125,7 +1155,7 @@ class MaskEditorDialog extends ComfyDialog {
      .then((response) => {
        if (!response.ok) {
          console.log('Failed to upload mask:', response)
-          this.uploadMask(filepath, formData, 2)
+          this.uploadMask(filepath, formData, retries - 1)
        }
      })
      .catch((error) => {
@@ -1952,12 +1982,19 @@ class BrushTool {
      'Comfy.MaskEditor.BrushAdjustmentSpeed'
    )

-    this.brushSettings = {
-      size: 10,
-      opacity: 100,
-      hardness: 1,
-      type: BrushShape.Arc
+    const cachedBrushSettings = loadBrushFromCache('maskeditor_brush_settings')
+    if (cachedBrushSettings) {
+      this.brushSettings = cachedBrushSettings
+    } else {
+      this.brushSettings = {
+        type: BrushShape.Arc,
+        size: 10,
+        opacity: 0.7,
+        hardness: 1,
+        smoothingPrecision: 10
+      }
    }
+
    this.maskBlendMode = MaskBlendMode.Black
  }

@@ -2016,6 +2053,10 @@ class BrushTool {
      'brushType',
      async () => this.brushSettings.type
    )
+    this.messageBroker.createPullTopic(
+      'brushSmoothingPrecision',
+      async () => this.brushSettings.smoothingPrecision
+    )
    this.messageBroker.createPullTopic(
      'maskBlendMode',
      async () => this.maskBlendMode
@@ -2143,7 +2184,7 @@ class BrushTool {
    }

    const distanceBetweenPoints =
-      (this.brushSettings.size / this.smoothingPrecision) * 6
+      (this.brushSettings.size / this.brushSettings.smoothingPrecision) * 6
    const stepNr = Math.ceil(totalLength / distanceBetweenPoints)

    let interpolatedPoints = points
@@ -2190,7 +2231,7 @@ class BrushTool {
    const brush_size = await this.messageBroker.pull('brushSize')
    const distance = Math.sqrt((p2.x - p1.x) ** 2 + (p2.y - p1.y) ** 2)
    const steps = Math.ceil(
-      distance / ((brush_size / this.smoothingPrecision) * 4)
+      distance / ((brush_size / this.brushSettings.smoothingPrecision) * 4)
    ) // Adjust for smoother lines
    const interpolatedOpacity =
      1 / (1 + Math.exp(-6 * (this.brushSettings.opacity - 0.5))) -
@@ -2545,23 +2586,27 @@ class BrushTool {

  private setBrushSize(size: number) {
    this.brushSettings.size = size
+    saveBrushToCache('maskeditor_brush_settings', this.brushSettings)
  }

  private setBrushOpacity(opacity: number) {
    this.brushSettings.opacity = opacity
+    saveBrushToCache('maskeditor_brush_settings', this.brushSettings)
  }

  private setBrushHardness(hardness: number) {
    this.brushSettings.hardness = hardness
+    saveBrushToCache('maskeditor_brush_settings', this.brushSettings)
  }

  private setBrushType(type: BrushShape) {
    this.brushSettings.type = type
+    saveBrushToCache('maskeditor_brush_settings', this.brushSettings)
  }

  private setBrushSmoothingPrecision(precision: number) {
-    //console.log('precision', precision)
-    this.smoothingPrecision = precision
+    this.brushSettings.smoothingPrecision = precision
+    saveBrushToCache('maskeditor_brush_settings', this.brushSettings)
  }
 }

@@ -2825,7 +2870,6 @@ class UIManager {
    const circle_shape = document.createElement('div')
    circle_shape.id = 'maskEditor_sidePanelBrushShapeCircle'
    circle_shape.classList.add(shapeColor)
-    circle_shape.style.background = 'var(--p-button-text-primary-color)'
    circle_shape.addEventListener('click', () => {
      this.messageBroker.publish('setBrushShape', BrushShape.Arc)
      this.setBrushBorderRadius()
@@ -2836,7 +2880,6 @@ class UIManager {
    const square_shape = document.createElement('div')
    square_shape.id = 'maskEditor_sidePanelBrushShapeSquare'
    square_shape.classList.add(shapeColor)
-    square_shape.style.background = ''
    square_shape.addEventListener('click', () => {
      this.messageBroker.publish('setBrushShape', BrushShape.Rect)
      this.setBrushBorderRadius()
@@ -2844,6 +2887,16 @@ class UIManager {
      circle_shape.style.background = ''
    })

+    if (
+      (await this.messageBroker.pull('brushSettings')).type === BrushShape.Arc
+    ) {
+      circle_shape.style.background = 'var(--p-button-text-primary-color)'
+      square_shape.style.background = ''
+    } else {
+      circle_shape.style.background = ''
+      square_shape.style.background = 'var(--p-button-text-primary-color)'
+    }
+
    brush_shape_container.appendChild(circle_shape)
    brush_shape_container.appendChild(square_shape)

@@ -2855,7 +2908,7 @@ class UIManager {
      1,
      100,
      1,
-      10,
+      (await this.messageBroker.pull('brushSettings')).size,
      (event, value) => {
        this.messageBroker.publish('setBrushSize', parseInt(value))
        this.updateBrushPreview()
@@ -2868,7 +2921,7 @@ class UIManager {
      0,
      1,
      0.01,
-      0.7,
+      (await this.messageBroker.pull('brushSettings')).opacity,
      (event, value) => {
        this.messageBroker.publish('setBrushOpacity', parseFloat(value))
        this.updateBrushPreview()
@@ -2881,7 +2934,7 @@ class UIManager {
      0,
      1,
      0.01,
-      1,
+      (await this.messageBroker.pull('brushSettings')).hardness,
      (event, value) => {
        this.messageBroker.publish('setBrushHardness', parseFloat(value))
        this.updateBrushPreview()
@@ -2894,7 +2947,7 @@ class UIManager {
      1,
      100,
      1,
-      10,
+      (await this.messageBroker.pull('brushSettings')).smoothingPrecision,
      (event, value) => {
        this.messageBroker.publish(
          'setBrushSmoothingPrecision',
@@ -2903,7 +2956,31 @@ class UIManager {
      }
    )

+    const resetBrushSettingsButton = document.createElement('button')
+    resetBrushSettingsButton.id = 'resetBrushSettingsButton'
+    resetBrushSettingsButton.innerText = 'Reset to Default'
+
+    resetBrushSettingsButton.addEventListener('click', () => {
+      this.messageBroker.publish('setBrushShape', BrushShape.Arc)
+      this.messageBroker.publish('setBrushSize', 10)
+      this.messageBroker.publish('setBrushOpacity', 0.7)
+      this.messageBroker.publish('setBrushHardness', 1)
+      this.messageBroker.publish('setBrushSmoothingPrecision', 10)
+
+      circle_shape.style.background = 'var(--p-button-text-primary-color)'
+      square_shape.style.background = ''
+
+      thicknesSliderObj.slider.value = '10'
+      opacitySliderObj.slider.value = '0.7'
+      hardnessSliderObj.slider.value = '1'
+      brushSmoothingPrecisionSliderObj.slider.value = '10'
+
+      this.setBrushBorderRadius()
+      this.updateBrushPreview()
+    })
+
    brush_settings_container.appendChild(brush_settings_title)
+    brush_settings_container.appendChild(resetBrushSettingsButton)
    brush_settings_container.appendChild(brush_shape_outer_container)
    brush_settings_container.appendChild(thicknesSliderObj.container)
    brush_settings_container.appendChild(opacitySliderObj.container)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
filtered	628b44051b	nit - fix TS type	2025-01-22 08:26:22 +11:00
filtered	a7a5e3cf67	[Refactor] Task state updates to TaskRunner	2025-01-22 08:18:42 +11:00
filtered	64e218a9f3	[Refactor] Task execution into task runner class	2025-01-22 08:18:42 +11:00
filtered	0b69d3cbfe	[Desktop] Startup maintenance screen (#2253 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-21 16:10:15 -05:00
bymyself	8257e848c6	Update SearchBox vue features (#2310 )	2025-01-21 10:32:46 -05:00
Chenlei Hu	a07b7693b6	[chore] Update vue to 3.5 (#2308 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-20 21:21:13 -05:00
Chenlei Hu	26ddf69451	Fix validation message locale (#2309 )	2025-01-20 21:11:23 -05:00
bymyself	ed6ece2099	Add forms plugin to issue report component (#2302 )	2025-01-20 20:20:59 -05:00
Chenlei Hu	b42516d39c	1.8.2 (#2307 )	2025-01-20 17:24:58 -05:00
Chenlei Hu	ef24efe5a3	[Desktop] Report execution complete events (#2306 )	2025-01-20 17:24:15 -05:00
Chenlei Hu	34c267c755	[chore] Update primevue to 4.2.5 (#2304 )	2025-01-20 16:22:24 -05:00
bymyself	8b9f0ddd1d	Add Comfy Forum (forum.comfy.org) to Help menu (#2305 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-20 16:06:31 -05:00
filtered	af658b7792	[Style] Use import/export icons for colour palette (#2300 )	2025-01-20 14:33:02 -05:00
filtered	9c53bbd53d	[Refactor] Move type extensions out of LG (SoC) (#2303 ) Co-authored-by: huchenlei <huchenlei@proton.me>	2025-01-20 14:22:56 -05:00
filtered	f9be20fa78	[Desktop] Fix unnecessary setting update (#2301 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-20 14:00:35 -05:00
Chenlei Hu	87fc7a2c5d	[Cleanup] Remove explicit prettier plugin call (#2299 )	2025-01-20 11:15:16 -05:00
Chenlei Hu	1f266e826e	Fix .cursorrules typo (#2298 )	2025-01-20 11:12:59 -05:00
Dr.Lt.Data	911adfe9f8	refine locales/ko (#2296 )	2025-01-20 11:11:16 -05:00
bymyself	654d72b4cc	Add issue report dialog service (#2284 ) Co-authored-by: huchenlei <huchenlei@proton.me>	2025-01-19 20:44:11 -05:00
bymyself	a1ed67fc74	Add User Feedback buttons (#2275 ) Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: huchenlei <huchenlei@proton.me>	2025-01-19 19:41:58 -05:00
Chenlei Hu	78bc635518	1.8.1 (#2295 )	2025-01-19 19:07:18 -05:00
Chenlei Hu	f49ec175e9	1.8.0 (#2293 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-19 18:57:07 -05:00
Yuki Shindo	e4c60e7e18	Prevent Enter Key from Triggering Selection During IME Composition in AutoCompletePlus (#2285 )	2025-01-19 18:34:26 -05:00
filtered	37cb2cb0a5	[Desktop] Add quit command (#2286 ) Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Chenlei Hu <huchenlei@proton.me>	2025-01-19 14:31:52 -05:00
Hikari-Fox	141825e988	Update Russian localization: refine terminology for "node", "hook", "… (#2289 ) Co-authored-by: Vladimir Pozdnyakov <pozdnyakov044@gmail.com>	2025-01-19 14:29:40 -05:00
filtered	78f43b1e06	[Desktop] Add electron types update script (#2290 )	2025-01-19 14:16:27 -05:00
filtered	a6105eb8c7	[DevExperience] Tailwind rules (#2292 )	2025-01-19 14:16:03 -05:00
filtered	79ed598d5d	[chore] Update electron-types to 0.4.11 (#2291 )	2025-01-19 14:12:17 -05:00
bymyself	816574e0ab	[Refactor] improve type safety in dialog service (#2283 )	2025-01-18 15:46:57 -05:00
Chenlei Hu	1a4e77a3ab	[Desktop] Ctrl+w to close workflow tab (#2282 )	2025-01-17 20:02:54 -05:00
Chenlei Hu	de570712df	1.7.14 (#2281 )	2025-01-17 18:04:43 -05:00
Chenlei Hu	44612e8f97	[Desktop] Add privacy policy link to install view about dialog (#2280 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-17 18:04:08 -05:00
bymyself	3df911c1bf	Add consent prompt view (#2268 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-17 17:39:50 -05:00
Chenlei Hu	af26b9ad6d	[Desktop] Report completed generation status (#2279 )	2025-01-17 17:36:46 -05:00
Chenlei Hu	d503873980	Move queueStore update from QueueSidebarTab to GraphView (#2278 )	2025-01-17 17:14:22 -05:00
bymyself	842a9f74fc	[BrowserTest] Fix flaky gallery test (#2150 )	2025-01-17 17:11:49 -05:00
Chenlei Hu	29551a36b3	Add .cursorrules (#2277 )	2025-01-17 16:35:25 -05:00
filtered	d6e5c8950c	[Desktop] Loading screen (#2274 ) Co-authored-by: huchenlei <huchenlei@proton.me>	2025-01-17 11:12:03 -05:00
Chenlei Hu	ad1c1ce9c2	[chore] Update electron-types to 0.4.9 (#2276 )	2025-01-17 10:59:41 -05:00
Benjamin Lu	cb9d2c6bae	Caching brush settings in mask editor (#2271 ) Co-authored-by: Benjamin Lu <templu1107@proton.me>	2025-01-17 10:38:23 -05:00
Chenlei Hu	7fd41eeaba	1.7.13 (#2270 )	2025-01-16 11:51:58 -05:00
filtered	79fee6ac72	Fix collapsed node textarea causes UI inconsistency (#2267 )	2025-01-16 11:50:53 -05:00
Benjamin Lu	edd58cd153	Hotfix scoped --sidebar-width uasges in maskeditor.ts (#2269 ) Co-authored-by: Benjamin Lu <templu1107@proton.me>	2025-01-16 11:36:11 -05:00
Chenlei Hu	e153508955	1.7.12 (#2265 )	2025-01-15 20:19:24 -05:00
Chenlei Hu	237fca0bf1	[CodeHealth] Use scoped CSS for SideToolbar (#2264 )	2025-01-15 20:16:39 -05:00
Chenlei Hu	65542b885a	[Style] Fix root CSS selector (#2263 )	2025-01-15 19:44:46 -05:00
Chenlei Hu	f739f704af	[CodeHealth] Use scoped CSS in views (#2262 )	2025-01-15 19:35:01 -05:00
Chenlei Hu	37abdbe35d	[Desktop] Add install screen stepper change metrics (#2261 )	2025-01-15 19:27:05 -05:00
Chenlei Hu	ff445f5c95	Apply min col on logs terminal for colab (#2260 )	2025-01-15 17:16:33 -05:00
Chenlei Hu	84b652a281	[CodeHealth] Convert useAutoSize to kwargs (#2259 )	2025-01-15 17:06:45 -05:00
Chenlei Hu	184291d21b	[Settings] Enable Comfy.Window.UnloadConfirmation by default (#2258 )	2025-01-15 16:37:11 -05:00
Chenlei Hu	d7fb25a36a	Don't prompt unsaved when there is no unsaved workflow on window close (#2257 )	2025-01-15 16:34:05 -05:00
Comfy Org PR Bot	c039a60fcc	Update locales for node definitions (#2256 ) Co-authored-by: huchenlei <20929282+huchenlei@users.noreply.github.com> Co-authored-by: huchenlei <huchenlei@proton.me>	2025-01-15 16:23:45 -05:00
Chenlei Hu	3b6108c26e	Add work dir to i18n-node-defs.yaml (#2255 )	2025-01-15 16:19:13 -05:00
Chenlei Hu	49bb247526	1.7.11 (#2250 )	2025-01-14 23:34:58 -05:00
bymyself	dd005f5fa5	Allow parent component to pass tags to issue report panel (#2247 )	2025-01-14 23:34:11 -05:00
Chenlei Hu	bf90b458d3	[Desktop] Add clarification of migration from existing install (#2249 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-14 23:33:53 -05:00
bymyself	7e78c5b1dc	Fix type error in BaseViewTemplate (#2245 )	2025-01-14 20:19:35 -05:00
Gremlation	c13190cd07	Fix `execution_interrupted` (#2244 )	2025-01-14 11:46:42 -05:00
filtered	00f031e382	[Refactor] Remove old workarounds (#2242 )	2025-01-14 10:52:34 -05:00
filtered	04153caaf5	Fix prettier output in CI does not match IDE (#2243 )	2025-01-14 10:51:32 -05:00
Chenlei Hu	210bfdeb7d	1.7.10 (#2241 )	2025-01-13 20:25:36 -05:00
bymyself	ce0726d85e	Restore all open workflows on load (#2238 )	2025-01-13 20:24:40 -05:00
bymyself	dd69f9dc30	[Style] Update workflow template cards style (#2239 )	2025-01-13 20:21:03 -05:00
Chenlei Hu	3f261f0e53	[Desktop] Add user journey events to the metrics collection list (UI) (#2237 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-12 17:16:16 -05:00
Chenlei Hu	3b2cc23f65	[Desktop] Mark window style setting as experimental (#2236 )	2025-01-12 16:14:51 -05:00
bymyself	c50a86b258	[CI] Fix vite config condition (#2235 )	2025-01-12 16:09:46 -05:00
Chenlei Hu	1a8c2bba42	1.7.9 (#2234 )	2025-01-12 13:43:05 -05:00
Benjamin Lu	fc09951b3e	[Style] Visual improvements to WorkflowTabs (#2232 ) Co-authored-by: Benjamin Lu <templu1107@proton.me>	2025-01-12 13:41:55 -05:00
Terry Jia	76d5f39607	[3d] use threejs native viewHelper (#2230 )	2025-01-12 13:23:23 -05:00
bymyself	9d3bc0f173	Add optional report feature to error dialog (#2229 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-12 13:23:02 -05:00
bymyself	d9b350e159	Add bookmark option in workflow tab context menu (#2231 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-12 13:22:22 -05:00
Chenlei Hu	44610674ee	[Desktop] Fix server start view layout (#2226 )	2025-01-10 22:14:01 -05:00
Chenlei Hu	9bfce5b8d0	Disable i18n on PRs from forked repo (#2225 )	2025-01-10 19:23:20 -05:00
Chenlei Hu	8986fa356a	1.7.8 (#2223 )	2025-01-10 19:06:03 -05:00
Chenlei Hu	0c4fd4af1c	[Style] Set topbar height to 2.5rem (40px) (#2224 )	2025-01-10 19:05:44 -05:00
Chenlei Hu	30cd46ce1f	[Desktop] Allow dragging window on empty titlebar (#2222 )	2025-01-10 13:41:26 -05:00
filtered	3122c33310	Allow Ctrl + C to send interrupt in terminal (#2221 )	2025-01-10 13:30:11 -05:00
Chenlei Hu	91d8d04dc6	[Style] Reduce opacity on workflow tabs scrollbar (#2220 )	2025-01-10 10:59:58 -05:00
Chenlei Hu	8f5aa1ff08	[Desktop] Native window in graph view (#2216 )	2025-01-09 23:00:28 -05:00
Chenlei Hu	e076783b89	[Desktop] Native window virtual menu bar (#2215 )	2025-01-09 20:21:03 -05:00
Chenlei Hu	04c23001fc	[Desktop] Set window action buttons style (#2214 )	2025-01-09 19:35:22 -05:00
Chenlei Hu	cb265fb0bf	1.7.7 (#2213 )	2025-01-09 19:03:43 -05:00
Chenlei Hu	e9211fe377	[Desktop] Add window style setting (#2212 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-09 17:33:57 -05:00
Chenlei Hu	ffc7febeac	[BrowserTest] Disable flaky test (#2211 )	2025-01-09 14:46:09 -05:00
Chenlei Hu	b15e626607	[Style] Replace px with rem in sidebar width (#2210 )	2025-01-09 14:25:34 -05:00
Chenlei Hu	906b5e35a3	[Style] Set fixed top menu bar height (#2209 )	2025-01-09 14:14:14 -05:00
Chenlei Hu	e8cd9c7642	[BrowserTest] Replace ComfyPage.reload with ComfyPage.setup (#2208 )	2025-01-09 12:54:05 -05:00
Chenlei Hu	93e184e379	Explicitly add zod-to-json-schema as dev dependency (#2207 )	2025-01-09 11:41:40 -05:00
Chenlei Hu	1d02cd3c47	[Docs] Extract comfy workflow zod schema as json schema (#2206 )	2025-01-09 11:30:47 -05:00
Chenlei Hu	b86e3f71cb	1.7.6 (#2202 )	2025-01-08 11:24:59 -05:00
bymyself	1ece2462bd	Use more conventional import/export icons in color palette settings (#2199 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-08 10:58:21 -05:00
bymyself	73ecacfa2d	Fix searchbox dismissed when closing filter panel (#2196 )	2025-01-08 10:57:55 -05:00
bymyself	67e6df7c72	Fix search result category text on light theme (#2198 )	2025-01-08 10:57:10 -05:00
Jarvis	7e8510028d	fix: Make sure use the correct `graph` parameter (#2200 )	2025-01-08 10:56:27 -05:00
bymyself	dd4dd8b68a	[Doc] Add anchors to sections in README (#2197 )	2025-01-08 10:55:59 -05:00
bymyself	7111022617	Fix node text highlight color on light theme (#2195 )	2025-01-08 09:16:57 -05:00
Chenlei Hu	daee073045	[Style] Fix second row workflow tabs overflow (#2194 )	2025-01-07 16:28:49 -05:00
Chenlei Hu	a1a834a76d	Support 2nd row location for workflow tabs (#2193 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-07 16:05:37 -05:00
Chenlei Hu	c437d32691	Truncate sidebar title first to avoid tool buttons wrap (#2192 )	2025-01-07 15:14:09 -05:00
Chenlei Hu	0130d41be5	Try fix workflow tabs vertical scrollbar (#2191 )	2025-01-07 13:39:14 -05:00
Chenlei Hu	527561d148	1.7.5 (#2189 )	2025-01-07 10:47:34 -05:00
Chenlei Hu	1c4481c342	Horizontal scroll workflow tabs on overflow (#2188 )	2025-01-07 10:45:58 -05:00
Chenlei Hu	07000a23d4	Wrap each init task with error handling (#2187 )	2025-01-07 10:40:32 -05:00
Chenlei Hu	ea6c9e7ca5	Replace unset unknown keybinding error with warn (#2186 )	2025-01-07 10:33:23 -05:00
Chenlei Hu	90698fced6	[BugFix] Migrate deprecated Comfy.Keybinding.UnsetBindings values (#2185 )	2025-01-07 10:23:25 -05:00
iola1999	9716aea10d	fix: Fix infinite recursion in mask upload retry logic (#2181 )	2025-01-07 16:19:13 +01:00
Chenlei Hu	077ded2cce	[Refactor] Simplify keybindingStore with _.groupBy (#2180 )	2025-01-06 19:46:20 -05:00
Chenlei Hu	ffb20b8789	1.7.4 (#2179 )	2025-01-06 19:24:40 -05:00
Chenlei Hu	549a2fdc92	Remove main_repo_release.py (#2147 )	2025-01-06 17:01:41 -05:00
bymyself	e123295423	Fix saved keybinding persistence (#2176 )	2025-01-06 15:54:35 -05:00
Chenlei Hu	613b44610a	1.7.3 (#2175 )	2025-01-06 11:04:54 -05:00
Chenlei Hu	e82d795ff9	Trigger node def locale update manually (#2170 )	2025-01-06 10:54:59 -05:00
bymyself	ba31f8fa68	Add Close Workflow to commands (#2171 ) Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Chenlei Hu <huchenlei@proton.me>	2025-01-06 10:50:44 -05:00
Alexander Piskun	f2eb4e1519	(fix): added missing slash to "loadWorkflow" templates endpoint (#2174 )	2025-01-06 10:49:07 -05:00
Chenlei Hu	975c2248c5	Rename Keybinding.targetSelector to targetElementId (#2169 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-05 16:03:38 -05:00
bymyself	477f4b275d	Fix node bookmark color customization (#2168 )	2025-01-05 13:05:09 -05:00
bymyself	179b8c22a9	[BrowserTest] Refactor test fixtures (#2165 )	2025-01-05 13:03:07 -05:00
bymyself	6525389273	Update Settings schema (#2167 )	2025-01-05 12:56:29 -05:00
Chenlei Hu	59fc5ac77e	Update litegraph 0.8.60 (#2164 )	2025-01-04 20:46:38 -05:00
bymyself	ed844e04b8	Fix text wrapping in dropdown menu (#2162 )	2025-01-04 20:30:58 -05:00
bymyself	972af1977d	Improve menu accessibility (#2163 )	2025-01-04 20:30:27 -05:00
Chenlei Hu	5ac0b7b181	1.7.2 (#2161 )	2025-01-04 19:42:15 -05:00
Chenlei Hu	31ea39e44c	Prevent reference sharing on settingStore content (#2160 )	2025-01-04 19:31:32 -05:00
Chenlei Hu	e65653c107	Add support for custom light color palette (#2156 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-04 18:53:47 -05:00
Chenlei Hu	e46706777c	[BrowserTest] Disable flaky queue sidebar tests (#2158 )	2025-01-04 16:33:36 -05:00
Chenlei Hu	1a817a48cb	1.7.1 (#2152 )	2025-01-03 20:19:11 -05:00
Chenlei Hu	871967349f	1.7.0 (#2151 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-03 20:14:51 -05:00
filtered	11258f4a95	Revert markdown note node, reland as new node (#2148 )	2025-01-03 16:05:23 -05:00
bymyself	c3e05c2a10	Add alt text to images in gallery and queue (#2136 )	2025-01-03 13:49:06 -05:00
Chenlei Hu	ea1e776dcc	Update litegraph 0.8.59 (#2140 )	2025-01-03 11:15:16 -05:00
Dr.Lt.Data	f0c273f845	elaborate korean translation (#2137 )	2025-01-03 11:14:56 -05:00
Chenlei Hu	ea489851ed	[BugFix] Fix open workflow after insert (#2138 )	2025-01-03 11:09:28 -05:00
Chenlei Hu	5717c33a0b	[BrowserTest] Add test on paste with link (#2130 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-02 20:38:36 -05:00
Chenlei Hu	c31919c418	Remove invertMenuScrolling extension (#2131 ) Co-authored-by: github-actions <github-actions@github.com>	2025-01-02 20:19:00 -05:00
bymyself	2e7de4701e	Reduce debounce delay in settings search (#2126 )	2025-01-02 19:51:31 -05:00
Chenlei Hu	f53723da0f	1.6.15 (#2129 )	2025-01-02 17:54:31 -05:00