Refactor + error handling

.github/workflows/test-ui.yaml

@@ -30,7 +30,7 @@ jobs:
         with:
           repository: 'Comfy-Org/ComfyUI_devtools'
           path: 'ComfyUI/custom_nodes/ComfyUI_devtools'
-          ref: 'd05fd48dd787a4192e16802d4244cfcc0e2f9684'
+          ref: '9d2421fd3208a310e4d0f71fca2ea0c985759c33'
 
       - uses: actions/setup-node@v4
         with:

browser_tests/assets/collapsed_multiline.json

@@ -33,11 +33,5 @@
   "links": [],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
   "version": 0.4
 }

browser_tests/assets/default.json

@@ -130,11 +130,6 @@
   ],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
+  "extra": {},
   "version": 0.4
 }

browser_tests/assets/default_input.json

@@ -42,12 +42,12 @@
   "config": {},
   "extra": {
     "ds": {
-      "scale": 1,
+      "scale": 2.1600300525920346,
       "offset": [
-        0,
-        0
+        63.071794466403446,
+        75.18055335968394
       ]
     }
   },
   "version": 0.4
-}
+}

browser_tests/assets/every_node_color.json

@@ -499,11 +499,6 @@
   ],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
+  "extra": {},
   "version": 0.4
-}
+}

browser_tests/assets/execution/partial_execution.json

@@ -1,85 +0,0 @@
-{
-  "id": "1a95532f-c8aa-4c9d-a7f6-f928ba2d4862",
-  "revision": 0,
-  "last_node_id": 4,
-  "last_link_id": 3,
-  "nodes": [
-    {
-      "id": 4,
-      "type": "PreviewAny",
-      "pos": [946.2566528320312, 598.4373168945312],
-      "size": [140, 76],
-      "flags": {},
-      "order": 2,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "source",
-          "type": "*",
-          "link": 3
-        }
-      ],
-      "outputs": [],
-      "properties": {
-        "Node name for S&R": "PreviewAny"
-      },
-      "widgets_values": []
-    },
-    {
-      "id": 1,
-      "type": "PreviewAny",
-      "pos": [951.0236206054688, 421.3861083984375],
-      "size": [140, 76],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "source",
-          "type": "*",
-          "link": 2
-        }
-      ],
-      "outputs": [],
-      "properties": {
-        "Node name for S&R": "PreviewAny"
-      },
-      "widgets_values": []
-    },
-    {
-      "id": 3,
-      "type": "PrimitiveString",
-      "pos": [575.1760864257812, 504.5214538574219],
-      "size": [270, 58],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "STRING",
-          "type": "STRING",
-          "links": [2, 3]
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "PrimitiveString"
-      },
-      "widgets_values": ["foo"]
-    }
-  ],
-  "links": [
-    [2, 3, 0, 1, 0, "*"],
-    [3, 3, 0, 4, 0, "*"]
-  ],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "frontendVersion": "1.19.1",
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
-  "version": 0.4
-}

browser_tests/assets/group_node_identical_nodes_hidden_inputs.json

@@ -160,4 +160,4 @@
     }
   },
   "version": 0.4
-}
+}

browser_tests/assets/group_node_v1.3.3.json

@@ -43,10 +43,6 @@
   "groups": [],
   "config": {},
   "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    },
     "groupNodes": {
       "group_node": {
         "nodes": [
@@ -405,4 +401,4 @@
     }
   },
   "version": 0.4
-}
+}

browser_tests/assets/legacy_group_node.json

@@ -110,10 +110,6 @@
   "groups": [],
   "config": {},
   "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    },
     "groupNodes": {
       "hello": {
         "nodes": [
@@ -253,4 +249,4 @@
     }
   },
   "version": 0.4
-}
+}

browser_tests/assets/missing_models_from_node_properties.json

@@ -44,11 +44,6 @@
   "links": [],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
+  "extra": {},
   "version": 0.4
 }

browser_tests/assets/missing_nodes_converted_widget.json

@@ -61,11 +61,6 @@
   "links": [],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
+  "extra": {},
   "version": 0.4
-}
+}

browser_tests/assets/node_with_v2_combo_input.json

@@ -1,36 +0,0 @@
-{
-  "id": "5635564e-189f-49e4-9b25-6b7634bcd595",
-  "revision": 0,
-  "last_node_id": 78,
-  "last_link_id": 53,
-  "nodes": [
-    {
-      "id": 78,
-      "type": "DevToolsNodeWithV2ComboInput",
-      "pos": [1320, 904],
-      "size": [270.3199157714844, 58],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "COMBO",
-          "type": "COMBO",
-          "links": null
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "DevToolsNodeWithV2ComboInput"
-      },
-      "widgets_values": ["A"]
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "frontendVersion": "1.19.7"
-  },
-  "version": 0.4
-}

browser_tests/assets/note_nodes.json

@@ -50,11 +50,6 @@
   "links": [],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
+  "extra": {},
   "version": 0.4
-}
+}

browser_tests/assets/only_optional_inputs.json

@@ -38,11 +38,7 @@
   "groups": [],
   "config": {},
   "extra": {
-    "groupNodes": {},
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
+    "groupNodes": {}
   },
   "version": 0.4
-}
+}

browser_tests/assets/primitive/primitive_node_unconnected_dom_widget.json

@@ -54,11 +54,6 @@
   "links": [],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
+  "extra": {},
   "version": 0.4
 }

browser_tests/assets/renamed_converted_widget.json

@@ -92,14 +92,10 @@
   "groups": [],
   "config": {},
   "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    },
     "VHS_latentpreview": true,
     "VHS_latentpreviewrate": 0,
     "VHS_MetadataImage": false,
     "VHS_KeepIntermediate": false
   },
   "version": 0.4
-}
+}

browser_tests/assets/reroute/native_reroute.json

@@ -84,10 +84,6 @@
   "groups": [],
   "config": {},
   "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    },
     "reroutes": [
       {
         "id": 1,

browser_tests/assets/single_connected_reroute_node.json

@@ -106,7 +106,10 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [0, 0]
+      "offset": {
+        "0": 0,
+        "1": 0
+      }
     }
   },
   "version": 0.4

browser_tests/assets/string_node_id.json

@@ -368,10 +368,10 @@
     "ds": {
       "scale": 1,
       "offset": [
-        0,
-        0
+        149.9747408641311,
+        383.8593224280729
       ]
     }
   },
   "version": 0.4
-}
+}

browser_tests/assets/widgets/boolean_widget.json

@@ -31,11 +31,5 @@
   "links": [],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
   "version": 0.4
-}
+}

browser_tests/assets/widgets/load_animated_webp.json

@@ -8,4 +8,4 @@
       "title": "Load Animated Image"
     }
   }
-}
+}

browser_tests/assets/widgets/load_audio_widget.json

@@ -27,11 +27,6 @@
   "links": [],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
+  "extra": {},
   "version": 0.4
 }

browser_tests/assets/widgets/load_image_widget.json

@@ -41,11 +41,6 @@
   "links": [],
   "groups": [],
   "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
+  "extra": {},
   "version": 0.4
-}
+}

browser_tests/assets/widgets/save_animated_webp.json

@@ -54,11 +54,7 @@
   "groups": [],
   "config": {},
   "extra": {
-    "frontendVersion": "1.17.0",
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
+    "frontendVersion": "1.17.0"
   },
   "version": 0.4
 }

browser_tests/fixtures/ComfyPage.ts

@@ -133,9 +133,6 @@ export class ComfyPage {
   // Inputs
   public readonly workflowUploadInput: Locator
 
-  // Toasts
-  public readonly visibleToasts: Locator
-
   // Components
   public readonly searchBox: ComfyNodeSearchBox
   public readonly menu: ComfyMenu
@@ -162,8 +159,6 @@ export class ComfyPage {
     this.resetViewButton = page.getByRole('button', { name: 'Reset View' })
     this.queueButton = page.getByRole('button', { name: 'Queue Prompt' })
     this.workflowUploadInput = page.locator('#comfy-file-input')
-    this.visibleToasts = page.locator('.p-toast-message:visible')
-
     this.searchBox = new ComfyNodeSearchBox(page)
     this.menu = new ComfyMenu(page)
     this.actionbar = new ComfyActionbar(page)
@@ -402,30 +397,6 @@ export class ComfyPage {
     await this.nextFrame()
   }
 
-  async deleteWorkflow(
-    workflowName: string,
-    whenMissing: 'ignoreMissing' | 'throwIfMissing' = 'ignoreMissing'
-  ) {
-    // Open workflows tab
-    const { workflowsTab } = this.menu
-    await workflowsTab.open()
-
-    // Action to take if workflow missing
-    if (whenMissing === 'ignoreMissing') {
-      const workflows = await workflowsTab.getTopLevelSavedWorkflowNames()
-      if (!workflows.includes(workflowName)) return
-    }
-
-    // Delete workflow
-    await workflowsTab.getPersistedItem(workflowName).click({ button: 'right' })
-    await this.clickContextMenuItem('Delete')
-    await this.confirmDialog.delete.click()
-
-    // Clear toast & close tab
-    await this.closeToasts(1)
-    await workflowsTab.close()
-  }
-
   async resetView() {
     if (await this.resetViewButton.isVisible()) {
       await this.resetViewButton.click()
@@ -442,20 +413,7 @@ export class ComfyPage {
   }
 
   async getVisibleToastCount() {
-    return await this.visibleToasts.count()
-  }
-
-  async closeToasts(requireCount = 0) {
-    if (requireCount) await expect(this.visibleToasts).toHaveCount(requireCount)
-
-    // Clear all toasts
-    const toastCloseButtons = await this.page
-      .locator('.p-toast-close-button')
-      .all()
-    for (const button of toastCloseButtons) {
-      await button.click()
-    }
-    await expect(this.visibleToasts).toHaveCount(0)
+    return await this.page.locator('.p-toast-message:visible').count()
   }
 
   async clickTextEncodeNode1() {

browser_tests/tests/execution.spec.ts

@@ -18,27 +18,3 @@ test.describe('Execution', () => {
     )
   })
 })
-
-test.describe('Execute to selected output nodes', () => {
-  test('Execute to selected output nodes', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('execution/partial_execution')
-    const input = await comfyPage.getNodeRefById(3)
-    const output1 = await comfyPage.getNodeRefById(1)
-    const output2 = await comfyPage.getNodeRefById(4)
-    expect(await (await input.getWidget(0)).getValue()).toBe('foo')
-    expect(await (await output1.getWidget(0)).getValue()).toBe('')
-    expect(await (await output2.getWidget(0)).getValue()).toBe('')
-
-    await output1.click('title')
-
-    await comfyPage.executeCommand('Comfy.QueueSelectedOutputNodes')
-    // @note: Wait for the execution to finish. We might want to move to a more
-    // reliable way to wait for the execution to finish. Workflow in this test
-    // is simple enough that this is fine for now.
-    await comfyPage.page.waitForTimeout(200)
-
-    expect(await (await input.getWidget(0)).getValue()).toBe('foo')
-    expect(await (await output1.getWidget(0)).getValue()).toBe('foo')
-    expect(await (await output2.getWidget(0)).getValue()).toBe('')
-  })
-})

browser_tests/tests/interaction.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import { type ComfyPage, comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.describe('Item Interaction', () => {
   test('Can select/delete all items', async ({ comfyPage }) => {
@@ -666,12 +666,6 @@ test.describe('Load workflow', () => {
       expect(activeWorkflowName).toEqual(workflowPathB)
     })
   })
-
-  test('Auto fit view after loading workflow', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.EnableWorkflowViewRestore', false)
-    await comfyPage.loadWorkflow('single_ksampler')
-    await expect(comfyPage.canvas).toHaveScreenshot('single_ksampler_fit.png')
-  })
 })
 
 test.describe('Load duplicate workflow', () => {
@@ -689,42 +683,3 @@ test.describe('Load duplicate workflow', () => {
     expect(await comfyPage.getGraphNodesCount()).toBe(1)
   })
 })
-
-test.describe('Viewport settings', () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.Workflow.WorkflowTabsPosition', 'Topbar')
-
-    await comfyPage.setupWorkflowsDirectory({})
-  })
-
-  test('Keeps viewport settings when changing tabs', async ({
-    comfyPage,
-    comfyMouse
-  }) => {
-    // Screenshot the canvas element
-    await comfyPage.menu.topbar.saveWorkflow('Workflow A')
-    await expect(comfyPage.canvas).toHaveScreenshot('viewport-workflow-a.png')
-
-    // Save workflow as a new file, then zoom out before screen shot
-    await comfyPage.menu.topbar.saveWorkflowAs('Workflow B')
-    await comfyMouse.move(comfyPage.emptySpace)
-    for (let i = 0; i < 4; i++) {
-      await comfyMouse.wheel(0, 60)
-    }
-    await expect(comfyPage.canvas).toHaveScreenshot('viewport-workflow-b.png')
-
-    const tabA = comfyPage.menu.topbar.getWorkflowTab('Workflow A')
-    const tabB = comfyPage.menu.topbar.getWorkflowTab('Workflow B')
-
-    // Go back to Workflow A
-    await tabA.click()
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('viewport-workflow-a.png')
-
-    // And back to Workflow B
-    await tabB.click()
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('viewport-workflow-b.png')
-  })
-})

browser_tests/tests/widget.spec.ts

@@ -53,26 +53,6 @@ test.describe('Combo text widget', () => {
     const refreshedComboValues = await getComboValues()
     expect(refreshedComboValues).not.toEqual(initialComboValues)
   })
-
-  test('Should refresh combo values of nodes with v2 combo input spec', async ({
-    comfyPage
-  }) => {
-    await comfyPage.loadWorkflow('node_with_v2_combo_input')
-    // click canvas to focus
-    await comfyPage.page.mouse.click(400, 300)
-    // press R to trigger refresh
-    await comfyPage.page.keyboard.press('r')
-    // wait for nodes' widgets to be updated
-    await comfyPage.page.mouse.click(400, 300)
-    await comfyPage.nextFrame()
-    // get the combo widget's values
-    const comboValues = await comfyPage.page.evaluate(() => {
-      return window['app'].graph.nodes
-        .find((node) => node.title === 'Node With V2 Combo Input')
-        .widgets.find((widget) => widget.name === 'combo_input').options.values
-    })
-    expect(comboValues).toEqual(['A', 'B'])
-  })
 })
 
 test.describe('Boolean widget', () => {

package-lock.json

@@ -1,18 +1,18 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.20.0",
+  "version": "1.19.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@comfyorg/comfyui-frontend",
-      "version": "1.20.0",
+      "version": "1.19.4",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
         "@comfyorg/comfyui-electron-types": "^0.4.43",
-        "@comfyorg/litegraph": "^0.15.9",
+        "@comfyorg/litegraph": "^0.15.3",
         "@primevue/forms": "^4.2.5",
         "@primevue/themes": "^4.2.5",
         "@sentry/vue": "^8.48.0",
@@ -482,9 +482,9 @@
       "license": "GPL-3.0-only"
     },
     "node_modules/@comfyorg/litegraph": {
-      "version": "0.15.9",
-      "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.15.9.tgz",
-      "integrity": "sha512-uMKUZx3VPLnpTOAcdvnppbJPQ/BL7Yt4flU2YeF+835r/59il+iUXCfnObpYmJj5jA4o89atpxByS8Jl1PM9vQ==",
+      "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.15.3.tgz",
+      "integrity": "sha512-YpHhNgV6a1bsi/NCuK/u5m9bgI3HK5qLXCLR2aKUJ4MPVfdILodqcbkKVBOb4li6KKUyg7plQ9GJpml6F2/fYQ==",
       "license": "MIT"
     },
     "node_modules/@cspotcode/source-map-support": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comfyorg/comfyui-frontend",
   "private": true,
-  "version": "1.20.0",
+  "version": "1.19.4",
   "type": "module",
   "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
   "homepage": "https://comfy.org",
@@ -72,7 +72,7 @@
     "@alloc/quick-lru": "^5.2.0",
     "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
     "@comfyorg/comfyui-electron-types": "^0.4.43",
-    "@comfyorg/litegraph": "^0.15.9",
+    "@comfyorg/litegraph": "^0.15.3",
     "@primevue/forms": "^4.2.5",
     "@primevue/themes": "^4.2.5",
     "@sentry/vue": "^8.48.0",

src/components/BrowserTabTitle.spec.ts

@@ -1,7 +1,8 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick, reactive } from 'vue'
 
-import { useBrowserTabTitle } from '@/composables/useBrowserTabTitle'
+import BrowserTabTitle from '@/components/BrowserTabTitle.vue'
 
 // Mock the execution store
 const executionStore = reactive({
@@ -30,8 +31,11 @@ vi.mock('@/stores/workflowStore', () => ({
   useWorkflowStore: () => workflowStore
 }))
 
-describe('useBrowserTabTitle', () => {
+describe('BrowserTabTitle.vue', () => {
+  let wrapper: ReturnType<typeof mount> | null
+
   beforeEach(() => {
+    wrapper = null
     // reset execution store
     executionStore.isIdle = true
     executionStore.executionProgress = 0
@@ -46,8 +50,12 @@ describe('useBrowserTabTitle', () => {
     document.title = ''
   })
 
+  afterEach(() => {
+    wrapper?.unmount()
+  })
+
   it('sets default title when idle and no workflow', () => {
-    useBrowserTabTitle()
+    wrapper = mount(BrowserTabTitle)
     expect(document.title).toBe('ComfyUI')
   })
 
@@ -58,7 +66,7 @@ describe('useBrowserTabTitle', () => {
       isModified: false,
       isPersisted: true
     }
-    useBrowserTabTitle()
+    wrapper = mount(BrowserTabTitle)
     await nextTick()
     expect(document.title).toBe('myFlow - ComfyUI')
   })
@@ -70,21 +78,19 @@ describe('useBrowserTabTitle', () => {
       isModified: true,
       isPersisted: true
     }
-    useBrowserTabTitle()
+    wrapper = mount(BrowserTabTitle)
     await nextTick()
     expect(document.title).toBe('*myFlow - ComfyUI')
   })
 
-  // Fails when run together with other tests. Suspect to be caused by leaked
-  // state from previous tests.
-  it.skip('disables workflow title when menu disabled', async () => {
+  it('disables workflow title when menu disabled', async () => {
     ;(settingStore.get as any).mockReturnValue('Disabled')
     workflowStore.activeWorkflow = {
       filename: 'myFlow',
       isModified: false,
       isPersisted: true
     }
-    useBrowserTabTitle()
+    wrapper = mount(BrowserTabTitle)
     await nextTick()
     expect(document.title).toBe('ComfyUI')
   })
@@ -92,7 +98,7 @@ describe('useBrowserTabTitle', () => {
   it('shows execution progress when not idle without workflow', async () => {
     executionStore.isIdle = false
     executionStore.executionProgress = 0.3
-    useBrowserTabTitle()
+    wrapper = mount(BrowserTabTitle)
     await nextTick()
     expect(document.title).toBe('[30%]ComfyUI')
   })
@@ -102,7 +108,7 @@ describe('useBrowserTabTitle', () => {
     executionStore.executionProgress = 0.4
     executionStore.executingNodeProgress = 0.5
     executionStore.executingNode = { type: 'Foo' }
-    useBrowserTabTitle()
+    wrapper = mount(BrowserTabTitle)
     await nextTick()
     expect(document.title).toBe('[40%][50%] Foo')
   })

src/components/BrowserTabTitle.vue

@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <!-- This component does not render anything visible. -->
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useTitle } from '@vueuse/core'
+import { computed } from 'vue'
+
+import { useExecutionStore } from '@/stores/executionStore'
+import { useSettingStore } from '@/stores/settingStore'
+import { useWorkflowStore } from '@/stores/workflowStore'
+
+const DEFAULT_TITLE = 'ComfyUI'
+const TITLE_SUFFIX = ' - ComfyUI'
+
+const executionStore = useExecutionStore()
+const executionText = computed(() =>
+  executionStore.isIdle
+    ? ''
+    : `[${Math.round(executionStore.executionProgress * 100)}%]`
+)
+
+const settingStore = useSettingStore()
+const newMenuEnabled = computed(
+  () => settingStore.get('Comfy.UseNewMenu') !== 'Disabled'
+)
+
+const workflowStore = useWorkflowStore()
+const isUnsavedText = computed(() =>
+  workflowStore.activeWorkflow?.isModified ||
+  !workflowStore.activeWorkflow?.isPersisted
+    ? ' *'
+    : ''
+)
+const workflowNameText = computed(() => {
+  const workflowName = workflowStore.activeWorkflow?.filename
+  return workflowName
+    ? isUnsavedText.value + workflowName + TITLE_SUFFIX
+    : DEFAULT_TITLE
+})
+
+const nodeExecutionTitle = computed(() =>
+  executionStore.executingNode && executionStore.executingNodeProgress
+    ? `${executionText.value}[${Math.round(executionStore.executingNodeProgress * 100)}%] ${executionStore.executingNode.type}`
+    : ''
+)
+
+const workflowTitle = computed(
+  () =>
+    executionText.value +
+    (newMenuEnabled.value ? workflowNameText.value : DEFAULT_TITLE)
+)
+
+const title = computed(() => nodeExecutionTitle.value || workflowTitle.value)
+useTitle(title)
+</script>

src/components/common/TreeExplorerTreeNode.spec.ts

@@ -32,8 +32,6 @@ describe('TreeExplorerTreeNode', () => {
     handleRename: () => {}
   } as RenderedTreeExplorerNode
 
-  const mockHandleEditLabel = vi.fn()
-
   beforeAll(() => {
     // Create a Vue app instance for PrimeVuePrimeVue
     const app = createApp({})
@@ -50,10 +48,7 @@ describe('TreeExplorerTreeNode', () => {
       props: { node: mockNode },
       global: {
         components: { EditableText, Badge },
-        plugins: [createTestingPinia(), i18n],
-        provide: {
-          [InjectKeyHandleEditLabelFunction]: mockHandleEditLabel
-        }
+        plugins: [createTestingPinia(), i18n]
       }
     })
 
@@ -77,10 +72,7 @@ describe('TreeExplorerTreeNode', () => {
       },
       global: {
         components: { EditableText, Badge, InputText },
-        plugins: [createTestingPinia(), i18n, PrimeVue],
-        provide: {
-          [InjectKeyHandleEditLabelFunction]: mockHandleEditLabel
-        }
+        plugins: [createTestingPinia(), i18n, PrimeVue]
       }
     })
 

src/components/common/VirtualGrid.vue

@@ -70,12 +70,11 @@ const state = computed<GridState>(() => {
   const fromCol = fromRow * cols.value
   const toCol = toRow * cols.value
   const remainingCol = items.length - toCol
-  const hasMoreToRender = remainingCol >= 0
 
   return {
     start: clamp(fromCol, 0, items?.length),
     end: clamp(toCol, fromCol, items?.length),
-    isNearEnd: hasMoreToRender && remainingCol <= cols.value * bufferRows
+    isNearEnd: remainingCol <= cols.value * bufferRows
   }
 })
 const renderedItems = computed(() =>

src/components/dialog/content/SettingDialogContent.vue

@@ -67,9 +67,9 @@ import Tabs from 'primevue/tabs'
 import { computed, watch } from 'vue'
 
 import SearchBox from '@/components/common/SearchBox.vue'
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import { useSettingSearch } from '@/composables/setting/useSettingSearch'
 import { useSettingUI } from '@/composables/setting/useSettingUI'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
 import { SettingTreeNode } from '@/stores/settingStore'
 import { ISettingGroup, SettingParams } from '@/types/settingTypes'
 import { flattenTree } from '@/utils/treeUtil'
@@ -107,7 +107,7 @@ const {
   getSearchResults
 } = useSettingSearch()
 
-const authActions = useFirebaseAuthActions()
+const authService = useFirebaseAuthService()
 
 // Sort groups for a category
 const sortedGroups = (category: SettingTreeNode): ISettingGroup[] => {
@@ -140,7 +140,7 @@ watch(activeCategory, (_, oldValue) => {
     activeCategory.value = oldValue
   }
   if (activeCategory.value?.key === 'credits') {
-    void authActions.fetchBalance()
+    void authService.fetchBalance()
   }
 })
 </script>

src/components/dialog/content/SignInContent.vue

@@ -1,141 +1,95 @@
 <template>
-  <div class="w-96 p-2 overflow-x-hidden">
-    <ApiKeyForm
-      v-if="showApiKeyForm"
-      @back="showApiKeyForm = false"
-      @success="onSuccess"
-    />
-    <template v-else>
-      <!-- Header -->
-      <div class="flex flex-col gap-4 mb-8">
-        <h1 class="text-2xl font-medium leading-normal my-0">
-          {{ isSignIn ? t('auth.login.title') : t('auth.signup.title') }}
-        </h1>
-        <p class="text-base my-0">
-          <span class="text-muted">{{
-            isSignIn
-              ? t('auth.login.newUser')
-              : t('auth.signup.alreadyHaveAccount')
-          }}</span>
-          <span
-            class="ml-1 cursor-pointer text-blue-500"
-            @click="toggleState"
-            >{{
-              isSignIn ? t('auth.login.signUp') : t('auth.signup.signIn')
-            }}</span
-          >
-        </p>
-      </div>
-
-      <Message v-if="!isSecureContext" severity="warn" class="mb-4">
-        {{ t('auth.login.insecureContextWarning') }}
-      </Message>
-
-      <!-- Form -->
-      <SignInForm v-if="isSignIn" @submit="signInWithEmail" />
-      <template v-else>
-        <Message v-if="userIsInChina" severity="warn" class="mb-4">
-          {{ t('auth.signup.regionRestrictionChina') }}
-        </Message>
-        <SignUpForm v-else @submit="signUpWithEmail" />
-      </template>
-
-      <!-- Divider -->
-      <Divider align="center" layout="horizontal" class="my-8">
-        <span class="text-muted">{{ t('auth.login.orContinueWith') }}</span>
-      </Divider>
-
-      <!-- Social Login Buttons -->
-      <div class="flex flex-col gap-6">
-        <Button
-          type="button"
-          class="h-10"
-          severity="secondary"
-          outlined
-          @click="signInWithGoogle"
-        >
-          <i class="pi pi-google mr-2"></i>
-          {{
-            isSignIn
-              ? t('auth.login.loginWithGoogle')
-              : t('auth.signup.signUpWithGoogle')
-          }}
-        </Button>
-
-        <Button
-          type="button"
-          class="h-10"
-          severity="secondary"
-          outlined
-          @click="signInWithGithub"
-        >
-          <i class="pi pi-github mr-2"></i>
-          {{
-            isSignIn
-              ? t('auth.login.loginWithGithub')
-              : t('auth.signup.signUpWithGithub')
-          }}
-        </Button>
-
-        <Button
-          type="button"
-          class="h-10"
-          severity="secondary"
-          outlined
-          @click="showApiKeyForm = true"
-        >
-          <img
-            src="/assets/images/comfy-logo-mono.svg"
-            class="w-5 h-5 mr-2"
-            alt="Comfy"
-          />
-          {{ t('auth.login.useApiKey') }}
-        </Button>
-        <small class="text-muted text-center">
-          {{ t('auth.apiKey.helpText') }}
-          <a
-            :href="`${COMFY_PLATFORM_BASE_URL}/login`"
-            target="_blank"
-            class="text-blue-500 cursor-pointer"
-          >
-            {{ t('auth.apiKey.generateKey') }}
-          </a>
-        </small>
-        <Message
-          v-if="authActions.accessError.value"
-          severity="info"
-          icon="pi pi-info-circle"
-          variant="outlined"
-          closable
-        >
-          {{ t('toastMessages.useApiKeyTip') }}
-        </Message>
-      </div>
-
-      <!-- Terms & Contact -->
-      <p class="text-xs text-muted mt-8">
-        {{ t('auth.login.termsText') }}
-        <a
-          href="https://www.comfy.org/terms-of-service"
-          target="_blank"
-          class="text-blue-500 cursor-pointer"
-        >
-          {{ t('auth.login.termsLink') }}
-        </a>
-        {{ t('auth.login.andText') }}
-        <a
-          href="https://www.comfy.org/privacy"
-          target="_blank"
-          class="text-blue-500 cursor-pointer"
-        >
-          {{ t('auth.login.privacyLink') }} </a
-        >.
-        {{ t('auth.login.questionsContactPrefix') }}
-        <a href="mailto:hello@comfy.org" class="text-blue-500 cursor-pointer">
-          hello@comfy.org</a
-        >.
+  <div class="w-96 p-2">
+    <!-- Header -->
+    <div class="flex flex-col gap-4 mb-8">
+      <h1 class="text-2xl font-medium leading-normal my-0">
+        {{ isSignIn ? t('auth.login.title') : t('auth.signup.title') }}
+      </h1>
+      <p class="text-base my-0">
+        <span class="text-muted">{{
+          isSignIn
+            ? t('auth.login.newUser')
+            : t('auth.signup.alreadyHaveAccount')
+        }}</span>
+        <span class="ml-1 cursor-pointer text-blue-500" @click="toggleState">{{
+          isSignIn ? t('auth.login.signUp') : t('auth.signup.signIn')
+        }}</span>
       </p>
+    </div>
+
+    <Message v-if="!isSecureContext" severity="warn" class="mb-4">
+      {{ t('auth.login.insecureContextWarning') }}
+    </Message>
+
+    <!-- Form -->
+    <SignInForm v-if="isSignIn" @submit="signInWithEmail" />
+    <template v-else>
+      <Message v-if="userIsInChina" severity="warn" class="mb-4">
+        {{ t('auth.signup.regionRestrictionChina') }}
+      </Message>
+      <SignUpForm v-else @submit="signUpWithEmail" />
     </template>
+
+    <!-- Divider -->
+    <Divider align="center" layout="horizontal" class="my-8">
+      <span class="text-muted">{{ t('auth.login.orContinueWith') }}</span>
+    </Divider>
+
+    <!-- Social Login Buttons -->
+    <div class="flex flex-col gap-6">
+      <Button
+        type="button"
+        class="h-10"
+        severity="secondary"
+        outlined
+        @click="signInWithGoogle"
+      >
+        <i class="pi pi-google mr-2"></i>
+        {{
+          isSignIn
+            ? t('auth.login.loginWithGoogle')
+            : t('auth.signup.signUpWithGoogle')
+        }}
+      </Button>
+
+      <Button
+        type="button"
+        class="h-10"
+        severity="secondary"
+        outlined
+        @click="signInWithGithub"
+      >
+        <i class="pi pi-github mr-2"></i>
+        {{
+          isSignIn
+            ? t('auth.login.loginWithGithub')
+            : t('auth.signup.signUpWithGithub')
+        }}
+      </Button>
+    </div>
+    <!-- Terms & Contact -->
+    <p class="text-xs text-muted mt-8">
+      {{ t('auth.login.termsText') }}
+      <a
+        href="https://www.comfy.org/terms-of-service"
+        target="_blank"
+        class="text-blue-500 cursor-pointer"
+      >
+        {{ t('auth.login.termsLink') }}
+      </a>
+      {{ t('auth.login.andText') }}
+      <a
+        href="https://www.comfy.org/privacy"
+        target="_blank"
+        class="text-blue-500 cursor-pointer"
+      >
+        {{ t('auth.login.privacyLink') }} </a
+      >.
+      {{ t('auth.login.questionsContactPrefix') }}
+      <a href="mailto:hello@comfy.org" class="text-blue-500 cursor-pointer">
+        hello@comfy.org</a
+      >.
+    </p>
   </div>
 </template>
 
@@ -143,15 +97,13 @@
 import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import Message from 'primevue/message'
-import { onMounted, onUnmounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
-import { COMFY_PLATFORM_BASE_URL } from '@/config/comfyApi'
 import { SignInData, SignUpData } from '@/schemas/signInSchema'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
 import { isInChina } from '@/utils/networkUtil'
 
-import ApiKeyForm from './signin/ApiKeyForm.vue'
 import SignInForm from './signin/SignInForm.vue'
 import SignUpForm from './signin/SignUpForm.vue'
 
@@ -160,36 +112,33 @@ const { onSuccess } = defineProps<{
 }>()
 
 const { t } = useI18n()
-const authActions = useFirebaseAuthActions()
+const authService = useFirebaseAuthService()
 const isSecureContext = window.isSecureContext
 const isSignIn = ref(true)
-const showApiKeyForm = ref(false)
-
 const toggleState = () => {
   isSignIn.value = !isSignIn.value
-  showApiKeyForm.value = false
 }
 
 const signInWithGoogle = async () => {
-  if (await authActions.signInWithGoogle()) {
+  if (await authService.signInWithGoogle()) {
     onSuccess()
   }
 }
 
 const signInWithGithub = async () => {
-  if (await authActions.signInWithGithub()) {
+  if (await authService.signInWithGithub()) {
     onSuccess()
   }
 }
 
 const signInWithEmail = async (values: SignInData) => {
-  if (await authActions.signInWithEmail(values.email, values.password)) {
+  if (await authService.signInWithEmail(values.email, values.password)) {
     onSuccess()
   }
 }
 
 const signUpWithEmail = async (values: SignUpData) => {
-  if (await authActions.signUpWithEmail(values.email, values.password)) {
+  if (await authService.signUpWithEmail(values.email, values.password)) {
     onSuccess()
   }
 }
@@ -198,8 +147,4 @@ const userIsInChina = ref(false)
 onMounted(async () => {
   userIsInChina.value = await isInChina()
 })
-
-onUnmounted(() => {
-  authActions.accessError.value = false
-})
 </script>

src/components/dialog/content/TopUpCreditsDialogContent.vue

@@ -51,7 +51,7 @@
 import Button from 'primevue/button'
 
 import UserCredit from '@/components/common/UserCredit.vue'
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
 
 import CreditTopUpOption from './credit/CreditTopUpOption.vue'
 
@@ -65,9 +65,9 @@ const {
   preselectedAmountOption?: number
 }>()
 
-const authActions = useFirebaseAuthActions()
+const authService = useFirebaseAuthService()
 
 const handleSeeDetails = async () => {
-  await authActions.accessBillingPortal()
+  await authService.accessBillingPortal()
 }
 </script>

src/components/dialog/content/UpdatePasswordContent.vue

@@ -23,10 +23,10 @@ import Button from 'primevue/button'
 import { ref } from 'vue'
 
 import PasswordFields from '@/components/dialog/content/signin/PasswordFields.vue'
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import { updatePasswordSchema } from '@/schemas/signInSchema'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
 
-const authActions = useFirebaseAuthActions()
+const authService = useFirebaseAuthService()
 const loading = ref(false)
 
 const { onSuccess } = defineProps<{
@@ -37,7 +37,7 @@ const onSubmit = async (event: FormSubmitEvent) => {
   if (event.valid) {
     loading.value = true
     try {
-      await authActions.updatePassword(event.values.password)
+      await authService.updatePassword(event.values.password)
       onSuccess()
     } finally {
       loading.value = false

src/components/dialog/content/credit/CreditTopUpOption.vue

@@ -41,9 +41,9 @@ import ProgressSpinner from 'primevue/progressspinner'
 import Tag from 'primevue/tag'
 import { onBeforeUnmount, ref } from 'vue'
 
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
 
-const authActions = useFirebaseAuthActions()
+const authService = useFirebaseAuthService()
 
 const {
   amount,
@@ -61,7 +61,7 @@ const loading = ref(false)
 
 const handleBuyNow = async () => {
   loading.value = true
-  await authActions.purchaseCredits(editable ? customAmount.value : amount)
+  await authService.purchaseCredits(editable ? customAmount.value : amount)
   loading.value = false
   didClickBuyNow.value = true
 }
@@ -69,7 +69,7 @@ const handleBuyNow = async () => {
 onBeforeUnmount(() => {
   if (didClickBuyNow.value) {
     // If clicked buy now, then returned back to the dialog and closed, fetch the balance
-    void authActions.fetchBalance()
+    void authService.fetchBalance()
   }
 })
 </script>

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

@@ -55,7 +55,6 @@
             />
             <div v-else class="h-full" @click="handleGridContainerClick">
               <VirtualGrid
-                id="results-grid"
                 :items="resultsWithKeys"
                 :buffer-rows="3"
                 :grid-style="GRID_STYLE"
@@ -93,7 +92,7 @@
 import { whenever } from '@vueuse/core'
 import { merge } from 'lodash'
 import Button from 'primevue/button'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { computed, onUnmounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import ContentDivider from '@/components/common/ContentDivider.vue'
@@ -200,10 +199,6 @@ const {
 const filterMissingPacks = (packs: components['schemas']['Node'][]) =>
   packs.filter((pack) => !comfyManagerStore.isPackInstalled(pack.id))
 
-whenever(selectedTab, () => {
-  pageNumber.value = 0
-})
-
 const isUpdateAvailableTab = computed(
   () => selectedTab.value?.id === ManagerTab.UpdateAvailable
 )
@@ -424,17 +419,6 @@ whenever(selectedNodePack, async () => {
   }
 })
 
-let gridContainer: HTMLElement | null = null
-onMounted(() => {
-  gridContainer = document.getElementById('results-grid')
-})
-watch(searchQuery, () => {
-  gridContainer ??= document.getElementById('results-grid')
-  if (gridContainer) {
-    gridContainer.scrollTop = 0
-  }
-})
-
 onUnmounted(() => {
   getPackById.cancel()
 })

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

@@ -20,7 +20,6 @@
             style: 'display: none'
           }
         }"
-        :show-empty-message="false"
         @complete="stubTrue"
         @option-select="onOptionSelect"
       />

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

@@ -36,7 +36,7 @@
             text
             size="small"
             severity="secondary"
-            @click="() => authActions.fetchBalance()"
+            @click="() => authService.fetchBalance()"
           />
         </div>
       </div>
@@ -112,8 +112,8 @@ import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import UserCredit from '@/components/common/UserCredit.vue'
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import { useDialogService } from '@/services/dialogService'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 import { formatMetronomeCurrency } from '@/utils/formatUtil'
 
@@ -127,7 +127,7 @@ interface CreditHistoryItemData {
 const { t } = useI18n()
 const dialogService = useDialogService()
 const authStore = useFirebaseAuthStore()
-const authActions = useFirebaseAuthActions()
+const authService = useFirebaseAuthService()
 const loading = computed(() => authStore.loading)
 const balanceLoading = computed(() => authStore.isFetchingBalance)
 
@@ -142,7 +142,7 @@ const handlePurchaseCreditsClick = () => {
 }
 
 const handleCreditsHistoryClick = async () => {
-  await authActions.accessBillingPortal()
+  await authService.accessBillingPortal()
 }
 
 const handleMessageSupport = () => {

src/components/dialog/content/setting/SettingItem.spec.ts

@@ -1,8 +1,6 @@
 import { mount } from '@vue/test-utils'
 import { createPinia } from 'pinia'
 import PrimeVue from 'primevue/config'
-import Tag from 'primevue/tag'
-import Tooltip from 'primevue/tooltip'
 import { describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 
@@ -21,16 +19,7 @@ describe('SettingItem', () => {
   const mountComponent = (props: any, options = {}): any => {
     return mount(SettingItem, {
       global: {
-        plugins: [PrimeVue, i18n, createPinia()],
-        components: {
-          Tag
-        },
-        directives: {
-          tooltip: Tooltip
-        },
-        stubs: {
-          'i-material-symbols:experiment-outline': true
-        }
+        plugins: [PrimeVue, i18n, createPinia()]
       },
       props,
       ...options

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

@@ -4,11 +4,10 @@
       <h2 class="text-2xl font-bold mb-2">{{ $t('userSettings.title') }}</h2>
       <Divider class="mb-3" />
 
-      <!-- Normal User Panel -->
-      <div v-if="isLoggedIn" class="flex flex-col gap-2">
+      <div v-if="user" class="flex flex-col gap-2">
         <UserAvatar
-          v-if="userPhotoUrl"
-          :photo-url="userPhotoUrl"
+          v-if="user.photoURL"
+          :photo-url="user.photoURL"
           shape="circle"
           size="large"
         />
@@ -18,7 +17,7 @@
             {{ $t('userSettings.name') }}
           </h3>
           <div class="text-muted">
-            {{ userDisplayName || $t('userSettings.notSet') }}
+            {{ user.displayName || $t('userSettings.notSet') }}
           </div>
         </div>
 
@@ -26,9 +25,9 @@
           <h3 class="font-medium">
             {{ $t('userSettings.email') }}
           </h3>
-          <span class="text-muted">
-            {{ userEmail }}
-          </span>
+          <a :href="'mailto:' + user.email" class="hover:underline">
+            {{ user.email }}
+          </a>
         </div>
 
         <div class="flex flex-col gap-0.5">
@@ -91,22 +90,51 @@ import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import ProgressSpinner from 'primevue/progressspinner'
 import TabPanel from 'primevue/tabpanel'
+import { computed } from 'vue'
 
 import UserAvatar from '@/components/common/UserAvatar.vue'
-import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useDialogService } from '@/services/dialogService'
+import { useCommandStore } from '@/stores/commandStore'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
 const dialogService = useDialogService()
-const {
-  loading,
-  isLoggedIn,
-  isEmailProvider,
-  userDisplayName,
-  userEmail,
-  userPhotoUrl,
-  providerName,
-  providerIcon,
-  handleSignOut,
-  handleSignIn
-} = useCurrentUser()
+const authStore = useFirebaseAuthStore()
+const commandStore = useCommandStore()
+const user = computed(() => authStore.currentUser)
+const loading = computed(() => authStore.loading)
+
+const providerName = computed(() => {
+  const providerId = user.value?.providerData[0]?.providerId
+  if (providerId?.includes('google')) {
+    return 'Google'
+  }
+  if (providerId?.includes('github')) {
+    return 'GitHub'
+  }
+  return providerId
+})
+
+const providerIcon = computed(() => {
+  const providerId = user.value?.providerData[0]?.providerId
+  if (providerId?.includes('google')) {
+    return 'pi pi-google'
+  }
+  if (providerId?.includes('github')) {
+    return 'pi pi-github'
+  }
+  return 'pi pi-user'
+})
+
+const isEmailProvider = computed(() => {
+  const providerId = user.value?.providerData[0]?.providerId
+  return providerId === 'password'
+})
+
+const handleSignOut = async () => {
+  await commandStore.execute('Comfy.User.SignOut')
+}
+
+const handleSignIn = async () => {
+  await commandStore.execute('Comfy.User.OpenSignInDialog')
+}
 </script>

src/components/dialog/content/signin/ApiKeyForm.test.ts

@@ -1,117 +0,0 @@
-import { Form } from '@primevue/forms'
-import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
-import Button from 'primevue/button'
-import PrimeVue from 'primevue/config'
-import InputText from 'primevue/inputtext'
-import Message from 'primevue/message'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { createApp } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import { COMFY_PLATFORM_BASE_URL } from '@/config/comfyApi'
-
-import ApiKeyForm from './ApiKeyForm.vue'
-
-const mockStoreApiKey = vi.fn()
-const mockLoading = vi.fn(() => false)
-
-vi.mock('@/stores/firebaseAuthStore', () => ({
-  useFirebaseAuthStore: vi.fn(() => ({
-    loading: mockLoading()
-  }))
-}))
-
-vi.mock('@/stores/apiKeyAuthStore', () => ({
-  useApiKeyAuthStore: vi.fn(() => ({
-    storeApiKey: mockStoreApiKey
-  }))
-}))
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      auth: {
-        apiKey: {
-          title: 'API Key',
-          label: 'API Key',
-          placeholder: 'Enter your API Key',
-          error: 'Invalid API Key',
-          helpText: 'Need an API key?',
-          generateKey: 'Get one here',
-          whitelistInfo: 'About non-whitelisted sites',
-          description: 'Use your Comfy API key to enable API Nodes'
-        }
-      },
-      g: {
-        back: 'Back',
-        save: 'Save',
-        learnMore: 'Learn more'
-      }
-    }
-  }
-})
-
-describe('ApiKeyForm', () => {
-  beforeEach(() => {
-    const app = createApp({})
-    app.use(PrimeVue)
-    vi.clearAllMocks()
-    mockStoreApiKey.mockReset()
-    mockLoading.mockReset()
-  })
-
-  const mountComponent = (props: any = {}) => {
-    return mount(ApiKeyForm, {
-      global: {
-        plugins: [PrimeVue, createPinia(), i18n],
-        components: { Button, Form, InputText, Message }
-      },
-      props
-    })
-  }
-
-  it('renders correctly with all required elements', () => {
-    const wrapper = mountComponent()
-
-    expect(wrapper.find('h1').text()).toBe('API Key')
-    expect(wrapper.find('label').text()).toBe('API Key')
-    expect(wrapper.findComponent(InputText).exists()).toBe(true)
-    expect(wrapper.findComponent(Button).exists()).toBe(true)
-  })
-
-  it('emits back event when back button is clicked', async () => {
-    const wrapper = mountComponent()
-
-    await wrapper.findComponent(Button).trigger('click')
-    expect(wrapper.emitted('back')).toBeTruthy()
-  })
-
-  it('shows loading state when submitting', async () => {
-    mockLoading.mockReturnValue(true)
-    const wrapper = mountComponent()
-    const input = wrapper.findComponent(InputText)
-
-    await input.setValue(
-      'comfyui-123456789012345678901234567890123456789012345678901234567890123456789012'
-    )
-    await wrapper.find('form').trigger('submit')
-
-    const submitButton = wrapper
-      .findAllComponents(Button)
-      .find((btn) => btn.text() === 'Save')
-    expect(submitButton?.props('loading')).toBe(true)
-  })
-
-  it('displays help text and links correctly', () => {
-    const wrapper = mountComponent()
-
-    const helpText = wrapper.find('small')
-    expect(helpText.text()).toContain('Need an API key?')
-    expect(helpText.find('a').attributes('href')).toBe(
-      `${COMFY_PLATFORM_BASE_URL}/login`
-    )
-  })
-})

src/components/dialog/content/signin/ApiKeyForm.vue

@@ -1,112 +0,0 @@
-<template>
-  <div class="flex flex-col gap-6">
-    <div class="flex flex-col gap-4 mb-8">
-      <h1 class="text-2xl font-medium leading-normal my-0">
-        {{ t('auth.apiKey.title') }}
-      </h1>
-      <div class="flex flex-col gap-2">
-        <p class="text-base my-0 text-muted">
-          {{ t('auth.apiKey.description') }}
-        </p>
-        <a
-          href="https://docs.comfy.org/interface/user#logging-in-with-an-api-key"
-          target="_blank"
-          class="text-blue-500 cursor-pointer"
-        >
-          {{ t('g.learnMore') }}
-        </a>
-      </div>
-    </div>
-
-    <Form
-      v-slot="$form"
-      class="flex flex-col gap-6"
-      :resolver="zodResolver(apiKeySchema)"
-      @submit="onSubmit"
-    >
-      <Message v-if="$form.apiKey?.invalid" severity="error" class="mb-4">
-        {{ $form.apiKey.error.message }}
-      </Message>
-
-      <div class="flex flex-col gap-2">
-        <label
-          class="opacity-80 text-base font-medium mb-2"
-          for="comfy-org-api-key"
-        >
-          {{ t('auth.apiKey.label') }}
-        </label>
-        <div class="flex flex-col gap-2">
-          <InputText
-            pt:root:id="comfy-org-api-key"
-            pt:root:autocomplete="off"
-            class="h-10"
-            name="apiKey"
-            type="password"
-            :placeholder="t('auth.apiKey.placeholder')"
-            :invalid="$form.apiKey?.invalid"
-          />
-          <small class="text-muted">
-            {{ t('auth.apiKey.helpText') }}
-            <a
-              :href="`${COMFY_PLATFORM_BASE_URL}/login`"
-              target="_blank"
-              class="text-blue-500 cursor-pointer"
-            >
-              {{ t('auth.apiKey.generateKey') }}
-            </a>
-            <span class="mx-1">•</span>
-            <a
-              href="https://docs.comfy.org/tutorials/api-nodes/overview#log-in-with-api-key-on-non-whitelisted-websites"
-              target="_blank"
-              class="text-blue-500 cursor-pointer"
-            >
-              {{ t('auth.apiKey.whitelistInfo') }}
-            </a>
-          </small>
-        </div>
-      </div>
-
-      <div class="flex justify-between items-center mt-4">
-        <Button type="button" link @click="$emit('back')">
-          {{ t('g.back') }}
-        </Button>
-        <Button type="submit" :loading="loading" :disabled="loading">
-          {{ t('g.save') }}
-        </Button>
-      </div>
-    </Form>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Form, FormSubmitEvent } from '@primevue/forms'
-import { zodResolver } from '@primevue/forms/resolvers/zod'
-import Button from 'primevue/button'
-import InputText from 'primevue/inputtext'
-import Message from 'primevue/message'
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { COMFY_PLATFORM_BASE_URL } from '@/config/comfyApi'
-import { apiKeySchema } from '@/schemas/signInSchema'
-import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore'
-import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
-
-const authStore = useFirebaseAuthStore()
-const apiKeyStore = useApiKeyAuthStore()
-const loading = computed(() => authStore.loading)
-
-const { t } = useI18n()
-
-const emit = defineEmits<{
-  (e: 'back'): void
-  (e: 'success'): void
-}>()
-
-const onSubmit = async (event: FormSubmitEvent) => {
-  if (event.valid) {
-    await apiKeyStore.storeApiKey(event.values.apiKey)
-    emit('success')
-  }
-}
-</script>

src/components/dialog/content/signin/SignInForm.vue

@@ -80,12 +80,12 @@ import ProgressSpinner from 'primevue/progressspinner'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import { type SignInData, signInSchema } from '@/schemas/signInSchema'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
 const authStore = useFirebaseAuthStore()
-const firebaseAuthActions = useFirebaseAuthActions()
+const firebaseAuthService = useFirebaseAuthService()
 const loading = computed(() => authStore.loading)
 
 const { t } = useI18n()
@@ -102,6 +102,6 @@ const onSubmit = (event: FormSubmitEvent) => {
 
 const handleForgotPassword = async (email: string) => {
   if (!email) return
-  await firebaseAuthActions.sendPasswordReset(email)
+  await firebaseAuthService.sendPasswordReset(email)
 }
 </script>

src/components/graph/DomWidgets.vue

@@ -16,12 +16,12 @@ import { computed, watch } from 'vue'
 
 import DomWidget from '@/components/graph/widgets/DomWidget.vue'
 import { useChainCallback } from '@/composables/functional/useChainCallback'
-import { useDomWidgetStore } from '@/stores/domWidgetStore'
+import { type DomWidgetState, useDomWidgetStore } from '@/stores/domWidgetStore'
 import { useCanvasStore } from '@/stores/graphStore'
 
 const domWidgetStore = useDomWidgetStore()
-const widgetStates = computed(() =>
-  Array.from(domWidgetStore.widgetStates.values())
+const widgetStates = computed(
+  () => Array.from(domWidgetStore.widgetStates.values()) as DomWidgetState[]
 )
 
 const updateWidgets = () => {

src/components/graph/GraphCanvas.vue

@@ -225,6 +225,32 @@ watch(
   }
 )
 
+// Save the drag & scale info in the serialized workflow if the setting is enabled
+watch(
+  [
+    () => canvasStore.canvas,
+    () => settingStore.get('Comfy.EnableWorkflowViewRestore')
+  ],
+  ([canvas, enableWorkflowViewRestore]) => {
+    const extra = canvas?.graph?.extra
+    if (!extra) return
+
+    if (enableWorkflowViewRestore) {
+      extra.ds = {
+        get scale() {
+          return canvas.ds.scale
+        },
+        get offset() {
+          const [x, y] = canvas.ds.offset
+          return [x, y]
+        }
+      }
+    } else {
+      delete extra.ds
+    }
+  }
+)
+
 useEventListener(
   canvasRef,
   'litegraph:no-items-selected',
@@ -267,7 +293,7 @@ onMounted(async () => {
   workspaceStore.spinner = true
   // ChangeTracker needs to be initialized before setup, as it will overwrite
   // some listeners of litegraph canvas.
-  ChangeTracker.init()
+  ChangeTracker.init(comfyApp)
   await loadCustomNodesI18n()
   try {
     await settingStore.loadSettingValues()
@@ -292,8 +318,10 @@ onMounted(async () => {
   canvasStore.canvas.render_canvas_border = false
   workspaceStore.spinner = false
 
-  window.app = comfyApp
-  window.graph = comfyApp.graph
+  // @ts-expect-error fixme ts strict error
+  window['app'] = comfyApp
+  // @ts-expect-error fixme ts strict error
+  window['graph'] = comfyApp.graph
 
   comfyAppReady.value = true
 

src/components/graph/SelectionOverlay.vue

@@ -79,7 +79,7 @@ watch(
     if (draggingItems === false) {
       setTimeout(() => {
         visible.value = true
-        positionSelectionOverlay(canvasStore.getCanvas())
+        positionSelectionOverlay(canvasStore.canvas as LGraphCanvas)
       }, 100)
     } else {
       // Selection change update to visible state is delayed by a frame. Here

src/components/graph/SelectionToolbox.vue

@@ -6,7 +6,6 @@
       content: 'p-0 flex flex-row'
     }"
   >
-    <ExecuteButton v-show="nodeSelected" />
     <ColorPickerButton v-show="nodeSelected || groupSelected" />
     <Button
       v-show="nodeSelected"
@@ -75,7 +74,6 @@ import Panel from 'primevue/panel'
 import { computed } from 'vue'
 
 import ColorPickerButton from '@/components/graph/selectionToolbox/ColorPickerButton.vue'
-import ExecuteButton from '@/components/graph/selectionToolbox/ExecuteButton.vue'
 import { useRefreshableSelection } from '@/composables/useRefreshableSelection'
 import { st, t } from '@/i18n'
 import { useExtensionService } from '@/services/extensionService'

src/components/graph/selectionToolbox/ExecuteButton.vue

@@ -1,71 +0,0 @@
-<template>
-  <Button
-    v-tooltip.top="{
-      value: isDisabled
-        ? t('selectionToolbox.executeButton.disabledTooltip')
-        : t('selectionToolbox.executeButton.tooltip'),
-      showDelay: 1000
-    }"
-    :severity="isDisabled ? 'secondary' : 'success'"
-    text
-    :disabled="isDisabled"
-    @mouseenter="() => handleMouseEnter()"
-    @mouseleave="() => handleMouseLeave()"
-    @click="handleClick"
-  >
-    <i-lucide:play />
-  </Button>
-</template>
-
-<script setup lang="ts">
-import type { LGraphNode } from '@comfyorg/litegraph'
-import Button from 'primevue/button'
-import { computed, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { useCommandStore } from '@/stores/commandStore'
-import { useCanvasStore } from '@/stores/graphStore'
-import { isLGraphNode } from '@/utils/litegraphUtil'
-
-const { t } = useI18n()
-const canvasStore = useCanvasStore()
-const commandStore = useCommandStore()
-
-const canvas = canvasStore.getCanvas()
-const buttonHovered = ref(false)
-const selectedOutputNodes = computed(
-  () =>
-    canvasStore.selectedItems.filter(
-      (item) => isLGraphNode(item) && item.constructor.nodeData?.output_node
-    ) as LGraphNode[]
-)
-
-const isDisabled = computed(() => selectedOutputNodes.value.length === 0)
-
-function outputNodeStokeStyle(this: LGraphNode) {
-  if (
-    this.selected &&
-    this.constructor.nodeData?.output_node &&
-    buttonHovered.value
-  ) {
-    return { color: 'orange', lineWidth: 2, padding: 10 }
-  }
-}
-
-const handleMouseEnter = () => {
-  buttonHovered.value = true
-  for (const node of selectedOutputNodes.value) {
-    node.strokeStyles['outputNode'] = outputNodeStokeStyle
-  }
-  canvas.setDirty(true)
-}
-
-const handleMouseLeave = () => {
-  buttonHovered.value = false
-  canvas.setDirty(true)
-}
-
-const handleClick = async () => {
-  await commandStore.execute('Comfy.QueueSelectedOutputNodes')
-}
-</script>

src/components/graph/widgets/TextPreviewWidget.vue

@@ -1,53 +0,0 @@
-<template>
-  <div
-    class="relative w-full text-xs min-h-[28px] max-h-[200px] rounded-lg px-4 py-2 overflow-y-auto"
-  >
-    <div class="flex items-center gap-2">
-      <div class="flex-1 break-all flex items-center gap-2">
-        <span v-html="formattedText"></span>
-        <Skeleton v-if="isParentNodeExecuting" class="!flex-1 !h-4" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { NodeId } from '@comfyorg/litegraph'
-import Skeleton from 'primevue/skeleton'
-import { computed, onMounted, ref, watch } from 'vue'
-
-import { useExecutionStore } from '@/stores/executionStore'
-import { linkifyHtml, nl2br } from '@/utils/formatUtil'
-
-const modelValue = defineModel<string>({ required: true })
-defineProps<{
-  widget?: object
-}>()
-
-const executionStore = useExecutionStore()
-const isParentNodeExecuting = ref(true)
-const formattedText = computed(() => nl2br(linkifyHtml(modelValue.value)))
-
-let executingNodeId: NodeId | null = null
-onMounted(() => {
-  executingNodeId = executionStore.executingNodeId
-})
-
-// Watch for either a new node has starting execution or overall execution ending
-const stopWatching = watch(
-  [() => executionStore.executingNode, () => executionStore.isIdle],
-  () => {
-    if (
-      executionStore.isIdle ||
-      (executionStore.executingNode &&
-        executionStore.executingNode.id !== executingNodeId)
-    ) {
-      isParentNodeExecuting.value = false
-      stopWatching()
-    }
-    if (!executingNodeId) {
-      executingNodeId = executionStore.executingNodeId
-    }
-  }
-)
-</script>

src/components/load3d/controls/RecordingControls.vue

@@ -75,7 +75,7 @@
 </template>
 
 <script setup lang="ts">
-import { LGraphNode } from '@comfyorg/litegraph'
+import { IWidget, LGraphNode } from '@comfyorg/litegraph'
 import { Tooltip } from 'primevue'
 import Button from 'primevue/button'
 
@@ -101,13 +101,13 @@ const emit = defineEmits<{
 const resizeNodeMatchOutput = () => {
   console.log('resizeNodeMatchOutput')
 
-  const outputWidth = node.widgets?.find((w) => w.name === 'width')
-  const outputHeight = node.widgets?.find((w) => w.name === 'height')
+  const outputWidth = node.widgets?.find((w: IWidget) => w.name === 'width')
+  const outputHeight = node.widgets?.find((w: IWidget) => w.name === 'height')
 
   if (outputWidth && outputHeight && outputHeight.value && outputWidth.value) {
     const [oldWidth, oldHeight] = node.size
 
-    const scene = node.widgets?.find((w) => w.name === 'image')
+    const scene = node.widgets?.find((w: IWidget) => w.name === 'image')
 
     const sceneHeight = scene?.computedHeight
 

src/components/sidebar/tabs/queue/ResultVideo.vue

@@ -8,7 +8,6 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
-import { useExtensionStore } from '@/stores/extensionStore'
 import { ResultItemImpl } from '@/stores/queueStore'
 import { useSettingStore } from '@/stores/settingStore'
 
@@ -17,16 +16,9 @@ const props = defineProps<{
 }>()
 
 const settingStore = useSettingStore()
-const { isExtensionInstalled, isExtensionEnabled } = useExtensionStore()
-
-const vhsAdvancedPreviews = computed(() => {
-  return (
-    isExtensionInstalled('VideoHelperSuite.Core') &&
-    isExtensionEnabled('VideoHelperSuite.Core') &&
-    settingStore.get('VHS.AdvancedPreviews') &&
-    settingStore.get('VHS.AdvancedPreviews') !== 'Never'
-  )
-})
+const vhsAdvancedPreviews = computed(() =>
+  settingStore.get('VHS.AdvancedPreviews')
+)
 
 const url = computed(() =>
   vhsAdvancedPreviews.value

src/components/topbar/CurrentUserButton.vue

@@ -2,7 +2,7 @@
 <template>
   <div>
     <Button
-      v-if="isLoggedIn"
+      v-if="isAuthenticated"
       class="user-profile-button p-1"
       severity="secondary"
       text
@@ -30,14 +30,15 @@ import Popover from 'primevue/popover'
 import { computed, ref } from 'vue'
 
 import UserAvatar from '@/components/common/UserAvatar.vue'
-import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
 import CurrentUserPopover from './CurrentUserPopover.vue'
 
-const { isLoggedIn, userPhotoUrl } = useCurrentUser()
+const authStore = useFirebaseAuthStore()
 
 const popover = ref<InstanceType<typeof Popover> | null>(null)
+const isAuthenticated = computed(() => authStore.isAuthenticated)
 const photoURL = computed<string | undefined>(
-  () => userPhotoUrl.value ?? undefined
+  () => authStore.currentUser?.photoURL ?? undefined
 )
 </script>

src/components/topbar/CurrentUserPopover.vue

@@ -6,19 +6,19 @@
       <div class="flex flex-col items-center">
         <UserAvatar
           class="mb-3"
-          :photo-url="userPhotoUrl"
+          :photo-url="user?.photoURL"
           :pt:icon:class="{
-            '!text-2xl': !userPhotoUrl
+            '!text-2xl': !user?.photoURL
           }"
           size="large"
         />
 
         <!-- User Details -->
         <h3 class="text-lg font-semibold truncate my-0 mb-1">
-          {{ userDisplayName || $t('g.user') }}
+          {{ user?.displayName || $t('g.user') }}
         </h3>
-        <p v-if="userEmail" class="text-sm text-muted truncate my-0">
-          {{ userEmail }}
+        <p v-if="user?.email" class="text-sm text-muted truncate my-0">
+          {{ user.email }}
         </p>
       </div>
     </div>
@@ -37,18 +37,6 @@
 
     <Divider class="my-2" />
 
-    <Button
-      class="justify-start"
-      :label="$t('credits.apiPricing')"
-      icon="pi pi-external-link"
-      text
-      fluid
-      severity="secondary"
-      @click="handleOpenApiPricing"
-    />
-
-    <Divider class="my-2" />
-
     <div class="w-full flex flex-col gap-2 p-2">
       <div class="text-muted text-sm">
         {{ $t('credits.yourCreditBalance') }}
@@ -64,18 +52,20 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import Divider from 'primevue/divider'
-import { onMounted } from 'vue'
+import { computed, onMounted } from 'vue'
 
 import UserAvatar from '@/components/common/UserAvatar.vue'
 import UserCredit from '@/components/common/UserCredit.vue'
-import { useCurrentUser } from '@/composables/auth/useCurrentUser'
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import { useDialogService } from '@/services/dialogService'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
-const { userDisplayName, userEmail, userPhotoUrl } = useCurrentUser()
-const authActions = useFirebaseAuthActions()
+const authStore = useFirebaseAuthStore()
+const authService = useFirebaseAuthService()
 const dialogService = useDialogService()
 
+const user = computed(() => authStore.currentUser)
+
 const handleOpenUserSettings = () => {
   dialogService.showSettingsDialog('user')
 }
@@ -84,11 +74,7 @@ const handleTopUp = () => {
   dialogService.showTopUpCreditsDialog()
 }
 
-const handleOpenApiPricing = () => {
-  window.open('https://docs.comfy.org/tutorials/api-nodes/pricing', '_blank')
-}
-
 onMounted(() => {
-  void authActions.fetchBalance()
+  void authService.fetchBalance()
 })
 </script>

src/composables/auth/useCurrentUser.ts

@@ -1,101 +0,0 @@
-import { computed } from 'vue'
-
-import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore'
-import { useCommandStore } from '@/stores/commandStore'
-import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
-
-export const useCurrentUser = () => {
-  const authStore = useFirebaseAuthStore()
-  const commandStore = useCommandStore()
-  const apiKeyStore = useApiKeyAuthStore()
-
-  const firebaseUser = computed(() => authStore.currentUser)
-  const isApiKeyLogin = computed(() => apiKeyStore.isAuthenticated)
-  const isLoggedIn = computed(
-    () => !!isApiKeyLogin.value || firebaseUser.value !== null
-  )
-
-  const userDisplayName = computed(() => {
-    if (isApiKeyLogin.value) {
-      return apiKeyStore.currentUser?.name
-    }
-    return firebaseUser.value?.displayName
-  })
-
-  const userEmail = computed(() => {
-    if (isApiKeyLogin.value) {
-      return apiKeyStore.currentUser?.email
-    }
-    return firebaseUser.value?.email
-  })
-
-  const providerName = computed(() => {
-    if (isApiKeyLogin.value) {
-      return 'Comfy API Key'
-    }
-
-    const providerId = firebaseUser.value?.providerData[0]?.providerId
-    if (providerId?.includes('google')) {
-      return 'Google'
-    }
-    if (providerId?.includes('github')) {
-      return 'GitHub'
-    }
-    return providerId
-  })
-
-  const providerIcon = computed(() => {
-    if (isApiKeyLogin.value) {
-      return 'pi pi-key'
-    }
-
-    const providerId = firebaseUser.value?.providerData[0]?.providerId
-    if (providerId?.includes('google')) {
-      return 'pi pi-google'
-    }
-    if (providerId?.includes('github')) {
-      return 'pi pi-github'
-    }
-    return 'pi pi-user'
-  })
-
-  const isEmailProvider = computed(() => {
-    if (isApiKeyLogin.value) {
-      return false
-    }
-
-    const providerId = firebaseUser.value?.providerData[0]?.providerId
-    return providerId === 'password'
-  })
-
-  const userPhotoUrl = computed(() => {
-    if (isApiKeyLogin.value) return null
-    return firebaseUser.value?.photoURL
-  })
-
-  const handleSignOut = async () => {
-    if (isApiKeyLogin.value) {
-      await apiKeyStore.clearStoredApiKey()
-    } else {
-      await commandStore.execute('Comfy.User.SignOut')
-    }
-  }
-
-  const handleSignIn = async () => {
-    await commandStore.execute('Comfy.User.OpenSignInDialog')
-  }
-
-  return {
-    loading: authStore.loading,
-    isLoggedIn,
-    isApiKeyLogin,
-    isEmailProvider,
-    userDisplayName,
-    userEmail,
-    userPhotoUrl,
-    providerName,
-    providerIcon,
-    handleSignOut,
-    handleSignIn
-  }
-}

src/composables/node/useNodeProgressText.ts

@@ -1,53 +0,0 @@
-import { LGraphNode } from '@comfyorg/litegraph'
-
-import { useTextPreviewWidget } from '@/composables/widgets/useProgressTextWidget'
-
-const TEXT_PREVIEW_WIDGET_NAME = '$$node-text-preview'
-
-/**
- * Composable for handling node text previews
- */
-export function useNodeProgressText() {
-  const textPreviewWidget = useTextPreviewWidget()
-
-  const findTextPreviewWidget = (node: LGraphNode) =>
-    node.widgets?.find((w) => w.name === TEXT_PREVIEW_WIDGET_NAME)
-
-  const addTextPreviewWidget = (node: LGraphNode) =>
-    textPreviewWidget(node, {
-      name: TEXT_PREVIEW_WIDGET_NAME,
-      type: 'progressText'
-    })
-
-  /**
-   * Shows text preview for a node
-   * @param node The graph node to show the preview for
-   */
-  function showTextPreview(node: LGraphNode, text: string) {
-    const widget = findTextPreviewWidget(node) ?? addTextPreviewWidget(node)
-    widget.value = text
-    node.setDirtyCanvas?.(true)
-  }
-
-  /**
-   * Removes text preview from a node
-   * @param node The graph node to remove the preview from
-   */
-  function removeTextPreview(node: LGraphNode) {
-    if (!node.widgets) return
-
-    const widgetIdx = node.widgets.findIndex(
-      (w) => w.name === TEXT_PREVIEW_WIDGET_NAME
-    )
-
-    if (widgetIdx > -1) {
-      node.widgets[widgetIdx].onRemove?.()
-      node.widgets.splice(widgetIdx, 1)
-    }
-  }
-
-  return {
-    showTextPreview,
-    removeTextPreview
-  }
-}

src/composables/setting/useSettingUI.ts

@@ -7,14 +7,13 @@ import {
 } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 import { SettingTreeNode, useSettingStore } from '@/stores/settingStore'
 import type { SettingParams } from '@/types/settingTypes'
 import { isElectron } from '@/utils/envUtil'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 import { buildTree } from '@/utils/treeUtil'
 
-import { useCurrentUser } from '../auth/useCurrentUser'
-
 interface SettingPanelItem {
   node: SettingTreeNode
   component: Component
@@ -30,7 +29,7 @@ export function useSettingUI(
     | 'credits'
 ) {
   const { t } = useI18n()
-  const { isLoggedIn } = useCurrentUser()
+  const firebaseAuthStore = useFirebaseAuthStore()
   const settingStore = useSettingStore()
   const activeCategory = ref<SettingTreeNode | null>(null)
 
@@ -166,7 +165,7 @@ export function useSettingUI(
       label: 'Account',
       children: [
         userPanel.node,
-        ...(isLoggedIn.value ? [creditsPanel.node] : [])
+        ...(firebaseAuthStore.isAuthenticated ? [creditsPanel.node] : [])
       ].map(translateCategory)
     },
     // Normal settings stored in the settingStore

src/composables/useBrowserTabTitle.ts

@@ -1,53 +0,0 @@
-import { useTitle } from '@vueuse/core'
-import { computed } from 'vue'
-
-import { useExecutionStore } from '@/stores/executionStore'
-import { useSettingStore } from '@/stores/settingStore'
-import { useWorkflowStore } from '@/stores/workflowStore'
-
-const DEFAULT_TITLE = 'ComfyUI'
-const TITLE_SUFFIX = ' - ComfyUI'
-
-export const useBrowserTabTitle = () => {
-  const executionStore = useExecutionStore()
-  const settingStore = useSettingStore()
-  const workflowStore = useWorkflowStore()
-
-  const executionText = computed(() =>
-    executionStore.isIdle
-      ? ''
-      : `[${Math.round(executionStore.executionProgress * 100)}%]`
-  )
-
-  const newMenuEnabled = computed(
-    () => settingStore.get('Comfy.UseNewMenu') !== 'Disabled'
-  )
-
-  const isUnsavedText = computed(() =>
-    workflowStore.activeWorkflow?.isModified ||
-    !workflowStore.activeWorkflow?.isPersisted
-      ? ' *'
-      : ''
-  )
-  const workflowNameText = computed(() => {
-    const workflowName = workflowStore.activeWorkflow?.filename
-    return workflowName
-      ? isUnsavedText.value + workflowName + TITLE_SUFFIX
-      : DEFAULT_TITLE
-  })
-
-  const nodeExecutionTitle = computed(() =>
-    executionStore.executingNode && executionStore.executingNodeProgress
-      ? `${executionText.value}[${Math.round(executionStore.executingNodeProgress * 100)}%] ${executionStore.executingNode.type}`
-      : ''
-  )
-
-  const workflowTitle = computed(
-    () =>
-      executionText.value +
-      (newMenuEnabled.value ? workflowNameText.value : DEFAULT_TITLE)
-  )
-
-  const title = computed(() => nodeExecutionTitle.value || workflowTitle.value)
-  useTitle(title)
-}

src/composables/useCoreCommands.ts

@@ -5,7 +5,6 @@ import {
   LiteGraph
 } from '@comfyorg/litegraph'
 
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import {
   DEFAULT_DARK_COLOR_PALETTE,
   DEFAULT_LIGHT_COLOR_PALETTE
@@ -14,6 +13,7 @@ import { t } from '@/i18n'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { useDialogService } from '@/services/dialogService'
+import { useFirebaseAuthService } from '@/services/firebaseAuthService'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useWorkflowService } from '@/services/workflowService'
 import type { ComfyCommand } from '@/stores/commandStore'
@@ -32,7 +32,7 @@ export function useCoreCommands(): ComfyCommand[] {
   const workflowStore = useWorkflowStore()
   const dialogService = useDialogService()
   const colorPaletteStore = useColorPaletteStore()
-  const firebaseAuthActions = useFirebaseAuthActions()
+  const firebaseAuthService = useFirebaseAuthService()
   const toastStore = useToastStore()
   const getTracker = () => workflowStore.activeWorkflow?.changeTracker
 
@@ -312,28 +312,6 @@ export function useCoreCommands(): ComfyCommand[] {
         await app.queuePrompt(-1, batchCount)
       }
     },
-    {
-      id: 'Comfy.QueueSelectedOutputNodes',
-      icon: 'pi pi-play',
-      label: 'Queue Selected Output Nodes',
-      versionAdded: '1.19.6',
-      function: async () => {
-        const batchCount = useQueueSettingsStore().batchCount
-        const queueNodeIds = getSelectedNodes()
-          .filter((node) => node.constructor.nodeData?.output_node)
-          .map((node) => node.id)
-        if (queueNodeIds.length === 0) {
-          toastStore.add({
-            severity: 'error',
-            summary: t('toastMessages.nothingToQueue'),
-            detail: t('toastMessages.pleaseSelectOutputNodes'),
-            life: 3000
-          })
-          return
-        }
-        await app.queuePrompt(0, batchCount, queueNodeIds)
-      }
-    },
     {
       id: 'Comfy.ShowSettingsDialog',
       icon: 'pi pi-cog',
@@ -671,7 +649,7 @@ export function useCoreCommands(): ComfyCommand[] {
       label: 'Sign Out',
       versionAdded: '1.18.1',
       function: async () => {
-        await firebaseAuthActions.logout()
+        await firebaseAuthService.logout()
       }
     }
   ]

src/composables/useLitegraphSettings.ts

@@ -128,10 +128,4 @@ export const useLitegraphSettings = () => {
       'LiteGraph.Pointer.TrackpadGestures'
     )
   })
-
-  watchEffect(() => {
-    LiteGraph.saveViewportWithGraph = settingStore.get(
-      'Comfy.EnableWorkflowViewRestore'
-    )
-  })
 }

src/composables/useProgressFavicon.ts

@@ -1,23 +0,0 @@
-import { useFavicon } from '@vueuse/core'
-import { watch } from 'vue'
-
-import { useExecutionStore } from '@/stores/executionStore'
-
-export const useProgressFavicon = () => {
-  const defaultFavicon = '/assets/images/favicon_progress_16x16/frame_9.png'
-  const favicon = useFavicon(defaultFavicon)
-  const executionStore = useExecutionStore()
-  const totalFrames = 10
-
-  watch(
-    [() => executionStore.executionProgress, () => executionStore.isIdle],
-    ([progress, isIdle]) => {
-      if (isIdle) {
-        favicon.value = defaultFavicon
-      } else {
-        const frame = Math.floor(progress * totalFrames)
-        favicon.value = `/assets/images/favicon_progress_16x16/frame_${frame}.png`
-      }
-    }
-  )
-}

src/composables/useRefreshableSelection.ts

@@ -1,5 +1,4 @@
-import type { LGraphNode } from '@comfyorg/litegraph'
-import type { IBaseWidget } from '@comfyorg/litegraph/dist/types/widgets'
+import type { IWidget, LGraphNode } from '@comfyorg/litegraph'
 import { computed, ref, watchEffect } from 'vue'
 
 import { useCanvasStore } from '@/stores/graphStore'
@@ -9,11 +8,9 @@ interface RefreshableItem {
   refresh: () => Promise<void> | void
 }
 
-type RefreshableWidget = IBaseWidget & RefreshableItem
+type RefreshableWidget = IWidget & RefreshableItem
 
-const isRefreshableWidget = (
-  widget: IBaseWidget
-): widget is RefreshableWidget =>
+const isRefreshableWidget = (widget: IWidget): widget is RefreshableWidget =>
   'refresh' in widget && typeof widget.refresh === 'function'
 
 /**

src/composables/useRegistrySearch.ts

@@ -1,7 +1,7 @@
 import { watchDebounced } from '@vueuse/core'
 import type { Hit } from 'algoliasearch/dist/lite/browser'
 import { memoize, orderBy } from 'lodash'
-import { computed, onUnmounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 import {
   AlgoliaNodePack,
@@ -11,10 +11,10 @@ import {
 import type { NodesIndexSuggestion } from '@/services/algoliaSearchService'
 import { SortableAlgoliaField } from '@/types/comfyManagerTypes'
 
-const SEARCH_DEBOUNCE_TIME = 320
+const SEARCH_DEBOUNCE_TIME = 256
 const DEFAULT_PAGE_SIZE = 64
 const DEFAULT_SORT_FIELD = SortableAlgoliaField.Downloads // Set in the index configuration
-const DEFAULT_MAX_CACHE_SIZE = 64
+
 const SORT_DIRECTIONS: Record<SortableAlgoliaField, 'asc' | 'desc'> = {
   [SortableAlgoliaField.Downloads]: 'desc',
   [SortableAlgoliaField.Created]: 'desc',
@@ -30,12 +30,7 @@ const isDateField = (field: SortableAlgoliaField): boolean =>
 /**
  * Composable for managing UI state of Comfy Node Registry search.
  */
-export function useRegistrySearch(
-  options: {
-    maxCacheSize?: number
-  } = {}
-) {
-  const { maxCacheSize = DEFAULT_MAX_CACHE_SIZE } = options
+export function useRegistrySearch() {
   const isLoading = ref(false)
   const sortField = ref<SortableAlgoliaField>(SortableAlgoliaField.Downloads)
   const searchMode = ref<'nodes' | 'packs'>('packs')
@@ -61,10 +56,7 @@ export function useRegistrySearch(
       : []
   )
 
-  const { searchPacksCached, toRegistryPack, clearSearchPacksCache } =
-    useAlgoliaSearchService({
-      maxCacheSize
-    })
+  const { searchPacks, toRegistryPack } = useAlgoliaSearchService()
 
   const algoliaToRegistry = memoize(
     toRegistryPack,
@@ -85,7 +77,7 @@ export function useRegistrySearch(
     if (!options.append) {
       pageNumber.value = 0
     }
-    const { nodePacks, querySuggestions } = await searchPacksCached(
+    const { nodePacks, querySuggestions } = await searchPacks(
       searchQuery.value,
       {
         pageSize: pageSize.value,
@@ -124,8 +116,6 @@ export function useRegistrySearch(
     immediate: true
   })
 
-  onUnmounted(clearSearchPacksCache)
-
   return {
     isLoading,
     pageNumber,

src/composables/useWorkflowValidation.ts

@@ -3,10 +3,14 @@ import type { ISerialisedGraph } from '@comfyorg/litegraph/dist/types/serialisat
 import type { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
 import { validateComfyWorkflow } from '@/schemas/comfyWorkflowSchema'
 import { useToastStore } from '@/stores/toastStore'
-import { fixBadLinks } from '@/utils/linkFixer'
+import { WorkflowLinkFixer } from '@/utils/linkFixer'
 
 export interface ValidationResult {
   graphData: ComfyWorkflowJSON | null
+  linksFixes?: {
+    patched: number
+    deleted: number
+  }
 }
 
 export function useWorkflowValidation() {
@@ -15,26 +19,26 @@ export function useWorkflowValidation() {
   function tryFixLinks(
     graphData: ComfyWorkflowJSON,
     options: { silent?: boolean } = {}
-  ) {
+  ): ComfyWorkflowJSON | null {
     const { silent = false } = options
-
     // Collect all logs in an array
     const logs: string[] = []
     // Then validate and fix links if schema validation passed
-    const linkValidation = fixBadLinks(
-      graphData as unknown as ISerialisedGraph,
-      {
-        fix: true,
-        silent,
-        logger: {
-          log: (message: string) => {
-            logs.push(message)
-          }
-        }
-      }
+    const fixer = WorkflowLinkFixer.create(
+      graphData as unknown as ISerialisedGraph
     )
+    fixer.logger = {
+      log: (...args: any[]) => {
+        logs.push(...args)
+      }
+    }
+    const checkBadLinksResult = fixer.check()
+    // Graph has no bad links, so we can return it as is
+    if (!checkBadLinksResult.hasBadLinks) {
+      return graphData
+    }
 
-    if (!silent && logs.length > 0) {
+    if (!silent) {
       toastStore.add({
         severity: 'warn',
         summary: 'Workflow Validation',
@@ -42,18 +46,17 @@ export function useWorkflowValidation() {
       })
     }
 
-    // If links were fixed, notify the user
-    if (linkValidation.fixed) {
+    const fixBadLinksResult = fixer.fix()
+    if (!fixBadLinksResult.hasBadLinks) {
       if (!silent) {
         toastStore.add({
           severity: 'success',
-          summary: 'Workflow Links Fixed',
-          detail: `Fixed ${linkValidation.patched} node connections and removed ${linkValidation.deleted} invalid links.`
+          summary: 'Workflow Links Fixed'
         })
       }
+      return fixBadLinksResult.graph as unknown as ComfyWorkflowJSON
     }
-
-    return linkValidation.graph as unknown as ComfyWorkflowJSON
+    return null
   }
 
   /**
@@ -83,7 +86,7 @@ export function useWorkflowValidation() {
       try {
         validatedData = tryFixLinks(validatedGraphData, { silent })
       } catch (err) {
-        // Link fixer itself is throwing an error
+        // Link fixer itself is throwing an error. Log it and return the original graph
         console.error(err)
       }
     }

src/composables/widgets/useFloatWidget.ts

@@ -50,8 +50,7 @@ export const useFloatWidget = () => {
       Math.max(0, -Math.floor(Math.log10(step)))
     const enableRounding = !settingStore.get('Comfy.DisableFloatRounding')
 
-    /** Assertion {@link inputSpec.default} */
-    const defaultValue = (inputSpec.default as number | undefined) ?? 0
+    const defaultValue = inputSpec.default ?? 0
     return node.addWidget(
       widgetType,
       inputSpec.name,

src/composables/widgets/useImagePreviewWidget.ts

@@ -8,7 +8,6 @@ import type {
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { calculateImageGrid } from '@/scripts/ui/imagePreview'
 import { ComfyWidgetConstructorV2 } from '@/scripts/widgets'
-import { useCanvasStore } from '@/stores/graphStore'
 import { useSettingStore } from '@/stores/settingStore'
 import { is_all_same_aspect_ratio } from '@/utils/imageUtil'
 
@@ -17,7 +16,7 @@ const renderPreview = (
   node: LGraphNode,
   shiftY: number
 ) => {
-  const canvas = useCanvasStore().getCanvas()
+  const canvas = app.canvas
   const mouse = canvas.graph_mouse
 
   if (!canvas.pointer_is_down && node.pointerDown) {

src/composables/widgets/useIntWidget.ts

@@ -55,8 +55,7 @@ export const useIntWidget = () => {
           : 'number'
 
     const step = inputSpec.step ?? 1
-    /** Assertion {@link inputSpec.default} */
-    const defaultValue = (inputSpec.default as number | undefined) ?? 0
+    const defaultValue = inputSpec.default ?? 0
     const widget = node.addWidget(
       widgetType,
       inputSpec.name,

src/composables/widgets/useProgressTextWidget.ts

@@ -1,35 +0,0 @@
-import type { LGraphNode } from '@comfyorg/litegraph'
-import { ref } from 'vue'
-
-import TextPreviewWidget from '@/components/graph/widgets/TextPreviewWidget.vue'
-import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
-import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget'
-import type { ComfyWidgetConstructorV2 } from '@/scripts/widgets'
-
-const PADDING = 16
-
-export const useTextPreviewWidget = () => {
-  const widgetConstructor: ComfyWidgetConstructorV2 = (
-    node: LGraphNode,
-    inputSpec: InputSpec
-  ) => {
-    const widgetValue = ref<string>('')
-    const widget = new ComponentWidgetImpl<string | object>({
-      node,
-      name: inputSpec.name,
-      component: TextPreviewWidget,
-      inputSpec,
-      options: {
-        getValue: () => widgetValue.value,
-        setValue: (value: string | object) => {
-          widgetValue.value = typeof value === 'string' ? value : String(value)
-        },
-        getMinHeight: () => 42 + PADDING
-      }
-    })
-    addWidget(node, widget)
-    return widget
-  }
-
-  return widgetConstructor
-}

src/config/comfyApi.ts

@@ -1,7 +1,3 @@
 export const COMFY_API_BASE_URL = __USE_PROD_CONFIG__
   ? 'https://api.comfy.org'
   : 'https://stagingapi.comfy.org'
-
-export const COMFY_PLATFORM_BASE_URL = __USE_PROD_CONFIG__
-  ? 'https://platform.comfy.org'
-  : 'https://stagingplatform.comfy.org'

src/extensions/core/contextMenuFilter.ts

@@ -1,4 +1,4 @@
-import { LGraphCanvas, LiteGraph, isComboWidget } from '@comfyorg/litegraph'
+import { LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
 
 import { app } from '../../scripts/app'
 
@@ -33,10 +33,10 @@ const ext = {
           const clickedComboValue = currentNode?.widgets
             ?.filter(
               (w) =>
-                isComboWidget(w) && w.options.values?.length === values.length
+                w.type === 'combo' && w.options.values?.length === values.length
             )
             .find((w) =>
-              // @ts-expect-error Poorly typed; filter above "should" mitigate exceptions
+              // @ts-ignore Poorly typed; filter above "should" mitigate exceptions
               w.options.values?.every((v, i) => v === values[i])
             )?.value
 

src/extensions/core/groupNode.ts

@@ -797,7 +797,7 @@ export class GroupNodeConfig {
 
 export class GroupNodeHandler {
   node: LGraphNode
-  groupData: any
+  groupData
   innerNodes: any
 
   constructor(node: LGraphNode) {
@@ -1231,6 +1231,7 @@ export class GroupNodeHandler {
             const widgetName = self.groupData.oldToNewWidgetMap[n][w]
             const widget = this.widgets.find((w) => w.name === widgetName)
             if (widget) {
+              // @ts-expect-error fixme ts strict error
               widget.type = 'hidden'
               widget.computeSize = () => [0, -4]
             }

src/extensions/core/load3d.ts

@@ -1,7 +1,5 @@
-import type {
-  IComboWidget,
-  IStringWidget
-} from '@comfyorg/litegraph/dist/types/widgets'
+import { IWidget } from '@comfyorg/litegraph'
+import { IStringWidget } from '@comfyorg/litegraph/dist/types/widgets'
 import { nextTick } from 'vue'
 
 import Load3D from '@/components/load3d/Load3D.vue'
@@ -118,8 +116,8 @@ useExtensionService().registerExtension({
         fileInput.onchange = async () => {
           if (fileInput.files?.length) {
             const modelWidget = node.widgets?.find(
-              (w) => w.name === 'model_file'
-            ) as IComboWidget & { options: { values: string[] } }
+              (w: IWidget) => w.name === 'model_file'
+            ) as IStringWidget
 
             node.properties['Texture'] = undefined
 
@@ -141,6 +139,7 @@ useExtensionService().registerExtension({
 
             if (uploadPath && modelWidget) {
               if (!modelWidget.options?.values?.includes(uploadPath)) {
+                // @ts-ignore Fails due to earlier type-assertion of IStringWidget
                 modelWidget.options?.values?.push(uploadPath)
               }
 
@@ -156,7 +155,9 @@ useExtensionService().registerExtension({
         node.addWidget('button', 'clear', 'clear', () => {
           useLoad3dService().getLoad3d(node)?.clearModel()
 
-          const modelWidget = node.widgets?.find((w) => w.name === 'model_file')
+          const modelWidget = node.widgets?.find(
+            (w: IWidget) => w.name === 'model_file'
+          )
           if (modelWidget) {
             modelWidget.value = ''
 
@@ -202,10 +203,12 @@ useExtensionService().registerExtension({
 
       const config = new Load3DConfiguration(load3d)
 
-      const modelWidget = node.widgets?.find((w) => w.name === 'model_file')
-      const width = node.widgets?.find((w) => w.name === 'width')
-      const height = node.widgets?.find((w) => w.name === 'height')
-      const sceneWidget = node.widgets?.find((w) => w.name === 'image')
+      const modelWidget = node.widgets?.find(
+        (w: IWidget) => w.name === 'model_file'
+      )
+      const width = node.widgets?.find((w: IWidget) => w.name === 'width')
+      const height = node.widgets?.find((w: IWidget) => w.name === 'height')
+      const sceneWidget = node.widgets?.find((w: IWidget) => w.name === 'image')
 
       if (modelWidget && width && height && sceneWidget) {
         config.configure('input', modelWidget, cameraState, width, height)
@@ -273,7 +276,7 @@ useExtensionService().registerExtension({
         fileInput.onchange = async () => {
           if (fileInput.files?.length) {
             const modelWidget = node.widgets?.find(
-              (w) => w.name === 'model_file'
+              (w: IWidget) => w.name === 'model_file'
             ) as IStringWidget
 
             const uploadPath = await Load3dUtils.uploadFile(
@@ -294,6 +297,7 @@ useExtensionService().registerExtension({
 
             if (uploadPath && modelWidget) {
               if (!modelWidget.options?.values?.includes(uploadPath)) {
+                // @ts-ignore Fails due to earlier type-assertion of IStringWidget
                 modelWidget.options?.values?.push(uploadPath)
               }
 
@@ -309,7 +313,9 @@ useExtensionService().registerExtension({
         node.addWidget('button', 'clear', 'clear', () => {
           useLoad3dService().getLoad3d(node)?.clearModel()
 
-          const modelWidget = node.widgets?.find((w) => w.name === 'model_file')
+          const modelWidget = node.widgets?.find(
+            (w: IWidget) => w.name === 'model_file'
+          )
           if (modelWidget) {
             modelWidget.value = ''
           }
@@ -346,16 +352,18 @@ useExtensionService().registerExtension({
 
     await nextTick()
 
-    const sceneWidget = node.widgets?.find((w) => w.name === 'image')
+    const sceneWidget = node.widgets?.find((w: IWidget) => w.name === 'image')
 
     const load3d = useLoad3dService().getLoad3d(node) as Load3dAnimation
 
-    const modelWidget = node.widgets?.find((w) => w.name === 'model_file')
+    const modelWidget = node.widgets?.find(
+      (w: IWidget) => w.name === 'model_file'
+    )
 
     let cameraState = node.properties['Camera Info']
 
-    const width = node.widgets?.find((w) => w.name === 'width')
-    const height = node.widgets?.find((w) => w.name === 'height')
+    const width = node.widgets?.find((w: IWidget) => w.name === 'width')
+    const height = node.widgets?.find((w: IWidget) => w.name === 'height')
 
     if (modelWidget && width && height && sceneWidget && load3d) {
       const config = new Load3DConfiguration(load3d)
@@ -471,7 +479,9 @@ useExtensionService().registerExtension({
 
       let cameraState = message.result[1]
 
-      const modelWidget = node.widgets?.find((w) => w.name === 'model_file')
+      const modelWidget = node.widgets?.find(
+        (w: IWidget) => w.name === 'model_file'
+      )
 
       if (load3d && modelWidget) {
         modelWidget.value = filePath.replaceAll('\\', '/')
@@ -545,7 +555,9 @@ useExtensionService().registerExtension({
 
       const load3d = useLoad3dService().getLoad3d(node)
 
-      const modelWidget = node.widgets?.find((w) => w.name === 'model_file')
+      const modelWidget = node.widgets?.find(
+        (w: IWidget) => w.name === 'model_file'
+      )
       if (load3d && modelWidget) {
         modelWidget.value = filePath.replaceAll('\\', '/')
 

src/extensions/core/load3d/Load3DConfiguration.ts

@@ -1,4 +1,4 @@
-import type { IBaseWidget } from '@comfyorg/litegraph/dist/types/widgets'
+import type { IWidget } from '@comfyorg/litegraph'
 
 import Load3d from '@/extensions/core/load3d/Load3d'
 import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
@@ -15,20 +15,17 @@ class Load3DConfiguration {
 
   configure(
     loadFolder: 'input' | 'output',
-    modelWidget: IBaseWidget,
+    modelWidget: IWidget,
     cameraState?: any,
-    width: IBaseWidget | null = null,
-    height: IBaseWidget | null = null
+    width: IWidget | null = null,
+    height: IWidget | null = null
   ) {
     this.setupModelHandling(modelWidget, loadFolder, cameraState)
     this.setupTargetSize(width, height)
     this.setupDefaultProperties()
   }
 
-  private setupTargetSize(
-    width: IBaseWidget | null,
-    height: IBaseWidget | null
-  ) {
+  private setupTargetSize(width: IWidget | null, height: IWidget | null) {
     if (width && height) {
       this.load3d.setTargetSize(width.value as number, height.value as number)
 
@@ -54,7 +51,7 @@ class Load3DConfiguration {
   }
 
   private setupModelHandling(
-    modelWidget: IBaseWidget,
+    modelWidget: IWidget,
     loadFolder: 'input' | 'output',
     cameraState?: any
   ) {

src/extensions/core/nodeTemplates.ts

@@ -401,7 +401,6 @@ app.registerExtension({
                   // @ts-expect-error
                   data.groupNodes = {}
                 }
-                if (nodeData == null) throw new TypeError('nodeData is not set')
                 // @ts-expect-error
                 data.groupNodes[nodeData.name] = groupData
                 // @ts-expect-error

src/extensions/core/previewAny.ts

@@ -3,7 +3,8 @@ Preview Any - original implement from
 https://github.com/rgthree/rgthree-comfy/blob/main/py/display_any.py
 upstream requested in https://github.com/Kosinkadink/rfcs/blob/main/rfcs/0000-corenodes.md#preview-nodes
  */
-import { app } from '@/scripts/app'
+import { IWidget } from '@comfyorg/litegraph'
+
 import { DOMWidget } from '@/scripts/domWidget'
 import { ComfyWidgets } from '@/scripts/widgets'
 import { useExtensionService } from '@/services/extensionService'
@@ -36,7 +37,9 @@ useExtensionService().registerExtension({
           ? void 0
           : onExecuted.apply(this, [message])
 
-        const previewWidget = this.widgets?.find((w) => w.name === 'preview')
+        const previewWidget = this.widgets?.find(
+          (w: IWidget) => w.name === 'preview'
+        )
 
         if (previewWidget) {
           previewWidget.value = message.text[0]

src/extensions/core/saveMesh.ts

@@ -1,3 +1,4 @@
+import { IWidget } from '@comfyorg/litegraph'
 import { nextTick } from 'vue'
 
 import Load3D from '@/components/load3d/Load3D.vue'
@@ -60,7 +61,7 @@ useExtensionService().registerExtension({
 
       const load3d = useLoad3dService().getLoad3d(node)
 
-      const modelWidget = node.widgets?.find((w) => w.name === 'image')
+      const modelWidget = node.widgets?.find((w: IWidget) => w.name === 'image')
 
       if (load3d && modelWidget) {
         const filePath = fileInfo['subfolder'] + '/' + fileInfo['filename']

src/extensions/core/uploadAudio.ts

@@ -1,4 +1,4 @@
-import type { LGraphNode } from '@comfyorg/litegraph'
+import type { IWidget, LGraphNode } from '@comfyorg/litegraph'
 import type { IStringWidget } from '@comfyorg/litegraph/dist/types/widgets'
 
 import { useNodeDragAndDrop } from '@/composables/node/useNodeDragAndDrop'
@@ -90,13 +90,7 @@ app.registerExtension({
   name: 'Comfy.AudioWidget',
   async beforeRegisterNodeDef(nodeType, nodeData) {
     if (
-      [
-        'LoadAudio',
-        'SaveAudio',
-        'PreviewAudio',
-        'SaveAudioMP3',
-        'SaveAudioOpus'
-      ].includes(
+      ['LoadAudio', 'SaveAudio', 'PreviewAudio'].includes(
         // @ts-expect-error fixme ts strict error
         nodeType.prototype.comfyClass
       )
@@ -117,10 +111,7 @@ app.registerExtension({
           node.addDOMWidget(inputName, /* name=*/ 'audioUI', audio)
         audioUIWidget.serialize = false
 
-        const { nodeData } = node.constructor
-        if (nodeData == null) throw new TypeError('nodeData is null')
-
-        const isOutputNode = nodeData.output_node
+        const isOutputNode = node.constructor.nodeData.output_node
         if (isOutputNode) {
           // Hide the audio widget when there is no audio initially.
           audioUIWidget.element.classList.add('empty-audio-widget')
@@ -173,11 +164,11 @@ app.registerExtension({
         // The widget that allows user to select file.
         // @ts-expect-error fixme ts strict error
         const audioWidget = node.widgets.find(
-          (w) => w.name === 'audio'
+          (w: IWidget) => w.name === 'audio'
         ) as IStringWidget
         // @ts-expect-error fixme ts strict error
         const audioUIWidget = node.widgets.find(
-          (w) => w.name === 'audioUI'
+          (w: IWidget) => w.name === 'audioUI'
         ) as unknown as DOMWidget<HTMLAudioElement, string>
 
         const onAudioWidgetUpdate = () => {

src/extensions/core/widgetInputs.ts

@@ -3,11 +3,11 @@ import type {
   INodeInputSlot,
   INodeOutputSlot,
   ISlotType,
+  IWidget,
   LLink,
   Vector2
 } from '@comfyorg/litegraph'
 import type { CanvasMouseEvent } from '@comfyorg/litegraph/dist/types/events'
-import type { IBaseWidget } from '@comfyorg/litegraph/dist/types/widgets'
 
 import {
   type CallbackParams,
@@ -226,7 +226,7 @@ export class PrimitiveNode extends LGraphNode {
 
     // Store current size as addWidget resizes the node
     const [oldWidth, oldHeight] = this.size
-    let widget: IBaseWidget | undefined
+    let widget: IWidget | undefined
     if (type in ComfyWidgets) {
       widget = (ComfyWidgets[type](this, 'value', inputData, app) || {}).widget
     } else {
@@ -426,7 +426,7 @@ function getConfig(this: LGraphNode, widgetName: string) {
  */
 export function convertToInput(
   node: LGraphNode,
-  widget: IBaseWidget
+  widget: IWidget
 ): INodeInputSlot | undefined {
   console.warn(
     'Please remove call to convertToInput. Widget to socket conversion is no longer necessary, as they co-exist now.'
@@ -506,7 +506,8 @@ export function mergeIfValid(
     }
   }
 
-  return { customConfig: customSpec?.[1] ?? {} }
+  // @ts-expect-error fixme ts strict error
+  return { customConfig: customSpec[1] }
 }
 
 app.registerExtension({

src/locales/en/commands.json

@@ -155,9 +155,6 @@
   "Comfy_QueuePromptFront": {
     "label": "Queue Prompt (Front)"
   },
-  "Comfy_QueueSelectedOutputNodes": {
-    "label": "Queue Selected Output Nodes"
-  },
   "Comfy_Redo": {
     "label": "Redo"
   },

src/locales/en/main.json

@@ -803,7 +803,6 @@
     "Open": "Open",
     "Queue Prompt": "Queue Prompt",
     "Queue Prompt (Front)": "Queue Prompt (Front)",
-    "Queue Selected Output Nodes": "Queue Selected Output Nodes",
     "Redo": "Redo",
     "Refresh Node Definitions": "Refresh Node Definitions",
     "Save": "Save",
@@ -1022,7 +1021,6 @@
     "image": "image",
     "preprocessors": "preprocessors",
     "advanced": "advanced",
-    "guidance": "guidance",
     "loaders": "loaders",
     "model_merging": "model_merging",
     "attention_experiments": "attention_experiments",
@@ -1035,64 +1033,44 @@
     "inpaint": "inpaint",
     "scheduling": "scheduling",
     "create": "create",
-    "video": "video",
     "mask": "mask",
     "deprecated": "deprecated",
     "latent": "latent",
+    "video": "video",
     "audio": "audio",
     "3d": "3d",
     "ltxv": "ltxv",
     "sd3": "sd3",
     "sigmas": "sigmas",
-    "api node": "api node",
-    "BFL": "BFL",
     "model_patches": "model_patches",
     "unet": "unet",
     "gligen": "gligen",
     "video_models": "video_models",
-    "Ideogram": "Ideogram",
-    "v1": "v1",
-    "v2": "v2",
-    "v3": "v3",
     "postprocessing": "postprocessing",
     "transform": "transform",
     "batch": "batch",
     "upscaling": "upscaling",
     "instructpix2pix": "instructpix2pix",
     "compositing": "compositing",
-    "Kling": "Kling",
     "samplers": "samplers",
     "operations": "operations",
-    "lotus": "lotus",
-    "Luma": "Luma",
-    "MiniMax": "MiniMax",
     "debug": "debug",
     "model": "model",
     "model_specific": "model_specific",
-    "OpenAI": "OpenAI",
     "cond pair": "cond pair",
     "photomaker": "photomaker",
-    "Pika": "Pika",
-    "PixVerse": "PixVerse",
-    "utils": "utils",
-    "primitive": "primitive",
-    "Recraft": "Recraft",
     "animation": "animation",
     "api": "api",
     "upscale_diffusion": "upscale_diffusion",
     "clip": "clip",
-    "Stability AI": "Stability AI",
+    "guidance": "guidance",
     "stable_cascade": "stable_cascade",
     "3d_models": "3d_models",
-    "style_model": "style_model",
-    "sd": "sd",
-    "Veo": "Veo"
+    "style_model": "style_model"
   },
   "dataTypes": {
-    "*": "*",
     "AUDIO": "AUDIO",
     "BOOLEAN": "BOOLEAN",
-    "CAMERA_CONTROL": "CAMERA_CONTROL",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP_VISION",
     "CLIP_VISION_OUTPUT": "CLIP_VISION_OUTPUT",
@@ -1111,27 +1089,18 @@
     "LATENT_OPERATION": "LATENT_OPERATION",
     "LOAD_3D": "LOAD_3D",
     "LOAD_3D_ANIMATION": "LOAD_3D_ANIMATION",
-    "LOAD3D_CAMERA": "LOAD3D_CAMERA",
-    "LUMA_CONCEPTS": "LUMA_CONCEPTS",
-    "LUMA_REF": "LUMA_REF",
     "MASK": "MASK",
     "MESH": "MESH",
     "MODEL": "MODEL",
     "NOISE": "NOISE",
     "PHOTOMAKER": "PHOTOMAKER",
-    "PIXVERSE_TEMPLATE": "PIXVERSE_TEMPLATE",
-    "RECRAFT_COLOR": "RECRAFT_COLOR",
-    "RECRAFT_CONTROLS": "RECRAFT_CONTROLS",
-    "RECRAFT_V3_STYLE": "RECRAFT_V3_STYLE",
     "SAMPLER": "SAMPLER",
     "SIGMAS": "SIGMAS",
     "STRING": "STRING",
     "STYLE_MODEL": "STYLE_MODEL",
-    "SVG": "SVG",
     "TIMESTEPS_RANGE": "TIMESTEPS_RANGE",
     "UPSCALE_MODEL": "UPSCALE_MODEL",
     "VAE": "VAE",
-    "VIDEO": "VIDEO",
     "VOXEL": "VOXEL",
     "WEBCAM": "WEBCAM"
   },
@@ -1228,8 +1197,6 @@
     "resizeNodeMatchOutput": "Resize Node to match output"
   },
   "toastMessages": {
-    "nothingToQueue": "Nothing to queue",
-    "pleaseSelectOutputNodes": "Please select output nodes",
     "no3dScene": "No 3D scene to apply texture",
     "failedToApplyTexture": "Failed to apply texture",
     "no3dSceneToExport": "No 3D scene to export",
@@ -1259,31 +1226,11 @@
     "failedToInitiateCreditPurchase": "Failed to initiate credit purchase: {error}",
     "failedToAccessBillingPortal": "Failed to access billing portal: {error}",
     "failedToPurchaseCredits": "Failed to purchase credits: {error}",
-    "unauthorizedDomain": "Your domain {domain} is not authorized to use this service. Please contact {email} to add your domain to the whitelist.",
-    "useApiKeyTip": "Tip: Can't access normal login? Use the Comfy API Key option."
+    "unauthorizedDomain": "Your domain {domain} is not authorized to use this service. Please contact {email} to add your domain to the whitelist."
   },
   "auth": {
-    "apiKey": {
-      "title": "API Key",
-      "label": "API Key",
-      "description": "Use your Comfy API key to enable API Nodes",
-      "placeholder": "Enter your API Key",
-      "error": "Invalid API Key",
-      "storageFailed": "Failed to store API Key",
-      "storageFailedDetail": "Please try again.",
-      "stored": "API Key stored",
-      "storedDetail": "Your API Key has been stored successfully",
-      "cleared": "API Key cleared",
-      "clearedDetail": "Your API Key has been cleared successfully",
-      "invalid": "Invalid API Key",
-      "invalidDetail": "Please enter a valid API Key",
-      "helpText": "Need an API key?",
-      "generateKey": "Get one here",
-      "whitelistInfo": "About non-whitelisted sites"
-    },
     "login": {
       "title": "Log in to your account",
-      "useApiKey": "Comfy API Key",
       "signInOrSignUp": "Sign In / Sign Up",
       "forgotPasswordError": "Failed to send password reset email",
       "passwordResetSent": "Password reset email sent",
@@ -1309,8 +1256,7 @@
       "success": "Login successful",
       "failed": "Login failed",
       "insecureContextWarning": "This connection is insecure (HTTP) - your credentials may be intercepted by attackers if you proceed to login.",
-      "questionsContactPrefix": "Questions? Contact us at",
-      "noAssociatedUser": "There is no Comfy user associated with the provided API key"
+      "questionsContactPrefix": "Questions? Contact us at"
     },
     "signup": {
       "title": "Create an account",
@@ -1341,8 +1287,6 @@
     "required": "Required",
     "minLength": "Must be at least {length} characters",
     "maxLength": "Must be no more than {length} characters",
-    "prefix": "Must start with {prefix}",
-    "length": "Must be {length} characters",
     "password": {
       "requirements": "Password requirements",
       "minLength": "Must be between 8 and 32 characters",
@@ -1359,7 +1303,6 @@
     "yourCreditBalance": "Your credit balance",
     "purchaseCredits": "Purchase Credits",
     "invoiceHistory": "Invoice History",
-    "apiPricing": "API Pricing",
     "faqs": "FAQs",
     "messageSupport": "Message Support",
     "lastUpdated": "Last updated",
@@ -1400,11 +1343,5 @@
         "title": "Run!"
       }
     }
-  },
-  "selectionToolbox": {
-    "executeButton": {
-      "tooltip": "Execute to selected output nodes (Highlighted with orange border)",
-      "disabledTooltip": "No output nodes selected"
-    }
   }
 }