diff --git a/apps/desktop-ui/src/i18n.ts b/apps/desktop-ui/src/i18n.ts
index 350376ff7a..a978ddcefa 100644
--- a/apps/desktop-ui/src/i18n.ts
+++ b/apps/desktop-ui/src/i18n.ts
@@ -1,13 +1,13 @@
 // Import only English locale eagerly as the default/fallback
 // ESLint cannot statically resolve dynamic imports with path aliases (@frontend-locales/*),
 // but these are properly configured in tsconfig.json and resolved by Vite at build time.
-// eslint-disable-next-line import-x/no-unresolved
+
 import enCommands from '@frontend-locales/en/commands.json' with { type: 'json' }
-// eslint-disable-next-line import-x/no-unresolved
+
 import en from '@frontend-locales/en/main.json' with { type: 'json' }
-// eslint-disable-next-line import-x/no-unresolved
+
 import enNodes from '@frontend-locales/en/nodeDefs.json' with { type: 'json' }
-// eslint-disable-next-line import-x/no-unresolved
+
 import enSettings from '@frontend-locales/en/settings.json' with { type: 'json' }
 import { createI18n } from 'vue-i18n'
 
@@ -27,7 +27,7 @@ function buildLocale<
 
 // Locale loader map - dynamically import locales only when needed
 // ESLint cannot statically resolve these dynamic imports, but they are valid at build time
-/* eslint-disable import-x/no-unresolved */
+
 const localeLoaders: Record<
   string,
   () => Promise<{ default: Record<string, unknown> }>
diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts
index aed8a40728..a9ae09dfe5 100644
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -1272,9 +1272,6 @@ export class ComfyPage {
         }, 'image/png')
       })
     }, filename)
-
-    // Wait a bit for the download to process
-    await this.page.waitForTimeout(500)
   }
 
   /**
diff --git a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts
index fd40ca9113..51b5a89280 100644
--- a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts
+++ b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts
@@ -60,9 +60,6 @@ export class ComfyNodeSearchBox {
     await this.input.waitFor({ state: 'visible' })
     await this.input.fill(nodeName)
     await this.dropdown.waitFor({ state: 'visible' })
-    // Wait for some time for the auto complete list to update.
-    // The auto complete list is debounced and may take some time to update.
-    await this.page.waitForTimeout(500)
     await this.dropdown
       .locator('li')
       .nth(options?.suggestionIndex || 0)
diff --git a/browser_tests/fixtures/components/SidebarTab.ts b/browser_tests/fixtures/components/SidebarTab.ts
index 1700866f23..00ec8a5b09 100644
--- a/browser_tests/fixtures/components/SidebarTab.ts
+++ b/browser_tests/fixtures/components/SidebarTab.ts
@@ -116,7 +116,6 @@ export class WorkflowsSidebarTab extends SidebarTab {
   async switchToWorkflow(workflowName: string) {
     const workflowLocator = this.getOpenedItem(workflowName)
     await workflowLocator.click()
-    await this.page.waitForTimeout(300)
   }
 
   getOpenedItem(name: string) {
@@ -138,7 +137,6 @@ export class WorkflowsSidebarTab extends SidebarTab {
       .click()
     await this.page.keyboard.type(newName)
     await this.page.keyboard.press('Enter')
-    await this.page.waitForTimeout(300)
   }
 
   async insertWorkflow(locator: Locator) {
diff --git a/browser_tests/fixtures/components/Topbar.ts b/browser_tests/fixtures/components/Topbar.ts
index 804793963c..289ca641bc 100644
--- a/browser_tests/fixtures/components/Topbar.ts
+++ b/browser_tests/fixtures/components/Topbar.ts
@@ -95,7 +95,6 @@ export class Topbar {
   }
 
   async openTopbarMenu() {
-    await this.page.waitForTimeout(1000)
     await this.menuTrigger.click()
     await this.menuLocator.waitFor({ state: 'visible' })
     return this.menuLocator
diff --git a/browser_tests/fixtures/utils/litegraphUtils.ts b/browser_tests/fixtures/utils/litegraphUtils.ts
index 5533fcaaa6..832db63249 100644
--- a/browser_tests/fixtures/utils/litegraphUtils.ts
+++ b/browser_tests/fixtures/utils/litegraphUtils.ts
@@ -462,7 +462,6 @@ export class NodeReference {
   async convertToSubgraph() {
     await this.clickContextMenuOption('Convert to Subgraph')
     await this.comfyPage.nextFrame()
-    await this.comfyPage.page.waitForTimeout(256)
     const nodes = await this.comfyPage.getNodeRefsByTitle('New Subgraph')
     if (nodes.length !== 1) {
       throw new Error(
@@ -511,7 +510,6 @@ export class NodeReference {
         // Double-click to enter subgraph
         await this.comfyPage.canvas.dblclick({ position, force: true })
         await this.comfyPage.nextFrame()
-        await this.comfyPage.page.waitForTimeout(500)
 
         // Check if we successfully entered the subgraph
         isInSubgraph = await this.comfyPage.page.evaluate(() => {
diff --git a/browser_tests/tests/backgroundImageUpload.spec.ts b/browser_tests/tests/backgroundImageUpload.spec.ts
index 7f3ed6a3d4..44ae2d6aea 100644
--- a/browser_tests/tests/backgroundImageUpload.spec.ts
+++ b/browser_tests/tests/backgroundImageUpload.spec.ts
@@ -75,9 +75,6 @@ test.describe('Background Image Upload', () => {
     // Upload the test image
     await fileChooser.setFiles(comfyPage.assetPath('image32x32.webp'))
 
-    // Wait for upload to complete and verify the setting was updated
-    await comfyPage.page.waitForTimeout(500) // Give time for file reading
-
     // Verify the URL input now has an API URL
     const urlInput = backgroundImageSetting.locator('input[type="text"]')
     const inputValue = await urlInput.inputValue()
@@ -191,14 +188,11 @@ test.describe('Background Image Upload', () => {
     )
     await uploadButton.hover()
 
-    // Wait for tooltip to appear and verify it exists
-    await comfyPage.page.waitForTimeout(700) // Tooltip delay
     const uploadTooltip = comfyPage.page.locator('.p-tooltip:visible')
     await expect(uploadTooltip).toBeVisible()
 
     // Move away to hide tooltip
     await comfyPage.page.locator('body').hover()
-    await comfyPage.page.waitForTimeout(100)
 
     // Set a background to enable clear button
     const urlInput = backgroundImageSetting.locator('input[type="text"]')
@@ -209,8 +203,6 @@ test.describe('Background Image Upload', () => {
     const clearButton = backgroundImageSetting.locator('button:has(.pi-trash)')
     await clearButton.hover()
 
-    // Wait for tooltip to appear and verify it exists
-    await comfyPage.page.waitForTimeout(700) // Tooltip delay
     const clearTooltip = comfyPage.page.locator('.p-tooltip:visible')
     await expect(clearTooltip).toBeVisible()
   })
diff --git a/browser_tests/tests/colorPalette.spec.ts b/browser_tests/tests/colorPalette.spec.ts
index 6dd53c194f..ce372ddfa6 100644
--- a/browser_tests/tests/colorPalette.spec.ts
+++ b/browser_tests/tests/colorPalette.spec.ts
@@ -203,7 +203,6 @@ test.describe('Node Color Adjustments', () => {
     comfyPage
   }) => {
     await comfyPage.setSetting('Comfy.Node.Opacity', 0.5)
-    await comfyPage.page.waitForTimeout(128)
 
     // Drag mouse to force canvas to redraw
     await comfyPage.page.mouse.move(0, 0)
@@ -211,7 +210,6 @@ test.describe('Node Color Adjustments', () => {
     await expect(comfyPage.canvas).toHaveScreenshot('node-opacity-0.5.png')
 
     await comfyPage.setSetting('Comfy.Node.Opacity', 1.0)
-    await comfyPage.page.waitForTimeout(128)
 
     await comfyPage.page.mouse.move(8, 8)
     await expect(comfyPage.canvas).toHaveScreenshot('node-opacity-1.png')
@@ -235,7 +233,6 @@ test.describe('Node Color Adjustments', () => {
     await comfyPage.setSetting('Comfy.Node.Opacity', 0.5)
     await comfyPage.setSetting('Comfy.ColorPalette', 'light')
     const saveWorkflowInterval = 1000
-    await comfyPage.page.waitForTimeout(saveWorkflowInterval)
     const workflow = await comfyPage.page.evaluate(() => {
       return localStorage.getItem('workflow')
     })
diff --git a/browser_tests/tests/dialog.spec.ts b/browser_tests/tests/dialog.spec.ts
index 269df33870..aef13f0cfe 100644
--- a/browser_tests/tests/dialog.spec.ts
+++ b/browser_tests/tests/dialog.spec.ts
@@ -43,7 +43,6 @@ test('Does not report warning on undo/redo', async ({ comfyPage }) => {
 
   // Wait for any async operations to complete after dialog closes
   await comfyPage.nextFrame()
-  await comfyPage.page.waitForTimeout(100)
 
   // Make a change to the graph
   await comfyPage.doubleClickCanvas()
diff --git a/browser_tests/tests/execution.spec.ts b/browser_tests/tests/execution.spec.ts
index 075025a3ab..ed77b79497 100644
--- a/browser_tests/tests/execution.spec.ts
+++ b/browser_tests/tests/execution.spec.ts
@@ -36,10 +36,6 @@ test.describe('Execute to selected output nodes', () => {
     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')
diff --git a/browser_tests/tests/execution.spec.ts-snapshots/execution-error-unconnected-slot-chromium-linux.png b/browser_tests/tests/execution.spec.ts-snapshots/execution-error-unconnected-slot-chromium-linux.png
index c352f301eb..dd7bda4c85 100644
Binary files a/browser_tests/tests/execution.spec.ts-snapshots/execution-error-unconnected-slot-chromium-linux.png and b/browser_tests/tests/execution.spec.ts-snapshots/execution-error-unconnected-slot-chromium-linux.png differ
diff --git a/browser_tests/tests/featureFlags.spec.ts b/browser_tests/tests/featureFlags.spec.ts
index 38286b3990..7079768291 100644
--- a/browser_tests/tests/featureFlags.spec.ts
+++ b/browser_tests/tests/featureFlags.spec.ts
@@ -94,9 +94,6 @@ test.describe('Feature Flags', () => {
   test('Server feature flags are received and accessible', async ({
     comfyPage
   }) => {
-    // Wait for connection to establish
-    await comfyPage.page.waitForTimeout(1000)
-
     // Get the actual server feature flags from the backend
     const serverFlags = await comfyPage.page.evaluate(() => {
       return window['app'].api.serverFeatureFlags
@@ -116,9 +113,6 @@ test.describe('Feature Flags', () => {
   test('serverSupportsFeature method works with real backend flags', async ({
     comfyPage
   }) => {
-    // Wait for connection
-    await comfyPage.page.waitForTimeout(1000)
-
     // Test serverSupportsFeature with real backend flags
     const supportsPreviewMetadata = await comfyPage.page.evaluate(() => {
       return window['app'].api.serverSupportsFeature(
@@ -170,9 +164,6 @@ test.describe('Feature Flags', () => {
   test('getServerFeature method works with real backend data', async ({
     comfyPage
   }) => {
-    // Wait for connection
-    await comfyPage.page.waitForTimeout(1000)
-
     // Test getServerFeature method
     const previewMetadataValue = await comfyPage.page.evaluate(() => {
       return window['app'].api.getServerFeature('supports_preview_metadata')
@@ -199,9 +190,6 @@ test.describe('Feature Flags', () => {
   test('getServerFeatures returns all backend feature flags', async ({
     comfyPage
   }) => {
-    // Wait for connection
-    await comfyPage.page.waitForTimeout(1000)
-
     // Test getServerFeatures returns all flags
     const allFeatures = await comfyPage.page.evaluate(() => {
       return window['app'].api.getServerFeatures()
@@ -248,9 +236,6 @@ test.describe('Feature Flags', () => {
   test('Server features are immutable when accessed via getServerFeatures', async ({
     comfyPage
   }) => {
-    // Wait for connection to establish
-    await comfyPage.page.waitForTimeout(1000)
-
     const immutabilityTest = await comfyPage.page.evaluate(() => {
       // Get a copy of server features
       const features1 = window['app'].api.getServerFeatures()
diff --git a/browser_tests/tests/groupNode.spec.ts b/browser_tests/tests/groupNode.spec.ts
index 5bbda7b03b..9d67a0951a 100644
--- a/browser_tests/tests/groupNode.spec.ts
+++ b/browser_tests/tests/groupNode.spec.ts
@@ -104,8 +104,6 @@ test.describe('Group Node', () => {
     await comfyPage.setSetting('Comfy.EnableTooltips', true)
     await comfyPage.convertAllNodesToGroupNode('Group Node')
     await comfyPage.page.mouse.move(47, 173)
-    const tooltipTimeout = 500
-    await comfyPage.page.waitForTimeout(tooltipTimeout + 16)
     await expect(comfyPage.page.locator('.node-tooltip')).toBeVisible()
   })
 
@@ -320,14 +318,12 @@ test.describe('Group Node', () => {
     test('Convert to group node, no selection', async ({ comfyPage }) => {
       expect(await comfyPage.getVisibleToastCount()).toBe(0)
       await comfyPage.page.keyboard.press('Alt+g')
-      await comfyPage.page.waitForTimeout(300)
       expect(await comfyPage.getVisibleToastCount()).toBe(1)
     })
     test('Convert to group node, selected 1 node', async ({ comfyPage }) => {
       expect(await comfyPage.getVisibleToastCount()).toBe(0)
       await comfyPage.clickTextEncodeNode1()
       await comfyPage.page.keyboard.press('Alt+g')
-      await comfyPage.page.waitForTimeout(300)
       expect(await comfyPage.getVisibleToastCount()).toBe(1)
     })
   })
diff --git a/browser_tests/tests/interaction.spec.ts b/browser_tests/tests/interaction.spec.ts
index 454b56ccf8..37442bf4e0 100644
--- a/browser_tests/tests/interaction.spec.ts
+++ b/browser_tests/tests/interaction.spec.ts
@@ -307,8 +307,6 @@ test.describe('Node Interaction', () => {
       position: numberWidgetPos
     })
     await expect(comfyPage.canvas).toHaveScreenshot('prompt-dialog-opened.png')
-    // Wait for 1s so that it does not trigger the search box by double click.
-    await comfyPage.page.waitForTimeout(1000)
     await comfyPage.canvas.click({
       position: {
         x: 10,
@@ -332,7 +330,6 @@ test.describe('Node Interaction', () => {
     await expect(comfyPage.canvas).toHaveScreenshot(
       'prompt-dialog-opened-text.png'
     )
-    await comfyPage.page.waitForTimeout(1000)
     await comfyPage.canvas.click({
       position: {
         x: 10,
@@ -663,9 +660,6 @@ test.describe('Load workflow', () => {
     await comfyPage.loadWorkflow('nodes/single_ksampler')
     const node = (await comfyPage.getFirstNodeRef())!
     await node.click('collapse')
-    // Wait 300ms between 2 clicks so that it is not treated as a double click
-    // by litegraph.
-    await comfyPage.page.waitForTimeout(300)
     await comfyPage.clickEmptySpace()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'single_ksampler_modified.png'
diff --git a/browser_tests/tests/nodeSearchBox.spec.ts b/browser_tests/tests/nodeSearchBox.spec.ts
index 98ba335836..ce8875defc 100644
--- a/browser_tests/tests/nodeSearchBox.spec.ts
+++ b/browser_tests/tests/nodeSearchBox.spec.ts
@@ -104,9 +104,6 @@ test.describe('Node search box', () => {
     await comfyPage.searchBox.input.waitFor({ state: 'visible' })
     await comfyPage.searchBox.input.fill(node)
     await comfyPage.searchBox.dropdown.waitFor({ state: 'visible' })
-    // Wait for some time for the auto complete list to update.
-    // The auto complete list is debounced and may take some time to update.
-    await comfyPage.page.waitForTimeout(500)
 
     const firstResult = comfyPage.searchBox.dropdown.locator('li').first()
     await expect(firstResult).toHaveAttribute('aria-label', node)
@@ -125,7 +122,6 @@ test.describe('Node search box', () => {
     await comfyPage.canvas.tap({
       position: screenCenter
     })
-    await comfyPage.page.waitForTimeout(256)
     await expect(comfyPage.searchBox.input).not.toHaveCount(0)
   })
 
diff --git a/browser_tests/tests/releaseNotifications.spec.ts b/browser_tests/tests/releaseNotifications.spec.ts
index 19d09327d0..3b16be2496 100644
--- a/browser_tests/tests/releaseNotifications.spec.ts
+++ b/browser_tests/tests/releaseNotifications.spec.ts
@@ -212,9 +212,6 @@ test.describe('Release Notifications', () => {
 
     await comfyPage.setup({ mockReleases: false })
 
-    // Wait a bit to ensure any potential API calls would have been made
-    await comfyPage.page.waitForTimeout(1000)
-
     // Verify no API calls were made
     expect(apiCallCount).toBe(0)
   })
diff --git a/browser_tests/tests/remoteWidgets.spec.ts b/browser_tests/tests/remoteWidgets.spec.ts
index 7a54cae07b..b717f62824 100644
--- a/browser_tests/tests/remoteWidgets.spec.ts
+++ b/browser_tests/tests/remoteWidgets.spec.ts
@@ -49,8 +49,6 @@ test.describe('Remote COMBO Widget', () => {
   const waitForWidgetUpdate = async (comfyPage: ComfyPage) => {
     // Force re-render to trigger first access of widget's options
     await comfyPage.page.mouse.click(400, 300)
-    // Wait for the widget to actually update instead of fixed timeout
-    await comfyPage.page.waitForTimeout(300)
   }
 
   test.beforeEach(async ({ comfyPage }) => {
@@ -92,7 +90,6 @@ test.describe('Remote COMBO Widget', () => {
     }) => {
       const nodeName = 'Remote Widget Node'
       await comfyPage.loadWorkflow('inputs/remote_widget')
-      await comfyPage.page.waitForTimeout(512)
 
       const node = await comfyPage.page.evaluate((name) => {
         return window['app'].graph.nodes.find((node) => node.title === name)
@@ -160,8 +157,6 @@ test.describe('Remote COMBO Widget', () => {
         }
       })
 
-      // Wait a reasonable time to ensure no request is made
-      await comfyPage.page.waitForTimeout(512)
       expect(requestWasMade).toBe(false)
     })
 
@@ -214,16 +209,9 @@ test.describe('Remote COMBO Widget', () => {
       await waitForWidgetUpdate(comfyPage)
       const initialOptions = await getWidgetOptions(comfyPage, nodeName)
 
-      // Wait for the refresh (TTL) to expire with extra buffer for processing
-      // TTL is 300ms, wait 600ms to ensure it has expired
-      await comfyPage.page.waitForTimeout(600)
-
       // Click on the canvas to trigger widget refresh
       await comfyPage.page.mouse.click(400, 300)
 
-      // Wait a bit for the refresh to complete
-      await comfyPage.page.waitForTimeout(100)
-
       const refreshedOptions = await getWidgetOptions(comfyPage, nodeName)
       expect(refreshedOptions).not.toEqual(initialOptions)
     })
@@ -331,7 +319,6 @@ test.describe('Remote COMBO Widget', () => {
 
       // Click refresh button
       await clickRefreshButton(comfyPage, nodeName)
-      await comfyPage.page.waitForTimeout(200)
 
       // Verify the selected value of the widget is the first option in the refreshed list
       const refreshedValue = await getWidgetValue(comfyPage, nodeName)
diff --git a/browser_tests/tests/rightClickMenu.spec.ts b/browser_tests/tests/rightClickMenu.spec.ts
index f7718122b7..d2c17b43db 100644
--- a/browser_tests/tests/rightClickMenu.spec.ts
+++ b/browser_tests/tests/rightClickMenu.spec.ts
@@ -118,7 +118,6 @@ test.describe('Node Right Click Menu', () => {
     await comfyPage.rightClickEmptyLatentNode()
     await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
     await comfyPage.nextFrame()
-    await comfyPage.page.waitForTimeout(256)
     await comfyPage.dragAndDrop({ x: 496, y: 618 }, { x: 200, y: 590 })
     await expect(comfyPage.canvas).toHaveScreenshot(
       'right-click-unpinned-node-moved.png'
diff --git a/browser_tests/tests/selectionToolboxSubmenus.spec.ts b/browser_tests/tests/selectionToolboxSubmenus.spec.ts
index db63261528..5c7d380a53 100644
--- a/browser_tests/tests/selectionToolboxSubmenus.spec.ts
+++ b/browser_tests/tests/selectionToolboxSubmenus.spec.ts
@@ -34,7 +34,6 @@ test.describe('Selection Toolbox - More Options Submenus', () => {
 
     await ksamplerNodes[0].click('title')
     await comfyPage.nextFrame()
-    await comfyPage.page.waitForTimeout(500)
 
     await expect(comfyPage.page.locator('.selection-toolbox')).toBeVisible({
       timeout: 5000
@@ -59,7 +58,6 @@ test.describe('Selection Toolbox - More Options Submenus', () => {
 
     await moreOptionsBtn.click({ force: true })
     await comfyPage.nextFrame()
-    await comfyPage.page.waitForTimeout(2000)
 
     const menuOptionsVisibleAfterClick = await comfyPage.page
       .getByText('Rename')
@@ -172,7 +170,6 @@ test.describe('Selection Toolbox - More Options Submenus', () => {
       }
     })
     await comfyPage.nextFrame()
-    await comfyPage.page.waitForTimeout(500)
 
     await expect(
       comfyPage.page.getByText('Rename', { exact: true })
diff --git a/browser_tests/tests/sidebar/workflows.spec.ts b/browser_tests/tests/sidebar/workflows.spec.ts
index 1b3f21ff4d..b14ba8eb0b 100644
--- a/browser_tests/tests/sidebar/workflows.spec.ts
+++ b/browser_tests/tests/sidebar/workflows.spec.ts
@@ -104,10 +104,8 @@ test.describe('Workflows sidebar', () => {
     await tab.open()
     // Switch to the parent folder
     await tab.getPersistedItem('foo').click()
-    await comfyPage.page.waitForTimeout(300)
     // Switch to the nested workflow
     await tab.getPersistedItem('bar').click()
-    await comfyPage.page.waitForTimeout(300)
 
     const openedWorkflow = tab.getOpenedItem('foo/bar')
     await tab.renameWorkflow(openedWorkflow, 'foo/baz')
@@ -193,7 +191,6 @@ test.describe('Workflows sidebar', () => {
 
     await comfyPage.menu.topbar.saveWorkflowAs('workflow5.json')
     await comfyPage.confirmDialog.click('overwrite')
-    await comfyPage.page.waitForTimeout(200)
     expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
       'workflow5.json'
     ])
@@ -228,7 +225,6 @@ test.describe('Workflows sidebar', () => {
 
     await topbar.saveWorkflowAs('workflow1.json')
     await comfyPage.confirmDialog.click('overwrite')
-    await comfyPage.page.waitForTimeout(200)
     // The old workflow1.json should be deleted and the new one should be saved.
     expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
       'workflow2.json',
@@ -362,8 +358,6 @@ test.describe('Workflows sidebar', () => {
       '#graph-canvas',
       { targetPosition }
     )
-    // Wait for the workflow to be inserted
-    await comfyPage.page.waitForTimeout(200)
     expect(await comfyPage.getGraphNodesCount()).toBe(nodeCount * 2)
   })
 })
diff --git a/browser_tests/tests/subgraph.spec.ts b/browser_tests/tests/subgraph.spec.ts
index 87ea504bb5..06a09210c5 100644
--- a/browser_tests/tests/subgraph.spec.ts
+++ b/browser_tests/tests/subgraph.spec.ts
@@ -308,8 +308,6 @@ test.describe('Subgraph Operations', () => {
         }
       })
 
-      // Wait for dialog to appear
-      await comfyPage.page.waitForTimeout(200)
       await comfyPage.nextFrame()
 
       await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
@@ -656,7 +654,6 @@ test.describe('Subgraph Operations', () => {
 
       await comfyPage.rightClickSubgraphInputSlot('text')
       await comfyPage.clickLitegraphContextMenuItem('Remove Slot')
-      await comfyPage.page.waitForTimeout(200)
 
       // Wait for breadcrumb to be visible
       await comfyPage.page.waitForSelector(SELECTORS.breadcrumb, {
@@ -673,7 +670,6 @@ test.describe('Subgraph Operations', () => {
       await homeBreadcrumb.waitFor({ state: 'visible' })
       await homeBreadcrumb.click()
       await comfyPage.nextFrame()
-      await comfyPage.page.waitForTimeout(300)
 
       // Check that the subgraph node has no widgets after removing the text slot
       const widgetCount = await comfyPage.page.evaluate(() => {
diff --git a/browser_tests/tests/templates.spec.ts b/browser_tests/tests/templates.spec.ts
index 6252332135..1e0d24dd68 100644
--- a/browser_tests/tests/templates.spec.ts
+++ b/browser_tests/tests/templates.spec.ts
@@ -170,9 +170,7 @@ test.describe('Templates', () => {
 
     // Verify English titles are shown as fallback
     await expect(
-      comfyPage.templates.content.getByRole('heading', {
-        name: 'Image Generation'
-      })
+      comfyPage.page.getByRole('main').getByText('All Templates')
     ).toBeVisible()
   })
 
diff --git a/browser_tests/tests/useSettingSearch.spec.ts b/browser_tests/tests/useSettingSearch.spec.ts
index a817616f8b..f022bb4bd2 100644
--- a/browser_tests/tests/useSettingSearch.spec.ts
+++ b/browser_tests/tests/useSettingSearch.spec.ts
@@ -150,7 +150,6 @@ test.describe('Settings Search functionality', () => {
 
     // Type in search box
     await searchBox.fill('graph')
-    await comfyPage.page.waitForTimeout(200) // Wait for debounce
 
     // Verify that the search input is handled
     await expect(searchBox).toHaveValue('graph')
@@ -182,9 +181,6 @@ test.describe('Settings Search functionality', () => {
     await searchBox.fill('abc')
     await searchBox.fill('abcd')
 
-    // Wait for debounce
-    await comfyPage.page.waitForTimeout(200)
-
     // Verify final value
     await expect(searchBox).toHaveValue('abcd')
   })
@@ -200,7 +196,6 @@ test.describe('Settings Search functionality', () => {
     // Search for our test settings
     const searchBox = comfyPage.page.locator('.settings-search-box input')
     await searchBox.fill('Test')
-    await comfyPage.page.waitForTimeout(300) // Wait for debounce
 
     // Get all settings content
     const settingsContent = comfyPage.page.locator('.settings-tab-panels')
@@ -221,7 +216,6 @@ test.describe('Settings Search functionality', () => {
     // Search for our test settings
     const searchBox = comfyPage.page.locator('.settings-search-box input')
     await searchBox.fill('Test')
-    await comfyPage.page.waitForTimeout(300) // Wait for debounce
 
     // Get all settings content
     const settingsContent = comfyPage.page.locator('.settings-tab-panels')
@@ -242,7 +236,6 @@ test.describe('Settings Search functionality', () => {
     // Search for our test settings
     const searchBox = comfyPage.page.locator('.settings-search-box input')
     await searchBox.fill('Test')
-    await comfyPage.page.waitForTimeout(300) // Wait for debounce
 
     // Get all settings content
     const settingsContent = comfyPage.page.locator('.settings-tab-panels')
@@ -269,7 +262,6 @@ test.describe('Settings Search functionality', () => {
     // Search specifically for hidden setting by name
     await searchBox.clear()
     await searchBox.fill('Hidden')
-    await comfyPage.page.waitForTimeout(300)
 
     // Should not show the hidden setting even when searching by name
     await expect(settingsContent).not.toContainText('Test Hidden Setting')
@@ -277,7 +269,6 @@ test.describe('Settings Search functionality', () => {
     // Search specifically for deprecated setting by name
     await searchBox.clear()
     await searchBox.fill('Deprecated')
-    await comfyPage.page.waitForTimeout(300)
 
     // Should not show the deprecated setting even when searching by name
     await expect(settingsContent).not.toContainText('Test Deprecated Setting')
@@ -285,7 +276,6 @@ test.describe('Settings Search functionality', () => {
     // Search for visible setting by name - should work
     await searchBox.clear()
     await searchBox.fill('Visible')
-    await comfyPage.page.waitForTimeout(300)
 
     // Should show the visible setting
     await expect(settingsContent).toContainText('Test Visible Setting')
diff --git a/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-create-group-chromium-linux.png b/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-create-group-chromium-linux.png
index aa60c90eb0..8a0fb4f928 100644
Binary files a/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-create-group-chromium-linux.png and b/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-create-group-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-fit-to-contents-chromium-linux.png b/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-fit-to-contents-chromium-linux.png
index 7874e1fb4d..31f835b9f9 100644
Binary files a/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-fit-to-contents-chromium-linux.png and b/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-fit-to-contents-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts-snapshots/vue-nodes-paned-with-touch-mobile-chrome-linux.png b/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts-snapshots/vue-nodes-paned-with-touch-mobile-chrome-linux.png
index c473af74e0..6a9ffbf9f1 100644
Binary files a/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts-snapshots/vue-nodes-paned-with-touch-mobile-chrome-linux.png and b/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts-snapshots/vue-nodes-paned-with-touch-mobile-chrome-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts-snapshots/zoomed-in-ctrl-shift-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts-snapshots/zoomed-in-ctrl-shift-chromium-linux.png
index 1c87757c5d..a372972914 100644
Binary files a/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts-snapshots/zoomed-in-ctrl-shift-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts-snapshots/zoomed-in-ctrl-shift-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-dragging-link-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-dragging-link-chromium-linux.png
index c454a29773..c7bc0306a8 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-dragging-link-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-dragging-link-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-ctrl-alt-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-ctrl-alt-chromium-linux.png
index 8bbbade09a..47d59a3567 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-ctrl-alt-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-ctrl-alt-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-reuses-origin-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-reuses-origin-chromium-linux.png
index ddeed325af..826de88153 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-reuses-origin-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-reuses-origin-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-input-drag-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-input-drag-chromium-linux.png
index c1b84f2cd3..92b7b91f5b 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-input-drag-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-input-drag-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-output-shift-drag-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-output-shift-drag-chromium-linux.png
index bc40dbb141..19b2f4746b 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-output-shift-drag-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-output-shift-drag-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-shift-output-multi-link-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-shift-output-multi-link-chromium-linux.png
index 6ac61c8b0c..abb9f398a5 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-shift-output-multi-link-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-shift-output-multi-link-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-node-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-node-chromium-linux.png
index be53102c58..f886dbbf8a 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-node-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-node-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-slot-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-slot-chromium-linux.png
index 33dbd25598..fbcf5f4e9d 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-slot-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-slot-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-chromium-linux.png
index a025ece449..edfb82f6e6 100644
Binary files a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-touch-mobile-chrome-linux.png b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-touch-mobile-chrome-linux.png
index 44387515dd..fddd996742 100644
Binary files a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-touch-mobile-chrome-linux.png and b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-touch-mobile-chrome-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/resize.spec.ts b/browser_tests/tests/vueNodes/interactions/node/resize.spec.ts
index 7ea5bf965b..c8e015ffa4 100644
--- a/browser_tests/tests/vueNodes/interactions/node/resize.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/resize.spec.ts
@@ -19,7 +19,6 @@ test.describe('Vue Node Resizing', () => {
 
     // Select the node first (this was causing the bug)
     await node.header.click()
-    await comfyPage.page.waitForTimeout(100) // Brief pause after selection
 
     // Get position after selection
     const selectedBox = await node.boundingBox()
diff --git a/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts-snapshots/vue-node-bypassed-state-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts-snapshots/vue-node-bypassed-state-chromium-linux.png
index dc585c6d81..665d96d913 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts-snapshots/vue-node-bypassed-state-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts-snapshots/vue-node-bypassed-state-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-color-blue-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-color-blue-chromium-linux.png
index f5ba72c46c..fd349491db 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-color-blue-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-color-blue-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png
index 3759efb2d4..7ddb546ebe 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png
index 98507102bc..0b3686ba90 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts-snapshots/vue-node-muted-state-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts-snapshots/vue-node-muted-state-chromium-linux.png
index b71272bace..6067bf18be 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts-snapshots/vue-node-muted-state-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts-snapshots/vue-node-muted-state-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts-snapshots/vue-nodes-upload-widgets-chromium-linux.png b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts-snapshots/vue-nodes-upload-widgets-chromium-linux.png
index d6aa02b4eb..7924bcf19f 100644
Binary files a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts-snapshots/vue-nodes-upload-widgets-chromium-linux.png and b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts-snapshots/vue-nodes-upload-widgets-chromium-linux.png differ
diff --git a/browser_tests/tests/widget.spec.ts b/browser_tests/tests/widget.spec.ts
index 3b9c057847..7afa823e35 100644
--- a/browser_tests/tests/widget.spec.ts
+++ b/browser_tests/tests/widget.spec.ts
@@ -95,7 +95,6 @@ test.describe('Boolean widget', () => {
 test.describe('Slider widget', () => {
   test('Can drag adjust value', async ({ comfyPage }) => {
     await comfyPage.loadWorkflow('inputs/simple_slider')
-    await comfyPage.page.waitForTimeout(300)
     const node = (await comfyPage.getFirstNodeRef())!
     const widget = await node.getWidget(0)
 
@@ -117,7 +116,6 @@ test.describe('Slider widget', () => {
 test.describe('Number widget', () => {
   test('Can drag adjust value', async ({ comfyPage }) => {
     await comfyPage.loadWorkflow('widgets/seed_widget')
-    await comfyPage.page.waitForTimeout(300)
 
     const node = (await comfyPage.getFirstNodeRef())!
     const widget = await node.getWidget(0)
@@ -141,7 +139,6 @@ test.describe('Dynamic widget manipulation', () => {
     comfyPage
   }) => {
     await comfyPage.loadWorkflow('nodes/single_ksampler')
-    await comfyPage.page.waitForTimeout(300)
 
     await comfyPage.page.evaluate(() => {
       window['graph'].nodes[0].addWidget('number', 'new_widget', 10)
@@ -234,9 +231,6 @@ test.describe('Animated image widget', () => {
       'animated_image_preview_drag_and_dropped.png'
     )
 
-    // Wait for animation to go to next frame
-    await comfyPage.page.waitForTimeout(512)
-
     // Move mouse and click on canvas to trigger render
     await comfyPage.page.mouse.click(64, 64)
 
@@ -260,7 +254,6 @@ test.describe('Animated image widget', () => {
     await comfyPage.dragAndDropFile('animated_webp.webp', {
       dropPosition: { x, y }
     })
-    await comfyPage.page.waitForTimeout(200)
 
     // Expect the filename combo value to be updated
     const fileComboWidget = await loadAnimatedWebpNode.getWidget(0)
@@ -306,9 +299,6 @@ test.describe('Animated image widget', () => {
     )
     await comfyPage.nextFrame()
 
-    // Wait for animation to go to next frame
-    await comfyPage.page.waitForTimeout(512)
-
     // Move mouse and click on canvas to trigger render
     await comfyPage.page.mouse.click(64, 64)
 
diff --git a/package.json b/package.json
index 1ef37695cb..1762ba3c26 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@comfyorg/comfyui-frontend",
   "private": true,
-  "version": "1.34.6",
+  "version": "1.34.7",
   "type": "module",
   "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
   "homepage": "https://comfy.org",
diff --git a/src/components/TopMenuSection.vue b/src/components/TopMenuSection.vue
index a0b5085540..7b9d88b0e3 100644
--- a/src/components/TopMenuSection.vue
+++ b/src/components/TopMenuSection.vue
@@ -115,6 +115,7 @@ const cancelJobTooltipConfig = computed(() =>
 
 // Right side panel toggle
 const { isOpen: isRightSidePanelOpen } = storeToRefs(rightSidePanelStore)
+
 const rightSidePanelTooltipConfig = computed(() =>
   buildTooltipConfig(t('rightSidePanel.togglePanel'))
 )
diff --git a/src/components/common/SearchBox.vue b/src/components/common/SearchBox.vue
index 8fbf3a34a0..00b705ce17 100644
--- a/src/components/common/SearchBox.vue
+++ b/src/components/common/SearchBox.vue
@@ -10,6 +10,7 @@
         @click="$emit('showFilter', $event)"
       />
       <InputText
+        ref="inputRef"
         class="search-box-input w-full"
         :model-value="modelValue"
         :placeholder="placeholder"
@@ -48,6 +49,7 @@ import Button from 'primevue/button'
 import IconField from 'primevue/iconfield'
 import InputIcon from 'primevue/inputicon'
 import InputText from 'primevue/inputtext'
+import { ref } from 'vue'
 
 import type { SearchFilter } from './SearchFilterChip.vue'
 import SearchFilterChip from './SearchFilterChip.vue'
@@ -77,6 +79,14 @@ const emit = defineEmits<{
   (e: 'removeFilter', filter: TFilter): void
 }>()
 
+const inputRef = ref()
+
+defineExpose({
+  focus: () => {
+    inputRef.value?.$el?.focus()
+  }
+})
+
 const emitSearch = debounce((value: string) => {
   emit('search', value, filters)
 }, debounceTime)
diff --git a/src/components/common/VirtualGrid.vue b/src/components/common/VirtualGrid.vue
index 89de6e421b..134778778a 100644
--- a/src/components/common/VirtualGrid.vue
+++ b/src/components/common/VirtualGrid.vue
@@ -117,16 +117,7 @@ onBeforeUnmount(() => {
 .scroll-container {
   height: 100%;
   overflow-y: auto;
-
-  /* Firefox */
-  scrollbar-width: none;
-
-  &::-webkit-scrollbar {
-    width: 1px;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background-color: transparent;
-  }
+  scrollbar-width: thin;
+  scrollbar-color: var(--dialog-surface) transparent;
 }
 </style>
diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
index 3d10328e62..35f2290340 100644
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -132,7 +132,7 @@ import { useCopy } from '@/composables/useCopy'
 import { useGlobalLitegraph } from '@/composables/useGlobalLitegraph'
 import { usePaste } from '@/composables/usePaste'
 import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
-import { i18n, t } from '@/i18n'
+import { mergeCustomNodesI18n, t } from '@/i18n'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { useLitegraphSettings } from '@/platform/settings/composables/useLitegraphSettings'
 import { CORE_SETTINGS } from '@/platform/settings/constants/coreSettings'
@@ -391,9 +391,7 @@ useEventListener(
 const loadCustomNodesI18n = async () => {
   try {
     const i18nData = await api.getCustomNodesI18n()
-    Object.entries(i18nData).forEach(([locale, message]) => {
-      i18n.global.mergeLocaleMessage(locale, message)
-    })
+    mergeCustomNodesI18n(i18nData)
   } catch (error) {
     console.error('Failed to load custom nodes i18n', error)
   }
diff --git a/src/components/queue/job/JobGroupsList.vue b/src/components/queue/job/JobGroupsList.vue
index 2aee8b03e0..482016d346 100644
--- a/src/components/queue/job/JobGroupsList.vue
+++ b/src/components/queue/job/JobGroupsList.vue
@@ -36,12 +36,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { onBeforeUnmount, ref, watch } from 'vue'
 
 import QueueJobItem from '@/components/queue/job/QueueJobItem.vue'
 import type { JobGroup, JobListItem } from '@/composables/queue/useJobList'
 
-defineProps<{ displayedJobGroups: JobGroup[] }>()
+const props = defineProps<{ displayedJobGroups: JobGroup[] }>()
 
 const emit = defineEmits<{
   (e: 'cancelItem', item: JobListItem): void
@@ -89,4 +89,26 @@ const onDetailsLeave = (jobId: string) => {
     hideTimer.value = null
   }, 150)
 }
+
+const resetActiveDetails = () => {
+  clearHideTimer()
+  clearShowTimer()
+  activeDetailsId.value = null
+}
+
+watch(
+  () => props.displayedJobGroups,
+  (groups) => {
+    const activeId = activeDetailsId.value
+    if (!activeId) return
+
+    const hasActiveJob = groups.some((group) =>
+      group.items.some((item) => item.id === activeId)
+    )
+
+    if (!hasActiveJob) resetActiveDetails()
+  }
+)
+
+onBeforeUnmount(resetActiveDetails)
 </script>
diff --git a/src/components/queue/job/QueueJobItem.vue b/src/components/queue/job/QueueJobItem.vue
index fc9c8d6d0e..9936b47c6a 100644
--- a/src/components/queue/job/QueueJobItem.vue
+++ b/src/components/queue/job/QueueJobItem.vue
@@ -361,7 +361,10 @@ const baseActions = computed<ActionConfig[]>(() => {
       ariaLabel: t('g.delete'),
       tooltip: deleteTooltipConfig.value,
       isVisible: () => props.state === 'failed' && computedShowClear.value,
-      onClick: () => emit('delete')
+      onClick: () => {
+        onRowLeave()
+        emit('delete')
+      }
     },
     {
       key: 'cancel-hover',
@@ -377,7 +380,10 @@ const baseActions = computed<ActionConfig[]>(() => {
         props.state !== 'running' &&
         props.state !== 'failed' &&
         computedShowClear.value,
-      onClick: () => emit('cancel')
+      onClick: () => {
+        onRowLeave()
+        emit('cancel')
+      }
     },
     {
       key: 'view',
@@ -401,7 +407,10 @@ const baseActions = computed<ActionConfig[]>(() => {
       ariaLabel: t('g.cancel'),
       tooltip: cancelTooltipConfig.value,
       isVisible: () => props.state === 'running' && computedShowClear.value,
-      onClick: () => emit('cancel')
+      onClick: () => {
+        onRowLeave()
+        emit('cancel')
+      }
     }
   ]
 })
diff --git a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
index 9ff7bd7638..c5cf5e9bd0 100644
--- a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
@@ -21,6 +21,7 @@
     </template>
     <template #header>
       <SearchBox
+        ref="searchBoxRef"
         v-model:model-value="searchQuery"
         class="model-lib-search-box p-2 2xl:p-4"
         :placeholder="$t('g.searchModels') + '...'"
@@ -66,6 +67,7 @@ import { buildTree } from '@/utils/treeUtil'
 const modelStore = useModelStore()
 const modelToNodeStore = useModelToNodeStore()
 const settingStore = useSettingStore()
+const searchBoxRef = ref()
 const searchQuery = ref<string>('')
 const expandedKeys = ref<Record<string, boolean>>({})
 const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
@@ -180,6 +182,7 @@ watch(
 )
 
 onMounted(async () => {
+  searchBoxRef.value?.focus()
   if (settingStore.get('Comfy.ModelLibrary.AutoLoadAll')) {
     await modelStore.loadModels()
   }
diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
index a6352ed7f9..edfa36288e 100644
--- a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
@@ -78,6 +78,7 @@
       <template #header>
         <div>
           <SearchBox
+            ref="searchBoxRef"
             v-model:model-value="searchQuery"
             class="node-lib-search-box p-2 2xl:p-4"
             :placeholder="$t('g.searchNodes') + '...'"
@@ -130,7 +131,7 @@ import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import Popover from 'primevue/popover'
 import type { Ref } from 'vue'
-import { computed, h, nextTick, ref, render } from 'vue'
+import { computed, h, nextTick, onMounted, ref, render } from 'vue'
 
 import SearchBox from '@/components/common/SearchBox.vue'
 import type { SearchFilter } from '@/components/common/SearchFilterChip.vue'
@@ -171,6 +172,12 @@ const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
 const nodeBookmarkTreeExplorerRef = ref<InstanceType<
   typeof NodeBookmarkTreeExplorer
 > | null>(null)
+const searchBoxRef = ref()
+
+onMounted(() => {
+  searchBoxRef.value?.focus()
+})
+
 const searchFilter = ref<InstanceType<typeof Popover> | null>(null)
 const groupingPopover = ref<InstanceType<typeof Popover> | null>(null)
 const sortingPopover = ref<InstanceType<typeof Popover> | null>(null)
diff --git a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
index 4f5377dffb..d4a649ac8b 100644
--- a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
+++ b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
@@ -14,6 +14,7 @@
     </template>
     <template #header>
       <SearchBox
+        ref="searchBoxRef"
         v-model:model-value="searchQuery"
         class="workflows-search-box p-2 2xl:p-4"
         :placeholder="$t('g.searchWorkflows') + '...'"
@@ -158,6 +159,8 @@ const workflowTabsPosition = computed(() =>
   settingStore.get('Comfy.Workflow.WorkflowTabsPosition')
 )
 
+const searchBoxRef = ref()
+
 const searchQuery = ref('')
 const isSearching = computed(() => searchQuery.value.length > 0)
 const filteredWorkflows = ref<ComfyWorkflow[]>([])
@@ -295,6 +298,7 @@ const selectionKeys = computed(() => ({
 
 const workflowBookmarkStore = useWorkflowBookmarkStore()
 onMounted(async () => {
+  searchBoxRef.value?.focus()
   await workflowBookmarkStore.loadBookmarks()
 })
 </script>
diff --git a/src/components/widget/layout/BaseModalLayout.vue b/src/components/widget/layout/BaseModalLayout.vue
index 779cf3db6d..8057502b84 100644
--- a/src/components/widget/layout/BaseModalLayout.vue
+++ b/src/components/widget/layout/BaseModalLayout.vue
@@ -162,7 +162,7 @@ const rightAreaClasses = computed(() => {
 })
 
 const contentContainerClasses = computed(() => {
-  return cn('min-h-0 px-6 pt-0 pb-10', 'overflow-y-auto scrollbar-hide')
+  return cn('min-h-0 px-6 pt-0 pb-10', 'overflow-y-auto')
 })
 
 const rightPanelClasses = computed(() => {
diff --git a/src/composables/maskeditor/usePanAndZoom.ts b/src/composables/maskeditor/usePanAndZoom.ts
index 2aa8336477..9a70855234 100644
--- a/src/composables/maskeditor/usePanAndZoom.ts
+++ b/src/composables/maskeditor/usePanAndZoom.ts
@@ -402,6 +402,19 @@ export function usePanAndZoom() {
     }
   )
 
+  const addPenPointerId = (pointerId: number): void => {
+    if (!penPointerIdList.value.includes(pointerId)) {
+      penPointerIdList.value.push(pointerId)
+    }
+  }
+
+  const removePenPointerId = (pointerId: number): void => {
+    const index = penPointerIdList.value.indexOf(pointerId)
+    if (index !== -1) {
+      penPointerIdList.value.splice(index, 1)
+    }
+  }
+
   return {
     initializeCanvasPanZoom,
     handlePanStart,
@@ -411,6 +424,8 @@ export function usePanAndZoom() {
     handleTouchEnd,
     updateCursorPosition,
     zoom,
-    invalidatePanZoom
+    invalidatePanZoom,
+    addPenPointerId,
+    removePenPointerId
   }
 }
diff --git a/src/composables/maskeditor/useToolManager.ts b/src/composables/maskeditor/useToolManager.ts
index e306f3dfbf..f51ce7b15a 100644
--- a/src/composables/maskeditor/useToolManager.ts
+++ b/src/composables/maskeditor/useToolManager.ts
@@ -114,6 +114,10 @@ export function useToolManager(
     event.preventDefault()
     if (event.pointerType === 'touch') return
 
+    if (event.pointerType === 'pen') {
+      panZoom.addPenPointerId(event.pointerId)
+    }
+
     const isSpacePressed = keyboard.isKeyDown(' ')
 
     if (event.buttons === 4 || (event.buttons === 1 && isSpacePressed)) {
@@ -207,6 +211,11 @@ export function useToolManager(
   const handlePointerUp = async (event: PointerEvent): Promise<void> => {
     store.isPanning = false
     store.brushVisible = true
+
+    if (event.pointerType === 'pen') {
+      panZoom.removePenPointerId(event.pointerId)
+    }
+
     if (event.pointerType === 'touch') return
     updateCursor()
     store.isAdjustingBrush = false
diff --git a/src/i18n.test.ts b/src/i18n.test.ts
new file mode 100644
index 0000000000..1cb2b673b0
--- /dev/null
+++ b/src/i18n.test.ts
@@ -0,0 +1,200 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+const { i18n, loadLocale, mergeCustomNodesI18n } = await import('./i18n')
+
+// Mock the JSON imports before importing i18n module
+vi.mock('./locales/en/main.json', () => ({ default: { welcome: 'Welcome' } }))
+vi.mock('./locales/en/nodeDefs.json', () => ({
+  default: { testNode: 'Test Node' }
+}))
+vi.mock('./locales/en/commands.json', () => ({
+  default: { save: 'Save' }
+}))
+vi.mock('./locales/en/settings.json', () => ({
+  default: { theme: 'Theme' }
+}))
+
+// Mock lazy-loaded locales
+vi.mock('./locales/zh/main.json', () => ({ default: { welcome: '欢迎' } }))
+vi.mock('./locales/zh/nodeDefs.json', () => ({
+  default: { testNode: '测试节点' }
+}))
+vi.mock('./locales/zh/commands.json', () => ({ default: { save: '保存' } }))
+vi.mock('./locales/zh/settings.json', () => ({ default: { theme: '主题' } }))
+
+describe('i18n', () => {
+  beforeEach(async () => {
+    vi.resetModules()
+  })
+
+  describe('mergeCustomNodesI18n', () => {
+    it('should immediately merge data for already loaded locales (en)', async () => {
+      // English is pre-loaded, so merge should work immediately
+      mergeCustomNodesI18n({
+        en: {
+          customNode: {
+            title: 'Custom Node Title'
+          }
+        }
+      })
+
+      // Verify the custom node data was merged
+      const messages = i18n.global.getLocaleMessage('en') as Record<
+        string,
+        unknown
+      >
+      expect(messages.customNode).toEqual({ title: 'Custom Node Title' })
+    })
+
+    it('should store data for not-yet-loaded locales', async () => {
+      const { i18n, mergeCustomNodesI18n } = await import('./i18n')
+
+      // Chinese is not pre-loaded, data should be stored but not merged yet
+      mergeCustomNodesI18n({
+        zh: {
+          customNode: {
+            title: '自定义节点标题'
+          }
+        }
+      })
+
+      // zh locale should not exist yet (not loaded)
+      const zhMessages = i18n.global.getLocaleMessage('zh') as Record<
+        string,
+        unknown
+      >
+      // Either empty or doesn't have our custom data merged directly
+      // (since zh wasn't loaded yet, mergeLocaleMessage on non-existent locale
+      // may create an empty locale or do nothing useful)
+      expect(zhMessages.customNode).toBeUndefined()
+    })
+
+    it('should merge stored data when locale is lazily loaded', async () => {
+      // First, store custom nodes i18n data (before locale is loaded)
+      mergeCustomNodesI18n({
+        zh: {
+          customNode: {
+            title: '自定义节点标题'
+          }
+        }
+      })
+
+      await loadLocale('zh')
+
+      // Verify both the base locale data and custom node data are present
+      const zhMessages = i18n.global.getLocaleMessage('zh') as Record<
+        string,
+        unknown
+      >
+      expect(zhMessages.welcome).toBe('欢迎')
+      expect(zhMessages.customNode).toEqual({ title: '自定义节点标题' })
+    })
+
+    it('should preserve custom node data when locale is loaded after merge', async () => {
+      // Simulate the real scenario:
+      // 1. Custom nodes i18n is loaded first
+      mergeCustomNodesI18n({
+        zh: {
+          customNode: {
+            title: '自定义节点标题'
+          },
+          settingsCategories: {
+            Hotkeys: '快捷键'
+          }
+        }
+      })
+
+      // 2. Then locale is lazily loaded (this would previously overwrite custom data)
+      await loadLocale('zh')
+
+      // 3. Verify custom node data is still present
+      const zhMessages = i18n.global.getLocaleMessage('zh') as Record<
+        string,
+        unknown
+      >
+      expect(zhMessages.customNode).toEqual({ title: '自定义节点标题' })
+      expect(zhMessages.settingsCategories).toEqual({ Hotkeys: '快捷键' })
+
+      // 4. Also verify base locale data is present
+      expect(zhMessages.welcome).toBe('欢迎')
+      expect(zhMessages.nodeDefs).toEqual({ testNode: '测试节点' })
+    })
+
+    it('should handle multiple locales in custom nodes i18n data', async () => {
+      // Merge data for multiple locales
+      mergeCustomNodesI18n({
+        en: {
+          customPlugin: { name: 'Easy Use' }
+        },
+        zh: {
+          customPlugin: { name: '简单使用' }
+        }
+      })
+
+      // English should be merged immediately (pre-loaded)
+      const enMessages = i18n.global.getLocaleMessage('en') as Record<
+        string,
+        unknown
+      >
+      expect(enMessages.customPlugin).toEqual({ name: 'Easy Use' })
+
+      await loadLocale('zh')
+      const zhMessages = i18n.global.getLocaleMessage('zh') as Record<
+        string,
+        unknown
+      >
+      expect(zhMessages.customPlugin).toEqual({ name: '简单使用' })
+    })
+
+    it('should handle calling mergeCustomNodesI18n multiple times', async () => {
+      // Use fresh module instance to ensure clean state
+      vi.resetModules()
+      const { i18n, loadLocale, mergeCustomNodesI18n } = await import('./i18n')
+
+      mergeCustomNodesI18n({
+        zh: { plugin1: { name: '插件1' } }
+      })
+
+      mergeCustomNodesI18n({
+        zh: { plugin2: { name: '插件2' } }
+      })
+
+      await loadLocale('zh')
+
+      const zhMessages = i18n.global.getLocaleMessage('zh') as Record<
+        string,
+        unknown
+      >
+      // Only the second call's data should be present
+      expect(zhMessages.plugin2).toEqual({ name: '插件2' })
+      // First call's data is overwritten
+      expect(zhMessages.plugin1).toBeUndefined()
+    })
+  })
+
+  describe('loadLocale', () => {
+    it('should not reload already loaded locale', async () => {
+      await loadLocale('zh')
+      await loadLocale('zh')
+
+      // Should complete without error (second call returns early)
+    })
+
+    it('should warn for unsupported locale', async () => {
+      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+      await loadLocale('unsupported-locale')
+
+      expect(consoleSpy).toHaveBeenCalledWith(
+        'Locale "unsupported-locale" is not supported'
+      )
+      consoleSpy.mockRestore()
+    })
+
+    it('should handle concurrent load requests for same locale', async () => {
+      // Start multiple loads concurrently
+      const promises = [loadLocale('zh'), loadLocale('zh'), loadLocale('zh')]
+
+      await Promise.all(promises)
+    })
+  })
+})
diff --git a/src/i18n.ts b/src/i18n.ts
index 0e26c655c7..3ef845ed16 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -94,6 +94,9 @@ const loadedLocales = new Set<string>(['en'])
 // Track locales currently being loaded to prevent race conditions
 const loadingLocales = new Map<string, Promise<void>>()
 
+// Store custom nodes i18n data for merging when locales are lazily loaded
+const customNodesI18nData: Record<string, unknown> = {}
+
 /**
  * Dynamically load a locale and its associated files (nodeDefs, commands, settings)
  */
@@ -137,6 +140,10 @@ export async function loadLocale(locale: string): Promise<void> {
 
       i18n.global.setLocaleMessage(locale, messages as LocaleMessages)
       loadedLocales.add(locale)
+
+      if (customNodesI18nData[locale]) {
+        i18n.global.mergeLocaleMessage(locale, customNodesI18nData[locale])
+      }
     } catch (error) {
       console.error(`Failed to load locale "${locale}":`, error)
       throw error
@@ -150,6 +157,24 @@ export async function loadLocale(locale: string): Promise<void> {
   return loadPromise
 }
 
+/**
+ * Stores the data for later use when locales are lazily loaded,
+ * and immediately merges data for already-loaded locales.
+ */
+export function mergeCustomNodesI18n(i18nData: Record<string, unknown>): void {
+  // Clear existing data and replace with new data
+  for (const key of Object.keys(customNodesI18nData)) {
+    delete customNodesI18nData[key]
+  }
+  Object.assign(customNodesI18nData, i18nData)
+
+  for (const [locale, message] of Object.entries(i18nData)) {
+    if (loadedLocales.has(locale)) {
+      i18n.global.mergeLocaleMessage(locale, message)
+    }
+  }
+}
+
 // Only include English in the initial bundle
 const messages = {
   en: buildLocale(en, enNodes, enCommands, enSettings)
diff --git a/src/lib/litegraph/src/canvas/ToInputFromIoNodeLink.ts b/src/lib/litegraph/src/canvas/ToInputFromIoNodeLink.ts
index e98c59d87a..073c777f1f 100644
--- a/src/lib/litegraph/src/canvas/ToInputFromIoNodeLink.ts
+++ b/src/lib/litegraph/src/canvas/ToInputFromIoNodeLink.ts
@@ -63,6 +63,9 @@ export class ToInputFromIoNodeLink implements RenderLink {
 
     if (existingLink) {
       // Moving an existing link
+      const { input, inputNode } = existingLink.resolve(this.network)
+      if (inputNode && input)
+        this.node._disconnectNodeInput(inputNode, input, existingLink)
       events.dispatch('input-moved', this)
     } else {
       // Creating a new link
diff --git a/src/locales/ar/nodeDefs.json b/src/locales/ar/nodeDefs.json
index 48a557091c..69b49a7df8 100644
--- a/src/locales/ar/nodeDefs.json
+++ b/src/locales/ar/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "الإطار الأخير الذي سيتم استخدامه للفيديو."
       },
       "model": {
-        "name": "النموذج",
-        "tooltip": "اسم النموذج"
+        "name": "النموذج"
       },
       "prompt": {
         "name": "المطالبة النصية",
@@ -248,8 +247,7 @@
         "tooltip": "الصورة الأساسية للتحرير"
       },
       "model": {
-        "name": "النموذج",
-        "tooltip": "اسم النموذج"
+        "name": "النموذج"
       },
       "prompt": {
         "name": "المطالبة النصية",
@@ -286,8 +284,7 @@
         "tooltip": "الارتفاع المخصص للصورة. القيمة تعمل فقط إذا تم ضبط `size_preset` على `Custom`"
       },
       "model": {
-        "name": "النموذج",
-        "tooltip": "اسم النموذج"
+        "name": "النموذج"
       },
       "prompt": {
         "name": "النص الموجه",
@@ -336,8 +333,7 @@
         "tooltip": "من صورة إلى أربع صور."
       },
       "model": {
-        "name": "النموذج",
-        "tooltip": "اسم النموذج"
+        "name": "النموذج"
       },
       "prompt": {
         "name": "prompt",
@@ -386,8 +382,7 @@
         "tooltip": "الإطار الأول الذي سيتم استخدامه للفيديو."
       },
       "model": {
-        "name": "model",
-        "tooltip": "اسم النموذج"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -490,8 +485,7 @@
         "tooltip": "مدة الفيديو الناتج بالثواني."
       },
       "model": {
-        "name": "النموذج",
-        "tooltip": "اسم النموذج"
+        "name": "النموذج"
       },
       "prompt": {
         "name": "النص الموجه",
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 63193b603f..f5254986b6 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -1360,6 +1360,7 @@
     "chroma_radiance": "chroma_radiance",
     "attention_experiments": "attention_experiments",
     "flux": "flux",
+    "kandinsky5": "kandinsky5",
     "hooks": "hooks",
     "combine": "combine",
     "cond single": "cond single",
@@ -2275,4 +2276,4 @@
     "inputsNoneTooltip": "Node has no inputs",
     "nodeState": "Node state"
   }
-}
+}
\ No newline at end of file
diff --git a/src/locales/en/nodeDefs.json b/src/locales/en/nodeDefs.json
index 757e3bef04..f1bcfbbc81 100644
--- a/src/locales/en/nodeDefs.json
+++ b/src/locales/en/nodeDefs.json
@@ -151,6 +151,11 @@
         "name": "volume",
         "tooltip": "Volume adjustment in decibels (dB). 0 = no change, +6 = double, -6 = half, etc"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -167,6 +172,11 @@
         "name": "direction",
         "tooltip": "Whether to append audio2 after or before audio1."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -212,6 +222,11 @@
         "name": "merge_method",
         "tooltip": "The method used to combine the audio waveforms."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -279,8 +294,7 @@
     "description": "Generate video using prompt and first and last frames.",
     "inputs": {
       "model": {
-        "name": "model",
-        "tooltip": "Model name"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -333,8 +347,7 @@
     "description": "Edit images using ByteDance models via api based on prompt",
     "inputs": {
       "model": {
-        "name": "model",
-        "tooltip": "Model name"
+        "name": "model"
       },
       "image": {
         "name": "image",
@@ -371,8 +384,7 @@
     "description": "Generate images using ByteDance models via api based on prompt",
     "inputs": {
       "model": {
-        "name": "model",
-        "tooltip": "Model name"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -417,8 +429,7 @@
     "description": "Generate video using prompt and reference images.",
     "inputs": {
       "model": {
-        "name": "model",
-        "tooltip": "Model name"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -463,8 +474,7 @@
     "description": "Generate video using ByteDance models via api based on image and prompt",
     "inputs": {
       "model": {
-        "name": "model",
-        "tooltip": "Model name"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -571,8 +581,7 @@
     "description": "Generate video using ByteDance models via api based on prompt",
     "inputs": {
       "model": {
-        "name": "model",
-        "tooltip": "Model name"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -1007,6 +1016,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "display_name": "CLIP Text Encode for Lumina2",
     "description": "Encodes a system prompt and a user prompt using a CLIP model into an embedding that can be used to guide the diffusion model towards generating specific images.",
@@ -1453,10 +1481,12 @@
     },
     "outputs": {
       "0": {
-        "name": "positive"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "negative"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -1522,6 +1552,10 @@
       "dim": {
         "name": "dim",
         "tooltip": "The dimension to apply the context windows to."
+      },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "Whether to apply FreeNoise noise shuffling, improves window blending."
       }
     },
     "outputs": {
@@ -1915,6 +1949,11 @@
       "height": {
         "name": "height"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -2072,6 +2111,11 @@
         "name": "channels",
         "tooltip": "Number of audio channels (1 for mono, 2 for stereo)."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -2224,6 +2268,11 @@
         "name": "batch_size",
         "tooltip": "The number of latent images in the batch."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2407,6 +2456,11 @@
       "bottom": {
         "name": "bottom"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2771,6 +2825,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2791,6 +2850,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreSca": {
@@ -2854,6 +2918,10 @@
         "name": "files",
         "tooltip": "Optional file(s) to use as context for the model. Accepts inputs from the Gemini Generate Content Input Files node."
       },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Foundational instructions that dictate an AI's behavior."
+      },
       "control_after_generate": {
         "name": "control after generate"
       }
@@ -2899,6 +2967,10 @@
         "name": "response_modalities",
         "tooltip": "Choose 'IMAGE' for image-only output, or 'IMAGE+TEXT' to return both the generated image and a text response."
       },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Foundational instructions that dictate an AI's behavior."
+      },
       "control_after_generate": {
         "name": "control after generate"
       }
@@ -2963,6 +3035,10 @@
         "name": "files",
         "tooltip": "Optional file(s) to use as context for the model. Accepts inputs from the Gemini Generate Content Input Files node."
       },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Foundational instructions that dictate an AI's behavior."
+      },
       "control_after_generate": {
         "name": "control after generate"
       }
@@ -3074,7 +3150,7 @@
     }
   },
   "GrowMask": {
-    "display_name": "GrowMask",
+    "display_name": "Grow Mask",
     "inputs": {
       "mask": {
         "name": "mask"
@@ -3085,6 +3161,11 @@
       "tapered_corners": {
         "name": "tapered_corners"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -3583,6 +3664,11 @@
       "color": {
         "name": "color"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3606,6 +3692,11 @@
       "mask": {
         "name": "mask"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3933,6 +4024,11 @@
       "channel": {
         "name": "channel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -4042,6 +4138,11 @@
       "mask": {
         "name": "mask"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -4060,6 +4161,53 @@
       }
     }
   },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "positive": {
+        "name": "positive"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "start_image": {
+        "name": "start_image"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Empty video latent"
+      },
+      "3": {
+        "name": "cond_latent",
+        "tooltip": "Clean encoded start images, used to replace the noisy start of the model output latents"
+      }
+    }
+  },
   "KarrasScheduler": {
     "display_name": "KarrasScheduler",
     "inputs": {
@@ -4974,6 +5122,11 @@
       "mask": {
         "name": "mask"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -5255,22 +5408,28 @@
     },
     "outputs": {
       "0": {
-        "name": "image"
+        "name": "image",
+        "tooltip": null
       },
       "1": {
-        "name": "mask"
+        "name": "mask",
+        "tooltip": null
       },
       "2": {
-        "name": "mesh_path"
+        "name": "mesh_path",
+        "tooltip": null
       },
       "3": {
-        "name": "normal"
+        "name": "normal",
+        "tooltip": null
       },
       "4": {
-        "name": "camera_info"
+        "name": "camera_info",
+        "tooltip": null
       },
       "5": {
-        "name": "recording_video"
+        "name": "recording_video",
+        "tooltip": null
       }
     }
   },
@@ -5286,6 +5445,11 @@
       "upload": {
         "name": "choose file to upload"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -6058,10 +6222,15 @@
       "operation": {
         "name": "operation"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
-    "display_name": "MaskPreview",
+    "display_name": "Preview Mask",
     "description": "Saves the input images to your ComfyUI output directory.",
     "inputs": {
       "mask": {
@@ -6075,6 +6244,11 @@
       "mask": {
         "name": "mask"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MergeImageLists": {
@@ -8571,6 +8745,29 @@
       }
     }
   },
+  "NormalizeVideoLatentStart": {
+    "display_name": "NormalizeVideoLatentStart",
+    "description": "Normalizes the initial frames of a video latent to match the mean and standard deviation of subsequent reference frames. Helps reduce differences between the starting frames and the rest of the video.",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "Number of latent frames to normalize, counted from the start"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "Number of latent frames after the start frames to use as reference"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "display_name": "OpenAI ChatGPT Advanced Options",
     "description": "Allows specifying advanced configuration options for the OpenAI Chat Nodes.",
@@ -9771,6 +9968,11 @@
       "audio": {
         "name": "audio"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -10311,6 +10513,28 @@
       }
     }
   },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "ReplaceVideoLatentFrames",
+    "inputs": {
+      "destination": {
+        "name": "destination",
+        "tooltip": "The destination latent where frames will be replaced."
+      },
+      "index": {
+        "name": "index",
+        "tooltip": "The starting latent frame index in the destination latent where the source latent frames will be placed. Negative values count from the end."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "The source latent providing frames to insert into the destination latent. If not provided, the destination latent is returned unchanged."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "RescaleCFG",
     "inputs": {
@@ -11561,6 +11785,11 @@
       "height": {
         "name": "height"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -11573,10 +11802,12 @@
     },
     "outputs": {
       "0": {
-        "name": "left"
+        "name": "left",
+        "tooltip": null
       },
       "1": {
-        "name": "right"
+        "name": "right",
+        "tooltip": null
       }
     }
   },
@@ -12555,6 +12786,11 @@
       "value": {
         "name": "value"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -12806,6 +13042,11 @@
         "name": "duration",
         "tooltip": "Duration in seconds"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -13305,6 +13546,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -13374,6 +13620,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -14146,6 +14397,10 @@
       "fuse_method": {
         "name": "fuse_method",
         "tooltip": "The method to use to fuse the context windows."
+      },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "Whether to apply FreeNoise noise shuffling, improves window blending."
       }
     },
     "outputs": {
diff --git a/src/locales/es/nodeDefs.json b/src/locales/es/nodeDefs.json
index 3d6f3d7366..e565185301 100644
--- a/src/locales/es/nodeDefs.json
+++ b/src/locales/es/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "Último fotograma que se utilizará para el video."
       },
       "model": {
-        "name": "modelo",
-        "tooltip": "Nombre del modelo"
+        "name": "modelo"
       },
       "prompt": {
         "name": "prompt",
@@ -248,8 +247,7 @@
         "tooltip": "La imagen base para editar"
       },
       "model": {
-        "name": "modelo",
-        "tooltip": "Nombre del modelo"
+        "name": "modelo"
       },
       "prompt": {
         "name": "prompt",
@@ -286,8 +284,7 @@
         "tooltip": "Alto personalizado para la imagen. El valor solo funciona si `tamaño_predefinido` está establecido en `Personalizado`"
       },
       "model": {
-        "name": "modelo",
-        "tooltip": "Nombre del modelo"
+        "name": "modelo"
       },
       "prompt": {
         "name": "prompt",
@@ -336,8 +333,7 @@
         "tooltip": "De una a cuatro imágenes."
       },
       "model": {
-        "name": "modelo",
-        "tooltip": "Nombre del modelo"
+        "name": "modelo"
       },
       "prompt": {
         "name": "prompt",
@@ -386,8 +382,7 @@
         "tooltip": "Primer fotograma a usar para el video."
       },
       "model": {
-        "name": "modelo",
-        "tooltip": "Nombre del modelo"
+        "name": "modelo"
       },
       "prompt": {
         "name": "prompt",
@@ -490,8 +485,7 @@
         "tooltip": "La duración del video de salida en segundos."
       },
       "model": {
-        "name": "modelo",
-        "tooltip": "Nombre del modelo"
+        "name": "modelo"
       },
       "prompt": {
         "name": "prompt",
diff --git a/src/locales/fr/nodeDefs.json b/src/locales/fr/nodeDefs.json
index 9f25913845..f7d42539e3 100644
--- a/src/locales/fr/nodeDefs.json
+++ b/src/locales/fr/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "Dernière image à utiliser pour la vidéo."
       },
       "model": {
-        "name": "modèle",
-        "tooltip": "Nom du modèle"
+        "name": "modèle"
       },
       "prompt": {
         "name": "invite",
@@ -248,8 +247,7 @@
         "tooltip": "L'image de base à modifier"
       },
       "model": {
-        "name": "model",
-        "tooltip": "Nom du modèle"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -286,8 +284,7 @@
         "tooltip": "Hauteur personnalisée pour l'image. La valeur fonctionne uniquement si `size_preset` est défini sur `Personnalisé`"
       },
       "model": {
-        "name": "model",
-        "tooltip": "Nom du modèle"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -336,8 +333,7 @@
         "tooltip": "Une à quatre images."
       },
       "model": {
-        "name": "modèle",
-        "tooltip": "Nom du modèle"
+        "name": "modèle"
       },
       "prompt": {
         "name": "prompt",
@@ -386,8 +382,7 @@
         "tooltip": "Première image à utiliser pour la vidéo."
       },
       "model": {
-        "name": "modèle",
-        "tooltip": "Nom du modèle"
+        "name": "modèle"
       },
       "prompt": {
         "name": "prompt",
@@ -490,8 +485,7 @@
         "tooltip": "La durée de la vidéo de sortie en secondes."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Nom du modèle"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
diff --git a/src/locales/ja/nodeDefs.json b/src/locales/ja/nodeDefs.json
index f7be8c63d2..d8805f45ac 100644
--- a/src/locales/ja/nodeDefs.json
+++ b/src/locales/ja/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "動画に使用する最後のフレーム。"
       },
       "model": {
-        "name": "モデル",
-        "tooltip": "モデル名"
+        "name": "モデル"
       },
       "prompt": {
         "name": "プロンプト",
@@ -248,8 +247,7 @@
         "tooltip": "編集するベース画像"
       },
       "model": {
-        "name": "モデル",
-        "tooltip": "モデル名"
+        "name": "モデル"
       },
       "prompt": {
         "name": "プロンプト",
@@ -286,8 +284,7 @@
         "tooltip": "画像のカスタム高さ。`size_preset`が`Custom`に設定されている場合のみ有効"
       },
       "model": {
-        "name": "モデル",
-        "tooltip": "モデル名"
+        "name": "モデル"
       },
       "prompt": {
         "name": "プロンプト",
@@ -336,8 +333,7 @@
         "tooltip": "1〜4枚の画像"
       },
       "model": {
-        "name": "モデル",
-        "tooltip": "モデル名"
+        "name": "モデル"
       },
       "prompt": {
         "name": "プロンプト",
@@ -386,8 +382,7 @@
         "tooltip": "動画の最初のフレームとして使用する画像。"
       },
       "model": {
-        "name": "model",
-        "tooltip": "モデル名"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -490,8 +485,7 @@
         "tooltip": "出力動画の長さ（秒単位）。"
       },
       "model": {
-        "name": "モデル",
-        "tooltip": "モデル名"
+        "name": "モデル"
       },
       "prompt": {
         "name": "プロンプト",
diff --git a/src/locales/ko/nodeDefs.json b/src/locales/ko/nodeDefs.json
index 1bb55aae74..2379ed100d 100644
--- a/src/locales/ko/nodeDefs.json
+++ b/src/locales/ko/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "비디오에 사용될 마지막 프레임입니다."
       },
       "model": {
-        "name": "model",
-        "tooltip": "모델 이름"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -248,8 +247,7 @@
         "tooltip": "편집할 기본 이미지"
       },
       "model": {
-        "name": "모델",
-        "tooltip": "모델 이름"
+        "name": "모델"
       },
       "prompt": {
         "name": "프롬프트",
@@ -286,8 +284,7 @@
         "tooltip": "이미지의 사용자 지정 높이. `size_preset`이 `Custom`으로 설정된 경우에만 값이 적용됨"
       },
       "model": {
-        "name": "모델",
-        "tooltip": "모델 이름"
+        "name": "모델"
       },
       "prompt": {
         "name": "프롬프트",
@@ -336,8 +333,7 @@
         "tooltip": "1개에서 4개의 이미지"
       },
       "model": {
-        "name": "모델",
-        "tooltip": "모델 이름"
+        "name": "모델"
       },
       "prompt": {
         "name": "프롬프트",
@@ -386,8 +382,7 @@
         "tooltip": "비디오에 사용할 첫 번째 프레임입니다."
       },
       "model": {
-        "name": "모델",
-        "tooltip": "모델 이름"
+        "name": "모델"
       },
       "prompt": {
         "name": "프롬프트",
@@ -490,8 +485,7 @@
         "tooltip": "출력 비디오의 지속 시간(초)입니다."
       },
       "model": {
-        "name": "model",
-        "tooltip": "모델 이름"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
diff --git a/src/locales/ru/nodeDefs.json b/src/locales/ru/nodeDefs.json
index 17737c971b..2e1c5ffed7 100644
--- a/src/locales/ru/nodeDefs.json
+++ b/src/locales/ru/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "Последний кадр, который будет использоваться для видео."
       },
       "model": {
-        "name": "модель",
-        "tooltip": "Название модели"
+        "name": "модель"
       },
       "prompt": {
         "name": "промпт",
@@ -248,8 +247,7 @@
         "tooltip": "Базовое изображение для редактирования"
       },
       "model": {
-        "name": "model",
-        "tooltip": "Название модели"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -286,8 +284,7 @@
         "tooltip": "Пользовательская высота изображения. Значение работает только если `размер_пресет` установлен в `Пользовательский`"
       },
       "model": {
-        "name": "model",
-        "tooltip": "Название модели"
+        "name": "model"
       },
       "prompt": {
         "name": "промпт",
@@ -336,8 +333,7 @@
         "tooltip": "От одного до четырёх изображений."
       },
       "model": {
-        "name": "модель",
-        "tooltip": "Название модели"
+        "name": "модель"
       },
       "prompt": {
         "name": "промпт",
@@ -386,8 +382,7 @@
         "tooltip": "Первый кадр, который будет использоваться для видео."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Название модели"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -490,8 +485,7 @@
         "tooltip": "Длительность выходного видео в секундах."
       },
       "model": {
-        "name": "модель",
-        "tooltip": "Название модели"
+        "name": "модель"
       },
       "prompt": {
         "name": "промпт",
diff --git a/src/locales/tr/nodeDefs.json b/src/locales/tr/nodeDefs.json
index a8ddbb9c33..f89c0977d2 100644
--- a/src/locales/tr/nodeDefs.json
+++ b/src/locales/tr/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "Video için kullanılacak son kare."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Model adı"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -248,8 +247,7 @@
         "tooltip": "Düzenlenecek temel görüntü"
       },
       "model": {
-        "name": "model",
-        "tooltip": "Model adı"
+        "name": "model"
       },
       "prompt": {
         "name": "istek",
@@ -286,8 +284,7 @@
         "tooltip": "Görsel için özel yükseklik. Bu değer yalnızca `size_preset` `Custom` olarak ayarlandığında çalışır"
       },
       "model": {
-        "name": "model",
-        "tooltip": "Model adı"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -336,8 +333,7 @@
         "tooltip": "Bir ila dört görsel."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Model adı"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -386,8 +382,7 @@
         "tooltip": "Video için kullanılacak ilk kare."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Model adı"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -490,8 +485,7 @@
         "tooltip": "Çıktı videosunun saniye cinsinden süresi."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Model adı"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
diff --git a/src/locales/zh-TW/nodeDefs.json b/src/locales/zh-TW/nodeDefs.json
index 4522e9cbe3..405a04c65d 100644
--- a/src/locales/zh-TW/nodeDefs.json
+++ b/src/locales/zh-TW/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "用於影片的尾幀。"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名稱"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示詞",
@@ -248,8 +247,7 @@
         "tooltip": "要編輯的基礎圖片"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名稱"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示詞",
@@ -286,8 +284,7 @@
         "tooltip": "圖像的自訂高度。僅在 `size_preset` 設為 `Custom` 時生效"
       },
       "model": {
-        "name": "model",
-        "tooltip": "模型名稱"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -336,8 +333,7 @@
         "tooltip": "一至四張圖片。"
       },
       "model": {
-        "name": "model",
-        "tooltip": "模型名稱"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -386,8 +382,7 @@
         "tooltip": "用於影片的第一幀圖片。"
       },
       "model": {
-        "name": "model",
-        "tooltip": "模型名稱"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -490,8 +485,7 @@
         "tooltip": "輸出影片的持續時間（秒）。"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名稱"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示詞",
diff --git a/src/locales/zh/nodeDefs.json b/src/locales/zh/nodeDefs.json
index 416f5d892c..8606adb1de 100644
--- a/src/locales/zh/nodeDefs.json
+++ b/src/locales/zh/nodeDefs.json
@@ -206,8 +206,7 @@
         "tooltip": "用于视频的最后一帧。"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示",
@@ -248,8 +247,7 @@
         "tooltip": "要编辑的基础图像"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示",
@@ -286,8 +284,7 @@
         "tooltip": "图像的自定义高度。仅当 `size_preset` 设置为 `Custom` 时该值才生效"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示",
@@ -336,8 +333,7 @@
         "tooltip": "一到四张图片。"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示",
@@ -386,8 +382,7 @@
         "tooltip": "用于视频的第一帧。"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示",
@@ -490,8 +485,7 @@
         "tooltip": "输出视频的时长（秒）。"
       },
       "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
+        "name": "模型"
       },
       "prompt": {
         "name": "提示",
diff --git a/src/platform/assets/components/UploadModelConfirmation.vue b/src/platform/assets/components/UploadModelConfirmation.vue
index 4a0b8edc5e..5f203fc514 100644
--- a/src/platform/assets/components/UploadModelConfirmation.vue
+++ b/src/platform/assets/components/UploadModelConfirmation.vue
@@ -5,10 +5,8 @@
       <p class="m-0">
         {{ $t('assetBrowser.modelAssociatedWithLink') }}
       </p>
-      <p
-        class="mt-0 bg-modal-card-background text-base-foreground p-3 rounded-lg"
-      >
-        {{ metadata?.name || metadata?.filename }}
+      <p class="mt-0 text-base-foreground rounded-lg">
+        {{ metadata?.filename || metadata?.name }}
       </p>
     </div>
 
diff --git a/src/platform/assets/components/UploadModelProgress.vue b/src/platform/assets/components/UploadModelProgress.vue
index 15b837e0aa..6dadf7cd08 100644
--- a/src/platform/assets/components/UploadModelProgress.vue
+++ b/src/platform/assets/components/UploadModelProgress.vue
@@ -29,7 +29,7 @@
       >
         <div class="flex flex-col justify-center items-start gap-1 flex-1">
           <p class="text-base-foreground m-0">
-            {{ metadata?.name || metadata?.filename }}
+            {{ metadata?.filename || metadata?.name }}
           </p>
           <p class="text-sm text-muted m-0">
             <!-- Going to want to add another translation here to get a nice display name. -->
diff --git a/src/platform/assets/composables/useUploadModelWizard.ts b/src/platform/assets/composables/useUploadModelWizard.ts
index b02f876c74..e75daea4b6 100644
--- a/src/platform/assets/composables/useUploadModelWizard.ts
+++ b/src/platform/assets/composables/useUploadModelWizard.ts
@@ -4,6 +4,8 @@ import { computed, ref, watch } from 'vue'
 import { st } from '@/i18n'
 import type { AssetMetadata } from '@/platform/assets/schemas/assetSchema'
 import { assetService } from '@/platform/assets/services/assetService'
+import { useAssetsStore } from '@/stores/assetsStore'
+import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 
 interface WizardData {
   url: string
@@ -18,6 +20,8 @@ interface ModelTypeOption {
 }
 
 export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
+  const assetsStore = useAssetsStore()
+  const modelToNodeStore = useModelToNodeStore()
   const currentStep = ref(1)
   const isFetchingMetadata = ref(false)
   const isUploading = ref(false)
@@ -143,6 +147,19 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
 
       uploadStatus.value = 'success'
       currentStep.value = 3
+
+      // Refresh model caches for all node types that use this model category
+      if (selectedModelType.value) {
+        const providers = modelToNodeStore.getAllNodeProviders(
+          selectedModelType.value
+        )
+        await Promise.all(
+          providers.map((provider) =>
+            assetsStore.updateModelsForNodeType(provider.nodeDef.name)
+          )
+        )
+      }
+
       return true
     } catch (error) {
       console.error('Failed to upload asset:', error)
diff --git a/src/platform/assets/utils/createModelNodeFromAsset.ts b/src/platform/assets/utils/createModelNodeFromAsset.ts
index bc9869739d..b180a0a5da 100644
--- a/src/platform/assets/utils/createModelNodeFromAsset.ts
+++ b/src/platform/assets/utils/createModelNodeFromAsset.ts
@@ -199,8 +199,11 @@ export function createModelNodeFromAsset(
     }
   }
 
-  targetGraph.add(node)
+  // Set widget value BEFORE adding to graph so the node is created with correct value
   widget.value = filename
 
+  // Now add the node to the graph with the correct widget value already set
+  targetGraph.add(node)
+
   return { success: true, value: node }
 }
diff --git a/src/renderer/core/layout/store/layoutStore.ts b/src/renderer/core/layout/store/layoutStore.ts
index b6e139e6bc..786be06256 100644
--- a/src/renderer/core/layout/store/layoutStore.ts
+++ b/src/renderer/core/layout/store/layoutStore.ts
@@ -956,6 +956,15 @@ class LayoutStoreImpl implements LayoutStore {
     return this.currentActor
   }
 
+  /**
+   * Clean up refs and triggers for a node when its Vue component unmounts.
+   * This should be called from the component's onUnmounted hook.
+   */
+  cleanupNodeRef(nodeId: NodeId): void {
+    this.nodeRefs.delete(nodeId)
+    this.nodeTriggers.delete(nodeId)
+  }
+
   /**
    * Initialize store with existing nodes
    */
@@ -964,8 +973,10 @@ class LayoutStoreImpl implements LayoutStore {
   ): void {
     this.ydoc.transact(() => {
       this.ynodes.clear()
-      this.nodeRefs.clear()
-      this.nodeTriggers.clear()
+      // Note: We intentionally do NOT clear nodeRefs and nodeTriggers here.
+      // Vue components may already hold references to these refs, and clearing
+      // them would break the reactivity chain. The refs will be reused when
+      // nodes are recreated, and stale refs will be cleaned up over time.
       this.spatialIndex.clear()
       this.linkSegmentSpatialIndex.clear()
       this.slotSpatialIndex.clear()
@@ -995,6 +1006,9 @@ class LayoutStoreImpl implements LayoutStore {
         // Add to spatial index
         this.spatialIndex.insert(layout.id, layout.bounds)
       })
+
+      // Trigger all existing refs to notify Vue of the new data
+      this.nodeTriggers.forEach((trigger) => trigger())
     }, 'initialization')
   }
 
@@ -1085,8 +1099,10 @@ class LayoutStoreImpl implements LayoutStore {
     if (!this.ynodes.has(operation.nodeId)) return
 
     this.ynodes.delete(operation.nodeId)
-    this.nodeRefs.delete(operation.nodeId)
-    this.nodeTriggers.delete(operation.nodeId)
+    // Note: We intentionally do NOT delete nodeRefs and nodeTriggers here.
+    // During undo/redo, Vue components may still hold references to the old ref.
+    // If we delete the trigger, Vue won't be notified when the node is re-created.
+    // The trigger will be called in finalizeOperation to notify Vue of the change.
 
     // Remove from spatial index
     this.spatialIndex.remove(operation.nodeId)
diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.test.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.test.ts
new file mode 100644
index 0000000000..fa2d16045d
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.test.ts
@@ -0,0 +1,116 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import { resolvePointerTarget } from '@/renderer/extensions/vueNodes/composables/useSlotLinkInteraction'
+
+describe('resolvePointerTarget', () => {
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('returns element from elementFromPoint when available', () => {
+    const targetElement = document.createElement('div')
+    targetElement.className = 'lg-slot'
+
+    const spy = vi
+      .spyOn(document, 'elementFromPoint')
+      .mockReturnValue(targetElement)
+
+    const fallback = document.createElement('span')
+    const result = resolvePointerTarget(100, 200, fallback)
+
+    expect(spy).toHaveBeenCalledWith(100, 200)
+    expect(result).toBe(targetElement)
+  })
+
+  it('returns fallback when elementFromPoint returns null', () => {
+    const spy = vi.spyOn(document, 'elementFromPoint').mockReturnValue(null)
+
+    const fallback = document.createElement('span')
+    fallback.className = 'fallback-element'
+
+    const result = resolvePointerTarget(100, 200, fallback)
+
+    expect(spy).toHaveBeenCalledWith(100, 200)
+    expect(result).toBe(fallback)
+  })
+
+  it('returns null fallback when both elementFromPoint and fallback are null', () => {
+    vi.spyOn(document, 'elementFromPoint').mockReturnValue(null)
+
+    const result = resolvePointerTarget(100, 200, null)
+
+    expect(result).toBeNull()
+  })
+
+  describe('touch/mobile pointer capture simulation', () => {
+    it('resolves correct target when touch moves over different element', () => {
+      // Simulate the touch scenario:
+      // - User touches slot A (event.target = slotA)
+      // - User drags over slot B (elementFromPoint returns slotB)
+      // - resolvePointerTarget should return slotB, not slotA
+
+      const slotA = document.createElement('div')
+      slotA.className = 'lg-slot slot-a'
+      slotA.setAttribute('data-slot-key', 'node1-0-input')
+
+      const slotB = document.createElement('div')
+      slotB.className = 'lg-slot slot-b'
+      slotB.setAttribute('data-slot-key', 'node2-0-input')
+
+      // When pointer is over slotB, elementFromPoint returns slotB
+      vi.spyOn(document, 'elementFromPoint').mockReturnValue(slotB)
+
+      // But the fallback (event.target on touch) is still slotA
+      const result = resolvePointerTarget(150, 250, slotA)
+
+      // Should return slotB (the actual element under pointer), not slotA
+      expect(result).toBe(slotB)
+      expect(result).not.toBe(slotA)
+    })
+
+    it('falls back to original target when pointer is outside viewport', () => {
+      // When pointer is outside the document (e.g., dragged off screen),
+      // elementFromPoint returns null
+
+      const slotA = document.createElement('div')
+      slotA.className = 'lg-slot slot-a'
+
+      vi.spyOn(document, 'elementFromPoint').mockReturnValue(null)
+
+      const result = resolvePointerTarget(-100, -100, slotA)
+
+      // Should fall back to the original target
+      expect(result).toBe(slotA)
+    })
+  })
+
+  describe('integration with slot detection', () => {
+    it('returned element can be used with closest() for slot detection', () => {
+      // Create a nested structure like the real DOM
+      const nodeContainer = document.createElement('div')
+      nodeContainer.setAttribute('data-node-id', 'node123')
+
+      const slotWrapper = document.createElement('div')
+      slotWrapper.className = 'lg-slot'
+
+      const slotDot = document.createElement('div')
+      slotDot.className = 'slot-dot'
+      slotDot.setAttribute('data-slot-key', 'node123-0-input')
+
+      slotWrapper.appendChild(slotDot)
+      nodeContainer.appendChild(slotWrapper)
+
+      // elementFromPoint returns the innermost element (slot dot)
+      vi.spyOn(document, 'elementFromPoint').mockReturnValue(slotDot)
+
+      const result = resolvePointerTarget(100, 100, null)
+
+      // Verify we can use closest() to find parent slot and node
+      expect(result).toBeInstanceOf(HTMLElement)
+      const htmlResult = result as HTMLElement
+      expect(htmlResult.closest('.lg-slot')).toBe(slotWrapper)
+      expect(htmlResult.closest('[data-node-id]')).toBe(nodeContainer)
+      expect(htmlResult.getAttribute('data-slot-key')).toBe('node123-0-input')
+    })
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts
index a7e5f1a67c..6e11902d80 100644
--- a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts
+++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts
@@ -85,6 +85,28 @@ function createPointerSession(): PointerSession {
   return { begin, register, matches, isActive, clear }
 }
 
+/**
+ * Resolves the actual DOM element under the pointer position.
+ *
+ * On touch/mobile devices, pointer events have "implicit pointer capture" -
+ * event.target stays as the element where the touch started, not the element
+ * currently under the pointer. This helper uses document.elementFromPoint()
+ * to get the actual element under the pointer, falling back to the provided
+ * fallback target if elementFromPoint returns null.
+ *
+ * @param clientX - The client X coordinate of the pointer
+ * @param clientY - The client Y coordinate of the pointer
+ * @param fallback - Fallback target to use if elementFromPoint returns null
+ * @returns The resolved target element
+ */
+export function resolvePointerTarget(
+  clientX: number,
+  clientY: number,
+  fallback: EventTarget | null
+): EventTarget | null {
+  return document.elementFromPoint(clientX, clientY) ?? fallback
+}
+
 export function useSlotLinkInteraction({
   nodeId,
   index,
@@ -299,7 +321,7 @@ export function useSlotLinkInteraction({
 
     let hoveredSlotKey: string | null = null
     let hoveredNodeId: NodeId | null = null
-    const target = data.target
+    const target = resolvePointerTarget(data.clientX, data.clientY, data.target)
     if (target === dragContext.lastPointerEventTarget) {
       hoveredSlotKey = dragContext.lastPointerTargetSlotKey
       hoveredNodeId = dragContext.lastPointerTargetNodeId
@@ -501,9 +523,14 @@ export function useSlotLinkInteraction({
       ? state.candidate
       : null
 
-    const hasConnected = connectByPriority(canvasEvent.target, snappedCandidate)
+    const dropTarget = resolvePointerTarget(
+      event.clientX,
+      event.clientY,
+      canvasEvent.target
+    )
+    const hasConnected = connectByPriority(dropTarget, snappedCandidate)
 
-    if (!hasConnected && event.target === app.canvas?.canvas) {
+    if (!hasConnected && dropTarget === app.canvas?.canvas) {
       activeAdapter?.dropOnCanvas(canvasEvent)
     }
 
diff --git a/src/renderer/extensions/vueNodes/layout/useNodeLayout.ts b/src/renderer/extensions/vueNodes/layout/useNodeLayout.ts
index db1ce71e72..3e1341cd85 100644
--- a/src/renderer/extensions/vueNodes/layout/useNodeLayout.ts
+++ b/src/renderer/extensions/vueNodes/layout/useNodeLayout.ts
@@ -1,4 +1,4 @@
-import { computed, toValue } from 'vue'
+import { computed, onUnmounted, toValue } from 'vue'
 import type { MaybeRefOrGetter } from 'vue'
 
 import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
@@ -17,6 +17,11 @@ export function useNodeLayout(nodeIdMaybe: MaybeRefOrGetter<string>) {
   // Get the customRef for this node (shared write access)
   const layoutRef = layoutStore.getNodeLayoutRef(nodeId)
 
+  // Clean up refs and triggers when Vue component unmounts
+  onUnmounted(() => {
+    layoutStore.cleanupNodeRef(nodeId)
+  })
+
   // Computed properties for easy access
   const position = computed(() => {
     const layout = layoutRef.value
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
index df3381f534..f029f0fcd7 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
@@ -4,6 +4,7 @@
       v-model="modelValue"
       :invalid
       :filter="selectOptions.length > 4"
+      :auto-filter-focus="selectOptions.length > 4"
       :options="selectOptions"
       v-bind="combinedProps"
       :class="cn(WidgetInputBaseClass, 'w-full text-xs')"
diff --git a/src/services/litegraphService.ts b/src/services/litegraphService.ts
index 71750ccfe4..7cc451c032 100644
--- a/src/services/litegraphService.ts
+++ b/src/services/litegraphService.ts
@@ -119,11 +119,6 @@ export const useLitegraphService = () => {
         return { color: '#0f0' }
       }
     }
-    node.strokeStyles['nodeError'] = function (this: LGraphNode) {
-      if (app.lastNodeErrors?.[this.id]?.errors) {
-        return { color: 'red' }
-      }
-    }
     node.strokeStyles['dragOver'] = function (this: LGraphNode) {
       if (app.dragOverNode?.id == this.id) {
         return { color: 'dodgerblue' }
diff --git a/src/stores/executionStore.ts b/src/stores/executionStore.ts
index 8541d56362..eabce26132 100644
--- a/src/stores/executionStore.ts
+++ b/src/stores/executionStore.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 import { useNodeProgressText } from '@/composables/node/useNodeProgressText'
 import type { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
@@ -32,6 +32,7 @@ import { app } from '@/scripts/app'
 import { useNodeOutputStore } from '@/stores/imagePreviewStore'
 import type { NodeLocatorId } from '@/types/nodeIdentification'
 import { createNodeLocatorId } from '@/types/nodeIdentification'
+import { forEachNode, getNodeByExecutionId } from '@/utils/graphTraversalUtil'
 
 interface QueuedPrompt {
   /**
@@ -534,6 +535,97 @@ export const useExecutionStore = defineStore('execution', () => {
     () => runningPromptIds.value.length
   )
 
+  /** Map of node errors indexed by locator ID. */
+  const nodeErrorsByLocatorId = computed<Record<NodeLocatorId, NodeError>>(
+    () => {
+      if (!lastNodeErrors.value) return {}
+
+      const map: Record<NodeLocatorId, NodeError> = {}
+
+      for (const [executionId, nodeError] of Object.entries(
+        lastNodeErrors.value
+      )) {
+        const locatorId = executionIdToNodeLocatorId(executionId)
+        if (locatorId) {
+          map[locatorId] = nodeError
+        }
+      }
+
+      return map
+    }
+  )
+
+  /** Get node errors by locator ID. */
+  const getNodeErrors = (
+    nodeLocatorId: NodeLocatorId
+  ): NodeError | undefined => {
+    return nodeErrorsByLocatorId.value[nodeLocatorId]
+  }
+
+  /** Check if a specific slot has validation errors. */
+  const slotHasError = (
+    nodeLocatorId: NodeLocatorId,
+    slotName: string
+  ): boolean => {
+    const nodeError = getNodeErrors(nodeLocatorId)
+    if (!nodeError) return false
+
+    return nodeError.errors.some((e) => e.extra_info?.input_name === slotName)
+  }
+
+  /**
+   * Update node and slot error flags when validation errors change.
+   * Propagates errors up subgraph chains.
+   */
+  watch(lastNodeErrors, () => {
+    if (!app.graph || !app.graph.nodes) return
+
+    // Clear all error flags
+    forEachNode(app.graph, (node) => {
+      node.has_errors = false
+      if (node.inputs) {
+        for (const slot of node.inputs) {
+          slot.hasErrors = false
+        }
+      }
+    })
+
+    if (!lastNodeErrors.value) return
+
+    // Set error flags on nodes and slots
+    for (const [executionId, nodeError] of Object.entries(
+      lastNodeErrors.value
+    )) {
+      const node = getNodeByExecutionId(app.graph, executionId)
+      if (!node) continue
+
+      node.has_errors = true
+
+      // Mark input slots with errors
+      if (node.inputs) {
+        for (const error of nodeError.errors) {
+          const slotName = error.extra_info?.input_name
+          if (!slotName) continue
+
+          const slot = node.inputs.find((s) => s.name === slotName)
+          if (slot) {
+            slot.hasErrors = true
+          }
+        }
+      }
+
+      // Propagate errors to parent subgraph nodes
+      const parts = executionId.split(':')
+      for (let i = parts.length - 1; i > 0; i--) {
+        const parentExecutionId = parts.slice(0, i).join(':')
+        const parentNode = getNodeByExecutionId(app.graph, parentExecutionId)
+        if (parentNode) {
+          parentNode.has_errors = true
+        }
+      }
+    }
+  })
+
   return {
     isIdle,
     clientId,
@@ -567,6 +659,9 @@ export const useExecutionStore = defineStore('execution', () => {
     // NodeLocatorId conversion helpers
     executionIdToNodeLocatorId,
     nodeLocatorIdToExecutionId,
-    promptIdToWorkflowId
+    promptIdToWorkflowId,
+    // Node error lookup helpers
+    getNodeErrors,
+    slotHasError
   }
 })
diff --git a/src/utils/mathUtil.ts b/src/utils/mathUtil.ts
index 8655451c5a..4dad40df54 100644
--- a/src/utils/mathUtil.ts
+++ b/src/utils/mathUtil.ts
@@ -2,14 +2,38 @@ import type { ReadOnlyRect } from '@/lib/litegraph/src/interfaces'
 import type { Bounds } from '@/renderer/core/layout/types'
 
 /**
- * Finds the greatest common divisor (GCD) for two numbers.
+ * Finds the greatest common divisor (GCD) for two numbers using iterative
+ * Euclidean algorithm. Uses iteration instead of recursion to avoid stack
+ * overflow with large inputs or small floating-point step values.
+ *
+ * For floating-point numbers, uses a tolerance-based approach to handle
+ * precision issues and limits iterations to prevent hangs.
  *
  * @param a - The first number.
  * @param b - The second number.
  * @returns The GCD of the two numbers.
  */
 export const gcd = (a: number, b: number): number => {
-  return b === 0 ? a : gcd(b, a % b)
+  // Use absolute values to handle negative numbers
+  let x = Math.abs(a)
+  let y = Math.abs(b)
+
+  // Handle edge cases
+  if (x === 0) return y
+  if (y === 0) return x
+
+  // For floating-point numbers, use tolerance-based comparison
+  // This prevents infinite loops due to floating-point precision issues
+  const epsilon = 1e-10
+  const maxIterations = 100
+
+  let iterations = 0
+  while (y > epsilon && iterations < maxIterations) {
+    ;[x, y] = [y, x % y]
+    iterations++
+  }
+
+  return x
 }
 
 /**
diff --git a/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts b/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts
index 9570765261..072a0fb4c3 100644
--- a/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts
+++ b/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts
@@ -1,15 +1,20 @@
 // TODO: Fix these tests after migration
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { LinkConnector } from '@/lib/litegraph/src/litegraph'
-import { MovingOutputLink } from '@/lib/litegraph/src/litegraph'
-import { ToOutputRenderLink } from '@/lib/litegraph/src/litegraph'
-import { LGraphNode, LLink } from '@/lib/litegraph/src/litegraph'
+import {
+  LinkConnector,
+  MovingOutputLink,
+  ToOutputRenderLink,
+  LGraphNode,
+  LLink
+} from '@/lib/litegraph/src/litegraph'
+import { ToInputFromIoNodeLink } from '@/lib/litegraph/src/canvas/ToInputFromIoNodeLink'
 import type { NodeInputSlot } from '@/lib/litegraph/src/litegraph'
+import { LinkDirection } from '@/lib/litegraph/src/types/globalEnums'
 
 import { createTestSubgraph } from '../subgraph/fixtures/subgraphHelpers'
 
-describe.skip('LinkConnector SubgraphInput connection validation', () => {
+describe('LinkConnector SubgraphInput connection validation', () => {
   let connector: LinkConnector
   const mockSetConnectingLinks = vi.fn()
 
@@ -17,8 +22,50 @@ describe.skip('LinkConnector SubgraphInput connection validation', () => {
     connector = new LinkConnector(mockSetConnectingLinks)
     vi.clearAllMocks()
   })
+  describe('Link disconnection validation', () => {
+    it('should properly cleanup a moved input link', () => {
+      const subgraph = createTestSubgraph({
+        inputs: [{ name: 'number_input', type: 'number' }]
+      })
 
-  describe.skip('MovingOutputLink validation', () => {
+      const fromTargetNode = new LGraphNode('TargetNode')
+      fromTargetNode.addInput('number_in', 'number')
+      subgraph.add(fromTargetNode)
+
+      const toTargetNode = new LGraphNode('TargetNode')
+      toTargetNode.addInput('number_in', 'number')
+      subgraph.add(toTargetNode)
+
+      const startLink = subgraph.inputNode.slots[0].connect(
+        fromTargetNode.inputs[0],
+        fromTargetNode
+      )
+
+      fromTargetNode.onConnectionsChange = vi.fn()
+      toTargetNode.onConnectionsChange = vi.fn()
+
+      const renderLink = new ToInputFromIoNodeLink(
+        subgraph,
+        subgraph.inputNode,
+        subgraph.inputNode.slots[0],
+        undefined,
+        LinkDirection.CENTER,
+        startLink
+      )
+      renderLink.connectToInput(
+        toTargetNode,
+        toTargetNode.inputs[0],
+        connector.events
+      )
+
+      expect(fromTargetNode.inputs[0].link).toBeNull()
+      expect(toTargetNode.inputs[0].link).not.toBeNull()
+      expect(toTargetNode.onConnectionsChange).toHaveBeenCalledTimes(1)
+      expect(fromTargetNode.onConnectionsChange).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('MovingOutputLink validation', () => {
     it('should implement canConnectToSubgraphInput method', () => {
       const subgraph = createTestSubgraph({
         inputs: [{ name: 'number_input', type: 'number' }]
@@ -113,7 +160,7 @@ describe.skip('LinkConnector SubgraphInput connection validation', () => {
     })
   })
 
-  describe.skip('ToOutputRenderLink validation', () => {
+  describe('ToOutputRenderLink validation', () => {
     it('should implement canConnectToSubgraphInput method', () => {
       // Create a minimal valid setup
       const subgraph = createTestSubgraph()
@@ -130,7 +177,7 @@ describe.skip('LinkConnector SubgraphInput connection validation', () => {
     })
   })
 
-  describe.skip('dropOnIoNode validation', () => {
+  describe('dropOnIoNode validation', () => {
     it('should prevent invalid connections when dropping on SubgraphInputNode', () => {
       const subgraph = createTestSubgraph({
         inputs: [{ name: 'number_input', type: 'number' }]
@@ -232,7 +279,7 @@ describe.skip('LinkConnector SubgraphInput connection validation', () => {
     })
   })
 
-  describe.skip('isSubgraphInputValidDrop', () => {
+  describe('isSubgraphInputValidDrop', () => {
     it('should check if render links can connect to SubgraphInput', () => {
       const subgraph = createTestSubgraph({
         inputs: [{ name: 'number_input', type: 'number' }]
diff --git a/tests-ui/tests/litegraph/core/LGraphNode.test.ts b/tests-ui/tests/litegraph/core/LGraphNode.test.ts
index be2828ec8e..a08a228f20 100644
--- a/tests-ui/tests/litegraph/core/LGraphNode.test.ts
+++ b/tests-ui/tests/litegraph/core/LGraphNode.test.ts
@@ -1,11 +1,17 @@
 import { afterEach, beforeEach, describe, expect, vi } from 'vitest'
 
-import type { INodeInputSlot, Point } from '@/lib/litegraph/src/litegraph'
-import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
-import { LGraph } from '@/lib/litegraph/src/litegraph'
-import { NodeInputSlot } from '@/lib/litegraph/src/litegraph'
-import { NodeOutputSlot } from '@/lib/litegraph/src/litegraph'
-import type { ISerialisedNode } from '@/lib/litegraph/src/litegraph'
+import type {
+  INodeInputSlot,
+  Point,
+  ISerialisedNode
+} from '@/lib/litegraph/src/litegraph'
+import {
+  LGraphNode,
+  LiteGraph,
+  LGraph,
+  NodeInputSlot,
+  NodeOutputSlot
+} from '@/lib/litegraph/src/litegraph'
 
 import { test } from './fixtures/testExtensions'
 
@@ -261,6 +267,34 @@ describe('LGraphNode', () => {
     })
   })
 
+  describe('Applies correct link type on connection', () => {
+    it.for<[string, string, string]>([
+      ['IMAGE', 'IMAGE', 'IMAGE'],
+      ['*', 'IMAGE', 'IMAGE'],
+      ['IMAGE', '*', 'IMAGE'],
+      ['*', '*', '*'],
+      ['IMAGE,MASK', 'IMAGE,LATENT', 'IMAGE'],
+      //An invalid connection should use input type
+      ['Mask', 'IMAGE', 'IMAGE']
+    ])(
+      'Link from %s to %s should have type %s',
+      ([output, input, expected]) => {
+        const target = new LGraphNode('target')
+        const source = new LGraphNode('source')
+        const graph = new LGraph()
+
+        target.addInput('input', input)
+        source.addOutput('output', output)
+
+        graph.add(source)
+        graph.add(target)
+
+        const link = source.connect(0, target, 0)
+        expect(link?.type).toBe(expected)
+      }
+    )
+  })
+
   describe('getInputPos and getOutputPos', () => {
     test('should handle collapsed nodes correctly', () => {
       const node = new LGraphNode('TestNode') as unknown as Omit<
diff --git a/tests-ui/tests/store/executionStore.test.ts b/tests-ui/tests/store/executionStore.test.ts
index 8124979f38..3c56059a71 100644
--- a/tests-ui/tests/store/executionStore.test.ts
+++ b/tests-ui/tests/store/executionStore.test.ts
@@ -129,3 +129,170 @@ describe('useExecutionStore - NodeLocatorId conversions', () => {
     })
   })
 })
+
+describe('useExecutionStore - Node Error Lookups', () => {
+  let store: ReturnType<typeof useExecutionStore>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createPinia())
+    store = useExecutionStore()
+  })
+
+  describe('getNodeErrors', () => {
+    it('should return undefined when no errors exist', () => {
+      const result = store.getNodeErrors('123')
+      expect(result).toBeUndefined()
+    })
+
+    it('should return node error by locator ID for root graph node', () => {
+      store.lastNodeErrors = {
+        '123': {
+          errors: [
+            {
+              type: 'validation_error',
+              message: 'Invalid input',
+              details: 'Width must be positive',
+              extra_info: { input_name: 'width' }
+            }
+          ],
+          class_type: 'TestNode',
+          dependent_outputs: []
+        }
+      }
+
+      const result = store.getNodeErrors('123')
+      expect(result).toBeDefined()
+      expect(result?.errors).toHaveLength(1)
+      expect(result?.errors[0].message).toBe('Invalid input')
+    })
+
+    it('should return node error by locator ID for subgraph node', () => {
+      const subgraphUuid = 'a1b2c3d4-e5f6-7890-abcd-ef1234567890'
+      const mockSubgraph = {
+        id: subgraphUuid,
+        _nodes: []
+      }
+
+      const mockNode = {
+        id: 123,
+        isSubgraphNode: () => true,
+        subgraph: mockSubgraph
+      } as any
+
+      vi.mocked(app.graph.getNodeById).mockReturnValue(mockNode)
+
+      store.lastNodeErrors = {
+        '123:456': {
+          errors: [
+            {
+              type: 'validation_error',
+              message: 'Invalid subgraph input',
+              details: 'Missing required input',
+              extra_info: { input_name: 'image' }
+            }
+          ],
+          class_type: 'SubgraphNode',
+          dependent_outputs: []
+        }
+      }
+
+      const locatorId = `${subgraphUuid}:456`
+      const result = store.getNodeErrors(locatorId)
+      expect(result).toBeDefined()
+      expect(result?.errors[0].message).toBe('Invalid subgraph input')
+    })
+  })
+
+  describe('slotHasError', () => {
+    it('should return false when node has no errors', () => {
+      const result = store.slotHasError('123', 'width')
+      expect(result).toBe(false)
+    })
+
+    it('should return false when node has errors but slot is not mentioned', () => {
+      store.lastNodeErrors = {
+        '123': {
+          errors: [
+            {
+              type: 'validation_error',
+              message: 'Invalid input',
+              details: 'Width must be positive',
+              extra_info: { input_name: 'width' }
+            }
+          ],
+          class_type: 'TestNode',
+          dependent_outputs: []
+        }
+      }
+
+      const result = store.slotHasError('123', 'height')
+      expect(result).toBe(false)
+    })
+
+    it('should return true when slot has error', () => {
+      store.lastNodeErrors = {
+        '123': {
+          errors: [
+            {
+              type: 'validation_error',
+              message: 'Invalid input',
+              details: 'Width must be positive',
+              extra_info: { input_name: 'width' }
+            }
+          ],
+          class_type: 'TestNode',
+          dependent_outputs: []
+        }
+      }
+
+      const result = store.slotHasError('123', 'width')
+      expect(result).toBe(true)
+    })
+
+    it('should return true when multiple errors exist for the same slot', () => {
+      store.lastNodeErrors = {
+        '123': {
+          errors: [
+            {
+              type: 'validation_error',
+              message: 'Invalid input',
+              details: 'Width must be positive',
+              extra_info: { input_name: 'width' }
+            },
+            {
+              type: 'validation_error',
+              message: 'Invalid range',
+              details: 'Width must be less than 1000',
+              extra_info: { input_name: 'width' }
+            }
+          ],
+          class_type: 'TestNode',
+          dependent_outputs: []
+        }
+      }
+
+      const result = store.slotHasError('123', 'width')
+      expect(result).toBe(true)
+    })
+
+    it('should handle errors without extra_info', () => {
+      store.lastNodeErrors = {
+        '123': {
+          errors: [
+            {
+              type: 'validation_error',
+              message: 'General error',
+              details: 'Something went wrong'
+            }
+          ],
+          class_type: 'TestNode',
+          dependent_outputs: []
+        }
+      }
+
+      const result = store.slotHasError('123', 'width')
+      expect(result).toBe(false)
+    })
+  })
+})
diff --git a/tests-ui/tests/utils/mathUtil.test.ts b/tests-ui/tests/utils/mathUtil.test.ts
index c4cb16dd89..47a70083d6 100644
--- a/tests-ui/tests/utils/mathUtil.test.ts
+++ b/tests-ui/tests/utils/mathUtil.test.ts
@@ -12,6 +12,19 @@ describe('mathUtil', () => {
       expect(gcd(0, 5)).toBe(5)
       expect(gcd(5, 0)).toBe(5)
     })
+
+    it('should handle negative numbers', () => {
+      expect(gcd(-48, 18)).toBe(6)
+      expect(gcd(48, -18)).toBe(6)
+      expect(gcd(-48, -18)).toBe(6)
+    })
+
+    it('should not cause stack overflow with small floating-point step values', () => {
+      // This would cause Maximum call stack size exceeded with recursive impl
+      // when used in lcm calculations with small step values
+      expect(() => gcd(0.0001, 0.0003)).not.toThrow()
+      expect(() => gcd(1e-10, 1e-9)).not.toThrow()
+    })
   })
 
   describe('lcm', () => {