Merge branch 'main' into glary/oxlint-func-style

Fix reactivity of vue subgraph price badges (#12029 )
When a subgraph contains partner nodes with price badges, those badges are also displayed on the subgraphNode. The reactivity here was spotty: The price badges would fail to display unless the user had navigated into the subgraph on the current page load. Fixing this is performed in 2 steps: - Firing a `node:property:changed` event when the badges contained in a subgraph are updated - Extending the reactivity updates so that badges update in vue mode despite using the litegraph badge getter. This PR also includes a minor styling tweak to fix text alignment on price badges | Before | After | | ------ | ----- | | <img width="360" alt="before" src="https://github.com/user-attachments/assets/56a95cbe-12c9-43b0-8664-34e52b6415ac" /> | <img width="360" alt="after" src="https://github.com/user-attachments/assets/bf4a0d81-21e4-4afc-946e-eba5967f1715" />| Resolves FE-346 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-12029-Fix-reactivity-of-vue-subgraph-price-badges-3586d73d3650813cb12fe265090940e4) by [Unito](https://www.unito.io)
2026-05-24 06:35:10 +00:00 · 2026-05-20 11:47:23 -07:00 · 2026-05-20 11:22:42 -07:00 · 2026-05-20 17:55:13 +00:00 · 2026-05-20 10:38:09 -07:00 · 2026-05-20 10:26:47 -07:00
765 changed files with 7083 additions and 4508 deletions
--- a/.env_example
+++ b/.env_example
@@ -41,6 +41,10 @@ ALGOLIA_API_KEY=684d998c36b67a9a9fce8fc2d8860579
 # Enable PostHog debug logging in the browser console.
 # VITE_POSTHOG_DEBUG=true

+# Override staging comfy-api / comfy-platform base URLs.
+# VITE_STAGING_API_BASE_URL=https://stagingapi.comfy.org
+# VITE_STAGING_PLATFORM_BASE_URL=https://stagingplatform.comfy.org
+
 # Sentry ENV vars replace with real ones for debugging
 # SENTRY_AUTH_TOKEN=private-token # get from sentry
 # SENTRY_ORG=comfy-org
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -28,6 +28,7 @@
  ],
  "rules": {
    "no-async-promise-executor": "off",
+    "func-style": ["error", "declaration"],
    "no-console": [
      "error",
      {
@@ -124,6 +125,12 @@
        "no-console": "allow"
      }
    },
+    {
+      "files": ["src/lib/litegraph/**"],
+      "rules": {
+        "func-style": "off"
+      }
+    },
    {
      "files": ["browser_tests/**/*.ts"],
      "jsPlugins": ["eslint-plugin-playwright"],
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -47,7 +47,7 @@ setup((app) => {
 })

 // Theme and dialog decorator
-export const withTheme = (Story: StoryFn, context: StoryContext) => {
+export function withTheme(Story: StoryFn, context: StoryContext) {
  const theme = context.globals.theme || 'light'

  // Apply theme class to document root
--- a/apps/desktop-ui/.storybook/preview.ts
+++ b/apps/desktop-ui/.storybook/preview.ts
@@ -40,7 +40,7 @@ setup((app) => {
  app.use(ToastService)
 })

-export const withTheme = (Story: StoryFn, context: StoryContext) => {
+export function withTheme(Story: StoryFn, context: StoryContext) {
  const theme = context.globals.theme || 'light'
  if (theme === 'dark') {
    document.documentElement.classList.add('dark-theme')
--- a/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
+++ b/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
@@ -58,7 +58,7 @@ const tooltipText = computed(() => {
    : t('serverStart.copyAllTooltip')
 })

-const handleCopy = async () => {
+async function handleCopy() {
  const existingSelection = terminal.getSelection()
  const shouldSelectAll = !existingSelection
  if (shouldSelectAll) terminal.selectAll()
@@ -76,7 +76,7 @@ const handleCopy = async () => {
  }
 }

-const showContextMenu = (event: MouseEvent) => {
+function showContextMenu(event: MouseEvent) {
  event.preventDefault()
  electronAPI()?.showContextMenu({ type: 'text' })
 }
--- a/apps/desktop-ui/src/components/common/UrlInput.vue
+++ b/apps/desktop-ui/src/components/common/UrlInput.vue
@@ -44,8 +44,9 @@ const emit = defineEmits<{

 const validationState = ref<ValidationState>(ValidationState.IDLE)

-const cleanInput = (value: string): string =>
-  value ? value.replace(/\s+/g, '') : ''
+function cleanInput(value: string): string {
+  return value ? value.replace(/\s+/g, '') : ''
+}

 // Add internal value state
 const internalValue = ref(cleanInput(props.modelValue))
@@ -68,14 +69,14 @@ onMounted(async () => {
  await validateUrl(props.modelValue)
 })

-const handleInput = (value: string | undefined) => {
+function handleInput(value: string | undefined) {
  // Update internal value without emitting
  internalValue.value = cleanInput(value ?? '')
  // Reset validation state when user types
  validationState.value = ValidationState.IDLE
 }

-const handleBlur = async () => {
+async function handleBlur() {
  const input = cleanInput(internalValue.value)

  let normalizedUrl = input
@@ -91,7 +92,7 @@ const handleBlur = async () => {
 }

 // Default validation implementation
-const defaultValidateUrl = async (url: string): Promise<boolean> => {
+async function defaultValidateUrl(url: string): Promise<boolean> {
  if (!isValidUrl(url)) return false
  try {
    return await checkUrlReachable(url)
@@ -100,7 +101,7 @@ const defaultValidateUrl = async (url: string): Promise<boolean> => {
  }
 }

-const validateUrl = async (value: string) => {
+async function validateUrl(value: string) {
  if (validationState.value === ValidationState.LOADING) return

  const url = cleanInput(value)
--- a/apps/desktop-ui/src/components/install/DesktopSettingsConfiguration.vue
+++ b/apps/desktop-ui/src/components/install/DesktopSettingsConfiguration.vue
@@ -127,7 +127,7 @@ const showDialog = ref(false)
 const autoUpdate = defineModel<boolean>('autoUpdate', { required: true })
 const allowMetrics = defineModel<boolean>('allowMetrics', { required: true })

-const showMetricsInfo = () => {
+function showMetricsInfo() {
  showDialog.value = true
 }
 </script>
--- a/apps/desktop-ui/src/components/install/InstallLocationPicker.vue
+++ b/apps/desktop-ui/src/components/install/InstallLocationPicker.vue
@@ -182,10 +182,12 @@ function getTorchMirrorItem(device: TorchDeviceType): UVMirror {
 }

 const userIsInChina = ref(false)
-const useFallbackMirror = (mirror: UVMirror) => ({
-  ...mirror,
-  mirror: mirror.fallbackMirror
-})
+function useFallbackMirror(mirror: UVMirror) {
+  return {
+    ...mirror,
+    mirror: mirror.fallbackMirror
+  }
+}

 const mirrors = computed<[UVMirror, ModelRef<string>][]>(() =>
  (
@@ -212,7 +214,7 @@ onMounted(async () => {
  userIsInChina.value = await isInChina()
 })

-const validatePath = async (path: string | undefined) => {
+async function validatePath(path: string | undefined) {
  try {
    pathError.value = ''
    pathExists.value = false
@@ -246,7 +248,7 @@ const validatePath = async (path: string | undefined) => {
  }
 }

-const browsePath = async () => {
+async function browsePath() {
  try {
    const result = await electron.showDirectoryPicker()
    if (result) {
@@ -258,7 +260,7 @@ const browsePath = async () => {
  }
 }

-const onFocus = async () => {
+async function onFocus() {
  if (!inputTouched.value) {
    inputTouched.value = true
    return
--- a/apps/desktop-ui/src/components/install/MigrationPicker.vue
+++ b/apps/desktop-ui/src/components/install/MigrationPicker.vue
@@ -92,7 +92,7 @@ const isValidSource = computed(
  () => sourcePath.value !== '' && pathError.value === ''
 )

-const validateSource = async (sourcePath: string | undefined) => {
+async function validateSource(sourcePath: string | undefined) {
  if (!sourcePath) {
    pathError.value = ''
    return
@@ -109,7 +109,7 @@ const validateSource = async (sourcePath: string | undefined) => {
  }
 }

-const browsePath = async () => {
+async function browsePath() {
  try {
    const result = await electron.showDirectoryPicker()
    if (result) {
--- a/apps/desktop-ui/src/components/maintenance/TaskListItem.vue
+++ b/apps/desktop-ui/src/components/maintenance/TaskListItem.vue
@@ -82,7 +82,7 @@ const isExecuting = useMinLoadingDurationRef(reactiveExecuting, 250)
 // Popover
 const infoPopover = ref<InstanceType<typeof Popover> | null>(null)

-const toggle = (event: Event) => {
+function toggle(event: Event) {
  infoPopover.value?.toggle(event)
 }
 </script>
--- a/apps/desktop-ui/src/components/maintenance/TaskListPanel.vue
+++ b/apps/desktop-ui/src/components/maintenance/TaskListPanel.vue
@@ -67,7 +67,7 @@ defineProps<{
  filter: MaintenanceFilter
 }>()

-const executeTask = async (task: MaintenanceTask) => {
+async function executeTask(task: MaintenanceTask) {
  let message: string | undefined

  try {
@@ -87,7 +87,7 @@ const executeTask = async (task: MaintenanceTask) => {
 }

 // Commands
-const confirmButton = async (event: MouseEvent, task: MaintenanceTask) => {
+async function confirmButton(event: MouseEvent, task: MaintenanceTask) {
  if (!task.requireConfirm) {
    await executeTask(task)
    return
--- a/apps/desktop-ui/src/components/maintenance/TerminalOutputDrawer.vue
+++ b/apps/desktop-ui/src/components/maintenance/TerminalOutputDrawer.vue
@@ -34,10 +34,10 @@ const buffer = useTerminalBuffer()
 let xterm: Terminal | null = null

 // Created and destroyed with the Drawer - contents copied from hidden buffer
-const terminalCreated = (
+function terminalCreated(
  { terminal, useAutoSize }: ReturnType<typeof useTerminal>,
  root: Ref<HTMLElement | undefined>
-) => {
+) {
  xterm = terminal
  useAutoSize({ root, autoRows: true, autoCols: true })
  terminal.write(props.defaultMessage)
@@ -49,7 +49,7 @@ const terminalCreated = (
  terminal.options.disableStdin = true
 }

-const terminalUnmounted = () => {
+function terminalUnmounted() {
  xterm = null
 }

--- a/apps/desktop-ui/src/composables/bottomPanelTabs/useTerminal.ts
+++ b/apps/desktop-ui/src/composables/bottomPanelTabs/useTerminal.ts
@@ -55,14 +55,14 @@ export function useTerminal(element: Ref<HTMLElement | undefined>) {
      minRows?: number
      onResize?: () => void
    }) {
-      const ensureValidRows = (rows: number | undefined): number => {
+      function ensureValidRows(rows: number | undefined): number {
        if (rows == null || isNaN(rows)) {
          return (root.value?.clientHeight ?? 80) / 20
        }
        return rows
      }

-      const ensureValidCols = (cols: number | undefined): number => {
+      function ensureValidCols(cols: number | undefined): number {
        if (cols == null || isNaN(cols)) {
          // Sometimes this is NaN if so, estimate.
          return (root.value?.clientWidth ?? 80) / 8
@@ -70,7 +70,7 @@ export function useTerminal(element: Ref<HTMLElement | undefined>) {
        return cols
      }

-      const resize = () => {
+      function resize() {
        const dims = fitAddon.proposeDimensions()
        // Sometimes propose returns NaN, so we may need to estimate.
        terminal.resize(
--- a/apps/desktop-ui/src/composables/bottomPanelTabs/useTerminalBuffer.ts
+++ b/apps/desktop-ui/src/composables/bottomPanelTabs/useTerminalBuffer.ts
@@ -6,13 +6,17 @@ export function useTerminalBuffer() {
  const serializeAddon = new SerializeAddon()
  const terminal = markRaw(new Terminal({ convertEol: true }))

-  const copyTo = (destinationTerminal: Terminal) => {
+  function copyTo(destinationTerminal: Terminal) {
    destinationTerminal.write(serializeAddon.serialize())
  }

-  const write = (message: string) => terminal.write(message)
+  function write(message: string) {
+    return terminal.write(message)
+  }

-  const serialize = () => serializeAddon.serialize()
+  function serialize() {
+    return serializeAddon.serialize()
+  }

  onMounted(() => {
    terminal.loadAddon(serializeAddon)
--- a/apps/desktop-ui/src/constants/desktopMaintenanceTasks.ts
+++ b/apps/desktop-ui/src/constants/desktopMaintenanceTasks.ts
@@ -5,7 +5,7 @@ import { electronAPI } from '@/utils/envUtil'

 const electron = electronAPI()

-const openUrl = (url: string) => {
+function openUrl(url: string) {
  window.open(url, '_blank')
  return true
 }
--- a/apps/desktop-ui/src/stores/maintenanceTaskStore.ts
+++ b/apps/desktop-ui/src/stores/maintenanceTaskStore.ts
@@ -124,13 +124,15 @@ export const useMaintenanceTaskStore = defineStore('maintenanceTask', () => {
   * @param task Task to get the matching state object for
   * @returns The state object for this task
   */
-  const getRunner = (task: MaintenanceTask) => taskRunners.value.get(task.id)!
+  function getRunner(task: MaintenanceTask) {
+    return taskRunners.value.get(task.id)!
+  }

  /**
   * Updates the task list with the latest validation state.
   * @param validationUpdate Update details passed in by electron
   */
-  const processUpdate = (validationUpdate: InstallValidation) => {
+  function processUpdate(validationUpdate: InstallValidation) {
    lastUpdate.value = validationUpdate
    const update = validationUpdate as IndexedUpdate
    isRefreshing.value = true
@@ -151,19 +153,19 @@ export const useMaintenanceTaskStore = defineStore('maintenanceTask', () => {
  }

  /** Clears the resolved status of tasks (when changing filters) */
-  const clearResolved = () => {
+  function clearResolved() {
    for (const task of tasks.value) {
      getRunner(task).resolved &&= false
    }
  }

  /** @todo Refreshes Electron tasks only. */
-  const refreshDesktopTasks = async () => {
+  async function refreshDesktopTasks() {
    isRefreshing.value = true
    await electron.Validation.validateInstallation(processUpdate)
  }

-  const execute = async (task: MaintenanceTask) => {
+  async function execute(task: MaintenanceTask) {
    const success = await getRunner(task).execute(task)
    if (success && task.isInstallationFix) {
      await refreshDesktopTasks()
--- a/apps/desktop-ui/src/utils/electronMirrorCheck.ts
+++ b/apps/desktop-ui/src/utils/electronMirrorCheck.ts
@@ -7,7 +7,7 @@ import { electronAPI } from './envUtil'
 * @param mirror - The mirror to check.
 * @returns True if the mirror is reachable, false otherwise.
 */
-export const checkMirrorReachable = async (mirror: string) => {
+export async function checkMirrorReachable(mirror: string) {
  return (
    isValidUrl(mirror) && (await electronAPI().NetWork.canAccessUrl(mirror))
  )
--- a/apps/desktop-ui/src/views/DesktopDialogView.vue
+++ b/apps/desktop-ui/src/views/DesktopDialogView.vue
@@ -36,7 +36,7 @@ import { electronAPI } from '@/utils/envUtil'
 const route = useRoute()
 const { id, title, message, buttons } = getDialog(route.params.dialogId)

-const handleButtonClick = async (button: DialogAction) => {
+async function handleButtonClick(button: DialogAction) {
  await electronAPI().Dialog.clickButton(button.returnValue)
 }
 </script>
--- a/apps/desktop-ui/src/views/DesktopUpdateView.vue
+++ b/apps/desktop-ui/src/views/DesktopUpdateView.vue
@@ -52,7 +52,7 @@ const electron = electronAPI()

 const terminalVisible = ref(false)

-const toggleConsoleDrawer = () => {
+function toggleConsoleDrawer() {
  terminalVisible.value = !terminalVisible.value
 }

--- a/apps/desktop-ui/src/views/DownloadGitView.vue
+++ b/apps/desktop-ui/src/views/DownloadGitView.vue
@@ -47,11 +47,11 @@ import { useRouter } from 'vue-router'

 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'

-const openGitDownloads = () => {
+function openGitDownloads() {
  window.open('https://git-scm.com/downloads/', '_blank')
 }

-const skipGit = async () => {
+async function skipGit() {
  console.warn('pushing')
  const router = useRouter()
  await router.push('install')
--- a/apps/desktop-ui/src/views/InstallView.stories.ts
+++ b/apps/desktop-ui/src/views/InstallView.stories.ts
@@ -8,8 +8,8 @@ import { createMemoryHistory, createRouter } from 'vue-router'
 import InstallView from './InstallView.vue'

 // Create a mock router for stories
-const createMockRouter = () =>
-  createRouter({
+function createMockRouter() {
+  return createRouter({
    history: createMemoryHistory(),
    routes: [
      { path: '/', component: { template: '<div>Home</div>' } },
@@ -23,6 +23,7 @@ const createMockRouter = () =>
      }
    ]
  })
+}

 const meta: Meta<typeof InstallView> = {
  title: 'Desktop/Views/InstallView',
--- a/apps/desktop-ui/src/views/InstallView.vue
+++ b/apps/desktop-ui/src/views/InstallView.vue
@@ -90,7 +90,7 @@ const currentStep = ref('1')
 /** Forces each install step to be visited at least once. */
 const highestStep = ref(0)

-const handleStepChange = (value: string | number) => {
+function handleStepChange(value: string | number) {
  setHighestStep(value)

  electronAPI().Events.trackEvent('install_stepper_change', {
@@ -98,7 +98,7 @@ const handleStepChange = (value: string | number) => {
  })
 }

-const setHighestStep = (value: string | number) => {
+function setHighestStep(value: string | number) {
  const int = typeof value === 'number' ? value : parseInt(value, 10)
  if (!isNaN(int) && int > highestStep.value) highestStep.value = int
 }
@@ -123,7 +123,7 @@ const canProceed = computed(() => {
 })

 // Navigation methods
-const goToNextStep = () => {
+function goToNextStep() {
  const nextStep = (parseInt(currentStep.value) + 1).toString()
  currentStep.value = nextStep
  setHighestStep(nextStep)
@@ -132,7 +132,7 @@ const goToNextStep = () => {
  })
 }

-const goToPreviousStep = () => {
+function goToPreviousStep() {
  const prevStep = (parseInt(currentStep.value) - 1).toString()
  currentStep.value = prevStep
  electronAPI().Events.trackEvent('install_stepper_change', {
@@ -142,7 +142,7 @@ const goToPreviousStep = () => {

 const electron = electronAPI()
 const router = useRouter()
-const install = async () => {
+async function install() {
  if (!device.value) return

  const options: InstallOptions = {
--- a/apps/desktop-ui/src/views/MaintenanceView.stories.ts
+++ b/apps/desktop-ui/src/views/MaintenanceView.stories.ts
@@ -35,12 +35,14 @@ const validationState: ValidationState = {
  upgradePackages: 'OK'
 }

-const createMockElectronAPI = () => {
+function createMockElectronAPI() {
  const logListeners: Array<(message: string) => void> = []

-  const getValidationUpdate = () => ({
-    ...validationState
-  })
+  function getValidationUpdate() {
+    return {
+      ...validationState
+    }
+  }

  return {
    getPlatform: () => 'darwin',
@@ -76,7 +78,7 @@ const createMockElectronAPI = () => {
  }
 }

-const ensureElectronAPI = () => {
+function ensureElectronAPI() {
  const globalWindow = window as { electronAPI?: unknown }
  if (!globalWindow.electronAPI) {
    globalWindow.electronAPI = createMockElectronAPI()
--- a/apps/desktop-ui/src/views/MaintenanceView.vue
+++ b/apps/desktop-ui/src/views/MaintenanceView.vue
@@ -183,7 +183,7 @@ const unsafeReasonText = computed(() => {
 })

 /** If valid, leave the validation window. */
-const completeValidation = async () => {
+async function completeValidation() {
  const isValid = await electron.Validation.complete()
  if (!isValid) {
    toast.add({
@@ -194,7 +194,7 @@ const completeValidation = async () => {
  }
 }

-const toggleConsoleDrawer = () => {
+function toggleConsoleDrawer() {
  terminalVisible.value = !terminalVisible.value
 }

--- a/apps/desktop-ui/src/views/ManualConfigurationView.vue
+++ b/apps/desktop-ui/src/views/ManualConfigurationView.vue
@@ -67,7 +67,9 @@ const electron = electronAPI()
 const basePath = ref<string | null>(null)
 const sep = ref<'\\' | '/'>('/')

-const restartApp = (message?: string) => electron.restartApp(message)
+function restartApp(message?: string) {
+  return electron.restartApp(message)
+}

 onMounted(async () => {
  basePath.value = await electron.getBasePath()
--- a/apps/desktop-ui/src/views/MetricsConsentView.vue
+++ b/apps/desktop-ui/src/views/MetricsConsentView.vue
@@ -64,7 +64,7 @@ const allowMetrics = ref(true)
 const router = useRouter()
 const isUpdating = ref(false)

-const updateConsent = async () => {
+async function updateConsent() {
  isUpdating.value = true
  try {
    await electronAPI().setMetricsConsent(allowMetrics.value)
--- a/apps/desktop-ui/src/views/NotSupportedView.vue
+++ b/apps/desktop-ui/src/views/NotSupportedView.vue
@@ -61,19 +61,19 @@ import { useRouter } from 'vue-router'

 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'

-const openDocs = () => {
+function openDocs() {
  window.open(
    'https://github.com/Comfy-Org/desktop#currently-supported-platforms',
    '_blank'
  )
 }

-const reportIssue = () => {
+function reportIssue() {
  window.open('https://forum.comfy.org/c/v1-feedback/', '_blank')
 }

 const router = useRouter()
-const continueToInstall = async () => {
+async function continueToInstall() {
  await router.push('/install')
 }
 </script>
--- a/apps/desktop-ui/src/views/ServerStartView.vue
+++ b/apps/desktop-ui/src/views/ServerStartView.vue
@@ -118,7 +118,7 @@ let xterm: Terminal | undefined
 /**
 * Handles installation stage updates from the desktop
 */
-const updateInstallStage = (stageInfo: InstallStageInfo) => {
+function updateInstallStage(stageInfo: InstallStageInfo) {
  console.warn('[InstallStage.onUpdate] Received:', {
    stage: stageInfo.stage,
    progress: stageInfo.progress,
@@ -183,17 +183,17 @@ const displayStatusText = computed(() => {
  return currentStatusLabel.value
 })

-const updateProgress = ({ status: newStatus }: { status: ProgressStatus }) => {
+function updateProgress({ status: newStatus }: { status: ProgressStatus }) {
  status.value = newStatus

  // Make critical error screen more obvious.
  if (newStatus === ProgressStatus.ERROR) terminalVisible.value = false
 }

-const terminalCreated = (
+function terminalCreated(
  { terminal, useAutoSize }: ReturnType<typeof useTerminal>,
  root: Ref<HTMLElement | undefined>
-) => {
+) {
  xterm = terminal

  useAutoSize({ root, autoRows: true, autoCols: true })
@@ -206,11 +206,15 @@ const terminalCreated = (
  terminal.options.cursorInactiveStyle = 'block'
 }

-const troubleshoot = () => electron.startTroubleshooting()
-const reportIssue = () => {
+function troubleshoot() {
+  return electron.startTroubleshooting()
+}
+function reportIssue() {
  window.open('https://forum.comfy.org/c/v1-feedback/', '_blank')
 }
-const openLogs = () => electron.openLogsFolder()
+function openLogs() {
+  return electron.openLogsFolder()
+}

 let cleanupInstallStageListener: (() => void) | undefined

--- a/apps/desktop-ui/src/views/WelcomeView.vue
+++ b/apps/desktop-ui/src/views/WelcomeView.vue
@@ -33,7 +33,7 @@ import { useRouter } from 'vue-router'
 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'

 const router = useRouter()
-const navigateTo = async (path: string) => {
+async function navigateTo(path: string) {
  await router.push(path)
 }
 </script>
--- a/apps/website/e2e/demos.spec.ts
+++ b/apps/website/e2e/demos.spec.ts
@@ -3,8 +3,9 @@ import { expect, test } from '@playwright/test'
 import { demos, getNextDemo } from '../src/config/demos'
 import { t } from '../src/i18n/translations'

-const escapeRegExp = (value: string): string =>
-  value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}

 test.describe('Demo pages @smoke', () => {
  for (const demo of demos) {
--- a/apps/website/e2e/responsive.spec.ts
+++ b/apps/website/e2e/responsive.spec.ts
@@ -111,7 +111,7 @@ async function measureMarqueeLoopGeometry(
        `Animation on ${sel} has unusable duration: ${String(duration)}`
      )
    }
-    const setAllTimes = (time: number) => {
+    function setAllTimes(time: number) {
      for (const track of tracks) {
        for (const anim of track.getAnimations()) {
          anim.currentTime = time
@@ -119,7 +119,9 @@ async function measureMarqueeLoopGeometry(
      }
      void document.body.offsetWidth
    }
-    const readX = () => tracks.map((track) => track.getBoundingClientRect().x)
+    function readX() {
+      return tracks.map((track) => track.getBoundingClientRect().x)
+    }
    setAllTimes(0)
    const startPositions = readX()
    const copyWidths = tracks.map(
--- a/apps/website/src/components/careers/RolesSection.vue
+++ b/apps/website/src/components/careers/RolesSection.vue
@@ -36,7 +36,9 @@ let pendingFrame = 0
 const HEADER_OFFSET = -144
 const ACTIVATION_OFFSET = 300

-const deptElementId = (key: string) => `careers-dept-${key}`
+function deptElementId(key: string) {
+  return `careers-dept-${key}`
+}

 function pickActiveSection() {
  pendingFrame = 0
--- a/apps/website/src/components/product/local/HeroSection.vue
+++ b/apps/website/src/components/product/local/HeroSection.vue
@@ -58,7 +58,7 @@ onMounted(() => {
  })

  raw.sort((a, b) => {
-    const norm = (v: number) => {
+    function norm(v: number) {
      const r = v + Math.PI / 2
      return r < 0 ? r + 2 * Math.PI : r
    }
@@ -117,7 +117,7 @@ onMounted(() => {
    applyToPanel(panels[1], elapsed2)
    applyToPanel(panels[2], elapsed3)

-    const wOf = (elapsed: number) => {
+    function wOf(elapsed: number) {
      const progress = elapsed < PANEL_DURATION ? elapsed / PANEL_DURATION : 1
      return lerp(S.w, E.w, ease(progress))
    }
--- a/apps/website/src/composables/useParallax.ts
+++ b/apps/website/src/composables/useParallax.ts
@@ -35,7 +35,7 @@ export function useParallax(

    const triggerEl = options.trigger?.value

-    const createAnimations = () => {
+    function createAnimations() {
      const els = elements
        .map((r) => r.value)
        .filter((el): el is HTMLElement => !!el && el.offsetParent !== null)
--- a/apps/website/src/composables/usePinScrub.ts
+++ b/apps/website/src/composables/usePinScrub.ts
@@ -29,7 +29,7 @@ function interpolateY(
  contentH: number,
  vpH: number
 ) {
-  const clampedTarget = (i: number) => {
+  function clampedTarget(i: number) {
    const center = buttonCenters[i] ?? 0
    return Math.max(-(contentH - vpH), Math.min(0, vpH / 2 - center))
  }
--- a/apps/website/src/pages/cloud/supported-nodes/[pack].astro
+++ b/apps/website/src/pages/cloud/supported-nodes/[pack].astro
@@ -1,5 +1,4 @@
 ---
-import type { GetStaticPaths } from 'astro'

 import type { Pack } from '../../../data/cloudNodes'

@@ -9,7 +8,7 @@ import { t } from '../../../i18n/translations'
 import { loadPacksForBuild } from '../../../utils/cloudNodes.build'
 import { escapeJsonLd } from '../../../utils/escapeJsonLd'

-export const getStaticPaths: GetStaticPaths = async () => {
+export async function getStaticPaths() {
  const packs = await loadPacksForBuild()
  return packs.map((pack) => ({
    params: { pack: pack.id },
--- a/apps/website/src/pages/customers/[slug].astro
+++ b/apps/website/src/pages/customers/[slug].astro
@@ -1,5 +1,4 @@
 ---
-import type { GetStaticPaths } from 'astro'
 import BaseLayout from '../../layouts/BaseLayout.astro'
 import DetailHeroSection from '../../components/customers/DetailHeroSection.vue'
 import ContentSection from '../../components/common/ContentSection.vue'
@@ -7,7 +6,7 @@ import WhatsNextSection from '../../components/customers/WhatsNextSection.vue'
 import { customerStories, getNextStory, getStoryBySlug } from '../../config/customerStories'
 import { t } from '../../i18n/translations'

-export const getStaticPaths: GetStaticPaths = () => {
+export function getStaticPaths() {
  return customerStories.map((story) => ({
    params: { slug: story.slug }
  }))
--- a/apps/website/src/pages/demos/[slug].astro
+++ b/apps/website/src/pages/demos/[slug].astro
@@ -1,5 +1,4 @@
 ---
-import type { GetStaticPaths } from 'astro'
 import BaseLayout from '../../layouts/BaseLayout.astro'
 import DemoHeroSection from '../../components/demos/DemoHeroSection.vue'
 import ArcadeEmbed from '../../components/demos/ArcadeEmbed.vue'
@@ -8,7 +7,7 @@ import DemoNavSection from '../../components/demos/DemoNavSection.vue'
 import { demos, getDemoBySlug, getNextDemo } from '../../config/demos'
 import { t } from '../../i18n/translations'

-export const getStaticPaths: GetStaticPaths = () => {
+export function getStaticPaths() {
  return demos.map((demo) => ({
    params: { slug: demo.slug }
  }))
--- a/apps/website/src/pages/p/supported-models/[slug].astro
+++ b/apps/website/src/pages/p/supported-models/[slug].astro
@@ -1,11 +1,10 @@
 ---
-import type { GetStaticPaths } from 'astro'
 import BaseLayout from '../../../layouts/BaseLayout.astro'
 import ModelHeroSection from '../../../components/models/ModelHeroSection.vue'
 import { models, getModelBySlug } from '../../../config/models'
 import { t } from '../../../i18n/translations'

-export const getStaticPaths: GetStaticPaths = () => {
+export function getStaticPaths() {
  return models.map((model) => ({
    params: { slug: model.slug }
  }))
--- a/apps/website/src/pages/zh-CN/cloud/supported-nodes/[pack].astro
+++ b/apps/website/src/pages/zh-CN/cloud/supported-nodes/[pack].astro
@@ -1,5 +1,4 @@
 ---
-import type { GetStaticPaths } from 'astro'

 import type { Pack } from '../../../../data/cloudNodes'

@@ -9,7 +8,7 @@ import { t } from '../../../../i18n/translations'
 import { loadPacksForBuild } from '../../../../utils/cloudNodes.build'
 import { escapeJsonLd } from '../../../../utils/escapeJsonLd'

-export const getStaticPaths: GetStaticPaths = async () => {
+export async function getStaticPaths() {
  const packs = await loadPacksForBuild()
  return packs.map((pack) => ({
    params: { pack: pack.id },
--- a/apps/website/src/pages/zh-CN/customers/[slug].astro
+++ b/apps/website/src/pages/zh-CN/customers/[slug].astro
@@ -1,5 +1,4 @@
 ---
-import type { GetStaticPaths } from 'astro'
 import BaseLayout from '../../../layouts/BaseLayout.astro'
 import DetailHeroSection from '../../../components/customers/DetailHeroSection.vue'
 import ContentSection from '../../../components/common/ContentSection.vue'
@@ -7,7 +6,7 @@ import WhatsNextSection from '../../../components/customers/WhatsNextSection.vue
 import { customerStories, getNextStory, getStoryBySlug } from '../../../config/customerStories'
 import { t } from '../../../i18n/translations'

-export const getStaticPaths: GetStaticPaths = () => {
+export function getStaticPaths() {
  return customerStories.map((story) => ({
    params: { slug: story.slug }
  }))
--- a/apps/website/src/pages/zh-CN/demos/[slug].astro
+++ b/apps/website/src/pages/zh-CN/demos/[slug].astro
@@ -1,5 +1,4 @@
 ---
-import type { GetStaticPaths } from 'astro'
 import BaseLayout from '../../../layouts/BaseLayout.astro'
 import DemoHeroSection from '../../../components/demos/DemoHeroSection.vue'
 import ArcadeEmbed from '../../../components/demos/ArcadeEmbed.vue'
@@ -8,7 +7,7 @@ import DemoNavSection from '../../../components/demos/DemoNavSection.vue'
 import { demos, getDemoBySlug, getNextDemo } from '../../../config/demos'
 import { t } from '../../../i18n/translations'

-export const getStaticPaths: GetStaticPaths = () => {
+export function getStaticPaths() {
  return demos.map((demo) => ({
    params: { slug: demo.slug }
  }))
--- a/apps/website/src/scripts/snakeGame.ts
+++ b/apps/website/src/scripts/snakeGame.ts
@@ -35,8 +35,9 @@ const TICK_MS = 200

 function readColors() {
  const style = getComputedStyle(document.documentElement)
-  const get = (name: string, fallback: string): string =>
-    style.getPropertyValue(name).trim() || fallback
+  function get(name: string, fallback: string): string {
+    return style.getPropertyValue(name).trim() || fallback
+  }

  return {
    bg: get('--color-primary-comfy-ink', '#211927'),
@@ -59,9 +60,12 @@ function requireElement<T extends Element>(
  return el
 }

-const isSVGSVG = (el: Element): el is SVGSVGElement =>
-  el instanceof SVGSVGElement
-const isSVGG = (el: Element): el is SVGGElement => el instanceof SVGGElement
+function isSVGSVG(el: Element): el is SVGSVGElement {
+  return el instanceof SVGSVGElement
+}
+function isSVGG(el: Element): el is SVGGElement {
+  return el instanceof SVGGElement
+}
 function isSVGText(el: Element): el is SVGTextElement {
  return el instanceof SVGTextElement
 }
@@ -127,8 +131,9 @@ function depth(cell: Cell): number {

 function roundedPath(pts: [number, number][], radius: number): string {
  const n = pts.length
-  const fmt = (p: readonly [number, number]) =>
-    `${p[0].toFixed(2)},${p[1].toFixed(2)}`
+  function fmt(p: readonly [number, number]) {
+    return `${p[0].toFixed(2)},${p[1].toFixed(2)}`
+  }
  let d = ''
  for (let i = 0; i < n; i++) {
    const prev = pts[(i - 1 + n) % n]
@@ -206,7 +211,7 @@ function triggerExplosion() {
  const cx = ((COLS - ROWS) * STEP_X) / 2
  const cy = ((COLS + ROWS - 2) * STEP_Y) / 2

-  const launchParticle = (i: number, j: number, fill: string): Particle => {
+  function launchParticle(i: number, j: number, fill: string): Particle {
    const [sx, sy] = iso(i, j)
    const baseAngle = Math.atan2(sy - cy, sx - cx)
    const angle = baseAngle + (Math.random() - 0.5) * 1.2
@@ -239,7 +244,9 @@ function triggerExplosion() {
 const DROP_DURATION_MS = 450
 const DROP_HEIGHT = 600
 let foodDropStart = 0
-const easeOutCubic = (t: number) => 1 - Math.pow(1 - t, 3)
+function easeOutCubic(t: number) {
+  return 1 - Math.pow(1 - t, 3)
+}

 function foodDropOffset(now = performance.now()): number {
  if (!foodDropStart) return 0
@@ -252,7 +259,7 @@ function foodDropOffset(now = performance.now()): number {
 const REBIRTH_STAGGER_MS = 90
 const REBIRTH_GROW_MS = 260
 let rebirthStart = 0
-const easeOutBack = (t: number) => {
+function easeOutBack(t: number) {
  const c1 = 1.70158
  const c3 = c1 + 1
  return 1 + c3 * Math.pow(t - 1, 3) + c1 * Math.pow(t - 1, 2)
@@ -271,7 +278,9 @@ function rebirthScaleFor(idx: number, now = performance.now()): number {
 const CHOMP_DURATION_MS = 220
 const CHOMP_PEAK_SCALE = 1.15
 let chompStart = 0
-const easeOut = (t: number) => 1 - (1 - t) * (1 - t)
+function easeOut(t: number) {
+  return 1 - (1 - t) * (1 - t)
+}

 function chompScale(now = performance.now()): number {
  if (!chompStart) return 1
@@ -299,7 +308,7 @@ function isAnimating(): boolean {

 function ensureAnimationLoop() {
  if (animationHandle !== null) return
-  const tick = () => {
+  function tick() {
    if (
      explodeStart &&
      performance.now() - explodeStart >= EXPLODE_DURATION_MS
@@ -411,8 +420,12 @@ function updateScoreDisplay() {
  scoreBestEl.textContent = String(best)
 }

-const cellsEqual = (a: Cell, b: Cell) => a.i === b.i && a.j === b.j
-const inBounds = (c: Cell) => c.i >= 0 && c.j >= 0 && c.i < COLS && c.j < ROWS
+function cellsEqual(a: Cell, b: Cell) {
+  return a.i === b.i && a.j === b.j
+}
+function inBounds(c: Cell) {
+  return c.i >= 0 && c.j >= 0 && c.i < COLS && c.j < ROWS
+}

 function reset() {
  const j0 = Math.floor(ROWS / 2)
--- a/browser_tests/fixtures/helpers/AssetHelper.ts
+++ b/browser_tests/fixtures/helpers/AssetHelper.ts
@@ -158,7 +158,7 @@ export class AssetHelper {
    statusCode: number,
    error: string = 'Internal Server Error'
  ): Promise<void> {
-    const handler = async (route: Route) => {
+    async function handler(route: Route) {
      return route.fulfill({
        status: statusCode,
        json: { error }
--- a/browser_tests/fixtures/helpers/AssetsHelper.ts
+++ b/browser_tests/fixtures/helpers/AssetsHelper.ts
@@ -325,7 +325,7 @@ export class AssetsHelper {
      await this.page.unroute(pattern, existingHandler)
    }

-    const handler = async (route: Route) => {
+    async function handler(route: Route) {
      await route.fulfill({
        status: 200,
        contentType: 'application/json',
--- a/browser_tests/fixtures/helpers/NodeReplacementHelper.ts
+++ b/browser_tests/fixtures/helpers/NodeReplacementHelper.ts
@@ -42,7 +42,7 @@ export async function setupNodeReplacement(
      options?: AddEventListenerOptions | boolean
    ) {
      if (type === 'message' && typeof listener === 'function') {
-        const wrapped = function (this: WebSocket, event: Event) {
+        function wrapped(this: WebSocket, event: Event) {
          const msgEvent = event as MessageEvent
          if (typeof msgEvent.data === 'string') {
            try {
--- a/browser_tests/fixtures/helpers/SubgraphHelper.ts
+++ b/browser_tests/fixtures/helpers/SubgraphHelper.ts
@@ -11,6 +11,7 @@ import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/w
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { SubgraphEditor } from '@e2e/fixtures/components/SubgraphEditor'
 import { TestIds } from '@e2e/fixtures/selectors'
+import type { Position, Size } from '@e2e/fixtures/types'
 import type { NodeReference } from '@e2e/fixtures/utils/litegraphUtils'
 import { SubgraphSlotReference } from '@e2e/fixtures/utils/litegraphUtils'

@@ -241,6 +242,17 @@ export class SubgraphHelper {
    return new SubgraphSlotReference('output', slotName || '', this.comfyPage)
  }

+  async getInputBounds(): Promise<Position & Size> {
+    return await this.comfyPage.page.evaluate(() => {
+      const graph = app!.canvas.graph as Subgraph
+      const inputNode = graph.inputNode
+      const [x, y] = app!.canvas.ds.convertOffsetToCanvas(inputNode.pos)
+      const width = inputNode.size[0] * app!.canvas.ds.scale
+      const height = inputNode.size[1] * app!.canvas.ds.scale
+      return { x, y, width, height }
+    })
+  }
+
  /**
   * Connect a regular node output to a subgraph input.
   * This creates a new input slot on the subgraph if targetInputName is not provided.
@@ -606,7 +618,7 @@ export class SubgraphHelper {
    ]
  ): { warnings: string[]; dispose: () => void } {
    const warnings: string[] = []
-    const handler = (msg: ConsoleMessage) => {
+    function handler(msg: ConsoleMessage) {
      const text = msg.text()
      if (patterns.some((p) => text.includes(p))) {
        warnings.push(text)
--- a/browser_tests/fixtures/helpers/TemplateHelper.ts
+++ b/browser_tests/fixtures/helpers/TemplateHelper.ts
@@ -150,7 +150,7 @@ export class TemplateHelper {
  }

  async mockThumbnails(): Promise<void> {
-    const thumbnailHandler = async (route: Route) => {
+    async function thumbnailHandler(route: Route) {
      await route.fulfill({
        status: 200,
        path: 'browser_tests/assets/example.webp',
--- a/browser_tests/fixtures/jobsRouteFixture.ts
+++ b/browser_tests/fixtures/jobsRouteFixture.ts
@@ -40,7 +40,7 @@ interface JobsListRoute {
  responseLimit?: number
 }

-interface JobsScenario {
+export interface JobsScenario {
  history?: readonly RawJobListItem[]
  queue?: readonly RawJobListItem[]
 }
--- a/browser_tests/fixtures/selectors.ts
+++ b/browser_tests/fixtures/selectors.ts
@@ -76,7 +76,15 @@ export const TestIds = {
    publishTabPanel: 'publish-tab-panel',
    apiSignin: 'api-signin-dialog',
    updatePassword: 'update-password-dialog',
-    cloudNotification: 'cloud-notification-dialog'
+    cloudNotification: 'cloud-notification-dialog',
+    openSharedWorkflow: 'open-shared-workflow-dialog',
+    openSharedWorkflowTitle: 'open-shared-workflow-title',
+    openSharedWorkflowClose: 'open-shared-workflow-close',
+    openSharedWorkflowErrorClose: 'open-shared-workflow-error-close',
+    openSharedWorkflowCancel: 'open-shared-workflow-cancel',
+    openSharedWorkflowOpenWithoutImporting:
+      'open-shared-workflow-open-without-importing',
+    openSharedWorkflowConfirm: 'open-shared-workflow-confirm'
  },
  keybindings: {
    presetMenu: 'keybinding-preset-menu'
--- a/browser_tests/fixtures/sharedWorkflowImportFixture.ts
+++ b/browser_tests/fixtures/sharedWorkflowImportFixture.ts
@@ -0,0 +1,252 @@
+import { test as base } from '@playwright/test'
+import type { Page } from '@playwright/test'
+import type {
+  Asset,
+  ImportPublishedAssetsRequest,
+  ListAssetsResponse
+} from '@comfyorg/ingest-types'
+import type { z } from 'zod'
+
+import type { zSharedWorkflowResponse } from '@/platform/workflow/sharing/schemas/shareSchemas'
+import type { AssetInfo } from '@/schemas/apiSchema'
+
+type SharedWorkflowResponse = z.input<typeof zSharedWorkflowResponse>
+
+export const sharedWorkflowImportScenario = {
+  shareId: 'shared-missing-media-e2e',
+  workflowId: 'shared-missing-media-workflow',
+  publishedAssetId: 'published-input-asset-1',
+  inputFileName: 'shared_imported_image.png'
+} as const
+
+export type SharedWorkflowRequestEvent =
+  | 'import'
+  | 'input-assets-including-public-before-import'
+  | 'input-assets-including-public-after-import'
+
+export interface SharedWorkflowImportMocks {
+  resetAndStartRecording: () => void
+  getImportBody: () => ImportPublishedAssetsRequest | undefined
+  getRequestEvents: () => SharedWorkflowRequestEvent[]
+  waitForPublicInclusiveInputAssetResponseAfterImport: () => Promise<void>
+}
+
+const defaultInputFileName = '00000000000000000000000Aexample.png'
+
+const sharedWorkflowAsset: AssetInfo = {
+  id: sharedWorkflowImportScenario.publishedAssetId,
+  name: sharedWorkflowImportScenario.inputFileName,
+  preview_url: '',
+  storage_url: '',
+  model: false,
+  public: false,
+  in_library: false
+}
+
+const defaultInputAsset: Asset = {
+  id: 'default-input-asset',
+  name: defaultInputFileName,
+  asset_hash: defaultInputFileName,
+  size: 1_024,
+  mime_type: 'image/png',
+  tags: ['input'],
+  created_at: '2026-05-01T00:00:00Z',
+  updated_at: '2026-05-01T00:00:00Z',
+  last_access_time: '2026-05-01T00:00:00Z'
+}
+
+const importedInputAsset: Asset = {
+  id: 'imported-input-asset',
+  name: sharedWorkflowImportScenario.inputFileName,
+  asset_hash: sharedWorkflowImportScenario.inputFileName,
+  size: 1_024,
+  mime_type: 'image/png',
+  tags: ['input'],
+  created_at: '2026-05-01T00:00:00Z',
+  updated_at: '2026-05-01T00:00:00Z',
+  last_access_time: '2026-05-01T00:00:00Z'
+}
+
+const sharedWorkflowResponse: SharedWorkflowResponse = {
+  share_id: sharedWorkflowImportScenario.shareId,
+  workflow_id: sharedWorkflowImportScenario.workflowId,
+  name: 'Shared Missing Media Workflow',
+  listed: true,
+  publish_time: '2026-05-01T00:00:00Z',
+  workflow_json: {
+    version: 0.4,
+    last_node_id: 10,
+    last_link_id: 0,
+    nodes: [
+      {
+        id: 10,
+        type: 'LoadImage',
+        pos: [50, 200],
+        size: [315, 314],
+        flags: {},
+        order: 0,
+        mode: 0,
+        inputs: [],
+        outputs: [
+          {
+            name: 'IMAGE',
+            type: 'IMAGE',
+            links: null
+          },
+          {
+            name: 'MASK',
+            type: 'MASK',
+            links: null
+          }
+        ],
+        properties: {
+          'Node name for S&R': 'LoadImage'
+        },
+        widgets_values: [sharedWorkflowImportScenario.inputFileName, 'image']
+      }
+    ],
+    links: [],
+    groups: [],
+    config: {},
+    extra: {
+      ds: {
+        offset: [0, 0],
+        scale: 1
+      }
+    }
+  },
+  assets: [sharedWorkflowAsset]
+}
+
+export const sharedWorkflowImportFixture = base.extend<{
+  sharedWorkflowImportMocks: SharedWorkflowImportMocks
+}>({
+  sharedWorkflowImportMocks: async ({ page }, use) => {
+    const mocks = await mockSharedWorkflowImportFlow(page)
+    await use(mocks)
+  }
+})
+
+async function mockSharedWorkflowImportFlow(
+  page: Page
+): Promise<SharedWorkflowImportMocks> {
+  function noopResolveResponse() {}
+  let isRecording = false
+  let importEndpointCalled = false
+  let importBody: ImportPublishedAssetsRequest | undefined
+  let resolvePublicInclusiveInputAssetResponseAfterImport: () => void =
+    noopResolveResponse
+  let publicInclusiveInputAssetResponseAfterImport = new Promise<void>(
+    (resolve) => {
+      resolvePublicInclusiveInputAssetResponseAfterImport = resolve
+    }
+  )
+  const requestEvents: SharedWorkflowRequestEvent[] = []
+
+  function resetPublicInclusiveInputAssetResponseWaiter() {
+    publicInclusiveInputAssetResponseAfterImport = new Promise<void>(
+      (resolve) => {
+        resolvePublicInclusiveInputAssetResponseAfterImport = resolve
+      }
+    )
+  }
+
+  function recordRequestEvent(event: SharedWorkflowRequestEvent) {
+    if (isRecording) requestEvents.push(event)
+  }
+
+  await page.route(
+    `**/workflows/published/${sharedWorkflowImportScenario.shareId}`,
+    async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(sharedWorkflowResponse)
+      })
+    }
+  )
+
+  await page.route('**/api/assets/import', async (route) => {
+    recordRequestEvent('import')
+    importBody = route.request().postDataJSON() as ImportPublishedAssetsRequest
+    importEndpointCalled = true
+
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({})
+    })
+  })
+
+  // Excludes `/api/assets/import` so the specific route above
+  // remains isolated from the general asset listing mock.
+  await page.route(/\/api\/assets(?=\?|$)/, async (route) => {
+    const url = new URL(route.request().url())
+    const includeTags = getTagParam(url, 'include_tags')
+    const isInputAssetRequest = includeTags.includes('input')
+    const includesPublicAssets =
+      url.searchParams.get('include_public') === 'true'
+    const isPublicInclusiveInputAssetRequest =
+      isInputAssetRequest && includesPublicAssets
+    const isAfterImportPublicInclusiveInputAssetRequest =
+      isPublicInclusiveInputAssetRequest && importEndpointCalled
+
+    if (isPublicInclusiveInputAssetRequest) {
+      recordRequestEvent(
+        importEndpointCalled
+          ? 'input-assets-including-public-after-import'
+          : 'input-assets-including-public-before-import'
+      )
+    }
+
+    const allAssets = [
+      defaultInputAsset,
+      ...(importEndpointCalled ? [importedInputAsset] : [])
+    ]
+    const assets = includeTags.length
+      ? allAssets.filter((asset) =>
+          includeTags.every((tag) => asset.tags?.includes(tag))
+        )
+      : allAssets
+
+    const response: ListAssetsResponse = {
+      assets,
+      total: assets.length,
+      has_more: false
+    }
+
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify(response)
+    })
+
+    if (isAfterImportPublicInclusiveInputAssetRequest) {
+      resolvePublicInclusiveInputAssetResponseAfterImport()
+    }
+  })
+
+  return {
+    resetAndStartRecording: () => {
+      isRecording = true
+      importEndpointCalled = false
+      importBody = undefined
+      requestEvents.length = 0
+      resetPublicInclusiveInputAssetResponseWaiter()
+    },
+    getImportBody: () => importBody,
+    getRequestEvents: () => [...requestEvents],
+    waitForPublicInclusiveInputAssetResponseAfterImport: () =>
+      publicInclusiveInputAssetResponseAfterImport
+  }
+}
+
+function getTagParam(url: URL, key: string): string[] {
+  return (
+    url.searchParams
+      .get(key)
+      ?.split(',')
+      .map((tag) => tag.trim())
+      .filter(Boolean) ?? []
+  )
+}
--- a/browser_tests/fixtures/utils/litegraphUtils.ts
+++ b/browser_tests/fixtures/utils/litegraphUtils.ts
@@ -7,7 +7,7 @@ import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import type { Position, Size } from '@e2e/fixtures/types'
 import { VueNodeFixture } from '@e2e/fixtures/utils/vueNodeFixtures'

-export const getMiddlePoint = (pos1: Position, pos2: Position) => {
+export function getMiddlePoint(pos1: Position, pos2: Position) {
  return {
    x: (pos1.x + pos2.x) / 2,
    y: (pos1.y + pos2.y) / 2
--- a/browser_tests/fixtures/utils/selectionToolboxMoreOptions.ts
+++ b/browser_tests/fixtures/utils/selectionToolboxMoreOptions.ts
@@ -0,0 +1,28 @@
+import { expect } from '@playwright/test'
+
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+
+export async function openMoreOptionsMenu(
+  comfyPage: ComfyPage,
+  nodeTitle: string
+) {
+  const nodes = await comfyPage.nodeOps.getNodeRefsByTitle(nodeTitle)
+  if (nodes.length === 0) {
+    throw new Error(`No "${nodeTitle}" nodes found`)
+  }
+
+  await nodes[0].centerOnNode()
+  await nodes[0].click('title')
+
+  await expect(comfyPage.page.locator('.selection-toolbox')).toBeVisible()
+
+  const moreOptionsBtn = comfyPage.page.getByTestId('more-options-button')
+  await expect(moreOptionsBtn).toBeVisible()
+  await moreOptionsBtn.click()
+  await comfyPage.nextFrame()
+
+  const menu = comfyPage.page.locator('.p-contextmenu')
+  await expect(menu).toBeVisible()
+
+  return menu
+}
--- a/browser_tests/tests/actionbar.spec.ts
+++ b/browser_tests/tests/actionbar.spec.ts
@@ -45,7 +45,7 @@ test.describe('Actionbar', { tag: '@ui' }, () => {
    const requestPromise = comfyPage.page.waitForResponse('**/api/prompt')

    // Find and set the width on the latent node
-    const triggerChange = async (value: number) => {
+    async function triggerChange(value: number) {
      return await comfyPage.page.evaluate((value) => {
        const node = window.app!.graph!._nodes.find(
          (n) => n.type === 'EmptyLatentImage'
@@ -59,7 +59,7 @@ test.describe('Actionbar', { tag: '@ui' }, () => {
    }

    // Trigger a status websocket message
-    const triggerStatus = (queueSize: number) => {
+    function triggerStatus(queueSize: number) {
      ws.send(
        JSON.stringify({
          type: 'status',
@@ -75,7 +75,7 @@ test.describe('Actionbar', { tag: '@ui' }, () => {
    }

    // Extract the width from the queue response
-    const getQueuedWidth = async (resp: Promise<Response>) => {
+    async function getQueuedWidth(resp: Promise<Response>) {
      const obj = await (await resp).json()
      return obj['__request']['prompt']['5']['inputs']['width']
    }
--- a/browser_tests/tests/canvasLayoutSettings.spec.ts
+++ b/browser_tests/tests/canvasLayoutSettings.spec.ts
@@ -5,16 +5,18 @@ import {
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import type { Size } from '@e2e/fixtures/types'

-const expectedGroupSize = (
+function expectedGroupSize(
  nodeBounds: Size,
  padding: number,
  titleHeight: number
-): Size => ({
-  width: nodeBounds.width + padding * 2,
-  // Group height adds one title row above the contained node bounds (which
-  // themselves already include the node's own title), independent of padding.
-  height: nodeBounds.height + padding * 2 + titleHeight
-})
+): Size {
+  return {
+    width: nodeBounds.width + padding * 2,
+    // Group height adds one title row above the contained node bounds (which
+    // themselves already include the node's own title), independent of padding.
+    height: nodeBounds.height + padding * 2 + titleHeight
+  }
+}

 test.describe('Canvas layout settings', { tag: '@canvas' }, () => {
  test.describe('Comfy.SnapToGrid.GridSize', () => {
@@ -24,7 +26,7 @@ test.describe('Canvas layout settings', { tag: '@canvas' }, () => {
      await comfyPage.nodeOps.clearGraph()
    })

-    const createNode = async (comfyPage: ComfyPage) => {
+    async function createNode(comfyPage: ComfyPage) {
      const note = await comfyPage.nodeOps.addNode('Note', undefined, {
        x: 0,
        y: 0
@@ -79,10 +81,10 @@ test.describe('Canvas layout settings', { tag: '@canvas' }, () => {
      await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
    })

-    const groupAroundAllNodesWithPadding = async (
+    async function groupAroundAllNodesWithPadding(
      comfyPage: ComfyPage,
      padding: number
-    ): Promise<Size> => {
+    ): Promise<Size> {
      await comfyPage.settings.setSetting(
        'Comfy.GroupSelectedNodes.Padding',
        padding
@@ -126,15 +128,16 @@ test.describe('Canvas layout settings', { tag: '@canvas' }, () => {

  test.describe('LiteGraph.ContextMenu.Scaling', () => {
    const ZOOM_SCALE = 2
-    const litegraphContextMenu = (comfyPage: ComfyPage) =>
-      comfyPage.page.locator('.litecontextmenu')
+    function litegraphContextMenu(comfyPage: ComfyPage) {
+      return comfyPage.page.locator('.litecontextmenu')
+    }

    test.beforeEach(async ({ comfyPage }) => {
      await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
      await comfyPage.canvasOps.setScale(ZOOM_SCALE)
    })

-    const openComboMenu = async (comfyPage: ComfyPage) => {
+    async function openComboMenu(comfyPage: ComfyPage) {
      const loadImage = (
        await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
      )[0]
--- a/browser_tests/tests/canvasModeSelector.spec.ts
+++ b/browser_tests/tests/canvasModeSelector.spec.ts
@@ -3,12 +3,14 @@ import { expect } from '@playwright/test'

 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'

-const getLocators = (page: Page) => ({
-  trigger: page.getByRole('button', { name: 'Canvas Mode' }),
-  menu: page.getByRole('menu', { name: 'Canvas Mode' }),
-  selectItem: page.getByRole('menuitemradio', { name: 'Select' }),
-  handItem: page.getByRole('menuitemradio', { name: 'Hand' })
-})
+function getLocators(page: Page) {
+  return {
+    trigger: page.getByRole('button', { name: 'Canvas Mode' }),
+    menu: page.getByRole('menu', { name: 'Canvas Mode' }),
+    selectItem: page.getByRole('menuitemradio', { name: 'Select' }),
+    handItem: page.getByRole('menuitemradio', { name: 'Hand' })
+  }
+}

 const MODES = [
  {
--- a/browser_tests/tests/canvasSettings.spec.ts
+++ b/browser_tests/tests/canvasSettings.spec.ts
@@ -7,7 +7,7 @@ import { sleep } from '@e2e/fixtures/utils/timing'

 const CLIP_NODE_COUNT = 2

-const getClipNodesDragBox = async (comfyPage: ComfyPage) => {
+async function getClipNodesDragBox(comfyPage: ComfyPage) {
  const clipNodes = await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
  expect(
    clipNodes,
@@ -242,11 +242,11 @@ test.describe('Canvas settings', { tag: '@canvas' }, () => {
     * hold), nudge by `(dx, dy)` absolute pixels, then release. Spec-local
     * because it exists only to probe the CanvasPointer timing thresholds.
     */
-    const holdDragAt = async (
+    async function holdDragAt(
      comfyPage: ComfyPage,
      pos: { x: number; y: number },
      opts: { dx: number; dy: number; holdMs: number }
-    ) => {
+    ) {
      const abs = await comfyPage.canvasOps.toAbsolute(pos)
      await comfyPage.page.mouse.move(abs.x, abs.y)
      await comfyPage.page.mouse.down()
@@ -383,8 +383,9 @@ test.describe('Canvas settings', { tag: '@canvas' }, () => {
    // (CI jitter, background throttling, canvas-idle behaviour). Assert the
    // render-loop throttle value instead — that is what actually governs
    // frame cadence.
-    const getFrameGap = (comfyPage: ComfyPage) =>
-      comfyPage.page.evaluate(() => window.app!.canvas.maximumFps * 1000)
+    function getFrameGap(comfyPage: ComfyPage) {
+      return comfyPage.page.evaluate(() => window.app!.canvas.maximumFps * 1000)
+    }

    test('caps the render loop frame gap', async ({ comfyPage }) => {
      await comfyPage.settings.setSetting('LiteGraph.Canvas.MaximumFps', 30)
--- a/browser_tests/tests/changeTracker.spec.ts
+++ b/browser_tests/tests/changeTracker.spec.ts
@@ -219,7 +219,7 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
    comfyPage
  }) => {
    const node = (await comfyPage.nodeOps.getFirstNodeRef())!
-    const bypassAndPin = async () => {
+    async function bypassAndPin() {
      await beforeChange(comfyPage)
      await comfyPage.keyboard.bypass()
      await expect(node).toBeBypassed()
@@ -228,14 +228,14 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
      await afterChange(comfyPage)
    }

-    const collapse = async () => {
+    async function collapse() {
      await beforeChange(comfyPage)
      await node.click('collapse', { moveMouseToEmptyArea: true })
      await expect(node).toBeCollapsed()
      await afterChange(comfyPage)
    }

-    const multipleChanges = async () => {
+    async function multipleChanges() {
      await beforeChange(comfyPage)
      // Call other actions that uses begin/endChange
      await node.click('title')
--- a/browser_tests/tests/defaultKeybindings.spec.ts
+++ b/browser_tests/tests/defaultKeybindings.spec.ts
@@ -133,10 +133,11 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
      await node.click('title')

      // Normal mode is ALWAYS (0)
-      const getMode = () =>
-        comfyPage.page.evaluate((nodeId) => {
+      function getMode() {
+        return comfyPage.page.evaluate((nodeId) => {
          return window.app!.canvas.graph!.getNodeById(nodeId)!.mode
        }, node.id)
+      }

      await expect.poll(() => getMode()).toBe(0)

--- a/browser_tests/tests/dialog.spec.ts
+++ b/browser_tests/tests/dialog.spec.ts
@@ -290,7 +290,7 @@ test('Blueprint overwrite', { tag: ['@subgraph'] }, async ({ comfyPage }) => {

  const confirmDialog = comfyPage.confirmDialog.root
  const { incrementButton } = comfyPage.vueNodes.getInputNumberControls(steps)
-  const dirtyGraphAndSave = async () => {
+  async function dirtyGraphAndSave() {
    await incrementButton.click()
    await comfyPage.page.keyboard.press('Control+s')
  }
--- a/browser_tests/tests/groupCopyPaste.spec.ts
+++ b/browser_tests/tests/groupCopyPaste.spec.ts
@@ -21,13 +21,14 @@ test.describe('Group Copy Paste', { tag: ['@canvas'] }, () => {
    await comfyPage.clipboard.paste()
    await comfyPage.nextFrame()

-    const getGroupPositions = () =>
-      comfyPage.page.evaluate(() =>
+    function getGroupPositions() {
+      return comfyPage.page.evaluate(() =>
        window.app!.graph.groups.map((g: { pos: number[] }) => ({
          x: g.pos[0],
          y: g.pos[1]
        }))
      )
+    }

    await expect.poll(getGroupPositions).toHaveLength(2)

--- a/browser_tests/tests/groupNode.spec.ts
+++ b/browser_tests/tests/groupNode.spec.ts
@@ -137,7 +137,7 @@ test.describe('Group Node', { tag: '@node' }, () => {
  test('Manage group opens with the correct group selected', async ({
    comfyPage
  }) => {
-    const makeGroup = async (name: string, type1: string, type2: string) => {
+    async function makeGroup(name: string, type1: string, type2: string) {
      const node1 = (await comfyPage.nodeOps.getNodeRefsByType(type1))[0]
      const node2 = (await comfyPage.nodeOps.getNodeRefsByType(type2))[0]
      await node1.click('title')
@@ -204,7 +204,7 @@ test.describe('Group Node', { tag: '@node' }, () => {
  test('Reconnects inputs after configuration changed via manage dialog save', async ({
    comfyPage
  }) => {
-    const expectSingleNode = async (type: string) => {
+    async function expectSingleNode(type: string) {
      const nodes = await comfyPage.nodeOps.getNodeRefsByType(type)
      expect(nodes).toHaveLength(1)
      return nodes[0]
@@ -255,13 +255,13 @@ test.describe('Group Node', { tag: '@node' }, () => {
    const GROUP_NODE_NAME = 'group_node' // Node name in given workflow
    const GROUP_NODE_TYPE = `${GROUP_NODE_PREFIX}${GROUP_NODE_NAME}`

-    const isRegisteredLitegraph = async (comfyPage: ComfyPage) => {
+    async function isRegisteredLitegraph(comfyPage: ComfyPage) {
      return await comfyPage.page.evaluate((nodeType: string) => {
        return !!window.LiteGraph!.registered_node_types[nodeType]
      }, GROUP_NODE_TYPE)
    }

-    const isRegisteredNodeDefStore = async (comfyPage: ComfyPage) => {
+    async function isRegisteredNodeDefStore(comfyPage: ComfyPage) {
      await comfyPage.menu.nodeLibraryTab.open()
      const groupNodesFolderCt = await comfyPage.menu.nodeLibraryTab
        .getFolder(GROUP_NODE_CATEGORY)
@@ -269,10 +269,10 @@ test.describe('Group Node', { tag: '@node' }, () => {
      return groupNodesFolderCt === 1
    }

-    const verifyNodeLoaded = async (
+    async function verifyNodeLoaded(
      comfyPage: ComfyPage,
      expectedCount: number
-    ) => {
+    ) {
      expect(
        await comfyPage.nodeOps.getNodeRefsByType(GROUP_NODE_TYPE)
      ).toHaveLength(expectedCount)
@@ -361,3 +361,15 @@ test.describe('Group Node', { tag: '@node' }, () => {
    })
  })
 })
+
+test('Convert to subgraph unpacks the group Node @vue-nodes', async ({
+  comfyPage
+}) => {
+  await comfyPage.workflow.loadWorkflow('groupnodes/legacy_group_node')
+  await (await comfyPage.vueNodes.getFixtureByTitle('hello')).title.click()
+  await comfyPage.page.keyboard.press('Control+Shift+e')
+  await expect(comfyPage.vueNodes.getNodeByTitle('New Subgraph')).toBeVisible()
+
+  await comfyPage.vueNodes.enterSubgraph()
+  await expect(comfyPage.vueNodes.getNodeByTitle('')).toHaveCount(2)
+})
--- a/browser_tests/tests/imageCompare.spec.ts
+++ b/browser_tests/tests/imageCompare.spec.ts
@@ -510,7 +510,7 @@ test.describe('Image Compare', { tag: ['@widget', '@vue-nodes'] }, () => {
    const brokenAfter = 'http://127.0.0.1:1/broken2.png'

    const pageErrors: Error[] = []
-    const onPageError = (err: Error) => {
+    function onPageError(err: Error) {
      pageErrors.push(err)
    }
    comfyPage.page.on('pageerror', onPageError)
--- a/browser_tests/tests/interaction.spec.ts
+++ b/browser_tests/tests/interaction.spec.ts
@@ -82,10 +82,10 @@ test.describe('Node Interaction', () => {
      }
    )

-    const dragSelectNodes = async (
+    async function dragSelectNodes(
      comfyPage: ComfyPage,
      clipNodes: NodeReference[]
-    ) => {
+    ) {
      const clipNode1Pos = await clipNodes[0].getPosition()
      const clipNode2Pos = await clipNodes[1].getPosition()
      const offset = 64
@@ -117,15 +117,16 @@ test.describe('Node Interaction', () => {
    }) => {
      const clipNodes =
        await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
-      const getPositions = () =>
-        Promise.all(clipNodes.map((node) => node.getPosition()))
-      const testDirection = async ({
+      function getPositions() {
+        return Promise.all(clipNodes.map((node) => node.getPosition()))
+      }
+      async function testDirection({
        direction,
        expectedPosition
      }: {
        direction: string
        expectedPosition: (originalPosition: Position) => Position
-      }) => {
+      }) {
        const originalPositions = await getPositions()
        await dragSelectNodes(comfyPage, clipNodes)
        await comfyPage.command.executeCommand(
@@ -671,7 +672,7 @@ test.describe('Canvas Interaction', { tag: '@screenshot' }, () => {
  })

  test('Cursor style changes when panning', async ({ comfyPage }) => {
-    const getCursorStyle = async () => {
+    async function getCursorStyle() {
      return await comfyPage.page.evaluate(() => {
        return (
          document.getElementById('graph-canvas')!.style.cursor || 'default'
@@ -703,7 +704,7 @@ test.describe('Canvas Interaction', { tag: '@screenshot' }, () => {
  test('Properly resets dragging state after pan mode sequence', async ({
    comfyPage
  }) => {
-    const getCursorStyle = async () => {
+    async function getCursorStyle() {
      return await comfyPage.page.evaluate(() => {
        return (
          document.getElementById('graph-canvas')!.style.cursor || 'default'
@@ -878,8 +879,9 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
    )
  })

-  const generateUniqueFilename = (extension = '') =>
-    `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}${extension}`
+  function generateUniqueFilename(extension = '') {
+    return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}${extension}`
+  }

  test.describe('Restore all open workflows on reload', () => {
    let workflowA: string
@@ -1077,7 +1079,7 @@ test.describe('Viewport settings', () => {
    comfyPage,
    comfyMouse
  }) => {
-    const changeTab = async (tab: Locator) => {
+    async function changeTab(tab: Locator) {
      await tab.click()
      await comfyPage.nextFrame()
      await comfyMouse.move(DefaultGraphPositions.emptySpace)
@@ -1406,7 +1408,7 @@ test.describe('Canvas Navigation', { tag: '@screenshot' }, () => {
    test('Cursor changes appropriately in different modes', async ({
      comfyPage
    }) => {
-      const getCursorStyle = async () => {
+      async function getCursorStyle() {
        return await comfyPage.page.evaluate(() => {
          return (
            document.getElementById('graph-canvas')!.style.cursor || 'default'
--- a/browser_tests/tests/load3d/gizmoControls.spec.ts
+++ b/browser_tests/tests/load3d/gizmoControls.spec.ts
@@ -3,14 +3,15 @@ import type { Page } from '@playwright/test'

 import { load3dTest as test } from '@e2e/fixtures/helpers/Load3DFixtures'

-const getGizmoConfig = (page: Page) =>
-  page.evaluate(() => {
+function getGizmoConfig(page: Page) {
+  return page.evaluate(() => {
    const n = window.app!.graph.getNodeById(1)
    const modelConfig = n?.properties?.['Model Config'] as
      | { gizmo?: { enabled: boolean; mode: string } }
      | undefined
    return modelConfig?.gizmo
  })
+}

 test.describe('Load3D Gizmo Controls', () => {
  test(
--- a/browser_tests/tests/load3d/load3d.spec.ts
+++ b/browser_tests/tests/load3d/load3d.spec.ts
@@ -155,7 +155,7 @@ test.describe('Load3D', () => {
    async ({ comfyPage, load3d }) => {
      await expect(load3d.uploadBackgroundImageButton).toBeVisible()
      const node = await comfyPage.nodeOps.getNodeRefById(1)
-      const readBackgroundImage = async () => {
+      async function readBackgroundImage() {
        const properties =
          await node.getProperty<Record<string, { backgroundImage?: string }>>(
            'properties'
@@ -222,7 +222,7 @@ test.describe('Load3D', () => {
      await expect(load3d.gridToggleButton).toBeVisible()

      const node = await comfyPage.nodeOps.getNodeRefById(1)
-      const readShowGrid = async () => {
+      async function readShowGrid() {
        const properties =
          await node.getProperty<Record<string, { showGrid?: boolean }>>(
            'properties'
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png
--- a/browser_tests/tests/nodeContextMenuShapeSubmenu.spec.ts
+++ b/browser_tests/tests/nodeContextMenuShapeSubmenu.spec.ts
@@ -0,0 +1,65 @@
+import { expect } from '@playwright/test'
+
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { openMoreOptionsMenu } from '@e2e/fixtures/utils/selectionToolboxMoreOptions'
+
+test.describe(
+  'Node context menu shape submenu (FE-570)',
+  { tag: '@ui' },
+  () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
+      await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
+    })
+
+    async function expectShapePopoverVisible(comfyPage: ComfyPage) {
+      const popover = comfyPage.page
+        .locator('.p-popover')
+        .filter({ hasText: 'Default' })
+      await expect(popover).toBeVisible()
+      await expect(popover).toContainText('Box')
+      await expect(popover).toContainText('Card')
+
+      const popoverBox = await popover.boundingBox()
+      expect(popoverBox).not.toBeNull()
+      expect(popoverBox!.width).toBeGreaterThan(0)
+      expect(popoverBox!.height).toBeGreaterThan(0)
+    }
+
+    test('Shape popover opens when the menu fits in the viewport', async ({
+      comfyPage
+    }) => {
+      await comfyPage.page.setViewportSize({ width: 1280, height: 900 })
+      const menu = await openMoreOptionsMenu(comfyPage, 'KSampler')
+      const rootList = menu.locator(':scope > ul')
+
+      await expect
+        .poll(() => rootList.evaluate((el) => getComputedStyle(el).overflowY))
+        .toBe('visible')
+
+      await menu.getByRole('menuitem', { name: 'Shape' }).click()
+      await expectShapePopoverVisible(comfyPage)
+    })
+
+    test('Shape popover opens even when the menu must scroll', async ({
+      comfyPage
+    }) => {
+      await comfyPage.page.setViewportSize({ width: 1280, height: 520 })
+      const menu = await openMoreOptionsMenu(comfyPage, 'KSampler')
+      const rootList = menu.locator(':scope > ul')
+
+      await expect
+        .poll(() =>
+          rootList.evaluate((el) => el.scrollHeight > el.clientHeight)
+        )
+        .toBe(true)
+
+      const shapeItem = menu.getByRole('menuitem', { name: 'Shape' })
+      await shapeItem.scrollIntoViewIfNeeded()
+      await shapeItem.click()
+      await expectShapePopoverVisible(comfyPage)
+    })
+  }
+)
--- a/browser_tests/tests/nodeHelp.spec.ts
+++ b/browser_tests/tests/nodeHelp.spec.ts
@@ -55,7 +55,7 @@ async function setLocaleAndWaitForWorkflowReload(
    const waitForReload = new Promise<void>((resolve, reject) => {
      const timeoutAt = performance.now() + 5000

-      const tick = () => {
+      function tick() {
        if (changeTracker.isLoadingGraph) {
          sawLoading = true
        }
--- a/browser_tests/tests/nodeSearchBox.spec.ts
+++ b/browser_tests/tests/nodeSearchBox.spec.ts
@@ -166,10 +166,10 @@ test.describe('Node search box', { tag: '@node' }, () => {
  })

  test.describe('Filtering', () => {
-    const expectFilterChips = async (
+    async function expectFilterChips(
      comfyPage: ComfyPage,
      expectedTexts: string[]
-    ) => {
+    ) {
      const chips = comfyPage.searchBox.filterChips

      // Check that the number of chips matches the expected count
--- a/browser_tests/tests/nodeSearchBoxV2.spec.ts
+++ b/browser_tests/tests/nodeSearchBoxV2.spec.ts
@@ -243,15 +243,18 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
      comfyPage
    }) => {
      const { searchBoxV2 } = comfyPage
-      const switchToDesktop = () =>
-        comfyPage.page.setViewportSize({ width: 1280, height: 800 })
-      const switchToMobile = () =>
-        comfyPage.page.setViewportSize({ width: 360, height: 800 })
-      const expectExpanded = (value: 'true' | 'false') =>
-        expect(searchBoxV2.sidebarToggle).toHaveAttribute(
+      function switchToDesktop() {
+        return comfyPage.page.setViewportSize({ width: 1280, height: 800 })
+      }
+      function switchToMobile() {
+        return comfyPage.page.setViewportSize({ width: 360, height: 800 })
+      }
+      function expectExpanded(value: 'true' | 'false') {
+        return expect(searchBoxV2.sidebarToggle).toHaveAttribute(
          'aria-expanded',
          value
        )
+      }

      await switchToDesktop()
      await searchBoxV2.open()
--- a/browser_tests/tests/nodeSearchBoxV2Extended.spec.ts
+++ b/browser_tests/tests/nodeSearchBoxV2Extended.spec.ts
@@ -312,7 +312,9 @@ test.describe('Node search box V2 extended', { tag: '@node' }, () => {
  test.describe('Search behavior', () => {
    test('Search narrows results progressively', async ({ comfyPage }) => {
      const { searchBoxV2 } = comfyPage
-      const getCount = () => searchBoxV2.results.count()
+      function getCount() {
+        return searchBoxV2.results.count()
+      }

      await searchBoxV2.open()

--- a/browser_tests/tests/painter.spec.ts
+++ b/browser_tests/tests/painter.spec.ts
@@ -758,8 +758,8 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
    await drawStroke(comfyPage.page, canvas, { yPct: 0.75 })
    await comfyPage.nextFrame()

-    const hasContentAtRow = (yFraction: number) =>
-      canvas.evaluate((el: HTMLCanvasElement, y: number) => {
+    function hasContentAtRow(yFraction: number) {
+      return canvas.evaluate((el: HTMLCanvasElement, y: number) => {
        const ctx = el.getContext('2d')
        if (!ctx) return false
        const cy = Math.floor(el.height * y)
@@ -769,6 +769,7 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
        }
        return false
      }, yFraction)
+    }

    await expect
      .poll(() => hasContentAtRow(0.25), {
--- a/browser_tests/tests/priceBadge.spec.ts
+++ b/browser_tests/tests/priceBadge.spec.ts
@@ -0,0 +1,41 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '@e2e/fixtures/ComfyPage'
+
+test('Price badge displays on subgraphs @vue-nodes', async ({ comfyPage }) => {
+  const apiNodeName = 'Node With Price Badge'
+  await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'v1 (legacy)')
+
+  const priceBadge = comfyPage.page.locator('.lg-node-header i + span')
+  const apiNode = comfyPage.vueNodes.getNodeByTitle(apiNodeName)
+
+  await comfyPage.menu.topbar.newWorkflowButton.click()
+  await comfyPage.nextFrame()
+
+  await comfyPage.page.mouse.dblclick(500, 500, { delay: 5 })
+  await comfyPage.searchBox.fillAndSelectFirstNode(apiNodeName)
+  await expect(comfyPage.searchBox.input).toBeHidden()
+  await expect(apiNode, 'Add partner node').toBeVisible()
+  await expect(apiNode.locator(priceBadge), 'Has price badge').toBeVisible()
+
+  await comfyPage.contextMenu
+    .openForVueNode(apiNode)
+    .then((m) => m.clickMenuItemExact('Convert to Subgraph'))
+  const subgraphNode = comfyPage.vueNodes.getNodeByTitle('New Subgraph')
+  await expect(subgraphNode, 'Convert to Subgraph').toBeVisible()
+
+  const nodePrice = subgraphNode.locator(priceBadge)
+  await expect(nodePrice, 'subgraphNode has price badge').toBeVisible()
+  const initialPrice = Number(await nodePrice.innerText())
+
+  await comfyPage.subgraph.editor.togglePromotion(subgraphNode, {
+    nodeName: apiNodeName,
+    widgetName: 'price',
+    toState: true
+  })
+  await comfyPage.vueNodes.selectComboOption('New Subgraph', 'price', '2x')
+  await expect(nodePrice, 'Price is reactive').toHaveText(
+    String(initialPrice * 2)
+  )
+})
--- a/browser_tests/tests/propertiesPanel/errorsTabMissingMediaRuntime.spec.ts
+++ b/browser_tests/tests/propertiesPanel/errorsTabMissingMediaRuntime.spec.ts
@@ -77,7 +77,7 @@ const cloudUploadRaceTest = comfyPageFixture.extend<{
    }
    cloudUploadAssetStateByPage.set(page, state)

-    const assetsRouteHandler = async (route: Route) => {
+    async function assetsRouteHandler(route: Route) {
      const allAssets = [
        cloudDefaultGraphInputAsset,
        ...(state.isUploadedAssetAvailable ? [cloudUploadedVideoAsset] : [])
@@ -149,7 +149,7 @@ async function delayNextUpload(comfyPage: ComfyPage) {
    releaseUpload = resolve
  })

-  const uploadRouteHandler = async (route: Route) => {
+  async function uploadRouteHandler(route: Route) {
    resolveUploadStarted()
    await release
    await route.continue()
--- a/browser_tests/tests/queueNotificationBanners.spec.ts
+++ b/browser_tests/tests/queueNotificationBanners.spec.ts
@@ -15,7 +15,9 @@ const REQUEST_ID_SECONDARY = 2
 const REQUEST_ID_MISMATCH = 999

 let nextRequestId = 1000
-const newRequestId = () => nextRequestId++
+function newRequestId() {
+  return nextRequestId++
+}

 function bannerLocator(page: Page) {
  return page.getByTestId(TestIds.queue.notificationBanner)
--- a/browser_tests/tests/remoteWidgets.spec.ts
+++ b/browser_tests/tests/remoteWidgets.spec.ts
@@ -6,11 +6,11 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 test.describe('Remote COMBO Widget', { tag: '@widget' }, () => {
  const mockOptions = ['d', 'c', 'b', 'a']

-  const addRemoteWidgetNode = async (
+  async function addRemoteWidgetNode(
    comfyPage: ComfyPage,
    nodeName: string,
    count: number = 1
-  ) => {
+  ) {
    const tab = comfyPage.menu.nodeLibraryTab
    await tab.open()
    await tab.getFolder('DevTools').click()
@@ -21,24 +21,24 @@ test.describe('Remote COMBO Widget', { tag: '@widget' }, () => {
    }
  }

-  const getWidgetOptions = async (
+  async function getWidgetOptions(
    comfyPage: ComfyPage,
    nodeName: string
-  ): Promise<string[] | undefined> => {
+  ): Promise<string[] | undefined> {
    return await comfyPage.page.evaluate((name) => {
      const node = window.app!.graph!.nodes.find((node) => node.title === name)
      return node!.widgets![0].options.values as string[] | undefined
    }, nodeName)
  }

-  const getWidgetValue = async (comfyPage: ComfyPage, nodeName: string) => {
+  async function getWidgetValue(comfyPage: ComfyPage, nodeName: string) {
    return await comfyPage.page.evaluate((name) => {
      const node = window.app!.graph!.nodes.find((node) => node.title === name)
      return node!.widgets![0].value
    }, nodeName)
  }

-  const clickRefreshButton = (comfyPage: ComfyPage, nodeName: string) => {
+  function clickRefreshButton(comfyPage: ComfyPage, nodeName: string) {
    return comfyPage.page.evaluate((name) => {
      const node = window.app!.graph!.nodes.find((node) => node.title === name)
      const buttonWidget = node!.widgets!.find((w) => w.name === 'refresh')
--- a/browser_tests/tests/selectionToolbox.spec.ts
+++ b/browser_tests/tests/selectionToolbox.spec.ts
@@ -13,16 +13,21 @@ test.beforeEach(async ({ comfyPage }) => {
 const BLUE_COLOR = 'rgb(51, 51, 85)'
 const RED_COLOR = 'rgb(85, 51, 51)'

-const getColorPickerButton = (comfyPage: { page: Page }) =>
-  comfyPage.page.getByTestId(TestIds.selectionToolbox.colorPickerButton)
+function getColorPickerButton(comfyPage: { page: Page }) {
+  return comfyPage.page.getByTestId(TestIds.selectionToolbox.colorPickerButton)
+}

-const getColorPickerCurrentColor = (comfyPage: { page: Page }) =>
-  comfyPage.page.getByTestId(TestIds.selectionToolbox.colorPickerCurrentColor)
+function getColorPickerCurrentColor(comfyPage: { page: Page }) {
+  return comfyPage.page.getByTestId(
+    TestIds.selectionToolbox.colorPickerCurrentColor
+  )
+}

-const getColorPickerGroup = (comfyPage: { page: Page }) =>
-  comfyPage.page.getByRole('group').filter({
+function getColorPickerGroup(comfyPage: { page: Page }) {
+  return comfyPage.page.getByRole('group').filter({
    has: comfyPage.page.getByTestId(TestIds.selectionToolbox.colorBlue)
  })
+}

 test.describe('Selection Toolbox', { tag: ['@screenshot', '@ui'] }, () => {
  test.beforeEach(async ({ comfyPage }) => {
--- a/browser_tests/tests/selectionToolboxSubmenus.spec.ts
+++ b/browser_tests/tests/selectionToolboxSubmenus.spec.ts
@@ -2,6 +2,7 @@ import { expect } from '@playwright/test'

 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { openMoreOptionsMenu } from '@e2e/fixtures/utils/selectionToolboxMoreOptions'

 test.beforeEach(async ({ comfyPage }) => {
  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
@@ -18,60 +19,8 @@ test.describe(
      await comfyPage.nextFrame()
    })

-    const openMoreOptions = async (comfyPage: ComfyPage) => {
-      const ksamplerNodes =
-        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
-      if (ksamplerNodes.length === 0) {
-        throw new Error('No KSampler nodes found')
-      }
-
-      // Drag the KSampler to the center of the screen
-      const nodePos = await ksamplerNodes[0].getPosition()
-      const viewportSize = comfyPage.page.viewportSize()
-      if (!viewportSize) {
-        throw new Error(
-          'Viewport size is null - page may not be properly initialized'
-        )
-      }
-      const centerX = viewportSize.width / 3
-      const centerY = viewportSize.height / 2
-      await comfyPage.canvasOps.dragAndDrop(
-        { x: nodePos.x, y: nodePos.y },
-        { x: centerX, y: centerY }
-      )
-      await comfyPage.nextFrame()
-
-      await ksamplerNodes[0].click('title')
-
-      await expect(comfyPage.page.locator('.selection-toolbox')).toBeVisible()
-
-      const moreOptionsBtn = comfyPage.page.getByTestId('more-options-button')
-      await expect(moreOptionsBtn).toBeVisible()
-
-      await moreOptionsBtn.click()
-
-      await comfyPage.nextFrame()
-
-      const menuOptionsVisible = await comfyPage.page
-        .getByText('Rename')
-        .isVisible({ timeout: 2000 })
-        .catch(() => false)
-      if (menuOptionsVisible) {
-        return
-      }
-
-      await moreOptionsBtn.click()
-      await comfyPage.nextFrame()
-
-      const menuOptionsVisibleAfterClick = await comfyPage.page
-        .getByText('Rename')
-        .isVisible({ timeout: 2000 })
-        .catch(() => false)
-      if (menuOptionsVisibleAfterClick) {
-        return
-      }
-
-      throw new Error('Could not open More Options menu - popover not showing')
+    function openMoreOptions(comfyPage: ComfyPage) {
+      return openMoreOptionsMenu(comfyPage, 'KSampler')
    }

    test('hides Node Info from More Options menu when the new menu is disabled', async ({
@@ -92,11 +41,14 @@ test.describe(
      )[0]

      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Shape', { exact: true }).hover()
-      await expect(
-        comfyPage.page.getByText('Box', { exact: true })
-      ).toBeVisible()
-      await comfyPage.page.getByText('Box', { exact: true }).click()
+      // Shape now opens via body-appended popover (FE-570); a hover no
+      // longer reveals the submenu — match the Color flow and click.
+      await comfyPage.page.getByText('Shape', { exact: true }).click()
+      const shapePopover = comfyPage.page
+        .locator('.p-popover')
+        .filter({ hasText: 'Default' })
+      await expect(shapePopover.getByText('Box', { exact: true })).toBeVisible()
+      await shapePopover.getByText('Box', { exact: true }).click()
      await comfyPage.nextFrame()

      await expect.poll(() => nodeRef.getProperty<number>('shape')).toBe(1)
--- a/browser_tests/tests/sharedWorkflowMissingMedia.spec.ts
+++ b/browser_tests/tests/sharedWorkflowMissingMedia.spec.ts
@@ -0,0 +1,147 @@
+import { expect, mergeTests } from '@playwright/test'
+
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { TestIds } from '@e2e/fixtures/selectors'
+import {
+  sharedWorkflowImportFixture,
+  sharedWorkflowImportScenario
+} from '@e2e/fixtures/sharedWorkflowImportFixture'
+import type { SharedWorkflowImportMocks } from '@e2e/fixtures/sharedWorkflowImportFixture'
+import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper'
+import type { WorkspaceStore } from '@e2e/types/globals'
+
+const IMPORT_ORDER_TIMEOUT_MS = 5_000
+
+async function expectImportPrecedesPublicInclusiveInputAssetScan(
+  mocks: SharedWorkflowImportMocks
+): Promise<void> {
+  await expect(async () => {
+    const events = mocks.getRequestEvents()
+    const importIndex = events.indexOf('import')
+    const afterImportIndex = events.indexOf(
+      'input-assets-including-public-after-import'
+    )
+
+    expect(
+      events,
+      'public-inclusive input assets must not be scanned before import'
+    ).not.toContain('input-assets-including-public-before-import')
+    expect(importIndex, `events: ${events.join(',')}`).toBeGreaterThanOrEqual(0)
+    expect(afterImportIndex, `events: ${events.join(',')}`).toBeGreaterThan(
+      importIndex
+    )
+  }).toPass({ timeout: IMPORT_ORDER_TIMEOUT_MS })
+}
+
+async function getCachedMissingMediaWarningNames(
+  comfyPage: ComfyPage
+): Promise<string[] | null> {
+  return await comfyPage.page.evaluate(() => {
+    const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
+      .activeWorkflow
+    if (!workflow) return null
+
+    return (
+      workflow.pendingWarnings?.missingMediaCandidates?.map(
+        (candidate) => candidate.name
+      ) ?? []
+    )
+  })
+}
+
+async function expectNoMissingMediaAfterPublicInclusiveAssetScan(
+  comfyPage: ComfyPage,
+  mocks: SharedWorkflowImportMocks
+): Promise<void> {
+  await mocks.waitForPublicInclusiveInputAssetResponseAfterImport()
+  await comfyPage.nextFrame()
+
+  await expect(
+    comfyPage.page.getByTestId(TestIds.dialogs.errorOverlay)
+  ).toBeHidden()
+  await expect
+    .poll(() => getCachedMissingMediaWarningNames(comfyPage))
+    .toEqual([])
+}
+
+async function openPanelAndExpectNoMissingMedia(
+  comfyPage: ComfyPage
+): Promise<void> {
+  const page = comfyPage.page
+  const errorOverlay = page.getByTestId(TestIds.dialogs.errorOverlay)
+  await expect(errorOverlay).toBeHidden()
+
+  const panel = new PropertiesPanelHelper(page)
+  await panel.open(comfyPage.actionbar.propertiesButton)
+  await expect(
+    panel.root.getByTestId(TestIds.propertiesPanel.errorsTab)
+  ).toBeHidden()
+  await expect(page.getByTestId(TestIds.dialogs.missingMediaGroup)).toHaveCount(
+    0
+  )
+}
+
+const test = mergeTests(comfyPageFixture, sharedWorkflowImportFixture)
+
+test.describe('Shared workflow missing media', { tag: '@cloud' }, () => {
+  // Missing media only surfaces the overlay when the Errors tab is enabled
+  // (src/stores/executionErrorStore.ts).
+  test.use({
+    initialSettings: {
+      'Comfy.RightSidePanel.ShowErrorsTab': true
+    }
+  })
+
+  test.beforeEach(async ({ comfyPage, sharedWorkflowImportMocks }) => {
+    sharedWorkflowImportMocks.resetAndStartRecording()
+    await comfyPage.setup({
+      clearStorage: false,
+      url: `/?share=${sharedWorkflowImportScenario.shareId}`
+    })
+  })
+
+  test('imports shared media before loading workflow so missing media is not surfaced', async ({
+    comfyPage,
+    sharedWorkflowImportMocks
+  }) => {
+    const { page } = comfyPage
+
+    const dialog = page.getByTestId(TestIds.dialogs.openSharedWorkflow)
+    await expect(
+      dialog.getByTestId(TestIds.dialogs.openSharedWorkflowTitle)
+    ).toBeVisible()
+
+    await dialog.getByTestId(TestIds.dialogs.openSharedWorkflowConfirm).click()
+
+    await expect
+      .poll(() =>
+        page.evaluate(() =>
+          window.app!.graph.nodes.map((node) => ({
+            type: node.type,
+            value: node.widgets?.[0]?.value
+          }))
+        )
+      )
+      .toEqual([
+        {
+          type: 'LoadImage',
+          value: sharedWorkflowImportScenario.inputFileName
+        }
+      ])
+    await expectImportPrecedesPublicInclusiveInputAssetScan(
+      sharedWorkflowImportMocks
+    )
+    await expectNoMissingMediaAfterPublicInclusiveAssetScan(
+      comfyPage,
+      sharedWorkflowImportMocks
+    )
+
+    expect(sharedWorkflowImportMocks.getImportBody()).toEqual({
+      published_asset_ids: [sharedWorkflowImportScenario.publishedAssetId],
+      share_id: sharedWorkflowImportScenario.shareId
+    })
+    expect(new URL(page.url()).searchParams.has('share')).toBe(false)
+    await openPanelAndExpectNoMissingMedia(comfyPage)
+  })
+})
--- a/browser_tests/tests/sidebar/jobHistory.spec.ts
+++ b/browser_tests/tests/sidebar/jobHistory.spec.ts
@@ -7,12 +7,10 @@ import {
  jobsRouteFixture,
  routeMockJobTimestamp
 } from '@e2e/fixtures/jobsRouteFixture'
-import type { JobsRouteMocker } from '@e2e/fixtures/jobsRouteFixture'
+import type { JobsScenario } from '@e2e/fixtures/jobsRouteFixture'
 import { TestIds } from '@e2e/fixtures/selectors'
 import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'

-const test = mergeTests(comfyPageFixture, jobsRouteFixture)
-
 const historyJobs: RawJobListItem[] = [
  createRouteMockJob({
    id: 'history-completed',
@@ -75,21 +73,24 @@ const activeJobs: RawJobListItem[] = [
 ]
 const runningOnlyJobs = activeJobs.filter((job) => job.status !== 'pending')

-async function setupJobHistorySidebar(
-  comfyPage: ComfyPage,
-  jobsRoutes: JobsRouteMocker,
-  {
-    history = historyJobs,
-    queue = activeJobs
-  }: {
-    history?: readonly RawJobListItem[]
-    queue?: readonly RawJobListItem[]
-  } = {}
-) {
-  await jobsRoutes.mockJobsScenario({ history, queue })
-  await comfyPage.settings.setSetting('Comfy.Queue.QPOV2', true)
-  await comfyPage.setup()
+const test = mergeTests(comfyPageFixture, jobsRouteFixture).extend<{
+  initialJobsScenario: JobsScenario
+  mockInitialJobsScenario: void
+}>({
+  initialJobsScenario: [
+    { history: historyJobs, queue: activeJobs },
+    { option: true }
+  ],
+  mockInitialJobsScenario: [
+    async ({ jobsRoutes, initialJobsScenario }, use) => {
+      await jobsRoutes.mockJobsScenario(initialJobsScenario)
+      await use()
+    },
+    { auto: true }
+  ]
+})

+async function openJobHistorySidebar(comfyPage: ComfyPage) {
  await comfyPage.page
    .getByTestId(TestIds.sidebar.toolbar)
    .getByRole('button', { name: 'Job History', exact: true })
@@ -122,159 +123,152 @@ async function openSidebarClearHistoryDialog(comfyPage: ComfyPage) {
 }

 test.describe('Job history sidebar', { tag: '@ui' }, () => {
-  test('opens from the queue overlay docked history action', async ({
-    comfyPage,
-    jobsRoutes
-  }) => {
-    await jobsRoutes.mockJobsScenario({
-      history: historyJobs,
-      queue: activeJobs
+  test.describe('docked overlay action', () => {
+    test.use({ initialSettings: { 'Comfy.Queue.QPOV2': false } })
+
+    test('opens from the queue overlay docked history action', async ({
+      comfyPage
+    }) => {
+      await comfyPage.page.getByTestId(TestIds.queue.overlayToggle).click()
+      await comfyPage.queuePanel.moreOptionsButton.click()
+      await comfyPage.page
+        .getByTestId(TestIds.queue.dockedJobHistoryAction)
+        .click()
+
+      await expect(jobHistorySidebar(comfyPage)).toBeVisible()
+      await expect(jobRow(comfyPage)('history-completed')).toBeVisible()
+      await expect(jobRow(comfyPage)('queue-pending')).toBeVisible()
    })
-    await comfyPage.settings.setSetting('Comfy.Queue.QPOV2', false)
-    await comfyPage.setup()
-
-    await comfyPage.page.getByTestId(TestIds.queue.overlayToggle).click()
-    await comfyPage.queuePanel.moreOptionsButton.click()
-    await comfyPage.page
-      .getByTestId(TestIds.queue.dockedJobHistoryAction)
-      .click()
-
-    await expect(jobHistorySidebar(comfyPage)).toBeVisible()
-    await expect(jobRow(comfyPage)('history-completed')).toBeVisible()
-    await expect(jobRow(comfyPage)('queue-pending')).toBeVisible()
  })

-  test('shows terminal and active job states', async ({
-    comfyPage,
-    jobsRoutes
-  }) => {
-    await setupJobHistorySidebar(comfyPage, jobsRoutes)
+  test.describe('expanded history tab', () => {
+    test.use({ initialSettings: { 'Comfy.Queue.QPOV2': true } })

-    const row = jobRow(comfyPage)
-    await expect(row('queue-pending')).toBeVisible()
-    await expect(row('queue-running')).toBeVisible()
-    await expect(row('history-completed')).toBeVisible()
-    await expect(row('history-failed')).toBeVisible()
-    await expect(row('history-cancelled')).toBeVisible()
+    test('shows terminal and active job states', async ({ comfyPage }) => {
+      await openJobHistorySidebar(comfyPage)

-    await expect(clearQueueButton(comfyPage)).toBeEnabled()
-  })
+      const row = jobRow(comfyPage)
+      await expect(row('queue-pending')).toBeVisible()
+      await expect(row('queue-running')).toBeVisible()
+      await expect(row('history-completed')).toBeVisible()
+      await expect(row('history-failed')).toBeVisible()
+      await expect(row('history-cancelled')).toBeVisible()

-  test('filters completed and failed history jobs', async ({
-    comfyPage,
-    jobsRoutes
-  }) => {
-    await setupJobHistorySidebar(comfyPage, jobsRoutes)
-
-    await comfyPage.page
-      .getByRole('button', { name: 'Completed', exact: true })
-      .click()
-
-    const row = jobRow(comfyPage)
-    await expect(row('history-completed')).toBeVisible()
-    await expect(row('history-failed')).toBeHidden()
-    await expect(row('queue-running')).toBeHidden()
-
-    await comfyPage.page
-      .getByRole('button', { name: 'Failed', exact: true })
-      .click()
-
-    await expect(row('history-failed')).toBeVisible()
-    await expect(row('history-cancelled')).toBeVisible()
-    await expect(row('history-completed')).toBeHidden()
-  })
-
-  test('searches by job id and output filename', async ({
-    comfyPage,
-    jobsRoutes
-  }) => {
-    await setupJobHistorySidebar(comfyPage, jobsRoutes)
-
-    const row = jobRow(comfyPage)
-    const searchInput = comfyPage.page.getByPlaceholder('Search...')
-
-    await searchInput.fill('history-failed')
-    await expect(row('history-failed')).toBeVisible()
-    await expect(row('history-completed')).toBeHidden()
-    await expect(row('queue-running')).toBeHidden()
-
-    await searchInput.fill('completed-output')
-    await expect(row('history-completed')).toBeVisible()
-    await expect(row('history-failed')).toBeHidden()
-
-    await searchInput.clear()
-    await expect(row('history-completed')).toBeVisible()
-    await expect(row('queue-running')).toBeVisible()
-  })
-
-  test('disables clear queue when there are no pending jobs', async ({
-    comfyPage,
-    jobsRoutes
-  }) => {
-    await setupJobHistorySidebar(comfyPage, jobsRoutes, {
-      queue: runningOnlyJobs
+      await expect(clearQueueButton(comfyPage)).toBeEnabled()
    })

-    await expect(clearQueueButton(comfyPage)).toBeDisabled()
-  })
+    test('filters completed and failed history jobs', async ({ comfyPage }) => {
+      await openJobHistorySidebar(comfyPage)

-  test('clears pending queue jobs and leaves running/history jobs', async ({
-    comfyPage,
-    jobsRoutes
-  }) => {
-    await setupJobHistorySidebar(comfyPage, jobsRoutes)
+      await comfyPage.page
+        .getByRole('button', { name: 'Completed', exact: true })
+        .click()

-    const row = jobRow(comfyPage)
-    await expect(row('queue-pending')).toBeVisible()
+      const row = jobRow(comfyPage)
+      await expect(row('history-completed')).toBeVisible()
+      await expect(row('history-failed')).toBeHidden()
+      await expect(row('queue-running')).toBeHidden()

-    const clearQueueRequests = await jobsRoutes.mockClearQueue()
-    const clearHistoryRequests = await jobsRoutes.mockClearHistory()
-    await jobsRoutes.mockJobsScenario({
-      history: historyJobs,
-      queue: runningOnlyJobs
+      await comfyPage.page
+        .getByRole('button', { name: 'Failed', exact: true })
+        .click()
+
+      await expect(row('history-failed')).toBeVisible()
+      await expect(row('history-cancelled')).toBeVisible()
+      await expect(row('history-completed')).toBeHidden()
    })

-    await clearQueueButton(comfyPage).click()
+    test('searches by job id and output filename', async ({ comfyPage }) => {
+      await openJobHistorySidebar(comfyPage)

-    await expect.poll(() => clearQueueRequests.length).toBe(1)
-    expect(clearQueueRequests).toContainEqual({ clear: true })
-    await expect(row('queue-pending')).toBeHidden()
-    await expect(row('queue-running')).toBeVisible()
-    await expect(row('history-completed')).toBeVisible()
-    await expect(clearQueueButton(comfyPage)).toBeDisabled()
-    expect(clearHistoryRequests).toHaveLength(0)
-  })
+      const row = jobRow(comfyPage)
+      const searchInput = comfyPage.page.getByPlaceholder('Search...')

-  test('clears history from the sidebar menu and keeps active jobs', async ({
-    comfyPage,
-    jobsRoutes
-  }) => {
-    await setupJobHistorySidebar(comfyPage, jobsRoutes)
+      await searchInput.fill('history-failed')
+      await expect(row('history-failed')).toBeVisible()
+      await expect(row('history-completed')).toBeHidden()
+      await expect(row('queue-running')).toBeHidden()

-    const row = jobRow(comfyPage)
-    await expect(row('history-completed')).toBeVisible()
+      await searchInput.fill('completed-output')
+      await expect(row('history-completed')).toBeVisible()
+      await expect(row('history-failed')).toBeHidden()

-    const clearHistoryRequests = await jobsRoutes.mockClearHistory()
-    const clearQueueRequests = await jobsRoutes.mockClearQueue()
-    await jobsRoutes.mockJobsScenario({
-      history: [],
-      queue: activeJobs
+      await searchInput.clear()
+      await expect(row('history-completed')).toBeVisible()
+      await expect(row('queue-running')).toBeVisible()
    })

-    await openSidebarClearHistoryDialog(comfyPage)
-    await expect(
-      comfyPage.page.getByText('Clear your job queue history?')
-    ).toBeVisible()
-    await comfyPage.page
-      .getByRole('button', { name: 'Clear', exact: true })
-      .click()
+    test('clears pending queue jobs and leaves running/history jobs', async ({
+      comfyPage,
+      jobsRoutes
+    }) => {
+      await openJobHistorySidebar(comfyPage)

-    await expect.poll(() => clearHistoryRequests.length).toBe(1)
-    expect(clearHistoryRequests).toContainEqual({ clear: true })
-    await expect(row('history-completed')).toBeHidden()
-    await expect(row('history-failed')).toBeHidden()
-    await expect(row('queue-running')).toBeVisible()
-    await expect(row('queue-pending')).toBeVisible()
-    expect(clearQueueRequests).toHaveLength(0)
+      const row = jobRow(comfyPage)
+      await expect(row('queue-pending')).toBeVisible()
+
+      const clearQueueRequests = await jobsRoutes.mockClearQueue()
+      const clearHistoryRequests = await jobsRoutes.mockClearHistory()
+      await jobsRoutes.mockJobsScenario({
+        history: historyJobs,
+        queue: runningOnlyJobs
+      })
+
+      await clearQueueButton(comfyPage).click()
+
+      await expect.poll(() => clearQueueRequests.length).toBe(1)
+      expect(clearQueueRequests).toContainEqual({ clear: true })
+      await expect(row('queue-pending')).toBeHidden()
+      await expect(row('queue-running')).toBeVisible()
+      await expect(row('history-completed')).toBeVisible()
+      await expect(clearQueueButton(comfyPage)).toBeDisabled()
+      expect(clearHistoryRequests).toHaveLength(0)
+    })
+
+    test('clears history from the sidebar menu and keeps active jobs', async ({
+      comfyPage,
+      jobsRoutes
+    }) => {
+      await openJobHistorySidebar(comfyPage)
+
+      const row = jobRow(comfyPage)
+      await expect(row('history-completed')).toBeVisible()
+
+      const clearHistoryRequests = await jobsRoutes.mockClearHistory()
+      const clearQueueRequests = await jobsRoutes.mockClearQueue()
+      await jobsRoutes.mockJobsScenario({
+        history: [],
+        queue: activeJobs
+      })
+
+      await openSidebarClearHistoryDialog(comfyPage)
+      await expect(
+        comfyPage.page.getByText('Clear your job queue history?')
+      ).toBeVisible()
+      await comfyPage.page
+        .getByRole('button', { name: 'Clear', exact: true })
+        .click()
+
+      await expect.poll(() => clearHistoryRequests.length).toBe(1)
+      expect(clearHistoryRequests).toContainEqual({ clear: true })
+      await expect(row('history-completed')).toBeHidden()
+      await expect(row('history-failed')).toBeHidden()
+      await expect(row('queue-running')).toBeVisible()
+      await expect(row('queue-pending')).toBeVisible()
+      expect(clearQueueRequests).toHaveLength(0)
+    })
+  })
+
+  test.describe('without pending queue jobs', () => {
+    test.use({
+      initialJobsScenario: { history: historyJobs, queue: runningOnlyJobs },
+      initialSettings: { 'Comfy.Queue.QPOV2': true }
+    })
+
+    test('disables clear queue', async ({ comfyPage }) => {
+      await openJobHistorySidebar(comfyPage)
+
+      await expect(clearQueueButton(comfyPage)).toBeDisabled()
+    })
  })
 })
--- a/browser_tests/tests/sidebar/sidebarSplitterWidth.spec.ts
+++ b/browser_tests/tests/sidebar/sidebarSplitterWidth.spec.ts
@@ -114,11 +114,12 @@ test.describe('Sidebar splitter width independence', () => {
    await dragGutter(comfyPage, 80)

    // Check that saved sizes sum to ~100%
-    const getSidebarSizes = () =>
-      comfyPage.page.evaluate(() => {
+    function getSidebarSizes() {
+      return comfyPage.page.evaluate(() => {
        const raw = localStorage.getItem('unified-sidebar')
        return raw ? (JSON.parse(raw) as number[]) : null
      })
+    }

    await expect
      .poll(async () => {
--- a/browser_tests/tests/subgraph/subgraphBreadcrumb.spec.ts
+++ b/browser_tests/tests/subgraph/subgraphBreadcrumb.spec.ts
@@ -25,7 +25,7 @@ const MISSING_NODES_SUBGRAPH_NODE_ID = '2'
 * the root graph, then the inner subgraph node that appears inside. Matches
 * how a user navigates via the canvas.
 */
-const enterNestedSubgraphs = async (comfyPage: ComfyPage) => {
+async function enterNestedSubgraphs(comfyPage: ComfyPage) {
  const outerNode = await comfyPage.nodeOps.getNodeRefById(
    OUTER_SUBGRAPH_NODE_ID_IN_NESTED
  )
--- a/browser_tests/tests/subgraph/subgraphPromotion.spec.ts
+++ b/browser_tests/tests/subgraph/subgraphPromotion.spec.ts
@@ -689,7 +689,9 @@ test('Can intermix linked and proxy @vue-nodes', async ({ comfyPage }) => {
    const fromSlot = ksampler.getSlot('steps')
    const toPos = await comfyPage.subgraph.getInputSlot().getOpenSlotPosition()
    await fromSlot.dragTo(comfyPage.canvas, { targetPosition: toPos })
-    const isConnected = () => comfyPage.vueNodes.isSlotConnected(fromSlot)
+    function isConnected() {
+      return comfyPage.vueNodes.isSlotConnected(fromSlot)
+    }
    await expect.poll(isConnected).toBe(true)

    await comfyPage.subgraph.exitViaBreadcrumb()
@@ -735,7 +737,9 @@ test('Link already promoted widget @vue-nodes', async ({ comfyPage }) => {
    const fromSlot = ksampler.getSlot('steps')
    const toPos = await comfyPage.subgraph.getInputSlot().getOpenSlotPosition()
    await fromSlot.dragTo(comfyPage.canvas, { targetPosition: toPos })
-    const isConnected = () => comfyPage.vueNodes.isSlotConnected(fromSlot)
+    function isConnected() {
+      return comfyPage.vueNodes.isSlotConnected(fromSlot)
+    }
    await expect.poll(isConnected).toBe(true)

    await comfyPage.subgraph.exitViaBreadcrumb()
@@ -812,7 +816,9 @@ test('Linked widgets can not be demoted @vue-nodes', async ({ comfyPage }) => {
    const fromSlot = ksampler.getSlot('steps')
    const toPos = await comfyPage.subgraph.getInputSlot().getOpenSlotPosition()
    await fromSlot.dragTo(comfyPage.canvas, { targetPosition: toPos })
-    const isConnected = () => comfyPage.vueNodes.isSlotConnected(fromSlot)
+    function isConnected() {
+      return comfyPage.vueNodes.isSlotConnected(fromSlot)
+    }
    await expect.poll(isConnected).toBe(true)

    await comfyPage.subgraph.exitViaBreadcrumb()
--- a/browser_tests/tests/subgraph/subgraphSerialization.spec.ts
+++ b/browser_tests/tests/subgraph/subgraphSerialization.spec.ts
@@ -368,15 +368,16 @@ test.describe('Subgraph Serialization', { tag: ['@subgraph'] }, () => {
        ]

        const SENTINEL_IDS = new Set([-1, -10, -20])
-        const isSentinelNodeId = (id: number | string): id is number =>
-          typeof id === 'number' && SENTINEL_IDS.has(id)
+        function isSentinelNodeId(id: number | string): id is number {
+          return typeof id === 'number' && SENTINEL_IDS.has(id)
+        }

-        const checkEndpoint = (
+        function checkEndpoint(
          label: string,
          kind: 'origin_id' | 'target_id',
          id: number | string,
          g: typeof graph
-        ): string | null => {
+        ): string | null {
          if (isSentinelNodeId(id)) return null
          if (typeof id !== 'number' || !g._nodes_by_id[id]) {
            return `${label}: ${kind} ${id} invalid or not found`
--- a/browser_tests/tests/subgraph/subgraphSlots.spec.ts
+++ b/browser_tests/tests/subgraph/subgraphSlots.spec.ts
@@ -632,3 +632,75 @@ test.describe('Subgraph Slots', { tag: ['@slow', '@subgraph'] }, () => {
    })
  })
 })
+
+test(
+  'link interactions',
+  { tag: ['@vue-nodes', '@subgraph'] },
+  async ({ comfyPage }) => {
+    await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
+    await comfyPage.vueNodes.enterSubgraph('2')
+
+    const ksampler = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
+    const seedSlot = ksampler.getSlot('seed')
+    const seedIOSlot = await comfyPage.subgraph.getInputSlot('seed')
+
+    await test.step('Make second INT typed connection', async () => {
+      const toPos = await seedIOSlot.getOpenSlotPosition()
+      await seedSlot.dragTo(comfyPage.canvas, { targetPosition: toPos })
+      function isConnected() {
+        return comfyPage.vueNodes.isSlotConnected(seedSlot)
+      }
+      await expect.poll(isConnected).toBe(true)
+    })
+
+    const stepsSlot = ksampler.getSlot('steps')
+
+    await test.step('Node -> I/O hover effect', async () => {
+      await stepsSlot.hover()
+      await stepsSlot.click({ trial: true })
+      await comfyPage.page.mouse.down()
+      await comfyPage.canvas.hover({ position: await seedIOSlot.getPosition() })
+
+      const rawClip = await comfyPage.subgraph.getInputBounds()
+      const absolutePos = await comfyPage.canvasOps.toAbsolute(rawClip)
+      const clip = { ...rawClip, ...absolutePos }
+      await expect(comfyPage.page).toHaveScreenshot('vue-io-highlight.png', {
+        clip
+      })
+
+      //cancel link operation
+      await stepsSlot.hover()
+      await comfyPage.page.mouse.up()
+    })
+
+    await ksampler.title.hover()
+
+    const slotParent = stepsSlot.locator('../..')
+    await expect(slotParent, 'unconnected slot is hidden').toHaveCSS(
+      'opacity',
+      '0'
+    )
+
+    await test.step('Connect I/O to node with snap', async () => {
+      function hasSnap() {
+        return comfyPage.page.evaluate(() => !!app!.canvas._highlight_pos)
+      }
+      expect(await hasSnap()).toBe(false)
+
+      const emptySlotPos = await seedIOSlot.getOpenSlotPosition()
+      await comfyPage.canvas.hover({ position: emptySlotPos })
+      await comfyPage.page.mouse.down()
+      await stepsSlot.hover()
+      await expect.poll(hasSnap).toBe(true)
+      await comfyPage.page.mouse.up()
+
+      //move hover off the slot
+      await ksampler.title.hover()
+    })
+
+    await expect(slotParent, 'connected slot is visible').not.toHaveCSS(
+      'opacity',
+      '0'
+    )
+  }
+)
--- a/browser_tests/tests/subgraph/subgraphSlots.spec.ts-snapshots/vue-io-highlight-chromium-linux.png
+++ b/browser_tests/tests/subgraph/subgraphSlots.spec.ts-snapshots/vue-io-highlight-chromium-linux.png
--- a/browser_tests/tests/subgraph/subgraphZeroUuid.spec.ts
+++ b/browser_tests/tests/subgraph/subgraphZeroUuid.spec.ts
@@ -14,7 +14,7 @@ test.describe(
      )
      await comfyPage.vueNodes.waitForNodes()

-      const assertInSubgraph = async (inSubgraph: boolean) => {
+      async function assertInSubgraph(inSubgraph: boolean) {
        await expect
          .poll(() => comfyPage.subgraph.isInSubgraph())
          .toBe(inSubgraph)
--- a/browser_tests/tests/templates.spec.ts
+++ b/browser_tests/tests/templates.spec.ts
@@ -143,7 +143,7 @@ test.describe('Templates', { tag: ['@slow', '@workflow'] }, () => {
    })

    await expect(
-      comfyPage.page.getByRole('heading', { name: 'Open shared workflow' })
+      comfyPage.page.getByTestId(TestIds.dialogs.openSharedWorkflowTitle)
    ).toBeVisible()

    await expect(comfyPage.templates.content).toBeHidden()
--- a/browser_tests/tests/versionMismatchWarnings.spec.ts
+++ b/browser_tests/tests/versionMismatchWarnings.spec.ts
@@ -7,9 +7,9 @@ test.describe('Version Mismatch Warnings', { tag: '@slow' }, () => {
  const ALWAYS_AHEAD_OF_INSTALLED_VERSION = '100.100.100'
  const ALWAYS_BEHIND_INSTALLED_VERSION = '0.0.0'

-  const createMockSystemStatsRes = (
+  function createMockSystemStatsRes(
    requiredFrontendVersion: string
-  ): SystemStats => {
+  ): SystemStats {
    return {
      system: {
        os: 'posix',
--- a/browser_tests/tests/vueNodes/groups/groups.spec.ts
+++ b/browser_tests/tests/vueNodes/groups/groups.spec.ts
@@ -79,7 +79,7 @@ async function getNodeGroupCenteringErrors(

    const nodeRect = nodeElement.getBoundingClientRect()

-    const getCenteringError = (group: GraphGroup): NodeGroupCenteringError => {
+    function getCenteringError(group: GraphGroup): NodeGroupCenteringError {
      const [groupStartX, groupStartY] = app.canvasPosToClientPos([
        group.pos[0],
        group.pos[1]
--- a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts
@@ -1151,12 +1151,14 @@ test.describe('Vue Node Widget Link Position', { tag: '@vue-nodes' }, () => {
    const ksampler = await comfyPage.page.evaluate(() => {
      const node = window.app!.graph.nodes.find((n) => n.type === 'KSampler')
      if (!node) return null
-      const findIndex = (name: string) =>
-        node.inputs.findIndex(
+      const ksamplerNode = node
+      function findIndex(name: string) {
+        return ksamplerNode.inputs.findIndex(
          (input) => input.name === name || input.widget?.name === name
        )
+      }
      return {
-        id: node.id,
+        id: ksamplerNode.id,
        denoiseIndex: findIndex('denoise'),
        schedulerIndex: findIndex('scheduler')
      }
--- a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts
@@ -8,10 +8,10 @@ import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import type { Position } from '@e2e/fixtures/types'

 test.describe('Vue Node Moving', { tag: '@vue-nodes' }, () => {
-  const getHeaderPos = async (
+  async function getHeaderPos(
    comfyPage: ComfyPage,
    title: string
-  ): Promise<{ x: number; y: number; width: number; height: number }> => {
+  ): Promise<{ x: number; y: number; width: number; height: number }> {
    const box = await comfyPage.vueNodes
      .getNodeByTitle(title)
      .getByTestId('node-title')
@@ -21,27 +21,30 @@ test.describe('Vue Node Moving', { tag: '@vue-nodes' }, () => {
    return box
  }

-  const getLoadCheckpointHeaderPos = async (comfyPage: ComfyPage) =>
-    getHeaderPos(comfyPage, 'Load Checkpoint')
+  async function getLoadCheckpointHeaderPos(comfyPage: ComfyPage) {
+    return getHeaderPos(comfyPage, 'Load Checkpoint')
+  }

-  const expectPosChanged = async (pos1: Position, pos2: Position) => {
+  async function expectPosChanged(pos1: Position, pos2: Position) {
    const diffX = Math.abs(pos2.x - pos1.x)
    const diffY = Math.abs(pos2.y - pos1.y)
    expect(diffX).toBeGreaterThan(0)
    expect(diffY).toBeGreaterThan(0)
  }

-  const deltaBetween = (before: Position, after: Position) => ({
-    x: after.x - before.x,
-    y: after.y - before.y
-  })
+  function deltaBetween(before: Position, after: Position) {
+    return {
+      x: after.x - before.x,
+      y: after.y - before.y
+    }
+  }

-  const expectSameDelta = (a: Position, b: Position, tol = 2) => {
+  function expectSameDelta(a: Position, b: Position, tol = 2) {
    expect(Math.abs(a.x - b.x)).toBeLessThanOrEqual(tol)
    expect(Math.abs(a.y - b.y)).toBeLessThanOrEqual(tol)
  }

-  const dragFromTabButton = async (comfyPage: ComfyPage, button: Locator) => {
+  async function dragFromTabButton(comfyPage: ComfyPage, button: Locator) {
    const box = await button.boundingBox()
    if (!box) throw new Error('Tab button has no bounding box')
    const start = {
@@ -172,7 +175,7 @@ test.describe('Vue Node Moving', { tag: '@vue-nodes' }, () => {
    const dx = 120
    const dy = 80

-    const clickNodeTitleWithMeta = async (title: string) => {
+    async function clickNodeTitleWithMeta(title: string) {
      await comfyPage.vueNodes
        .getNodeByTitle(title)
        .getByTestId('node-title')
--- a/browser_tests/tests/vueNodes/widgets/legacy.spec.ts
+++ b/browser_tests/tests/vueNodes/widgets/legacy.spec.ts
@@ -15,10 +15,11 @@ test('@vue-nodes In App Mode, widget width updates with panel size', async ({
    await comfyPage.appMode.enterAppModeWithInputs([['10', 'legacy_widget']])
  })

-  const getWidth = () =>
-    comfyPage.page.evaluate(
+  function getWidth() {
+    return comfyPage.page.evaluate(
      () => graph!.getNodeById(10)!.widgets![0].width ?? 0
    )
+  }

  await test.step('Mouse clicks resolve to button regions', async () => {
    const legacyWidget = comfyPage.appMode.linearWidgets.locator('canvas')
--- a/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts
+++ b/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts
@@ -5,11 +5,15 @@ import {
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'

 test.describe('Vue Multiline String Widget', { tag: '@vue-nodes' }, () => {
-  const getFirstClipNode = (comfyPage: ComfyPage) =>
-    comfyPage.vueNodes.getNodeByTitle('CLIP Text Encode (Prompt)').first()
+  function getFirstClipNode(comfyPage: ComfyPage) {
+    return comfyPage.vueNodes
+      .getNodeByTitle('CLIP Text Encode (Prompt)')
+      .first()
+  }

-  const getFirstMultilineStringWidget = (comfyPage: ComfyPage) =>
-    getFirstClipNode(comfyPage).getByRole('textbox', { name: 'text' })
+  function getFirstMultilineStringWidget(comfyPage: ComfyPage) {
+    return getFirstClipNode(comfyPage).getByRole('textbox', { name: 'text' })
+  }

  test('should allow entering text', async ({ comfyPage }) => {
    const textarea = getFirstMultilineStringWidget(comfyPage)
--- a/browser_tests/tests/widget.spec.ts
+++ b/browser_tests/tests/widget.spec.ts
@@ -56,8 +56,8 @@ test.describe('Combo text widget', { tag: ['@screenshot', '@widget'] }, () => {
  test('should refresh combo values of optional inputs', async ({
    comfyPage
  }) => {
-    const getComboValues = async () =>
-      comfyPage.page.evaluate(() => {
+    async function getComboValues() {
+      return comfyPage.page.evaluate(() => {
        return window
          .app!.graph!.nodes.find(
            (node) => node.title === 'Node With Optional Combo Input'
@@ -65,6 +65,7 @@ test.describe('Combo text widget', { tag: ['@screenshot', '@widget'] }, () => {
          .widgets!.find((widget) => widget.name === 'optional_combo_input')!
          .options.values
      })
+    }

    await comfyPage.workflow.loadWorkflow('inputs/optional_combo_input')
    const initialComboValues = await getComboValues()
@@ -82,8 +83,8 @@ test.describe('Combo text widget', { tag: ['@screenshot', '@widget'] }, () => {
  test('Should refresh combo values of nodes with v2 combo input spec', async ({
    comfyPage
  }) => {
-    const getComboValues = async () =>
-      comfyPage.page.evaluate(() => {
+    async function getComboValues() {
+      return comfyPage.page.evaluate(() => {
        return window
          .app!.graph!.nodes.find(
            (node) => node.title === 'Node With V2 Combo Input'
@@ -91,6 +92,7 @@ test.describe('Combo text widget', { tag: ['@screenshot', '@widget'] }, () => {
          .widgets!.find((widget) => widget.name === 'combo_input')!.options
          .values
      })
+    }

    await comfyPage.workflow.loadWorkflow('inputs/node_with_v2_combo_input')
    // click canvas to focus
--- a/browser_tests/tests/workflowPersistence.spec.ts
+++ b/browser_tests/tests/workflowPersistence.spec.ts
@@ -213,10 +213,11 @@ test.describe('Workflow Persistence', () => {
      .poll(() => comfyPage.nodeOps.getNodeCount())
      .toBeGreaterThanOrEqual(2)

-    const getNodeTypes = () =>
-      comfyPage.page.evaluate(() =>
+    function getNodeTypes() {
+      return comfyPage.page.evaluate(() =>
        window.app!.graph.nodes.map((n: { type: string }) => n.type)
      )
+    }
    await expect.poll(getNodeTypes).toContain('KSampler')
    await expect.poll(getNodeTypes).toContain('EmptyLatentImage')
    await expect
@@ -552,11 +553,12 @@ test.describe('Workflow Persistence', () => {
    await comfyPage.setup({ clearStorage: false })
    await comfyPage.nextFrame()

-    const getSplitterSizes = () =>
-      comfyPage.page.evaluate(() => {
+    function getSplitterSizes() {
+      return comfyPage.page.evaluate(() => {
        const raw = localStorage.getItem('Comfy.Splitter.MainSplitter')
        return raw ? (JSON.parse(raw) as number[]) : null
      })
+    }

    await expect
      .poll(async () => {
--- a/browser_tests/utils/backupUtils.ts
+++ b/browser_tests/utils/backupUtils.ts
@@ -3,9 +3,11 @@ import path from 'path'

 type PathParts = readonly [string, ...string[]]

-const getBackupPath = (originalPath: string): string => `${originalPath}.bak`
+function getBackupPath(originalPath: string): string {
+  return `${originalPath}.bak`
+}

-const resolvePathIfExists = (pathParts: PathParts): string | null => {
+function resolvePathIfExists(pathParts: PathParts): string | null {
  const resolvedPath = path.resolve(...pathParts)
  if (!fs.pathExistsSync(resolvedPath)) {
    console.warn(`Path not found: ${resolvedPath}`)
@@ -14,7 +16,7 @@ const resolvePathIfExists = (pathParts: PathParts): string | null => {
  return resolvedPath
 }

-const createScaffoldingCopy = (srcDir: string, destDir: string) => {
+function createScaffoldingCopy(srcDir: string, destDir: string) {
  // Get all items (files and directories) in the source directory
  const items = fs.readdirSync(srcDir, { withFileTypes: true })

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@comfyorg/comfyui-frontend",
-  "version": "1.45.10",
+  "version": "1.45.11",
  "private": true,
  "description": "Official front-end implementation of ComfyUI",
  "homepage": "https://comfy.org",
@@ -60,6 +60,7 @@
    "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
    "@comfyorg/comfyui-electron-types": "catalog:",
    "@comfyorg/design-system": "workspace:*",
+    "@comfyorg/fbx-exporter-three": "^1.0.1",
    "@comfyorg/object-info-parser": "workspace:*",
    "@comfyorg/registry-types": "workspace:*",
    "@comfyorg/shared-frontend-utils": "workspace:*",
--- a/packages/shared-frontend-utils/src/formatUtil.test.ts
+++ b/packages/shared-frontend-utils/src/formatUtil.test.ts
@@ -112,6 +112,7 @@ describe('formatUtil', () => {
        expect(getMediaTypeFromFilename('asset.gltf')).toBe('3D')
        expect(getMediaTypeFromFilename('binary.glb')).toBe('3D')
        expect(getMediaTypeFromFilename('apple.usdz')).toBe('3D')
+        expect(getMediaTypeFromFilename('scan.ply')).toBe('3D')
      })
    })

--- a/Show More
+++ b/Show More