fix: remove unnecessary allowJs from tsconfig

.oxlintrc.json

@@ -96,7 +96,6 @@
     "typescript/restrict-template-expressions": "off",
     "typescript/unbound-method": "off",
     "typescript/no-floating-promises": "error",
-    "typescript/no-explicit-any": "error",
     "vue/no-import-compiler-macros": "error",
     "vue/no-dupe-keys": "error"
   },

.storybook/main.ts

@@ -98,10 +98,12 @@ const config: StorybookConfig = {
       },
       build: {
         rolldownOptions: {
+          experimental: {
+            strictExecutionOrder: true
+          },
           treeshake: false,
           output: {
-            keepNames: true,
-            strictExecutionOrder: true
+            keepNames: true
           },
           onwarn: (warning, warn) => {
             // Suppress specific warnings

browser_tests/fixtures/components/SettingDialog.ts

@@ -23,7 +23,9 @@ export class SettingDialog extends BaseDialog {
    * @param value - The value to set
    */
   async setStringSetting(id: string, value: string) {
-    const settingInputDiv = this.root.locator(`div[id="${id}"]`)
+    const settingInputDiv = this.page.locator(
+      `div.settings-container div[id="${id}"]`
+    )
     await settingInputDiv.locator('input').fill(value)
   }
 
@@ -32,31 +34,16 @@ export class SettingDialog extends BaseDialog {
    * @param id - The id of the setting
    */
   async toggleBooleanSetting(id: string) {
-    const settingInputDiv = this.root.locator(`div[id="${id}"]`)
+    const settingInputDiv = this.page.locator(
+      `div.settings-container div[id="${id}"]`
+    )
     await settingInputDiv.locator('input').click()
   }
 
-  get searchBox() {
-    return this.root.getByPlaceholder(/Search/)
-  }
-
-  get categories() {
-    return this.root.locator('nav').getByRole('button')
-  }
-
-  category(name: string) {
-    return this.root.locator('nav').getByRole('button', { name })
-  }
-
-  get contentArea() {
-    return this.root.getByRole('main')
-  }
-
   async goToAboutPanel() {
-    const aboutButton = this.root.locator('nav').getByRole('button', {
-      name: 'About'
-    })
-    await aboutButton.click()
-    await this.page.waitForSelector('.about-container')
+    await this.page.getByTestId(TestIds.dialogs.settingsTabAbout).click()
+    await this.page
+      .getByTestId(TestIds.dialogs.about)
+      .waitFor({ state: 'visible' })
   }
 }

browser_tests/tests/bottomPanelShortcuts.spec.ts

@@ -226,7 +226,9 @@ test.describe('Bottom Panel Shortcuts', { tag: '@ui' }, () => {
     await expect(bottomPanel.shortcuts.manageButton).toBeVisible()
     await bottomPanel.shortcuts.manageButton.click()
 
-    await expect(comfyPage.settingDialog.root).toBeVisible()
-    await expect(comfyPage.settingDialog.category('Keybinding')).toBeVisible()
+    await expect(comfyPage.page.getByRole('dialog')).toBeVisible()
+    await expect(
+      comfyPage.page.getByRole('option', { name: 'Keybinding' })
+    ).toBeVisible()
   })
 })

browser_tests/tests/dialog.spec.ts

@@ -244,13 +244,9 @@ test.describe('Missing models warning', () => {
 test.describe('Settings', () => {
   test('@mobile Should be visible on mobile', async ({ comfyPage }) => {
     await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator(
-      '[data-testid="settings-dialog"]'
-    )
-    await expect(settingsDialog).toBeVisible()
-    const contentArea = settingsDialog.locator('main')
-    await expect(contentArea).toBeVisible()
-    const isUsableHeight = await contentArea.evaluate(
+    const settingsContent = comfyPage.page.locator('.settings-content')
+    await expect(settingsContent).toBeVisible()
+    const isUsableHeight = await settingsContent.evaluate(
       (el) => el.clientHeight > 30
     )
     expect(isUsableHeight).toBeTruthy()
@@ -260,9 +256,7 @@ test.describe('Settings', () => {
     await comfyPage.page.keyboard.down('ControlOrMeta')
     await comfyPage.page.keyboard.press(',')
     await comfyPage.page.keyboard.up('ControlOrMeta')
-    const settingsLocator = comfyPage.page.locator(
-      '[data-testid="settings-dialog"]'
-    )
+    const settingsLocator = comfyPage.page.locator('.settings-container')
     await expect(settingsLocator).toBeVisible()
     await comfyPage.page.keyboard.press('Escape')
     await expect(settingsLocator).not.toBeVisible()
@@ -281,15 +275,10 @@ test.describe('Settings', () => {
   test('Should persist keybinding setting', async ({ comfyPage }) => {
     // Open the settings dialog
     await comfyPage.page.keyboard.press('Control+,')
-    await comfyPage.page.waitForSelector('[data-testid="settings-dialog"]')
+    await comfyPage.page.waitForSelector('.settings-container')
 
     // Open the keybinding tab
-    const settingsDialog = comfyPage.page.locator(
-      '[data-testid="settings-dialog"]'
-    )
-    await settingsDialog
-      .locator('nav [role="button"]', { hasText: 'Keybinding' })
-      .click()
+    await comfyPage.page.getByLabel('Keybinding').click()
     await comfyPage.page.waitForSelector(
       '[placeholder="Search Keybindings..."]'
     )

browser_tests/tests/subgraph-duplicate-ids.spec.ts

@@ -5,6 +5,13 @@ import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 test.describe('Subgraph duplicate ID remapping', { tag: ['@subgraph'] }, () => {
   const WORKFLOW = 'subgraphs/subgraph-nested-duplicate-ids'
 
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting(
+      'Comfy.Graph.DeduplicateSubgraphNodeIds',
+      true
+    )
+  })
+
   test('All node IDs are globally unique after loading', async ({
     comfyPage
   }) => {

browser_tests/tests/subgraph.spec.ts

@@ -61,10 +61,7 @@ test.describe('Subgraph Operations', { tag: ['@slow', '@subgraph'] }, () => {
       await subgraphNode.navigateIntoSubgraph()
 
       const initialCount = await getSubgraphSlotCount(comfyPage, 'inputs')
-      const [vaeEncodeNode] = await comfyPage.nodeOps.getNodeRefsByType(
-        'VAEEncode',
-        true
-      )
+      const vaeEncodeNode = await comfyPage.nodeOps.getNodeRefById('2')
 
       await comfyPage.subgraph.connectFromInput(vaeEncodeNode, 0)
       await comfyPage.nextFrame()
@@ -80,10 +77,7 @@ test.describe('Subgraph Operations', { tag: ['@slow', '@subgraph'] }, () => {
       await subgraphNode.navigateIntoSubgraph()
 
       const initialCount = await getSubgraphSlotCount(comfyPage, 'outputs')
-      const [vaeEncodeNode] = await comfyPage.nodeOps.getNodeRefsByType(
-        'VAEEncode',
-        true
-      )
+      const vaeEncodeNode = await comfyPage.nodeOps.getNodeRefById('2')
 
       await comfyPage.subgraph.connectToOutput(vaeEncodeNode, 0)
       await comfyPage.nextFrame()
@@ -826,7 +820,7 @@ test.describe('Subgraph Operations', { tag: ['@slow', '@subgraph'] }, () => {
 
       // Open settings dialog using hotkey
       await comfyPage.page.keyboard.press('Control+,')
-      await comfyPage.page.waitForSelector('[data-testid="settings-dialog"]', {
+      await comfyPage.page.waitForSelector('.settings-container', {
         state: 'visible'
       })
 
@@ -836,7 +830,7 @@ test.describe('Subgraph Operations', { tag: ['@slow', '@subgraph'] }, () => {
 
       // Dialog should be closed
       await expect(
-        comfyPage.page.locator('[data-testid="settings-dialog"]')
+        comfyPage.page.locator('.settings-container')
       ).not.toBeVisible()
 
       // Should still be in subgraph

browser_tests/tests/useSettingSearch.spec.ts

@@ -22,6 +22,7 @@ test.describe('Settings Search functionality', { tag: '@settings' }, () => {
         name: 'TestSettingsExtension',
         settings: [
           {
+            // Extensions can register arbitrary setting IDs
             id: 'TestHiddenSetting' as TestSettingId,
             name: 'Test Hidden Setting',
             type: 'hidden',
@@ -29,6 +30,7 @@ test.describe('Settings Search functionality', { tag: '@settings' }, () => {
             category: ['Test', 'Hidden']
           },
           {
+            // Extensions can register arbitrary setting IDs
             id: 'TestDeprecatedSetting' as TestSettingId,
             name: 'Test Deprecated Setting',
             type: 'text',
@@ -37,6 +39,7 @@ test.describe('Settings Search functionality', { tag: '@settings' }, () => {
             category: ['Test', 'Deprecated']
           },
           {
+            // Extensions can register arbitrary setting IDs
             id: 'TestVisibleSetting' as TestSettingId,
             name: 'Test Visible Setting',
             type: 'text',
@@ -49,143 +52,238 @@ test.describe('Settings Search functionality', { tag: '@settings' }, () => {
   })
 
   test('can open settings dialog and use search box', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await expect(dialog.searchBox).toHaveAttribute(
+    // Find the search box
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+    await expect(searchBox).toBeVisible()
+
+    // Verify search box has the correct placeholder
+    await expect(searchBox).toHaveAttribute(
       'placeholder',
       expect.stringContaining('Search')
     )
   })
 
   test('search box is functional and accepts input', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await dialog.searchBox.fill('Comfy')
-    await expect(dialog.searchBox).toHaveValue('Comfy')
+    // Find and interact with the search box
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+    await searchBox.fill('Comfy')
+
+    // Verify the input was accepted
+    await expect(searchBox).toHaveValue('Comfy')
   })
 
   test('search box clears properly', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await dialog.searchBox.fill('test')
-    await expect(dialog.searchBox).toHaveValue('test')
+    // Find and interact with the search box
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+    await searchBox.fill('test')
+    await expect(searchBox).toHaveValue('test')
 
-    await dialog.searchBox.clear()
-    await expect(dialog.searchBox).toHaveValue('')
+    // Clear the search box
+    await searchBox.clear()
+    await expect(searchBox).toHaveValue('')
   })
 
   test('settings categories are visible in sidebar', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    expect(await dialog.categories.count()).toBeGreaterThan(0)
+    // Check that the sidebar has categories
+    const categories = comfyPage.page.locator(
+      '.settings-sidebar .p-listbox-option'
+    )
+    expect(await categories.count()).toBeGreaterThan(0)
+
+    // Check that at least one category is visible
+    await expect(categories.first()).toBeVisible()
   })
 
   test('can select different categories in sidebar', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    const categoryCount = await dialog.categories.count()
+    // Click on a specific category (Appearance) to verify category switching
+    const appearanceCategory = comfyPage.page.getByRole('option', {
+      name: 'Appearance'
+    })
+    await appearanceCategory.click()
 
-    if (categoryCount > 1) {
-      await dialog.categories.nth(1).click()
+    // Verify the category is selected
+    await expect(appearanceCategory).toHaveClass(/p-listbox-option-selected/)
+  })
 
-      await expect(dialog.categories.nth(1)).toHaveClass(
-        /bg-interface-menu-component-surface-selected/
-      )
-    }
+  test('settings content area is visible', async ({ comfyPage }) => {
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
+
+    // Check that the content area is visible
+    const contentArea = comfyPage.page.locator('.settings-content')
+    await expect(contentArea).toBeVisible()
+
+    // Check that tab panels are visible
+    const tabPanels = comfyPage.page.locator('.settings-tab-panels')
+    await expect(tabPanels).toBeVisible()
   })
 
   test('search functionality affects UI state', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await dialog.searchBox.fill('graph')
-    await expect(dialog.searchBox).toHaveValue('graph')
+    // Find the search box
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+
+    // Type in search box
+    await searchBox.fill('graph')
+
+    // Verify that the search input is handled
+    await expect(searchBox).toHaveValue('graph')
   })
 
   test('settings dialog can be closed', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
+    // Close with escape key
     await comfyPage.page.keyboard.press('Escape')
-    await expect(dialog.root).not.toBeVisible()
+
+    // Verify dialog is closed
+    await expect(settingsDialog).not.toBeVisible()
   })
 
   test('search box has proper debouncing behavior', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await dialog.searchBox.fill('a')
-    await dialog.searchBox.fill('ab')
-    await dialog.searchBox.fill('abc')
-    await dialog.searchBox.fill('abcd')
+    // Type rapidly in search box
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+    await searchBox.fill('a')
+    await searchBox.fill('ab')
+    await searchBox.fill('abc')
+    await searchBox.fill('abcd')
 
-    await expect(dialog.searchBox).toHaveValue('abcd')
+    // Verify final value
+    await expect(searchBox).toHaveValue('abcd')
   })
 
   test('search excludes hidden settings from results', async ({
     comfyPage
   }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await dialog.searchBox.fill('Test')
+    // Search for our test settings
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+    await searchBox.fill('Test')
 
-    await expect(dialog.contentArea).toContainText('Test Visible Setting')
-    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
+    // Get all settings content
+    const settingsContent = comfyPage.page.locator('.settings-tab-panels')
+
+    // Should show visible setting but not hidden setting
+    await expect(settingsContent).toContainText('Test Visible Setting')
+    await expect(settingsContent).not.toContainText('Test Hidden Setting')
   })
 
   test('search excludes deprecated settings from results', async ({
     comfyPage
   }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await dialog.searchBox.fill('Test')
+    // Search for our test settings
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+    await searchBox.fill('Test')
 
-    await expect(dialog.contentArea).toContainText('Test Visible Setting')
-    await expect(dialog.contentArea).not.toContainText(
-      'Test Deprecated Setting'
-    )
+    // Get all settings content
+    const settingsContent = comfyPage.page.locator('.settings-tab-panels')
+
+    // Should show visible setting but not deprecated setting
+    await expect(settingsContent).toContainText('Test Visible Setting')
+    await expect(settingsContent).not.toContainText('Test Deprecated Setting')
   })
 
   test('search shows visible settings but excludes hidden and deprecated', async ({
     comfyPage
   }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await dialog.searchBox.fill('Test')
+    // Search for our test settings
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+    await searchBox.fill('Test')
 
-    await expect(dialog.contentArea).toContainText('Test Visible Setting')
-    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
-    await expect(dialog.contentArea).not.toContainText(
-      'Test Deprecated Setting'
-    )
+    // Get all settings content
+    const settingsContent = comfyPage.page.locator('.settings-tab-panels')
+
+    // Should only show the visible setting
+    await expect(settingsContent).toContainText('Test Visible Setting')
+
+    // Should not show hidden or deprecated settings
+    await expect(settingsContent).not.toContainText('Test Hidden Setting')
+    await expect(settingsContent).not.toContainText('Test Deprecated Setting')
   })
 
   test('search by setting name excludes hidden and deprecated', async ({
     comfyPage
   }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
+    // Open settings dialog
+    await comfyPage.page.keyboard.press('Control+,')
+    const settingsDialog = comfyPage.page.locator('.settings-container')
+    await expect(settingsDialog).toBeVisible()
 
-    await dialog.searchBox.clear()
-    await dialog.searchBox.fill('Hidden')
-    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
+    const searchBox = comfyPage.page.locator('.settings-search-box input')
+    const settingsContent = comfyPage.page.locator('.settings-tab-panels')
 
-    await dialog.searchBox.clear()
-    await dialog.searchBox.fill('Deprecated')
-    await expect(dialog.contentArea).not.toContainText(
-      'Test Deprecated Setting'
-    )
+    // Search specifically for hidden setting by name
+    await searchBox.clear()
+    await searchBox.fill('Hidden')
 
-    await dialog.searchBox.clear()
-    await dialog.searchBox.fill('Visible')
-    await expect(dialog.contentArea).toContainText('Test Visible Setting')
+    // Should not show the hidden setting even when searching by name
+    await expect(settingsContent).not.toContainText('Test Hidden Setting')
+
+    // Search specifically for deprecated setting by name
+    await searchBox.clear()
+    await searchBox.fill('Deprecated')
+
+    // Should not show the deprecated setting even when searching by name
+    await expect(settingsContent).not.toContainText('Test Deprecated Setting')
+
+    // Search for visible setting by name - should work
+    await searchBox.clear()
+    await searchBox.fill('Visible')
+
+    // Should show the visible setting
+    await expect(settingsContent).toContainText('Test Visible Setting')
   })
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.40.5",
+  "version": "1.39.12",
   "private": true,
   "description": "Official front-end implementation of ComfyUI",
   "homepage": "https://comfy.org",
@@ -193,7 +193,7 @@
   },
   "pnpm": {
     "overrides": {
-      "vite": "catalog:"
+      "vite": "^8.0.0-beta.8"
     }
   }
 }

packages/design-system/src/icons/comfy-c.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 9">
-  <path d="M1.82148 8.68376C1.61587 8.68376 1.44996 8.60733 1.34177 8.46284C1.23057 8.31438 1.20157 8.10711 1.26219 7.89434L1.50561 7.03961C1.52502 6.97155 1.51151 6.89831 1.46918 6.8417C1.42684 6.7852 1.3606 6.75194 1.29025 6.75194H0.590376C0.384656 6.75194 0.21875 6.67562 0.110614 6.53113C-0.000591531 6.38256 -0.0295831 6.17529 0.0310774 5.96252L0.867308 3.03952L0.959638 2.71838C1.08375 2.28258 1.53638 1.9284 1.96878 1.9284H2.80622C2.90615 1.9284 2.99406 1.86177 3.02157 1.76508L3.29852 0.79284C3.4225 0.357484 3.87514 0.0033043 4.30753 0.0033043L6.09854 0.000112775L7.40967 0C7.61533 0 7.78124 0.0763259 7.88937 0.220813C8.00058 0.369269 8.02957 0.576538 7.96895 0.78931L7.59405 2.10572C7.4701 2.54096 7.01746 2.89503 6.58507 2.89503L4.79008 2.89844H3.95292C3.8531 2.89844 3.7653 2.96496 3.73762 3.06155L3.03961 5.49964C3.02008 5.56781 3.03359 5.64127 3.07604 5.69787C3.11837 5.75437 3.18461 5.78763 3.2549 5.78763C3.25507 5.78763 4.44105 5.78532 4.44105 5.78532H5.7483C5.95396 5.78532 6.11986 5.86164 6.228 6.00613C6.33921 6.1547 6.3682 6.36197 6.30754 6.57474L5.93263 7.89092C5.80869 8.32628 5.35605 8.68034 4.92366 8.68034L3.12872 8.68376H1.82148Z" fill="#8A8A8A"/>
-</svg>
-

pnpm-workspace.yaml

@@ -92,7 +92,7 @@ catalog:
   unplugin-icons: ^22.5.0
   unplugin-typegpu: 0.8.0
   unplugin-vue-components: ^30.0.0
-  vite: 8.0.0-beta.13
+  vite: ^8.0.0-beta.8
   vite-plugin-dts: ^4.5.4
   vite-plugin-html: ^3.2.2
   vite-plugin-vue-devtools: ^8.0.0

src/components/TopMenuSection.test.ts

@@ -2,12 +2,11 @@ import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
 import type { MenuItem } from 'primevue/menuitem'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed, defineComponent, h, nextTick, onMounted, ref } from 'vue'
+import { computed, defineComponent, h, nextTick, onMounted } from 'vue'
 import type { Component } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import TopMenuSection from '@/components/TopMenuSection.vue'
-import QueueNotificationBannerHost from '@/components/queue/QueueNotificationBannerHost.vue'
 import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
 import LoginButton from '@/components/topbar/LoginButton.vue'
 import type {
@@ -20,11 +19,7 @@ import { useExecutionStore } from '@/stores/executionStore'
 import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 
-const mockData = vi.hoisted(() => ({
-  isLoggedIn: false,
-  isDesktop: false,
-  setShowConflictRedDot: (_value: boolean) => {}
-}))
+const mockData = vi.hoisted(() => ({ isLoggedIn: false, isDesktop: false }))
 
 vi.mock('@/composables/auth/useCurrentUser', () => ({
   useCurrentUser: () => {
@@ -41,36 +36,6 @@ vi.mock('@/platform/distribution/types', () => ({
     return mockData.isDesktop
   }
 }))
-
-vi.mock('@/platform/updates/common/releaseStore', () => ({
-  useReleaseStore: () => ({
-    shouldShowRedDot: computed(() => true)
-  })
-}))
-
-vi.mock(
-  '@/workbench/extensions/manager/composables/useConflictAcknowledgment',
-  () => {
-    const shouldShowConflictRedDot = ref(false)
-    mockData.setShowConflictRedDot = (value: boolean) => {
-      shouldShowConflictRedDot.value = value
-    }
-
-    return {
-      useConflictAcknowledgment: () => ({
-        shouldShowRedDot: shouldShowConflictRedDot
-      })
-    }
-  }
-)
-
-vi.mock('@/workbench/extensions/manager/composables/useManagerState', () => ({
-  useManagerState: () => ({
-    shouldShowManagerButtons: computed(() => true),
-    openManager: vi.fn()
-  })
-}))
-
 vi.mock('@/stores/firebaseAuthStore', () => ({
   useFirebaseAuthStore: vi.fn(() => ({
     currentUser: null,
@@ -114,7 +79,6 @@ function createWrapper({
         SubgraphBreadcrumb: true,
         QueueProgressOverlay: true,
         QueueInlineProgressSummary: true,
-        QueueNotificationBannerHost: true,
         CurrentUserButton: true,
         LoginButton: true,
         ContextMenu: {
@@ -144,25 +108,12 @@ function createTask(id: string, status: JobStatus): TaskItemImpl {
   return new TaskItemImpl(createJob(id, status))
 }
 
-function createComfyActionbarStub(actionbarTarget: HTMLElement) {
-  return defineComponent({
-    name: 'ComfyActionbar',
-    setup(_, { emit }) {
-      onMounted(() => {
-        emit('update:progressTarget', actionbarTarget)
-      })
-      return () => h('div')
-    }
-  })
-}
-
 describe('TopMenuSection', () => {
   beforeEach(() => {
     vi.resetAllMocks()
     localStorage.clear()
     mockData.isDesktop = false
     mockData.isLoggedIn = false
-    mockData.setShowConflictRedDot(false)
   })
 
   describe('authentication state', () => {
@@ -330,7 +281,15 @@ describe('TopMenuSection', () => {
       const executionStore = useExecutionStore(pinia)
       executionStore.activePromptId = 'prompt-1'
 
-      const ComfyActionbarStub = createComfyActionbarStub(actionbarTarget)
+      const ComfyActionbarStub = defineComponent({
+        name: 'ComfyActionbar',
+        setup(_, { emit }) {
+          onMounted(() => {
+            emit('update:progressTarget', actionbarTarget)
+          })
+          return () => h('div')
+        }
+      })
 
       const wrapper = createWrapper({
         pinia,
@@ -352,103 +311,6 @@ describe('TopMenuSection', () => {
     })
   })
 
-  describe(QueueNotificationBannerHost, () => {
-    const configureSettings = (
-      pinia: ReturnType<typeof createTestingPinia>,
-      qpoV2Enabled: boolean
-    ) => {
-      const settingStore = useSettingStore(pinia)
-      vi.mocked(settingStore.get).mockImplementation((key) => {
-        if (key === 'Comfy.Queue.QPOV2') return qpoV2Enabled
-        if (key === 'Comfy.UseNewMenu') return 'Top'
-        return undefined
-      })
-    }
-
-    it('renders queue notification banners when QPO V2 is enabled', async () => {
-      const pinia = createTestingPinia({ createSpy: vi.fn })
-      configureSettings(pinia, true)
-
-      const wrapper = createWrapper({ pinia })
-
-      await nextTick()
-
-      expect(
-        wrapper.findComponent({ name: 'QueueNotificationBannerHost' }).exists()
-      ).toBe(true)
-    })
-
-    it('renders queue notification banners when QPO V2 is disabled', async () => {
-      const pinia = createTestingPinia({ createSpy: vi.fn })
-      configureSettings(pinia, false)
-
-      const wrapper = createWrapper({ pinia })
-
-      await nextTick()
-
-      expect(
-        wrapper.findComponent({ name: 'QueueNotificationBannerHost' }).exists()
-      ).toBe(true)
-    })
-
-    it('renders inline summary above banners when both are visible', async () => {
-      const pinia = createTestingPinia({ createSpy: vi.fn })
-      configureSettings(pinia, true)
-      const wrapper = createWrapper({ pinia })
-
-      await nextTick()
-
-      const html = wrapper.html()
-      const inlineSummaryIndex = html.indexOf(
-        'queue-inline-progress-summary-stub'
-      )
-      const queueBannerIndex = html.indexOf(
-        'queue-notification-banner-host-stub'
-      )
-
-      expect(inlineSummaryIndex).toBeGreaterThan(-1)
-      expect(queueBannerIndex).toBeGreaterThan(-1)
-      expect(inlineSummaryIndex).toBeLessThan(queueBannerIndex)
-    })
-
-    it('does not teleport queue notification banners when actionbar is floating', async () => {
-      localStorage.setItem('Comfy.MenuPosition.Docked', 'false')
-      const actionbarTarget = document.createElement('div')
-      document.body.appendChild(actionbarTarget)
-      const pinia = createTestingPinia({ createSpy: vi.fn })
-      configureSettings(pinia, true)
-      const executionStore = useExecutionStore(pinia)
-      executionStore.activePromptId = 'prompt-1'
-
-      const ComfyActionbarStub = createComfyActionbarStub(actionbarTarget)
-
-      const wrapper = createWrapper({
-        pinia,
-        attachTo: document.body,
-        stubs: {
-          ComfyActionbar: ComfyActionbarStub,
-          QueueNotificationBannerHost: true
-        }
-      })
-
-      try {
-        await nextTick()
-
-        expect(
-          actionbarTarget.querySelector('queue-notification-banner-host-stub')
-        ).toBeNull()
-        expect(
-          wrapper
-            .findComponent({ name: 'QueueNotificationBannerHost' })
-            .exists()
-        ).toBe(true)
-      } finally {
-        wrapper.unmount()
-        actionbarTarget.remove()
-      }
-    })
-  })
-
   it('disables the clear queue context menu item when no queued jobs exist', () => {
     const wrapper = createWrapper()
     const menu = wrapper.findComponent({ name: 'ContextMenu' })
@@ -468,16 +330,4 @@ describe('TopMenuSection', () => {
     const model = menu.props('model') as MenuItem[]
     expect(model[0]?.disabled).toBe(false)
   })
-
-  it('shows manager red dot only for manager conflicts', async () => {
-    const wrapper = createWrapper()
-
-    // Release red dot is mocked as true globally for this test file.
-    expect(wrapper.find('span.bg-red-500').exists()).toBe(false)
-
-    mockData.setShowConflictRedDot(true)
-    await nextTick()
-
-    expect(wrapper.find('span.bg-red-500').exists()).toBe(true)
-  })
 })

src/components/TopMenuSection.vue

@@ -105,7 +105,7 @@
       </div>
     </div>
 
-    <div class="flex flex-col items-end gap-1">
+    <div>
       <Teleport
         v-if="inlineProgressSummaryTarget"
         :to="inlineProgressSummaryTarget"
@@ -121,10 +121,6 @@
         class="pr-1"
         :hidden="isQueueOverlayExpanded"
       />
-      <QueueNotificationBannerHost
-        v-if="shouldShowQueueNotificationBanners"
-        class="pr-1"
-      />
     </div>
   </div>
 </template>
@@ -140,7 +136,6 @@ import { useI18n } from 'vue-i18n'
 import ComfyActionbar from '@/components/actionbar/ComfyActionbar.vue'
 import SubgraphBreadcrumb from '@/components/breadcrumb/SubgraphBreadcrumb.vue'
 import QueueInlineProgressSummary from '@/components/queue/QueueInlineProgressSummary.vue'
-import QueueNotificationBannerHost from '@/components/queue/QueueNotificationBannerHost.vue'
 import QueueProgressOverlay from '@/components/queue/QueueProgressOverlay.vue'
 import ActionBarButtons from '@/components/topbar/ActionBarButtons.vue'
 import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
@@ -150,6 +145,7 @@ import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import { useReleaseStore } from '@/platform/updates/common/releaseStore'
 import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
@@ -177,6 +173,8 @@ const sidebarTabStore = useSidebarTabStore()
 const { activeJobsCount } = storeToRefs(queueStore)
 const { isOverlayExpanded: isQueueOverlayExpanded } = storeToRefs(queueUIStore)
 const { activeSidebarTabId } = storeToRefs(sidebarTabStore)
+const releaseStore = useReleaseStore()
+const { shouldShowRedDot: showReleaseRedDot } = storeToRefs(releaseStore)
 const { shouldShowRedDot: shouldShowConflictRedDot } =
   useConflictAcknowledgment()
 const isTopMenuHovered = ref(false)
@@ -209,9 +207,6 @@ const isQueueProgressOverlayEnabled = computed(
 const shouldShowInlineProgressSummary = computed(
   () => isQueuePanelV2Enabled.value && isActionbarEnabled.value
 )
-const shouldShowQueueNotificationBanners = computed(
-  () => isActionbarEnabled.value
-)
 const progressTarget = ref<HTMLElement | null>(null)
 function updateProgressTarget(target: HTMLElement | null) {
   progressTarget.value = target
@@ -241,8 +236,10 @@ const queueContextMenuItems = computed<MenuItem[]>(() => [
   }
 ])
 
+// Use either release red dot or conflict red dot
 const shouldShowRedDot = computed((): boolean => {
-  return shouldShowConflictRedDot.value
+  const releaseRedDot = showReleaseRedDot.value
+  return releaseRedDot || shouldShowConflictRedDot.value
 })
 
 // Right side panel toggle

src/components/bottomPanel/BottomPanel.vue

@@ -89,12 +89,12 @@ import { useI18n } from 'vue-i18n'
 
 import ExtensionSlot from '@/components/common/ExtensionSlot.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogService } from '@/services/dialogService'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import type { BottomPanelExtension } from '@/types/extensionTypes'
 
 const bottomPanelStore = useBottomPanelStore()
-const settingsDialog = useSettingsDialog()
+const dialogService = useDialogService()
 const { t } = useI18n()
 
 const isShortcutsTabActive = computed(() => {
@@ -115,7 +115,7 @@ const getTabDisplayTitle = (tab: BottomPanelExtension): string => {
 }
 
 const openKeybindingSettings = async () => {
-  settingsDialog.show('keybinding')
+  dialogService.showSettingsDialog('keybinding')
 }
 
 const closeBottomPanel = () => {

src/components/common/TreeExplorer.vue

@@ -12,9 +12,9 @@
       nodeContent: ({ context }) => ({
         class: 'group/tree-node',
         onClick: (e: MouseEvent) =>
-          onNodeContentClick(e, context.node as RenderedTreeExplorerNode<T>),
+          onNodeContentClick(e, context.node as RenderedTreeExplorerNode),
         onContextmenu: (e: MouseEvent) =>
-          handleContextMenu(e, context.node as RenderedTreeExplorerNode<T>)
+          handleContextMenu(e, context.node as RenderedTreeExplorerNode)
       }),
       nodeToggleButton: () => ({
         onClick: (e: MouseEvent) => {
@@ -36,11 +36,15 @@
   </Tree>
   <ContextMenu ref="menu" :model="menuItems" />
 </template>
-<script setup lang="ts" generic="T">
+<script setup lang="ts">
+defineOptions({
+  inheritAttrs: false
+})
+
 import ContextMenu from 'primevue/contextmenu'
 import type { MenuItem, MenuItemCommandEvent } from 'primevue/menuitem'
 import Tree from 'primevue/tree'
-import { computed, provide, ref, shallowRef } from 'vue'
+import { computed, provide, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
@@ -56,10 +60,6 @@ import type {
 } from '@/types/treeExplorerTypes'
 import { combineTrees, findNodeByKey } from '@/utils/treeUtil'
 
-defineOptions({
-  inheritAttrs: false
-})
-
 const expandedKeys = defineModel<Record<string, boolean>>('expandedKeys', {
   required: true
 })
@@ -69,13 +69,13 @@ const selectionKeys = defineModel<Record<string, boolean>>('selectionKeys')
 const storeSelectionKeys = selectionKeys.value !== undefined
 
 const props = defineProps<{
-  root: TreeExplorerNode<T>
+  root: TreeExplorerNode
   class?: string
 }>()
 const emit = defineEmits<{
-  (e: 'nodeClick', node: RenderedTreeExplorerNode<T>, event: MouseEvent): void
-  (e: 'nodeDelete', node: RenderedTreeExplorerNode<T>): void
-  (e: 'contextMenu', node: RenderedTreeExplorerNode<T>, event: MouseEvent): void
+  (e: 'nodeClick', node: RenderedTreeExplorerNode, event: MouseEvent): void
+  (e: 'nodeDelete', node: RenderedTreeExplorerNode): void
+  (e: 'contextMenu', node: RenderedTreeExplorerNode, event: MouseEvent): void
 }>()
 
 const {
@@ -83,19 +83,19 @@ const {
   getAddFolderMenuItem,
   handleFolderCreation,
   addFolderCommand
-} = useTreeFolderOperations<T>(
-  /* expandNode */ (node: TreeExplorerNode<T>) => {
+} = useTreeFolderOperations(
+  /* expandNode */ (node: TreeExplorerNode) => {
     expandedKeys.value[node.key] = true
   }
 )
 
-const renderedRoot = computed<RenderedTreeExplorerNode<T>>(() => {
+const renderedRoot = computed<RenderedTreeExplorerNode>(() => {
   const renderedRoot = fillNodeInfo(props.root)
   return newFolderNode.value
     ? combineTrees(renderedRoot, newFolderNode.value)
     : renderedRoot
 })
-const getTreeNodeIcon = (node: TreeExplorerNode<T>) => {
+const getTreeNodeIcon = (node: TreeExplorerNode) => {
   if (node.getIcon) {
     const icon = node.getIcon()
     if (icon) {
@@ -111,9 +111,7 @@ const getTreeNodeIcon = (node: TreeExplorerNode<T>) => {
   const isExpanded = expandedKeys.value?.[node.key] ?? false
   return isExpanded ? 'pi pi-folder-open' : 'pi pi-folder'
 }
-const fillNodeInfo = (
-  node: TreeExplorerNode<T>
-): RenderedTreeExplorerNode<T> => {
+const fillNodeInfo = (node: TreeExplorerNode): RenderedTreeExplorerNode => {
   const children = node.children?.map(fillNodeInfo) ?? []
   const totalLeaves = node.leaf
     ? 1
@@ -130,7 +128,7 @@ const fillNodeInfo = (
 }
 const onNodeContentClick = async (
   e: MouseEvent,
-  node: RenderedTreeExplorerNode<T>
+  node: RenderedTreeExplorerNode
 ) => {
   if (!storeSelectionKeys) {
     selectionKeys.value = {}
@@ -141,22 +139,20 @@ const onNodeContentClick = async (
   emit('nodeClick', node, e)
 }
 const menu = ref<InstanceType<typeof ContextMenu> | null>(null)
-const menuTargetNode = shallowRef<RenderedTreeExplorerNode<T> | null>(null)
+const menuTargetNode = ref<RenderedTreeExplorerNode | null>(null)
 const extraMenuItems = computed(() => {
-  const node = menuTargetNode.value
-  return node?.contextMenuItems
-    ? typeof node.contextMenuItems === 'function'
-      ? node.contextMenuItems(node)
-      : node.contextMenuItems
+  return menuTargetNode.value?.contextMenuItems
+    ? typeof menuTargetNode.value.contextMenuItems === 'function'
+      ? menuTargetNode.value.contextMenuItems(menuTargetNode.value)
+      : menuTargetNode.value.contextMenuItems
     : []
 })
-const renameEditingNode = shallowRef<RenderedTreeExplorerNode<T> | null>(null)
+const renameEditingNode = ref<RenderedTreeExplorerNode | null>(null)
 const errorHandling = useErrorHandling()
 const handleNodeLabelEdit = async (
-  n: RenderedTreeExplorerNode,
+  node: RenderedTreeExplorerNode,
   newName: string
 ) => {
-  const node = n as RenderedTreeExplorerNode<T>
   await errorHandling.wrapWithErrorHandlingAsync(
     async () => {
       if (node.key === newFolderNode.value?.key) {
@@ -174,36 +170,35 @@ const handleNodeLabelEdit = async (
 provide(InjectKeyHandleEditLabelFunction, handleNodeLabelEdit)
 
 const { t } = useI18n()
-const renameCommand = (node: RenderedTreeExplorerNode<T>) => {
+const renameCommand = (node: RenderedTreeExplorerNode) => {
   renameEditingNode.value = node
 }
-const deleteCommand = async (node: RenderedTreeExplorerNode<T>) => {
+const deleteCommand = async (node: RenderedTreeExplorerNode) => {
   await node.handleDelete?.()
   emit('nodeDelete', node)
 }
-const menuItems = computed<MenuItem[]>(() => {
-  const node = menuTargetNode.value
-  return [
-    getAddFolderMenuItem(node),
+const menuItems = computed<MenuItem[]>(() =>
+  [
+    getAddFolderMenuItem(menuTargetNode.value),
     {
       label: t('g.rename'),
       icon: 'pi pi-file-edit',
       command: () => {
-        if (node) {
-          renameCommand(node)
+        if (menuTargetNode.value) {
+          renameCommand(menuTargetNode.value)
         }
       },
-      visible: node?.handleRename !== undefined
+      visible: menuTargetNode.value?.handleRename !== undefined
     },
     {
       label: t('g.delete'),
       icon: 'pi pi-trash',
       command: async () => {
-        if (node) {
-          await deleteCommand(node)
+        if (menuTargetNode.value) {
+          await deleteCommand(menuTargetNode.value)
         }
       },
-      visible: node?.handleDelete !== undefined,
+      visible: menuTargetNode.value?.handleDelete !== undefined,
       isAsync: true // The delete command can be async
     },
     ...extraMenuItems.value
@@ -215,12 +210,9 @@ const menuItems = computed<MenuItem[]>(() => {
         })
       : undefined
   }))
-})
+)
 
-const handleContextMenu = (
-  e: MouseEvent,
-  node: RenderedTreeExplorerNode<T>
-) => {
+const handleContextMenu = (e: MouseEvent, node: RenderedTreeExplorerNode) => {
   menuTargetNode.value = node
   emit('contextMenu', node, e)
   if (menuItems.value.filter((item) => item.visible).length > 0) {
@@ -232,13 +224,15 @@ const wrapCommandWithErrorHandler = (
   command: (event: MenuItemCommandEvent) => void,
   { isAsync = false }: { isAsync: boolean }
 ) => {
-  const node = menuTargetNode.value
   return isAsync
     ? errorHandling.wrapWithErrorHandlingAsync(
         command as (event: MenuItemCommandEvent) => Promise<void>,
-        node?.handleError
+        menuTargetNode.value?.handleError
+      )
+    : errorHandling.wrapWithErrorHandling(
+        command,
+        menuTargetNode.value?.handleError
       )
-    : errorHandling.wrapWithErrorHandling(command, node?.handleError)
 }
 
 defineExpose({

src/components/common/TreeExplorerTreeNode.vue

@@ -36,7 +36,7 @@
   </div>
 </template>
 
-<script setup lang="ts" generic="T">
+<script setup lang="ts">
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview'
 import Badge from 'primevue/badge'
 import { computed, inject, ref } from 'vue'
@@ -53,17 +53,17 @@ import type {
 } from '@/types/treeExplorerTypes'
 
 const props = defineProps<{
-  node: RenderedTreeExplorerNode<T>
+  node: RenderedTreeExplorerNode
 }>()
 
 const emit = defineEmits<{
   (
     e: 'itemDropped',
-    node: RenderedTreeExplorerNode<T>,
-    data: RenderedTreeExplorerNode<T>
+    node: RenderedTreeExplorerNode,
+    data: RenderedTreeExplorerNode
   ): void
-  (e: 'dragStart', node: RenderedTreeExplorerNode<T>): void
-  (e: 'dragEnd', node: RenderedTreeExplorerNode<T>): void
+  (e: 'dragStart', node: RenderedTreeExplorerNode): void
+  (e: 'dragEnd', node: RenderedTreeExplorerNode): void
 }>()
 
 const nodeBadgeText = computed<string>(() => {
@@ -80,7 +80,7 @@ const showNodeBadgeText = computed<boolean>(() => nodeBadgeText.value !== '')
 const isEditing = computed<boolean>(() => props.node.isEditingLabel ?? false)
 const handleEditLabel = inject(InjectKeyHandleEditLabelFunction)
 const handleRename = (newName: string) => {
-  handleEditLabel?.(props.node as RenderedTreeExplorerNode, newName)
+  handleEditLabel?.(props.node, newName)
 }
 
 const container = ref<HTMLElement | null>(null)
@@ -117,13 +117,9 @@ if (props.node.droppable) {
     onDrop: async (event) => {
       const dndData = event.source.data as TreeExplorerDragAndDropData
       if (dndData.type === 'tree-explorer-node') {
-        await props.node.handleDrop?.(dndData as TreeExplorerDragAndDropData<T>)
+        await props.node.handleDrop?.(dndData)
         canDrop.value = false
-        emit(
-          'itemDropped',
-          props.node,
-          dndData.data as RenderedTreeExplorerNode<T>
-        )
+        emit('itemDropped', props.node, dndData.data)
       }
     },
     onDragEnter: (event) => {

src/components/custom/widget/WorkflowTemplateSelectorDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <BaseModalLayout
     :content-title="$t('templateWorkflows.title', 'Workflow Templates')"
-    size="md"
+    class="workflow-template-selector-dialog"
   >
     <template #leftPanelHeaderTitle>
       <i class="icon-[comfy--template]" />
@@ -854,3 +854,19 @@ onBeforeUnmount(() => {
   cardRefs.value = [] // Release DOM refs
 })
 </script>
+
+<style>
+/* Ensure the workflow template selector dialog fits within provided dialog */
+.workflow-template-selector-dialog.base-widget-layout {
+  width: 100% !important;
+  max-width: 1400px;
+  height: 100% !important;
+  aspect-ratio: auto !important;
+}
+
+@media (min-width: 1600px) {
+  .workflow-template-selector-dialog.base-widget-layout {
+    max-width: 1600px;
+  }
+}
+</style>

src/components/dialog/GlobalDialog.vue

@@ -4,7 +4,12 @@
     v-for="item in dialogStore.dialogStack"
     :key="item.key"
     v-model:visible="item.visible"
-    class="global-dialog"
+    :class="[
+      'global-dialog',
+      item.key === 'global-settings' && teamWorkspacesEnabled
+        ? 'settings-dialog-workspace'
+        : ''
+    ]"
     v-bind="item.dialogComponentProps"
     :pt="getDialogPt(item)"
     :aria-labelledby="item.key"

src/components/dialog/content/ConfirmationDialogContent.vue

@@ -116,7 +116,7 @@ import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogService } from '@/services/dialogService'
 import type { ConfirmationDialogType } from '@/services/dialogService'
 import { useDialogStore } from '@/stores/dialogStore'
 
@@ -134,7 +134,10 @@ const onCancel = () => useDialogStore().closeDialog()
 
 function openBlueprintOverwriteSetting() {
   useDialogStore().closeDialog()
-  useSettingsDialog().show(undefined, 'Comfy.Workflow.WarnBlueprintOverwrite')
+  void useDialogService().showSettingsDialog(
+    undefined,
+    'Comfy.Workflow.WarnBlueprintOverwrite'
+  )
 }
 
 const doNotAskAgain = ref(false)

src/components/dialog/content/MissingModelsWarning.vue

@@ -64,7 +64,7 @@ import FileDownload from '@/components/common/FileDownload.vue'
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import { isDesktop } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogService } from '@/services/dialogService'
 import { useDialogStore } from '@/stores/dialogStore'
 
 // TODO: Read this from server internal API rather than hardcoding here
@@ -105,7 +105,10 @@ const doNotAskAgain = ref(false)
 
 function openShowMissingModelsSetting() {
   useDialogStore().closeDialog({ key: 'global-missing-models-warning' })
-  useSettingsDialog().show(undefined, 'Comfy.Workflow.ShowMissingModelsWarning')
+  void useDialogService().showSettingsDialog(
+    undefined,
+    'Comfy.Workflow.ShowMissingModelsWarning'
+  )
 }
 
 const modelDownloads = ref<Record<string, ModelInfo>>({})

src/components/dialog/content/MissingNodesFooter.vue

@@ -80,7 +80,7 @@ import Button from '@/components/ui/button/Button.vue'
 import { isCloud } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useToastStore } from '@/platform/updates/common/toastStore'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogService } from '@/services/dialogService'
 import { useDialogStore } from '@/stores/dialogStore'
 import PackInstallButton from '@/workbench/extensions/manager/components/manager/button/PackInstallButton.vue'
 import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
@@ -103,7 +103,10 @@ const handleGotItClick = () => {
 
 function openShowMissingNodesSetting() {
   dialogStore.closeDialog({ key: 'global-missing-nodes' })
-  useSettingsDialog().show(undefined, 'Comfy.Workflow.ShowMissingNodesWarning')
+  void useDialogService().showSettingsDialog(
+    undefined,
+    'Comfy.Workflow.ShowMissingNodesWarning'
+  )
 }
 
 const { missingNodePacks, isLoading, error } = useMissingNodes()

src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue

@@ -162,7 +162,7 @@ import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import { useTelemetry } from '@/platform/telemetry'
 import { clearTopupTracking } from '@/platform/telemetry/topupTracker'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogService } from '@/services/dialogService'
 import { useDialogStore } from '@/stores/dialogStore'
 import { cn } from '@/utils/tailwindUtil'
 
@@ -173,7 +173,7 @@ const { isInsufficientCredits = false } = defineProps<{
 const { t } = useI18n()
 const authActions = useFirebaseAuthActions()
 const dialogStore = useDialogStore()
-const settingsDialog = useSettingsDialog()
+const dialogService = useDialogService()
 const telemetry = useTelemetry()
 const toast = useToast()
 const { buildDocsUrl, docsPaths } = useExternalLink()
@@ -266,7 +266,7 @@ async function handleBuy() {
       : isSubscriptionEnabled()
         ? 'subscription'
         : 'credits'
-    settingsDialog.show(settingsPanel)
+    dialogService.showSettingsDialog(settingsPanel)
   } catch (error) {
     console.error('Purchase failed:', error)
 

src/components/dialog/content/TopUpCreditsDialogContentWorkspace.vue

@@ -161,7 +161,7 @@ import { useExternalLink } from '@/composables/useExternalLink'
 import { useTelemetry } from '@/platform/telemetry'
 import { clearTopupTracking } from '@/platform/telemetry/topupTracker'
 import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogService } from '@/services/dialogService'
 import { useBillingOperationStore } from '@/stores/billingOperationStore'
 import { useDialogStore } from '@/stores/dialogStore'
 import { cn } from '@/utils/tailwindUtil'
@@ -172,7 +172,7 @@ const { isInsufficientCredits = false } = defineProps<{
 
 const { t } = useI18n()
 const dialogStore = useDialogStore()
-const settingsDialog = useSettingsDialog()
+const dialogService = useDialogService()
 const telemetry = useTelemetry()
 const toast = useToast()
 const { buildDocsUrl, docsPaths } = useExternalLink()
@@ -266,7 +266,7 @@ async function handleBuy() {
       })
       await fetchBalance()
       handleClose(false)
-      settingsDialog.show('workspace')
+      dialogService.showSettingsDialog('workspace')
     } else if (response.status === 'pending') {
       billingOperationStore.startOperation(response.billing_op_id, 'topup')
     } else {

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

@@ -1,5 +1,9 @@
 <template>
-  <div class="about-container flex flex-col gap-2" data-testid="about-panel">
+  <PanelTemplate
+    value="About"
+    class="about-container"
+    data-testid="about-panel"
+  >
     <h2 class="mb-2 text-2xl font-bold">
       {{ $t('g.about') }}
     </h2>
@@ -28,7 +32,7 @@
       v-if="systemStatsStore.systemStats"
       :stats="systemStatsStore.systemStats"
     />
-  </div>
+  </PanelTemplate>
 </template>
 
 <script setup lang="ts">
@@ -39,6 +43,8 @@ import SystemStatsPanel from '@/components/common/SystemStatsPanel.vue'
 import { useAboutPanelStore } from '@/stores/aboutPanelStore'
 import { useSystemStatsStore } from '@/stores/systemStatsStore'
 
+import PanelTemplate from './PanelTemplate.vue'
+
 const systemStatsStore = useSystemStatsStore()
 const aboutPanelStore = useAboutPanelStore()
 </script>

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

@@ -1,9 +1,13 @@
 <template>
-  <div class="keybinding-panel flex flex-col gap-2">
-    <SearchBox
-      v-model="filters['global'].value"
-      :placeholder="$t('g.searchPlaceholder', { subject: $t('g.keybindings') })"
-    />
+  <PanelTemplate value="Keybinding" class="keybinding-panel">
+    <template #header>
+      <SearchBox
+        v-model="filters['global'].value"
+        :placeholder="
+          $t('g.searchPlaceholder', { subject: $t('g.keybindings') })
+        "
+      />
+    </template>
 
     <DataTable
       v-model:selection="selectedCommandData"
@@ -131,7 +135,7 @@
       <i class="pi pi-replay" />
       {{ $t('g.resetAll') }}
     </Button>
-  </div>
+  </PanelTemplate>
 </template>
 
 <script setup lang="ts">
@@ -155,6 +159,7 @@ import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 
+import PanelTemplate from './PanelTemplate.vue'
 import KeyComboDisplay from './keybinding/KeyComboDisplay.vue'
 
 const filters = ref({

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="credits-container h-full">
+  <TabPanel value="Credits" class="credits-container h-full">
     <!-- Legacy Design -->
     <div class="flex h-full flex-col">
       <h2 class="mb-2 text-2xl font-bold">
@@ -102,7 +102,7 @@
         </Button>
       </div>
     </div>
-  </div>
+  </TabPanel>
 </template>
 
 <script setup lang="ts">
@@ -110,6 +110,7 @@ import Column from 'primevue/column'
 import DataTable from 'primevue/datatable'
 import Divider from 'primevue/divider'
 import Skeleton from 'primevue/skeleton'
+import TabPanel from 'primevue/tabpanel'
 import { computed, ref, watch } from 'vue'
 
 import UserCredit from '@/components/common/UserCredit.vue'

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

@@ -6,15 +6,14 @@
       <!-- Section Header -->
       <div class="flex w-full items-center gap-9">
         <div class="flex min-w-0 flex-1 items-baseline gap-2">
-          <span class="text-base font-semibold text-base-foreground">
+          <span
+            v-if="uiConfig.showMembersList"
+            class="text-base font-semibold text-base-foreground"
+          >
             <template v-if="activeView === 'active'">
               {{
                 $t('workspacePanel.members.membersCount', {
-                  count:
-                    isSingleSeatPlan || isPersonalWorkspace
-                      ? 1
-                      : members.length,
-                  maxSeats: maxSeats
+                  count: members.length
                 })
               }}
             </template>
@@ -28,10 +27,7 @@
             </template>
           </span>
         </div>
-        <div
-          v-if="uiConfig.showSearch && !isSingleSeatPlan"
-          class="flex items-start gap-2"
-        >
+        <div v-if="uiConfig.showSearch" class="flex items-start gap-2">
           <SearchBox
             v-model="searchQuery"
             :placeholder="$t('g.search')"
@@ -49,16 +45,14 @@
           :class="
             cn(
               'grid w-full items-center py-2',
-              isSingleSeatPlan
-                ? 'grid-cols-1 py-0'
-                : activeView === 'pending'
-                  ? uiConfig.pendingGridCols
-                  : uiConfig.headerGridCols
+              activeView === 'pending'
+                ? uiConfig.pendingGridCols
+                : uiConfig.headerGridCols
             )
           "
         >
           <!-- Tab buttons in first column -->
-          <div v-if="!isSingleSeatPlan" class="flex items-center gap-2">
+          <div class="flex items-center gap-2">
             <Button
               :variant="
                 activeView === 'active' ? 'secondary' : 'muted-textonly'
@@ -107,19 +101,17 @@
             <div />
           </template>
           <template v-else>
-            <template v-if="!isSingleSeatPlan">
-              <Button
-                variant="muted-textonly"
-                size="sm"
-                class="justify-end"
-                @click="toggleSort('joinDate')"
-              >
-                {{ $t('workspacePanel.members.columns.joinDate') }}
-                <i class="icon-[lucide--chevrons-up-down] size-4" />
-              </Button>
-              <!-- Empty cell for action column header (OWNER only) -->
-              <div v-if="permissions.canRemoveMembers" />
-            </template>
+            <Button
+              variant="muted-textonly"
+              size="sm"
+              class="justify-end"
+              @click="toggleSort('joinDate')"
+            >
+              {{ $t('workspacePanel.members.columns.joinDate') }}
+              <i class="icon-[lucide--chevrons-up-down] size-4" />
+            </Button>
+            <!-- Empty cell for action column header (OWNER only) -->
+            <div v-if="permissions.canRemoveMembers" />
           </template>
         </div>
 
@@ -174,7 +166,7 @@
                 :class="
                   cn(
                     'grid w-full items-center rounded-lg p-2',
-                    isSingleSeatPlan ? 'grid-cols-1' : uiConfig.membersGridCols,
+                    uiConfig.membersGridCols,
                     index % 2 === 1 && 'bg-secondary-background/50'
                   )
                 "
@@ -214,14 +206,14 @@
                 </div>
                 <!-- Join date -->
                 <span
-                  v-if="uiConfig.showDateColumn && !isSingleSeatPlan"
+                  v-if="uiConfig.showDateColumn"
                   class="text-sm text-muted-foreground text-right"
                 >
                   {{ formatDate(member.joinDate) }}
                 </span>
                 <!-- Remove member action (OWNER only, can't remove yourself) -->
                 <div
-                  v-if="permissions.canRemoveMembers && !isSingleSeatPlan"
+                  v-if="permissions.canRemoveMembers"
                   class="flex items-center justify-end"
                 >
                   <Button
@@ -245,29 +237,8 @@
             </template>
           </template>
 
-          <!-- Upsell Banner -->
-          <div
-            v-if="isSingleSeatPlan"
-            class="flex items-center gap-2 rounded-xl border bg-secondary-background border-border-default px-4 py-3 mt-4 justify-center"
-          >
-            <p class="m-0 text-sm text-foreground">
-              {{
-                isActiveSubscription
-                  ? $t('workspacePanel.members.upsellBannerUpgrade')
-                  : $t('workspacePanel.members.upsellBannerSubscribe')
-              }}
-            </p>
-            <Button
-              variant="muted-textonly"
-              class="cursor-pointer underline text-sm"
-              @click="showSubscriptionDialog()"
-            >
-              {{ $t('workspacePanel.members.viewPlans') }}
-            </Button>
-          </div>
-
           <!-- Pending Invites -->
-          <template v-if="activeView === 'pending'">
+          <template v-else>
             <div
               v-for="(invite, index) in filteredPendingInvites"
               :key="invite.id"
@@ -371,8 +342,6 @@ import SearchBox from '@/components/common/SearchBox.vue'
 import UserAvatar from '@/components/common/UserAvatar.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
-import { useBillingContext } from '@/composables/billing/useBillingContext'
-import { TIER_TO_KEY } from '@/platform/cloud/subscription/constants/tierPricing'
 import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
 import type {
   PendingInvite,
@@ -398,27 +367,6 @@ const {
 } = storeToRefs(workspaceStore)
 const { copyInviteLink } = workspaceStore
 const { permissions, uiConfig } = useWorkspaceUI()
-const {
-  isActiveSubscription,
-  subscription,
-  showSubscriptionDialog,
-  getMaxSeats
-} = useBillingContext()
-
-const maxSeats = computed(() => {
-  if (isPersonalWorkspace.value) return 1
-  const tier = subscription.value?.tier
-  if (!tier) return 1
-  const tierKey = TIER_TO_KEY[tier]
-  if (!tierKey) return 1
-  return getMaxSeats(tierKey)
-})
-
-const isSingleSeatPlan = computed(() => {
-  if (isPersonalWorkspace.value) return false
-  if (!isActiveSubscription.value) return true
-  return maxSeats.value <= 1
-})
 
 const searchQuery = ref('')
 const activeView = ref<'active' | 'pending'>('active')

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

@@ -0,0 +1,21 @@
+<template>
+  <TabPanel :value="props.value" class="h-full w-full" :class="props.class">
+    <div class="flex h-full w-full flex-col gap-2">
+      <slot name="header" />
+      <ScrollPanel class="h-0 grow pr-2">
+        <slot />
+      </ScrollPanel>
+      <slot name="footer" />
+    </div>
+  </TabPanel>
+</template>
+
+<script setup lang="ts">
+import ScrollPanel from 'primevue/scrollpanel'
+import TabPanel from 'primevue/tabpanel'
+
+const props = defineProps<{
+  value: string
+  class?: string
+}>()
+</script>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="user-settings-container h-full">
+  <TabPanel value="User" class="user-settings-container h-full">
     <div class="flex h-full flex-col">
       <h2 class="mb-2 text-2xl font-bold">{{ $t('userSettings.title') }}</h2>
       <Divider class="mb-3" />
@@ -95,12 +95,13 @@
         </Button>
       </div>
     </div>
-  </div>
+  </TabPanel>
 </template>
 
 <script setup lang="ts">
 import Divider from 'primevue/divider'
 import ProgressSpinner from 'primevue/progressspinner'
+import TabPanel from 'primevue/tabpanel'
 
 import UserAvatar from '@/components/common/UserAvatar.vue'
 import Button from '@/components/ui/button/Button.vue'

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

@@ -0,0 +1,11 @@
+<template>
+  <TabPanel value="Workspace" class="h-full">
+    <WorkspacePanelContent />
+  </TabPanel>
+</template>
+
+<script setup lang="ts">
+import TabPanel from 'primevue/tabpanel'
+
+import WorkspacePanelContent from '@/components/dialog/content/setting/WorkspacePanelContent.vue'
+</script>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="flex h-full w-full flex-col">
-    <header class="mb-8 flex items-center gap-4">
+    <div class="pb-8 flex items-center gap-4">
       <WorkspaceProfilePic
         class="size-12 !text-3xl"
         :workspace-name="workspaceName"
@@ -8,38 +8,44 @@
       <h1 class="text-3xl text-base-foreground">
         {{ workspaceName }}
       </h1>
-    </header>
-    <TabsRoot v-model="activeTab">
+    </div>
+    <Tabs unstyled :value="activeTab" @update:value="setActiveTab">
       <div class="flex w-full items-center">
-        <TabsList class="flex items-center gap-2 pb-1">
-          <TabsTrigger
+        <TabList unstyled class="flex w-full gap-2">
+          <Tab
             value="plan"
             :class="
               cn(
-                tabTriggerBase,
-                activeTab === 'plan' ? tabTriggerActive : tabTriggerInactive
+                buttonVariants({
+                  variant: activeTab === 'plan' ? 'secondary' : 'textonly',
+                  size: 'md'
+                }),
+                activeTab === 'plan' && 'text-base-foreground no-underline'
               )
             "
           >
             {{ $t('workspacePanel.tabs.planCredits') }}
-          </TabsTrigger>
-          <TabsTrigger
+          </Tab>
+          <Tab
             value="members"
             :class="
               cn(
-                tabTriggerBase,
-                activeTab === 'members' ? tabTriggerActive : tabTriggerInactive
+                buttonVariants({
+                  variant: activeTab === 'members' ? 'secondary' : 'textonly',
+                  size: 'md'
+                }),
+                activeTab === 'members' && 'text-base-foreground no-underline',
+                'ml-2'
               )
             "
           >
             {{
               $t('workspacePanel.tabs.membersCount', {
-                count: members.length
+                count: isInPersonalWorkspace ? 1 : members.length
               })
             }}
-          </TabsTrigger>
-        </TabsList>
-
+          </Tab>
+        </TabList>
         <Button
           v-if="permissions.canInviteMembers"
           v-tooltip="
@@ -49,22 +55,20 @@
           "
           variant="secondary"
           size="lg"
-          :disabled="!isSingleSeatPlan && isInviteLimitReached"
-          :class="
-            !isSingleSeatPlan &&
-            isInviteLimitReached &&
-            'opacity-50 cursor-not-allowed'
-          "
+          :disabled="isInviteLimitReached"
+          :class="isInviteLimitReached && 'opacity-50 cursor-not-allowed'"
           :aria-label="$t('workspacePanel.inviteMember')"
           @click="handleInviteMember"
         >
-          <i class="pi pi-plus text-sm" />
+          {{ $t('workspacePanel.invite') }}
+          <i class="pi pi-plus ml-1 text-sm" />
         </Button>
         <template v-if="permissions.canAccessWorkspaceMenu">
           <Button
             v-tooltip="{ value: $t('g.moreOptions'), showDelay: 300 }"
-            variant="muted-textonly"
-            size="icon"
+            class="ml-2"
+            variant="secondary"
+            size="lg"
             :aria-label="$t('g.moreOptions')"
             @click="menu?.toggle($event)"
           >
@@ -72,21 +76,17 @@
           </Button>
           <Menu ref="menu" :model="menuItems" :popup="true">
             <template #item="{ item }">
-              <button
+              <div
                 v-tooltip="
                   item.disabled && deleteTooltip
                     ? { value: deleteTooltip, showDelay: 0 }
                     : null
                 "
-                type="button"
-                :disabled="!!item.disabled"
-                :class="
-                  cn(
-                    'flex w-full items-center gap-2 px-3 py-2 bg-transparent border-none cursor-pointer',
-                    item.class,
-                    item.disabled && 'pointer-events-auto cursor-not-allowed'
-                  )
-                "
+                :class="[
+                  'flex items-center gap-2 px-3 py-2',
+                  item.class,
+                  item.disabled ? 'pointer-events-auto' : 'cursor-pointer'
+                ]"
                 @click="
                   item.command?.({
                     originalEvent: $event,
@@ -96,47 +96,44 @@
               >
                 <i :class="item.icon" />
                 <span>{{ item.label }}</span>
-              </button>
+              </div>
             </template>
           </Menu>
         </template>
       </div>
 
-      <TabsContent value="plan" class="mt-4">
-        <SubscriptionPanelContentWorkspace />
-      </TabsContent>
-      <TabsContent value="members" class="mt-4">
-        <MembersPanelContent :key="workspaceRole" />
-      </TabsContent>
-    </TabsRoot>
+      <TabPanels unstyled>
+        <TabPanel value="plan">
+          <SubscriptionPanelContentWorkspace />
+        </TabPanel>
+        <TabPanel value="members">
+          <MembersPanelContent :key="workspaceRole" />
+        </TabPanel>
+      </TabPanels>
+    </Tabs>
   </div>
 </template>
 
 <script setup lang="ts">
 import { storeToRefs } from 'pinia'
 import Menu from 'primevue/menu'
+import Tab from 'primevue/tab'
+import TabList from 'primevue/tablist'
+import TabPanel from 'primevue/tabpanel'
+import TabPanels from 'primevue/tabpanels'
+import Tabs from 'primevue/tabs'
 import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { TabsContent, TabsList, TabsRoot, TabsTrigger } from 'reka-ui'
-
 import WorkspaceProfilePic from '@/components/common/WorkspaceProfilePic.vue'
 import MembersPanelContent from '@/components/dialog/content/setting/MembersPanelContent.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useBillingContext } from '@/composables/billing/useBillingContext'
-import { TIER_TO_KEY } from '@/platform/cloud/subscription/constants/tierPricing'
+import { buttonVariants } from '@/components/ui/button/button.variants'
 import SubscriptionPanelContentWorkspace from '@/platform/cloud/subscription/components/SubscriptionPanelContentWorkspace.vue'
+import { cn } from '@/utils/tailwindUtil'
 import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
 import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
 import { useDialogService } from '@/services/dialogService'
-import { cn } from '@/utils/tailwindUtil'
-
-const tabTriggerBase =
-  'flex items-center justify-center shrink-0 px-2.5 py-2 text-sm rounded-lg cursor-pointer transition-all duration-200 outline-hidden border-none'
-const tabTriggerActive =
-  'bg-interface-menu-component-surface-hovered text-text-primary font-bold'
-const tabTriggerInactive =
-  'bg-transparent text-text-secondary hover:bg-button-hover-surface focus:bg-button-hover-surface'
 
 const { defaultTab = 'plan' } = defineProps<{
   defaultTab?: string
@@ -147,26 +144,19 @@ const {
   showLeaveWorkspaceDialog,
   showDeleteWorkspaceDialog,
   showInviteMemberDialog,
-  showInviteMemberUpsellDialog,
   showEditWorkspaceDialog
 } = useDialogService()
-const { isActiveSubscription, subscription, getMaxSeats } = useBillingContext()
-
-const isSingleSeatPlan = computed(() => {
-  if (!isActiveSubscription.value) return true
-  const tier = subscription.value?.tier
-  if (!tier) return true
-  const tierKey = TIER_TO_KEY[tier]
-  if (!tierKey) return true
-  return getMaxSeats(tierKey) <= 1
-})
 const workspaceStore = useTeamWorkspaceStore()
-const { workspaceName, members, isInviteLimitReached, isWorkspaceSubscribed } =
-  storeToRefs(workspaceStore)
+const {
+  workspaceName,
+  members,
+  isInviteLimitReached,
+  isWorkspaceSubscribed,
+  isInPersonalWorkspace
+} = storeToRefs(workspaceStore)
 const { fetchMembers, fetchPendingInvites } = workspaceStore
-
-const { workspaceRole, permissions, uiConfig } = useWorkspaceUI()
-const activeTab = ref(defaultTab)
+const { activeTab, setActiveTab, workspaceRole, permissions, uiConfig } =
+  useWorkspaceUI()
 
 const menu = ref<InstanceType<typeof Menu> | null>(null)
 
@@ -197,16 +187,11 @@ const deleteTooltip = computed(() => {
 })
 
 const inviteTooltip = computed(() => {
-  if (isSingleSeatPlan.value) return null
   if (!isInviteLimitReached.value) return null
   return t('workspacePanel.inviteLimitReached')
 })
 
 function handleInviteMember() {
-  if (isSingleSeatPlan.value) {
-    showInviteMemberUpsellDialog()
-    return
-  }
   if (isInviteLimitReached.value) return
   showInviteMemberDialog()
 }
@@ -246,6 +231,7 @@ const menuItems = computed(() => {
 })
 
 onMounted(() => {
+  setActiveTab(defaultTab)
   fetchMembers()
   fetchPendingInvites()
 })

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

@@ -0,0 +1,19 @@
+<template>
+  <div class="flex items-center gap-2">
+    <WorkspaceProfilePic
+      class="size-6 text-xs"
+      :workspace-name="workspaceName"
+    />
+
+    <span>{{ workspaceName }}</span>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+
+import WorkspaceProfilePic from '@/components/common/WorkspaceProfilePic.vue'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+
+const { workspaceName } = storeToRefs(useTeamWorkspaceStore())
+</script>

src/components/dialog/content/workspace/InviteMemberDialogContent.vue

@@ -70,17 +70,31 @@
             @click="onSelectLink"
           />
           <div
-            class="absolute right-3 top-2.5 cursor-pointer"
+            class="absolute right-4 top-2 cursor-pointer"
             @click="onCopyLink"
           >
-            <i
-              :class="
-                cn(
-                  'pi size-4',
-                  justCopied ? 'pi-check text-green-500' : 'pi-copy'
-                )
-              "
-            />
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              viewBox="0 0 16 16"
+              fill="none"
+            >
+              <g clip-path="url(#clip0_2127_14348)">
+                <path
+                  d="M2.66634 10.6666C1.93301 10.6666 1.33301 10.0666 1.33301 9.33325V2.66659C1.33301 1.93325 1.93301 1.33325 2.66634 1.33325H9.33301C10.0663 1.33325 10.6663 1.93325 10.6663 2.66659M6.66634 5.33325H13.333C14.0694 5.33325 14.6663 5.93021 14.6663 6.66658V13.3333C14.6663 14.0696 14.0694 14.6666 13.333 14.6666H6.66634C5.92996 14.6666 5.33301 14.0696 5.33301 13.3333V6.66658C5.33301 5.93021 5.92996 5.33325 6.66634 5.33325Z"
+                  stroke="white"
+                  stroke-width="1.3"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                />
+              </g>
+              <defs>
+                <clipPath id="clip0_2127_14348">
+                  <rect width="16" height="16" fill="white" />
+                </clipPath>
+              </defs>
+            </svg>
           </div>
         </div>
       </div>
@@ -104,7 +118,6 @@ import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
-import { cn } from '@/utils/tailwindUtil'
 import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
 import { useDialogStore } from '@/stores/dialogStore'
 
@@ -117,7 +130,6 @@ const loading = ref(false)
 const email = ref('')
 const step = ref<'email' | 'link'>('email')
 const generatedLink = ref('')
-const justCopied = ref(false)
 
 const isValidEmail = computed(() => {
   const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
@@ -149,10 +161,6 @@ async function onCreateLink() {
 async function onCopyLink() {
   try {
     await navigator.clipboard.writeText(generatedLink.value)
-    justCopied.value = true
-    setTimeout(() => {
-      justCopied.value = false
-    }, 759)
     toast.add({
       severity: 'success',
       summary: t('workspacePanel.inviteMemberDialog.linkCopied'),

src/components/dialog/content/workspace/InviteMemberUpsellDialogContent.vue

@@ -1,68 +0,0 @@
-<template>
-  <div
-    class="flex w-full max-w-[512px] flex-col rounded-2xl border border-border-default bg-base-background"
-  >
-    <!-- Header -->
-    <div
-      class="flex h-12 items-center justify-between border-b border-border-default px-4"
-    >
-      <h2 class="m-0 text-sm font-normal text-base-foreground">
-        {{
-          isActiveSubscription
-            ? $t('workspacePanel.inviteUpsellDialog.titleSingleSeat')
-            : $t('workspacePanel.inviteUpsellDialog.titleNotSubscribed')
-        }}
-      </h2>
-      <button
-        class="cursor-pointer rounded border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-secondary-foreground"
-        :aria-label="$t('g.close')"
-        @click="onDismiss"
-      >
-        <i class="pi pi-times size-4" />
-      </button>
-    </div>
-
-    <!-- Body -->
-    <div class="flex flex-col gap-4 px-4 py-4">
-      <p class="m-0 text-sm text-muted-foreground">
-        {{
-          isActiveSubscription
-            ? $t('workspacePanel.inviteUpsellDialog.messageSingleSeat')
-            : $t('workspacePanel.inviteUpsellDialog.messageNotSubscribed')
-        }}
-      </p>
-    </div>
-
-    <!-- Footer -->
-    <div class="flex items-center justify-end gap-4 px-4 py-4">
-      <Button variant="muted-textonly" @click="onDismiss">
-        {{ $t('g.cancel') }}
-      </Button>
-      <Button variant="primary" size="lg" @click="onUpgrade">
-        {{
-          isActiveSubscription
-            ? $t('workspacePanel.inviteUpsellDialog.upgradeToCreator')
-            : $t('workspacePanel.inviteUpsellDialog.viewPlans')
-        }}
-      </Button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Button from '@/components/ui/button/Button.vue'
-import { useBillingContext } from '@/composables/billing/useBillingContext'
-import { useDialogStore } from '@/stores/dialogStore'
-
-const dialogStore = useDialogStore()
-const { isActiveSubscription, showSubscriptionDialog } = useBillingContext()
-
-function onDismiss() {
-  dialogStore.closeDialog({ key: 'invite-member-upsell' })
-}
-
-function onUpgrade() {
-  dialogStore.closeDialog({ key: 'invite-member-upsell' })
-  showSubscriptionDialog()
-}
-</script>

src/components/dialog/header/SettingDialogHeader.vue

@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <h2 :class="cn(flags.teamWorkspacesEnabled ? 'px-6' : 'px-4')">
+      <i class="pi pi-cog" />
+      <span>{{ $t('g.settings') }}</span>
+      <Tag
+        v-if="isStaging"
+        value="staging"
+        severity="warn"
+        class="ml-2 text-xs"
+      />
+    </h2>
+  </div>
+</template>
+<script setup lang="ts">
+import Tag from 'primevue/tag'
+
+import { isStaging } from '@/config/staging'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { cn } from '@comfyorg/tailwind-utils'
+const { flags } = useFeatureFlags()
+</script>
+
+<style scoped>
+.pi-cog {
+  font-size: 1.25rem;
+  margin-right: 0.5rem;
+}
+.version-tag {
+  margin-left: 0.5rem;
+}
+</style>

src/components/queue/CompletionSummaryBanner.stories.ts

@@ -0,0 +1,73 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import CompletionSummaryBanner from './CompletionSummaryBanner.vue'
+
+const meta: Meta<typeof CompletionSummaryBanner> = {
+  title: 'Queue/CompletionSummaryBanner',
+  component: CompletionSummaryBanner,
+  parameters: {
+    layout: 'padded'
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+const thumb = (hex: string) =>
+  `data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24'><rect width='24' height='24' fill='%23${hex}'/></svg>`
+
+const thumbs = [thumb('ff6b6b'), thumb('4dabf7'), thumb('51cf66')]
+
+export const AllSuccessSingle: Story = {
+  args: {
+    mode: 'allSuccess',
+    completedCount: 1,
+    failedCount: 0,
+    thumbnailUrls: [thumbs[0]]
+  }
+}
+
+export const AllSuccessPlural: Story = {
+  args: {
+    mode: 'allSuccess',
+    completedCount: 3,
+    failedCount: 0,
+    thumbnailUrls: thumbs
+  }
+}
+
+export const MixedSingleSingle: Story = {
+  args: {
+    mode: 'mixed',
+    completedCount: 1,
+    failedCount: 1,
+    thumbnailUrls: thumbs.slice(0, 2)
+  }
+}
+
+export const MixedPluralPlural: Story = {
+  args: {
+    mode: 'mixed',
+    completedCount: 2,
+    failedCount: 3,
+    thumbnailUrls: thumbs
+  }
+}
+
+export const AllFailedSingle: Story = {
+  args: {
+    mode: 'allFailed',
+    completedCount: 0,
+    failedCount: 1,
+    thumbnailUrls: []
+  }
+}
+
+export const AllFailedPlural: Story = {
+  args: {
+    mode: 'allFailed',
+    completedCount: 0,
+    failedCount: 4,
+    thumbnailUrls: []
+  }
+}

src/components/queue/CompletionSummaryBanner.test.ts

@@ -0,0 +1,91 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import CompletionSummaryBanner from './CompletionSummaryBanner.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      sideToolbar: {
+        queueProgressOverlay: {
+          jobsCompleted: '{count} job completed | {count} jobs completed',
+          jobsFailed: '{count} job failed | {count} jobs failed'
+        }
+      }
+    }
+  }
+})
+
+const mountComponent = (props: Record<string, unknown>) =>
+  mount(CompletionSummaryBanner, {
+    props: {
+      mode: 'allSuccess',
+      completedCount: 0,
+      failedCount: 0,
+      ...props
+    },
+    global: {
+      plugins: [i18n]
+    }
+  })
+
+describe('CompletionSummaryBanner', () => {
+  it('renders success mode text, thumbnails, and aria label', () => {
+    const wrapper = mountComponent({
+      mode: 'allSuccess',
+      completedCount: 3,
+      failedCount: 0,
+      thumbnailUrls: [
+        'https://example.com/thumb-a.png',
+        'https://example.com/thumb-b.png'
+      ],
+      ariaLabel: 'Open queue summary'
+    })
+
+    const button = wrapper.get('button')
+    expect(button.attributes('aria-label')).toBe('Open queue summary')
+    expect(wrapper.text()).toContain('3 jobs completed')
+
+    const thumbnailImages = wrapper.findAll('img')
+    expect(thumbnailImages).toHaveLength(2)
+    expect(thumbnailImages[0].attributes('src')).toBe(
+      'https://example.com/thumb-a.png'
+    )
+    expect(thumbnailImages[1].attributes('src')).toBe(
+      'https://example.com/thumb-b.png'
+    )
+
+    const thumbnailContainers = wrapper.findAll('.inline-block.h-6.w-6')
+    expect(thumbnailContainers[1].attributes('style')).toContain(
+      'margin-left: -12px'
+    )
+
+    expect(wrapper.html()).not.toContain('icon-[lucide--circle-alert]')
+  })
+
+  it('renders mixed mode with success and failure counts', () => {
+    const wrapper = mountComponent({
+      mode: 'mixed',
+      completedCount: 2,
+      failedCount: 1
+    })
+
+    const summaryText = wrapper.text().replace(/\s+/g, ' ').trim()
+    expect(summaryText).toContain('2 jobs completed, 1 job failed')
+  })
+
+  it('renders failure mode icon without thumbnails', () => {
+    const wrapper = mountComponent({
+      mode: 'allFailed',
+      completedCount: 0,
+      failedCount: 4
+    })
+
+    expect(wrapper.text()).toContain('4 jobs failed')
+    expect(wrapper.html()).toContain('icon-[lucide--circle-alert]')
+    expect(wrapper.findAll('img')).toHaveLength(0)
+  })
+})

src/components/queue/CompletionSummaryBanner.vue

@@ -0,0 +1,109 @@
+<template>
+  <Button
+    variant="secondary"
+    size="lg"
+    class="group w-full justify-between gap-3 p-1 text-left font-normal hover:cursor-pointer focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-background"
+    :aria-label="props.ariaLabel"
+    @click="emit('click', $event)"
+  >
+    <span class="inline-flex items-center gap-2">
+      <span v-if="props.mode === 'allFailed'" class="inline-flex items-center">
+        <i
+          class="ml-1 icon-[lucide--circle-alert] block size-4 leading-none text-destructive-background"
+        />
+      </span>
+
+      <span class="inline-flex items-center gap-2">
+        <span
+          v-if="props.mode !== 'allFailed'"
+          class="relative inline-flex h-6 items-center"
+        >
+          <span
+            v-for="(url, idx) in props.thumbnailUrls"
+            :key="url + idx"
+            class="inline-block h-6 w-6 overflow-hidden rounded-[6px] border-0 bg-secondary-background"
+            :style="{ marginLeft: idx === 0 ? '0' : '-12px' }"
+          >
+            <img
+              :src="url"
+              :alt="$t('sideToolbar.queueProgressOverlay.preview')"
+              class="h-full w-full object-cover"
+            />
+          </span>
+        </span>
+
+        <span class="text-[14px] font-normal text-text-primary">
+          <template v-if="props.mode === 'allSuccess'">
+            <i18n-t
+              keypath="sideToolbar.queueProgressOverlay.jobsCompleted"
+              :plural="props.completedCount"
+            >
+              <template #count>
+                <span class="font-bold">{{ props.completedCount }}</span>
+              </template>
+            </i18n-t>
+          </template>
+          <template v-else-if="props.mode === 'mixed'">
+            <i18n-t
+              keypath="sideToolbar.queueProgressOverlay.jobsCompleted"
+              :plural="props.completedCount"
+            >
+              <template #count>
+                <span class="font-bold">{{ props.completedCount }}</span>
+              </template>
+            </i18n-t>
+            <span>, </span>
+            <i18n-t
+              keypath="sideToolbar.queueProgressOverlay.jobsFailed"
+              :plural="props.failedCount"
+            >
+              <template #count>
+                <span class="font-bold">{{ props.failedCount }}</span>
+              </template>
+            </i18n-t>
+          </template>
+          <template v-else>
+            <i18n-t
+              keypath="sideToolbar.queueProgressOverlay.jobsFailed"
+              :plural="props.failedCount"
+            >
+              <template #count>
+                <span class="font-bold">{{ props.failedCount }}</span>
+              </template>
+            </i18n-t>
+          </template>
+        </span>
+      </span>
+    </span>
+
+    <span
+      class="flex items-center justify-center rounded p-1 text-text-secondary transition-colors duration-200 ease-in-out"
+    >
+      <i class="icon-[lucide--chevron-down] block size-4 leading-none" />
+    </span>
+  </Button>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+import type {
+  CompletionSummary,
+  CompletionSummaryMode
+} from '@/composables/queue/useCompletionSummary'
+
+type Props = {
+  mode: CompletionSummaryMode
+  completedCount: CompletionSummary['completedCount']
+  failedCount: CompletionSummary['failedCount']
+  thumbnailUrls?: CompletionSummary['thumbnailUrls']
+  ariaLabel?: string
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  thumbnailUrls: () => []
+})
+
+const emit = defineEmits<{
+  (e: 'click', event: MouseEvent): void
+}>()
+</script>

src/components/queue/QueueNotificationBanner.stories.ts

@@ -1,140 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import type { QueueNotificationBanner as QueueNotificationBannerItem } from '@/composables/queue/useQueueNotificationBanners'
-
-import QueueNotificationBanner from './QueueNotificationBanner.vue'
-
-const meta: Meta<typeof QueueNotificationBanner> = {
-  title: 'Queue/QueueNotificationBanner',
-  component: QueueNotificationBanner,
-  parameters: {
-    layout: 'padded'
-  }
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-const thumbnail = (hex: string) =>
-  `data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='256' height='256'><rect width='256' height='256' fill='%23${hex}'/></svg>`
-
-const args = (notification: QueueNotificationBannerItem) => ({ notification })
-
-export const Queueing: Story = {
-  args: args({
-    type: 'queuedPending',
-    count: 1
-  })
-}
-
-export const QueueingMultiple: Story = {
-  args: args({
-    type: 'queuedPending',
-    count: 3
-  })
-}
-
-export const Queued: Story = {
-  args: args({
-    type: 'queued',
-    count: 1
-  })
-}
-
-export const QueuedMultiple: Story = {
-  args: args({
-    type: 'queued',
-    count: 4
-  })
-}
-
-export const Completed: Story = {
-  args: args({
-    type: 'completed',
-    count: 1,
-    thumbnailUrl: thumbnail('4dabf7')
-  })
-}
-
-export const CompletedMultiple: Story = {
-  args: args({
-    type: 'completed',
-    count: 4
-  })
-}
-
-export const CompletedMultipleWithThumbnail: Story = {
-  args: args({
-    type: 'completed',
-    count: 4,
-    thumbnailUrls: [
-      thumbnail('ff6b6b'),
-      thumbnail('4dabf7'),
-      thumbnail('51cf66')
-    ]
-  })
-}
-
-export const Failed: Story = {
-  args: args({
-    type: 'failed',
-    count: 1
-  })
-}
-
-export const Gallery: Story = {
-  render: () => ({
-    components: { QueueNotificationBanner },
-    setup() {
-      const queueing = args({
-        type: 'queuedPending',
-        count: 1
-      })
-      const queued = args({
-        type: 'queued',
-        count: 2
-      })
-      const completed = args({
-        type: 'completed',
-        count: 1,
-        thumbnailUrl: thumbnail('ff6b6b')
-      })
-      const completedMultiple = args({
-        type: 'completed',
-        count: 4
-      })
-      const completedMultipleWithThumbnail = args({
-        type: 'completed',
-        count: 4,
-        thumbnailUrls: [
-          thumbnail('51cf66'),
-          thumbnail('ffd43b'),
-          thumbnail('ff922b')
-        ]
-      })
-      const failed = args({
-        type: 'failed',
-        count: 2
-      })
-
-      return {
-        queueing,
-        queued,
-        completed,
-        completedMultiple,
-        completedMultipleWithThumbnail,
-        failed
-      }
-    },
-    template: `
-      <div class="flex flex-col gap-2">
-        <QueueNotificationBanner v-bind="queueing" />
-        <QueueNotificationBanner v-bind="queued" />
-        <QueueNotificationBanner v-bind="completed" />
-        <QueueNotificationBanner v-bind="completedMultiple" />
-        <QueueNotificationBanner v-bind="completedMultipleWithThumbnail" />
-        <QueueNotificationBanner v-bind="failed" />
-      </div>
-    `
-  })
-}

src/components/queue/QueueNotificationBanner.test.ts

@@ -1,136 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { describe, expect, it } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import QueueNotificationBanner from '@/components/queue/QueueNotificationBanner.vue'
-import type { QueueNotificationBanner as QueueNotificationBannerItem } from '@/composables/queue/useQueueNotificationBanners'
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      queue: {
-        jobAddedToQueue: 'Job added to queue',
-        jobQueueing: 'Job queueing'
-      },
-      sideToolbar: {
-        queueProgressOverlay: {
-          preview: 'Preview',
-          jobCompleted: 'Job completed',
-          jobFailed: 'Job failed',
-          jobsAddedToQueue:
-            '{count} job added to queue | {count} jobs added to queue',
-          jobsCompleted: '{count} job completed | {count} jobs completed',
-          jobsFailed: '{count} job failed | {count} jobs failed'
-        }
-      }
-    }
-  }
-})
-
-const mountComponent = (notification: QueueNotificationBannerItem) =>
-  mount(QueueNotificationBanner, {
-    props: { notification },
-    global: {
-      plugins: [i18n]
-    }
-  })
-
-describe(QueueNotificationBanner, () => {
-  it('renders singular queued message without count prefix', () => {
-    const wrapper = mountComponent({
-      type: 'queued',
-      count: 1
-    })
-
-    expect(wrapper.text()).toContain('Job added to queue')
-    expect(wrapper.text()).not.toContain('1 job')
-  })
-
-  it('renders queued message with pluralization', () => {
-    const wrapper = mountComponent({
-      type: 'queued',
-      count: 2
-    })
-
-    expect(wrapper.text()).toContain('2 jobs added to queue')
-    expect(wrapper.html()).toContain('icon-[lucide--check]')
-  })
-
-  it('renders queued pending message with spinner icon', () => {
-    const wrapper = mountComponent({
-      type: 'queuedPending',
-      count: 1
-    })
-
-    expect(wrapper.text()).toContain('Job queueing')
-    expect(wrapper.html()).toContain('icon-[lucide--loader-circle]')
-    expect(wrapper.html()).toContain('animate-spin')
-  })
-
-  it('renders failed message and alert icon', () => {
-    const wrapper = mountComponent({
-      type: 'failed',
-      count: 1
-    })
-
-    expect(wrapper.text()).toContain('Job failed')
-    expect(wrapper.html()).toContain('icon-[lucide--circle-alert]')
-  })
-
-  it('renders completed message with thumbnail preview when provided', () => {
-    const wrapper = mountComponent({
-      type: 'completed',
-      count: 3,
-      thumbnailUrls: ['https://example.com/preview.png']
-    })
-
-    expect(wrapper.text()).toContain('3 jobs completed')
-    const image = wrapper.get('img')
-    expect(image.attributes('src')).toBe('https://example.com/preview.png')
-    expect(image.attributes('alt')).toBe('Preview')
-  })
-
-  it('renders two completion thumbnail previews', () => {
-    const wrapper = mountComponent({
-      type: 'completed',
-      count: 4,
-      thumbnailUrls: [
-        'https://example.com/preview-1.png',
-        'https://example.com/preview-2.png'
-      ]
-    })
-
-    const images = wrapper.findAll('img')
-    expect(images.length).toBe(2)
-    expect(images[0].attributes('src')).toBe(
-      'https://example.com/preview-1.png'
-    )
-    expect(images[1].attributes('src')).toBe(
-      'https://example.com/preview-2.png'
-    )
-  })
-
-  it('caps completion thumbnail previews at two', () => {
-    const wrapper = mountComponent({
-      type: 'completed',
-      count: 4,
-      thumbnailUrls: [
-        'https://example.com/preview-1.png',
-        'https://example.com/preview-2.png',
-        'https://example.com/preview-3.png',
-        'https://example.com/preview-4.png'
-      ]
-    })
-
-    const images = wrapper.findAll('img')
-    expect(images.length).toBe(2)
-    expect(images[0].attributes('src')).toBe(
-      'https://example.com/preview-1.png'
-    )
-    expect(images[1].attributes('src')).toBe(
-      'https://example.com/preview-2.png'
-    )
-  })
-})

src/components/queue/QueueNotificationBanner.vue

@@ -1,154 +0,0 @@
-<template>
-  <div class="inline-flex overflow-hidden rounded-lg bg-secondary-background">
-    <div class="flex items-center gap-2 p-1 pr-3">
-      <div
-        :class="
-          cn(
-            'relative shrink-0 items-center rounded-[4px]',
-            showsCompletionPreview && showThumbnails
-              ? 'flex h-8 overflow-visible p-0'
-              : showsCompletionPreview
-                ? 'flex size-8 justify-center overflow-hidden p-0'
-                : 'flex size-8 justify-center p-1'
-          )
-        "
-      >
-        <template v-if="showThumbnails">
-          <div class="flex h-8 shrink-0 items-center">
-            <div
-              v-for="(thumbnailUrl, index) in thumbnailUrls"
-              :key="`completion-preview-${index}`"
-              :class="
-                cn(
-                  'relative size-8 shrink-0 overflow-hidden rounded-[4px]',
-                  index > 0 && '-ml-3 ring-2 ring-secondary-background'
-                )
-              "
-            >
-              <img
-                :src="thumbnailUrl"
-                :alt="t('sideToolbar.queueProgressOverlay.preview')"
-                class="size-full object-cover"
-              />
-            </div>
-          </div>
-        </template>
-        <div
-          v-else-if="showCompletionGradientFallback"
-          class="size-full bg-linear-to-br from-coral-500 via-coral-500 to-azure-600"
-        />
-        <i
-          v-else
-          :class="cn(iconClass, 'size-4', iconColorClass)"
-          aria-hidden="true"
-        />
-      </div>
-      <div class="flex h-full items-center">
-        <span
-          class="overflow-hidden text-ellipsis text-center font-inter text-[12px] leading-normal font-normal text-base-foreground"
-        >
-          {{ bannerText }}
-        </span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import type { QueueNotificationBanner } from '@/composables/queue/useQueueNotificationBanners'
-import { cn } from '@/utils/tailwindUtil'
-
-const { notification } = defineProps<{
-  notification: QueueNotificationBanner
-}>()
-
-const { t, n } = useI18n()
-
-const thumbnailUrls = computed(() => {
-  if (notification.type !== 'completed') {
-    return []
-  }
-  if (typeof notification.thumbnailUrl === 'string') {
-    return notification.thumbnailUrl.length > 0
-      ? [notification.thumbnailUrl]
-      : []
-  }
-  return notification.thumbnailUrls?.slice(0, 2) ?? []
-})
-
-const showThumbnails = computed(() => {
-  if (notification.type !== 'completed') {
-    return false
-  }
-  return thumbnailUrls.value.length > 0
-})
-
-const showCompletionGradientFallback = computed(
-  () => notification.type === 'completed' && !showThumbnails.value
-)
-
-const showsCompletionPreview = computed(
-  () => showThumbnails.value || showCompletionGradientFallback.value
-)
-
-const bannerText = computed(() => {
-  const count = notification.count
-  if (notification.type === 'queuedPending') {
-    return t('queue.jobQueueing')
-  }
-  if (notification.type === 'queued') {
-    if (count === 1) {
-      return t('queue.jobAddedToQueue')
-    }
-    return t(
-      'sideToolbar.queueProgressOverlay.jobsAddedToQueue',
-      { count: n(count) },
-      count
-    )
-  }
-  if (notification.type === 'failed') {
-    if (count === 1) {
-      return t('sideToolbar.queueProgressOverlay.jobFailed')
-    }
-    return t(
-      'sideToolbar.queueProgressOverlay.jobsFailed',
-      { count: n(count) },
-      count
-    )
-  }
-  if (count === 1) {
-    return t('sideToolbar.queueProgressOverlay.jobCompleted')
-  }
-  return t(
-    'sideToolbar.queueProgressOverlay.jobsCompleted',
-    { count: n(count) },
-    count
-  )
-})
-
-const iconClass = computed(() => {
-  if (notification.type === 'queuedPending') {
-    return 'icon-[lucide--loader-circle]'
-  }
-  if (notification.type === 'queued') {
-    return 'icon-[lucide--check]'
-  }
-  if (notification.type === 'failed') {
-    return 'icon-[lucide--circle-alert]'
-  }
-  return 'icon-[lucide--image]'
-})
-
-const iconColorClass = computed(() => {
-  if (notification.type === 'queuedPending') {
-    return 'animate-spin text-slate-100'
-  }
-  if (notification.type === 'failed') {
-    return 'text-danger-200'
-  }
-  return 'text-slate-100'
-})
-</script>

src/components/queue/QueueNotificationBannerHost.vue

@@ -1,18 +0,0 @@
-<template>
-  <div
-    v-if="currentNotification"
-    class="flex justify-end"
-    role="status"
-    aria-live="polite"
-    aria-atomic="true"
-  >
-    <QueueNotificationBanner :notification="currentNotification" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import QueueNotificationBanner from '@/components/queue/QueueNotificationBanner.vue'
-import { useQueueNotificationBanners } from '@/composables/queue/useQueueNotificationBanners'
-
-const { currentNotification } = useQueueNotificationBanners()
-</script>

src/components/queue/QueueOverlayEmpty.test.ts

@@ -0,0 +1,69 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import QueueOverlayEmpty from './QueueOverlayEmpty.vue'
+import type { CompletionSummary } from '@/composables/queue/useCompletionSummary'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      sideToolbar: {
+        queueProgressOverlay: {
+          expandCollapsedQueue: 'Expand job queue',
+          noActiveJobs: 'No active jobs'
+        }
+      }
+    }
+  }
+})
+
+const CompletionSummaryBannerStub = {
+  name: 'CompletionSummaryBanner',
+  props: [
+    'mode',
+    'completedCount',
+    'failedCount',
+    'thumbnailUrls',
+    'ariaLabel'
+  ],
+  emits: ['click'],
+  template: '<button class="summary-banner" @click="$emit(\'click\')"></button>'
+}
+
+const mountComponent = (summary: CompletionSummary) =>
+  mount(QueueOverlayEmpty, {
+    props: { summary },
+    global: {
+      plugins: [i18n],
+      components: { CompletionSummaryBanner: CompletionSummaryBannerStub }
+    }
+  })
+
+describe('QueueOverlayEmpty', () => {
+  it('renders completion summary banner and proxies click', async () => {
+    const summary: CompletionSummary = {
+      mode: 'mixed',
+      completedCount: 2,
+      failedCount: 1,
+      thumbnailUrls: ['thumb-a']
+    }
+
+    const wrapper = mountComponent(summary)
+    const summaryBanner = wrapper.findComponent(CompletionSummaryBannerStub)
+
+    expect(summaryBanner.exists()).toBe(true)
+    expect(summaryBanner.props()).toMatchObject({
+      mode: 'mixed',
+      completedCount: 2,
+      failedCount: 1,
+      thumbnailUrls: ['thumb-a'],
+      ariaLabel: 'Expand job queue'
+    })
+
+    await summaryBanner.trigger('click')
+    expect(wrapper.emitted('summaryClick')).toHaveLength(1)
+  })
+})

src/components/queue/QueueOverlayEmpty.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="pointer-events-auto">
+    <CompletionSummaryBanner
+      :mode="summary.mode"
+      :completed-count="summary.completedCount"
+      :failed-count="summary.failedCount"
+      :thumbnail-urls="summary.thumbnailUrls"
+      :aria-label="t('sideToolbar.queueProgressOverlay.expandCollapsedQueue')"
+      @click="$emit('summaryClick')"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
+import CompletionSummaryBanner from '@/components/queue/CompletionSummaryBanner.vue'
+import type { CompletionSummary } from '@/composables/queue/useCompletionSummary'
+
+defineProps<{ summary: CompletionSummary }>()
+
+defineEmits<{
+  (e: 'summaryClick'): void
+}>()
+
+const { t } = useI18n()
+</script>

src/components/queue/QueueProgressOverlay.vue

@@ -44,6 +44,12 @@
         @clear-queued="cancelQueuedWorkflows"
         @view-all-jobs="viewAllJobs"
       />
+
+      <QueueOverlayEmpty
+        v-else-if="completionSummary"
+        :summary="completionSummary"
+        @summary-click="onSummaryClick"
+      />
     </div>
   </div>
 
@@ -58,9 +64,11 @@ import { computed, nextTick, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import QueueOverlayActive from '@/components/queue/QueueOverlayActive.vue'
+import QueueOverlayEmpty from '@/components/queue/QueueOverlayEmpty.vue'
 import QueueOverlayExpanded from '@/components/queue/QueueOverlayExpanded.vue'
 import QueueClearHistoryDialog from '@/components/queue/dialogs/QueueClearHistoryDialog.vue'
 import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
+import { useCompletionSummary } from '@/composables/queue/useCompletionSummary'
 import { useJobList } from '@/composables/queue/useJobList'
 import type { JobListItem } from '@/composables/queue/useJobList'
 import { useQueueProgress } from '@/composables/queue/useQueueProgress'
@@ -76,7 +84,7 @@ import { useExecutionStore } from '@/stores/executionStore'
 import { useQueueStore } from '@/stores/queueStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 
-type OverlayState = 'hidden' | 'active' | 'expanded'
+type OverlayState = 'hidden' | 'empty' | 'active' | 'expanded'
 
 const props = withDefaults(
   defineProps<{
@@ -122,6 +130,9 @@ const isExpanded = computed({
   }
 })
 
+const { summary: completionSummary, clearSummary } = useCompletionSummary()
+const hasCompletionSummary = computed(() => completionSummary.value !== null)
+
 const runningCount = computed(() => queueStore.runningTasks.length)
 const queuedCount = computed(() => queueStore.pendingTasks.length)
 const isExecuting = computed(() => !executionStore.isIdle)
@@ -131,12 +142,14 @@ const activeJobsCount = computed(() => runningCount.value + queuedCount.value)
 const overlayState = computed<OverlayState>(() => {
   if (isExpanded.value) return 'expanded'
   if (hasActiveJob.value) return 'active'
+  if (hasCompletionSummary.value) return 'empty'
   return 'hidden'
 })
 
 const showBackground = computed(
   () =>
     overlayState.value === 'expanded' ||
+    overlayState.value === 'empty' ||
     (overlayState.value === 'active' && isOverlayHovered.value)
 )
 
@@ -217,10 +230,19 @@ const setExpanded = (expanded: boolean) => {
   isExpanded.value = expanded
 }
 
+const openExpandedFromEmpty = () => {
+  setExpanded(true)
+}
+
 const viewAllJobs = () => {
   setExpanded(true)
 }
 
+const onSummaryClick = () => {
+  openExpandedFromEmpty()
+  clearSummary()
+}
+
 const openAssetsSidebar = () => {
   sidebarTabStore.activeSidebarTabId = 'assets'
 }

src/components/rightSidePanel/RightSidePanel.vue

@@ -14,13 +14,11 @@ import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { useExecutionStore } from '@/stores/executionStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import type { RightSidePanelTab } from '@/stores/workspace/rightSidePanelStore'
 import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
 import { cn } from '@/utils/tailwindUtil'
 
-import TabError from './TabError.vue'
 import TabInfo from './info/TabInfo.vue'
 import TabGlobalParameters from './parameters/TabGlobalParameters.vue'
 import TabNodes from './parameters/TabNodes.vue'
@@ -35,7 +33,6 @@ import {
 import SubgraphEditor from './subgraph/SubgraphEditor.vue'
 
 const canvasStore = useCanvasStore()
-const executionStore = useExecutionStore()
 const rightSidePanelStore = useRightSidePanelStore()
 const settingStore = useSettingStore()
 const { t } = useI18n()
@@ -90,25 +87,10 @@ function closePanel() {
 type RightSidePanelTabList = Array<{
   label: () => string
   value: RightSidePanelTab
-  icon?: string
 }>
 
-//FIXME all errors if nothing selected?
-const selectedNodeErrors = computed(() =>
-  selectedNodes.value
-    .map((node) => executionStore.getNodeErrors(`${node.id}`))
-    .filter((nodeError) => !!nodeError)
-)
-
 const tabs = computed<RightSidePanelTabList>(() => {
   const list: RightSidePanelTabList = []
-  if (selectedNodeErrors.value.length) {
-    list.push({
-      label: () => t('g.error'),
-      value: 'error',
-      icon: 'icon-[lucide--octagon-alert] bg-node-stroke-error ml-1'
-    })
-  }
 
   list.push({
     label: () =>
@@ -289,7 +271,6 @@ function handleProxyWidgetsUpdate(value: ProxyWidgetsProperty) {
             :value="tab.value"
           >
             {{ tab.label() }}
-            <i v-if="tab.icon" :class="cn(tab.icon, 'size-4')" />
           </Tab>
         </TabList>
       </nav>
@@ -307,7 +288,6 @@ function handleProxyWidgetsUpdate(value: ProxyWidgetsProperty) {
         :node="selectedSingleNode"
       />
       <template v-else>
-        <TabError v-if="activeTab === 'error'" :errors="selectedNodeErrors" />
         <TabSubgraphInputs
           v-if="activeTab === 'parameters' && isSingleSubgraphNode"
           :node="selectedSingleNode as SubgraphNode"

src/components/rightSidePanel/TabError.vue

@@ -1,30 +0,0 @@
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n'
-
-import Button from '@/components/ui/button/Button.vue'
-import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
-import type { NodeError } from '@/schemas/apiSchema'
-
-const { t } = useI18n()
-
-defineProps<{
-  errors: NodeError[]
-}>()
-const { copyToClipboard } = useCopyToClipboard()
-</script>
-<template>
-  <div class="m-4">
-    <Button class="w-full" @click="copyToClipboard(JSON.stringify(errors))">
-      {{ t('g.copy') }}
-      <i class="icon-[lucide--copy] size-4" />
-    </Button>
-  </div>
-  <div
-    v-for="(error, index) in errors.flatMap((ne) => ne.errors)"
-    :key="index"
-    class="px-2"
-  >
-    <h3 class="text-error" v-text="error.message" />
-    <div class="text-muted-foreground" v-text="error.details" />
-  </div>
-</template>

src/components/rightSidePanel/parameters/SectionWidgets.vue

@@ -12,9 +12,6 @@ import type {
 } from '@/lib/litegraph/src/litegraph'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { getWidgetDefaultValue } from '@/utils/widgetUtil'
-import type { WidgetValue } from '@/utils/widgetUtil'
 
 import PropertiesAccordionItem from '../layout/PropertiesAccordionItem.vue'
 import { HideLayoutFieldKey } from '@/types/widgetTypes'
@@ -60,7 +57,6 @@ watchEffect(() => (widgets.value = widgetsProp))
 provide(HideLayoutFieldKey, true)
 
 const canvasStore = useCanvasStore()
-const nodeDefStore = useNodeDefStore()
 const { t } = useI18n()
 
 const getNodeParentGroup = inject(GetNodeParentGroupKey, null)
@@ -122,31 +118,15 @@ function handleLocateNode() {
   }
 }
 
-function writeWidgetValue(widget: IBaseWidget, value: WidgetValue) {
-  widget.value = value
-  widget.callback?.(value)
+function handleWidgetValueUpdate(
+  widget: IBaseWidget,
+  newValue: string | number | boolean | object
+) {
+  widget.value = newValue
+  widget.callback?.(newValue)
   canvasStore.canvas?.setDirty(true, true)
 }
 
-function handleResetAllWidgets() {
-  for (const { widget, node: widgetNode } of widgetsProp) {
-    const spec = nodeDefStore.getInputSpecForWidget(widgetNode, widget.name)
-    const defaultValue = getWidgetDefaultValue(spec)
-    if (defaultValue !== undefined) {
-      writeWidgetValue(widget, defaultValue)
-    }
-  }
-}
-
-function handleWidgetValueUpdate(widget: IBaseWidget, newValue: WidgetValue) {
-  if (newValue === undefined) return
-  writeWidgetValue(widget, newValue)
-}
-
-function handleWidgetReset(widget: IBaseWidget, newValue: WidgetValue) {
-  writeWidgetValue(widget, newValue)
-}
-
 defineExpose({
   widgetsContainer,
   rootElement
@@ -177,17 +157,6 @@ defineExpose({
               {{ parentGroup.title }}
             </span>
           </span>
-          <Button
-            v-if="!isEmpty"
-            variant="textonly"
-            size="icon-sm"
-            class="subbutton shrink-0 size-8 cursor-pointer text-muted-foreground hover:text-base-foreground"
-            :title="t('rightSidePanel.resetAllParameters')"
-            :aria-label="t('rightSidePanel.resetAllParameters')"
-            @click.stop="handleResetAllWidgets"
-          >
-            <i class="icon-[lucide--rotate-ccw] size-4" />
-          </Button>
           <Button
             v-if="canShowLocateButton"
             variant="textonly"
@@ -220,7 +189,6 @@ defineExpose({
             :parents="parents"
             :is-shown-on-parents="isWidgetShownOnParents(node, widget)"
             @update:widget-value="handleWidgetValueUpdate(widget, $event)"
-            @reset-to-default="handleWidgetReset(widget, $event)"
           />
         </TransitionGroup>
       </div>

src/components/rightSidePanel/parameters/WidgetActions.test.ts

@@ -1,209 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { mount } from '@vue/test-utils'
-import { setActivePinia } from 'pinia'
-import type { Slots } from 'vue'
-import { h } from 'vue'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
-
-import WidgetActions from './WidgetActions.vue'
-
-const { mockGetInputSpecForWidget } = vi.hoisted(() => ({
-  mockGetInputSpecForWidget: vi.fn()
-}))
-
-vi.mock('@/stores/nodeDefStore', () => ({
-  useNodeDefStore: () => ({
-    getInputSpecForWidget: mockGetInputSpecForWidget
-  })
-}))
-
-vi.mock('@/renderer/core/canvas/canvasStore', () => ({
-  useCanvasStore: () => ({
-    canvas: { setDirty: vi.fn() }
-  })
-}))
-
-vi.mock('@/stores/workspace/favoritedWidgetsStore', () => ({
-  useFavoritedWidgetsStore: () => ({
-    isFavorited: vi.fn().mockReturnValue(false),
-    toggleFavorite: vi.fn()
-  })
-}))
-
-vi.mock('@/services/dialogService', () => ({
-  useDialogService: () => ({
-    prompt: vi.fn()
-  })
-}))
-
-vi.mock('@/components/button/MoreButton.vue', () => ({
-  default: (_: unknown, { slots }: { slots: Slots }) =>
-    h('div', slots.default?.({ close: () => {} }))
-}))
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      g: {
-        rename: 'Rename',
-        enterNewName: 'Enter new name'
-      },
-      rightSidePanel: {
-        hideInput: 'Hide input',
-        showInput: 'Show input',
-        addFavorite: 'Favorite',
-        removeFavorite: 'Unfavorite',
-        resetToDefault: 'Reset to default'
-      }
-    }
-  }
-})
-
-describe('WidgetActions', () => {
-  beforeEach(() => {
-    setActivePinia(createTestingPinia({ stubActions: false }))
-    vi.resetAllMocks()
-    mockGetInputSpecForWidget.mockReturnValue({
-      type: 'INT',
-      default: 42
-    })
-  })
-
-  function createMockWidget(
-    value: number = 100,
-    callback?: () => void
-  ): IBaseWidget {
-    return {
-      name: 'test_widget',
-      type: 'number',
-      value,
-      label: 'Test Widget',
-      options: {},
-      y: 0,
-      callback
-    } as IBaseWidget
-  }
-
-  function createMockNode(): LGraphNode {
-    return {
-      id: 1,
-      type: 'TestNode'
-    } as LGraphNode
-  }
-
-  function mountWidgetActions(widget: IBaseWidget, node: LGraphNode) {
-    return mount(WidgetActions, {
-      props: {
-        widget,
-        node,
-        label: 'Test Widget'
-      },
-      global: {
-        plugins: [i18n]
-      }
-    })
-  }
-
-  it('shows reset button when widget has default value', () => {
-    const widget = createMockWidget()
-    const node = createMockNode()
-
-    const wrapper = mountWidgetActions(widget, node)
-
-    const resetButton = wrapper
-      .findAll('button')
-      .find((b) => b.text().includes('Reset'))
-    expect(resetButton).toBeDefined()
-  })
-
-  it('emits resetToDefault with default value when reset button clicked', async () => {
-    const widget = createMockWidget(100)
-    const node = createMockNode()
-
-    const wrapper = mountWidgetActions(widget, node)
-
-    const resetButton = wrapper
-      .findAll('button')
-      .find((b) => b.text().includes('Reset'))
-
-    await resetButton?.trigger('click')
-
-    expect(wrapper.emitted('resetToDefault')).toHaveLength(1)
-    expect(wrapper.emitted('resetToDefault')![0]).toEqual([42])
-  })
-
-  it('disables reset button when value equals default', () => {
-    const widget = createMockWidget(42)
-    const node = createMockNode()
-
-    const wrapper = mountWidgetActions(widget, node)
-
-    const resetButton = wrapper
-      .findAll('button')
-      .find((b) => b.text().includes('Reset'))
-
-    expect(resetButton?.attributes('disabled')).toBeDefined()
-  })
-
-  it('does not show reset button when no default value exists', () => {
-    mockGetInputSpecForWidget.mockReturnValue({
-      type: 'CUSTOM'
-    })
-
-    const widget = createMockWidget(100)
-    const node = createMockNode()
-
-    const wrapper = mountWidgetActions(widget, node)
-
-    const resetButton = wrapper
-      .findAll('button')
-      .find((b) => b.text().includes('Reset'))
-
-    expect(resetButton).toBeUndefined()
-  })
-
-  it('uses fallback default for INT type without explicit default', async () => {
-    mockGetInputSpecForWidget.mockReturnValue({
-      type: 'INT'
-    })
-
-    const widget = createMockWidget(100)
-    const node = createMockNode()
-
-    const wrapper = mountWidgetActions(widget, node)
-
-    const resetButton = wrapper
-      .findAll('button')
-      .find((b) => b.text().includes('Reset'))
-
-    await resetButton?.trigger('click')
-
-    expect(wrapper.emitted('resetToDefault')![0]).toEqual([0])
-  })
-
-  it('uses first option as default for combo without explicit default', async () => {
-    mockGetInputSpecForWidget.mockReturnValue({
-      type: 'COMBO',
-      options: ['option1', 'option2', 'option3']
-    })
-
-    const widget = createMockWidget(100)
-    const node = createMockNode()
-
-    const wrapper = mountWidgetActions(widget, node)
-
-    const resetButton = wrapper
-      .findAll('button')
-      .find((b) => b.text().includes('Reset'))
-
-    await resetButton?.trigger('click')
-
-    expect(wrapper.emitted('resetToDefault')![0]).toEqual(['option1'])
-  })
-})

src/components/rightSidePanel/parameters/WidgetActions.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { cn } from '@comfyorg/tailwind-utils'
-import { isEqual } from 'es-toolkit'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
@@ -15,10 +14,7 @@ import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useDialogService } from '@/services/dialogService'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useFavoritedWidgetsStore } from '@/stores/workspace/favoritedWidgetsStore'
-import { getWidgetDefaultValue } from '@/utils/widgetUtil'
-import type { WidgetValue } from '@/utils/widgetUtil'
 
 const {
   widget,
@@ -32,15 +28,10 @@ const {
   isShownOnParents?: boolean
 }>()
 
-const emit = defineEmits<{
-  resetToDefault: [value: WidgetValue]
-}>()
-
 const label = defineModel<string>('label', { required: true })
 
 const canvasStore = useCanvasStore()
 const favoritedWidgetsStore = useFavoritedWidgetsStore()
-const nodeDefStore = useNodeDefStore()
 const dialogService = useDialogService()
 const { t } = useI18n()
 
@@ -52,19 +43,6 @@ const isFavorited = computed(() =>
   favoritedWidgetsStore.isFavorited(favoriteNode.value, widget.name)
 )
 
-const inputSpec = computed(() =>
-  nodeDefStore.getInputSpecForWidget(node, widget.name)
-)
-
-const defaultValue = computed(() => getWidgetDefaultValue(inputSpec.value))
-
-const hasDefault = computed(() => defaultValue.value !== undefined)
-
-const isCurrentValueDefault = computed(() => {
-  if (!hasDefault.value) return true
-  return isEqual(widget.value, defaultValue.value)
-})
-
 async function handleRename() {
   const newLabel = await dialogService.prompt({
     title: t('g.rename'),
@@ -119,11 +97,6 @@ function handleToggleFavorite() {
   favoritedWidgetsStore.toggleFavorite(favoriteNode.value, widget.name)
 }
 
-function handleResetToDefault() {
-  if (!hasDefault.value) return
-  emit('resetToDefault', defaultValue.value)
-}
-
 const buttonClasses = cn([
   'border-none bg-transparent',
   'w-full flex items-center gap-2 rounded px-3 py-2 text-sm',
@@ -189,21 +162,6 @@ const buttonClasses = cn([
           <span>{{ t('rightSidePanel.addFavorite') }}</span>
         </template>
       </button>
-
-      <button
-        v-if="hasDefault"
-        :class="cn(buttonClasses, isCurrentValueDefault && 'opacity-50')"
-        :disabled="isCurrentValueDefault"
-        @click="
-          () => {
-            handleResetToDefault()
-            close()
-          }
-        "
-      >
-        <i class="icon-[lucide--rotate-ccw] size-4" />
-        <span>{{ t('rightSidePanel.resetToDefault') }}</span>
-      </button>
     </template>
   </MoreButton>
 </template>

src/components/rightSidePanel/parameters/WidgetItem.vue

@@ -20,7 +20,6 @@ import { getNodeByExecutionId } from '@/utils/graphTraversalUtil'
 import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
 import { cn } from '@/utils/tailwindUtil'
 import { renameWidget } from '@/utils/widgetUtil'
-import type { WidgetValue } from '@/utils/widgetUtil'
 
 import WidgetActions from './WidgetActions.vue'
 
@@ -43,8 +42,7 @@ const {
 }>()
 
 const emit = defineEmits<{
-  'update:widgetValue': [value: WidgetValue]
-  resetToDefault: [value: WidgetValue]
+  'update:widgetValue': [value: string | number | boolean | object]
 }>()
 
 const { t } = useI18n()
@@ -85,8 +83,11 @@ const favoriteNode = computed(() =>
 )
 
 const widgetValue = computed({
-  get: () => widget.value,
-  set: (newValue: WidgetValue) => {
+  get: () => {
+    widget.vueTrack?.()
+    return widget.value
+  },
+  set: (newValue: string | number | boolean | object) => {
     emit('update:widgetValue', newValue)
   }
 })
@@ -156,7 +157,6 @@ const displayLabel = customRef((track, trigger) => {
           :node="node"
           :parents="parents"
           :is-shown-on-parents="isShownOnParents"
-          @reset-to-default="emit('resetToDefault', $event)"
         />
       </div>
     </div>

src/components/rightSidePanel/settings/TabGlobalSettings.vue

@@ -11,7 +11,7 @@ import type { LinkRenderType } from '@/lib/litegraph/src/types/globalEnums'
 import { LinkMarkerShape } from '@/lib/litegraph/src/types/globalEnums'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { WidgetInputBaseClass } from '@/renderer/extensions/vueNodes/widgets/components/layout'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogService } from '@/services/dialogService'
 import { cn } from '@/utils/tailwindUtil'
 
 import PropertiesAccordionItem from '../layout/PropertiesAccordionItem.vue'
@@ -20,7 +20,7 @@ import LayoutField from './LayoutField.vue'
 
 const { t } = useI18n()
 const settingStore = useSettingStore()
-const settingsDialog = useSettingsDialog()
+const dialogService = useDialogService()
 
 // NODES settings
 const showAdvancedParameters = computed({
@@ -92,7 +92,7 @@ function updateGridSpacingFromInput(value: number | null | undefined) {
 }
 
 function openFullSettings() {
-  settingsDialog.show()
+  dialogService.showSettingsDialog()
 }
 </script>
 

src/components/sidebar/ComfyMenuButton.vue

@@ -108,14 +108,15 @@ import ToggleSwitch from 'primevue/toggleswitch'
 import { computed, nextTick, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import SettingDialogHeader from '@/components/dialog/header/SettingDialogHeader.vue'
 import ComfyLogo from '@/components/icons/ComfyLogo.vue'
 import { useWorkflowTemplateSelectorDialog } from '@/composables/useWorkflowTemplateSelectorDialog'
+import SettingDialogContent from '@/platform/settings/components/SettingDialogContent.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
-import type { SettingPanelType } from '@/platform/settings/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useColorPaletteService } from '@/services/colorPaletteService'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useCommandStore } from '@/stores/commandStore'
+import { useDialogStore } from '@/stores/dialogStore'
 import { useMenuItemStore } from '@/stores/menuItemStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { normalizeI18nKey } from '@/utils/formatUtil'
@@ -128,7 +129,7 @@ const commandStore = useCommandStore()
 const menuItemStore = useMenuItemStore()
 const colorPaletteStore = useColorPaletteStore()
 const colorPaletteService = useColorPaletteService()
-const settingsDialog = useSettingsDialog()
+const dialogStore = useDialogStore()
 const managerState = useManagerState()
 const settingStore = useSettingStore()
 
@@ -165,8 +166,15 @@ const translateMenuItem = (item: MenuItem): MenuItem => {
   }
 }
 
-const showSettings = (defaultPanel?: SettingPanelType) => {
-  settingsDialog.show(defaultPanel)
+const showSettings = (defaultPanel?: string) => {
+  dialogStore.showDialog({
+    key: 'global-settings',
+    headerComponent: SettingDialogHeader,
+    component: SettingDialogContent,
+    props: {
+      defaultPanel
+    }
+  })
 }
 
 const showManageExtensions = async () => {

src/components/sidebar/tabs/WorkflowsSidebarTab.vue

@@ -50,8 +50,7 @@
                 <template #before-label="{ node: treeNode }">
                   <span
                     v-if="
-                      (treeNode.data as ComfyWorkflow)?.isModified ||
-                      !(treeNode.data as ComfyWorkflow)?.isPersisted
+                      treeNode.data?.isModified || !treeNode.data?.isPersisted
                     "
                     >*</span
                   >

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

@@ -215,11 +215,7 @@ const renderedBookmarkedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(
   }
 )
 
-interface TreeExplorerExposed {
-  addFolderCommand: (targetNodeKey: string) => void
-}
-
-const treeExplorerRef = ref<TreeExplorerExposed | null>(null)
+const treeExplorerRef = ref<InstanceType<typeof TreeExplorer> | null>(null)
 defineExpose({
   addNewBookmarkFolder: () => treeExplorerRef.value?.addFolderCommand('root')
 })

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

@@ -63,7 +63,7 @@ onUnmounted(() => {
 })
 
 const expandedKeys = inject(InjectKeyExpandedKeys)
-const handleItemDrop = (node: RenderedTreeExplorerNode<ComfyNodeDefImpl>) => {
+const handleItemDrop = (node: RenderedTreeExplorerNode) => {
   if (!expandedKeys) return
   expandedKeys.value[node.key] = true
 }

src/components/toast/InviteAcceptedToast.vue

@@ -1,42 +0,0 @@
-<template>
-  <Toast group="invite-accepted" position="top-right">
-    <template #message="slotProps">
-      <div class="flex items-center gap-2 justify-between w-full">
-        <div class="flex flex-col justify-start">
-          <div class="text-base">
-            {{ slotProps.message.summary }}
-          </div>
-          <div class="mt-1 text-sm text-foreground">
-            {{ slotProps.message.detail.text }} <br />
-            {{ slotProps.message.detail.workspaceName }}
-          </div>
-        </div>
-        <Button
-          size="md"
-          variant="inverted"
-          @click="viewWorkspace(slotProps.message.detail.workspaceId)"
-        >
-          {{ t('workspace.viewWorkspace') }}
-        </Button>
-      </div>
-    </template>
-  </Toast>
-</template>
-
-<script setup lang="ts">
-import { useToast } from 'primevue'
-import Toast from 'primevue/toast'
-import { useI18n } from 'vue-i18n'
-
-import Button from '@/components/ui/button/Button.vue'
-import { useWorkspaceSwitch } from '@/platform/auth/workspace/useWorkspaceSwitch'
-
-const { t } = useI18n()
-const toast = useToast()
-const { switchWithConfirmation } = useWorkspaceSwitch()
-
-function viewWorkspace(workspaceId: string) {
-  void switchWithConfirmation(workspaceId)
-  toast.removeGroup('invite-accepted')
-}
-</script>

src/components/topbar/CurrentUserPopoverLegacy.test.ts

@@ -31,15 +31,6 @@ vi.mock('pinia')
 const mockShowSettingsDialog = vi.fn()
 const mockShowTopUpCreditsDialog = vi.fn()
 
-// Mock the settings dialog composable
-vi.mock('@/platform/settings/composables/useSettingsDialog', () => ({
-  useSettingsDialog: vi.fn(() => ({
-    show: mockShowSettingsDialog,
-    hide: vi.fn(),
-    showAbout: vi.fn()
-  }))
-}))
-
 // Mock window.open
 const originalWindowOpen = window.open
 beforeEach(() => {
@@ -73,6 +64,7 @@ vi.mock('@/composables/auth/useFirebaseAuthActions', () => ({
 // Mock the dialog service
 vi.mock('@/services/dialogService', () => ({
   useDialogService: vi.fn(() => ({
+    showSettingsDialog: mockShowSettingsDialog,
     showTopUpCreditsDialog: mockShowTopUpCreditsDialog
   }))
 }))

src/components/topbar/CurrentUserPopoverLegacy.vue

@@ -152,7 +152,6 @@ import { useSubscription } from '@/platform/cloud/subscription/composables/useSu
 import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useDialogService } from '@/services/dialogService'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
@@ -166,7 +165,6 @@ const { userDisplayName, userEmail, userPhotoUrl, handleSignOut } =
   useCurrentUser()
 const authActions = useFirebaseAuthActions()
 const authStore = useFirebaseAuthStore()
-const settingsDialog = useSettingsDialog()
 const dialogService = useDialogService()
 const {
   isActiveSubscription,
@@ -200,7 +198,7 @@ const canUpgrade = computed(() => {
 })
 
 const handleOpenUserSettings = () => {
-  settingsDialog.show('user')
+  dialogService.showSettingsDialog('user')
   emit('close')
 }
 
@@ -211,9 +209,9 @@ const handleOpenPlansAndPricing = () => {
 
 const handleOpenPlanAndCreditsSettings = () => {
   if (isCloud) {
-    settingsDialog.show('subscription')
+    dialogService.showSettingsDialog('subscription')
   } else {
-    settingsDialog.show('credits')
+    dialogService.showSettingsDialog('credits')
   }
 
   emit('close')

src/components/topbar/CurrentUserPopoverWorkspace.vue

@@ -55,61 +55,63 @@
       />
     </Popover>
 
-    <!-- Credits Section -->
+    <!-- Credits Section (PERSONAL and OWNER only) -->
+    <template v-if="showCreditsSection">
+      <div class="flex items-center gap-2 px-4 py-2">
+        <i class="icon-[lucide--component] text-sm text-amber-400" />
+        <Skeleton
+          v-if="isLoadingBalance"
+          width="4rem"
+          height="1.25rem"
+          class="w-full"
+        />
+        <span v-else class="text-base font-semibold text-base-foreground">{{
+          displayedCredits
+        }}</span>
+        <i
+          v-tooltip="{ value: $t('credits.unified.tooltip'), showDelay: 300 }"
+          class="icon-[lucide--circle-help] mr-auto cursor-help text-base text-muted-foreground"
+        />
+        <!-- Subscribed: Show Add Credits button -->
+        <Button
+          v-if="isActiveSubscription && isWorkspaceSubscribed"
+          variant="secondary"
+          size="sm"
+          class="text-base-foreground"
+          data-testid="add-credits-button"
+          @click="handleTopUp"
+        >
+          {{ $t('subscription.addCredits') }}
+        </Button>
+        <!-- Unsubscribed: Show Subscribe button -->
+        <SubscribeButton
+          v-else-if="isPersonalWorkspace"
+          :fluid="false"
+          :label="
+            isCancelled
+              ? $t('subscription.resubscribe')
+              : $t('workspaceSwitcher.subscribe')
+          "
+          size="sm"
+          variant="gradient"
+        />
+        <!-- Non-personal workspace: Show pricing table -->
+        <Button
+          v-else
+          variant="primary"
+          size="sm"
+          @click="handleOpenPlansAndPricing"
+        >
+          {{
+            isCancelled
+              ? $t('subscription.resubscribe')
+              : $t('workspaceSwitcher.subscribe')
+          }}
+        </Button>
+      </div>
 
-    <div class="flex items-center gap-2 px-4 py-2">
-      <i class="icon-[lucide--component] text-sm text-amber-400" />
-      <Skeleton
-        v-if="isLoadingBalance"
-        width="4rem"
-        height="1.25rem"
-        class="w-full"
-      />
-      <span v-else class="text-base font-semibold text-base-foreground">{{
-        displayedCredits
-      }}</span>
-      <i
-        v-tooltip="{ value: $t('credits.unified.tooltip'), showDelay: 300 }"
-        class="icon-[lucide--circle-help] mr-auto cursor-help text-base text-muted-foreground"
-      />
-      <!-- Add Credits (subscribed + personal or workspace owner only) -->
-      <Button
-        v-if="isActiveSubscription && permissions.canTopUp"
-        variant="secondary"
-        size="sm"
-        class="text-base-foreground"
-        data-testid="add-credits-button"
-        @click="handleTopUp"
-      >
-        {{ $t('subscription.addCredits') }}
-      </Button>
-      <!-- Subscribe/Resubscribe (only when not subscribed or cancelled) -->
-      <SubscribeButton
-        v-if="showSubscribeAction && isPersonalWorkspace"
-        :fluid="false"
-        :label="
-          isCancelled
-            ? $t('subscription.resubscribe')
-            : $t('workspaceSwitcher.subscribe')
-        "
-        size="sm"
-        variant="gradient"
-      />
-      <Button
-        v-if="showSubscribeAction && !isPersonalWorkspace"
-        variant="primary"
-        size="sm"
-        @click="handleOpenPlansAndPricing"
-      >
-        {{
-          isCancelled
-            ? $t('subscription.resubscribe')
-            : $t('workspaceSwitcher.subscribe')
-        }}
-      </Button>
-    </div>
-
-    <Divider class="mx-0 my-2" />
+      <Divider class="mx-0 my-2" />
+    </template>
 
     <!-- Plans & Pricing (PERSONAL and OWNER only) -->
     <div
@@ -220,16 +222,16 @@ import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
 import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useDialogService } from '@/services/dialogService'
 
 const workspaceStore = useTeamWorkspaceStore()
 const {
   initState,
   workspaceName,
-  isInPersonalWorkspace: isPersonalWorkspace
+  isInPersonalWorkspace: isPersonalWorkspace,
+  isWorkspaceSubscribed
 } = storeToRefs(workspaceStore)
-const { permissions } = useWorkspaceUI()
+const { workspaceRole } = useWorkspaceUI()
 const workspaceSwitcherPopover = ref<InstanceType<typeof Popover> | null>(null)
 
 const emit = defineEmits<{
@@ -240,7 +242,6 @@ const { buildDocsUrl, docsPaths } = useExternalLink()
 
 const { userDisplayName, userEmail, userPhotoUrl, handleSignOut } =
   useCurrentUser()
-const settingsDialog = useSettingsDialog()
 const dialogService = useDialogService()
 const { isActiveSubscription, subscription, balance, isLoading, fetchBalance } =
   useBillingContext()
@@ -274,24 +275,22 @@ const canUpgrade = computed(() => {
 })
 
 const showPlansAndPricing = computed(
-  () => permissions.value.canManageSubscription
+  () => isPersonalWorkspace.value || workspaceRole.value === 'owner'
 )
 const showManagePlan = computed(
-  () => permissions.value.canManageSubscription && isActiveSubscription.value
+  () => showPlansAndPricing.value && isActiveSubscription.value
 )
-const showSubscribeAction = computed(
-  () =>
-    permissions.value.canManageSubscription &&
-    (!isActiveSubscription.value || isCancelled.value)
+const showCreditsSection = computed(
+  () => isPersonalWorkspace.value || workspaceRole.value === 'owner'
 )
 
 const handleOpenUserSettings = () => {
-  settingsDialog.show('user')
+  dialogService.showSettingsDialog('user')
   emit('close')
 }
 
 const handleOpenWorkspaceSettings = () => {
-  settingsDialog.show('workspace')
+  dialogService.showSettingsDialog('workspace')
   emit('close')
 }
 
@@ -302,9 +301,9 @@ const handleOpenPlansAndPricing = () => {
 
 const handleOpenPlanAndCreditsSettings = () => {
   if (isCloud) {
-    settingsDialog.show('workspace')
+    dialogService.showSettingsDialog('workspace')
   } else {
-    settingsDialog.show('credits')
+    dialogService.showSettingsDialog('credits')
   }
 
   emit('close')

src/components/ui/Popover.vue

@@ -36,7 +36,7 @@ defineProps<{
         :side-offset="5"
         :collision-padding="10"
         v-bind="$attrs"
-        class="z-1700 rounded-lg p-2 bg-base-background shadow-sm border border-border-subtle will-change-[transform,opacity] data-[state=open]:data-[side=top]:animate-slideDownAndFade data-[state=open]:data-[side=right]:animate-slideLeftAndFade data-[state=open]:data-[side=bottom]:animate-slideUpAndFade data-[state=open]:data-[side=left]:animate-slideRightAndFade"
+        class="rounded-lg p-2 bg-base-background shadow-sm border border-border-subtle will-change-[transform,opacity] data-[state=open]:data-[side=top]:animate-slideDownAndFade data-[state=open]:data-[side=right]:animate-slideLeftAndFade data-[state=open]:data-[side=bottom]:animate-slideUpAndFade data-[state=open]:data-[side=left]:animate-slideRightAndFade"
       >
         <slot>
           <div class="flex flex-col p-1">

src/components/widget/layout/BaseModalLayout.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    :class="cn('rounded-2xl overflow-hidden relative', sizeClasses)"
+    class="base-widget-layout rounded-2xl overflow-hidden relative"
     @keydown.esc.capture="handleEscape"
   >
     <div
@@ -141,31 +141,14 @@ import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { OnCloseKey } from '@/types/widgetTypes'
-import { cn } from '@/utils/tailwindUtil'
 
 const { t } = useI18n()
 
-const SIZE_CLASSES = {
-  sm: 'h-[80vh] w-[90vw] max-w-[960px]',
-  md: 'h-[80vh] w-[90vw] max-w-[1400px]',
-  lg: 'h-[80vh] w-[90vw] max-w-[1280px] aspect-[20/13] min-[1450px]:max-w-[1724px]',
-  full: 'h-full w-full max-w-[1400px] 2xl:max-w-[1600px]'
-} as const
-
-type ModalSize = keyof typeof SIZE_CLASSES
-
-const {
-  contentTitle,
-  rightPanelTitle,
-  size = 'lg'
-} = defineProps<{
+const { contentTitle, rightPanelTitle } = defineProps<{
   contentTitle: string
   rightPanelTitle?: string
-  size?: ModalSize
 }>()
 
-const sizeClasses = computed(() => SIZE_CLASSES[size])
-
 const isRightPanelOpen = defineModel<boolean>('rightPanelOpen', {
   default: false
 })
@@ -232,3 +215,17 @@ function handleEscape(event: KeyboardEvent) {
   }
 }
 </script>
+<style scoped>
+.base-widget-layout {
+  height: 80vh;
+  width: 90vw;
+  max-width: 1280px;
+  aspect-ratio: 20/13;
+}
+
+@media (min-width: 1450px) {
+  .base-widget-layout {
+    max-width: 1724px;
+  }
+}
+</style>

src/composables/billing/types.ts

@@ -1,6 +1,5 @@
 import type { ComputedRef, Ref } from 'vue'
 
-import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
 import type {
   Plan,
   PreviewSubscribeResponse,
@@ -74,5 +73,4 @@ export interface BillingState {
 
 export interface BillingContext extends BillingState, BillingActions {
   type: ComputedRef<BillingType>
-  getMaxSeats: (tierKey: TierKey) => number
 }

src/composables/billing/useBillingContext.test.ts

@@ -1,50 +1,25 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type { Plan } from '@/platform/workspace/api/workspaceApi'
-
 import { useBillingContext } from './useBillingContext'
 
-const { mockTeamWorkspacesEnabled, mockIsPersonal, mockPlans } = vi.hoisted(
-  () => ({
-    mockTeamWorkspacesEnabled: { value: false },
-    mockIsPersonal: { value: true },
-    mockPlans: { value: [] as Plan[] }
-  })
-)
-
-vi.mock('@vueuse/core', async (importOriginal) => {
-  const original = await importOriginal()
+vi.mock('@/platform/workspace/stores/teamWorkspaceStore', () => {
+  const isInPersonalWorkspace = { value: true }
+  const activeWorkspace = { value: { id: 'personal-123', type: 'personal' } }
   return {
-    ...(original as Record<string, unknown>),
-    createSharedComposable: (fn: (...args: unknown[]) => unknown) => fn
+    useTeamWorkspaceStore: () => ({
+      isInPersonalWorkspace: isInPersonalWorkspace.value,
+      activeWorkspace: activeWorkspace.value,
+      _setPersonalWorkspace: (value: boolean) => {
+        isInPersonalWorkspace.value = value
+        activeWorkspace.value = value
+          ? { id: 'personal-123', type: 'personal' }
+          : { id: 'team-456', type: 'team' }
+      }
+    })
   }
 })
 
-vi.mock('@/composables/useFeatureFlags', () => ({
-  useFeatureFlags: () => ({
-    flags: {
-      get teamWorkspacesEnabled() {
-        return mockTeamWorkspacesEnabled.value
-      }
-    }
-  })
-}))
-
-vi.mock('@/platform/workspace/stores/teamWorkspaceStore', () => ({
-  useTeamWorkspaceStore: () => ({
-    get isInPersonalWorkspace() {
-      return mockIsPersonal.value
-    },
-    get activeWorkspace() {
-      return mockIsPersonal.value
-        ? { id: 'personal-123', type: 'personal' }
-        : { id: 'team-456', type: 'team' }
-    },
-    updateActiveWorkspace: vi.fn()
-  })
-}))
-
 vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
   useSubscription: () => ({
     isActiveSubscription: { value: true },
@@ -77,18 +52,20 @@ vi.mock('@/stores/firebaseAuthStore', () => ({
   })
 }))
 
-vi.mock('@/platform/cloud/subscription/composables/useBillingPlans', () => ({
-  useBillingPlans: () => ({
-    get plans() {
-      return mockPlans
-    },
-    currentPlanSlug: { value: null },
-    isLoading: { value: false },
-    error: { value: null },
-    fetchPlans: vi.fn().mockResolvedValue(undefined),
-    getPlanBySlug: vi.fn().mockReturnValue(null)
-  })
-}))
+vi.mock('@/platform/cloud/subscription/composables/useBillingPlans', () => {
+  const plans = { value: [] }
+  const currentPlanSlug = { value: null }
+  return {
+    useBillingPlans: () => ({
+      plans,
+      currentPlanSlug,
+      isLoading: { value: false },
+      error: { value: null },
+      fetchPlans: vi.fn().mockResolvedValue(undefined),
+      getPlanBySlug: vi.fn().mockReturnValue(null)
+    })
+  }
+})
 
 vi.mock('@/platform/workspace/api/workspaceApi', () => ({
   workspaceApi: {
@@ -111,9 +88,6 @@ describe('useBillingContext', () => {
   beforeEach(() => {
     setActivePinia(createPinia())
     vi.clearAllMocks()
-    mockTeamWorkspacesEnabled.value = false
-    mockIsPersonal.value = true
-    mockPlans.value = []
   })
 
   it('returns legacy type for personal workspace', () => {
@@ -187,51 +161,4 @@ describe('useBillingContext', () => {
     const { showSubscriptionDialog } = useBillingContext()
     expect(() => showSubscriptionDialog()).not.toThrow()
   })
-
-  describe('getMaxSeats', () => {
-    it('returns 1 for personal workspaces regardless of tier', () => {
-      const { getMaxSeats } = useBillingContext()
-      expect(getMaxSeats('standard')).toBe(1)
-      expect(getMaxSeats('creator')).toBe(1)
-      expect(getMaxSeats('pro')).toBe(1)
-      expect(getMaxSeats('founder')).toBe(1)
-    })
-
-    it('falls back to hardcoded values when no API plans available', () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-
-      const { getMaxSeats } = useBillingContext()
-      expect(getMaxSeats('standard')).toBe(1)
-      expect(getMaxSeats('creator')).toBe(5)
-      expect(getMaxSeats('pro')).toBe(20)
-      expect(getMaxSeats('founder')).toBe(1)
-    })
-
-    it('prefers API max_seats when plans are loaded', () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockPlans.value = [
-        {
-          slug: 'pro-monthly',
-          tier: 'PRO',
-          duration: 'MONTHLY',
-          price_cents: 10000,
-          credits_cents: 2110000,
-          max_seats: 50,
-          availability: { available: true },
-          seat_summary: {
-            seat_count: 1,
-            total_cost_cents: 10000,
-            total_credits_cents: 2110000
-          }
-        }
-      ]
-
-      const { getMaxSeats } = useBillingContext()
-      expect(getMaxSeats('pro')).toBe(50)
-      // Tiers without API plans still fall back to hardcoded values
-      expect(getMaxSeats('creator')).toBe(5)
-    })
-  })
 })

src/composables/billing/useBillingContext.ts

@@ -2,11 +2,6 @@ import { computed, ref, shallowRef, toValue, watch } from 'vue'
 import { createSharedComposable } from '@vueuse/core'
 
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
-import {
-  KEY_TO_TIER,
-  getTierFeatures
-} from '@/platform/cloud/subscription/constants/tierPricing'
-import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
 import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
 
 import type {
@@ -120,16 +115,6 @@ function useBillingContextInternal(): BillingContext {
     toValue(activeContext.value.isActiveSubscription)
   )
 
-  function getMaxSeats(tierKey: TierKey): number {
-    if (type.value === 'legacy') return 1
-
-    const apiTier = KEY_TO_TIER[tierKey]
-    const plan = plans.value.find(
-      (p) => p.tier === apiTier && p.duration === 'MONTHLY'
-    )
-    return plan?.max_seats ?? getTierFeatures(tierKey).maxMembers
-  }
-
   // Sync subscription info to workspace store for display in workspace switcher
   // A subscription is considered "subscribed" for workspace purposes if it's active AND not cancelled
   // This ensures the delete button is enabled after cancellation, even before the period ends
@@ -238,7 +223,6 @@ function useBillingContextInternal(): BillingContext {
     isLoading,
     error,
     isActiveSubscription,
-    getMaxSeats,
 
     initialize,
     fetchStatus,

src/composables/graph/useGraphNodeManager.test.ts

@@ -1,76 +1,49 @@
 import { setActivePinia } from 'pinia'
 import { createTestingPinia } from '@pinia/testing'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed, nextTick, watch } from 'vue'
+import { describe, expect, it, vi } from 'vitest'
+import { nextTick, watch } from 'vue'
 
 import { useGraphNodeManager } from '@/composables/graph/useGraphNodeManager'
-import { BaseWidget, LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { NodeSlotType } from '@/lib/litegraph/src/types/globalEnums'
-import { useWidgetValueStore } from '@/stores/widgetValueStore'
+
+setActivePinia(createTestingPinia())
+
+function createTestGraph() {
+  const graph = new LGraph()
+  const node = new LGraphNode('test')
+  node.addInput('input', 'INT')
+  node.addWidget('number', 'testnum', 2, () => undefined, {})
+  graph.add(node)
+
+  const { vueNodeData } = useGraphNodeManager(graph)
+  const onReactivityUpdate = vi.fn()
+  watch(vueNodeData, onReactivityUpdate)
+
+  return [node, graph, onReactivityUpdate] as const
+}
 
 describe('Node Reactivity', () => {
-  beforeEach(() => {
-    setActivePinia(createTestingPinia({ stubActions: false }))
-  })
+  it('should trigger on callback', async () => {
+    const [node, , onReactivityUpdate] = createTestGraph()
 
-  function createTestGraph() {
-    const graph = new LGraph()
-    const node = new LGraphNode('test')
-    node.addInput('input', 'INT')
-    node.addWidget('number', 'testnum', 2, () => undefined, {})
-    graph.add(node)
-
-    const { vueNodeData } = useGraphNodeManager(graph)
-
-    return { node, graph, vueNodeData }
-  }
-
-  it('widget values are reactive through the store', async () => {
-    const { node } = createTestGraph()
-    const store = useWidgetValueStore()
-    const widget = node.widgets![0]
-
-    // Verify widget is a BaseWidget with correct value and node assignment
-    expect(widget).toBeInstanceOf(BaseWidget)
-    expect(widget.value).toBe(2)
-    expect((widget as BaseWidget).node.id).toBe(node.id)
-
-    // Initial value should be in store after setNodeId was called
-    expect(store.getWidget(node.id, 'testnum')?.value).toBe(2)
-
-    const onValueChange = vi.fn()
-    const widgetValue = computed(
-      () => store.getWidget(node.id, 'testnum')?.value
-    )
-    watch(widgetValue, onValueChange)
-
-    widget.value = 42
+    node.widgets![0].callback!(2)
     await nextTick()
-
-    expect(widgetValue.value).toBe(42)
-    expect(onValueChange).toHaveBeenCalledTimes(1)
+    expect(onReactivityUpdate).toHaveBeenCalledTimes(1)
   })
 
-  it('widget values remain reactive after a connection is made', async () => {
-    const { node, graph } = createTestGraph()
-    const store = useWidgetValueStore()
-    const onValueChange = vi.fn()
+  it('should remain reactive after a connection is made', async () => {
+    const [node, graph, onReactivityUpdate] = createTestGraph()
 
     graph.trigger('node:slot-links:changed', {
-      nodeId: String(node.id),
+      nodeId: '1',
       slotType: NodeSlotType.INPUT
     })
     await nextTick()
+    onReactivityUpdate.mockClear()
 
-    const widgetValue = computed(
-      () => store.getWidget(node.id, 'testnum')?.value
-    )
-    watch(widgetValue, onValueChange)
-
-    node.widgets![0].value = 99
+    node.widgets![0].callback!(2)
     await nextTick()
-
-    expect(onValueChange).toHaveBeenCalledTimes(1)
-    expect(widgetValue.value).toBe(99)
+    expect(onReactivityUpdate).toHaveBeenCalledTimes(1)
   })
 })

src/composables/graph/useGraphNodeManager.ts

@@ -3,7 +3,7 @@
  * Provides event-driven reactivity with performance optimizations
  */
 import { reactiveComputed } from '@vueuse/core'
-import { reactive, shallowReactive } from 'vue'
+import { customRef, reactive, shallowReactive } from 'vue'
 
 import { useChainCallback } from '@/composables/functional/useChainCallback'
 import { isProxyWidget } from '@/core/graph/subgraph/proxyWidget'
@@ -11,7 +11,10 @@ import type {
   INodeInputSlot,
   INodeOutputSlot
 } from '@/lib/litegraph/src/interfaces'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type {
+  IBaseWidget,
+  IWidgetOptions
+} from '@/lib/litegraph/src/types/widgets'
 import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
 import { LayoutSource } from '@/renderer/core/layout/types'
 import type { NodeId } from '@/renderer/core/layout/types'
@@ -38,35 +41,19 @@ export interface WidgetSlotMetadata {
   linked: boolean
 }
 
-/**
- * Minimal render-specific widget data extracted from LiteGraph widgets.
- * Value and metadata (label, hidden, disabled, etc.) are accessed via widgetValueStore.
- */
 export interface SafeWidgetData {
-  nodeId?: NodeId
   name: string
   type: string
-  /** Callback to invoke when widget value changes (wraps LiteGraph callback + triggerDraw) */
+  value: WidgetValue
+  borderStyle?: string
   callback?: ((value: unknown) => void) | undefined
-  /** Control widget for seed randomization/increment/decrement */
   controlWidget?: SafeControlWidget
-  /** Whether widget has custom layout size computation */
   hasLayoutSize?: boolean
-  /** Whether widget is a DOM widget */
   isDOMWidget?: boolean
-  /**
-   * Widget options needed for render decisions.
-   * Note: Most metadata should be accessed via widgetValueStore.getWidget().
-   */
-  options?: {
-    canvasOnly?: boolean
-    advanced?: boolean
-    hidden?: boolean
-    read_only?: boolean
-  }
-  /** Input specification from node definition */
+  label?: string
+  nodeType?: string
+  options?: IWidgetOptions
   spec?: InputSpec
-  /** Input slot metadata (index and link status) */
   slotMetadata?: WidgetSlotMetadata
 }
 
@@ -108,6 +95,23 @@ export interface GraphNodeManager {
   cleanup(): void
 }
 
+function widgetWithVueTrack(
+  widget: IBaseWidget
+): asserts widget is IBaseWidget & { vueTrack: () => void } {
+  if (widget.vueTrack) return
+
+  customRef((track, trigger) => {
+    widget.callback = useChainCallback(widget.callback, trigger)
+    widget.vueTrack = track
+    return { get() {}, set() {} }
+  })
+}
+function useReactiveWidgetValue(widget: IBaseWidget) {
+  widgetWithVueTrack(widget)
+  widget.vueTrack()
+  return widget.value
+}
+
 function getControlWidget(widget: IBaseWidget): SafeControlWidget | undefined {
   const cagWidget = widget.linkedWidgets?.find(
     (w) => w.name == 'control_after_generate'
@@ -119,20 +123,36 @@ function getControlWidget(widget: IBaseWidget): SafeControlWidget | undefined {
   }
 }
 
+function getNodeType(node: LGraphNode, widget: IBaseWidget) {
+  if (!node.isSubgraphNode() || !isProxyWidget(widget)) return undefined
+  const subNode = node.subgraph.getNodeById(widget._overlay.nodeId)
+  return subNode?.type
+}
+
 /**
  * Shared widget enhancements used by both safeWidgetMapper and Right Side Panel
  */
 interface SharedWidgetEnhancements {
+  /** Reactive widget value that updates when the widget changes */
+  value: WidgetValue
   /** Control widget for seed randomization/increment/decrement */
   controlWidget?: SafeControlWidget
   /** Input specification from node definition */
   spec?: InputSpec
+  /** Node type (for subgraph promoted widgets) */
+  nodeType?: string
+  /** Border style for promoted/advanced widgets */
+  borderStyle?: string
+  /** Widget label */
+  label?: string
+  /** Widget options */
+  options?: IWidgetOptions
 }
 
 /**
  * Extracts common widget enhancements shared across different rendering contexts.
- * This function centralizes the logic for extracting metadata from widgets.
- * Note: Value and metadata (label, options, hidden, etc.) are accessed via widgetValueStore.
+ * This function centralizes the logic for extracting metadata and reactive values
+ * from widgets, ensuring consistency between Nodes 2.0 and Right Side Panel.
  */
 export function getSharedWidgetEnhancements(
   node: LGraphNode,
@@ -141,8 +161,17 @@ export function getSharedWidgetEnhancements(
   const nodeDefStore = useNodeDefStore()
 
   return {
+    value: useReactiveWidgetValue(widget),
     controlWidget: getControlWidget(widget),
-    spec: nodeDefStore.getInputSpecForWidget(node, widget.name)
+    spec: nodeDefStore.getInputSpecForWidget(node, widget.name),
+    nodeType: getNodeType(node, widget),
+    borderStyle: widget.promoted
+      ? 'ring ring-component-node-widget-promoted'
+      : widget.advanced
+        ? 'ring ring-component-node-widget-advanced'
+        : undefined,
+    label: widget.label,
+    options: widget.options as IWidgetOptions
   }
 }
 
@@ -183,7 +212,7 @@ function safeWidgetMapper(
 ): (widget: IBaseWidget) => SafeWidgetData {
   return function (widget) {
     try {
-      // Get shared enhancements (controlWidget, spec, nodeType)
+      // Get shared enhancements used by both Nodes 2.0 and Right Side Panel
       const sharedEnhancements = getSharedWidgetEnhancements(node, widget)
       const slotInfo = slotMetadata.get(widget.name)
 
@@ -199,41 +228,20 @@ function safeWidgetMapper(
         node.widgets?.forEach((w) => w.triggerDraw?.())
       }
 
-      // Extract only render-critical options (canvasOnly, advanced, read_only)
-      const options = widget.options
-        ? {
-            canvasOnly: widget.options.canvasOnly,
-            advanced: widget.advanced,
-            hidden: widget.options.hidden,
-            read_only: widget.options.read_only
-          }
-        : undefined
-      const subgraphId = node.isSubgraphNode() && node.subgraph.id
-
-      const localId = isProxyWidget(widget)
-        ? widget._overlay?.nodeId
-        : undefined
-      const nodeId =
-        subgraphId && localId ? `${subgraphId}:${localId}` : undefined
-      const name = isProxyWidget(widget)
-        ? widget._overlay.widgetName
-        : widget.name
-
       return {
-        nodeId,
-        name,
+        name: widget.name,
         type: widget.type,
         ...sharedEnhancements,
         callback,
         hasLayoutSize: typeof widget.computeLayoutSize === 'function',
         isDOMWidget: isDOMWidget(widget),
-        options,
         slotMetadata: slotInfo
       }
     } catch (error) {
       return {
         name: widget.name || 'unknown',
-        type: widget.type || 'text'
+        type: widget.type || 'text',
+        value: undefined
       }
     }
   }

src/composables/node/usePriceBadge.ts

@@ -36,9 +36,7 @@ export const usePriceBadge = () => {
     return badges
   }
 
-  function isCreditsBadge(
-    badge: Partial<LGraphBadge> | (() => Partial<LGraphBadge>)
-  ): boolean {
+  function isCreditsBadge(badge: LGraphBadge | (() => LGraphBadge)): boolean {
     const badgeInstance = typeof badge === 'function' ? badge() : badge
     return badgeInstance.icon?.image === componentIconSvg
   }
@@ -63,7 +61,6 @@ export const usePriceBadge = () => {
   }
   return {
     getCreditsBadge,
-    isCreditsBadge,
     updateSubgraphCredits
   }
 }

src/composables/queue/useCompletionSummary.test.ts

@@ -0,0 +1,289 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, reactive } from 'vue'
+
+import { useCompletionSummary } from '@/composables/queue/useCompletionSummary'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
+
+type MockTask = {
+  displayStatus: 'Completed' | 'Failed' | 'Cancelled' | 'Running' | 'Pending'
+  executionEndTimestamp?: number
+  previewOutput?: {
+    isImage: boolean
+    urlWithTimestamp: string
+  }
+}
+
+vi.mock('@/stores/queueStore', () => {
+  const state = reactive({
+    runningTasks: [] as MockTask[],
+    historyTasks: [] as MockTask[]
+  })
+
+  return {
+    useQueueStore: () => state
+  }
+})
+
+vi.mock('@/stores/executionStore', () => {
+  const state = reactive({
+    isIdle: true
+  })
+
+  return {
+    useExecutionStore: () => state
+  }
+})
+
+describe('useCompletionSummary', () => {
+  const queueStore = () =>
+    useQueueStore() as {
+      runningTasks: MockTask[]
+      historyTasks: MockTask[]
+    }
+  const executionStore = () => useExecutionStore() as { isIdle: boolean }
+
+  const resetState = () => {
+    queueStore().runningTasks = []
+    queueStore().historyTasks = []
+    executionStore().isIdle = true
+  }
+
+  const createTask = (
+    options: {
+      state?: MockTask['displayStatus']
+      ts?: number
+      previewUrl?: string
+      isImage?: boolean
+    } = {}
+  ): MockTask => {
+    const {
+      state = 'Completed',
+      ts = Date.now(),
+      previewUrl,
+      isImage = true
+    } = options
+
+    const task: MockTask = {
+      displayStatus: state,
+      executionEndTimestamp: ts
+    }
+
+    if (previewUrl) {
+      task.previewOutput = {
+        isImage,
+        urlWithTimestamp: previewUrl
+      }
+    }
+
+    return task
+  }
+
+  const runBatch = async (options: {
+    start: number
+    finish: number
+    tasks: MockTask[]
+  }) => {
+    const { start, finish, tasks } = options
+
+    vi.setSystemTime(start)
+    executionStore().isIdle = false
+    await nextTick()
+
+    vi.setSystemTime(finish)
+    queueStore().historyTasks = tasks
+    executionStore().isIdle = true
+    await nextTick()
+  }
+
+  beforeEach(() => {
+    resetState()
+    vi.useFakeTimers()
+    vi.setSystemTime(0)
+  })
+
+  afterEach(() => {
+    vi.runOnlyPendingTimers()
+    vi.useRealTimers()
+    resetState()
+  })
+
+  it('summarizes the most recent batch and auto clears after the dismiss delay', async () => {
+    const { summary } = useCompletionSummary()
+    await nextTick()
+
+    const start = 1_000
+    const finish = 2_000
+
+    const tasks = [
+      createTask({ ts: start - 100, previewUrl: 'ignored-old' }),
+      createTask({ ts: start + 10, previewUrl: 'img-1' }),
+      createTask({ ts: start + 20, previewUrl: 'img-2' }),
+      createTask({ ts: start + 30, previewUrl: 'img-3' }),
+      createTask({ ts: start + 40, previewUrl: 'img-4' }),
+      createTask({ state: 'Failed', ts: start + 50 })
+    ]
+
+    await runBatch({ start, finish, tasks })
+
+    expect(summary.value).toEqual({
+      mode: 'mixed',
+      completedCount: 4,
+      failedCount: 1,
+      thumbnailUrls: ['img-1', 'img-2', 'img-3']
+    })
+
+    vi.advanceTimersByTime(6000)
+    await nextTick()
+    expect(summary.value).toBeNull()
+  })
+
+  it('reports allFailed when every task in the batch failed', async () => {
+    const { summary } = useCompletionSummary()
+    await nextTick()
+
+    const start = 10_000
+    const finish = 10_200
+
+    await runBatch({
+      start,
+      finish,
+      tasks: [
+        createTask({ state: 'Failed', ts: start + 25 }),
+        createTask({ state: 'Failed', ts: start + 50 })
+      ]
+    })
+
+    expect(summary.value).toEqual({
+      mode: 'allFailed',
+      completedCount: 0,
+      failedCount: 2,
+      thumbnailUrls: []
+    })
+  })
+
+  it('treats cancelled tasks as failures and skips non-image previews', async () => {
+    const { summary } = useCompletionSummary()
+    await nextTick()
+
+    const start = 15_000
+    const finish = 15_200
+
+    await runBatch({
+      start,
+      finish,
+      tasks: [
+        createTask({ ts: start + 25, previewUrl: 'img-1' }),
+        createTask({
+          state: 'Cancelled',
+          ts: start + 50,
+          previewUrl: 'thumb-ignore',
+          isImage: false
+        })
+      ]
+    })
+
+    expect(summary.value).toEqual({
+      mode: 'mixed',
+      completedCount: 1,
+      failedCount: 1,
+      thumbnailUrls: ['img-1']
+    })
+  })
+
+  it('clearSummary dismisses the banner immediately and still tracks future batches', async () => {
+    const { summary, clearSummary } = useCompletionSummary()
+    await nextTick()
+
+    await runBatch({
+      start: 5_000,
+      finish: 5_100,
+      tasks: [createTask({ ts: 5_050, previewUrl: 'img-1' })]
+    })
+
+    expect(summary.value).toEqual({
+      mode: 'allSuccess',
+      completedCount: 1,
+      failedCount: 0,
+      thumbnailUrls: ['img-1']
+    })
+
+    clearSummary()
+    expect(summary.value).toBeNull()
+
+    await runBatch({
+      start: 6_000,
+      finish: 6_150,
+      tasks: [createTask({ ts: 6_075, previewUrl: 'img-2' })]
+    })
+
+    expect(summary.value).toEqual({
+      mode: 'allSuccess',
+      completedCount: 1,
+      failedCount: 0,
+      thumbnailUrls: ['img-2']
+    })
+  })
+
+  it('ignores batches that have no finished tasks after the active period started', async () => {
+    const { summary } = useCompletionSummary()
+    await nextTick()
+
+    const start = 20_000
+    const finish = 20_500
+
+    await runBatch({
+      start,
+      finish,
+      tasks: [createTask({ ts: start - 1, previewUrl: 'too-early' })]
+    })
+
+    expect(summary.value).toBeNull()
+  })
+
+  it('derives the active period from running tasks when execution is already idle', async () => {
+    const { summary } = useCompletionSummary()
+    await nextTick()
+
+    const start = 25_000
+    vi.setSystemTime(start)
+    queueStore().runningTasks = [
+      createTask({ state: 'Running', ts: start + 1 })
+    ]
+    await nextTick()
+
+    const finish = start + 150
+    vi.setSystemTime(finish)
+    queueStore().historyTasks = [
+      createTask({ ts: finish - 10, previewUrl: 'img-running-trigger' })
+    ]
+    queueStore().runningTasks = []
+    await nextTick()
+
+    expect(summary.value).toEqual({
+      mode: 'allSuccess',
+      completedCount: 1,
+      failedCount: 0,
+      thumbnailUrls: ['img-running-trigger']
+    })
+  })
+
+  it('does not emit a summary when every finished task is still running or pending', async () => {
+    const { summary } = useCompletionSummary()
+    await nextTick()
+
+    const start = 30_000
+    const finish = 30_300
+
+    await runBatch({
+      start,
+      finish,
+      tasks: [
+        createTask({ state: 'Running', ts: start + 20 }),
+        createTask({ state: 'Pending', ts: start + 40 })
+      ]
+    })
+
+    expect(summary.value).toBeNull()
+  })
+})

src/composables/queue/useCompletionSummary.ts

@@ -0,0 +1,116 @@
+import { computed, ref, watch } from 'vue'
+
+import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
+import { jobStateFromTask } from '@/utils/queueUtil'
+
+export type CompletionSummaryMode = 'allSuccess' | 'mixed' | 'allFailed'
+
+export type CompletionSummary = {
+  mode: CompletionSummaryMode
+  completedCount: number
+  failedCount: number
+  thumbnailUrls: string[]
+}
+
+/**
+ * Tracks queue activity transitions and exposes a short-lived summary of the
+ * most recent generation batch.
+ */
+export const useCompletionSummary = () => {
+  const queueStore = useQueueStore()
+  const executionStore = useExecutionStore()
+
+  const isActive = computed(
+    () => queueStore.runningTasks.length > 0 || !executionStore.isIdle
+  )
+
+  const lastActiveStartTs = ref<number | null>(null)
+  const _summary = ref<CompletionSummary | null>(null)
+  const dismissTimer = ref<number | null>(null)
+
+  const clearDismissTimer = () => {
+    if (dismissTimer.value !== null) {
+      clearTimeout(dismissTimer.value)
+      dismissTimer.value = null
+    }
+  }
+
+  const startDismissTimer = () => {
+    clearDismissTimer()
+    dismissTimer.value = window.setTimeout(() => {
+      _summary.value = null
+      dismissTimer.value = null
+    }, 6000)
+  }
+
+  const clearSummary = () => {
+    _summary.value = null
+    clearDismissTimer()
+  }
+
+  watch(
+    isActive,
+    (active, prev) => {
+      if (!prev && active) {
+        lastActiveStartTs.value = Date.now()
+      }
+      if (prev && !active) {
+        const start = lastActiveStartTs.value ?? 0
+        const finished = queueStore.historyTasks.filter((t) => {
+          const ts = t.executionEndTimestamp
+          return typeof ts === 'number' && ts >= start
+        })
+
+        if (!finished.length) {
+          _summary.value = null
+          clearDismissTimer()
+          return
+        }
+
+        let completedCount = 0
+        let failedCount = 0
+        const imagePreviews: string[] = []
+
+        for (const task of finished) {
+          const state = jobStateFromTask(task, false)
+          if (state === 'completed') {
+            completedCount++
+            const preview = task.previewOutput
+            if (preview?.isImage) {
+              imagePreviews.push(preview.urlWithTimestamp)
+            }
+          } else if (state === 'failed') {
+            failedCount++
+          }
+        }
+
+        if (completedCount === 0 && failedCount === 0) {
+          _summary.value = null
+          clearDismissTimer()
+          return
+        }
+
+        let mode: CompletionSummaryMode = 'mixed'
+        if (failedCount === 0) mode = 'allSuccess'
+        else if (completedCount === 0) mode = 'allFailed'
+
+        _summary.value = {
+          mode,
+          completedCount,
+          failedCount,
+          thumbnailUrls: imagePreviews.slice(0, 3)
+        }
+        startDismissTimer()
+      }
+    },
+    { immediate: true }
+  )
+
+  const summary = computed(() => _summary.value)
+
+  return {
+    summary,
+    clearSummary
+  }
+}

src/composables/queue/useJobList.test.ts

@@ -5,6 +5,7 @@ import type { Ref } from 'vue'
 
 import { useJobList } from '@/composables/queue/useJobList'
 import type { JobState } from '@/types/queue'
+import { buildJobDisplay } from '@/utils/queueDisplay'
 import type { BuildJobDisplayCtx } from '@/utils/queueDisplay'
 import type { TaskItemImpl } from '@/stores/queueStore'
 
@@ -255,6 +256,78 @@ describe('useJobList', () => {
     return api!
   }
 
+  it('tracks recently added pending jobs and clears the hint after expiry', async () => {
+    vi.useFakeTimers()
+    queueStoreMock.pendingTasks = [
+      createTask({ promptId: '1', queueIndex: 1, mockState: 'pending' })
+    ]
+
+    const { jobItems } = initComposable()
+    await flush()
+
+    jobItems.value
+    expect(buildJobDisplay).toHaveBeenCalledWith(
+      expect.anything(),
+      'pending',
+      expect.objectContaining({ showAddedHint: true })
+    )
+
+    vi.mocked(buildJobDisplay).mockClear()
+    await vi.advanceTimersByTimeAsync(3000)
+    await flush()
+
+    jobItems.value
+    expect(buildJobDisplay).toHaveBeenCalledWith(
+      expect.anything(),
+      'pending',
+      expect.objectContaining({ showAddedHint: false })
+    )
+  })
+
+  it('removes pending hint immediately when the task leaves the queue', async () => {
+    vi.useFakeTimers()
+    const taskId = '2'
+    queueStoreMock.pendingTasks = [
+      createTask({ promptId: taskId, queueIndex: 1, mockState: 'pending' })
+    ]
+
+    const { jobItems } = initComposable()
+    await flush()
+    jobItems.value
+
+    queueStoreMock.pendingTasks = []
+    await flush()
+    expect(vi.getTimerCount()).toBe(0)
+
+    vi.mocked(buildJobDisplay).mockClear()
+    queueStoreMock.pendingTasks = [
+      createTask({ promptId: taskId, queueIndex: 2, mockState: 'pending' })
+    ]
+    await flush()
+    jobItems.value
+    expect(buildJobDisplay).toHaveBeenCalledWith(
+      expect.anything(),
+      'pending',
+      expect.objectContaining({ showAddedHint: true })
+    )
+  })
+
+  it('cleans up timeouts on unmount', async () => {
+    vi.useFakeTimers()
+    queueStoreMock.pendingTasks = [
+      createTask({ promptId: '3', queueIndex: 1, mockState: 'pending' })
+    ]
+
+    initComposable()
+    await flush()
+    expect(vi.getTimerCount()).toBeGreaterThan(0)
+
+    wrapper?.unmount()
+    wrapper = null
+    await flush()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
   it('sorts all tasks by create time', async () => {
     queueStoreMock.pendingTasks = [
       createTask({

src/composables/queue/useQueueNotificationBanners.test.ts

@@ -1,349 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick, reactive } from 'vue'
-
-import { useQueueNotificationBanners } from '@/composables/queue/useQueueNotificationBanners'
-import { api } from '@/scripts/api'
-import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
-
-const mockApi = vi.hoisted(() => new EventTarget())
-
-vi.mock('@/scripts/api', () => ({
-  api: mockApi
-}))
-
-type MockTask = {
-  displayStatus: 'Completed' | 'Failed' | 'Cancelled' | 'Running' | 'Pending'
-  executionEndTimestamp?: number
-  previewOutput?: {
-    isImage: boolean
-    urlWithTimestamp: string
-  }
-}
-
-vi.mock('@/stores/queueStore', () => {
-  const state = reactive({
-    pendingTasks: [] as MockTask[],
-    runningTasks: [] as MockTask[],
-    historyTasks: [] as MockTask[]
-  })
-
-  return {
-    useQueueStore: () => state
-  }
-})
-
-vi.mock('@/stores/executionStore', () => {
-  const state = reactive({
-    isIdle: true
-  })
-
-  return {
-    useExecutionStore: () => state
-  }
-})
-
-const mountComposable = () => {
-  let composable: ReturnType<typeof useQueueNotificationBanners>
-  const wrapper = mount({
-    template: '<div />',
-    setup() {
-      composable = useQueueNotificationBanners()
-      return {}
-    }
-  })
-  return { wrapper, composable: composable! }
-}
-
-describe(useQueueNotificationBanners, () => {
-  const queueStore = () =>
-    useQueueStore() as {
-      pendingTasks: MockTask[]
-      runningTasks: MockTask[]
-      historyTasks: MockTask[]
-    }
-  const executionStore = () => useExecutionStore() as { isIdle: boolean }
-
-  const resetState = () => {
-    queueStore().pendingTasks = []
-    queueStore().runningTasks = []
-    queueStore().historyTasks = []
-    executionStore().isIdle = true
-  }
-
-  const createTask = (
-    options: {
-      state?: MockTask['displayStatus']
-      ts?: number
-      previewUrl?: string
-      isImage?: boolean
-    } = {}
-  ): MockTask => {
-    const {
-      state = 'Completed',
-      ts = Date.now(),
-      previewUrl,
-      isImage = true
-    } = options
-
-    const task: MockTask = {
-      displayStatus: state,
-      executionEndTimestamp: ts
-    }
-
-    if (previewUrl) {
-      task.previewOutput = {
-        isImage,
-        urlWithTimestamp: previewUrl
-      }
-    }
-
-    return task
-  }
-
-  const runBatch = async (options: {
-    start: number
-    finish: number
-    tasks: MockTask[]
-  }) => {
-    const { start, finish, tasks } = options
-
-    vi.setSystemTime(start)
-    executionStore().isIdle = false
-    await nextTick()
-
-    vi.setSystemTime(finish)
-    queueStore().historyTasks = tasks
-    executionStore().isIdle = true
-    await nextTick()
-  }
-
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.setSystemTime(0)
-    resetState()
-  })
-
-  afterEach(() => {
-    vi.runOnlyPendingTimers()
-    vi.useRealTimers()
-    resetState()
-  })
-
-  it('shows queued notifications from promptQueued events', async () => {
-    const { wrapper, composable } = mountComposable()
-
-    try {
-      ;(api as unknown as EventTarget).dispatchEvent(
-        new CustomEvent('promptQueued', { detail: { batchCount: 4 } })
-      )
-      await nextTick()
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'queued',
-        count: 4
-      })
-
-      await vi.advanceTimersByTimeAsync(4000)
-      await nextTick()
-      expect(composable.currentNotification.value).toBeNull()
-    } finally {
-      wrapper.unmount()
-    }
-  })
-
-  it('shows queued pending then queued confirmation', async () => {
-    const { wrapper, composable } = mountComposable()
-
-    try {
-      ;(api as unknown as EventTarget).dispatchEvent(
-        new CustomEvent('promptQueueing', {
-          detail: { requestId: 1, batchCount: 2 }
-        })
-      )
-      await nextTick()
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'queuedPending',
-        count: 2,
-        requestId: 1
-      })
-
-      ;(api as unknown as EventTarget).dispatchEvent(
-        new CustomEvent('promptQueued', {
-          detail: { requestId: 1, batchCount: 2 }
-        })
-      )
-      await nextTick()
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'queued',
-        count: 2,
-        requestId: 1
-      })
-    } finally {
-      wrapper.unmount()
-    }
-  })
-
-  it('falls back to 1 when queued batch count is invalid', async () => {
-    const { wrapper, composable } = mountComposable()
-
-    try {
-      ;(api as unknown as EventTarget).dispatchEvent(
-        new CustomEvent('promptQueued', { detail: { batchCount: 0 } })
-      )
-      await nextTick()
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'queued',
-        count: 1
-      })
-    } finally {
-      wrapper.unmount()
-    }
-  })
-
-  it('shows a completed notification from a finished batch', async () => {
-    const { wrapper, composable } = mountComposable()
-
-    try {
-      await runBatch({
-        start: 1_000,
-        finish: 1_200,
-        tasks: [
-          createTask({
-            ts: 1_050,
-            previewUrl: 'https://example.com/preview.png'
-          })
-        ]
-      })
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'completed',
-        count: 1,
-        thumbnailUrls: ['https://example.com/preview.png']
-      })
-    } finally {
-      wrapper.unmount()
-    }
-  })
-
-  it('shows one completion notification when history updates after queue becomes idle', async () => {
-    const { wrapper, composable } = mountComposable()
-
-    try {
-      vi.setSystemTime(4_000)
-      executionStore().isIdle = false
-      await nextTick()
-
-      vi.setSystemTime(4_100)
-      executionStore().isIdle = true
-      queueStore().historyTasks = []
-      await nextTick()
-
-      expect(composable.currentNotification.value).toBeNull()
-
-      queueStore().historyTasks = [
-        createTask({
-          ts: 4_050,
-          previewUrl: 'https://example.com/race-preview.png'
-        })
-      ]
-      await nextTick()
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'completed',
-        count: 1,
-        thumbnailUrls: ['https://example.com/race-preview.png']
-      })
-
-      await vi.advanceTimersByTimeAsync(4000)
-      await nextTick()
-      expect(composable.currentNotification.value).toBeNull()
-
-      await vi.advanceTimersByTimeAsync(4000)
-      await nextTick()
-      expect(composable.currentNotification.value).toBeNull()
-    } finally {
-      wrapper.unmount()
-    }
-  })
-
-  it('queues both completed and failed notifications for mixed batches', async () => {
-    const { wrapper, composable } = mountComposable()
-
-    try {
-      await runBatch({
-        start: 2_000,
-        finish: 2_200,
-        tasks: [
-          createTask({
-            ts: 2_050,
-            previewUrl: 'https://example.com/result.png'
-          }),
-          createTask({ ts: 2_060 }),
-          createTask({ ts: 2_070 }),
-          createTask({ state: 'Failed', ts: 2_080 })
-        ]
-      })
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'completed',
-        count: 3,
-        thumbnailUrls: ['https://example.com/result.png']
-      })
-
-      await vi.advanceTimersByTimeAsync(4000)
-      await nextTick()
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'failed',
-        count: 1
-      })
-    } finally {
-      wrapper.unmount()
-    }
-  })
-
-  it('uses up to two completion thumbnails for notification icon previews', async () => {
-    const { wrapper, composable } = mountComposable()
-
-    try {
-      await runBatch({
-        start: 3_000,
-        finish: 3_300,
-        tasks: [
-          createTask({
-            ts: 3_050,
-            previewUrl: 'https://example.com/preview-1.png'
-          }),
-          createTask({
-            ts: 3_060,
-            previewUrl: 'https://example.com/preview-2.png'
-          }),
-          createTask({
-            ts: 3_070,
-            previewUrl: 'https://example.com/preview-3.png'
-          }),
-          createTask({
-            ts: 3_080,
-            previewUrl: 'https://example.com/preview-4.png'
-          })
-        ]
-      })
-
-      expect(composable.currentNotification.value).toEqual({
-        type: 'completed',
-        count: 4,
-        thumbnailUrls: [
-          'https://example.com/preview-1.png',
-          'https://example.com/preview-2.png'
-        ]
-      })
-    } finally {
-      wrapper.unmount()
-    }
-  })
-})

src/composables/queue/useQueueNotificationBanners.ts

@@ -1,318 +0,0 @@
-import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
-
-import { api } from '@/scripts/api'
-import type {
-  PromptQueuedEventPayload,
-  PromptQueueingEventPayload
-} from '@/scripts/api'
-import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
-import { jobStateFromTask } from '@/utils/queueUtil'
-
-const BANNER_DISMISS_DELAY_MS = 4000
-const MAX_COMPLETION_THUMBNAILS = 2
-
-type QueueQueuedNotificationType = 'queuedPending' | 'queued'
-
-type QueueQueuedNotification = {
-  type: QueueQueuedNotificationType
-  count: number
-  requestId?: number
-}
-
-type QueueCompletedNotification = {
-  type: 'completed'
-  count: number
-  thumbnailUrl?: string
-  thumbnailUrls?: string[]
-}
-
-type QueueFailedNotification = {
-  type: 'failed'
-  count: number
-}
-
-export type QueueNotificationBanner =
-  | QueueQueuedNotification
-  | QueueCompletedNotification
-  | QueueFailedNotification
-
-const sanitizeCount = (value: number | undefined) => {
-  if (value === undefined || Number.isNaN(value) || value <= 0) {
-    return 1
-  }
-  return Math.floor(value)
-}
-
-export const useQueueNotificationBanners = () => {
-  const queueStore = useQueueStore()
-  const executionStore = useExecutionStore()
-
-  const pendingNotifications = ref<QueueNotificationBanner[]>([])
-  const activeNotification = ref<QueueNotificationBanner | null>(null)
-  const dismissTimer = ref<number | null>(null)
-  const lastActiveStartTs = ref<number | null>(null)
-  let stopIdleHistoryWatch: (() => void) | null = null
-  let idleCompletionScheduleToken = 0
-  const isQueueActive = computed(
-    () =>
-      queueStore.pendingTasks.length > 0 ||
-      queueStore.runningTasks.length > 0 ||
-      !executionStore.isIdle
-  )
-
-  const clearIdleCompletionHooks = () => {
-    idleCompletionScheduleToken++
-    if (!stopIdleHistoryWatch) {
-      return
-    }
-    stopIdleHistoryWatch()
-    stopIdleHistoryWatch = null
-  }
-
-  const clearDismissTimer = () => {
-    if (dismissTimer.value === null) {
-      return
-    }
-    clearTimeout(dismissTimer.value)
-    dismissTimer.value = null
-  }
-
-  const dismissActiveNotification = () => {
-    activeNotification.value = null
-    dismissTimer.value = null
-    showNextNotification()
-  }
-
-  const showNextNotification = () => {
-    if (activeNotification.value !== null) {
-      return
-    }
-    const [nextNotification, ...rest] = pendingNotifications.value
-    pendingNotifications.value = rest
-    if (!nextNotification) {
-      return
-    }
-
-    activeNotification.value = nextNotification
-    clearDismissTimer()
-    dismissTimer.value = window.setTimeout(
-      dismissActiveNotification,
-      BANNER_DISMISS_DELAY_MS
-    )
-  }
-
-  const queueNotification = (notification: QueueNotificationBanner) => {
-    pendingNotifications.value = [...pendingNotifications.value, notification]
-    showNextNotification()
-  }
-
-  const toQueueLifecycleNotification = (
-    type: QueueQueuedNotificationType,
-    count: number,
-    requestId?: number
-  ): QueueQueuedNotification => {
-    if (requestId === undefined) {
-      return {
-        type,
-        count
-      }
-    }
-    return {
-      type,
-      count,
-      requestId
-    }
-  }
-
-  const toCompletedNotification = (
-    count: number,
-    thumbnailUrls: string[]
-  ): QueueCompletedNotification => ({
-    type: 'completed',
-    count,
-    thumbnailUrls: thumbnailUrls.slice(0, MAX_COMPLETION_THUMBNAILS)
-  })
-
-  const toFailedNotification = (count: number): QueueFailedNotification => ({
-    type: 'failed',
-    count
-  })
-
-  const convertQueuedPendingToQueued = (
-    requestId: number | undefined,
-    count: number
-  ) => {
-    if (
-      activeNotification.value?.type === 'queuedPending' &&
-      (requestId === undefined ||
-        activeNotification.value.requestId === requestId)
-    ) {
-      activeNotification.value = toQueueLifecycleNotification(
-        'queued',
-        count,
-        requestId
-      )
-      return true
-    }
-
-    const pendingIndex = pendingNotifications.value.findIndex(
-      (notification) =>
-        notification.type === 'queuedPending' &&
-        (requestId === undefined || notification.requestId === requestId)
-    )
-
-    if (pendingIndex === -1) {
-      return false
-    }
-
-    const queuedPendingNotification = pendingNotifications.value[pendingIndex]
-    if (
-      queuedPendingNotification === undefined ||
-      queuedPendingNotification.type !== 'queuedPending'
-    ) {
-      return false
-    }
-
-    pendingNotifications.value = [
-      ...pendingNotifications.value.slice(0, pendingIndex),
-      toQueueLifecycleNotification(
-        'queued',
-        count,
-        queuedPendingNotification.requestId
-      ),
-      ...pendingNotifications.value.slice(pendingIndex + 1)
-    ]
-
-    return true
-  }
-
-  const handlePromptQueueing = (
-    event: CustomEvent<PromptQueueingEventPayload>
-  ) => {
-    const payload = event.detail
-    const count = sanitizeCount(payload?.batchCount)
-    queueNotification(
-      toQueueLifecycleNotification('queuedPending', count, payload?.requestId)
-    )
-  }
-
-  const handlePromptQueued = (event: CustomEvent<PromptQueuedEventPayload>) => {
-    const payload = event.detail
-    const count = sanitizeCount(payload?.batchCount)
-    const handled = convertQueuedPendingToQueued(payload?.requestId, count)
-    if (!handled) {
-      queueNotification(
-        toQueueLifecycleNotification('queued', count, payload?.requestId)
-      )
-    }
-  }
-
-  api.addEventListener('promptQueueing', handlePromptQueueing)
-  api.addEventListener('promptQueued', handlePromptQueued)
-
-  const queueCompletionBatchNotifications = () => {
-    const startTs = lastActiveStartTs.value ?? 0
-    const finishedTasks = queueStore.historyTasks.filter((task) => {
-      const ts = task.executionEndTimestamp
-      return typeof ts === 'number' && ts >= startTs
-    })
-
-    if (!finishedTasks.length) {
-      return false
-    }
-
-    let completedCount = 0
-    let failedCount = 0
-    const imagePreviews: string[] = []
-
-    for (const task of finishedTasks) {
-      const state = jobStateFromTask(task, false)
-      if (state === 'completed') {
-        completedCount++
-        const preview = task.previewOutput
-        if (preview?.isImage) {
-          imagePreviews.push(preview.urlWithTimestamp)
-        }
-      } else if (state === 'failed') {
-        failedCount++
-      }
-    }
-
-    if (completedCount > 0) {
-      queueNotification(toCompletedNotification(completedCount, imagePreviews))
-    }
-
-    if (failedCount > 0) {
-      queueNotification(toFailedNotification(failedCount))
-    }
-
-    return completedCount > 0 || failedCount > 0
-  }
-
-  const scheduleIdleCompletionBatchNotifications = () => {
-    clearIdleCompletionHooks()
-    const scheduleToken = idleCompletionScheduleToken
-    const startTsSnapshot = lastActiveStartTs.value
-
-    const isStillSameIdleWindow = () =>
-      scheduleToken === idleCompletionScheduleToken &&
-      !isQueueActive.value &&
-      lastActiveStartTs.value === startTsSnapshot
-
-    stopIdleHistoryWatch = watch(
-      () => queueStore.historyTasks,
-      () => {
-        if (!isStillSameIdleWindow()) {
-          clearIdleCompletionHooks()
-          return
-        }
-        queueCompletionBatchNotifications()
-        clearIdleCompletionHooks()
-      }
-    )
-
-    void nextTick(() => {
-      if (!isStillSameIdleWindow()) {
-        clearIdleCompletionHooks()
-        return
-      }
-
-      const hasShownNotifications = queueCompletionBatchNotifications()
-      if (hasShownNotifications) {
-        clearIdleCompletionHooks()
-      }
-    })
-  }
-
-  watch(
-    isQueueActive,
-    (active, prev) => {
-      if (!prev && active) {
-        clearIdleCompletionHooks()
-        lastActiveStartTs.value = Date.now()
-        return
-      }
-      if (prev && !active) {
-        scheduleIdleCompletionBatchNotifications()
-      }
-    },
-    { immediate: true }
-  )
-
-  onUnmounted(() => {
-    api.removeEventListener('promptQueueing', handlePromptQueueing)
-    api.removeEventListener('promptQueued', handlePromptQueued)
-    clearIdleCompletionHooks()
-    clearDismissTimer()
-    pendingNotifications.value = []
-    activeNotification.value = null
-    lastActiveStartTs.value = null
-  })
-
-  const currentNotification = computed(() => activeNotification.value)
-
-  return {
-    currentNotification
-  }
-}

src/composables/tree/useTreeFolderOperations.ts

@@ -1,5 +1,5 @@
 import type { MenuItem } from 'primevue/menuitem'
-import { shallowRef } from 'vue'
+import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
@@ -8,14 +8,12 @@ import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
  * Use this to handle folder operations in a tree.
  * @param expandNode - The function to expand a node.
  */
-export function useTreeFolderOperations<T>(
-  expandNode: (node: RenderedTreeExplorerNode<T>) => void
+export function useTreeFolderOperations(
+  expandNode: (node: RenderedTreeExplorerNode) => void
 ) {
   const { t } = useI18n()
-  const newFolderNode = shallowRef<RenderedTreeExplorerNode<T> | null>(null)
-  const addFolderTargetNode = shallowRef<RenderedTreeExplorerNode<T> | null>(
-    null
-  )
+  const newFolderNode = ref<RenderedTreeExplorerNode | null>(null)
+  const addFolderTargetNode = ref<RenderedTreeExplorerNode | null>(null)
 
   // Generate a unique temporary key for the new folder
   const generateTempKey = (parentKey: string) => {
@@ -39,7 +37,7 @@ export function useTreeFolderOperations<T>(
    * The command to add a folder to a node via the context menu
    * @param targetNode - The node where the folder will be added under
    */
-  const addFolderCommand = (targetNode: RenderedTreeExplorerNode<T>) => {
+  const addFolderCommand = (targetNode: RenderedTreeExplorerNode) => {
     expandNode(targetNode)
     newFolderNode.value = {
       key: generateTempKey(targetNode.key),
@@ -51,13 +49,13 @@ export function useTreeFolderOperations<T>(
       totalLeaves: 0,
       badgeText: '',
       isEditingLabel: true
-    } as RenderedTreeExplorerNode<T>
+    }
     addFolderTargetNode.value = targetNode
   }
 
   // Generate the "Add Folder" menu item
   const getAddFolderMenuItem = (
-    targetNode: RenderedTreeExplorerNode<T> | null
+    targetNode: RenderedTreeExplorerNode | null
   ): MenuItem => {
     return {
       label: t('g.newFolder'),

src/composables/useCoreCommands.ts

@@ -35,7 +35,6 @@ import {
 } from '@/renderer/core/canvas/canvasStore'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
-import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useDialogService } from '@/services/dialogService'
 import { useLitegraphService } from '@/services/litegraphService'
 import type { ComfyCommand } from '@/stores/commandStore'
@@ -74,7 +73,6 @@ export function useCoreCommands(): ComfyCommand[] {
   const { isActiveSubscription, showSubscriptionDialog } = useBillingContext()
   const workflowService = useWorkflowService()
   const workflowStore = useWorkflowStore()
-  const settingsDialog = useSettingsDialog()
   const dialogService = useDialogService()
   const colorPaletteStore = useColorPaletteStore()
   const firebaseAuthActions = useFirebaseAuthActions()
@@ -584,7 +582,7 @@ export function useCoreCommands(): ComfyCommand[] {
       versionAdded: '1.3.7',
       category: 'view-controls' as const,
       function: () => {
-        settingsDialog.show()
+        void dialogService.showSettingsDialog()
       }
     },
     {
@@ -833,7 +831,7 @@ export function useCoreCommands(): ComfyCommand[] {
       menubarLabel: 'About ComfyUI',
       versionAdded: '1.6.4',
       function: () => {
-        settingsDialog.showAbout()
+        void dialogService.showSettingsDialog('about')
       }
     },
     {

src/composables/useErrorHandling.ts

@@ -52,17 +52,10 @@ export interface ErrorRecoveryStrategy<
 export function useErrorHandling() {
   const toast = useToastStore()
   const toastErrorHandler = (error: unknown) => {
-    const isNetworkError =
-      error instanceof TypeError && error.message === 'Failed to fetch'
-    const message = isNetworkError
-      ? t('g.disconnectedFromBackend')
-      : error instanceof Error
-        ? error.message
-        : t('g.unknownError')
     toast.add({
       severity: 'error',
       summary: t('g.error'),
-      detail: message
+      detail: error instanceof Error ? error.message : t('g.unknownError')
     })
     console.error(error)
   }

src/composables/useFeatureFlags.ts

@@ -61,7 +61,7 @@ export function useFeatureFlags() {
     get onboardingSurveyEnabled() {
       return (
         remoteConfig.value.onboarding_survey_enabled ??
-        api.getServerFeature(ServerFeatureFlag.ONBOARDING_SURVEY_ENABLED, false)
+        api.getServerFeature(ServerFeatureFlag.ONBOARDING_SURVEY_ENABLED, true)
       )
     },
     get linearToggleEnabled() {

src/composables/usePaste.test.ts

@@ -7,13 +7,8 @@ import type {
 } from '@/lib/litegraph/src/litegraph'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { app } from '@/scripts/app'
-import { createNode, isImageNode } from '@/utils/litegraphUtil'
-import {
-  cloneDataTransfer,
-  pasteImageNode,
-  pasteImageNodes,
-  usePaste
-} from './usePaste'
+import { isImageNode } from '@/utils/litegraphUtil'
+import { pasteImageNode, usePaste } from './usePaste'
 
 function createMockNode() {
   return {
@@ -91,7 +86,6 @@ vi.mock('@/lib/litegraph/src/litegraph', () => ({
 }))
 
 vi.mock('@/utils/litegraphUtil', () => ({
-  createNode: vi.fn(),
   isAudioNode: vi.fn(),
   isImageNode: vi.fn(),
   isVideoNode: vi.fn()
@@ -105,32 +99,34 @@ describe('pasteImageNode', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     vi.mocked(mockCanvas.graph!.add).mockImplementation(
-      (node: LGraphNode | LGraphGroup | null) => node as LGraphNode
+      (node: LGraphNode | LGraphGroup) => node as LGraphNode
     )
   })
 
-  it('should create new LoadImage node when no image node provided', async () => {
+  it('should create new LoadImage node when no image node provided', () => {
     const mockNode = createMockNode()
-    vi.mocked(createNode).mockResolvedValue(mockNode as unknown as LGraphNode)
+    vi.mocked(LiteGraph.createNode).mockReturnValue(
+      mockNode as unknown as LGraphNode
+    )
 
     const file = createImageFile()
     const dataTransfer = createDataTransfer([file])
 
-    await pasteImageNode(
-      mockCanvas as unknown as LGraphCanvas,
-      dataTransfer.items
-    )
+    pasteImageNode(mockCanvas as unknown as LGraphCanvas, dataTransfer.items)
 
-    expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadImage')
+    expect(LiteGraph.createNode).toHaveBeenCalledWith('LoadImage')
+    expect(mockNode.pos).toEqual([100, 200])
+    expect(mockCanvas.graph!.add).toHaveBeenCalledWith(mockNode)
+    expect(mockCanvas.graph!.change).toHaveBeenCalled()
     expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
   })
 
-  it('should use existing image node when provided', async () => {
+  it('should use existing image node when provided', () => {
     const mockNode = createMockNode()
     const file = createImageFile()
     const dataTransfer = createDataTransfer([file])
 
-    await pasteImageNode(
+    pasteImageNode(
       mockCanvas as unknown as LGraphCanvas,
       dataTransfer.items,
       mockNode as unknown as LGraphNode
@@ -140,13 +136,13 @@ describe('pasteImageNode', () => {
     expect(mockNode.pasteFiles).toHaveBeenCalledWith([file])
   })
 
-  it('should handle multiple image files', async () => {
+  it('should handle multiple image files', () => {
     const mockNode = createMockNode()
     const file1 = createImageFile('test1.png')
     const file2 = createImageFile('test2.jpg', 'image/jpeg')
     const dataTransfer = createDataTransfer([file1, file2])
 
-    await pasteImageNode(
+    pasteImageNode(
       mockCanvas as unknown as LGraphCanvas,
       dataTransfer.items,
       mockNode as unknown as LGraphNode
@@ -156,11 +152,11 @@ describe('pasteImageNode', () => {
     expect(mockNode.pasteFiles).toHaveBeenCalledWith([file1, file2])
   })
 
-  it('should do nothing when no image files present', async () => {
+  it('should do nothing when no image files present', () => {
     const mockNode = createMockNode()
     const dataTransfer = createDataTransfer()
 
-    await pasteImageNode(
+    pasteImageNode(
       mockCanvas as unknown as LGraphCanvas,
       dataTransfer.items,
       mockNode as unknown as LGraphNode
@@ -170,13 +166,13 @@ describe('pasteImageNode', () => {
     expect(mockNode.pasteFiles).not.toHaveBeenCalled()
   })
 
-  it('should filter non-image items', async () => {
+  it('should filter non-image items', () => {
     const mockNode = createMockNode()
     const imageFile = createImageFile()
     const textFile = new File([''], 'test.txt', { type: 'text/plain' })
     const dataTransfer = createDataTransfer([textFile, imageFile])
 
-    await pasteImageNode(
+    pasteImageNode(
       mockCanvas as unknown as LGraphCanvas,
       dataTransfer.items,
       mockNode as unknown as LGraphNode
@@ -187,61 +183,21 @@ describe('pasteImageNode', () => {
   })
 })
 
-describe('pasteImageNodes', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should create multiple nodes for multiple files', async () => {
-    const mockNode1 = createMockNode()
-    const mockNode2 = createMockNode()
-    vi.mocked(createNode)
-      .mockResolvedValueOnce(mockNode1 as unknown as LGraphNode)
-      .mockResolvedValueOnce(mockNode2 as unknown as LGraphNode)
-
-    const file1 = createImageFile('test1.png')
-    const file2 = createImageFile('test2.jpg', 'image/jpeg')
-    const fileList = createDataTransfer([file1, file2]).files
-
-    const result = await pasteImageNodes(
-      mockCanvas as unknown as LGraphCanvas,
-      fileList
-    )
-
-    expect(createNode).toHaveBeenCalledTimes(2)
-    expect(createNode).toHaveBeenNthCalledWith(1, mockCanvas, 'LoadImage')
-    expect(createNode).toHaveBeenNthCalledWith(2, mockCanvas, 'LoadImage')
-    expect(mockNode1.pasteFile).toHaveBeenCalledWith(file1)
-    expect(mockNode2.pasteFile).toHaveBeenCalledWith(file2)
-    expect(result).toEqual([mockNode1, mockNode2])
-  })
-
-  it('should handle empty file list', async () => {
-    const fileList = createDataTransfer([]).files
-
-    const result = await pasteImageNodes(
-      mockCanvas as unknown as LGraphCanvas,
-      fileList
-    )
-
-    expect(createNode).not.toHaveBeenCalled()
-    expect(result).toEqual([])
-  })
-})
-
 describe('usePaste', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     mockCanvas.current_node = null
     mockWorkspaceStore.shiftDown = false
     vi.mocked(mockCanvas.graph!.add).mockImplementation(
-      (node: LGraphNode | LGraphGroup | null) => node as LGraphNode
+      (node: LGraphNode | LGraphGroup) => node as LGraphNode
     )
   })
 
   it('should handle image paste', async () => {
     const mockNode = createMockNode()
-    vi.mocked(createNode).mockResolvedValue(mockNode as unknown as LGraphNode)
+    vi.mocked(LiteGraph.createNode).mockReturnValue(
+      mockNode as unknown as LGraphNode
+    )
 
     usePaste()
 
@@ -251,7 +207,7 @@ describe('usePaste', () => {
     document.dispatchEvent(event)
 
     await vi.waitFor(() => {
-      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadImage')
+      expect(LiteGraph.createNode).toHaveBeenCalledWith('LoadImage')
       expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
     })
   })
@@ -356,62 +312,3 @@ describe('usePaste', () => {
     })
   })
 })
-
-describe('cloneDataTransfer', () => {
-  it('should clone string data', () => {
-    const original = new DataTransfer()
-    original.setData('text/plain', 'test text')
-    original.setData('text/html', '<p>test html</p>')
-
-    const cloned = cloneDataTransfer(original)
-
-    expect(cloned.getData('text/plain')).toBe('test text')
-    expect(cloned.getData('text/html')).toBe('<p>test html</p>')
-  })
-
-  it('should clone files', () => {
-    const file1 = createImageFile('test1.png')
-    const file2 = createImageFile('test2.jpg', 'image/jpeg')
-    const original = createDataTransfer([file1, file2])
-
-    const cloned = cloneDataTransfer(original)
-
-    // Files are added from both .files and .items, causing duplicates
-    expect(cloned.files.length).toBeGreaterThanOrEqual(2)
-    expect(Array.from(cloned.files)).toContain(file1)
-    expect(Array.from(cloned.files)).toContain(file2)
-  })
-
-  it('should preserve dropEffect and effectAllowed', () => {
-    const original = new DataTransfer()
-    original.dropEffect = 'copy'
-    original.effectAllowed = 'copyMove'
-
-    const cloned = cloneDataTransfer(original)
-
-    expect(cloned.dropEffect).toBe('copy')
-    expect(cloned.effectAllowed).toBe('copyMove')
-  })
-
-  it('should handle empty DataTransfer', () => {
-    const original = new DataTransfer()
-
-    const cloned = cloneDataTransfer(original)
-
-    expect(cloned.types.length).toBe(0)
-    expect(cloned.files.length).toBe(0)
-  })
-
-  it('should clone both string data and files', () => {
-    const file = createImageFile()
-    const original = createDataTransfer([file])
-    original.setData('text/plain', 'test')
-
-    const cloned = cloneDataTransfer(original)
-
-    expect(cloned.getData('text/plain')).toBe('test')
-    // Files are added from both .files and .items
-    expect(cloned.files.length).toBeGreaterThanOrEqual(1)
-    expect(Array.from(cloned.files)).toContain(file)
-  })
-})

src/composables/usePaste.ts

@@ -6,41 +6,9 @@ import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/w
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { app } from '@/scripts/app'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import {
-  createNode,
-  isAudioNode,
-  isImageNode,
-  isVideoNode
-} from '@/utils/litegraphUtil'
+import { isAudioNode, isImageNode, isVideoNode } from '@/utils/litegraphUtil'
 import { shouldIgnoreCopyPaste } from '@/workbench/eventHelpers'
 
-export function cloneDataTransfer(original: DataTransfer): DataTransfer {
-  const persistent = new DataTransfer()
-
-  // Copy string data
-  for (const type of original.types) {
-    const data = original.getData(type)
-    if (data) {
-      persistent.setData(type, data)
-    }
-  }
-
-  for (const item of original.items) {
-    if (item.kind === 'file') {
-      const file = item.getAsFile()
-      if (file) {
-        persistent.items.add(file)
-      }
-    }
-  }
-
-  // Preserve dropEffect and effectAllowed
-  persistent.dropEffect = original.dropEffect
-  persistent.effectAllowed = original.effectAllowed
-
-  return persistent
-}
-
 function pasteClipboardItems(data: DataTransfer): boolean {
   const rawData = data.getData('text/html')
   const match = rawData.match(/data-metadata="([A-Za-z0-9+/=]+)"/)?.[1]
@@ -80,37 +48,27 @@ function pasteItemsOnNode(
   )
 }
 
-export async function pasteImageNode(
+export function pasteImageNode(
   canvas: LGraphCanvas,
   items: DataTransferItemList,
   imageNode: LGraphNode | null = null
-): Promise<LGraphNode | null> {
-  // No image node selected: add a new one
+): void {
+  const {
+    graph,
+    graph_mouse: [posX, posY]
+  } = canvas
+
   if (!imageNode) {
-    imageNode = await createNode(canvas, 'LoadImage')
+    // No image node selected: add a new one
+    const newNode = LiteGraph.createNode('LoadImage')
+    if (newNode) {
+      newNode.pos = [posX, posY]
+      imageNode = graph?.add(newNode) ?? null
+    }
+    graph?.change()
   }
 
   pasteItemsOnNode(items, imageNode, 'image')
-  return imageNode
-}
-
-export async function pasteImageNodes(
-  canvas: LGraphCanvas,
-  fileList: FileList
-): Promise<LGraphNode[]> {
-  const nodes: LGraphNode[] = []
-
-  for (const file of fileList) {
-    const transfer = new DataTransfer()
-    transfer.items.add(file)
-    const imageNode = await pasteImageNode(canvas, transfer.items)
-
-    if (imageNode) {
-      nodes.push(imageNode)
-    }
-  }
-
-  return nodes
 }
 
 /**
@@ -135,7 +93,6 @@ export const usePaste = () => {
     const { graph } = canvas
     let data: DataTransfer | string | null = e.clipboardData
     if (!data) throw new Error('No clipboard data on clipboard event')
-    data = cloneDataTransfer(data)
 
     const { items } = data
 
@@ -157,7 +114,7 @@ export const usePaste = () => {
     // Look for image paste data
     for (const item of items) {
       if (item.type.startsWith('image/')) {
-        await pasteImageNode(canvas as LGraphCanvas, items, imageNode)
+        pasteImageNode(canvas as LGraphCanvas, items, imageNode)
         return
       } else if (item.type.startsWith('video/')) {
         if (!videoNode) {

src/composables/useWorkflowTemplateSelectorDialog.ts

@@ -32,6 +32,15 @@ export const useWorkflowTemplateSelectorDialog = () => {
       props: {
         onClose: hide,
         initialCategory
+      },
+      dialogComponentProps: {
+        pt: {
+          content: { class: '!px-0 overflow-hidden h-full !py-0' },
+          root: {
+            style:
+              'width: 90vw; height: 85vh; max-width: 1400px; display: flex;'
+          }
+        }
       }
     })
   }

src/config/staging.ts

@@ -0,0 +1,20 @@
+import { computed } from 'vue'
+
+import { isCloud } from '@/platform/distribution/types'
+import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
+
+const BUILD_TIME_IS_STAGING = !__USE_PROD_CONFIG__
+
+/**
+ * Returns whether the current environment is staging.
+ * - Cloud builds use runtime configuration (firebase_config.projectId containing '-dev')
+ * - OSS / localhost builds fall back to the build-time config determined by __USE_PROD_CONFIG__
+ */
+export const isStaging = computed(() => {
+  if (!isCloud) {
+    return BUILD_TIME_IS_STAGING
+  }
+
+  const projectId = remoteConfig.value.firebase_config?.projectId
+  return projectId?.includes('-dev') ?? BUILD_TIME_IS_STAGING
+})

src/constants/serverConfig.ts

@@ -9,7 +9,7 @@ import {
   VramManagement
 } from '@/types/serverArgs'
 
-export type ServerConfigValue = string | number | boolean | null | undefined
+export type ServerConfigValue = string | number | true | null | undefined
 
 export interface ServerConfig<T> extends FormItem {
   id: string
@@ -19,7 +19,7 @@ export interface ServerConfig<T> extends FormItem {
   getValue?: (value: T) => Record<string, ServerConfigValue>
 }
 
-export const SERVER_CONFIG_ITEMS = [
+export const SERVER_CONFIG_ITEMS: ServerConfig<any>[] = [
   // Network settings
   {
     id: 'listen',