[automated] Apply ESLint and Oxfmt fixes

The backport job checked out with the default GITHUB_TOKEN and reused those
credentials for `git push`. GitHub refuses to let that token create or update
files under .github/workflows/**, so any PR that also touches a workflow file
fails the push with:

  ! [remote rejected] ... (refusing to allow a GitHub App to create or update
    workflow `.github/workflows/ci-tests-e2e.yaml` without `workflows` permission)

Because the run step inherits `set -e`, the loop aborted before writing the
`failed=` output, so the "Comment on failures" step posted nothing - the
backport just silently failed (see PR #12804: cherry-pick succeeded on every
target, only the push was rejected, and all four had to be created by hand).

Check out with PR_GH_TOKEN - already used by the Create-PR step - so the push
carries `workflow` scope. PR_GH_TOKEN must have workflow write permission for
this to take effect.

.coderabbit.yaml

@@ -15,11 +15,6 @@ reviews:
       - github-actions[bot]
   pre_merge_checks:
     override_requested_reviewers_only: true
-    # Explicitly disable the built-in docstring coverage check, which is
-    # enabled via organization-level settings. This repo opts out at the
-    # repo level without affecting other org repos.
-    docstrings:
-      mode: 'off'
     custom_checks:
       - name: End-to-end regression coverage for fixes
         mode: error

.github/workflows/ci-tests-e2e-coverage.yaml

@@ -85,16 +85,6 @@ jobs:
             fi
           done
 
-      - name: Strip non-source entries from coverage
-        if: steps.coverage-shards.outputs.has-coverage == 'true'
-        run: |
-          lcov --remove coverage/playwright/coverage.lcov \
-            '*localhost-8188*' \
-            'assets/images/*' \
-            -o coverage/playwright/coverage.lcov \
-            --ignore-errors unused
-          wc -l coverage/playwright/coverage.lcov
-
       - name: Upload merged coverage data
         if: steps.coverage-shards.outputs.has-coverage == 'true'
         uses: actions/upload-artifact@v6
@@ -121,8 +111,7 @@ jobs:
             --title "ComfyUI E2E Coverage" \
             --no-function-coverage \
             --precision 1 \
-            --ignore-errors source,unmapped,range \
-            --synthesize-missing
+            --ignore-errors source,unmapped
 
       - name: Upload HTML report artifact
         if: steps.coverage-shards.outputs.has-coverage == 'true'

.github/workflows/cla.yml

@@ -1,63 +0,0 @@
-name: CLA Assistant
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened, synchronize, closed]
-  merge_group:
-
-permissions:
-  actions: write
-  contents: read # 'read' is enough because signatures live in a REMOTE repo
-  pull-requests: write
-  statuses: write
-
-jobs:
-  cla-assistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: CLA Assistant
-        # Run on PR events, on "recheck" comment, or when someone posts the exact signing phrase.
-        # IMPORTANT: this phrase must match `custom-pr-sign-comment` below.
-        if: >
-          github.event_name == 'pull_request_target' ||
-          github.event.comment.body == 'recheck' ||
-          github.event.comment.body == 'I have read and agree to the Contributor License Agreement'
-        uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # PAT required to write to the centralized signatures repo.
-          PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-        with:
-          # Where the CLA document lives (shown to contributors)
-          path-to-document: https://github.com/Comfy-Org/comfy-cla/blob/main/comfyui_icla.md
-
-          # Centralized signature storage
-          remote-organization-name: comfy-org
-          remote-repository-name: comfy-cla
-          path-to-signatures: signatures/cla.json
-          branch: main
-
-          # Allowlist bots so they don't need to sign (optional, comma-separated).
-          # *[bot] is a catch-all for any GitHub App bot account.
-          allowlist: actions-user,ampagent,claude,coderabbitai[bot],comfy-pr-bot,dependabot[bot],github-actions[bot],copilot-swe-agent[bot],devin-ai-integration[bot],*[bot]
-
-          # Custom PR comment messages
-          custom-notsigned-prcomment: |
-            🎉 Thank you for your contribution, we really appreciate it! 🎉
-
-            Like many open source projects, we require contributors to sign our [Contributor License Agreement (CLA)](https://github.com/Comfy-Org/comfy-cla/blob/main/comfyui_icla.md). A CLA makes the ownership of contributions explicit, so contributors and the project share a clear understanding of how the code can be used. By signing, you:
-
-            - Confirm that you own your contribution.
-            - Keep the right to reuse your own code.
-            - Grant us a copyright license to include and share it within our projects.
-
-            CLAs are standard practice across major open source projects including those under the Apache Software Foundation and the Linux Foundation. Ours is based on the Apache Software Foundation's CLA. Most importantly, it would enable us to relicense the project under a more permissive license in the future, giving the project and its community greater flexibility.
-
-            ✍ **To sign, please post a new comment on this PR with exactly the following text:** ✍
-
-          custom-pr-sign-comment: I have read and agree to the Contributor License Agreement
-
-          custom-allsigned-prcomment: |
-            ✅ All contributors have signed the CLA. Thank you! This PR is ready to be merged.

.github/workflows/pr-backport.yaml

@@ -67,6 +67,11 @@ jobs:
         uses: actions/checkout@v6
         with:
           fetch-depth: 0
+          # Persist a token with `workflow` scope so the backport push can
+          # include changes to .github/workflows/**. The default GITHUB_TOKEN
+          # is refused by GitHub when a push creates/updates workflow files,
+          # which silently aborted the whole job (see PR #12804 backport).
+          token: ${{ secrets.PR_GH_TOKEN }}
 
       - name: Configure git
         run: |

.storybook/main.ts

@@ -78,11 +78,6 @@ const config: StorybookConfig = {
             find: '@/composables/queue/useJobActions',
             replacement: process.cwd() + '/src/storybook/mocks/useJobActions.ts'
           },
-          {
-            find: '@/composables/billing/useBillingContext',
-            replacement:
-              process.cwd() + '/src/storybook/mocks/useBillingContext.ts'
-          },
           {
             find: '@/utils/formatUtil',
             replacement:

.storybook/preview.ts

@@ -5,6 +5,7 @@ import type { Preview, StoryContext, StoryFn } from '@storybook/vue3-vite'
 import { createPinia } from 'pinia'
 import 'primeicons/primeicons.css'
 import PrimeVue from 'primevue/config'
+import ConfirmationService from 'primevue/confirmationservice'
 import ToastService from 'primevue/toastservice'
 import Tooltip from 'primevue/tooltip'
 
@@ -41,6 +42,7 @@ setup((app) => {
       }
     }
   })
+  app.use(ConfirmationService)
   app.use(ToastService)
 })
 

apps/website/e2e/download.spec.ts

@@ -47,11 +47,6 @@ test.describe('Download page @smoke', () => {
     const downloadBtn = hero.getByRole('link', { name: /DOWNLOAD DESKTOP/i })
     await expect(downloadBtn).toBeVisible()
     await expect(downloadBtn).toHaveAttribute('target', '_blank')
-    await expect(downloadBtn).toHaveAttribute(
-      'href',
-      'https://comfy.org/download/windows/nsis/x64'
-    )
-    await expect(downloadBtn).toHaveAttribute('data-astro-prefetch', 'false')
 
     const githubBtn = hero.getByRole('link', { name: /INSTALL FROM GITHUB/i })
     await expect(githubBtn).toBeVisible()
@@ -78,7 +73,7 @@ test.describe('Download page @smoke', () => {
     })
 
     const windowsBtn = hero.locator(
-      'a[href="https://comfy.org/download/windows/nsis/x64"]'
+      'a[href="https://download.comfy.org/windows/nsis/x64"]'
     )
     await expect(windowsBtn).toBeVisible()
     await expect(windowsBtn).toHaveText(/DOWNLOAD DESKTOP/i)

apps/website/src/components/blocks/FAQSplit01.vue

@@ -30,9 +30,9 @@ function toggle(index: number) {
     <div class="flex flex-col gap-6 md:flex-row md:gap-16">
       <!-- Left heading -->
       <div
-        class="sticky top-20 z-10 w-full shrink-0 self-start bg-primary-comfy-ink py-4 md:top-28 md:w-80 md:py-0"
+        class="bg-primary-comfy-ink sticky top-20 z-10 w-full shrink-0 self-start py-4 md:top-28 md:w-80 md:py-0"
       >
-        <h2 class="text-4xl font-light text-primary-comfy-canvas md:text-5xl">
+        <h2 class="text-primary-comfy-canvas text-4xl font-light md:text-5xl">
           {{ heading }}
         </h2>
       </div>
@@ -42,7 +42,7 @@ function toggle(index: number) {
         <div
           v-for="(faq, index) in faqs"
           :key="faq.id"
-          class="border-b border-primary-comfy-canvas/20"
+          class="border-primary-comfy-canvas/20 border-b"
         >
           <button
             :id="`faq-trigger-${faq.id}`"
@@ -83,7 +83,7 @@ function toggle(index: number) {
             :aria-labelledby="`faq-trigger-${faq.id}`"
             class="pb-6"
           >
-            <p class="text-sm whitespace-pre-line text-primary-comfy-canvas/70">
+            <p class="text-primary-comfy-canvas/70 text-sm whitespace-pre-line">
               {{ faq.answer }}
             </p>
           </section>

apps/website/src/components/common/CallToActionSection.vue

@@ -25,7 +25,7 @@ const {
   <section class="max-w-9xl mx-auto px-6 py-20 lg:py-32">
     <div class="flex flex-col items-center text-center">
       <h2
-        class="max-w-5xl text-3xl font-light tracking-tight text-primary-comfy-canvas lg:text-5xl"
+        class="text-primary-comfy-canvas max-w-5xl text-3xl font-light tracking-tight lg:text-5xl"
       >
         {{ t(headingKey, locale) }}
       </h2>

apps/website/src/components/common/EventsSection.vue

@@ -40,12 +40,12 @@ const {
       <div class="grid grid-cols-1 gap-12 lg:grid-cols-2 lg:gap-16">
         <div class="flex flex-col gap-8">
           <h2
-            class="text-4xl font-light tracking-tight text-primary-comfy-canvas lg:text-6xl"
+            class="text-primary-comfy-canvas text-4xl font-light tracking-tight lg:text-6xl"
           >
             {{ t(headingKey, locale) }}
           </h2>
           <p
-            class="max-w-sm text-sm/relaxed text-primary-comfy-canvas lg:text-base"
+            class="text-primary-comfy-canvas max-w-sm text-sm/relaxed lg:text-base"
           >
             {{ t(descriptionKey, locale) }}
           </p>
@@ -66,10 +66,10 @@ const {
             v-for="(event, i) in events"
             :key="i"
             :href="event.href"
-            class="group flex items-center gap-4 border-b border-primary-comfy-canvas/15 py-6 lg:gap-8"
+            class="group border-primary-comfy-canvas/15 flex items-center gap-4 border-b py-6 lg:gap-8"
           >
             <span
-              class="shrink-0 text-sm font-medium text-primary-comfy-canvas"
+              class="text-primary-comfy-canvas shrink-0 text-sm font-medium"
             >
               {{ event.label[locale] }}
             </span>

apps/website/src/components/common/SiteFooter.vue

@@ -109,7 +109,7 @@ const contactColumn: { title: string; links: FooterLink[] } = {
 <template>
   <footer
     ref="footerRef"
-    class="bg-primary-comfy-ink px-6 py-8 text-primary-comfy-canvas lg:px-20"
+    class="bg-primary-comfy-ink text-primary-comfy-canvas px-6 py-8 lg:px-20"
   >
     <div
       class="border-primary-warm-gray grid gap-12 border-t pt-16 lg:grid-cols-2 lg:gap-4"

apps/website/src/components/gallery/GalleryCard.vue

@@ -53,7 +53,7 @@ defineEmits<{ click: [] }>()
         <div class="flex w-full items-end justify-between p-4">
           <div class="gap-2">
             <p class="text-sm font-bold text-white">{{ item.title }}</p>
-            <p class="text-xs text-primary-comfy-canvas">
+            <p class="text-primary-comfy-canvas text-xs">
               <GalleryItemAttribution :item :locale />
             </p>
           </div>
@@ -82,7 +82,7 @@ defineEmits<{ click: [] }>()
     <!-- Mobile metadata -->
     <div v-if="mobile" class="mt-2 gap-2">
       <p class="text-sm font-bold text-white">{{ item.title }}</p>
-      <p class="text-xs text-primary-comfy-canvas">
+      <p class="text-primary-comfy-canvas text-xs">
         <GalleryItemAttribution :item :locale />
       </p>
     </div>

apps/website/src/components/learning/HeroSection.vue

@@ -11,7 +11,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
     class="max-w-9xl mx-auto flex flex-col items-center px-6 pt-24 pb-12 text-center"
   >
     <h1
-      class="max-w-4xl text-3xl leading-[110%] font-light tracking-tight text-primary-comfy-canvas lg:text-5xl"
+      class="text-primary-comfy-canvas max-w-4xl text-3xl leading-[110%] font-light tracking-tight lg:text-5xl"
     >
       {{ t('learning.heroTitle.before', locale) }}
       <span class="text-primary-comfy-yellow">ComfyUI</span

apps/website/src/components/product/local/DownloadLocalButton.vue

@@ -72,7 +72,6 @@ const buttons = computed<ButtonSpec[]>(() => {
     size="lg"
     :class="customClass"
     :aria-label="btn.ariaLabel"
-    :data-astro-prefetch="btn.key === 'windows' ? 'false' : undefined"
     @click="captureDownloadClick(btn.key)"
   >
     <span class="inline-flex items-center gap-2">

apps/website/src/composables/useDownloadUrl.ts

@@ -3,7 +3,7 @@ import { computed, onMounted, ref } from 'vue'
 import { externalLinks } from '@/config/routes'
 
 export const downloadUrls = {
-  windows: 'https://comfy.org/download/windows/nsis/x64',
+  windows: 'https://download.comfy.org/windows/nsis/x64',
   macArm: 'https://download.comfy.org/mac/dmg/arm64'
 } as const
 

browser_tests/fixtures/ComfyPage.ts

@@ -56,16 +56,12 @@ class ComfyPropertiesPanel {
   readonly panelTitle: Locator
   readonly searchBox: Locator
   readonly titleEditor: TitleEditor
-  readonly toggleButton: Locator
 
   constructor(readonly page: Page) {
     this.root = page.getByTestId(TestIds.propertiesPanel.root)
     this.panelTitle = this.root.locator('h3')
     this.searchBox = this.root.getByPlaceholder(/^Search/)
     this.titleEditor = new TitleEditor(this.root)
-    this.toggleButton = page.getByRole('button', {
-      name: 'Toggle properties panel'
-    })
   }
 }
 

browser_tests/fixtures/components/BaseDialog.ts

@@ -8,7 +8,7 @@ export class BaseDialog {
     public readonly page: Page,
     testId?: string
   ) {
-    this.root = testId ? page.getByTestId(testId) : page.getByRole('dialog')
+    this.root = testId ? page.getByTestId(testId) : page.locator('.p-dialog')
     this.closeButton = this.root.getByRole('button', { name: 'Close' })
   }
 

browser_tests/fixtures/components/SidebarTab.ts

@@ -352,11 +352,20 @@ export class AssetsSidebarTab extends SidebarTab {
     this.listViewItems = page.locator(
       '.sidebar-content-container [role="button"][tabindex="0"]'
     )
-    this.selectionFooter = page.getByTestId('assets-selection-bar')
-    this.selectionCountButton = page.getByText(/\d+ selected/)
-    this.deselectAllButton = page.getByTestId('assets-deselect-selected')
-    this.deleteSelectedButton = page.getByTestId('assets-delete-selected')
-    this.downloadSelectedButton = page.getByTestId('assets-download-selected')
+    this.selectionFooter = page
+      .locator('.sidebar-content-container')
+      .locator('..')
+      .locator('[class*="h-18"]')
+    this.selectionCountButton = page.getByText(/Assets Selected: \d+/)
+    this.deselectAllButton = page.getByText('Deselect all')
+    this.deleteSelectedButton = page
+      .getByTestId('assets-delete-selected')
+      .or(page.locator('button:has(.icon-\\[lucide--trash-2\\])').last())
+      .first()
+    this.downloadSelectedButton = page
+      .getByTestId('assets-download-selected')
+      .or(page.locator('button:has(.icon-\\[lucide--download\\])').last())
+      .first()
     this.backToAssetsButton = page.getByText('Back to all assets')
     this.skeletonLoaders = page.locator(
       '.sidebar-content-container .animate-pulse'

browser_tests/fixtures/helpers/BuilderSaveAsHelper.ts

@@ -36,11 +36,9 @@ export class BuilderSaveAsHelper {
     this.closeButton = this.successDialog
       .getByRole('button', { name: 'Close', exact: true })
       .filter({ hasText: 'Close' })
-    // The icon-only X carries an aria-label, while the footer Close button
-    // is named by its text — getByLabel only matches the former.
-    this.dismissButton = this.successDialog.getByLabel('Close', {
-      exact: true
-    })
+    this.dismissButton = this.successDialog.locator(
+      'button.p-dialog-close-button'
+    )
     this.exitBuilderButton = this.successDialog.getByRole('button', {
       name: 'Exit builder'
     })

browser_tests/fixtures/helpers/ExecutionHelper.ts

@@ -231,22 +231,6 @@ export class ExecutionHelper {
     )
   }
 
-  /** Send `execution_interrupted` WS event (user-initiated stop). */
-  executionInterrupted(jobId: string, nodeId: string): void {
-    this.requireWs().send(
-      JSON.stringify({
-        type: 'execution_interrupted',
-        data: {
-          prompt_id: jobId,
-          timestamp: Date.now(),
-          node_id: nodeId,
-          node_type: 'Unknown',
-          executed: []
-        }
-      })
-    )
-  }
-
   /** Send `progress` WS event. */
   progress(jobId: string, nodeId: string, value: number, max: number): void {
     this.requireWs().send(

browser_tests/fixtures/selectors.ts

@@ -38,6 +38,7 @@ export const TestIds = {
     settings: 'settings-dialog',
     settingsContainer: 'settings-container',
     settingsTabAbout: 'settings-tab-about',
+    confirm: 'confirm-dialog',
     errorOverlay: 'error-overlay',
     errorOverlaySeeErrors: 'error-overlay-see-errors',
     errorOverlayDismiss: 'error-overlay-dismiss',
@@ -112,10 +113,6 @@ export const TestIds = {
     root: 'properties-panel',
     errorsTab: 'panel-tab-errors'
   },
-  assets: {
-    browserModal: 'asset-browser-modal',
-    card: 'asset-card'
-  },
   subgraphEditor: {
     hiddenSection: 'subgraph-editor-hidden-section',
     iconEye: 'icon-eye',

browser_tests/tests/billingFacadeConsumers.spec.ts

@@ -1,165 +0,0 @@
-import { expect } from '@playwright/test'
-import type { Page } from '@playwright/test'
-
-import type { CloudSubscriptionStatusResponse } from '@/platform/cloud/subscription/composables/useSubscription'
-import type { RemoteConfig } from '@/platform/remoteConfig/types'
-
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { mockSystemStats } from '@e2e/fixtures/data/systemStats'
-import { CloudAuthHelper } from '@e2e/fixtures/helpers/CloudAuthHelper'
-
-/**
- * Billing facade consumers — FE-933 (B3) regression.
- *
- * The repointed surfaces (avatar popover tier badge / balance, free-tier
- * dialog renewal date) must keep rendering from `useBillingContext`, which in
- * a personal workspace routes through the legacy `/customers/*` endpoints
- * (mocked here). Drives a raw `page` (not the `comfyPage` fixture) so the
- * cloud app boots against fully mocked endpoints — same pattern as
- * creditsTile.spec.ts. `team_workspaces_enabled: false` keeps the topbar on
- * the legacy popover variant that FE-933 repointed.
- */
-const APP_URL = process.env.PLAYWRIGHT_TEST_URL || 'http://localhost:8188'
-
-const jsonRoute = (body: unknown) => ({
-  status: 200,
-  contentType: 'application/json',
-  body: JSON.stringify(body)
-})
-
-async function mockCloudBoot(
-  page: Page,
-  subscriptionStatus: CloudSubscriptionStatusResponse,
-  remoteConfig: RemoteConfig = { team_workspaces_enabled: false }
-) {
-  await page.route('**/api/features', (r) => r.fulfill(jsonRoute(remoteConfig)))
-  await page.route('**/api/system_stats', (r) =>
-    r.fulfill(jsonRoute(mockSystemStats))
-  )
-  await page.route('**/api/users', (r) =>
-    r.fulfill(
-      jsonRoute({
-        storage: 'server',
-        migrated: true,
-        users: { 'test-user-e2e': 'E2E Test User' }
-      })
-    )
-  )
-  // TutorialCompleted suppresses the new-user template browser, whose modal
-  // overlay would otherwise intercept clicks on the topbar.
-  await page.route('**/api/settings', (r) =>
-    r.fulfill(jsonRoute({ 'Comfy.TutorialCompleted': true }))
-  )
-  await page.route('**/api/userdata**', (r) => r.fulfill(jsonRoute([])))
-  await page.route('**/api/extensions', (r) => r.fulfill(jsonRoute([])))
-  await page.route('**/api/object_info', (r) => r.fulfill(jsonRoute({})))
-  await page.route('**/api/global_subgraphs', (r) => r.fulfill(jsonRoute({})))
-  await page.route('**/api/i18n', (r) => r.fulfill(jsonRoute({})))
-  await page.route('**/api/auth/session', (r) =>
-    r.fulfill(jsonRoute({ token: 'mock-workspace-token' }))
-  )
-  await page.route('**/releases**', (r) => r.fulfill(jsonRoute([])))
-
-  // Single personal workspace: keeps the billing facade on the legacy
-  // `/customers/*` path when team workspaces are enabled.
-  await page.route('**/api/workspaces', (r) =>
-    r.fulfill(
-      jsonRoute({
-        workspaces: [
-          {
-            id: 'ws-personal',
-            name: 'Personal Workspace',
-            type: 'personal',
-            role: 'owner'
-          }
-        ]
-      })
-    )
-  )
-
-  await page.route('**/customers/cloud-subscription-status', (r) =>
-    r.fulfill(jsonRoute(subscriptionStatus))
-  )
-  await page.route('**/customers/balance', (r) =>
-    r.fulfill(
-      jsonRoute({
-        amount_micros: 6000, // -> 12,660 credits
-        currency: 'usd',
-        effective_balance_micros: 6000
-      })
-    )
-  )
-}
-
-async function bootApp(page: Page) {
-  const auth = new CloudAuthHelper(page)
-  await auth.mockAuth()
-
-  await page.addInitScript(() => {
-    localStorage.setItem('Comfy.userId', 'test-user-e2e')
-  })
-
-  await page.goto(APP_URL)
-  await page.waitForFunction(() => !!window.app?.extensionManager, null, {
-    timeout: 45_000
-  })
-}
-
-test.describe('Billing facade consumers (FE-933)', { tag: '@cloud' }, () => {
-  test('avatar popover renders tier badge and balance from the facade', async ({
-    page
-  }) => {
-    test.setTimeout(60_000)
-
-    await mockCloudBoot(page, {
-      is_active: true,
-      subscription_tier: 'PRO',
-      subscription_duration: 'MONTHLY',
-      renewal_date: '2099-02-20T10:00:00Z',
-      end_date: null
-    })
-    await bootApp(page)
-
-    await page.getByRole('button', { name: 'Current user' }).click()
-    const popover = page.locator('.current-user-popover')
-    await expect(popover).toBeVisible()
-
-    await expect(popover.getByText('Pro', { exact: true })).toBeVisible()
-    await expect(popover.getByText('12,660')).toBeVisible()
-    await expect(popover.getByTestId('add-credits-button')).toBeVisible()
-  })
-
-  test('free-tier dialog shows the renewal date from the facade', async ({
-    page
-  }) => {
-    test.setTimeout(60_000)
-
-    // Boots with team workspaces enabled (production shape); the facade still
-    // routes a personal workspace through `/customers/*`. With subscription
-    // gating on, an inactive FREE user gets the "Subscribe to run" button,
-    // which opens the free-tier dialog on click. (refreshRemoteConfig
-    // overwrites window.__CONFIG__ from /api/features, so the flags must come
-    // from the features mock, not an init script.)
-    await mockCloudBoot(
-      page,
-      {
-        is_active: false,
-        subscription_tier: 'FREE',
-        subscription_duration: 'MONTHLY',
-        // 10:00Z keeps the en-US calendar date stable across CI timezones.
-        renewal_date: '2099-02-20T10:00:00Z',
-        end_date: null
-      },
-      { team_workspaces_enabled: true, subscription_required: true }
-    )
-    await bootApp(page)
-
-    await page.getByTestId('subscribe-to-run-button').click()
-
-    // T5: the dialog must source the date from facade renewalDate — when this
-    // line read the legacy store it silently vanished for team users.
-    await expect(
-      page.getByText('Your credits refresh on Feb 20, 2099.')
-    ).toBeVisible()
-  })
-})

browser_tests/tests/bottomPanelShortcuts.spec.ts

@@ -223,23 +223,4 @@ test.describe('Bottom Panel Shortcuts', { tag: '@ui' }, () => {
     await expect(comfyPage.settingDialog.root).toBeVisible()
     await expect(comfyPage.settingDialog.category('Keybinding')).toBeVisible()
   })
-
-  test('should focus keybindings search when opening manage shortcuts', async ({
-    comfyPage
-  }) => {
-    const { bottomPanel } = comfyPage
-
-    await bottomPanel.keyboardShortcutsButton.click()
-    await bottomPanel.shortcuts.manageButton.click()
-
-    await expect(comfyPage.settingDialog.root).toBeVisible()
-    await expect(comfyPage.settingDialog.category('Keybinding')).toBeVisible()
-
-    await expect(
-      comfyPage.page.getByPlaceholder('Search Keybindings...')
-    ).toBeFocused()
-    await expect(
-      comfyPage.page.getByPlaceholder('Search Settings...')
-    ).not.toBeFocused()
-  })
 })

browser_tests/tests/browseModelAssets.spec.ts

@@ -1,61 +0,0 @@
-import { expect } from '@playwright/test'
-
-import type { Asset } from '@comfyorg/ingest-types'
-import { createCloudAssetsFixture } from '@e2e/fixtures/assetApiFixture'
-import { STABLE_CHECKPOINT } from '@e2e/fixtures/data/assetFixtures'
-
-const CLOUD_ASSETS: Asset[] = [STABLE_CHECKPOINT]
-
-const test = createCloudAssetsFixture(CLOUD_ASSETS)
-
-test.describe('Browse Model Assets - Use button', { tag: '@cloud' }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.settings.setSetting('Comfy.Assets.UseAssetAPI', true)
-    await comfyPage.nodeOps.clearGraph()
-  })
-
-  test.afterEach(async ({ comfyPage }) => {
-    await comfyPage.nodeOps.clearGraph()
-  })
-
-  test('Use button ghost-places a loader populated with the model', async ({
-    comfyPage
-  }) => {
-    await comfyPage.command.executeCommand('Comfy.BrowseModelAssets')
-
-    const modal = comfyPage.page.locator(
-      '[data-component-id="AssetBrowserModal"]'
-    )
-    await expect(modal).toBeVisible()
-
-    const card = comfyPage.page.locator(
-      `[data-component-id="AssetCard"][data-asset-id="${STABLE_CHECKPOINT.id}"]`
-    )
-    await expect(card).toBeVisible()
-    await card.getByRole('button', { name: 'Use' }).click()
-
-    // Dialog closes and the ghost is armed; the node is not placed until the
-    // user clicks the canvas.
-    await expect(modal).toBeHidden()
-    await expect
-      .poll(() => comfyPage.nodeOps.getGraphNodesCount(), { timeout: 1000 })
-      .toBe(0)
-
-    const canvasBox = (await comfyPage.canvas.boundingBox())!
-    await comfyPage.canvas.click({
-      position: { x: canvasBox.width / 2, y: canvasBox.height / 2 }
-    })
-
-    await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
-    await expect
-      .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-      .toBe(1)
-
-    const [loader] = await comfyPage.nodeOps.getNodeRefsByType(
-      'CheckpointLoaderSimple'
-    )
-    expect(loader).toBeDefined()
-    const widget = await loader.getWidgetByName('ckpt_name')
-    expect(await widget.getValue()).toBe(STABLE_CHECKPOINT.name)
-  })
-})

browser_tests/tests/cloud-asset-promoted-widget.spec.ts

@@ -1,99 +0,0 @@
-import { expect } from '@playwright/test'
-import type { Page } from '@playwright/test'
-
-import {
-  assetRequestIncludesTag,
-  createCloudAssetsFixture
-} from '@e2e/fixtures/assetApiFixture'
-import {
-  STABLE_CHECKPOINT,
-  STABLE_CHECKPOINT_2
-} from '@e2e/fixtures/data/assetFixtures'
-import { TestIds } from '@e2e/fixtures/selectors'
-
-const WORKFLOW = 'missing/missing_model_promoted_widget'
-const HOST_NODE_ID = 2
-const WIDGET_NAME = 'ckpt_name'
-const SELECTED_MODEL = STABLE_CHECKPOINT_2.name
-
-const test = createCloudAssetsFixture([STABLE_CHECKPOINT, STABLE_CHECKPOINT_2])
-
-interface WidgetSnapshot {
-  type: string
-  value: string
-  hasLayout: boolean
-}
-
-async function getHostWidgetSnapshot(page: Page): Promise<WidgetSnapshot> {
-  return await page.evaluate(
-    ({ nodeId, widgetName }) => {
-      const node = window.app!.graph.getNodeById(nodeId)
-      const widget = node?.widgets?.find((widget) => widget.name === widgetName)
-
-      return {
-        type: widget?.type ?? '',
-        value: String(widget?.value ?? ''),
-        hasLayout: widget?.last_y != null
-      }
-    },
-    { nodeId: HOST_NODE_ID, widgetName: WIDGET_NAME }
-  )
-}
-
-test.describe(
-  'Promoted subgraph asset widgets',
-  { tag: ['@cloud', '@canvas', '@widget'] },
-  () => {
-    test.afterEach(async ({ comfyPage }) => {
-      await comfyPage.nodeOps.clearGraph()
-    })
-
-    test('legacy asset browser selection updates the promoted host widget value', async ({
-      cloudAssetRequests,
-      comfyPage
-    }) => {
-      await comfyPage.settings.setSetting('Comfy.Assets.UseAssetAPI', true)
-      await comfyPage.workflow.loadWorkflow(WORKFLOW)
-
-      await expect
-        .poll(
-          () =>
-            cloudAssetRequests.some((url) =>
-              assetRequestIncludesTag(url, 'checkpoints')
-            ),
-          { timeout: 10_000 }
-        )
-        .toBe(true)
-      await expect
-        .poll(() => getHostWidgetSnapshot(comfyPage.page))
-        .toMatchObject({
-          type: 'asset',
-          hasLayout: true
-        })
-      const initialWidget = await getHostWidgetSnapshot(comfyPage.page)
-      expect(initialWidget.value).not.toBe(SELECTED_MODEL)
-
-      const hostNode = await comfyPage.nodeOps.getNodeRefById(HOST_NODE_ID)
-      await hostNode.centerOnNode()
-      const promotedWidget = await hostNode.getWidgetByName(WIDGET_NAME)
-      await promotedWidget.click()
-
-      const modal = comfyPage.page.getByTestId(TestIds.assets.browserModal)
-      await expect(modal).toBeVisible()
-
-      const assetCard = modal
-        .getByTestId(TestIds.assets.card)
-        .filter({ hasText: SELECTED_MODEL })
-        .first()
-      await expect(assetCard).toBeVisible()
-      await assetCard.getByRole('button', { name: 'Use' }).click()
-
-      await expect(modal).toBeHidden()
-      await expect
-        .poll(() =>
-          getHostWidgetSnapshot(comfyPage.page).then((widget) => widget.value)
-        )
-        .toBe(SELECTED_MODEL)
-    })
-  }
-)

browser_tests/tests/cloud.spec.ts

@@ -1,9 +1,6 @@
 import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
-const APP_URL = process.env.PLAYWRIGHT_TEST_URL || 'http://localhost:8188'
-const SHARE_AUTH_STORAGE_KEY = 'Comfy.PreservedQuery.share_auth'
-
 /**
  * Cloud distribution E2E tests.
  *
@@ -17,31 +14,15 @@ test.describe('Cloud distribution UI', { tag: '@cloud' }, () => {
   test('cloud build redirects unauthenticated users to login', async ({
     page
   }) => {
-    await page.goto(APP_URL)
+    await page.goto('http://localhost:8188')
     // Cloud build has an auth guard that redirects to /cloud/login.
     // This route only exists in the cloud distribution — it's tree-shaken
     // in the OSS build. Its presence confirms the cloud build is active.
     await expect(page).toHaveURL(/\/cloud\/login/, { timeout: 10_000 })
   })
 
-  test('preserves share auth attribution before redirecting logged-out users', async ({
-    page
-  }) => {
-    await page.goto(new URL('/?share=abc', APP_URL).toString())
-
-    await expect(page).toHaveURL(/\/cloud\/login/, { timeout: 10_000 })
-    await expect
-      .poll(() =>
-        page.evaluate(
-          (key) => sessionStorage.getItem(key),
-          SHARE_AUTH_STORAGE_KEY
-        )
-      )
-      .toBe(JSON.stringify({ share: 'abc' }))
-  })
-
   test('cloud login page renders sign-in options', async ({ page }) => {
-    await page.goto(APP_URL)
+    await page.goto('http://localhost:8188')
     await expect(page).toHaveURL(/\/cloud\/login/, { timeout: 10_000 })
     // Verify cloud-specific login UI is rendered
     await expect(page.getByRole('button', { name: /google/i })).toBeVisible()

browser_tests/tests/currentUserPopoverCredits.spec.ts

@@ -1,138 +0,0 @@
-import { expect } from '@playwright/test'
-
-import type { CloudSubscriptionStatusResponse } from '@/platform/cloud/subscription/composables/useSubscription'
-import type { RemoteConfig } from '@/platform/remoteConfig/types'
-import type { WorkspaceWithRole } from '@/platform/workspace/api/workspaceApi'
-import type { WorkspaceTokenResponse } from '@/platform/workspace/stores/workspaceAuthStore'
-import type { operations } from '@/types/comfyRegistryTypes'
-import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
-
-type CustomerBalanceResponse = NonNullable<
-  operations['GetCustomerBalance']['responses']['200']['content']['application/json']
->
-
-const PERSONAL_WORKSPACE_NAME = 'Personal Workspace'
-const FUTURE_DATE = '2099-01-01T00:00:00Z'
-
-const mockRemoteConfig: RemoteConfig = { team_workspaces_enabled: true }
-
-const mockListWorkspacesResponse: { workspaces: WorkspaceWithRole[] } = {
-  workspaces: [
-    {
-      id: 'ws-personal',
-      name: PERSONAL_WORKSPACE_NAME,
-      type: 'personal',
-      created_at: '2026-01-01T00:00:00Z',
-      joined_at: '2026-01-01T00:00:00Z',
-      role: 'owner'
-    }
-  ]
-}
-
-const mockTokenResponse: WorkspaceTokenResponse = {
-  token: 'mock-workspace-token',
-  expires_at: FUTURE_DATE,
-  workspace: {
-    id: 'ws-personal',
-    name: PERSONAL_WORKSPACE_NAME,
-    type: 'personal'
-  },
-  role: 'owner',
-  permissions: []
-}
-
-// Cancelled but still active: `end_date` set (cancelled) while `is_active` is
-// true. A personal owner in this state sees BOTH "Add credits" and "Resubscribe"
-// in the credits row.
-const mockSubscriptionStatus: CloudSubscriptionStatusResponse = {
-  is_active: true,
-  subscription_id: 'sub_e2e',
-  renewal_date: FUTURE_DATE,
-  end_date: FUTURE_DATE
-}
-
-// ~6.3M credits — a 7-digit balance is what pushes the second action button out
-// of the popover before the fix.
-const mockBalance: CustomerBalanceResponse = {
-  amount_micros: 3_000_000,
-  effective_balance_micros: 3_000_000,
-  currency: 'usd'
-}
-
-const test = comfyPageFixture.extend({
-  page: async ({ page }, use) => {
-    await page.route('**/api/features', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify(mockRemoteConfig)
-      })
-    )
-
-    await page.route('**/api/workspaces', async (route) => {
-      if (route.request().method() !== 'GET') {
-        await route.fallback()
-        return
-      }
-      await route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify(mockListWorkspacesResponse)
-      })
-    })
-
-    await page.route('**/api/auth/token', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify(mockTokenResponse)
-      })
-    )
-
-    await page.route('**/customers/cloud-subscription-status', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify(mockSubscriptionStatus)
-      })
-    )
-
-    await page.route('**/customers/balance', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify(mockBalance)
-      })
-    )
-
-    await use(page)
-  }
-})
-
-test.describe('Current user popover credits row', { tag: '@cloud' }, () => {
-  test('keeps both action buttons inside the popover when cancelled but active', async ({
-    comfyPage
-  }) => {
-    const page = comfyPage.page
-
-    await comfyPage.toast.closeToasts()
-    await page.getByRole('button', { name: 'Current user' }).click()
-
-    const popover = page.locator('.current-user-popover')
-    await expect(popover).toBeVisible()
-
-    const addCredits = page.getByTestId('add-credits-button')
-    const resubscribe = page.getByRole('button', { name: 'Resubscribe' })
-    await expect(addCredits).toBeVisible()
-    await expect(resubscribe).toBeVisible()
-
-    const popoverBox = await popover.boundingBox()
-    const resubscribeBox = await resubscribe.boundingBox()
-    expect(popoverBox).not.toBeNull()
-    expect(resubscribeBox).not.toBeNull()
-
-    const popoverRight = popoverBox!.x + popoverBox!.width
-    const resubscribeRight = resubscribeBox!.x + resubscribeBox!.width
-    expect(resubscribeRight).toBeLessThanOrEqual(popoverRight)
-  })
-})

browser_tests/tests/dialogs/shareWorkflowDialog.spec.ts

@@ -99,15 +99,15 @@ async function mockShareableAssets(
 }
 
 /**
- * Dismiss stale dialogs left by cloud-mode's onboarding flow or
- * auth-triggered modals by pressing Escape until they clear.
+ * Dismiss stale PrimeVue dialog masks left by cloud-mode's onboarding flow
+ * or auth-triggered modals by pressing Escape until they clear.
  */
 async function dismissOverlays(page: Page): Promise<void> {
-  const dialogs = page.getByRole('dialog')
+  const mask = page.locator('.p-dialog-mask')
   for (let attempt = 0; attempt < 3; attempt++) {
-    if ((await dialogs.count()) === 0) break
+    if ((await mask.count()) === 0) break
     await page.keyboard.press('Escape')
-    await dialogs
+    await mask
       .first()
       .waitFor({ state: 'hidden', timeout: 2000 })
       .catch(() => {})

browser_tests/tests/interaction.spec.ts

@@ -612,23 +612,18 @@ test.describe('Canvas Interaction', { tag: '@screenshot' }, () => {
   test('Can zoom in/out with ctrl+shift+vertical-drag', async ({
     comfyPage
   }) => {
-    // Use ctrlShiftDrag so the Control+Shift modifiers are pressed and released
-    // around each individual gesture. Holding the modifiers down across all
-    // three drags plus the intervening screenshot assertions could saturate the
-    // main thread and stall a single mouse.move step past the test timeout, and
-    // a mid-test failure would leave the modifiers stuck down. Releasing per
-    // gesture matches the robust pattern used in canvasSettings.spec.ts.
-    await comfyPage.canvasOps.ctrlShiftDrag({ x: 10, y: 100 }, { x: 10, y: 40 })
+    await comfyPage.page.keyboard.down('Control')
+    await comfyPage.page.keyboard.down('Shift')
+    await comfyPage.canvasOps.dragAndDrop({ x: 10, y: 100 }, { x: 10, y: 40 })
     await expect(comfyPage.canvas).toHaveScreenshot('zoomed-in-ctrl-shift.png')
-    await comfyPage.canvasOps.ctrlShiftDrag({ x: 10, y: 40 }, { x: 10, y: 160 })
+    await comfyPage.canvasOps.dragAndDrop({ x: 10, y: 40 }, { x: 10, y: 160 })
     await expect(comfyPage.canvas).toHaveScreenshot('zoomed-out-ctrl-shift.png')
-    await comfyPage.canvasOps.ctrlShiftDrag(
-      { x: 10, y: 280 },
-      { x: 10, y: 220 }
-    )
+    await comfyPage.canvasOps.dragAndDrop({ x: 10, y: 280 }, { x: 10, y: 220 })
     await expect(comfyPage.canvas).toHaveScreenshot(
       'zoomed-default-ctrl-shift.png'
     )
+    await comfyPage.page.keyboard.up('Control')
+    await comfyPage.page.keyboard.up('Shift')
   })
 
   test('Can zoom in/out after decreasing canvas zoom speed setting', async ({

browser_tests/tests/maskEditor.spec.ts

@@ -254,8 +254,21 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
   }) => {
     const dialog = await maskEditor.openDialog()
 
+    let maskUploadCount = 0
     let imageUploadCount = 0
 
+    await comfyPage.page.route('**/upload/mask', (route) => {
+      maskUploadCount++
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({
+          name: `test-mask-${maskUploadCount}.png`,
+          subfolder: 'clipspace',
+          type: 'input'
+        })
+      })
+    })
     await comfyPage.page.route('**/upload/image', (route) => {
       imageUploadCount++
       return route.fulfill({
@@ -275,17 +288,20 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
 
     await expect(dialog).toBeHidden()
 
-    // The save pipeline uploads four layers (masked, paint, painted, paintedMasked)
-    // through the unified /upload/image endpoint.
+    // The save pipeline uploads multiple layers (mask + image variants)
     expect(
-      imageUploadCount,
-      'save should upload all four layers via /upload/image'
-    ).toBe(4)
+      maskUploadCount + imageUploadCount,
+      'save should trigger upload calls'
+    ).toBeGreaterThan(0)
   })
 
   test('save failure keeps dialog open', async ({ comfyPage, maskEditor }) => {
     const dialog = await maskEditor.openDialog()
 
+    // Fail all upload routes
+    await comfyPage.page.route('**/upload/mask', (route) =>
+      route.fulfill({ status: 500 })
+    )
     await comfyPage.page.route('**/upload/image', (route) =>
       route.fulfill({ status: 500 })
     )

browser_tests/tests/maskEditorLoadSave.spec.ts

@@ -34,17 +34,19 @@ test.describe('Mask Editor load/save', { tag: '@vue-nodes' }, () => {
     let observedContentType = ''
     let observedBodyLength = 0
 
-    await comfyPage.page.route('**/upload/image', async (route) => {
+    await comfyPage.page.route('**/upload/mask', async (route) => {
       const request = route.request()
-      if (!observedContentType) {
-        observedContentType = (await request.headerValue('content-type')) ?? ''
-        observedBodyLength = request.postDataBuffer()?.byteLength ?? 0
-      }
+      observedContentType = (await request.headerValue('content-type')) ?? ''
+      observedBodyLength = request.postDataBuffer()?.byteLength ?? 0
       await route.fulfill(
         fulfillJson(successResponse('clipspace-mask-123.png'))
       )
     })
 
+    await comfyPage.page.route('**/upload/image', (route) =>
+      route.fulfill(fulfillJson(successResponse('clipspace-painted-123.png')))
+    )
+
     await dialog.getByRole('button', { name: 'Save' }).click()
     await expect(dialog).toBeHidden()
     expect(observedContentType).toContain('multipart/form-data')
@@ -67,11 +69,24 @@ test.describe('Mask Editor load/save', { tag: '@vue-nodes' }, () => {
     await expect(dialog).toBeVisible()
   })
 
-  test('Save failure keeps dialog open', async ({ comfyPage, maskEditor }) => {
+  test('Save failure on partial upload keeps dialog open', async ({
+    comfyPage,
+    maskEditor
+  }) => {
     const dialog = await maskEditor.openDialog()
     await maskEditor.drawStrokeAndExpectPixels(dialog)
 
+    // The saver uploads sequentially: mask layer first, then image layers.
+    // Let the mask upload succeed and the image upload fail to exercise both
+    // endpoints and verify the dialog stays open after a partial failure.
+    let maskUploadHit = false
     let imageUploadHit = false
+    await comfyPage.page.route('**/upload/mask', (route) => {
+      maskUploadHit = true
+      return route.fulfill(
+        fulfillJson(successResponse('clipspace-mask-999.png'))
+      )
+    })
     await comfyPage.page.route('**/upload/image', (route) => {
       imageUploadHit = true
       return route.fulfill({ status: 500 })
@@ -80,6 +95,7 @@ test.describe('Mask Editor load/save', { tag: '@vue-nodes' }, () => {
     const saveButton = dialog.getByRole('button', { name: 'Save' })
     await saveButton.click()
 
+    await expect.poll(() => maskUploadHit).toBe(true)
     await expect.poll(() => imageUploadHit).toBe(true)
     await expect(dialog).toBeVisible()
     await expect(saveButton).toBeVisible()

browser_tests/tests/propertiesPanel/errorsTabMissingModels.spec.ts

@@ -143,7 +143,7 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
         const objectInfo = await response.json()
         const ckptName =
           objectInfo.CheckpointLoaderSimple.input.required.ckpt_name
-        ckptName[0] = [...ckptName[0], FAKE_MODEL_NAME]
+        ckptName[0] = [...ckptName[0], 'fake_model.safetensors']
         await route.fulfill({ response, json: objectInfo })
       })
 
@@ -151,11 +151,21 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
         const url = new URL(response.url())
         return url.pathname.endsWith('/object_info') && response.ok()
       })
+      const modelFoldersResponse = comfyPage.page.waitForResponse(
+        (response) => {
+          const url = new URL(response.url())
+          return url.pathname.endsWith('/experiment/models') && response.ok()
+        }
+      )
       const refreshButton = comfyPage.page.getByTestId(
         TestIds.dialogs.missingModelRefresh
       )
 
-      await Promise.all([objectInfoResponse, refreshButton.click()])
+      await Promise.all([
+        objectInfoResponse,
+        modelFoldersResponse,
+        refreshButton.click()
+      ])
       await expect(
         comfyPage.page.getByTestId(TestIds.dialogs.missingModelsGroup)
       ).toBeHidden()

browser_tests/tests/sidebar/assets.spec.ts

@@ -13,6 +13,10 @@ import type {
 // Legacy coverage backed by AssetsHelper's shadow backend. New assets-sidebar
 // browser coverage should use typed route mocks in assetsSidebarTab.spec.ts.
 
+// ---------------------------------------------------------------------------
+// Shared fixtures
+// ---------------------------------------------------------------------------
+
 const SAMPLE_JOBS: RawJobListItem[] = [
   createMockJob({
     id: 'job-alpha',
@@ -176,10 +180,12 @@ test.describe('Assets sidebar - tab navigation', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Switch to Imported
     await tab.switchToImported()
     await expect(tab.importedTab).toHaveAttribute('aria-selected', 'true')
     await expect(tab.generatedTab).toHaveAttribute('aria-selected', 'false')
 
+    // Switch back to Generated
     await tab.switchToGenerated()
     await expect(tab.generatedTab).toHaveAttribute('aria-selected', 'true')
   })
@@ -188,9 +194,11 @@ test.describe('Assets sidebar - tab navigation', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Type search in Generated tab
     await tab.searchInput.fill('landscape')
     await expect(tab.searchInput).toHaveValue('landscape')
 
+    // Switch to Imported tab
     await tab.switchToImported()
     await expect(tab.searchInput).toHaveValue('')
   })
@@ -227,8 +235,10 @@ test.describe('Assets sidebar - grid view display', () => {
     await tab.open()
     await tab.switchToImported()
 
+    // Wait for imported assets to render
     await expect(tab.assetCards.first()).toBeVisible()
 
+    // Imported tab should show the mocked files
     await expect.poll(() => tab.assetCards.count()).toBeGreaterThanOrEqual(1)
   })
 
@@ -276,9 +286,11 @@ test.describe('Assets sidebar - view mode toggle', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Open settings menu and select list view
     await tab.openSettingsMenu()
     await tab.listViewOption.click()
 
+    // List view items should now be visible
     await expect(tab.listViewItems.first()).toBeVisible()
   })
 
@@ -286,13 +298,16 @@ test.describe('Assets sidebar - view mode toggle', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Switch to list view
     await tab.openSettingsMenu()
     await tab.listViewOption.click()
     await expect(tab.listViewItems.first()).toBeVisible()
 
+    // Switch back to grid view (settings popover is still open)
     await tab.gridViewOption.click()
     await tab.waitForAssets()
 
+    // Grid cards (with data-selected attribute) should be visible again
     await expect(tab.assetCards.first()).toBeVisible()
   })
 })
@@ -327,8 +342,10 @@ test.describe('Assets sidebar - search', () => {
 
     const initialCount = await tab.assetCards.count()
 
+    // Search for a specific filename that matches only one asset
     await tab.searchInput.fill('landscape')
 
+    // Wait for filter to reduce the count
     await expect.poll(() => tab.assetCards.count()).toBeLessThan(initialCount)
   })
 
@@ -338,6 +355,7 @@ test.describe('Assets sidebar - search', () => {
 
     const initialCount = await tab.assetCards.count()
 
+    // Filter then clear
     await tab.searchInput.fill('landscape')
     await expect.poll(() => tab.assetCards.count()).toBeLessThan(initialCount)
 
@@ -373,8 +391,10 @@ test.describe('Assets sidebar - selection', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Click first asset card
     await tab.assetCards.first().click()
 
+    // Should have data-selected="true"
     await expect(tab.selectedCards).toHaveCount(1)
   })
 
@@ -385,9 +405,11 @@ test.describe('Assets sidebar - selection', () => {
     const cards = tab.assetCards
     await expect.poll(() => cards.count()).toBeGreaterThanOrEqual(2)
 
+    // Click first card
     await cards.first().click()
     await expect(tab.selectedCards).toHaveCount(1)
 
+    // Ctrl+click second card
     await cards.nth(1).click({ modifiers: ['ControlOrMeta'] })
     await expect(tab.selectedCards).toHaveCount(2)
   })
@@ -398,8 +420,10 @@ test.describe('Assets sidebar - selection', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Select an asset
     await tab.assetCards.first().click()
 
+    // Footer should show selection count
     await expect(tab.selectionCountButton).toBeVisible()
   })
 
@@ -407,10 +431,15 @@ test.describe('Assets sidebar - selection', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Select an asset
     await tab.assetCards.first().click()
     await expect(tab.selectedCards).toHaveCount(1)
 
+    // Hover over the selection count button to reveal "Deselect all"
+    await tab.selectionCountButton.hover()
     await expect(tab.deselectAllButton).toBeVisible()
+
+    // Click "Deselect all"
     await tab.deselectAllButton.click()
     await expect(tab.selectedCards).toHaveCount(0)
   })
@@ -419,11 +448,14 @@ test.describe('Assets sidebar - selection', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Select an asset
     await tab.assetCards.first().click()
     await expect(tab.selectedCards).toHaveCount(1)
 
+    // Switch to Imported tab
     await tab.switchToImported()
 
+    // Switch back - selection should be cleared
     await tab.switchToGenerated()
     await tab.waitForAssets()
     await expect(tab.selectedCards).toHaveCount(0)
@@ -449,8 +481,10 @@ test.describe('Assets sidebar - context menu', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Right-click first asset
     await tab.assetCards.first().click({ button: 'right' })
 
+    // Context menu should appear with standard items
     const contextMenu = comfyPage.page.locator('.p-contextmenu')
     await expect(contextMenu).toBeVisible()
   })
@@ -531,6 +565,8 @@ test.describe('Assets sidebar - context menu', () => {
   test('Cancelling export-workflow filename prompt does not show an error toast', async ({
     comfyPage
   }) => {
+    // job-gamma is the first card; its detail carries a valid workflow so
+    // extraction succeeds and the filename prompt opens.
     await comfyPage.assets.mockJobDetail('job-gamma', JOB_GAMMA_DETAIL)
 
     const tab = comfyPage.menu.assetsTab
@@ -578,6 +614,8 @@ test.describe('Assets sidebar - context menu', () => {
   test('Export-workflow shows a warning toast when the asset has no workflow', async ({
     comfyPage
   }) => {
+    // Strip the workflow field so extraction yields null and the export
+    // action returns { success: false, error: 'No workflow…' }.
     const { workflow: _, ...detailWithoutWorkflow } = JOB_GAMMA_DETAIL
     await comfyPage.assets.mockJobDetail('job-gamma', detailWithoutWorkflow)
 
@@ -587,6 +625,7 @@ test.describe('Assets sidebar - context menu', () => {
     await tab.assetCards.first().click({ button: 'right' })
     await tab.contextMenuItem('Export workflow').click()
 
+    // Filename prompt should be skipped: extraction fails before the prompt.
     await expect(comfyPage.toast.toastWarnings).toBeVisible()
     await expect(comfyPage.toast.toastSuccesses).toBeHidden({ timeout: 1500 })
   })
@@ -600,18 +639,23 @@ test.describe('Assets sidebar - context menu', () => {
     const cards = tab.assetCards
     await expect.poll(() => cards.count()).toBeGreaterThanOrEqual(2)
 
+    // Dismiss any toasts that appeared after asset loading
     await tab.dismissToasts()
 
-    // useKeyModifier('Control') needs keyboard events, not click modifiers.
+    // Multi-select: use keyboard.down/up so useKeyModifier('Control') detects
+    // the modifier — click({ modifiers }) only sets the mouse event flag and
+    // does not fire a keydown event that VueUse tracks.
     await cards.first().click()
     await comfyPage.page.keyboard.down('Control')
     await cards.nth(1).click()
     await comfyPage.page.keyboard.up('Control')
 
+    // Verify multi-selection took effect and footer is stable before right-clicking
     await expect(tab.selectedCards).toHaveCount(2)
     await expect(tab.selectionFooter).toBeVisible()
 
-    // dispatchEvent avoids the selection footer intercepting a right click.
+    // Use dispatchEvent instead of click({ button: 'right' }) to avoid any
+    // overlay intercepting the event, and assert directly without toPass.
     const contextMenu = comfyPage.page.locator('.p-contextmenu')
     await cards.first().dispatchEvent('contextmenu', {
       bubbles: true,
@@ -620,6 +664,7 @@ test.describe('Assets sidebar - context menu', () => {
     })
     await expect(contextMenu).toBeVisible()
 
+    // Bulk menu should show bulk download action
     await expect(tab.contextMenuItem('Download all')).toBeVisible()
   })
 })
@@ -647,6 +692,7 @@ test.describe('Assets sidebar - bulk actions', () => {
 
     await tab.assetCards.first().click()
 
+    // Download button in footer should be visible
     await expect(tab.downloadSelectedButton).toBeVisible()
   })
 
@@ -658,6 +704,7 @@ test.describe('Assets sidebar - bulk actions', () => {
 
     await tab.assetCards.first().click()
 
+    // Delete button in footer should be visible
     await expect(tab.deleteSelectedButton).toBeVisible()
   })
 
@@ -665,67 +712,21 @@ test.describe('Assets sidebar - bulk actions', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
+    // Select the two single-output assets (job-alpha, job-beta).
+    // The count reflects total outputs, not cards — job-gamma has
+    // outputs_count: 2 which would inflate the total.
     const cards = tab.assetCards
     await expect.poll(() => cards.count()).toBeGreaterThanOrEqual(3)
 
+    // Cards are sorted newest-first: gamma (idx 0), beta (1), alpha (2)
     await cards.nth(1).click()
     await comfyPage.page.keyboard.down('Control')
     await cards.nth(2).click()
     await comfyPage.page.keyboard.up('Control')
 
+    // Selection count should show the count
     await expect(tab.selectionCountButton).toBeVisible()
-    await expect(tab.selectionCountButton).toHaveText(/\b2 selected\b/)
-  })
-
-  test('Selection count sums the outputs of a stacked asset', async ({
-    comfyPage
-  }) => {
-    const tab = comfyPage.menu.assetsTab
-    await tab.open()
-
-    await tab.assetCards.first().click()
-
-    await expect(tab.selectionCountButton).toBeVisible()
-    await expect(tab.selectionCountButton).toHaveText(/\b2 selected\b/)
-  })
-
-  test('Selection bar stays capped, not stretched, on a wide panel', async ({
-    comfyPage
-  }) => {
-    await comfyPage.page.setViewportSize({ width: 1600, height: 900 })
-    const tab = comfyPage.menu.assetsTab
-    await tab.open()
-
-    const gutter = comfyPage.page.locator('.p-splitter-gutter').first()
-    await expect(gutter).toBeVisible()
-    const gutterBox = await gutter.boundingBox()
-    if (!gutterBox) {
-      throw new Error('sidebar splitter gutter has no bounding box')
-    }
-    await comfyPage.page.mouse.move(
-      gutterBox.x + gutterBox.width / 2,
-      gutterBox.y + gutterBox.height / 2
-    )
-    await comfyPage.page.mouse.down()
-    await comfyPage.page.mouse.move(900, gutterBox.y + gutterBox.height / 2, {
-      steps: 12
-    })
-    await comfyPage.page.mouse.up()
-
-    await tab.assetCards.first().click()
-    await expect(tab.selectionFooter).toBeVisible()
-
-    const sidebar = comfyPage.page.locator('.side-bar-panel').first()
-    await expect
-      .poll(async () => (await sidebar.boundingBox())?.width ?? 0)
-      .toBeGreaterThan(520)
-    await expect
-      .poll(async () => {
-        const bar = await tab.selectionFooter.boundingBox()
-        const side = await sidebar.boundingBox()
-        return bar && side ? side.width - bar.width : 0
-      })
-      .toBeGreaterThan(100)
+    await expect(tab.selectionCountButton).toHaveText(/Assets Selected:\s*2\b/)
   })
 })
 
@@ -832,7 +833,8 @@ test.describe('Assets sidebar - pagination', () => {
     await comfyPage.assets.mockOutputHistory(manyJobs)
     await comfyPage.setup()
 
-    // Queue polling also calls /jobs, so wait for completed history only.
+    // Capture the first history fetch (terminal statuses only).
+    // Queue polling also hits /jobs but with status=in_progress,pending.
     const firstRequest = comfyPage.page.waitForRequest((req) => {
       if (!/\/api\/jobs\?/.test(req.url())) return false
       const url = new URL(req.url())
@@ -1000,7 +1002,9 @@ const MIXED_MEDIA_JOBS: RawJobListItem[] = [
   })
 ]
 
-// Filter button is guarded by isCloud; cloud CI needs authenticated setup.
+// Filter button is guarded by isCloud (compile-time). The cloud CI project
+// cannot use comfyPageFixture (auth required). Enable once cloud E2E infra
+// supports authenticated comfyPage setup.
 test.describe('Assets sidebar - media type filter', () => {
   test.fixme(true, 'Requires DISTRIBUTION=cloud build with auth bypass')
 
@@ -1036,9 +1040,12 @@ test.describe('Assets sidebar - media type filter', () => {
       'All three mixed-media jobs should render'
     ).toHaveCount(3)
 
+    // Open filter menu and enable only image filter (selecting a filter
+    // restricts to that type only, hiding unselected types)
     await tab.openFilterMenu()
     await tab.filterCheckbox('Image').click()
 
+    // Only the image asset should remain
     await expect(tab.assetCards).toHaveCount(1, { timeout: 5000 })
     await expect(tab.getAssetCardByName('photo.png')).toBeVisible()
   })
@@ -1049,10 +1056,12 @@ test.describe('Assets sidebar - media type filter', () => {
 
     const initialCount = await tab.assetCards.count()
 
+    // Enable image filter to restrict to images only
     await tab.openFilterMenu()
     await tab.filterCheckbox('Image').click()
     await expect(tab.assetCards).toHaveCount(1, { timeout: 5000 })
 
+    // Uncheck image filter to remove all filters (restores all assets)
     await tab.filterCheckbox('Image').click()
     await expect(tab.assetCards).toHaveCount(initialCount, { timeout: 5000 })
   })

browser_tests/tests/sidebar/assetsSidebarTab.spec.ts

@@ -214,7 +214,7 @@ test.describe('FE-130 assets sidebar route mocks', () => {
     await tab.open()
 
     await tab.getAssetCardByName('alpha').click()
-    await expect(tab.selectionCountButton).toHaveText(/\b1 selected\b/)
+    await expect(tab.selectionCountButton).toHaveText(/Assets Selected:\s*1\b/)
     await expect(tab.deleteSelectedButton).toBeVisible()
     await expect(tab.downloadSelectedButton).toBeVisible()
 
@@ -222,7 +222,7 @@ test.describe('FE-130 assets sidebar route mocks', () => {
     await tab.getAssetCardByName('beta').click()
     await comfyPage.page.keyboard.up('Control')
 
-    await expect(tab.selectionCountButton).toHaveText(/\b2 selected\b/)
+    await expect(tab.selectionCountButton).toHaveText(/Assets Selected:\s*2\b/)
     await expect(tab.deleteSelectedButton).toBeVisible()
     await expect(tab.downloadSelectedButton).toBeVisible()
   })

browser_tests/tests/sidebar/modelLibrary.spec.ts

@@ -233,64 +233,4 @@ test.describe('Model library sidebar - empty state', () => {
     await expect(tab.folderNodes).toHaveCount(0)
     await expect(tab.leafNodes).toHaveCount(0)
   })
-
-  test.describe('Model library sidebar - add node', () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.modelLibrary.mockFoldersWithFiles(MOCK_FOLDERS)
-      await comfyPage.setup()
-      await comfyPage.nodeOps.clearGraph()
-    })
-
-    test.afterEach(async ({ comfyPage }) => {
-      await comfyPage.modelLibrary.clearMocks()
-    })
-
-    test('Clicking a model defers creation until placed on the canvas', async ({
-      comfyPage
-    }) => {
-      const tab = comfyPage.menu.modelLibraryTab
-      await tab.open()
-      await tab.getFolderByLabel('checkpoints').click()
-      await expect(tab.getLeafByLabel('sd_xl_base_1.0')).toBeVisible()
-
-      await tab.getLeafByLabel('sd_xl_base_1.0').click()
-
-      await expect
-        .poll(() => comfyPage.nodeOps.getGraphNodesCount(), { timeout: 1000 })
-        .toBe(0)
-
-      const canvasBox = (await comfyPage.canvas.boundingBox())!
-      await comfyPage.canvas.click({
-        position: { x: canvasBox.width / 2, y: canvasBox.height / 2 }
-      })
-
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
-      await expect
-        .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-        .toBe(1)
-
-      const [loader] = await comfyPage.nodeOps.getNodeRefsByType(
-        'CheckpointLoaderSimple'
-      )
-      expect(loader).toBeDefined()
-      const widget = await loader.getWidgetByName('ckpt_name')
-      expect(await widget.getValue()).toBe('sd_xl_base_1.0.safetensors')
-    })
-
-    test('Ghost preview shows the model in the loader widget before placing', async ({
-      comfyPage
-    }) => {
-      const tab = comfyPage.menu.modelLibraryTab
-      await tab.open()
-      await tab.getFolderByLabel('checkpoints').click()
-      await expect(tab.getLeafByLabel('sd_xl_base_1.0')).toBeVisible()
-
-      await tab.getLeafByLabel('sd_xl_base_1.0').click()
-
-      const ghost = comfyPage.page.locator(
-        '[data-node-id="preview-CheckpointLoaderSimple"]'
-      )
-      await expect(ghost).toContainText('sd_xl_base_1.0.safetensors')
-    })
-  })
 })

browser_tests/tests/subgraph/subgraphLifecycle.spec.ts

@@ -1,9 +1,6 @@
-import type { ConsoleMessage } from '@playwright/test'
 import { expect } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
 import { getPseudoPreviewWidgets } from '@e2e/fixtures/utils/promotedWidgets'
 
 const domPreviewSelector = '.image-preview'
@@ -98,225 +95,4 @@ test.describe('Subgraph Lifecycle', { tag: ['@subgraph'] }, () => {
       await expect(comfyPage.page.locator(domPreviewSelector)).toHaveCount(0)
     })
   })
-
-  test.describe('Detach Race Repro', { tag: ['@vue-nodes'] }, () => {
-    const SUBGRAPH_NODE_TITLE = 'New Subgraph'
-
-    // Queues legacy onNodeRemoved/onSelectionChange so unpack completes first,
-    // widening the race window so a guard regression deterministically surfaces.
-    async function deferLegacyHandlers(comfyPage: ComfyPage) {
-      return await comfyPage.page.evaluateHandle(() => {
-        const graph = window.app!.graph!
-        const canvas = window.app!.canvas!
-        const queue: Array<() => void> = []
-        const originalNodeRemoved = graph.onNodeRemoved
-        const originalSelectionChange = canvas.onSelectionChange
-        graph.onNodeRemoved = function (node) {
-          queue.push(() => originalNodeRemoved?.call(this, node))
-        }
-        canvas.onSelectionChange = function (selected) {
-          queue.push(() => originalSelectionChange?.call(this, selected))
-        }
-        return {
-          drain: () => {
-            for (const fn of queue.splice(0)) fn()
-          },
-          restore: () => {
-            graph.onNodeRemoved = originalNodeRemoved
-            canvas.onSelectionChange = originalSelectionChange
-          }
-        }
-      })
-    }
-
-    type DeferredHandlers = Awaited<ReturnType<typeof deferLegacyHandlers>>
-
-    // Defers only the legacy selection-change callback, so the detached host
-    // node lingers in the reactive selection while onNodeRemoved still runs
-    // normally and clears it from the canvas. This isolates the panel render
-    // path: a panel mounted during this window reads the stale selection.
-    async function deferSelectionChange(
-      comfyPage: ComfyPage
-    ): Promise<DeferredHandlers> {
-      return await comfyPage.page.evaluateHandle(() => {
-        const canvas = window.app!.canvas!
-        const queue: Array<() => void> = []
-        const original = canvas.onSelectionChange
-        canvas.onSelectionChange = function (selected) {
-          queue.push(() => original?.call(this, selected))
-        }
-        return {
-          drain: () => {
-            for (const fn of queue.splice(0)) fn()
-          },
-          restore: () => {
-            canvas.onSelectionChange = original
-          }
-        }
-      })
-    }
-
-    function isNullGraphErrorText(text: string): boolean {
-      return text.includes('NullGraphError') || text.endsWith('has no graph')
-    }
-
-    // Vue's default errorHandler routes render throws to console.error,
-    // not pageerror - listen to both.
-    function captureNullGraphErrors(comfyPage: ComfyPage) {
-      const captured: string[] = []
-      const onPageError = (err: Error) => {
-        if (
-          err.name === 'NullGraphError' ||
-          isNullGraphErrorText(err.message ?? '')
-        ) {
-          captured.push(`pageerror ${err.name}: ${err.message}`)
-        }
-      }
-      const onConsoleMessage = (msg: ConsoleMessage) => {
-        if (msg.type() !== 'error') return
-        const text = msg.text()
-        if (isNullGraphErrorText(text)) {
-          captured.push(`console.error: ${text}`)
-        }
-      }
-      comfyPage.page.on('pageerror', onPageError)
-      comfyPage.page.on('console', onConsoleMessage)
-      return {
-        getErrors: () => [...captured],
-        stop: () => {
-          comfyPage.page.off('pageerror', onPageError)
-          comfyPage.page.off('console', onConsoleMessage)
-        }
-      }
-    }
-
-    async function unpackViaContextMenu(comfyPage: ComfyPage, title: string) {
-      const fixture = await comfyPage.vueNodes.getFixtureByTitle(title)
-      await comfyPage.contextMenu.openForVueNode(fixture.header)
-      await comfyPage.contextMenu.clickMenuItemExact('Unpack Subgraph')
-    }
-
-    async function reopenRightSidePanel(comfyPage: ComfyPage) {
-      const { propertiesPanel } = comfyPage.menu
-      await propertiesPanel.toggleButton.click()
-      await expect(propertiesPanel.root).toBeHidden()
-      await propertiesPanel.toggleButton.click()
-      await comfyPage.nextFrame()
-    }
-
-    // Unpacks the subgraph behind deferred teardown, runs an optional
-    // interaction while the node is detached but not yet cleaned up, then
-    // drains the deferred handlers and reports any NullGraphErrors seen.
-    async function unpackAndCaptureNullGraphErrors(
-      comfyPage: ComfyPage,
-      options: {
-        defer: (comfyPage: ComfyPage) => Promise<DeferredHandlers>
-        duringWindow?: (comfyPage: ComfyPage) => Promise<void>
-      }
-    ): Promise<string[]> {
-      const subgraphNode =
-        comfyPage.vueNodes.getNodeByTitle(SUBGRAPH_NODE_TITLE)
-      const errors = captureNullGraphErrors(comfyPage)
-      const deferred = await options.defer(comfyPage)
-      try {
-        await unpackViaContextMenu(comfyPage, SUBGRAPH_NODE_TITLE)
-        await expect(subgraphNode).toHaveCount(0)
-        await options.duringWindow?.(comfyPage)
-        await deferred.evaluate((handlers) => handlers.drain())
-        // Let drained-handler reactive flushes settle before stop().
-        await comfyPage.nextFrame()
-        return errors.getErrors()
-      } finally {
-        await deferred.evaluate((handlers) => handlers.restore())
-        await deferred.dispose()
-        errors.stop()
-      }
-    }
-
-    test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.settings.setSetting('Comfy.RightSidePanel.IsOpen', true)
-      await comfyPage.workflow.loadWorkflow(
-        'subgraphs/subgraph-with-promoted-text-widget'
-      )
-      const subgraphNode =
-        comfyPage.vueNodes.getNodeByTitle(SUBGRAPH_NODE_TITLE)
-      await expect(subgraphNode).toBeVisible()
-
-      const fixture =
-        await comfyPage.vueNodes.getFixtureByTitle(SUBGRAPH_NODE_TITLE)
-      await fixture.header.click()
-      await expect(
-        comfyPage.page.getByTestId(TestIds.propertiesPanel.root)
-      ).toBeVisible()
-      await comfyPage.nextFrame()
-    })
-
-    test('unpack does not surface NullGraphError on the LGraphNode render path', async ({
-      comfyPage
-    }) => {
-      const nullGraphErrors = await unpackAndCaptureNullGraphErrors(comfyPage, {
-        defer: deferLegacyHandlers
-      })
-      expect(
-        nullGraphErrors,
-        'LGraphNode render path: detach race must not surface NullGraphError'
-      ).toEqual([])
-    })
-
-    test('unpack does not surface NullGraphError from the TabSubgraphInputs panel', async ({
-      comfyPage
-    }) => {
-      const nullGraphErrors = await unpackAndCaptureNullGraphErrors(comfyPage, {
-        defer: deferLegacyHandlers
-      })
-      expect(
-        nullGraphErrors,
-        'TabSubgraphInputs panel: detach race must not surface NullGraphError'
-      ).toEqual([])
-    })
-
-    test('unpack with subgraph editor open does not surface NullGraphError from the SubgraphEditor panel', async ({
-      comfyPage
-    }) => {
-      await comfyPage.page.getByTestId(TestIds.subgraphEditor.toggle).click()
-      await comfyPage.nextFrame()
-
-      const nullGraphErrors = await unpackAndCaptureNullGraphErrors(comfyPage, {
-        defer: deferLegacyHandlers
-      })
-      expect(
-        nullGraphErrors,
-        'SubgraphEditor panel: detach race must not surface NullGraphError'
-      ).toEqual([])
-    })
-
-    test('reopening the right side panel after unpack does not surface NullGraphError', async ({
-      comfyPage
-    }) => {
-      const nullGraphErrors = await unpackAndCaptureNullGraphErrors(comfyPage, {
-        defer: deferSelectionChange,
-        duringWindow: reopenRightSidePanel
-      })
-      expect(
-        nullGraphErrors,
-        'TabSubgraphInputs remount: stale selection must not surface NullGraphError'
-      ).toEqual([])
-    })
-
-    test('reopening the right side panel with the subgraph editor open does not surface NullGraphError', async ({
-      comfyPage
-    }) => {
-      await comfyPage.page.getByTestId(TestIds.subgraphEditor.toggle).click()
-      await comfyPage.nextFrame()
-
-      const nullGraphErrors = await unpackAndCaptureNullGraphErrors(comfyPage, {
-        defer: deferSelectionChange,
-        duringWindow: reopenRightSidePanel
-      })
-      expect(
-        nullGraphErrors,
-        'SubgraphEditor remount: stale selection must not surface NullGraphError'
-      ).toEqual([])
-    })
-  })
 })

browser_tests/tests/topbar/workflowTabStatus.spec.ts

@@ -1,139 +0,0 @@
-import type { Locator, WebSocketRoute } from '@playwright/test'
-import { mergeTests } from '@playwright/test'
-
-import {
-  comfyPageFixture,
-  comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { ExecutionHelper } from '@e2e/fixtures/helpers/ExecutionHelper'
-import { webSocketFixture } from '@e2e/fixtures/ws'
-import { TestIds } from '@e2e/fixtures/selectors'
-
-const test = mergeTests(comfyPageFixture, webSocketFixture)
-
-const KSAMPLER_NODE = '3'
-
-async function runOnBackgroundTab(
-  comfyPage: ComfyPage,
-  ws: WebSocketRoute
-): Promise<{ exec: ExecutionHelper; jobId: string; backgroundTab: Locator }> {
-  const topbar = comfyPage.menu.topbar
-
-  await comfyPage.workflow.waitForActiveWorkflow()
-  await comfyPage.workflow.waitForWorkflowIdle()
-
-  const exec = new ExecutionHelper(comfyPage, ws)
-  const jobId = await exec.run()
-  await comfyPage.nextFrame()
-
-  await topbar.newWorkflowButton.click()
-  await comfyPage.workflow.waitForWorkflowIdle()
-  await expect(topbar.getActiveTab()).toContainText('(2)')
-
-  const backgroundTab = topbar.getTab(0)
-  exec.executionStart(jobId)
-  await expect(
-    backgroundTab.getByRole('img', { name: 'Running' })
-  ).toBeVisible()
-
-  return { exec, jobId, backgroundTab }
-}
-
-test.describe('Workflow tab status indicator', () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.settings.setSetting(
-      'Comfy.Workflow.WorkflowTabsPosition',
-      'Topbar'
-    )
-    await comfyPage.setup()
-  })
-
-  test('replaces the running indicator with completed when the job finishes', async ({
-    comfyPage,
-    getWebSocket
-  }) => {
-    const ws = await getWebSocket()
-    const { exec, jobId, backgroundTab } = await runOnBackgroundTab(
-      comfyPage,
-      ws
-    )
-
-    exec.executionSuccess(jobId)
-
-    await expect(
-      backgroundTab.getByRole('img', { name: 'Completed' })
-    ).toBeVisible()
-    await expect(
-      backgroundTab.getByRole('img', { name: 'Running' })
-    ).toHaveCount(0)
-  })
-
-  test('shows failed when the background job errors', async ({
-    comfyPage,
-    getWebSocket
-  }) => {
-    const ws = await getWebSocket()
-    const { exec, jobId, backgroundTab } = await runOnBackgroundTab(
-      comfyPage,
-      ws
-    )
-
-    exec.executionError(jobId, KSAMPLER_NODE, 'boom')
-
-    // The error opens a modal dialog that aria-hides the rest of the app
-    // (focus trap), taking the tab out of the accessibility tree. Dismiss it
-    // so the badge is reachable by role.
-    const errorDialog = comfyPage.page.getByTestId(TestIds.dialogs.errorDialog)
-    await expect(errorDialog).toBeVisible()
-    await comfyPage.page.keyboard.press('Escape')
-    await expect(errorDialog).toBeHidden()
-
-    await expect(
-      backgroundTab.getByRole('img', { name: 'Failed' })
-    ).toBeVisible()
-  })
-
-  test('drops the indicator on user interrupt rather than showing an error', async ({
-    comfyPage,
-    getWebSocket
-  }) => {
-    const ws = await getWebSocket()
-    const { exec, jobId, backgroundTab } = await runOnBackgroundTab(
-      comfyPage,
-      ws
-    )
-
-    exec.executionInterrupted(jobId, KSAMPLER_NODE)
-
-    await expect(backgroundTab.getByRole('img')).toHaveCount(0)
-  })
-
-  test('clears the indicator once the tab is activated', async ({
-    comfyPage,
-    getWebSocket
-  }) => {
-    const ws = await getWebSocket()
-    const { exec, jobId, backgroundTab } = await runOnBackgroundTab(
-      comfyPage,
-      ws
-    )
-
-    exec.executionSuccess(jobId)
-    await expect(
-      backgroundTab.getByRole('img', { name: 'Completed' })
-    ).toBeVisible()
-
-    const currentTab = comfyPage.menu.topbar.getActiveTab()
-
-    await expect(
-      backgroundTab.getByRole('img', { name: 'Completed' })
-    ).toBeVisible()
-    await backgroundTab.click()
-    await expect(backgroundTab.getByRole('img')).toHaveCount(0)
-
-    await currentTab.click()
-    await comfyPage.workflow.waitForWorkflowIdle()
-    await expect(backgroundTab.getByRole('img')).toHaveCount(0)
-  })
-})

browser_tests/tests/vueNodes/groups/groups.spec.ts

@@ -280,36 +280,3 @@ test.describe('Vue Node Groups', { tag: ['@screenshot', '@vue-nodes'] }, () => {
     await expect.poll(bypassCount, "won't toggle double selected node").toBe(7)
   })
 })
-
-test.describe(
-  'Vue Node Group Context Menu',
-  { tag: ['@vue-nodes', '@canvas'] },
-  () => {
-    test('right-clicking a group opens the Vue context menu instead of the legacy menu', async ({
-      comfyPage
-    }) => {
-      // Deselect so the right-click selects the group itself.
-      await comfyPage.keyboard.selectAll()
-      await comfyPage.page.keyboard.press(CREATE_GROUP_HOTKEY)
-      await expect
-        .poll(() => comfyPage.page.evaluate(() => graph!.groups.length))
-        .toBe(1)
-      await comfyPage.page.mouse.click(100, 100)
-      await comfyPage.nextFrame()
-
-      const groupPos = await getGroupTitlePosition(comfyPage, 'Group')
-      await comfyPage.page.mouse.click(groupPos.x, groupPos.y, {
-        button: 'right'
-      })
-
-      await expect(comfyPage.contextMenu.primeVueMenu).toBeVisible()
-      await expect(comfyPage.contextMenu.litegraphContextMenu).toBeHidden()
-      await expect(comfyPage.contextMenu.litegraphMenu).toBeHidden()
-
-      // Group-only action confirms it is the group menu.
-      await expect(
-        comfyPage.contextMenu.primeVueMenu.getByText('Fit Group To Nodes')
-      ).toBeVisible()
-    })
-  }
-)

browser_tests/tests/vueNodes/interactions/node/move.spec.ts

@@ -335,30 +335,6 @@ test.describe('Vue Node Moving', { tag: '@vue-nodes' }, () => {
     await comfyPage.canvasOps.moveMouseToEmptyArea()
   })
 
-  test('pointerCancel stops autopan', async ({ comfyPage }) => {
-    const ksampler = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
-    await ksampler.header.click({ trial: true })
-    await comfyPage.page.mouse.down()
-
-    const getOffset = () => comfyPage.canvasOps.getOffset()
-    const initialOffset = await getOffset()
-    await comfyPage.page.mouse.move(10, 10, { steps: 20 })
-    await expect.poll(getOffset, 'drag with autopan').not.toEqual(initialOffset)
-
-    await test.step('move outside pan range and cancel drag', async () => {
-      await comfyPage.page.mouse.move(400, 400, { steps: 20 })
-      await ksampler.header.evaluate((node) =>
-        node.dispatchEvent(new PointerEvent('pointercancel', { bubbles: true }))
-      )
-    })
-
-    const secondaryOffset = await getOffset()
-
-    await comfyPage.page.mouse.move(10, 10, { steps: 20 })
-    await comfyPage.nextFrame()
-    expect(await getOffset(), 'drag canceled').toEqual(secondaryOffset)
-  })
-
   test(
     '@mobile should allow moving nodes by dragging on touch devices',
     { tag: '@screenshot' },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.47.3",
+  "version": "1.47.2",
   "private": true,
   "description": "Official front-end implementation of ComfyUI",
   "homepage": "https://comfy.org",
@@ -19,10 +19,7 @@
     "size:collect": "node scripts/size-collect.js",
     "size:report": "node scripts/size-report.js",
     "collect-i18n": "pnpm exec playwright test --config=playwright.i18n.config.ts",
-    "dev:cloud": "pnpm dev:cloud:test",
-    "dev:cloud:test": "cross-env DEV_SERVER_COMFYUI_URL=https://testcloud.comfy.org/ vite --config vite.config.mts",
-    "dev:cloud:staging": "cross-env DEV_SERVER_COMFYUI_URL=https://stagingcloud.comfy.org/ vite --config vite.config.mts",
-    "dev:cloud:prod": "cross-env DEV_SERVER_COMFYUI_URL=https://cloud.comfy.org/ vite --config vite.config.mts",
+    "dev:cloud": "cross-env DEV_SERVER_COMFYUI_URL='https://testcloud.comfy.org/' vite --config vite.config.mts",
     "dev:desktop": "pnpm --filter @comfyorg/desktop-ui run dev",
     "dev:electron": "cross-env DISTRIBUTION=desktop vite --config vite.electron.config.mts",
     "dev:no-vue": "cross-env DISABLE_VUE_PLUGINS=true vite --config vite.config.mts",

src/components/boundingBoxes/WidgetBoundingBoxes.test.ts

@@ -1,224 +0,0 @@
-/* eslint-disable testing-library/no-container, testing-library/no-node-access, testing-library/prefer-user-event */
-import { fireEvent, render, screen } from '@testing-library/vue'
-import userEvent from '@testing-library/user-event'
-import { createPinia, setActivePinia } from 'pinia'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import WidgetBoundingBoxes from './WidgetBoundingBoxes.vue'
-import boundingBoxes from '@/locales/en/main.json'
-import type { BoundingBox } from '@/types/boundingBoxes'
-
-const { appState } = vi.hoisted(() => ({ appState: { node: null as unknown } }))
-
-vi.mock('@/scripts/app', () => ({
-  app: { canvas: { graph: { getNodeById: () => appState.node } } }
-}))
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      boundingBoxes: boundingBoxes.boundingBoxes,
-      palette: { swatchTitle: 'Edit', addColor: 'Add' }
-    }
-  }
-})
-
-const box = (over: Partial<BoundingBox> = {}): BoundingBox => ({
-  x: 51,
-  y: 51,
-  width: 256,
-  height: 256,
-  metadata: { type: 'obj', text: '', desc: '', palette: ['#ff0000'] },
-  ...over
-})
-
-const fakeCtx = {
-  measureText: (s: string) => ({ width: s.length * 7 }),
-  setTransform: () => {},
-  clearRect: () => {},
-  fillRect: () => {},
-  strokeRect: () => {},
-  fillText: () => {},
-  drawImage: () => {},
-  save: () => {},
-  restore: () => {},
-  beginPath: () => {},
-  rect: () => {},
-  clip: () => {},
-  font: '',
-  fillStyle: '',
-  strokeStyle: '',
-  lineWidth: 0
-} as unknown as CanvasRenderingContext2D
-
-function prepCanvas(canvas: HTMLCanvasElement) {
-  Object.defineProperty(canvas, 'clientWidth', {
-    value: 100,
-    configurable: true
-  })
-  Object.defineProperty(canvas, 'clientHeight', {
-    value: 100,
-    configurable: true
-  })
-  canvas.getContext = (() =>
-    fakeCtx) as unknown as HTMLCanvasElement['getContext']
-  canvas.getBoundingClientRect = () =>
-    ({
-      left: 0,
-      top: 0,
-      right: 100,
-      bottom: 100,
-      width: 100,
-      height: 100,
-      x: 0,
-      y: 0,
-      toJSON: () => ({})
-    }) as DOMRect
-  canvas.setPointerCapture = () => {}
-  canvas.releasePointerCapture = () => {}
-}
-
-function renderWidget(modelValue: BoundingBox[]) {
-  const result = render(WidgetBoundingBoxes, {
-    props: { nodeId: '1', modelValue },
-    global: { plugins: [i18n] }
-  })
-  const canvas = screen.getByTestId('bounding-boxes').querySelector('canvas')!
-  prepCanvas(canvas)
-  return { ...result, canvas }
-}
-
-const lastBoxes = (emitted: () => Record<string, unknown[][]>) => {
-  const calls = emitted()['update:modelValue']
-  return calls[calls.length - 1][0] as BoundingBox[]
-}
-
-beforeEach(() => {
-  setActivePinia(createPinia())
-  appState.node = {
-    widgets: [
-      { name: 'width', value: 512 },
-      { name: 'height', value: 512 }
-    ],
-    findInputSlot: () => -1,
-    getInputNode: () => null
-  }
-  vi.stubGlobal('requestAnimationFrame', () => 1)
-  vi.stubGlobal('cancelAnimationFrame', () => {})
-})
-
-afterEach(() => {
-  vi.unstubAllGlobals()
-})
-
-describe('WidgetBoundingBoxes', () => {
-  it('renders the canvas and editor shell', () => {
-    renderWidget([])
-    expect(
-      screen.getByTestId('bounding-boxes').querySelector('canvas')
-    ).not.toBeNull()
-  })
-
-  it('shows the region editor panel when a region is active', () => {
-    renderWidget([box()])
-    expect(screen.getByText('obj')).toBeTruthy()
-    expect(screen.getByText('text')).toBeTruthy()
-  })
-
-  it('reveals the text field after switching the region to text', async () => {
-    renderWidget([box()])
-    expect(
-      screen.queryByPlaceholderText('text to render (verbatim)')
-    ).toBeNull()
-    await userEvent.click(screen.getByText('text'))
-    expect(
-      screen.getByPlaceholderText('text to render (verbatim)')
-    ).toBeTruthy()
-  })
-
-  it('clears all regions via the clear button', async () => {
-    const { emitted } = renderWidget([box()])
-    await userEvent.click(screen.getByText('Clear all'))
-    expect(lastBoxes(emitted)).toEqual([])
-  })
-
-  it('draws a region through canvas pointer events', async () => {
-    const { canvas, emitted } = renderWidget([])
-    await fireEvent.pointerDown(canvas, {
-      button: 0,
-      clientX: 10,
-      clientY: 10,
-      pointerId: 1
-    })
-    await fireEvent.pointerMove(canvas, {
-      clientX: 60,
-      clientY: 60,
-      pointerId: 1
-    })
-    await fireEvent.pointerUp(canvas, {
-      clientX: 60,
-      clientY: 60,
-      pointerId: 1
-    })
-    expect(lastBoxes(emitted)).toHaveLength(1)
-  })
-
-  it('tracks focus and blur on the canvas', async () => {
-    const { canvas } = renderWidget([box()])
-    await fireEvent.focus(canvas)
-    await fireEvent.blur(canvas)
-    expect(canvas).toBeTruthy()
-  })
-
-  it('opens an inline editor on double click', async () => {
-    const { canvas, container } = renderWidget([box()])
-    await fireEvent.dblClick(canvas, { clientX: 30, clientY: 30 })
-    expect(container.querySelector('textarea')).not.toBeNull()
-  })
-
-  it('syncs description edits back to the model', async () => {
-    const { emitted } = renderWidget([box()])
-    await fireEvent.update(
-      screen.getByPlaceholderText('description of this region'),
-      'a caption'
-    )
-    expect(lastBoxes(emitted)[0].metadata.desc).toBe('a caption')
-  })
-
-  it('edits the text field once the region is a text region', async () => {
-    const { emitted } = renderWidget([box()])
-    await userEvent.click(screen.getByText('text'))
-    await fireEvent.update(
-      screen.getByPlaceholderText('text to render (verbatim)'),
-      'hello'
-    )
-    expect(lastBoxes(emitted)[0].metadata.text).toBe('hello')
-  })
-
-  it('deletes the active region with the Delete key', async () => {
-    const { canvas, emitted } = renderWidget([box()])
-    await fireEvent.keyDown(canvas, { key: 'Delete' })
-    expect(lastBoxes(emitted)).toEqual([])
-  })
-
-  it('clears hover state on pointer leave', async () => {
-    const { canvas } = renderWidget([
-      box({ x: 10, y: 10, width: 256, height: 256 })
-    ])
-    await fireEvent.pointerMove(canvas, { clientX: 15, clientY: 15 })
-    await fireEvent.pointerLeave(canvas)
-    expect(canvas).toBeTruthy()
-  })
-
-  it('commits the inline editor on blur', async () => {
-    const { canvas, container, emitted } = renderWidget([box()])
-    await fireEvent.dblClick(canvas, { clientX: 30, clientY: 30 })
-    const editor = container.querySelector('textarea')!
-    await fireEvent.update(editor, 'committed')
-    await fireEvent.blur(editor)
-    expect(lastBoxes(emitted)[0].metadata.desc).toBe('committed')
-  })
-})

src/components/boundingBoxes/WidgetBoundingBoxes.vue

@@ -1,181 +0,0 @@
-<template>
-  <div
-    class="widget-expands flex size-full flex-col gap-1 select-none"
-    data-testid="bounding-boxes"
-    @pointerdown.stop
-  >
-    <div
-      ref="canvasContainer"
-      class="relative w-full shrink-0 overflow-hidden rounded-sm border border-component-node-border bg-node-component-surface"
-      :style="canvasStyle"
-    >
-      <canvas
-        ref="canvasEl"
-        tabindex="0"
-        class="absolute inset-0 size-full rounded-sm outline-none"
-        :style="{ cursor: canvasCursor }"
-        @pointerdown="onPointerDown"
-        @pointermove="onCanvasPointerMove"
-        @pointerup="onDocPointerUp"
-        @pointercancel="onDocPointerUp"
-        @pointerleave="onPointerLeave"
-        @lostpointercapture="onDocPointerUp"
-        @dblclick="onDoubleClick"
-        @keydown="onCanvasKeyDown"
-        @focus="focused = true"
-        @blur="focused = false"
-      />
-      <textarea
-        v-if="inlineEditor"
-        ref="inlineEditorEl"
-        v-model="inlineEditor.value"
-        class="absolute box-border resize-none rounded-sm border-2 bg-black/90 p-1 font-mono text-xs text-white outline-none"
-        :style="inlineEditor.style"
-        data-capture-wheel="true"
-        @keydown.stop="onInlineKeyDown"
-        @blur="commitInlineEditor"
-      />
-    </div>
-
-    <div
-      v-if="activeRegion"
-      class="flex flex-col gap-2 rounded-sm bg-node-component-surface p-2 text-xs"
-    >
-      <div
-        class="flex h-8 items-center gap-1 rounded-sm bg-component-node-widget-background p-1"
-      >
-        <Button
-          variant="textonly"
-          size="unset"
-          :class="
-            cn(
-              'flex-1 self-stretch px-2 text-xs transition-colors',
-              activeRegion.type === 'obj'
-                ? 'rounded-sm bg-component-node-widget-background-selected text-base-foreground'
-                : 'text-node-text-muted hover:text-node-text'
-            )
-          "
-          @click="setActiveType('obj')"
-        >
-          {{ $t('boundingBoxes.typeObj') }}
-        </Button>
-        <Button
-          variant="textonly"
-          size="unset"
-          :class="
-            cn(
-              'flex-1 self-stretch px-2 text-xs transition-colors',
-              activeRegion.type === 'text'
-                ? 'rounded-sm bg-component-node-widget-background-selected text-base-foreground'
-                : 'text-node-text-muted hover:text-node-text'
-            )
-          "
-          @click="setActiveType('text')"
-        >
-          {{ $t('boundingBoxes.typeText') }}
-        </Button>
-      </div>
-      <div
-        v-if="activeRegion.type === 'text'"
-        class="group relative rounded-lg transition-all focus-within:ring focus-within:ring-component-node-widget-background-highlighted hover:bg-component-node-widget-background-hovered"
-      >
-        <span
-          class="pointer-events-none absolute top-1.5 left-3 z-10 text-2xs text-muted-foreground"
-        >
-          {{ $t('boundingBoxes.textLabel') }}
-        </span>
-        <Textarea
-          v-model="activeRegion.text"
-          :placeholder="$t('boundingBoxes.textPlaceholder')"
-          class="min-h-14 resize-none overflow-hidden pt-5 text-(length:--comfy-textarea-font-size) leading-normal not-disabled:bg-component-node-widget-background not-disabled:text-component-node-foreground hover:overflow-auto focus:overflow-auto"
-          data-capture-wheel="true"
-          @update:model-value="syncState"
-        />
-      </div>
-      <div
-        class="group relative rounded-lg transition-all focus-within:ring focus-within:ring-component-node-widget-background-highlighted hover:bg-component-node-widget-background-hovered"
-      >
-        <span
-          class="pointer-events-none absolute top-1.5 left-3 z-10 text-2xs text-muted-foreground"
-        >
-          {{ $t('boundingBoxes.descLabel') }}
-        </span>
-        <Textarea
-          v-model="activeRegion.desc"
-          :placeholder="$t('boundingBoxes.descPlaceholder')"
-          class="min-h-20 resize-none overflow-hidden pt-5 text-(length:--comfy-textarea-font-size) leading-normal not-disabled:bg-component-node-widget-background not-disabled:text-component-node-foreground hover:overflow-auto focus:overflow-auto"
-          data-capture-wheel="true"
-          @update:model-value="syncState"
-        />
-      </div>
-      <div class="flex items-center gap-2">
-        <span class="shrink-0 truncate text-sm text-muted-foreground">
-          {{ $t('boundingBoxes.colors') }}
-        </span>
-        <PaletteSwatchRow
-          v-model="activeRegion.palette"
-          :max="maxColors"
-          @update:model-value="syncState"
-        />
-      </div>
-    </div>
-    <div v-else-if="hasRegions" class="text-node-text-muted px-1 text-xs">
-      {{ $t('boundingBoxes.clickRegionToEdit') }}
-    </div>
-
-    <Button
-      variant="secondary"
-      size="md"
-      class="gap-2 rounded-lg border border-component-node-border bg-component-node-background text-xs text-muted-foreground hover:text-base-foreground"
-      @click="clearAll"
-    >
-      <i class="icon-[lucide--undo-2]" />
-      {{ $t('boundingBoxes.clearAll') }}
-    </Button>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useTemplateRef } from 'vue'
-
-import { cn } from '@comfyorg/tailwind-utils'
-
-import PaletteSwatchRow from '@/components/palette/PaletteSwatchRow.vue'
-import Button from '@/components/ui/button/Button.vue'
-import Textarea from '@/components/ui/textarea/Textarea.vue'
-import { useBoundingBoxes } from '@/composables/boundingBoxes/useBoundingBoxes'
-import type { BoundingBox } from '@/types/boundingBoxes'
-
-const { nodeId } = defineProps<{ nodeId: string }>()
-const modelValue = defineModel<BoundingBox[]>({ default: () => [] })
-
-const canvasEl = useTemplateRef<HTMLCanvasElement>('canvasEl')
-const canvasContainer = useTemplateRef<HTMLDivElement>('canvasContainer')
-const inlineEditorEl = useTemplateRef<HTMLTextAreaElement>('inlineEditorEl')
-
-const {
-  canvasStyle,
-  canvasCursor,
-  focused,
-  activeRegion,
-  hasRegions,
-  inlineEditor,
-  maxColors,
-  onPointerDown,
-  onCanvasPointerMove,
-  onDocPointerUp,
-  onPointerLeave,
-  onDoubleClick,
-  onCanvasKeyDown,
-  onInlineKeyDown,
-  commitInlineEditor,
-  setActiveType,
-  clearAll,
-  syncState
-} = useBoundingBoxes(nodeId, {
-  canvasEl,
-  canvasContainer,
-  inlineEditorEl,
-  modelValue
-})
-</script>

src/components/common/TreeExplorerV2Node.test.ts

@@ -355,7 +355,7 @@ describe('TreeExplorerV2Node', () => {
       const nodeDiv = getTreeNode(container)
       await fireEvent.dragStart(nodeDiv)
 
-      expect(mockStartDrag).toHaveBeenCalledWith(mockData, { mode: 'native' })
+      expect(mockStartDrag).toHaveBeenCalledWith(mockData, 'native')
     })
 
     it('does not call startDrag for folder items on dragstart', async () => {

src/components/custom/widget/WorkflowTemplateSelectorDialog.vue

@@ -427,6 +427,7 @@ import { useIntersectionObserver } from '@/composables/useIntersectionObserver'
 import { useLazyPagination } from '@/composables/useLazyPagination'
 import { usePrimeVueOverlayChildStyle } from '@/composables/usePopoverSizing'
 import { useTemplateFiltering } from '@/composables/useTemplateFiltering'
+import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useTemplateWorkflows } from '@/platform/workflow/templates/composables/useTemplateWorkflows'
 import type { TemplateInfo } from '@/platform/workflow/templates/types/template'
@@ -452,14 +453,16 @@ onMounted(() => {
 
 // Wrap onClose to track session end
 const onClose = () => {
-  const timeSpentSeconds = Math.floor(
-    (Date.now() - sessionStartTime.value) / 1000
-  )
+  if (isCloud) {
+    const timeSpentSeconds = Math.floor(
+      (Date.now() - sessionStartTime.value) / 1000
+    )
 
-  useTelemetry()?.trackTemplateLibraryClosed({
-    template_selected: templateWasSelected.value,
-    time_spent_seconds: timeSpentSeconds
-  })
+    useTelemetry()?.trackTemplateLibraryClosed({
+      template_selected: templateWasSelected.value,
+      time_spent_seconds: timeSpentSeconds
+    })
+  }
 
   originalOnClose()
 }

src/components/dialog/GlobalDialog.test.ts

@@ -44,30 +44,14 @@ describe('GlobalDialog renderer branching', () => {
     cleanup()
   })
 
-  it('renders the Reka branch when renderer is omitted (default)', async () => {
+  it('renders the PrimeVue branch when renderer is omitted', async () => {
     mountDialog()
     const store = useDialogStore()
 
     store.showDialog({
-      key: 'renderer-default',
-      title: 'Default renderer dialog',
-      component: Body
-    })
-
-    const dialogs = await screen.findAllByRole('dialog')
-    expect(dialogs.length).toBeGreaterThan(0)
-    expect(dialogs.some((el) => el.classList.contains('p-dialog'))).toBe(false)
-  })
-
-  it("renders the legacy PrimeVue branch when renderer is 'primevue'", async () => {
-    mountDialog()
-    const store = useDialogStore()
-
-    store.showDialog({
-      key: 'primevue-escape-hatch',
+      key: 'primevue-default',
       title: 'PrimeVue dialog',
-      component: Body,
-      dialogComponentProps: { renderer: 'primevue' }
+      component: Body
     })
 
     const dialogs = await screen.findAllByRole('dialog')

src/components/dialog/confirm/confirmDialog.test.ts

@@ -1,54 +0,0 @@
-/**
- * Dialog migration regression net: the showConfirmDialog helper must open
- * its dialog through the Reka renderer with zeroed section padding (the
- * Confirm* sections carry their own). Catches accidental reverts of the
- * Phase 6 renderer flip.
- */
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const showDialog = vi.hoisted(() => vi.fn())
-
-vi.mock('@/stores/dialogStore', () => ({
-  useDialogStore: () => ({ showDialog })
-}))
-
-import ConfirmBody from '@/components/dialog/confirm/ConfirmBody.vue'
-import ConfirmFooter from '@/components/dialog/confirm/ConfirmFooter.vue'
-import ConfirmHeader from '@/components/dialog/confirm/ConfirmHeader.vue'
-import { showConfirmDialog } from '@/components/dialog/confirm/confirmDialog'
-
-describe('showConfirmDialog Reka renderer opt-in', () => {
-  beforeEach(() => {
-    showDialog.mockReset()
-  })
-
-  it("sets renderer 'reka' with size 'md' and zeroed section padding", () => {
-    showConfirmDialog()
-
-    const [args] = showDialog.mock.calls[0]
-    expect(args.dialogComponentProps.renderer).toBe('reka')
-    expect(args.dialogComponentProps.size).toBe('md')
-    expect(args.dialogComponentProps.headerClass).toBe('p-0')
-    expect(args.dialogComponentProps.bodyClass).toBe('p-0')
-    expect(args.dialogComponentProps.footerClass).toBe('p-0')
-    expect(args.dialogComponentProps.pt).toBeUndefined()
-  })
-
-  it('forwards the confirm section components and caller props', () => {
-    showConfirmDialog({
-      key: 'confirm-test',
-      headerProps: { title: 'Title' },
-      props: { promptText: 'Prompt' },
-      footerProps: { confirmText: 'Delete' }
-    })
-
-    const [args] = showDialog.mock.calls[0]
-    expect(args.key).toBe('confirm-test')
-    expect(args.headerComponent).toBe(ConfirmHeader)
-    expect(args.component).toBe(ConfirmBody)
-    expect(args.footerComponent).toBe(ConfirmFooter)
-    expect(args.headerProps).toEqual({ title: 'Title' })
-    expect(args.props).toEqual({ promptText: 'Prompt' })
-    expect(args.footerProps).toEqual({ confirmText: 'Delete' })
-  })
-})

src/components/dialog/confirm/confirmDialog.ts

@@ -1,7 +1,6 @@
 import ConfirmBody from '@/components/dialog/confirm/ConfirmBody.vue'
 import ConfirmFooter from '@/components/dialog/confirm/ConfirmFooter.vue'
 import ConfirmHeader from '@/components/dialog/confirm/ConfirmHeader.vue'
-import type { DialogInstance } from '@/stores/dialogStore'
 import { useDialogStore } from '@/stores/dialogStore'
 import type { ComponentAttrs } from 'vue-component-type-helpers'
 
@@ -12,9 +11,7 @@ interface ConfirmDialogOptions {
   footerProps?: ComponentAttrs<typeof ConfirmFooter>
 }
 
-export function showConfirmDialog(
-  options: ConfirmDialogOptions = {}
-): DialogInstance {
+export function showConfirmDialog(options: ConfirmDialogOptions = {}) {
   const dialogStore = useDialogStore()
   const { key, headerProps, props, footerProps } = options
   return dialogStore.showDialog({
@@ -26,13 +23,11 @@ export function showConfirmDialog(
     props,
     footerProps,
     dialogComponentProps: {
-      renderer: 'reka',
-      size: 'md',
-      // Confirm sections carry their own padding — zero out the dialog
-      // chrome padding, like the PrimeVue `pt` overrides did.
-      headerClass: 'p-0',
-      bodyClass: 'p-0',
-      footerClass: 'p-0'
+      pt: {
+        header: 'py-0! px-0!',
+        content: 'p-0!',
+        footer: 'p-0!'
+      }
     }
   })
 }

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

@@ -8,7 +8,6 @@
         v-model="filters['global'].value"
         class="max-w-96"
         size="lg"
-        autofocus
         :placeholder="
           $t('g.searchPlaceholder', { subject: $t('g.keybindings') })
         "

src/components/dialog/content/setting/UsageLogsTable.test.ts

@@ -7,7 +7,6 @@ import { createI18n } from 'vue-i18n'
 
 import { render, screen, waitFor } from '@testing-library/vue'
 
-import type * as DistributionTypes from '@/platform/distribution/types'
 import type { AuditLog } from '@/services/customerEventsService'
 import { EventType } from '@/services/customerEventsService'
 
@@ -39,23 +38,6 @@ vi.mock('@/platform/telemetry', () => ({
   useTelemetry: () => null
 }))
 
-const mockFlags = vi.hoisted(() => ({ teamWorkspacesEnabled: false }))
-vi.mock('@/composables/useFeatureFlags', () => ({
-  useFeatureFlags: () => ({ flags: mockFlags })
-}))
-
-vi.mock('@/platform/distribution/types', async (importOriginal) => ({
-  ...(await importOriginal<typeof DistributionTypes>()),
-  isCloud: true
-}))
-
-const mockWorkspaceApi = vi.hoisted(() => ({
-  getBillingEvents: vi.fn()
-}))
-vi.mock('@/platform/workspace/api/workspaceApi', () => ({
-  workspaceApi: mockWorkspaceApi
-}))
-
 const i18n = createI18n({
   legacy: false,
   locale: 'en',
@@ -136,8 +118,6 @@ describe('UsageLogsTable', () => {
     vi.clearAllMocks()
 
     mockCustomerEventsService.getMyEvents.mockResolvedValue(mockEventsResponse)
-    mockWorkspaceApi.getBillingEvents.mockResolvedValue(mockEventsResponse)
-    mockFlags.teamWorkspacesEnabled = false
     mockCustomerEventsService.formatEventType.mockImplementation(
       (type: string) => {
         switch (type) {
@@ -340,20 +320,6 @@ describe('UsageLogsTable', () => {
     })
   })
 
-  describe('billing events source', () => {
-    it('uses workspaceApi.getBillingEvents when teamWorkspacesEnabled is on', async () => {
-      mockFlags.teamWorkspacesEnabled = true
-
-      await renderLoaded()
-
-      expect(mockWorkspaceApi.getBillingEvents).toHaveBeenCalledWith({
-        page: 1,
-        limit: 7
-      })
-      expect(mockCustomerEventsService.getMyEvents).not.toHaveBeenCalled()
-    })
-  })
-
   describe('EventType integration', () => {
     it('renders credit_added event with correct detail template', async () => {
       mockCustomerEventsService.getMyEvents.mockResolvedValue(

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

@@ -99,10 +99,7 @@ import ProgressSpinner from 'primevue/progressspinner'
 import { computed, ref } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
-import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
-import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
 import type { AuditLog } from '@/services/customerEventsService'
 import {
   EventType,
@@ -115,9 +112,6 @@ const error = ref<string | null>(null)
 
 const customerEventService = useCustomerEventsService()
 
-const { flags } = useFeatureFlags()
-const useBillingApi = computed(() => isCloud && flags.teamWorkspacesEnabled)
-
 const pagination = ref({
   page: 1,
   limit: 7,
@@ -144,13 +138,10 @@ const loadEvents = async () => {
   error.value = null
 
   try {
-    const params = {
+    const response = await customerEventService.getMyEvents({
       page: pagination.value.page,
       limit: pagination.value.limit
-    }
-    const response = useBillingApi.value
-      ? await workspaceApi.getBillingEvents(params)
-      : await customerEventService.getMyEvents(params)
+    })
 
     if (response) {
       if (response.events) {

src/components/graph/GraphCanvas.vue

@@ -93,7 +93,6 @@
 
   <NodeTooltip v-if="tooltipEnabled" />
   <NodeSearchboxPopover ref="nodeSearchboxPopoverRef" />
-  <NodeDragPreview />
   <VueNodeSwitchPopup />
 
   <!-- Initialize components after comfyApp is ready. useAbsolutePosition requires
@@ -137,7 +136,6 @@ import GraphCanvasMenu from '@/components/graph/GraphCanvasMenu.vue'
 import LinkOverlayCanvas from '@/components/graph/LinkOverlayCanvas.vue'
 import NodeTooltip from '@/components/graph/NodeTooltip.vue'
 import NodeContextMenu from '@/components/graph/NodeContextMenu.vue'
-import NodeDragPreview from '@/components/graph/NodeDragPreview.vue'
 import SelectionToolbox from '@/components/graph/SelectionToolbox.vue'
 import TitleEditor from '@/components/graph/TitleEditor.vue'
 import NodePropertiesPanel from '@/components/rightSidePanel/RightSidePanel.vue'
@@ -147,7 +145,6 @@ import TopbarBadges from '@/components/topbar/TopbarBadges.vue'
 import TopbarSubscribeButton from '@/components/topbar/TopbarSubscribeButton.vue'
 import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import { useChainCallback } from '@/composables/functional/useChainCallback'
-import { useGroupContextMenu } from '@/composables/graph/useGroupContextMenu'
 import { installErrorClearingHooks } from '@/composables/graph/useErrorClearingHooks'
 import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
 import { useVueNodeLifecycle } from '@/composables/graph/useVueNodeLifecycle'
@@ -467,7 +464,6 @@ useNodeBadge()
 
 useGlobalLitegraph()
 useContextMenuTranslation()
-useGroupContextMenu()
 useCopy()
 usePaste()
 useWorkflowAutoSave()

src/components/graph/NodeDragPreview.test.ts

@@ -1,97 +0,0 @@
-import { render } from '@testing-library/vue'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick } from 'vue'
-
-import NodeDragPreview from '@/components/graph/NodeDragPreview.vue'
-import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas'
-import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-import { fromPartial } from '@total-typescript/shoehorn'
-
-vi.mock(
-  '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue',
-  () => ({
-    default: { template: '<div data-testid="node-preview" />' }
-  })
-)
-
-const nodeDef = fromPartial<ComfyNodeDefImpl>({ name: 'TestNode' })
-
-function moveMouse(clientX: number, clientY: number) {
-  window.dispatchEvent(new MouseEvent('mousemove', { clientX, clientY }))
-}
-
-function ghostElement() {
-  return document.querySelector('[data-testid="node-preview"]')?.parentElement
-    ?.parentElement
-}
-
-describe('NodeDragPreview', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-  })
-
-  afterEach(() => {
-    useNodeDragToCanvas().cancelDrag()
-    vi.useRealTimers()
-  })
-
-  it('shows no ghost when nothing is being dragged', async () => {
-    render(NodeDragPreview)
-
-    moveMouse(100, 200)
-    vi.advanceTimersByTime(16)
-    await nextTick()
-
-    expect(ghostElement()).toBeFalsy()
-  })
-
-  it('keeps the ghost hidden until the mouse position is known', async () => {
-    render(NodeDragPreview)
-
-    useNodeDragToCanvas().startDrag(nodeDef)
-    await nextTick()
-    vi.advanceTimersByTime(16)
-    await nextTick()
-
-    expect(ghostElement()).toBeFalsy()
-  })
-
-  it('follows the mouse with an offset while dragging', async () => {
-    render(NodeDragPreview)
-
-    useNodeDragToCanvas().startDrag(nodeDef)
-    await nextTick()
-    moveMouse(100, 200)
-    vi.advanceTimersByTime(16)
-    await nextTick()
-
-    expect(ghostElement()?.style.transform).toBe('translate(112px, 212px)')
-
-    vi.advanceTimersByTime(16)
-    await nextTick()
-
-    expect(ghostElement()?.style.transform).toBe('translate(112px, 212px)')
-
-    moveMouse(300, 400)
-    vi.advanceTimersByTime(16)
-    await nextTick()
-
-    expect(ghostElement()?.style.transform).toBe('translate(312px, 412px)')
-  })
-
-  it('removes the ghost when the drag is cancelled', async () => {
-    render(NodeDragPreview)
-
-    useNodeDragToCanvas().startDrag(nodeDef)
-    await nextTick()
-    moveMouse(100, 200)
-    vi.advanceTimersByTime(16)
-    await nextTick()
-    expect(ghostElement()).toBeTruthy()
-
-    useNodeDragToCanvas().cancelDrag()
-    await nextTick()
-
-    expect(ghostElement()).toBeFalsy()
-  })
-})

src/components/graph/NodeDragPreview.vue

@@ -1,57 +0,0 @@
-<template>
-  <Teleport to="body">
-    <div
-      v-if="showGhost && rafPosition"
-      class="pointer-events-none fixed top-0 left-0 z-10000 will-change-transform"
-      :style="{
-        transform: `translate(${rafPosition.x + 12}px, ${rafPosition.y + 12}px)`
-      }"
-    >
-      <div class="origin-top-left scale-50 opacity-80">
-        <LGraphNodePreview
-          :node-def="draggedNode!"
-          :widget-values="pendingWidgetValues"
-          position="relative"
-        />
-      </div>
-    </div>
-  </Teleport>
-</template>
-
-<script setup lang="ts">
-import { useMouse, useRafFn } from '@vueuse/core'
-import { computed, shallowRef, watch } from 'vue'
-
-import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas'
-import LGraphNodePreview from '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue'
-
-const { isDragging, draggedNode, pendingWidgetValues } = useNodeDragToCanvas()
-
-const { x, y, sourceType } = useMouse({ type: 'client' })
-
-const showGhost = computed(() => Boolean(isDragging.value && draggedNode.value))
-const rafPosition = shallowRef<{ x: number; y: number }>()
-
-const { pause, resume } = useRafFn(
-  () => {
-    if (sourceType.value === null) return
-    const pos = rafPosition.value
-    if (pos && pos.x === x.value && pos.y === y.value) return
-    rafPosition.value = { x: x.value, y: y.value }
-  },
-  { immediate: false }
-)
-
-watch(
-  showGhost,
-  (show) => {
-    if (show) {
-      resume()
-    } else {
-      pause()
-      rafPosition.value = undefined
-    }
-  },
-  { immediate: true }
-)
-</script>

src/components/hdr/HdrViewerContent.test.ts

@@ -1,126 +0,0 @@
-/* eslint-disable testing-library/no-container, testing-library/no-node-access */
-import { render, screen } from '@testing-library/vue'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ref } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import HdrViewerContent from './HdrViewerContent.vue'
-
-vi.mock('@/base/common/downloadUtil', () => ({ downloadFile: vi.fn() }))
-
-const holder = vi.hoisted(() => ({ viewer: undefined as unknown }))
-vi.mock('@/composables/useHdrViewer', () => ({
-  useHdrViewer: () => holder.viewer,
-  CHANNEL_MODES: ['rgb', 'r', 'g', 'b', 'a', 'luminance']
-}))
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      g: { loading: 'Loading', downloadImage: 'Download' },
-      hdrViewer: {
-        failedToLoad: 'Failed',
-        exposure: 'Exposure',
-        normalizeExposure: 'Auto exposure',
-        channel: 'Channel',
-        channels: {
-          rgb: 'RGB',
-          r: 'R',
-          g: 'G',
-          b: 'B',
-          a: 'Alpha',
-          luminance: 'Luminance'
-        },
-        sourceGamut: 'Source gamut',
-        dither: 'Dither',
-        clipWarnings: 'Clip warnings',
-        fitView: 'Fit',
-        histogram: 'Histogram',
-        resolution: 'Resolution',
-        min: 'Min',
-        max: 'Max',
-        mean: 'Mean',
-        stdDev: 'Std dev',
-        nan: 'NaN',
-        inf: 'Inf'
-      }
-    }
-  }
-})
-
-function makeViewer(overrides: Record<string, unknown> = {}) {
-  return {
-    exposureStops: ref(0),
-    dither: ref(true),
-    clipWarnings: ref(false),
-    gamut: ref('sRGB'),
-    channel: ref('r'),
-    loading: ref(false),
-    error: ref(null),
-    dimensions: ref('512 x 512'),
-    stats: ref({
-      min: 0,
-      max: 4,
-      mean: 0.5,
-      stdDev: 0.2,
-      nanCount: 2,
-      infCount: 1
-    }),
-    histogram: ref(new Uint32Array([1, 2, 3, 4])),
-    pixel: ref({ x: 1, y: 2, r: 0.1, g: 0.2, b: 0.3, a: 1 }),
-    mount: vi.fn(),
-    dispose: vi.fn(),
-    fitView: vi.fn(),
-    normalizeExposure: vi.fn(),
-    ...overrides
-  }
-}
-
-function renderViewer() {
-  return render(HdrViewerContent, {
-    props: { imageUrl: '/api/view?filename=out.exr' },
-    global: { plugins: [i18n], stubs: { Button: true } }
-  })
-}
-
-describe('HdrViewerContent', () => {
-  beforeEach(() => {
-    holder.viewer = makeViewer()
-  })
-
-  it('renders the full statistics set including NaN/Inf', () => {
-    renderViewer()
-    for (const label of [
-      'Resolution',
-      'Min',
-      'Max',
-      'Mean',
-      'Std dev',
-      'NaN',
-      'Inf'
-    ]) {
-      screen.getByText(label)
-    }
-  })
-
-  it('shows the pixel readout when a pixel is hovered', () => {
-    renderViewer()
-    expect(screen.getByTestId('hdr-pixel-readout')).toBeInTheDocument()
-  })
-
-  it('colors the histogram according to the selected channel', () => {
-    holder.viewer = makeViewer({ channel: ref('g') })
-    const { container } = renderViewer()
-    const path = container.querySelector('svg path')
-    expect(path?.getAttribute('class')).toContain('text-green-500')
-  })
-
-  it('renders an option for each channel mode', () => {
-    renderViewer()
-    expect(
-      screen.getByRole('option', { name: 'Luminance' })
-    ).toBeInTheDocument()
-  })
-})

src/components/hdr/HdrViewerContent.vue

@@ -1,258 +0,0 @@
-<template>
-  <div class="flex size-full bg-base-background">
-    <div class="relative flex-1">
-      <div
-        ref="containerRef"
-        class="absolute size-full"
-        data-testid="hdr-viewer-canvas"
-      />
-
-      <div
-        v-if="viewer.loading.value"
-        class="absolute inset-0 flex items-center justify-center text-base-foreground"
-      >
-        {{ $t('g.loading') }}...
-      </div>
-      <div
-        v-else-if="viewer.error.value"
-        role="alert"
-        class="absolute inset-0 flex flex-col items-center justify-center gap-2 text-base-foreground"
-      >
-        <i class="icon-[lucide--image-off] size-12" />
-        <p class="text-sm">{{ $t('hdrViewer.failedToLoad') }}</p>
-      </div>
-
-      <div
-        v-if="viewer.pixel.value"
-        class="absolute top-2 left-2 rounded-sm bg-base-background/80 px-2 py-1 font-mono text-xs text-base-foreground"
-        data-testid="hdr-pixel-readout"
-      >
-        <div>{{ viewer.pixel.value.x }}, {{ viewer.pixel.value.y }}</div>
-        <div>
-          {{ formatNum(viewer.pixel.value.r) }}
-          {{ formatNum(viewer.pixel.value.g) }}
-          {{ formatNum(viewer.pixel.value.b) }}
-          <template v-if="viewer.pixel.value.a !== null">
-            {{ formatNum(viewer.pixel.value.a) }}
-          </template>
-        </div>
-      </div>
-    </div>
-
-    <div class="flex w-72 flex-col" data-testid="hdr-viewer-sidebar">
-      <div class="flex-1 overflow-y-auto p-4">
-        <div class="space-y-2">
-          <div class="space-y-4 p-2">
-            <div class="flex flex-col gap-2">
-              <label>{{ $t('hdrViewer.exposure') }}: {{ exposureLabel }}</label>
-              <input
-                v-model.number="viewer.exposureStops.value"
-                type="range"
-                min="-10"
-                max="10"
-                step="0.1"
-                class="w-full"
-                :aria-label="$t('hdrViewer.exposure')"
-              />
-            </div>
-            <Button
-              variant="secondary"
-              class="w-full"
-              @click="viewer.normalizeExposure"
-            >
-              {{ $t('hdrViewer.normalizeExposure') }}
-            </Button>
-          </div>
-
-          <div class="space-y-4 p-2">
-            <div class="flex flex-col gap-2">
-              <label>{{ $t('hdrViewer.channel') }}</label>
-              <select
-                v-model="viewer.channel.value"
-                class="bg-base-component-surface w-full rounded-sm px-2 py-1"
-                :aria-label="$t('hdrViewer.channel')"
-              >
-                <option v-for="mode in channelModes" :key="mode" :value="mode">
-                  {{ channelLabels[mode] }}
-                </option>
-              </select>
-            </div>
-
-            <div class="flex flex-col gap-2">
-              <label>{{ $t('hdrViewer.sourceGamut') }}</label>
-              <select
-                v-model="viewer.gamut.value"
-                class="bg-base-component-surface w-full rounded-sm px-2 py-1"
-                :aria-label="$t('hdrViewer.sourceGamut')"
-              >
-                <option v-for="name in gamutNames" :key="name" :value="name">
-                  {{ name }}
-                </option>
-              </select>
-            </div>
-          </div>
-
-          <div class="space-y-4 p-2">
-            <div class="flex items-center gap-2">
-              <input
-                id="hdr-dither"
-                v-model="viewer.dither.value"
-                type="checkbox"
-                class="size-4 cursor-pointer accent-node-component-surface-highlight"
-              />
-              <label for="hdr-dither" class="cursor-pointer">
-                {{ $t('hdrViewer.dither') }}
-              </label>
-            </div>
-            <div class="flex items-center gap-2">
-              <input
-                id="hdr-clip"
-                v-model="viewer.clipWarnings.value"
-                type="checkbox"
-                class="size-4 cursor-pointer accent-node-component-surface-highlight"
-              />
-              <label for="hdr-clip" class="cursor-pointer">
-                {{ $t('hdrViewer.clipWarnings') }}
-              </label>
-            </div>
-          </div>
-
-          <div v-if="histogramPath" class="space-y-2 p-2">
-            <label>{{ $t('hdrViewer.histogram') }}</label>
-            <svg
-              viewBox="0 0 1 1"
-              preserveAspectRatio="none"
-              class="bg-base-component-surface aspect-3/2 w-full rounded-sm"
-            >
-              <path
-                :d="histogramPath"
-                :class="histogramColorClass"
-                fill="currentColor"
-                fill-opacity="0.5"
-                stroke="none"
-              />
-            </svg>
-          </div>
-
-          <div
-            v-if="viewer.stats.value"
-            class="space-y-1 p-2 text-xs tabular-nums"
-          >
-            <div v-if="viewer.dimensions.value" class="flex justify-between">
-              <span>{{ $t('hdrViewer.resolution') }}</span>
-              <span>{{ viewer.dimensions.value }}</span>
-            </div>
-            <div class="flex justify-between">
-              <span>{{ $t('hdrViewer.min') }}</span>
-              <span>{{ formatNum(viewer.stats.value.min) }}</span>
-            </div>
-            <div class="flex justify-between">
-              <span>{{ $t('hdrViewer.max') }}</span>
-              <span>{{ formatNum(viewer.stats.value.max) }}</span>
-            </div>
-            <div class="flex justify-between">
-              <span>{{ $t('hdrViewer.mean') }}</span>
-              <span>{{ formatNum(viewer.stats.value.mean) }}</span>
-            </div>
-            <div class="flex justify-between">
-              <span>{{ $t('hdrViewer.stdDev') }}</span>
-              <span>{{ formatNum(viewer.stats.value.stdDev) }}</span>
-            </div>
-            <div
-              v-if="viewer.stats.value.nanCount"
-              class="flex justify-between text-error"
-            >
-              <span>{{ $t('hdrViewer.nan') }}</span>
-              <span>{{ viewer.stats.value.nanCount }}</span>
-            </div>
-            <div
-              v-if="viewer.stats.value.infCount"
-              class="flex justify-between text-error"
-            >
-              <span>{{ $t('hdrViewer.inf') }}</span>
-              <span>{{ viewer.stats.value.infCount }}</span>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="p-4">
-        <div class="flex gap-2">
-          <Button variant="secondary" class="flex-1" @click="viewer.fitView">
-            {{ $t('hdrViewer.fitView') }}
-          </Button>
-          <Button variant="secondary" class="flex-1" @click="handleDownload">
-            {{ $t('g.downloadImage') }}
-          </Button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted, useTemplateRef } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { downloadFile } from '@/base/common/downloadUtil'
-import Button from '@/components/ui/button/Button.vue'
-import type { ChannelMode } from '@/composables/useHdrViewer'
-import { CHANNEL_MODES, useHdrViewer } from '@/composables/useHdrViewer'
-import { GAMUT_NAMES } from '@/renderer/hdr/colorGamut'
-import { toFullResolutionUrl } from '@/utils/hdrFormatUtil'
-import { histogramToPath } from '@/utils/histogramUtil'
-
-const { imageUrl } = defineProps<{ imageUrl: string }>()
-
-const { t } = useI18n()
-const viewer = useHdrViewer()
-const gamutNames = GAMUT_NAMES
-const channelModes = CHANNEL_MODES
-const containerRef = useTemplateRef<HTMLDivElement>('containerRef')
-
-const exposureLabel = computed(() => {
-  const value = viewer.exposureStops.value
-  return `${value > 0 ? '+' : ''}${value.toFixed(1)}`
-})
-
-const histogramPath = computed(() =>
-  viewer.histogram.value ? histogramToPath(viewer.histogram.value) : ''
-)
-
-const histogramColorClass = computed(() => {
-  switch (viewer.channel.value) {
-    case 'r':
-      return 'text-red-500'
-    case 'g':
-      return 'text-green-500'
-    case 'b':
-      return 'text-blue-500'
-    default:
-      return 'text-base-foreground'
-  }
-})
-
-const channelLabels = computed<Record<ChannelMode, string>>(() => ({
-  rgb: t('hdrViewer.channels.rgb'),
-  r: t('hdrViewer.channels.r'),
-  g: t('hdrViewer.channels.g'),
-  b: t('hdrViewer.channels.b'),
-  a: t('hdrViewer.channels.a'),
-  luminance: t('hdrViewer.channels.luminance')
-}))
-
-function formatNum(value: number): string {
-  if (!Number.isFinite(value)) return String(value)
-  return Math.abs(value) >= 1000 || (value !== 0 && Math.abs(value) < 0.001)
-    ? value.toExponential(3)
-    : value.toFixed(4)
-}
-
-function handleDownload() {
-  downloadFile(toFullResolutionUrl(imageUrl))
-}
-
-onMounted(() => {
-  if (containerRef.value) void viewer.mount(containerRef.value, imageUrl)
-})
-</script>

src/components/palette/PaletteSwatchRow.test.ts

@@ -1,70 +0,0 @@
-/* eslint-disable testing-library/no-container, testing-library/no-node-access, testing-library/prefer-user-event */
-import { fireEvent, render, screen } from '@testing-library/vue'
-import userEvent from '@testing-library/user-event'
-import { describe, expect, it } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import PaletteSwatchRow from './PaletteSwatchRow.vue'
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: { en: { palette: { swatchTitle: 'Edit', addColor: 'Add' } } }
-})
-
-function renderRow(modelValue: string[], max = 5) {
-  return render(PaletteSwatchRow, {
-    props: { modelValue, max },
-    global: { plugins: [i18n] }
-  })
-}
-
-const lastEmit = (emitted: () => Record<string, unknown[][]>) => {
-  const calls = emitted()['update:modelValue']
-  return calls[calls.length - 1][0]
-}
-
-describe('PaletteSwatchRow', () => {
-  it('renders one swatch per color', () => {
-    const { container } = renderRow(['#ff0000', '#00ff00'])
-    expect(container.querySelectorAll('[data-index]')).toHaveLength(2)
-  })
-
-  it('appends a color when the add button is clicked', async () => {
-    const { emitted } = renderRow(['#ff0000'])
-    await userEvent.click(screen.getByRole('button'))
-    expect(lastEmit(emitted)).toEqual(['#ff0000', '#ffffff'])
-  })
-
-  it('removes a color on right click', async () => {
-    const { container, emitted } = renderRow(['#ff0000', '#00ff00'])
-    await fireEvent.contextMenu(container.querySelector('[data-index="0"]')!)
-    expect(lastEmit(emitted)).toEqual(['#00ff00'])
-  })
-
-  it('hides the add button once the max is reached', () => {
-    renderRow(['#a', '#b'], 2)
-    expect(screen.queryByRole('button')).toBeNull()
-  })
-
-  it('writes a picked color back through the hidden color input', async () => {
-    const { container, emitted } = renderRow(['#ff0000', '#00ff00'])
-    await fireEvent.click(container.querySelector('[data-index="1"]')!)
-    const input = container.querySelector(
-      'input[type="color"]'
-    ) as HTMLInputElement
-    input.value = '#0000ff'
-    await fireEvent.input(input)
-    expect(lastEmit(emitted)).toEqual(['#ff0000', '#0000ff'])
-  })
-
-  it('starts a drag on pointer down without emitting', async () => {
-    const { container, emitted } = renderRow(['#ff0000', '#00ff00'])
-    await fireEvent.pointerDown(container.querySelector('[data-index="0"]')!, {
-      button: 0,
-      clientX: 5,
-      clientY: 5
-    })
-    expect(emitted()['update:modelValue']).toBeUndefined()
-  })
-})

src/components/palette/PaletteSwatchRow.vue

@@ -1,48 +0,0 @@
-<template>
-  <div ref="container" class="flex flex-wrap items-center gap-1">
-    <div
-      v-for="(hex, i) in modelValue"
-      :key="`${i}-${hex}`"
-      :data-index="i"
-      :data-hex="hex"
-      class="relative size-5 cursor-pointer rounded-sm border border-component-node-border"
-      :style="{ background: hex }"
-      :title="t('palette.swatchTitle')"
-      @click="openPicker(i, $event)"
-      @contextmenu.prevent.stop="remove(i)"
-      @pointerdown="onPointerDown(i, $event)"
-    />
-    <button
-      v-if="modelValue.length < max"
-      type="button"
-      class="h-5 rounded-sm border border-component-node-border bg-component-node-widget-background px-2 text-xs leading-none"
-      :title="t('palette.addColor')"
-      @click="addColor"
-    >
-      +
-    </button>
-    <input
-      ref="picker"
-      type="color"
-      class="pointer-events-none absolute size-0 opacity-0"
-      @input="onPickerInput"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useTemplateRef } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { usePaletteSwatchRow } from '@/composables/palette/usePaletteSwatchRow'
-
-const { max = 5 } = defineProps<{ max?: number }>()
-const modelValue = defineModel<string[]>({ required: true })
-const { t } = useI18n()
-
-const container = useTemplateRef<HTMLDivElement>('container')
-const picker = useTemplateRef<HTMLInputElement>('picker')
-
-const { openPicker, onPickerInput, remove, addColor, onPointerDown } =
-  usePaletteSwatchRow({ modelValue, container, picker })
-</script>

src/components/palette/WidgetColors.test.ts

@@ -1,54 +0,0 @@
-/* eslint-disable testing-library/no-node-access, testing-library/no-container, testing-library/prefer-user-event */
-import { fireEvent, render, screen } from '@testing-library/vue'
-import userEvent from '@testing-library/user-event'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import WidgetColors from './WidgetColors.vue'
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: { en: { palette: { swatchTitle: 'Edit', addColor: 'Add' } } }
-})
-
-function renderWidget(modelValue: string[], widget?: { name: string }) {
-  return render(WidgetColors, {
-    props: { modelValue, widget },
-    global: { plugins: [i18n] }
-  })
-}
-
-const cleanups: Array<() => void> = []
-afterEach(() => {
-  while (cleanups.length) cleanups.pop()?.()
-})
-
-describe('WidgetColors', () => {
-  it('renders the palette swatch row for each color', () => {
-    renderWidget(['#ff0000', '#00ff00'])
-    const root = screen.getByTestId('colors')
-    expect(root.querySelectorAll('[data-index]')).toHaveLength(2)
-  })
-
-  it('shows the widget name as an inline label', () => {
-    renderWidget(['#ff0000'], { name: 'color_palette' })
-    expect(screen.getByText('color_palette')).toBeInTheDocument()
-  })
-
-  it('emits an updated palette when a color is added', async () => {
-    const { emitted } = renderWidget([])
-    await userEvent.click(screen.getByRole('button'))
-    const calls = emitted()['update:modelValue'] as unknown[][]
-    expect(calls[calls.length - 1][0]).toEqual(['#ffffff'])
-  })
-
-  it('does not stop swatch pointer moves from reaching document drag handlers', async () => {
-    const { container } = renderWidget(['#ff0000'])
-    const onDocMove = vi.fn()
-    document.addEventListener('pointermove', onDocMove)
-    cleanups.push(() => document.removeEventListener('pointermove', onDocMove))
-    await fireEvent.pointerMove(container.querySelector('[data-index="0"]')!)
-    expect(onDocMove).toHaveBeenCalled()
-  })
-})

src/components/palette/WidgetColors.vue

@@ -1,29 +0,0 @@
-<template>
-  <div
-    class="flex size-full items-center gap-2"
-    data-testid="colors"
-    @pointerdown.stop
-  >
-    <span
-      v-if="widget?.name"
-      class="shrink-0 truncate text-node-component-slot-text"
-    >
-      {{ widget.label || widget.name }}
-    </span>
-    <PaletteSwatchRow v-model="modelValue" :max="MAX_COLORS" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { SimplifiedWidget } from '@/types/simplifiedWidget'
-
-import PaletteSwatchRow from './PaletteSwatchRow.vue'
-
-const MAX_COLORS = 16
-
-const { widget } = defineProps<{
-  widget?: Pick<SimplifiedWidget<string[]>, 'name' | 'label'>
-}>()
-
-const modelValue = defineModel<string[]>({ default: () => [] })
-</script>

src/components/queue/QueueProgressOverlay.vue

@@ -66,6 +66,7 @@ import { useQueueProgress } from '@/composables/queue/useQueueProgress'
 import { useResultGallery } from '@/composables/queue/useResultGallery'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { useAssetSelectionStore } from '@/platform/assets/composables/useAssetSelectionStore'
+import { isCloud } from '@/platform/distribution/types'
 import { useSurveyFeatureTracking } from '@/platform/surveys/useSurveyFeatureTracking'
 import { api } from '@/scripts/api'
 import { useAssetsStore } from '@/stores/assetsStore'
@@ -194,15 +195,20 @@ const onCancelItem = wrapWithErrorHandlingAsync(async (item: JobListItem) => {
   const jobId = item.taskRef?.jobId
   if (!jobId) return
 
-  if (
-    item.state === 'running' ||
-    item.state === 'initialization' ||
-    item.state === 'pending'
-  ) {
-    // State-agnostic cancel (see api.ts cancelJob for the runtime-parity caveat).
-    await api.cancelJob(jobId)
+  if (item.state === 'running' || item.state === 'initialization') {
+    // Running/initializing jobs: interrupt execution
+    // Cloud backend uses deleteItem, local uses interrupt
+    if (isCloud) {
+      await api.deleteItem('queue', jobId)
+    } else {
+      await api.interrupt(jobId)
+    }
     executionStore.clearInitializationByJobId(jobId)
     await queueStore.update()
+  } else if (item.state === 'pending') {
+    // Pending jobs: remove from queue
+    await api.deleteItem('queue', jobId)
+    await queueStore.update()
   }
 })
 
@@ -286,8 +292,17 @@ const interruptAll = wrapWithErrorHandlingAsync(async () => {
 
   if (!jobIds.length) return
 
-  // State-agnostic batch cancel (see api.ts cancelJobs for the runtime-parity caveat).
-  await api.cancelJobs(jobIds)
+  // Cloud backend supports cancelling specific jobs via /queue delete,
+  // while /interrupt always targets the "first" job. Use the targeted API
+  // on cloud to ensure we cancel the workflow the user clicked.
+  if (isCloud) {
+    await Promise.all(jobIds.map((id) => api.deleteItem('queue', id)))
+    executionStore.clearInitializationByJobIds(jobIds)
+    await queueStore.update()
+    return
+  }
+
+  await Promise.all(jobIds.map((id) => api.interrupt(id)))
   executionStore.clearInitializationByJobIds(jobIds)
   await queueStore.update()
 })

src/components/range/WidgetRange.test.ts

@@ -1,5 +1,4 @@
 import { render, screen } from '@testing-library/vue'
-import { createNodeLocatorId } from '@/types/nodeIdentification'
 import userEvent from '@testing-library/user-event'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { defineComponent, ref } from 'vue'
@@ -166,9 +165,7 @@ describe('WidgetRange', () => {
       outputsHolder.nodeOutputs = {
         loc1: { histogram_range_w: [1, 2, 3, 4] }
       }
-      renderWidget(
-        makeWidget({}, { nodeLocatorId: createNodeLocatorId(null, 'loc1') })
-      )
+      renderWidget(makeWidget({}, { nodeLocatorId: 'loc1' }))
       expect(screen.getByTestId('range-editor').dataset.hasHistogram).toBe(
         'true'
       )
@@ -178,9 +175,7 @@ describe('WidgetRange', () => {
       outputsHolder.nodeOutputs = {
         loc1: { histogram_range_w: [] }
       }
-      renderWidget(
-        makeWidget({}, { nodeLocatorId: createNodeLocatorId(null, 'loc1') })
-      )
+      renderWidget(makeWidget({}, { nodeLocatorId: 'loc1' }))
       expect(screen.getByTestId('range-editor').dataset.hasHistogram).toBe(
         'false'
       )

src/components/rightSidePanel/errors/ErrorNodeCard.stories.ts

@@ -1,7 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import ErrorNodeCard from './ErrorNodeCard.vue'
 import type { ErrorCardData } from './types'
-import { createNodeExecutionId } from '@/types/nodeIdentification'
 
 const meta: Meta<typeof ErrorNodeCard> = {
   title: 'RightSidePanel/Errors/ErrorNodeCard',
@@ -24,7 +23,7 @@ type Story = StoryObj<typeof meta>
 const singleErrorCard: ErrorCardData = {
   id: 'node-10',
   title: 'CLIPTextEncode',
-  nodeId: createNodeExecutionId([10]),
+  nodeId: '10',
   nodeTitle: 'CLIP Text Encode (Prompt)',
   isSubgraphNode: false,
   errors: [
@@ -38,7 +37,7 @@ const singleErrorCard: ErrorCardData = {
 const multipleErrorsCard: ErrorCardData = {
   id: 'node-24',
   title: 'VAEDecode',
-  nodeId: createNodeExecutionId([24]),
+  nodeId: '24',
   nodeTitle: 'VAE Decode',
   isSubgraphNode: false,
   errors: [
@@ -56,7 +55,7 @@ const multipleErrorsCard: ErrorCardData = {
 const runtimeErrorCard: ErrorCardData = {
   id: 'exec-45',
   title: 'KSampler',
-  nodeId: createNodeExecutionId([45]),
+  nodeId: '45',
   nodeTitle: 'KSampler',
   isSubgraphNode: false,
   errors: [
@@ -76,7 +75,7 @@ const runtimeErrorCard: ErrorCardData = {
 const subgraphErrorCard: ErrorCardData = {
   id: 'node-3:15',
   title: 'KSampler',
-  nodeId: createNodeExecutionId([3, 15]),
+  nodeId: '3:15',
   nodeTitle: 'Nested KSampler',
   isSubgraphNode: true,
   errors: [

src/components/rightSidePanel/errors/ErrorNodeCard.test.ts

@@ -6,7 +6,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 import ErrorNodeCard from './ErrorNodeCard.vue'
 import type { ErrorCardData } from './types'
-import { createNodeExecutionId } from '@/types/nodeIdentification'
 
 const mockGetLogs = vi.fn(() => Promise.resolve('mock server logs'))
 const mockSerialize = vi.fn(() => ({ nodes: [] }))
@@ -157,7 +156,7 @@ describe('ErrorNodeCard.vue', () => {
     return {
       id: `exec-${++cardIdCounter}`,
       title: 'KSampler',
-      nodeId: createNodeExecutionId([10]),
+      nodeId: '10',
       nodeTitle: 'KSampler',
       errors: [
         {
@@ -250,7 +249,7 @@ describe('ErrorNodeCard.vue', () => {
     renderCard({
       id: `node-${++cardIdCounter}`,
       title: 'KSampler',
-      nodeId: createNodeExecutionId([10]),
+      nodeId: '10',
       nodeTitle: 'KSampler',
       errors: [
         {
@@ -388,7 +387,7 @@ describe('ErrorNodeCard.vue', () => {
     const card: ErrorCardData = {
       id: `exec-${++cardIdCounter}`,
       title: 'KSampler',
-      nodeId: createNodeExecutionId([10]),
+      nodeId: '10',
       nodeTitle: 'KSampler',
       errors: [
         {

src/components/rightSidePanel/errors/types.ts

@@ -1,5 +1,4 @@
 import type { ResolvedErrorMessage } from '@/platform/errorCatalog/types'
-import type { NodeExecutionId } from '@/types/nodeIdentification'
 
 export interface ErrorItem extends ResolvedErrorMessage {
   /** Raw source/API-compatible message. */
@@ -13,7 +12,7 @@ export interface ErrorItem extends ResolvedErrorMessage {
 export interface ErrorCardData {
   id: string
   title: string
-  nodeId?: NodeExecutionId
+  nodeId?: string
   nodeTitle?: string
   graphNodeId?: string
   isSubgraphNode?: boolean

src/components/rightSidePanel/errors/useErrorGroups.test.ts

@@ -671,30 +671,6 @@ describe('useErrorGroups', () => {
       expect(nodeIds).toEqual(['1', '2', '10'])
     })
 
-    it('marks only nested execution paths as subgraph node cards', async () => {
-      const { store, groups } = createErrorGroups()
-      store.lastNodeErrors = {
-        '1': {
-          class_type: 'KSampler',
-          dependent_outputs: [],
-          errors: [{ type: 'err', message: 'Error', details: '' }]
-        },
-        '1:20': {
-          class_type: 'KSampler',
-          dependent_outputs: [],
-          errors: [{ type: 'err', message: 'Error', details: '' }]
-        }
-      }
-      await nextTick()
-
-      const execGroup = groups.allErrorGroups.value.find(
-        (g) => g.type === 'execution'
-      )
-      expect(execGroup?.cards).toMatchObject([
-        { nodeId: '1', isSubgraphNode: false },
-        { nodeId: '1:20', isSubgraphNode: true }
-      ])
-    })
     it('sorts cards with subpath nodeIds before higher root IDs', async () => {
       const { store, groups } = createErrorGroups()
       store.lastNodeErrors = {

src/components/rightSidePanel/errors/useErrorGroups.ts

@@ -39,8 +39,8 @@ import {
   resolveRunErrorMessage
 } from '@/platform/errorCatalog/errorMessageResolver'
 import {
-  compareExecutionId,
-  tryNormalizeNodeExecutionId
+  isNodeExecutionId,
+  compareExecutionId
 } from '@/types/nodeIdentification'
 
 const PROMPT_CARD_ID = '__prompt__'
@@ -82,7 +82,7 @@ interface ErrorSearchItem {
 type CataloguedErrorItem = ErrorItem & ResolvedCatalogErrorMessage
 
 /** Resolve display info for a node by its execution ID. */
-function resolveNodeInfo(nodeId: NodeExecutionId) {
+function resolveNodeInfo(nodeId: string) {
   const graphNode = getNodeByExecutionId(app.rootGraph, nodeId)
 
   return {
@@ -119,7 +119,7 @@ function getOrCreateGroup(
 }
 
 function createErrorCard(
-  nodeId: NodeExecutionId,
+  nodeId: string,
   classType: string,
   idPrefix: string
 ): ErrorCardData {
@@ -130,7 +130,7 @@ function createErrorCard(
     nodeId,
     nodeTitle: nodeInfo.title,
     graphNodeId: nodeInfo.graphNodeId,
-    isSubgraphNode: nodeId.includes(':'),
+    isSubgraphNode: isNodeExecutionId(nodeId),
     errors: []
   }
 }
@@ -288,7 +288,7 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
     return map
   })
 
-  function isErrorInSelection(executionNodeId: NodeExecutionId): boolean {
+  function isErrorInSelection(executionNodeId: string): boolean {
     const nodeIds = selectedNodeInfo.value.nodeIds
     if (!nodeIds) return true
 
@@ -305,7 +305,7 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
 
   function addNodeErrorToGroup(
     groupsMap: Map<string, GroupEntry>,
-    nodeId: NodeExecutionId,
+    nodeId: string,
     classType: string,
     idPrefix: string,
     error: CataloguedErrorItem,
@@ -371,11 +371,9 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
   ) {
     if (!executionErrorStore.lastNodeErrors) return
 
-    for (const [rawNodeId, nodeError] of Object.entries(
+    for (const [nodeId, nodeError] of Object.entries(
       executionErrorStore.lastNodeErrors
     )) {
-      const nodeId = tryNormalizeNodeExecutionId(rawNodeId)
-      if (!nodeId) continue
       const nodeDisplayName =
         resolveNodeInfo(nodeId).title || nodeError.class_type
       for (const e of nodeError.errors) {
@@ -406,12 +404,9 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
     if (!executionErrorStore.lastExecutionError) return
 
     const e = executionErrorStore.lastExecutionError
-    const nodeId = tryNormalizeNodeExecutionId(e.node_id)
-    if (!nodeId) return
-
     addNodeErrorToGroup(
       groupsMap,
-      nodeId,
+      String(e.node_id),
       e.node_type,
       'exec',
       {
@@ -422,7 +417,8 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
         ...resolveRunErrorMessage({
           kind: 'execution',
           error: e,
-          nodeDisplayName: resolveNodeInfo(nodeId).title || e.node_type
+          nodeDisplayName:
+            resolveNodeInfo(String(e.node_id)).title || e.node_type
         })
       },
       filterBySelection
@@ -673,7 +669,7 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
     ]
   }
 
-  function isAssetErrorInSelection(executionNodeId: NodeExecutionId): boolean {
+  function isAssetErrorInSelection(executionNodeId: string): boolean {
     const nodeIds = selectedNodeInfo.value.nodeIds
     if (!nodeIds) return true
 
@@ -695,17 +691,12 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
     return false
   }
 
-  function isAssetCandidateInSelection(nodeId: string | number): boolean {
-    const executionNodeId = tryNormalizeNodeExecutionId(nodeId)
-    return executionNodeId ? isAssetErrorInSelection(executionNodeId) : false
-  }
-
   const filteredMissingModelGroups = computed(() => {
     if (!selectedNodeInfo.value.nodeIds) return missingModelGroups.value
     const candidates = missingModelStore.missingModelCandidates
     if (!candidates?.length) return []
     const filtered = candidates.filter(
-      (c) => c.nodeId != null && isAssetCandidateInSelection(c.nodeId)
+      (c) => c.nodeId != null && isAssetErrorInSelection(String(c.nodeId))
     )
     if (!filtered.length) return []
     return groupMissingModelCandidates(filtered, isCloud)
@@ -716,7 +707,7 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
     const candidates = missingMediaStore.missingMediaCandidates
     if (!candidates?.length) return []
     const filtered = candidates.filter(
-      (c) => c.nodeId != null && isAssetCandidateInSelection(c.nodeId)
+      (c) => c.nodeId != null && isAssetErrorInSelection(String(c.nodeId))
     )
     if (!filtered.length) return []
     return groupCandidatesByMediaType(filtered)

src/components/rightSidePanel/errors/useErrorReport.test.ts

@@ -4,7 +4,6 @@ import { nextTick, ref } from 'vue'
 import type { useSystemStatsStore } from '@/stores/systemStatsStore'
 
 import type { ErrorCardData } from './types'
-import { createNodeExecutionId } from '@/types/nodeIdentification'
 import { useErrorReport } from './useErrorReport'
 
 async function flushPromises() {
@@ -104,7 +103,7 @@ function makeCard(overrides: Partial<ErrorCardData> = {}): ErrorCardData {
   return {
     id: 'card-1',
     title: 'KSampler',
-    nodeId: createNodeExecutionId([42]),
+    nodeId: '42',
     errors: [],
     ...overrides
   }
@@ -182,7 +181,7 @@ describe('useErrorReport', () => {
       exceptionType: 'RuntimeError',
       exceptionMessage: 'CUDA oom',
       traceback: 'trace-0',
-      nodeId: createNodeExecutionId([42]),
+      nodeId: '42',
       nodeType: 'KSampler',
       systemStats: sampleSystemStats,
       serverLogs: 'server logs',

src/components/sidebar/SidebarIcon.test.ts

@@ -3,12 +3,17 @@ import userEvent from '@testing-library/user-event'
 import PrimeVue from 'primevue/config'
 import Tooltip from 'primevue/tooltip'
 import { describe, expect, it } from 'vitest'
-import type { ComponentProps } from 'vue-component-type-helpers'
 import { createI18n } from 'vue-i18n'
 
 import SidebarIcon from './SidebarIcon.vue'
 
-type SidebarIconProps = ComponentProps<typeof SidebarIcon>
+type SidebarIconProps = {
+  icon: string
+  selected: boolean
+  tooltip?: string
+  class?: string
+  iconBadge?: string | (() => string | null)
+}
 
 const i18n = createI18n({
   legacy: false,
@@ -79,20 +84,4 @@ describe('SidebarIcon', () => {
       tooltipText
     )
   })
-
-  it('falls back to label for tooltip when no tooltip is provided', async () => {
-    const labelText = 'WASNodeSuitePreprocessors'
-    const { user } = renderSidebarIcon({ label: labelText })
-
-    expect(screen.getByRole('button')).toHaveAttribute('aria-label', labelText)
-
-    await user.hover(screen.getByRole('button'))
-
-    await waitFor(
-      () => {
-        expect(screen.getByRole('tooltip')).toHaveTextContent(labelText)
-      },
-      { timeout: 1000 }
-    )
-  })
 })

src/components/sidebar/SidebarIcon.vue

@@ -40,11 +40,9 @@
           </span>
         </div>
       </slot>
-      <!-- w-max sizes the label to the rail instead of the padding-inset
-           button content box, which is too narrow for one-line labels -->
       <span
         v-if="label && !isSmall"
-        class="side-bar-button-label line-clamp-2 w-max max-w-[calc(var(--sidebar-width)-var(--sidebar-padding))] text-center text-2xs wrap-break-word whitespace-normal"
+        class="side-bar-button-label text-center text-2xs"
         >{{ st(label, label) }}</span
       >
     </div>
@@ -85,14 +83,7 @@ const overlayValue = computed(() =>
   typeof iconBadge === 'function' ? (iconBadge() ?? '') : iconBadge
 )
 const shouldShowBadge = computed(() => !!overlayValue.value)
-/**
- * Falls back to the label when no tooltip is provided, so labels clamped
- * to two lines can always be recovered in full on hover.
- */
-const computedTooltip = computed(() => {
-  const text = tooltip || label
-  return st(text, text) + tooltipSuffix
-})
+const computedTooltip = computed(() => st(tooltip, tooltip) + tooltipSuffix)
 </script>
 
 <style>

src/components/sidebar/tabs/AssetsSidebarTab.vue

@@ -115,14 +115,69 @@
       </div>
     </template>
     <template #footer>
-      <MediaAssetSelectionBar
+      <div
         v-if="hasSelection"
-        :count="totalOutputCount"
-        :show-delete="shouldShowDeleteButton"
-        @deselect="handleDeselectAll"
-        @download="handleDownloadSelected"
-        @delete="handleDeleteSelected"
-      />
+        ref="footerRef"
+        class="flex h-18 w-full items-center justify-between gap-1"
+      >
+        <div class="flex-1 pl-4">
+          <div ref="selectionCountButtonRef" class="inline-flex w-48">
+            <Button
+              variant="secondary"
+              :class="cn(isCompact && 'text-left')"
+              @click="handleDeselectAll"
+            >
+              {{
+                isHoveringSelectionCount
+                  ? $t('mediaAsset.selection.deselectAll')
+                  : $t('mediaAsset.selection.selectedCount', {
+                      count: totalOutputCount
+                    })
+              }}
+            </Button>
+          </div>
+        </div>
+        <div class="flex shrink items-center-safe justify-end-safe gap-2 pr-4">
+          <template v-if="isCompact">
+            <!-- Compact mode: Icon only -->
+            <Button
+              v-if="shouldShowDeleteButton"
+              size="icon"
+              data-testid="assets-delete-selected"
+              @click="handleDeleteSelected"
+            >
+              <i class="icon-[lucide--trash-2] size-4" />
+            </Button>
+            <Button
+              size="icon"
+              data-testid="assets-download-selected"
+              @click="handleDownloadSelected"
+            >
+              <i class="icon-[lucide--download] size-4" />
+            </Button>
+          </template>
+          <template v-else>
+            <!-- Normal mode: Icon + Text -->
+            <Button
+              v-if="shouldShowDeleteButton"
+              variant="secondary"
+              data-testid="assets-delete-selected"
+              @click="handleDeleteSelected"
+            >
+              <span>{{ $t('mediaAsset.selection.deleteSelected') }}</span>
+              <i class="icon-[lucide--trash-2] size-4" />
+            </Button>
+            <Button
+              variant="secondary"
+              data-testid="assets-download-selected"
+              @click="handleDownloadSelected"
+            >
+              <span>{{ $t('mediaAsset.selection.downloadSelected') }}</span>
+              <i class="icon-[lucide--download] size-4" />
+            </Button>
+          </template>
+        </div>
+      </div>
     </template>
   </SidebarTabTemplate>
   <MediaLightbox
@@ -153,6 +208,8 @@
 import {
   useAsyncState,
   useDebounceFn,
+  useElementHover,
+  useResizeObserver,
   useStorage,
   useTimeoutFn
 } from '@vueuse/core'
@@ -179,7 +236,6 @@ import TabList from '@/components/tab/TabList.vue'
 import Button from '@/components/ui/button/Button.vue'
 import MediaAssetContextMenu from '@/platform/assets/components/MediaAssetContextMenu.vue'
 import MediaAssetFilterBar from '@/platform/assets/components/MediaAssetFilterBar.vue'
-import MediaAssetSelectionBar from '@/platform/assets/components/MediaAssetSelectionBar.vue'
 import { getAssetType } from '@/platform/assets/composables/media/assetMappers'
 import { useAssetsApi } from '@/platform/assets/composables/media/useAssetsApi'
 import { useAssetSelection } from '@/platform/assets/composables/useAssetSelection'
@@ -201,6 +257,7 @@ import {
   getMediaTypeFromFilename,
   isPreviewableMediaType
 } from '@/utils/formatUtil'
+import { cn } from '@comfyorg/tailwind-utils'
 
 const Load3dViewerContent = defineAsyncComponent(
   () => import('@/components/load3d/Load3dViewerContent.vue')
@@ -278,6 +335,33 @@ const {
   exportMultipleWorkflows
 } = useMediaAssetActions()
 
+// Footer responsive behavior
+const footerRef = ref<HTMLElement | null>(null)
+const footerWidth = ref(0)
+
+// Track footer width changes
+useResizeObserver(footerRef, (entries) => {
+  const entry = entries[0]
+  footerWidth.value = entry.contentRect.width
+})
+
+// Determine if we should show compact mode (icon only)
+// Threshold matches when grid switches from 2 columns to 1 column
+// 2 columns need about ~430px
+const COMPACT_MODE_THRESHOLD_PX = 430
+const isCompact = computed(
+  () => footerWidth.value > 0 && footerWidth.value <= COMPACT_MODE_THRESHOLD_PX
+)
+
+// Hover state for selection count button
+const selectionCountButtonRef = ref<HTMLElement | null>(null)
+const isHoveringSelectionCount = useElementHover(selectionCountButtonRef)
+
+// Total output count for all selected assets
+const totalOutputCount = computed(() => {
+  return getTotalOutputCount(selectedAssets.value)
+})
+
 const currentAssets = computed(() =>
   activeTab.value === 'input' ? inputAssets : outputAssets
 )
@@ -345,10 +429,6 @@ const previewableVisibleAssets = computed(() =>
 
 const selectedAssets = computed(() => getSelectedAssets(visibleAssets.value))
 
-const totalOutputCount = computed(() =>
-  getTotalOutputCount(selectedAssets.value)
-)
-
 const isBulkMode = computed(
   () => hasSelection.value && selectedAssets.value.length > 1
 )

src/components/sidebar/tabs/ModelLibrarySidebarTab.test.ts

@@ -14,7 +14,7 @@ const {
   captureRoot,
   getRoot,
   resetRoot,
-  mockStartDrag,
+  mockAddNodeOnGraph,
   mockGetNodeProvider,
   mockToggleNodeOnEvent,
   mockRefreshModelFolder,
@@ -29,7 +29,7 @@ const {
     resetRoot: () => {
       capturedRoot = null
     },
-    mockStartDrag: vi.fn(),
+    mockAddNodeOnGraph: vi.fn(),
     mockGetNodeProvider: vi.fn(),
     mockToggleNodeOnEvent: vi.fn(),
     mockRefreshModelFolder: vi.fn().mockResolvedValue(undefined),
@@ -37,8 +37,8 @@ const {
   }
 })
 
-vi.mock('@/composables/node/useNodeDragToCanvas', () => ({
-  useNodeDragToCanvas: () => ({ startDrag: mockStartDrag })
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: () => ({ addNodeOnGraph: mockAddNodeOnGraph })
 }))
 
 vi.mock('@/stores/modelToNodeStore', () => ({
@@ -173,13 +173,16 @@ describe('ModelLibrarySidebarTab', () => {
     expect(screen.getByTestId('search-input')).toBeInTheDocument()
   })
 
-  it('starts a ghost drag carrying the widget value to fill on placement', async () => {
+  it('handles model click and adds node to graph', async () => {
     const mockNodeDef = { name: 'CheckpointLoaderSimple' }
+    const mockWidget = { name: 'ckpt_name', value: '' }
+    const mockGraphNode = { widgets: [mockWidget] }
 
     mockGetNodeProvider.mockReturnValue({
       nodeDef: mockNodeDef,
       key: 'ckpt_name'
     })
+    mockAddNodeOnGraph.mockReturnValue(mockGraphNode)
 
     renderComponent()
     await nextTick()
@@ -195,10 +198,8 @@ describe('ModelLibrarySidebarTab', () => {
     await modelLeaf?.handleClick?.(mockEvent)
 
     expect(mockGetNodeProvider).toHaveBeenCalledWith('checkpoints')
-    expect(mockStartDrag).toHaveBeenCalledWith(mockNodeDef, {
-      widgetValues: { ckpt_name: 'model.safetensors' },
-      source: 'sidebar_drag'
-    })
+    expect(mockAddNodeOnGraph).toHaveBeenCalledWith(mockNodeDef)
+    expect(mockWidget.value).toBe('model.safetensors')
   })
 
   it('toggles folder expansion on click', async () => {

src/components/sidebar/tabs/ModelLibrarySidebarTab.vue

@@ -63,9 +63,10 @@ import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue
 import ElectronDownloadItems from '@/components/sidebar/tabs/modelLibrary/ElectronDownloadItems.vue'
 import ModelTreeLeaf from '@/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { startModelLoaderDrag } from '@/composables/node/startModelNodeDragFromAsset'
 import { useTreeExpansion } from '@/composables/useTreeExpansion'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import { withNodeAddSource } from '@/platform/telemetry/nodeAdded/nodeAddSource'
+import { useLitegraphService } from '@/services/litegraphService'
 import { useAssetDownloadStore } from '@/stores/assetDownloadStore'
 import type { ComfyModelDef, ModelFolder } from '@/stores/modelStore'
 import { ResourceState, useModelStore } from '@/stores/modelStore'
@@ -155,7 +156,15 @@ const renderedRoot = computed<TreeExplorerNode<ModelOrFolder>>(() => {
         if (this.leaf && model) {
           const provider = modelToNodeStore.getNodeProvider(model.directory)
           if (provider) {
-            startModelLoaderDrag(provider, model.file_name)
+            const graphNode = withNodeAddSource('sidebar_drag', () =>
+              useLitegraphService().addNodeOnGraph(provider.nodeDef)
+            )
+            const widget = graphNode?.widgets?.find(
+              (widget) => widget.name === provider.key
+            )
+            if (widget) {
+              widget.value = model.file_name
+            }
           }
         } else {
           toggleNodeOnEvent(e, node)

src/components/sidebar/tabs/NodeLibrarySidebarTabV2.test.ts

@@ -31,8 +31,11 @@ vi.mock('@/composables/node/useNodeDragToCanvas', () => ({
   useNodeDragToCanvas: () => ({
     isDragging: { value: false },
     draggedNode: { value: null },
+    cursorPosition: { value: { x: 0, y: 0 } },
     startDrag: vi.fn(),
-    cancelDrag: vi.fn()
+    cancelDrag: vi.fn(),
+    setupGlobalListeners: vi.fn(),
+    cleanupGlobalListeners: vi.fn()
   })
 }))
 

src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue

@@ -115,6 +115,7 @@
       </div>
     </template>
     <template #body>
+      <NodeDragPreview />
       <div class="flex h-full flex-col">
         <div
           v-if="hasNoMatches"
@@ -214,6 +215,7 @@ import type {
 import AllNodesPanel from './nodeLibrary/AllNodesPanel.vue'
 import BlueprintsPanel from './nodeLibrary/BlueprintsPanel.vue'
 import EssentialNodesPanel from './nodeLibrary/EssentialNodesPanel.vue'
+import NodeDragPreview from './nodeLibrary/NodeDragPreview.vue'
 import SidebarTabTemplate from './SidebarTabTemplate.vue'
 
 const { flags } = useFeatureFlags()

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

@@ -0,0 +1,69 @@
+<template>
+  <Teleport to="body">
+    <div
+      v-if="isDragging && draggedNode && showPreview"
+      class="pointer-events-none fixed z-10000"
+      :style="{
+        left: `${previewPosition.x + 12}px`,
+        top: `${previewPosition.y + 12}px`
+      }"
+    >
+      <div class="origin-top-left scale-50 opacity-80">
+        <LGraphNodePreview :node-def="draggedNode" position="relative" />
+      </div>
+    </div>
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, onUnmounted, ref } from 'vue'
+
+import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas'
+import LGraphNodePreview from '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue'
+
+const {
+  isDragging,
+  draggedNode,
+  cursorPosition,
+  dragMode,
+  setupGlobalListeners,
+  cleanupGlobalListeners
+} = useNodeDragToCanvas()
+
+const nativeDragPosition = ref({ x: 0, y: 0 })
+
+const previewPosition = computed(() => {
+  if (dragMode.value === 'native') {
+    return nativeDragPosition.value
+  }
+  return cursorPosition.value
+})
+
+const showPreview = computed(() => {
+  if (dragMode.value === 'native') {
+    return nativeDragPosition.value.x > 0 || nativeDragPosition.value.y > 0
+  }
+  return true
+})
+
+function handleDrag(e: DragEvent) {
+  if (e.clientX === 0 && e.clientY === 0) return
+  nativeDragPosition.value = { x: e.clientX, y: e.clientY }
+}
+
+function handleDragEnd() {
+  nativeDragPosition.value = { x: 0, y: 0 }
+}
+
+onMounted(() => {
+  setupGlobalListeners()
+  document.addEventListener('drag', handleDrag)
+  document.addEventListener('dragend', handleDragEnd)
+})
+
+onUnmounted(() => {
+  cleanupGlobalListeners()
+  document.removeEventListener('drag', handleDrag)
+  document.removeEventListener('dragend', handleDragEnd)
+})
+</script>

src/components/topbar/CurrentUserPopoverLegacy.test.ts

@@ -1,18 +1,37 @@
 import { render, screen } from '@testing-library/vue'
 import userEvent from '@testing-library/user-event'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
-import { defineComponent, h, ref } from 'vue'
+import { h, ref } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import { formatCreditsFromCents } from '@/base/credits/comfyCredits'
-import type { BalanceInfo, SubscriptionInfo } from '@/composables/billing/types'
 import enMessages from '@/locales/en/main.json' with { type: 'json' }
 
 import CurrentUserPopoverLegacy from './CurrentUserPopoverLegacy.vue'
 
+// Mock all firebase modules
+vi.mock('firebase/app', () => ({
+  initializeApp: vi.fn(),
+  getApp: vi.fn()
+}))
+
+vi.mock('firebase/auth', () => ({
+  getAuth: vi.fn(),
+  setPersistence: vi.fn(),
+  browserLocalPersistence: {},
+  onAuthStateChanged: vi.fn(),
+  signInWithEmailAndPassword: vi.fn(),
+  signOut: vi.fn()
+}))
+
+// Mock pinia
+vi.mock('pinia')
+
+// Mock showSettingsDialog and showTopUpCreditsDialog
 const mockShowSettingsDialog = vi.fn()
 const mockShowTopUpCreditsDialog = vi.fn()
 
+// Mock the settings dialog composable
 vi.mock('@/platform/settings/composables/useSettingsDialog', () => ({
   useSettingsDialog: vi.fn(() => ({
     show: mockShowSettingsDialog,
@@ -21,6 +40,7 @@ vi.mock('@/platform/settings/composables/useSettingsDialog', () => ({
   }))
 }))
 
+// Mock window.open
 const originalWindowOpen = window.open
 beforeEach(() => {
   window.open = vi.fn()
@@ -30,6 +50,7 @@ afterAll(() => {
   window.open = originalWindowOpen
 })
 
+// Mock the useCurrentUser composable
 const mockHandleSignOut = vi.fn()
 vi.mock('@/composables/auth/useCurrentUser', () => ({
   useCurrentUser: vi.fn(() => ({
@@ -40,50 +61,60 @@ vi.mock('@/composables/auth/useCurrentUser', () => ({
   }))
 }))
 
+// Mock the useAuthActions composable
+const mockLogout = vi.fn()
+vi.mock('@/composables/auth/useAuthActions', () => ({
+  useAuthActions: vi.fn(() => ({
+    fetchBalance: vi.fn().mockResolvedValue(undefined),
+    logout: mockLogout
+  }))
+}))
+
+// Mock the dialog service
 vi.mock('@/services/dialogService', () => ({
   useDialogService: vi.fn(() => ({
     showTopUpCreditsDialog: mockShowTopUpCreditsDialog
   }))
 }))
 
-function makeSubscription(
-  overrides: Partial<SubscriptionInfo> = {}
-): SubscriptionInfo {
-  return {
-    isActive: true,
-    tier: 'CREATOR',
-    duration: 'MONTHLY',
-    planSlug: null,
-    renewalDate: null,
-    endDate: null,
-    isCancelled: false,
-    hasFunds: true,
-    ...overrides
-  }
-}
+// Mock the authStore with hoisted state for per-test manipulation
+const mockAuthStoreState = vi.hoisted(() => ({
+  balance: {
+    amount_micros: 100_000,
+    effective_balance_micros: 100_000,
+    currency: 'usd'
+  } as {
+    amount_micros?: number
+    effective_balance_micros?: number
+    currency: string
+  },
+  isFetchingBalance: false
+}))
 
-const mockFetchStatus = vi.fn().mockResolvedValue(undefined)
-const mockFetchBalance = vi.fn().mockResolvedValue(undefined)
-const mockIsActiveSubscription = ref(true)
-const mockIsFreeTier = ref(false)
-const mockTier = ref<SubscriptionInfo['tier']>('CREATOR')
-const mockSubscription = ref<SubscriptionInfo | null>(makeSubscription())
-const mockBalance = ref<BalanceInfo | null>(null)
-const mockIsLoading = ref(false)
-
-vi.mock('@/composables/billing/useBillingContext', () => ({
-  useBillingContext: vi.fn(() => ({
-    isActiveSubscription: mockIsActiveSubscription,
-    isFreeTier: mockIsFreeTier,
-    tier: mockTier,
-    subscription: mockSubscription,
-    balance: mockBalance,
-    isLoading: mockIsLoading,
-    fetchStatus: mockFetchStatus,
-    fetchBalance: mockFetchBalance
+vi.mock('@/stores/authStore', () => ({
+  useAuthStore: vi.fn(() => ({
+    getAuthHeader: vi
+      .fn()
+      .mockResolvedValue({ Authorization: 'Bearer mock-token' }),
+    balance: mockAuthStoreState.balance,
+    isFetchingBalance: mockAuthStoreState.isFetchingBalance
   }))
 }))
 
+// Mock the useSubscription composable
+const mockFetchStatus = vi.fn().mockResolvedValue(undefined)
+const mockIsFreeTier = ref(false)
+vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
+  useSubscription: vi.fn(() => ({
+    isActiveSubscription: ref(true),
+    isFreeTier: mockIsFreeTier,
+    subscriptionTierName: ref('Creator'),
+    subscriptionTier: ref('CREATOR'),
+    fetchStatus: mockFetchStatus
+  }))
+}))
+
+// Mock the useSubscriptionDialog composable
 const mockShowPricingTable = vi.fn()
 vi.mock(
   '@/platform/cloud/subscription/composables/useSubscriptionDialog',
@@ -96,6 +127,7 @@ vi.mock(
   })
 )
 
+// Mock UserAvatar component
 vi.mock('@/components/common/UserAvatar.vue', () => ({
   default: {
     name: 'UserAvatarMock',
@@ -105,10 +137,22 @@ vi.mock('@/components/common/UserAvatar.vue', () => ({
   }
 }))
 
+// Mock UserCredit component
+vi.mock('@/components/common/UserCredit.vue', () => ({
+  default: {
+    name: 'UserCreditMock',
+    render() {
+      return h('div', 'Credit: 100')
+    }
+  }
+}))
+
+// Mock formatCreditsFromCents
 vi.mock('@/base/credits/comfyCredits', () => ({
   formatCreditsFromCents: vi.fn(({ cents }) => (cents / 100).toString())
 }))
 
+// Mock useExternalLink
 vi.mock('@/composables/useExternalLink', () => ({
   useExternalLink: vi.fn(() => ({
     buildDocsUrl: vi.fn((path) => `https://docs.comfy.org${path}`),
@@ -118,12 +162,14 @@ vi.mock('@/composables/useExternalLink', () => ({
   }))
 }))
 
+// Mock useTelemetry
 vi.mock('@/platform/telemetry', () => ({
   useTelemetry: vi.fn(() => ({
     trackAddApiCreditButtonClicked: vi.fn()
   }))
 }))
 
+// Mock isCloud with hoisted state for per-test toggling
 const mockIsCloud = vi.hoisted(() => ({ value: true }))
 vi.mock('@/platform/distribution/types', () => ({
   get isCloud() {
@@ -132,37 +178,25 @@ vi.mock('@/platform/distribution/types', () => ({
 }))
 
 vi.mock('@/platform/cloud/subscription/components/SubscribeButton.vue', () => ({
-  default: defineComponent({
+  default: {
     name: 'SubscribeButtonMock',
-    emits: ['subscribed'],
-    setup(_, { emit }) {
-      return () =>
-        h(
-          'button',
-          {
-            'data-testid': 'subscribe-button-mock',
-            onClick: () => emit('subscribed')
-          },
-          'Subscribe Button'
-        )
+    render() {
+      return h('div', 'Subscribe Button')
     }
-  })
+  }
 }))
 
 describe('CurrentUserPopoverLegacy', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     mockIsCloud.value = true
-    mockIsActiveSubscription.value = true
     mockIsFreeTier.value = false
-    mockTier.value = 'CREATOR'
-    mockSubscription.value = makeSubscription()
-    mockBalance.value = {
-      amountMicros: 100_000,
-      effectiveBalanceMicros: 100_000,
+    mockAuthStoreState.balance = {
+      amount_micros: 100_000,
+      effective_balance_micros: 100_000,
       currency: 'usd'
     }
-    mockIsLoading.value = false
+    mockAuthStoreState.isFetchingBalance = false
   })
 
   function renderComponent() {
@@ -196,47 +230,7 @@ describe('CurrentUserPopoverLegacy', () => {
     expect(screen.getByText('test@example.com')).toBeInTheDocument()
   })
 
-  it('fetches the balance through the billing facade on mount', () => {
-    renderComponent()
-
-    expect(mockFetchBalance).toHaveBeenCalled()
-  })
-
-  it('refreshes subscription status through the billing facade after subscribing', async () => {
-    mockIsActiveSubscription.value = false
-    const { user } = renderComponent()
-
-    await user.click(screen.getByTestId('subscribe-button-mock'))
-
-    expect(mockFetchStatus).toHaveBeenCalled()
-  })
-
-  describe('subscription tier badge', () => {
-    it('renders the tier name derived from the facade tier', () => {
-      renderComponent()
-
-      expect(screen.getByText('Creator')).toBeInTheDocument()
-    })
-
-    it('renders the yearly tier name when the facade subscription is annual', () => {
-      mockSubscription.value = makeSubscription({ duration: 'ANNUAL' })
-
-      renderComponent()
-
-      expect(screen.getByText('Creator Yearly')).toBeInTheDocument()
-    })
-
-    it('hides the badge when the facade reports no tier', () => {
-      mockTier.value = null
-      mockSubscription.value = null
-
-      renderComponent()
-
-      expect(screen.queryByText('Creator')).not.toBeInTheDocument()
-    })
-  })
-
-  it('formats and displays the facade balance', () => {
+  it('calls formatCreditsFromCents with correct parameters and displays formatted credits', () => {
     renderComponent()
 
     expect(formatCreditsFromCents).toHaveBeenCalledWith({
@@ -251,14 +245,6 @@ describe('CurrentUserPopoverLegacy', () => {
     expect(screen.getByText('1000')).toBeInTheDocument()
   })
 
-  it('shows a skeleton instead of the balance while billing is loading', () => {
-    mockIsLoading.value = true
-
-    renderComponent()
-
-    expect(screen.queryByText('1000')).not.toBeInTheDocument()
-  })
-
   it('renders logout menu item with correct text', () => {
     renderComponent()
 
@@ -338,11 +324,11 @@ describe('CurrentUserPopoverLegacy', () => {
     expect(onClose).toHaveBeenCalledTimes(1)
   })
 
-  describe('facade balance handling', () => {
-    it('uses effectiveBalanceMicros when present (positive balance)', () => {
-      mockBalance.value = {
-        amountMicros: 200_000,
-        effectiveBalanceMicros: 150_000,
+  describe('effective_balance_micros handling', () => {
+    it('uses effective_balance_micros when present (positive balance)', () => {
+      mockAuthStoreState.balance = {
+        amount_micros: 200_000,
+        effective_balance_micros: 150_000,
         currency: 'usd'
       }
 
@@ -359,10 +345,10 @@ describe('CurrentUserPopoverLegacy', () => {
       expect(screen.getByText('1500')).toBeInTheDocument()
     })
 
-    it('uses effectiveBalanceMicros when zero', () => {
-      mockBalance.value = {
-        amountMicros: 100_000,
-        effectiveBalanceMicros: 0,
+    it('uses effective_balance_micros when zero', () => {
+      mockAuthStoreState.balance = {
+        amount_micros: 100_000,
+        effective_balance_micros: 0,
         currency: 'usd'
       }
 
@@ -379,10 +365,10 @@ describe('CurrentUserPopoverLegacy', () => {
       expect(screen.getByText('0')).toBeInTheDocument()
     })
 
-    it('uses effectiveBalanceMicros when negative', () => {
-      mockBalance.value = {
-        amountMicros: 0,
-        effectiveBalanceMicros: -50_000,
+    it('uses effective_balance_micros when negative', () => {
+      mockAuthStoreState.balance = {
+        amount_micros: 0,
+        effective_balance_micros: -50_000,
         currency: 'usd'
       }
 
@@ -399,9 +385,9 @@ describe('CurrentUserPopoverLegacy', () => {
       expect(screen.getByText('-500')).toBeInTheDocument()
     })
 
-    it('falls back to amountMicros when effectiveBalanceMicros is missing', () => {
-      mockBalance.value = {
-        amountMicros: 100_000,
+    it('falls back to amount_micros when effective_balance_micros is missing', () => {
+      mockAuthStoreState.balance = {
+        amount_micros: 100_000,
         currency: 'usd'
       }
 
@@ -418,8 +404,10 @@ describe('CurrentUserPopoverLegacy', () => {
       expect(screen.getByText('1000')).toBeInTheDocument()
     })
 
-    it('falls back to 0 when the facade reports no balance', () => {
-      mockBalance.value = null
+    it('falls back to 0 when both effective_balance_micros and amount_micros are missing', () => {
+      mockAuthStoreState.balance = {
+        currency: 'usd'
+      }
 
       renderComponent()
 
@@ -478,11 +466,8 @@ describe('CurrentUserPopoverLegacy', () => {
     })
 
     it('hides subscribe button', () => {
-      mockIsActiveSubscription.value = false
       renderComponent()
-      expect(
-        screen.queryByTestId('subscribe-button-mock')
-      ).not.toBeInTheDocument()
+      expect(screen.queryByText('Subscribe Button')).not.toBeInTheDocument()
     })
 
     it('still shows partner nodes menu item', () => {

src/components/topbar/CurrentUserPopoverLegacy.vue

@@ -32,7 +32,12 @@
     <!-- Credits Section -->
     <div v-if="isActiveSubscription" class="flex items-center gap-2 px-4 py-2">
       <i class="icon-[lucide--component] text-sm text-amber-400" />
-      <Skeleton v-if="isLoading" width="4rem" height="1.25rem" class="w-full" />
+      <Skeleton
+        v-if="authStore.isFetchingBalance"
+        width="4rem"
+        height="1.25rem"
+        class="w-full"
+      />
       <span v-else class="text-base font-semibold text-base-foreground">{{
         formattedBalance
       }}</span>
@@ -157,15 +162,16 @@ import { formatCreditsFromCents } from '@/base/credits/comfyCredits'
 import UserAvatar from '@/components/common/UserAvatar.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
-import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useAuthActions } from '@/composables/auth/useAuthActions'
 import { useExternalLink } from '@/composables/useExternalLink'
 import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
+import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
-import { useWorkspaceTierLabel } from '@/platform/workspace/composables/useWorkspaceTierLabel'
 import { useDialogService } from '@/services/dialogService'
+import { useAuthStore } from '@/stores/authStore'
 
 const emit = defineEmits<{
   close: []
@@ -175,29 +181,25 @@ const { buildDocsUrl, docsPaths } = useExternalLink()
 
 const { userDisplayName, userEmail, userPhotoUrl, handleSignOut } =
   useCurrentUser()
+const authActions = useAuthActions()
+const authStore = useAuthStore()
 const settingsDialog = useSettingsDialog()
 const dialogService = useDialogService()
 const {
   isActiveSubscription,
   isFreeTier,
-  tier,
-  subscription,
-  balance,
-  isLoading,
-  fetchStatus,
-  fetchBalance
-} = useBillingContext()
-const { formatTierName } = useWorkspaceTierLabel()
+  subscriptionTierName,
+  subscriptionTier,
+  fetchStatus
+} = useSubscription()
 const subscriptionDialog = useSubscriptionDialog()
 const { locale } = useI18n()
 
-const subscriptionTierName = computed(() =>
-  formatTierName(tier.value, subscription.value?.duration === 'ANNUAL')
-)
-
 const formattedBalance = computed(() => {
   const cents =
-    balance.value?.effectiveBalanceMicros ?? balance.value?.amountMicros ?? 0
+    authStore.balance?.effective_balance_micros ??
+    authStore.balance?.amount_micros ??
+    0
   return formatCreditsFromCents({
     cents,
     locale: locale.value,
@@ -209,12 +211,12 @@ const formattedBalance = computed(() => {
 })
 
 const canUpgrade = computed(() => {
-  const currentTier = tier.value
+  const tier = subscriptionTier.value
   return (
-    currentTier === 'FREE' ||
-    currentTier === 'FOUNDERS_EDITION' ||
-    currentTier === 'STANDARD' ||
-    currentTier === 'CREATOR'
+    tier === 'FREE' ||
+    tier === 'FOUNDERS_EDITION' ||
+    tier === 'STANDARD' ||
+    tier === 'CREATOR'
   )
 })
 
@@ -268,6 +270,6 @@ const handleSubscribed = async () => {
 }
 
 onMounted(() => {
-  void fetchBalance()
+  void authActions.fetchBalance()
 })
 </script>

src/components/topbar/WorkflowTab.test.ts

@@ -1,233 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { render, screen } from '@testing-library/vue'
-import userEvent from '@testing-library/user-event'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { markRaw } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import type { ComponentProps } from 'vue-component-type-helpers'
-
-import type * as ExecutionStoreModule from '@/stores/executionStore'
-import type { WorkflowExecutionStatus } from '@/stores/executionStore'
-
-const { mockWorkflowStatus, mockCloseWorkflow } = await vi.hoisted(async () => {
-  const { shallowRef } = await import('vue')
-  return {
-    mockWorkflowStatus: shallowRef<Map<object, WorkflowExecutionStatus>>(
-      new Map()
-    ),
-    mockCloseWorkflow: vi.fn().mockResolvedValue(true)
-  }
-})
-
-vi.mock('@/stores/firebaseAuthStore', () => ({
-  useFirebaseAuthStore: () => ({
-    currentUser: null,
-    isAuthenticated: false,
-    isLoading: false
-  })
-}))
-
-vi.mock('@/stores/authStore', () => ({
-  useAuthStore: () => ({
-    currentUser: null,
-    isAuthenticated: false,
-    isInitialized: true
-  })
-}))
-
-vi.mock('@/stores/executionStore', async (importOriginal) => {
-  const actual = await importOriginal<typeof ExecutionStoreModule>()
-  return {
-    WORKFLOW_STATUS_I18N_KEYS: actual.WORKFLOW_STATUS_I18N_KEYS,
-    useExecutionStore: () => ({
-      getWorkflowStatus(workflow: object | undefined | null) {
-        if (!workflow) return undefined
-        return mockWorkflowStatus.value.get(workflow)
-      }
-    })
-  }
-})
-
-vi.mock('@/composables/usePragmaticDragAndDrop', () => ({
-  usePragmaticDraggable: vi.fn(),
-  usePragmaticDroppable: vi.fn()
-}))
-
-vi.mock('@/composables/useWorkflowActionsMenu', () => ({
-  useWorkflowActionsMenu: () => ({
-    menuItems: { value: [] }
-  })
-}))
-
-vi.mock('@/platform/workflow/core/services/workflowService', () => ({
-  useWorkflowService: () => ({
-    closeWorkflow: mockCloseWorkflow
-  })
-}))
-
-vi.mock('@/renderer/core/thumbnail/useWorkflowThumbnail', () => ({
-  useWorkflowThumbnail: () => ({
-    getThumbnail: vi.fn(() => null)
-  })
-}))
-
-vi.mock('./WorkflowTabPopover.vue', () => ({
-  default: {
-    render: () => null,
-    methods: {
-      showPopover: () => {},
-      hidePopover: () => {},
-      togglePopover: () => {}
-    }
-  }
-}))
-
-import WorkflowTab from './WorkflowTab.vue'
-
-type WorkflowTabProps = ComponentProps<typeof WorkflowTab>
-
-const statusAriaLabels: Record<WorkflowExecutionStatus, string> = {
-  running: 'Running',
-  completed: 'Completed',
-  failed: 'Failed'
-}
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      g: { close: 'Close', ...statusAriaLabels }
-    }
-  }
-})
-
-type WorkflowOption = WorkflowTabProps['workflowOption']
-type Workflow = WorkflowOption['workflow']
-type WorkflowOverrides = Partial<Workflow>
-
-// ComfyWorkflow has many required fields the component never reads (file
-// IO, change tracking). Validate the fields we *do* set against the real
-// type via Partial<Workflow>, then cast — adding/renaming a read field in
-// the component will fail typecheck on the override map.
-function makeWorkflowOption(overrides: WorkflowOverrides = {}): WorkflowOption {
-  const workflow = {
-    key: 'test-key',
-    path: '/workflows/test.json',
-    filename: 'test.json',
-    isPersisted: true,
-    isModified: false,
-    activeMode: 'graph',
-    changeTracker: null,
-    ...overrides
-  } satisfies WorkflowOverrides
-  // markRaw keeps a stable identity through prop reactivity so the store's
-  // identity-based status lookup resolves against the same object.
-  return { value: 'test-key', workflow: markRaw(workflow) as Workflow }
-}
-
-function renderTab({
-  workflowOption = makeWorkflowOption(),
-  activeWorkflowKey = 'other-key'
-}: {
-  workflowOption?: WorkflowOption
-  activeWorkflowKey?: string
-} = {}) {
-  return render(WorkflowTab, {
-    global: {
-      plugins: [
-        createTestingPinia({
-          stubActions: false,
-          initialState: {
-            workspace: { shiftDown: false },
-            workflow: {
-              activeWorkflow: { key: activeWorkflowKey }
-            },
-            setting: { settingValues: { 'Comfy.Workflow.AutoSave': 'off' } }
-          }
-        }),
-        i18n
-      ],
-      stubs: {
-        WorkflowActionsList: true,
-        Button: {
-          template: '<button v-bind="$attrs"><slot /></button>'
-        }
-      }
-    },
-    props: {
-      workflowOption,
-      isFirst: false,
-      isLast: false
-    }
-  })
-}
-
-describe('WorkflowTab - workflow status indicator', () => {
-  beforeEach(() => {
-    mockWorkflowStatus.value = new Map()
-  })
-
-  it.for(['running', 'completed', 'failed'] as const)(
-    'labels the %s indicator with a translated status name',
-    (status) => {
-      const workflowOption = makeWorkflowOption()
-      mockWorkflowStatus.value = new Map([[workflowOption.workflow, status]])
-
-      renderTab({ workflowOption })
-      expect(
-        screen.getByRole('img', { name: statusAriaLabels[status] })
-      ).toBeTruthy()
-    }
-  )
-
-  it('does not badge the active tab with its own status', () => {
-    const workflowOption = makeWorkflowOption()
-    mockWorkflowStatus.value = new Map([[workflowOption.workflow, 'running']])
-
-    renderTab({ workflowOption, activeWorkflowKey: 'test-key' })
-    expect(screen.queryByRole('img')).toBeNull()
-  })
-
-  it('shows unsaved dot when no workflow status and workflow is unsaved', () => {
-    renderTab({ workflowOption: makeWorkflowOption({ isPersisted: false }) })
-
-    expect(screen.queryByRole('img')).toBeNull()
-    expect(screen.getByTestId('workflow-dirty-indicator').textContent).toBe('•')
-  })
-
-  it('shows the unsaved dot when modified and autosave is off', () => {
-    renderTab({ workflowOption: makeWorkflowOption({ isModified: true }) })
-
-    expect(screen.getByTestId('workflow-dirty-indicator').textContent).toBe('•')
-  })
-
-  it('workflow status replaces the unsaved dot', () => {
-    const workflowOption = makeWorkflowOption({ isPersisted: false })
-    mockWorkflowStatus.value = new Map([[workflowOption.workflow, 'running']])
-
-    renderTab({ workflowOption })
-    expect(
-      screen.getByRole('img', { name: statusAriaLabels.running })
-    ).toBeTruthy()
-    expect(screen.queryByTestId('workflow-dirty-indicator')).toBeNull()
-  })
-})
-
-describe('WorkflowTab - close button', () => {
-  beforeEach(() => {
-    mockCloseWorkflow.mockClear()
-  })
-
-  it('delegates close to workflow service with the tab workflow', async () => {
-    renderTab()
-    const user = userEvent.setup()
-    await user.click(screen.getByTestId('close-workflow-button'))
-
-    expect(mockCloseWorkflow).toHaveBeenCalledWith(
-      expect.objectContaining({ key: 'test-key' }),
-      expect.anything()
-    )
-  })
-})

src/components/topbar/WorkflowTab.vue

@@ -21,19 +21,8 @@
           {{ workflowOption.workflow.filename }}
         </span>
         <div class="relative">
-          <i
-            v-if="workflowStatus"
-            role="img"
-            :aria-label="workflowStatusLabel"
-            :class="
-              cn(
-                'absolute top-1/2 left-1/2 z-10 size-4 -translate-1/2 group-hover:hidden',
-                workflowStatusIconClasses[workflowStatus]
-              )
-            "
-          />
           <span
-            v-else-if="shouldShowUnsavedIndicator"
+            v-if="shouldShowStatusIndicator"
             data-testid="workflow-dirty-indicator"
             class="absolute top-1/2 left-1/2 z-10 w-4 -translate-1/2 bg-(--comfy-menu-bg) text-2xl font-bold group-hover:hidden"
             >•</span
@@ -43,7 +32,6 @@
             variant="muted-textonly"
             size="icon-sm"
             :aria-label="t('g.close')"
-            data-testid="close-workflow-button"
             @click.stop="onCloseWorkflow(workflowOption)"
           >
             <i class="pi pi-times" />
@@ -97,14 +85,8 @@ import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workfl
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useWorkflowThumbnail } from '@/renderer/core/thumbnail/useWorkflowThumbnail'
 import { useCommandStore } from '@/stores/commandStore'
-import type { WorkflowExecutionStatus } from '@/stores/executionStore'
-import {
-  useExecutionStore,
-  WORKFLOW_STATUS_I18N_KEYS
-} from '@/stores/executionStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import type { WorkflowMenuItem } from '@/types/workflowMenuItem'
-import { cn } from '@comfyorg/tailwind-utils'
 
 import WorkflowTabPopover from './WorkflowTabPopover.vue'
 
@@ -131,7 +113,6 @@ const { t } = useI18n()
 const workspaceStore = useWorkspaceStore()
 const workflowStore = useWorkflowStore()
 const settingStore = useSettingStore()
-const executionStore = useExecutionStore()
 const workflowTabRef = ref<HTMLElement | null>(null)
 const popoverRef = ref<InstanceType<typeof WorkflowTabPopover> | null>(null)
 const workflowThumbnail = useWorkflowThumbnail()
@@ -144,7 +125,7 @@ const autoSaveDelay = computed(() =>
   settingStore.get('Comfy.Workflow.AutoSaveDelay')
 )
 
-const shouldShowUnsavedIndicator = computed(() => {
+const shouldShowStatusIndicator = computed(() => {
   if (workspaceStore.shiftDown) {
     // Branch 1: Shift key is held down, do not show the status indicator.
     return false
@@ -179,27 +160,6 @@ const isActiveTab = computed(() => {
   return workflowStore.activeWorkflow?.key === props.workflowOption.workflow.key
 })
 
-const workflowStatusIconClasses: Record<WorkflowExecutionStatus, string> = {
-  running:
-    'text-base-foreground icon-[lucide--loader-circle] motion-safe:animate-spin',
-  completed: 'icon-[lucide--circle-check] text-success-background',
-  failed: 'icon-[lucide--octagon-alert] text-destructive-background'
-}
-
-// The active tab doesn't badge its own status - the user is already looking
-// at it. Background tabs surface the recorded execution status.
-const workflowStatus = computed(() =>
-  isActiveTab.value
-    ? undefined
-    : executionStore.getWorkflowStatus(props.workflowOption.workflow)
-)
-
-const workflowStatusLabel = computed(() =>
-  workflowStatus.value
-    ? t(WORKFLOW_STATUS_I18N_KEYS[workflowStatus.value])
-    : undefined
-)
-
 const thumbnailUrl = computed(() => {
   return workflowThumbnail.getThumbnail(props.workflowOption.workflow.key)
 })

src/components/topbar/WorkflowTabs.test.ts

@@ -43,10 +43,6 @@ vi.mock('@/composables/useFeatureFlags', () => ({
   useFeatureFlags: () => ({ flags: { showSignInButton: false } })
 }))
 
-vi.mock('@/composables/useWorkflowStatusDismissal', () => ({
-  useWorkflowStatusDismissal: vi.fn()
-}))
-
 vi.mock('@/composables/element/useOverflowObserver', () => ({
   useOverflowObserver: () => ({
     isOverflowing: { value: false },

src/components/topbar/WorkflowTabs.vue

@@ -117,7 +117,6 @@ import WorkflowTab from '@/components/topbar/WorkflowTab.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
-import { useWorkflowStatusDismissal } from '@/composables/useWorkflowStatusDismissal'
 import { useOverflowObserver } from '@/composables/element/useOverflowObserver'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { buildFeedbackTypeformUrl } from '@/platform/support/config'
@@ -146,9 +145,6 @@ const workflowStore = useWorkflowStore()
 const workflowService = useWorkflowService()
 const commandStore = useCommandStore()
 const { isLoggedIn } = useCurrentUser()
-
-// Dismiss a tab's terminal status badge once it has been viewed
-useWorkflowStatusDismissal()
 const { flags } = useFeatureFlags()
 
 const isIntegratedTabBar = computed(

src/components/ui/credit-slider/CreditSlider.stories.ts

@@ -1,110 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-import { ref } from 'vue'
-
-import CreditSlider from './CreditSlider.vue'
-
-const meta: Meta<typeof CreditSlider> = {
-  title: 'Components/CreditSlider',
-  component: CreditSlider,
-  tags: ['autodocs'],
-  parameters: { layout: 'centered' },
-  argTypes: {
-    disabled: { control: 'boolean' }
-  },
-  args: {
-    disabled: false
-  },
-  decorators: [
-    (story) => ({
-      components: { story },
-      // Previews at the real layout width: the Figma "Team Plan" card column is
-      // 512px wide with 32px padding (DES-197), i.e. a 448px content area — the
-      // width the slider actually renders into inside PricingTableWorkspace.
-      template: '<div class="w-[512px] px-8"><story /></div>'
-    })
-  ]
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Default: Story = {
-  render: (args) => ({
-    components: { CreditSlider },
-    setup() {
-      const value = ref(700)
-      return { args, value }
-    },
-    template: '<CreditSlider v-model="value" :disabled="args.disabled" />'
-  })
-}
-
-export const Disabled: Story = {
-  args: { disabled: true },
-  render: (args) => ({
-    components: { CreditSlider },
-    setup() {
-      const value = ref(700)
-      return { args, value }
-    },
-    template: '<CreditSlider v-model="value" :disabled="args.disabled" />'
-  })
-}
-
-// Sample `GET /api/billing/plans → team_credit_stops` payload (DES-197 yearly).
-// In production this comes from the API; here it shows the stops being driven
-// entirely through props rather than the hardcoded default constant.
-const apiTeamCreditStops = {
-  default_stop_index: 2,
-  stops: [
-    {
-      id: 'team_200',
-      credits: 42_200,
-      yearly: { price_cents: 20_000, discount_percent: 0 }
-    },
-    {
-      id: 'team_400',
-      credits: 84_400,
-      yearly: { price_cents: 38_000, discount_percent: 5 }
-    },
-    {
-      id: 'team_700',
-      credits: 147_700,
-      yearly: { price_cents: 63_000, discount_percent: 10 }
-    },
-    {
-      id: 'team_1400',
-      credits: 295_400,
-      yearly: { price_cents: 119_000, discount_percent: 15 }
-    },
-    {
-      id: 'team_2500',
-      credits: 527_500,
-      yearly: { price_cents: 200_000, discount_percent: 20 }
-    }
-  ]
-}
-
-// Reference adapter (FE-934 will own this in the data layer): API → CreditStop[].
-// The pre-discount list price is recovered as discounted / (1 - discount).
-const mappedStops = apiTeamCreditStops.stops.map((s) => ({
-  credits: s.credits,
-  discountPercentYearly: s.yearly.discount_percent,
-  usd: Math.round(
-    s.yearly.price_cents / 100 / (1 - s.yearly.discount_percent / 100)
-  )
-}))
-
-export const BackendDrivenStops: Story = {
-  name: 'Backend-driven stops (props)',
-  render: (args) => ({
-    components: { CreditSlider },
-    setup() {
-      const defaultStopIndex = apiTeamCreditStops.default_stop_index
-      const value = ref(mappedStops[defaultStopIndex].usd)
-      return { args, value, mappedStops, defaultStopIndex }
-    },
-    template:
-      '<CreditSlider v-model="value" :stops="mappedStops" :default-stop-index="defaultStopIndex" :disabled="args.disabled" />'
-  })
-}

src/components/ui/credit-slider/CreditSlider.test.ts

@@ -1,208 +0,0 @@
-import { render, screen, within } from '@testing-library/vue'
-import userEvent from '@testing-library/user-event'
-import { describe, expect, it, vi } from 'vitest'
-import { nextTick } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import { usdToCredits } from '@/base/credits/comfyCredits'
-import { TEAM_PLAN_CREDIT_STOPS } from '@/platform/cloud/subscription/constants/teamPlanCreditStops'
-
-import CreditSlider from './CreditSlider.vue'
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      subscription: {
-        usdPerMonth: 'USD / mo',
-        billedYearly: '{total} Billed yearly',
-        billedMonthly: 'Billed monthly',
-        creditSliderSave: 'Save {percent}% ({amount})'
-      }
-    }
-  }
-})
-
-function renderSlider(props: Record<string, unknown> = {}) {
-  return render(CreditSlider, { props, global: { plugins: [i18n] } })
-}
-
-async function flush() {
-  await nextTick()
-  await nextTick()
-}
-
-describe('CreditSlider', () => {
-  it('defaults to the $700 stop (index 2) when no value is bound', async () => {
-    renderSlider()
-    await flush()
-
-    const thumb = screen.getByRole('slider')
-    expect(thumb).toHaveAttribute('aria-valuemin', '0')
-    expect(thumb).toHaveAttribute('aria-valuemax', '4')
-    expect(thumb).toHaveAttribute('aria-valuenow', '2')
-  })
-
-  it('snaps to the next fixed stop on ArrowRight (never a value in between)', async () => {
-    const user = userEvent.setup()
-    const onUpdate = vi.fn<(usd: number) => void>()
-
-    renderSlider({ modelValue: 700, 'onUpdate:modelValue': onUpdate })
-    await flush()
-
-    screen.getByRole('slider').focus()
-    await user.keyboard('{ArrowRight}')
-
-    expect(onUpdate).toHaveBeenCalledWith(1400)
-  })
-
-  it('snaps to the previous fixed stop on ArrowLeft', async () => {
-    const user = userEvent.setup()
-    const onUpdate = vi.fn<(usd: number) => void>()
-
-    renderSlider({ modelValue: 700, 'onUpdate:modelValue': onUpdate })
-    await flush()
-
-    screen.getByRole('slider').focus()
-    await user.keyboard('{ArrowLeft}')
-
-    expect(onUpdate).toHaveBeenCalledWith(400)
-  })
-
-  it('emits change with the full {index, usd, credits} payload', async () => {
-    const user = userEvent.setup()
-    const onChange = vi.fn()
-
-    renderSlider({ modelValue: 700, onChange })
-    await flush()
-
-    screen.getByRole('slider').focus()
-    await user.keyboard('{ArrowRight}')
-
-    expect(onChange).toHaveBeenCalledWith({
-      index: 3,
-      usd: 1400,
-      credits: 295_400
-    })
-  })
-
-  it('emits nothing when disabled (keyboard interaction suppressed)', async () => {
-    const user = userEvent.setup()
-    const onUpdate = vi.fn<(usd: number) => void>()
-    const onChange = vi.fn()
-
-    renderSlider({
-      modelValue: 700,
-      disabled: true,
-      'onUpdate:modelValue': onUpdate,
-      onChange
-    })
-    await flush()
-
-    screen.getByRole('slider').focus()
-    await user.keyboard('{ArrowRight}')
-
-    expect(onUpdate).not.toHaveBeenCalled()
-    expect(onChange).not.toHaveBeenCalled()
-  })
-
-  it('shows the discounted price, struck original, save badge and yearly total (DES-197)', async () => {
-    renderSlider() // default $700 stop → 10% yearly discount
-    await flush()
-
-    expect(screen.getByTestId('credit-slider-price')).toHaveTextContent('$630')
-    expect(
-      screen.getByTestId('credit-slider-original-price')
-    ).toHaveTextContent('$700')
-    expect(screen.getByTestId('credit-slider-save')).toHaveTextContent(
-      'Save 10% ($70)'
-    )
-    expect(screen.getByTestId('credit-slider-billed-yearly')).toHaveTextContent(
-      '$7,560'
-    )
-  })
-
-  it('halves the discount and reads "billed monthly" when cycle=monthly (PRD)', async () => {
-    renderSlider({ cycle: 'monthly' }) // default $700 stop → 10% yearly → 5% monthly
-    await flush()
-
-    expect(screen.getByTestId('credit-slider-price')).toHaveTextContent('$665')
-    expect(
-      screen.getByTestId('credit-slider-original-price')
-    ).toHaveTextContent('$700')
-    expect(screen.getByTestId('credit-slider-save')).toHaveTextContent(
-      'Save 5% ($35)'
-    )
-    expect(screen.getByTestId('credit-slider-billed-yearly')).toHaveTextContent(
-      'Billed monthly'
-    )
-  })
-
-  it('applies the fractional monthly discount at $400 (2.5%)', async () => {
-    renderSlider({ modelValue: 400, cycle: 'monthly' })
-    await flush()
-
-    expect(screen.getByTestId('credit-slider-price')).toHaveTextContent('$390')
-    expect(screen.getByTestId('credit-slider-save')).toHaveTextContent(
-      'Save 2.5% ($10)'
-    )
-  })
-
-  it('hides the discount UI at the 0% stop ($200)', async () => {
-    renderSlider({ modelValue: 200 })
-    await flush()
-
-    expect(screen.getByTestId('credit-slider-price')).toHaveTextContent('$200')
-    expect(
-      screen.queryByTestId('credit-slider-original-price')
-    ).not.toBeInTheDocument()
-    expect(screen.queryByTestId('credit-slider-save')).not.toBeInTheDocument()
-  })
-
-  it('renders all five fixed credit stop labels', async () => {
-    renderSlider({ modelValue: 700 })
-    await flush()
-
-    const stops = within(screen.getByTestId('credit-slider-stops'))
-    for (const label of ['42.2K', '84.4K', '147.7K', '295.4K', '527.5K']) {
-      expect(stops.getByText(label)).toBeInTheDocument()
-    }
-  })
-
-  it('renders stops + default index supplied via props (BE-sourced override)', async () => {
-    const stops = [
-      { usd: 50, credits: 10_550, discountPercentYearly: 0 },
-      { usd: 100, credits: 21_100, discountPercentYearly: 25 }
-    ]
-    // No modelValue → the model default ($700) matches no stop, so selectedIndex
-    // falls back to defaultStopIndex (here index 1 → $100).
-    renderSlider({ stops, defaultStopIndex: 1 })
-    await flush()
-
-    const thumb = screen.getByRole('slider')
-    expect(thumb).toHaveAttribute('aria-valuemax', '1') // 2 stops → max index 1
-    expect(thumb).toHaveAttribute('aria-valuenow', '1') // default index honored
-
-    // index 1 → $100 at 25% yearly → $75 discounted, struck $100, save $25
-    expect(screen.getByTestId('credit-slider-price')).toHaveTextContent('$75')
-    expect(
-      screen.getByTestId('credit-slider-original-price')
-    ).toHaveTextContent('$100')
-    expect(screen.getByTestId('credit-slider-save')).toHaveTextContent(
-      'Save 25% ($25)'
-    )
-
-    // Only the prop's labels render — none of the DES-197 defaults.
-    const labels = within(screen.getByTestId('credit-slider-stops'))
-    expect(labels.getByText('10.6K')).toBeInTheDocument()
-    expect(labels.getByText('21.1K')).toBeInTheDocument()
-    expect(labels.queryByText('147.7K')).not.toBeInTheDocument()
-  })
-
-  it('keeps every credit amount equal to usdToCredits(usd) (guards rate drift)', () => {
-    for (const stop of TEAM_PLAN_CREDIT_STOPS) {
-      expect(stop.credits).toBe(usdToCredits(stop.usd))
-    }
-  })
-})

src/components/ui/credit-slider/CreditSlider.vue

@@ -1,235 +0,0 @@
-<script setup lang="ts">
-import {
-  TransitionPresets,
-  usePreferredReducedMotion,
-  useTransition
-} from '@vueuse/core'
-import { computed } from 'vue'
-import type { HTMLAttributes } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { cn } from '@comfyorg/tailwind-utils'
-
-import Slider from '@/components/ui/slider/Slider.vue'
-import {
-  DEFAULT_TEAM_PLAN_STOP_INDEX,
-  TEAM_PLAN_CREDIT_STOPS
-} from '@/platform/cloud/subscription/constants/teamPlanCreditStops'
-import type { CreditStop } from '@/platform/cloud/subscription/constants/teamPlanCreditStops'
-
-const {
-  disabled = false,
-  class: rootClass,
-  stops = TEAM_PLAN_CREDIT_STOPS,
-  defaultStopIndex = DEFAULT_TEAM_PLAN_STOP_INDEX,
-  cycle = 'yearly'
-} = defineProps<{
-  disabled?: boolean
-  class?: HTMLAttributes['class']
-  /**
-   * The fixed credit stops the slider snaps to. Must be non-empty. Defaults to
-   * the hardcoded DES-197 set; pass the backend-sourced stops once the contract
-   * lands — map `GET /api/billing/plans → team_credit_stops.stops` to
-   * `CreditStop[]` (credits, the pre-discount `usd`, and `discountPercentYearly`).
-   */
-  stops?: readonly CreditStop[]
-  /**
-   * Stop selected when the bound value matches none (e.g. first render).
-   * Maps to `team_credit_stops.default_stop_index`. Defaults to DES-197 ($700).
-   */
-  defaultStopIndex?: number
-  /**
-   * Billing cycle. Yearly applies the full `discountPercentYearly`; monthly
-   * applies half of it (PRD: GA Team Billing — "for monthly the discount is
-   * halved": yearly 0/5/10/15/20% → monthly 0/2.5/5/7.5/10%).
-   */
-  cycle?: 'monthly' | 'yearly'
-}>()
-
-const emit = defineEmits<{
-  /** Fired when the selected stop changes, with the full derived payload. */
-  change: [stop: { index: number; usd: number; credits: number }]
-}>()
-
-/**
- * v-model carries the selected USD value (one of the `stops`). The literal
- * default keeps `defineModel` statically analyzable; when custom `stops` are
- * passed without a matching v-model, `selectedIndex` falls back to
- * `defaultStopIndex`, so the displayed stop is still correct.
- */
-const usd = defineModel<number>({
-  default: TEAM_PLAN_CREDIT_STOPS[DEFAULT_TEAM_PLAN_STOP_INDEX].usd
-})
-
-const selectedIndex = computed(() => {
-  const i = stops.findIndex((stop) => stop.usd === usd.value)
-  if (i !== -1) return i
-  // Fall back to the default stop, clamped into range: a backend-driven `stops`
-  // array can be shorter than expected (or `defaultStopIndex` out of bounds), so
-  // clamping keeps `current` defined and the price computeds below from reading
-  // `undefined.usd` at runtime. (`stops` is required to be non-empty.)
-  return Math.min(Math.max(defaultStopIndex, 0), Math.max(stops.length - 1, 0))
-})
-
-const current = computed<CreditStop>(() => stops[selectedIndex.value])
-
-// The discount applies to the monthly figure. Yearly uses the full
-// `discountPercentYearly`; monthly halves it (PRD: GA Team Billing). The card
-// shows the discounted monthly price, the struck pre-discount price, the
-// saving, and — for yearly — the annual total.
-const effectiveDiscountPercent = computed(() =>
-  cycle === 'monthly'
-    ? current.value.discountPercentYearly / 2
-    : current.value.discountPercentYearly
-)
-const discountedMonthly = computed(() =>
-  Math.round(current.value.usd * (1 - effectiveDiscountPercent.value / 100))
-)
-const saveAmount = computed(() => current.value.usd - discountedMonthly.value)
-const hasDiscount = computed(() => effectiveDiscountPercent.value > 0)
-
-/**
- * Smoothly count the price figures up/down as the slider moves between stops
- * instead of snapping. Honors the user's reduced-motion preference. The save
- * badge ("X% ($Y)") is intentionally left snapping — its percent is a discrete
- * tier, so animating the bracketed amount alone would read inconsistently.
- */
-const prefersReducedMotion = usePreferredReducedMotion()
-const priceTween = {
-  duration: 350,
-  easing: TransitionPresets.easeOutCubic,
-  disabled: computed(() => prefersReducedMotion.value === 'reduce')
-}
-const animatedMonthly = useTransition(discountedMonthly, priceTween)
-const animatedOriginal = useTransition(() => current.value.usd, priceTween)
-
-const displayMonthly = computed(() => Math.round(animatedMonthly.value))
-const displayOriginal = computed(() => Math.round(animatedOriginal.value))
-// Derive the yearly total from the displayed monthly so it always reads as
-// exactly 12× the price shown — even mid-count — rather than drifting as a
-// second, independently-phased tween would.
-const displayBilledYearly = computed(() => displayMonthly.value * 12)
-
-/**
- * Bridge the discrete stop index (0..n-1) to the reka-ui slider's `number[]`
- * model. Driving the slider in index space with `step = 1` guarantees the
- * thumb can only land on the fixed stops — never a value in between.
- */
-const sliderModel = computed<number[]>({
-  get: () => [selectedIndex.value],
-  set: ([index]) => {
-    const stop = stops[index]
-    if (!stop) return
-    usd.value = stop.usd
-    emit('change', { index, usd: stop.usd, credits: stop.credits })
-  }
-})
-
-const lastIndex = computed(() => Math.max(stops.length - 1, 0))
-
-const formatUsd = (value: number) => `$${value.toLocaleString('en-US')}`
-const formatCreditsCompact = (value: number) =>
-  new Intl.NumberFormat('en-US', {
-    notation: 'compact',
-    maximumFractionDigits: 1
-  }).format(value)
-
-const { t } = useI18n()
-</script>
-
-<template>
-  <div :class="cn('flex w-full flex-col gap-3', rootClass)">
-    <!-- Price: discounted monthly + struck pre-discount + save badge -->
-    <div class="flex flex-col gap-2">
-      <div class="flex flex-wrap items-center gap-x-2 gap-y-1">
-        <span class="flex shrink-0 items-baseline gap-1.5 whitespace-nowrap">
-          <span
-            class="text-[2rem]/none font-semibold text-base-foreground tabular-nums"
-            data-testid="credit-slider-price"
-          >
-            {{ formatUsd(displayMonthly) }}
-          </span>
-          <span
-            v-if="hasDiscount"
-            class="text-base text-muted-foreground tabular-nums line-through"
-            data-testid="credit-slider-original-price"
-          >
-            {{ formatUsd(displayOriginal) }}
-          </span>
-          <span class="text-base text-muted-foreground">
-            {{ t('subscription.usdPerMonth') }}
-          </span>
-        </span>
-        <!-- Save badge: outlined primary pill. On wide layouts it's pushed to
-             the right of the price; when the column narrows (mobile) it wraps
-             and aligns left under the price instead (DES QA). -->
-        <span
-          v-if="hasDiscount"
-          data-testid="credit-slider-save"
-          class="shrink-0 rounded-full border-2 border-primary-background px-2 py-1 text-sm font-bold whitespace-nowrap text-primary-background xl:ms-auto"
-        >
-          {{
-            t('subscription.creditSliderSave', {
-              percent: effectiveDiscountPercent,
-              amount: formatUsd(saveAmount)
-            })
-          }}
-        </span>
-      </div>
-      <p
-        class="m-0 text-sm text-muted-foreground tabular-nums"
-        data-testid="credit-slider-billed-yearly"
-      >
-        {{
-          cycle === 'monthly'
-            ? t('subscription.billedMonthly')
-            : t('subscription.billedYearly', {
-                total: formatUsd(displayBilledYearly)
-              })
-        }}
-      </p>
-    </div>
-
-    <!-- Discrete slider: snaps to the 5 fixed DES-197 stops -->
-    <Slider
-      v-model="sliderModel"
-      :min="0"
-      :max="lastIndex"
-      :step="1"
-      :disabled="disabled"
-      range-class="bg-base-foreground"
-      thumb-class="bg-base-foreground"
-    />
-
-    <!-- Credit stop labels; the selected stop is emphasized -->
-    <ol
-      data-testid="credit-slider-stops"
-      class="m-0 flex list-none justify-between p-0"
-    >
-      <li
-        v-for="(stop, i) in stops"
-        :key="stop.usd"
-        :data-selected="i === selectedIndex ? '' : undefined"
-        :class="
-          cn(
-            'flex items-center gap-1 text-xs tabular-nums',
-            i === selectedIndex
-              ? 'font-semibold text-base-foreground'
-              : 'text-muted-foreground'
-          )
-        "
-      >
-        <i
-          :class="
-            cn(
-              'icon-[comfy--credits] size-3 shrink-0',
-              i === selectedIndex ? 'bg-amber-400' : 'bg-muted-foreground'
-            )
-          "
-          aria-hidden="true"
-        />
-        {{ formatCreditsCompact(stop.credits) }}
-      </li>
-    </ol>
-  </div>
-</template>

src/components/ui/slider/Slider.vue

@@ -15,11 +15,7 @@ import { cn } from '@comfyorg/tailwind-utils'
 
 const props = defineProps<
   // eslint-disable-next-line vue/no-unused-properties
-  SliderRootProps & {
-    class?: HTMLAttributes['class']
-    rangeClass?: HTMLAttributes['class']
-    thumbClass?: HTMLAttributes['class']
-  }
+  SliderRootProps & { class?: HTMLAttributes['class'] }
 >()
 
 const pressed = ref(false)
@@ -29,7 +25,7 @@ const setPressed = (val: boolean) => {
 
 const emits = defineEmits<SliderRootEmits>()
 
-const delegatedProps = reactiveOmit(props, 'class', 'rangeClass', 'thumbClass')
+const delegatedProps = reactiveOmit(props, 'class')
 
 const forwarded = useForwardPropsEmits(delegatedProps, emits)
 </script>
@@ -64,12 +60,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
     >
       <SliderRange
         data-slot="slider-range"
-        :class="
-          cn(
-            'absolute bg-node-component-surface-highlight data-[orientation=horizontal]:h-full data-[orientation=vertical]:w-full',
-            props.rangeClass
-          )
-        "
+        class="absolute bg-node-component-surface-highlight data-[orientation=horizontal]:h-full data-[orientation=vertical]:w-full"
       />
     </SliderTrack>
 
@@ -83,8 +74,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
           'cursor-grab',
           'before:absolute before:-inset-1 before:block before:rounded-full before:bg-transparent',
           'hover:ring-2 focus-visible:ring-2 focus-visible:outline-hidden disabled:pointer-events-none disabled:opacity-50',
-          { 'cursor-grabbing': pressed },
-          props.thumbClass
+          { 'cursor-grabbing': pressed }
         )
       "
     />

src/composables/auth/useAuthActions.test.ts

@@ -225,40 +225,6 @@ describe('useAuthActions.reportError', () => {
     expect(mockToastErrorHandler).not.toHaveBeenCalled()
   })
 
-  it('shows the signupBlocked message when the error carries the signup_blocked token', () => {
-    const { reportError } = useAuthActions()
-
-    // The backend wraps the rejection in a generic code; we match the token in
-    // the message, so it must win over the auth.errors.${code} fallback.
-    reportError(
-      new FirebaseError(
-        'auth/internal-error',
-        'Account creation is temporarily unavailable. (ref: signup_blocked)'
-      )
-    )
-
-    expect(mockToastStore.add).toHaveBeenCalledWith({
-      severity: 'error',
-      summary: 'g.error',
-      detail: 'auth.errors.signupBlocked'
-    })
-    expect(mockToastErrorHandler).not.toHaveBeenCalled()
-  })
-
-  it('matches the signup_blocked token case-insensitively', () => {
-    const { reportError } = useAuthActions()
-
-    reportError(
-      new FirebaseError('auth/internal-error', 'rejected: SIGNUP_BLOCKED')
-    )
-
-    expect(mockToastStore.add).toHaveBeenCalledWith({
-      severity: 'error',
-      summary: 'g.error',
-      detail: 'auth.errors.signupBlocked'
-    })
-  })
-
   it('shows the generic fallback for an unknown Firebase auth code', () => {
     const { reportError } = useAuthActions()
 

src/composables/auth/useAuthActions.ts

@@ -47,19 +47,6 @@ export const useAuthActions = () => {
           email: 'support@comfy.org'
         })
       })
-    } else if (
-      error instanceof FirebaseError &&
-      error.message.toLowerCase().includes('signup_blocked')
-    ) {
-      // Match on `error.message`, not `error.code`: Firebase `beforeUserCreated`
-      // rejections collapse the thrown code into a generic `auth/internal-error`,
-      // so the message is the only reliable channel. `signup_blocked` is a
-      // cross-repo contract token; matched case-insensitively.
-      toastStore.add({
-        severity: 'error',
-        summary: t('g.error'),
-        detail: t('auth.errors.signupBlocked')
-      })
     } else if (error instanceof FirebaseError) {
       toastStore.add({
         severity: 'error',

src/composables/billing/types.ts

@@ -5,13 +5,11 @@ import type {
   BillingStatus,
   BillingSubscriptionStatus,
   CreateTopupResponse,
-  CurrentTeamCreditStop,
   Plan,
   PreviewSubscribeResponse,
   SubscribeResponse,
   SubscriptionDuration,
-  SubscriptionTier,
-  TeamCreditStops
+  SubscriptionTier
 } from '@/platform/workspace/api/workspaceApi'
 
 export type BillingType = 'legacy' | 'workspace'
@@ -73,10 +71,6 @@ export interface BillingState {
   balance: ComputedRef<BalanceInfo | null>
   plans: ComputedRef<Plan[]>
   currentPlanSlug: ComputedRef<string | null>
-  /** Team per-credit pricing ladder; null for personal/legacy. */
-  teamCreditStops: ComputedRef<TeamCreditStops | null>
-  /** The team's currently-subscribed credit stop; null for personal/legacy. */
-  currentTeamCreditStop: ComputedRef<CurrentTeamCreditStop | null>
   isLoading: Ref<boolean>
   error: Ref<string | null>
   isActiveSubscription: ComputedRef<boolean>
@@ -89,10 +83,5 @@ export interface BillingState {
 
 export interface BillingContext extends BillingState, BillingActions {
   type: ComputedRef<BillingType>
-  /**
-   * True when the active team workspace is still on a pre-credit-slider
-   * (legacy) per-member tier plan, which keeps the old team pricing table.
-   */
-  isLegacyTeamPlan: ComputedRef<boolean>
   getMaxSeats: (tierKey: TierKey) => number
 }

src/composables/billing/useBillingContext.test.ts

@@ -1,39 +1,20 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type {
-  BillingStatusResponse,
-  Plan
-} from '@/platform/workspace/api/workspaceApi'
+import type { Plan } from '@/platform/workspace/api/workspaceApi'
 
 import { useBillingContext } from './useBillingContext'
 
-const DEFAULT_BILLING_STATUS: BillingStatusResponse = {
-  is_active: true,
-  has_funds: true,
-  subscription_tier: 'PRO',
-  subscription_duration: 'MONTHLY'
-}
-
 const {
   mockTeamWorkspacesEnabled,
   mockIsPersonal,
   mockPlans,
-  mockPurchaseCredits,
-  mockBillingStatus
+  mockPurchaseCredits
 } = vi.hoisted(() => ({
   mockTeamWorkspacesEnabled: { value: false },
   mockIsPersonal: { value: true },
   mockPlans: { value: [] as Plan[] },
-  mockPurchaseCredits: vi.fn(),
-  mockBillingStatus: {
-    value: {
-      is_active: true,
-      has_funds: true,
-      subscription_tier: 'PRO',
-      subscription_duration: 'MONTHLY'
-    } as BillingStatusResponse
-  }
+  mockPurchaseCredits: vi.fn()
 }))
 
 vi.mock('@vueuse/core', async (importOriginal) => {
@@ -122,7 +103,12 @@ vi.mock('@/platform/cloud/subscription/composables/useBillingPlans', () => ({
 
 vi.mock('@/platform/workspace/api/workspaceApi', () => ({
   workspaceApi: {
-    getBillingStatus: vi.fn(() => Promise.resolve(mockBillingStatus.value)),
+    getBillingStatus: vi.fn().mockResolvedValue({
+      is_active: true,
+      has_funds: true,
+      subscription_tier: 'PRO',
+      subscription_duration: 'MONTHLY'
+    }),
     getBillingBalance: vi.fn().mockResolvedValue({
       amount_micros: 10000000,
       currency: 'usd'
@@ -139,7 +125,6 @@ describe('useBillingContext', () => {
     mockTeamWorkspacesEnabled.value = false
     mockIsPersonal.value = true
     mockPlans.value = []
-    mockBillingStatus.value = { ...DEFAULT_BILLING_STATUS }
   })
 
   it('returns legacy type for personal workspace', () => {
@@ -267,158 +252,4 @@ describe('useBillingContext', () => {
       expect(getMaxSeats('creator')).toBe(5)
     })
   })
-
-  describe('isLegacyTeamPlan', () => {
-    it('is false for a personal workspace', () => {
-      const { isLegacyTeamPlan } = useBillingContext()
-      expect(isLegacyTeamPlan.value).toBe(false)
-    })
-
-    it('is true for an active team plan: team- slug and no credit stop', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_tier: 'STANDARD',
-        subscription_duration: 'ANNUAL',
-        plan_slug: 'team-standard-annual'
-      }
-
-      const { initialize, isLegacyTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isLegacyTeamPlan.value).toBe(true)
-    })
-
-    it('is true for any legacy team tier, not just standard', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_tier: 'PRO',
-        subscription_duration: 'ANNUAL',
-        plan_slug: 'team-pro-annual'
-      }
-
-      const { initialize, isLegacyTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isLegacyTeamPlan.value).toBe(true)
-    })
-
-    it('is false for a new credit-slider team subscriber', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      // Real BE shape: underscore slug + populated credit stop. (subscription_tier
-      // is 'TEAM' on the wire, not yet in the FE SubscriptionTier union, so it is
-      // omitted here — the predicate does not depend on it.)
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_status: 'active',
-        subscription_duration: 'ANNUAL',
-        plan_slug: 'team_per_credit_annual',
-        team_credit_stop: {
-          id: 'team_700',
-          credits_monthly: 147700,
-          stop_usd: 700
-        }
-      }
-
-      const { initialize, isLegacyTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isLegacyTeamPlan.value).toBe(false)
-    })
-
-    it('is false for a new team sub even before its credit stop is populated', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      // Provisioning lag: credit stop not yet attached. The underscore slug
-      // (team_per_credit, not team-) must still exclude it from the legacy table.
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_status: 'active',
-        subscription_duration: 'ANNUAL',
-        plan_slug: 'team_per_credit_annual'
-      }
-
-      const { initialize, isLegacyTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isLegacyTeamPlan.value).toBe(false)
-    })
-
-    it('is false for a team workspace on a personal-tier plan', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_tier: 'STANDARD',
-        subscription_duration: 'ANNUAL',
-        plan_slug: 'standard-annual'
-      }
-
-      const { initialize, isLegacyTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isLegacyTeamPlan.value).toBe(false)
-    })
-
-    it('stays true for a cancelled-but-still-active legacy team sub', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_status: 'canceled',
-        subscription_tier: 'STANDARD',
-        subscription_duration: 'ANNUAL',
-        plan_slug: 'team-standard-annual',
-        cancel_at: '2099-01-01T00:00:00Z'
-      }
-
-      const { initialize, isLegacyTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isLegacyTeamPlan.value).toBe(true)
-    })
-
-    it('is false for a FREE-tier team even on a team- prefixed slug', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_tier: 'FREE',
-        plan_slug: 'team-free'
-      }
-
-      const { initialize, isLegacyTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isLegacyTeamPlan.value).toBe(false)
-    })
-
-    it('matches the legacy slug case-insensitively', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_tier: 'STANDARD',
-        subscription_duration: 'ANNUAL',
-        plan_slug: 'Team-Standard-Annual'
-      }
-
-      const { initialize, isLegacyTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isLegacyTeamPlan.value).toBe(true)
-    })
-  })
 })

src/composables/billing/useBillingContext.ts

@@ -20,12 +20,6 @@ import type {
 import { useLegacyBilling } from './useLegacyBilling'
 import { useWorkspaceBilling } from '@/platform/workspace/composables/useWorkspaceBilling'
 
-// Legacy per-member team plans use a hyphenated `team-{tier}-{cycle}` slug; the
-// new credit-slider plan uses an underscore `team_per_credit_{cycle}` slug and
-// carries a team_credit_stop. The hyphen prefix alone separates the two, so a
-// new sub is never misrouted even before its credit stop is populated.
-const LEGACY_TEAM_PLAN_SLUG_PREFIX = 'team-'
-
 /**
  * Unified billing context that automatically switches between legacy (user-scoped)
  * and workspace billing based on the active workspace type.
@@ -122,32 +116,12 @@ function useBillingContextInternal(): BillingContext {
     toValue(activeContext.value.currentPlanSlug)
   )
 
-  const teamCreditStops = computed(() =>
-    toValue(activeContext.value.teamCreditStops)
-  )
-
-  const currentTeamCreditStop = computed(() =>
-    toValue(activeContext.value.currentTeamCreditStop)
-  )
-
   const isActiveSubscription = computed(() =>
     toValue(activeContext.value.isActiveSubscription)
   )
 
   const isFreeTier = computed(() => subscription.value?.tier === 'FREE')
 
-  const isLegacyTeamPlan = computed(
-    () =>
-      type.value === 'workspace' &&
-      isActiveSubscription.value &&
-      !isFreeTier.value &&
-      currentTeamCreditStop.value === null &&
-      (currentPlanSlug.value
-        ?.toLowerCase()
-        .startsWith(LEGACY_TEAM_PLAN_SLUG_PREFIX) ??
-        false)
-  )
-
   const billingStatus = computed(() =>
     toValue(activeContext.value.billingStatus)
   )
@@ -280,13 +254,10 @@ function useBillingContextInternal(): BillingContext {
     balance,
     plans,
     currentPlanSlug,
-    teamCreditStops,
-    currentTeamCreditStop,
     isLoading,
     error,
     isActiveSubscription,
     isFreeTier,
-    isLegacyTeamPlan,
     billingStatus,
     subscriptionStatus,
     tier,

src/composables/billing/useLegacyBilling.ts

@@ -93,8 +93,6 @@ export function useLegacyBilling(): BillingState & BillingActions {
   // Legacy billing doesn't have workspace-style plans
   const plans = computed(() => [])
   const currentPlanSlug = computed(() => null)
-  const teamCreditStops = computed(() => null)
-  const currentTeamCreditStop = computed(() => null)
 
   async function initialize(): Promise<void> {
     if (isInitialized.value) return
@@ -202,8 +200,6 @@ export function useLegacyBilling(): BillingState & BillingActions {
     balance,
     plans,
     currentPlanSlug,
-    teamCreditStops,
-    currentTeamCreditStop,
     isLoading,
     error,
     isActiveSubscription,

src/composables/boundingBoxes/boundingBoxesUtil.test.ts

@@ -1,237 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { BoundingBox } from '@/types/boundingBoxes'
-
-import type { HitMode, Region } from './boundingBoxesUtil'
-import {
-  applyDrag,
-  boxesAt,
-  fromBoundingBoxes,
-  tagRects,
-  toBoundingBoxes
-} from './boundingBoxesUtil'
-
-const region = (over: Partial<Region> = {}): Region => ({
-  x: 0.2,
-  y: 0.2,
-  w: 0.2,
-  h: 0.2,
-  type: 'obj',
-  text: '',
-  desc: '',
-  palette: [],
-  ...over
-})
-
-describe('applyDrag', () => {
-  it('moves without resizing and keeps width/height', () => {
-    const out = applyDrag('move', region({ x: 0.2, y: 0.2 }), 0.1, 0.1)
-    expect(out.x).toBeCloseTo(0.3)
-    expect(out.y).toBeCloseTo(0.3)
-    expect(out.w).toBeCloseTo(0.2)
-    expect(out.h).toBeCloseTo(0.2)
-  })
-
-  it('clamps a move so the box stays inside the unit square', () => {
-    const out = applyDrag(
-      'move',
-      region({ x: 0.9, y: 0.9, w: 0.2, h: 0.2 }),
-      0.5,
-      0.5
-    )
-    expect(out.x).toBeCloseTo(0.8)
-    expect(out.y).toBeCloseTo(0.8)
-  })
-
-  it('grows from the bottom-right for draw and resize-br', () => {
-    for (const mode of ['draw', 'resize-br'] as HitMode[]) {
-      const out = applyDrag(
-        mode,
-        region({ x: 0.2, y: 0.2, w: 0.1, h: 0.1 }),
-        0.1,
-        0.2
-      )
-      expect(out).toMatchObject({ x: 0.2, y: 0.2 })
-      expect(out.w).toBeCloseTo(0.2)
-      expect(out.h).toBeCloseTo(0.3)
-    }
-  })
-
-  it('moves the top-left corner on resize-tl', () => {
-    const out = applyDrag(
-      'resize-tl',
-      region({ x: 0.5, y: 0.5, w: 0.2, h: 0.2 }),
-      0.1,
-      0.1
-    )
-    expect(out.x).toBeCloseTo(0.6)
-    expect(out.y).toBeCloseTo(0.6)
-    expect(out.w).toBeCloseTo(0.1)
-    expect(out.h).toBeCloseTo(0.1)
-  })
-
-  it('normalizes a corner drag that inverts the box', () => {
-    const out = applyDrag(
-      'resize-tl',
-      region({ x: 0.5, y: 0.5, w: 0.2, h: 0.2 }),
-      0.3,
-      0
-    )
-    expect(out.x).toBeCloseTo(0.7)
-    expect(out.w).toBeCloseTo(0.1)
-    expect(out.y).toBeCloseTo(0.5)
-    expect(out.h).toBeCloseTo(0.2)
-  })
-
-  it('resizes single edges', () => {
-    expect(applyDrag('resize-r', region({ w: 0.2 }), 0.1, 0).w).toBeCloseTo(0.3)
-    expect(applyDrag('resize-b', region({ h: 0.2 }), 0, 0.1).h).toBeCloseTo(0.3)
-    const top = applyDrag('resize-t', region({ y: 0.4, h: 0.2 }), 0, 0.1)
-    expect(top.y).toBeCloseTo(0.5)
-    expect(top.h).toBeCloseTo(0.1)
-    const left = applyDrag('resize-l', region({ x: 0.4, w: 0.2 }), 0.1, 0)
-    expect(left.x).toBeCloseTo(0.5)
-    expect(left.w).toBeCloseTo(0.1)
-  })
-})
-
-describe('boxesAt', () => {
-  const regions: Region[] = [region({ x: 0.2, y: 0.2, w: 0.2, h: 0.2 })]
-
-  it('detects a corner handle', () => {
-    const hits = boxesAt(regions, 0.2, 0.2, 6, 100, 100, -1)
-    expect(hits[0]).toEqual({ index: 0, mode: 'resize-tl' })
-  })
-
-  it('detects an interior move', () => {
-    const hits = boxesAt(regions, 0.3, 0.3, 6, 100, 100, -1)
-    expect(hits[0]).toEqual({ index: 0, mode: 'move' })
-  })
-
-  it('returns nothing when the pointer misses every box', () => {
-    expect(boxesAt(regions, 0.9, 0.9, 6, 100, 100, -1)).toEqual([])
-  })
-
-  it('brings the active box to the front of overlapping candidates', () => {
-    const overlapping: Region[] = [
-      region({ x: 0.2, y: 0.2, w: 0.2, h: 0.2 }),
-      region({ x: 0.25, y: 0.25, w: 0.2, h: 0.2 })
-    ]
-    const hits = boxesAt(overlapping, 0.3, 0.3, 6, 100, 100, 1)
-    expect(hits).toHaveLength(2)
-    expect(hits[0].index).toBe(1)
-  })
-})
-
-describe('tagRects', () => {
-  const measure = (s: string) => s.length * 7
-
-  it('places the first tag at the top-left corner', () => {
-    const rects = tagRects(
-      [region({ x: 0.1, y: 0.1, w: 0.3, h: 0.3 })],
-      100,
-      100,
-      measure
-    )
-    expect(rects[0]).toMatchObject({ x: 10, y: 10, tag: '01' })
-    expect(rects[0].w).toBe(measure('01') + 8)
-  })
-
-  it('moves a colliding tag to a different corner', () => {
-    const boxes = [
-      region({ x: 0.1, y: 0.1, w: 0.3, h: 0.3 }),
-      region({ x: 0.1, y: 0.1, w: 0.3, h: 0.3 })
-    ]
-    const rects = tagRects(boxes, 100, 100, measure)
-    const sameSpot = rects[1].x === rects[0].x && rects[1].y === rects[0].y
-    expect(sameSpot).toBe(false)
-  })
-})
-
-describe('fromBoundingBoxes', () => {
-  it('converts pixel boxes to normalized regions with metadata', () => {
-    const boxes: BoundingBox[] = [
-      {
-        x: 100,
-        y: 200,
-        width: 300,
-        height: 400,
-        metadata: { type: 'text', text: 'hi', desc: 'd', palette: ['#fff'] }
-      }
-    ]
-    expect(fromBoundingBoxes(boxes, 1000, 1000)[0]).toEqual({
-      x: 0.1,
-      y: 0.2,
-      w: 0.3,
-      h: 0.4,
-      type: 'text',
-      text: 'hi',
-      desc: 'd',
-      palette: ['#fff']
-    })
-  })
-
-  it('fills defaults when metadata is missing or partial', () => {
-    const boxes = [{ x: 0, y: 0, width: 10, height: 10 }] as BoundingBox[]
-    expect(fromBoundingBoxes(boxes, 100, 100)[0]).toMatchObject({
-      type: 'obj',
-      text: '',
-      desc: '',
-      palette: []
-    })
-  })
-
-  it('drops entries that are not bounding boxes', () => {
-    const boxes = [null, { x: 1 }, undefined] as unknown as BoundingBox[]
-    expect(fromBoundingBoxes(boxes, 100, 100)).toEqual([])
-  })
-
-  it('guards against zero dimensions', () => {
-    const boxes: BoundingBox[] = [
-      {
-        x: 5,
-        y: 5,
-        width: 5,
-        height: 5,
-        metadata: { type: 'obj', text: '', desc: '', palette: [] }
-      }
-    ]
-    expect(fromBoundingBoxes(boxes, 0, 0)[0]).toMatchObject({
-      x: 5,
-      y: 5,
-      w: 5,
-      h: 5
-    })
-  })
-})
-
-describe('toBoundingBoxes', () => {
-  it('rounds normalized regions back to pixels and copies the palette', () => {
-    const palette = ['#abc']
-    const regions: Region[] = [
-      region({ x: 0.1, y: 0.2, w: 0.3, h: 0.4, palette })
-    ]
-    const [box] = toBoundingBoxes(regions, 1000, 1000)
-    expect(box).toMatchObject({ x: 100, y: 200, width: 300, height: 400 })
-    expect(box.metadata.palette).toEqual(['#abc'])
-    expect(box.metadata.palette).not.toBe(palette)
-  })
-
-  it('round-trips from pixels to regions and back', () => {
-    const boxes: BoundingBox[] = [
-      {
-        x: 100,
-        y: 200,
-        width: 300,
-        height: 400,
-        metadata: { type: 'obj', text: '', desc: '', palette: [] }
-      }
-    ]
-    const restored = toBoundingBoxes(
-      fromBoundingBoxes(boxes, 1000, 1000),
-      1000,
-      1000
-    )
-    expect(restored).toEqual(boxes)
-  })
-})

src/composables/boundingBoxes/boundingBoxesUtil.ts

@@ -1,246 +0,0 @@
-import type { BoundingBox, BoundingBoxMetadata } from '@/types/boundingBoxes'
-
-export type HitMode =
-  | 'move'
-  | 'draw'
-  | 'resize-tl'
-  | 'resize-tr'
-  | 'resize-bl'
-  | 'resize-br'
-  | 'resize-t'
-  | 'resize-b'
-  | 'resize-l'
-  | 'resize-r'
-
-export interface Region extends BoundingBoxMetadata {
-  x: number
-  y: number
-  w: number
-  h: number
-}
-
-interface BoxCandidate {
-  index: number
-  mode: HitMode
-}
-
-interface TagRect {
-  x: number
-  y: number
-  w: number
-  h: number
-  tag: string
-}
-
-const clamp01 = (v: number) => Math.max(0, Math.min(1, v))
-
-function normalizeBox(b: Region): Region {
-  let { x, y, w, h } = b
-  if (w < 0) {
-    x += w
-    w = -w
-  }
-  if (h < 0) {
-    y += h
-    h = -h
-  }
-  x = clamp01(x)
-  y = clamp01(y)
-  w = Math.min(w, 1 - x)
-  h = Math.min(h, 1 - y)
-  return { ...b, x, y, w: Math.max(0, w), h: Math.max(0, h) }
-}
-
-function rectHitTest(
-  mx: number,
-  my: number,
-  x1: number,
-  y1: number,
-  x2: number,
-  y2: number,
-  rx: number,
-  ry: number
-): HitMode | null {
-  const h = (cx: number, cy: number) =>
-    Math.abs(mx - cx) < rx && Math.abs(my - cy) < ry
-  if (h(x1, y1)) return 'resize-tl'
-  if (h(x2, y1)) return 'resize-tr'
-  if (h(x1, y2)) return 'resize-bl'
-  if (h(x2, y2)) return 'resize-br'
-  if (mx >= x1 && mx <= x2 && Math.abs(my - y1) < ry) return 'resize-t'
-  if (mx >= x1 && mx <= x2 && Math.abs(my - y2) < ry) return 'resize-b'
-  if (my >= y1 && my <= y2 && Math.abs(mx - x1) < rx) return 'resize-l'
-  if (my >= y1 && my <= y2 && Math.abs(mx - x2) < rx) return 'resize-r'
-  if (mx >= x1 && mx <= x2 && my >= y1 && my <= y2) return 'move'
-  return null
-}
-
-export function applyDrag(
-  mode: HitMode,
-  start: Region,
-  dx: number,
-  dy: number
-): Region {
-  let { x, y, w, h } = start
-  switch (mode) {
-    case 'move':
-      x += dx
-      y += dy
-      x = clamp01(Math.min(x, 1 - w))
-      y = clamp01(Math.min(y, 1 - h))
-      break
-    case 'draw':
-    case 'resize-br':
-      w += dx
-      h += dy
-      break
-    case 'resize-tl':
-      x += dx
-      y += dy
-      w -= dx
-      h -= dy
-      break
-    case 'resize-tr':
-      y += dy
-      w += dx
-      h -= dy
-      break
-    case 'resize-bl':
-      x += dx
-      w -= dx
-      h += dy
-      break
-    case 'resize-t':
-      y += dy
-      h -= dy
-      break
-    case 'resize-b':
-      h += dy
-      break
-    case 'resize-l':
-      x += dx
-      w -= dx
-      break
-    case 'resize-r':
-      w += dx
-      break
-  }
-  return mode === 'move'
-    ? { ...start, x, y }
-    : normalizeBox({ ...start, x, y, w, h })
-}
-
-export function boxesAt(
-  regions: readonly Region[],
-  mxN: number,
-  myN: number,
-  handlePx: number,
-  logW: number,
-  logH: number,
-  activeIdx: number
-): BoxCandidate[] {
-  const rx = handlePx / Math.max(1, logW)
-  const ry = handlePx / Math.max(1, logH)
-  const res: BoxCandidate[] = []
-  for (let i = 0; i < regions.length; i++) {
-    const b = regions[i]
-    const mode = rectHitTest(mxN, myN, b.x, b.y, b.x + b.w, b.y + b.h, rx, ry)
-    if (mode) res.push({ index: i, mode })
-  }
-  const ai = res.findIndex((c) => c.index === activeIdx)
-  if (ai > 0) res.unshift(res.splice(ai, 1)[0])
-  return res
-}
-
-export function tagRects(
-  regions: readonly Region[],
-  logW: number,
-  logH: number,
-  measureWidth: (s: string) => number,
-  height = 14
-): TagRect[] {
-  const placed: TagRect[] = []
-  const rects: TagRect[] = []
-  const hits = (a: TagRect, b: TagRect) =>
-    a.x < b.x + b.w && a.x + a.w > b.x && a.y < b.y + b.h && a.y + a.h > b.y
-  for (let i = 0; i < regions.length; i++) {
-    const b = regions[i]
-    const x1 = b.x * logW
-    const y1 = b.y * logH
-    const x2 = (b.x + b.w) * logW
-    const y2 = (b.y + b.h) * logH
-    const tag = String(i + 1).padStart(2, '0')
-    const w = measureWidth(tag) + 8
-    let pick: [number, number] = [x1, y1]
-    for (const [cx, cy] of [
-      [x1, y1],
-      [x2 - w, y1],
-      [x2 - w, y2 - height],
-      [x1, y2 - height]
-    ] as const) {
-      const candidate: TagRect = { x: cx, y: cy, w, h: height, tag }
-      if (!placed.some((p) => hits(candidate, p))) {
-        pick = [cx, cy]
-        break
-      }
-    }
-    const r: TagRect = { x: pick[0], y: pick[1], w, h: height, tag }
-    placed.push(r)
-    rects[i] = r
-  }
-  return rects
-}
-
-function isBoundingBox(b: unknown): b is BoundingBox {
-  if (!b || typeof b !== 'object') return false
-  const box = b as Record<string, unknown>
-  return (
-    typeof box.x === 'number' &&
-    typeof box.y === 'number' &&
-    typeof box.width === 'number' &&
-    typeof box.height === 'number'
-  )
-}
-
-export function fromBoundingBoxes(
-  boxes: readonly BoundingBox[],
-  width: number,
-  height: number
-): Region[] {
-  const w = width || 1
-  const h = height || 1
-  return boxes.filter(isBoundingBox).map((box) => {
-    const meta = (box.metadata ?? {}) as Partial<BoundingBoxMetadata>
-    return {
-      x: box.x / w,
-      y: box.y / h,
-      w: box.width / w,
-      h: box.height / h,
-      type: meta.type === 'text' ? 'text' : 'obj',
-      text: typeof meta.text === 'string' ? meta.text : '',
-      desc: typeof meta.desc === 'string' ? meta.desc : '',
-      palette: Array.isArray(meta.palette)
-        ? meta.palette.filter((c): c is string => typeof c === 'string')
-        : []
-    }
-  })
-}
-
-export function toBoundingBoxes(
-  regions: readonly Region[],
-  width: number,
-  height: number
-): BoundingBox[] {
-  return regions.map((r) => ({
-    x: Math.round(r.x * width),
-    y: Math.round(r.y * height),
-    width: Math.round(r.w * width),
-    height: Math.round(r.h * height),
-    metadata: {
-      type: r.type,
-      text: r.text,
-      desc: r.desc,
-      palette: r.palette.slice()
-    }
-  }))
-}

src/composables/boundingBoxes/useBoundingBoxes.test.ts

@@ -1,249 +0,0 @@
-import { render } from '@testing-library/vue'
-import { createPinia, setActivePinia } from 'pinia'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Ref, ShallowRef } from 'vue'
-import { defineComponent, h, nextTick, ref, shallowRef } from 'vue'
-
-import { useBoundingBoxes } from './useBoundingBoxes'
-import type { BoundingBox } from '@/types/boundingBoxes'
-
-const { appState } = vi.hoisted(() => ({
-  appState: { node: null as unknown }
-}))
-
-vi.mock('@/scripts/app', () => ({
-  app: { canvas: { graph: { getNodeById: () => appState.node } } }
-}))
-
-const ctx = {
-  measureText: (s: string) => ({ width: s.length * 7 }),
-  setTransform: () => {},
-  clearRect: () => {},
-  fillRect: () => {},
-  strokeRect: () => {},
-  fillText: () => {},
-  drawImage: () => {},
-  save: () => {},
-  restore: () => {},
-  beginPath: () => {},
-  rect: () => {},
-  clip: () => {},
-  font: '',
-  fillStyle: '',
-  strokeStyle: '',
-  lineWidth: 0
-} as unknown as CanvasRenderingContext2D
-
-function makeCanvas(): HTMLCanvasElement {
-  const el = document.createElement('canvas')
-  Object.defineProperty(el, 'clientWidth', { value: 100, configurable: true })
-  Object.defineProperty(el, 'clientHeight', { value: 100, configurable: true })
-  el.getContext = (() => ctx) as unknown as HTMLCanvasElement['getContext']
-  el.getBoundingClientRect = () =>
-    ({
-      left: 0,
-      top: 0,
-      right: 100,
-      bottom: 100,
-      width: 100,
-      height: 100,
-      x: 0,
-      y: 0,
-      toJSON: () => ({})
-    }) as DOMRect
-  el.focus = () => {}
-  el.setPointerCapture = () => {}
-  el.releasePointerCapture = () => {}
-  return el
-}
-
-function makeNode() {
-  return {
-    widgets: [
-      { name: 'width', value: 512 },
-      { name: 'height', value: 512 }
-    ],
-    findInputSlot: () => -1,
-    getInputNode: () => null
-  }
-}
-
-const pe = (
-  clientX: number,
-  clientY: number,
-  over: Partial<PointerEvent> = {}
-) =>
-  ({
-    button: 0,
-    clientX,
-    clientY,
-    altKey: false,
-    pointerId: 1,
-    preventDefault: () => {},
-    stopPropagation: () => {},
-    ...over
-  }) as unknown as PointerEvent
-
-const flush = async () => {
-  await Promise.resolve()
-  await nextTick()
-}
-
-type Api = ReturnType<typeof useBoundingBoxes>
-interface Captured extends Api {
-  canvasEl: ShallowRef<HTMLCanvasElement | null>
-  modelValue: Ref<BoundingBox[]>
-}
-
-function setup(initial: BoundingBox[] = []) {
-  let captured: Captured | undefined
-  const Harness = defineComponent({
-    setup() {
-      const canvasEl = shallowRef<HTMLCanvasElement | null>(null)
-      const canvasContainer = shallowRef<HTMLDivElement | null>(null)
-      const inlineEditorEl = shallowRef<HTMLTextAreaElement | null>(null)
-      const modelValue = ref(initial)
-      const api = useBoundingBoxes('1', {
-        canvasEl,
-        canvasContainer,
-        inlineEditorEl,
-        modelValue
-      })
-      captured = { canvasEl, modelValue, ...api }
-      return () => h('div')
-    }
-  })
-  render(Harness)
-  captured!.canvasEl.value = makeCanvas()
-  return captured!
-}
-
-const box = (over: Partial<BoundingBox> = {}): BoundingBox => ({
-  x: 51,
-  y: 51,
-  width: 256,
-  height: 256,
-  metadata: { type: 'obj', text: '', desc: '', palette: ['#ff0000'] },
-  ...over
-})
-
-beforeEach(() => {
-  setActivePinia(createPinia())
-  appState.node = makeNode()
-  vi.stubGlobal('requestAnimationFrame', (cb: FrameRequestCallback) => {
-    void Promise.resolve().then(() => cb(0))
-    return 1
-  })
-  vi.stubGlobal('cancelAnimationFrame', () => {})
-})
-
-afterEach(() => {
-  vi.unstubAllGlobals()
-})
-
-describe('useBoundingBoxes initialization', () => {
-  it('derives regions from the initial model value', () => {
-    const c = setup([box()])
-    expect(c.hasRegions.value).toBe(true)
-    expect(c.activeRegion.value).toMatchObject({ type: 'obj' })
-  })
-
-  it('exposes an aspect-ratio canvas style from the node width/height', () => {
-    const c = setup()
-    expect(c.canvasStyle.value).toEqual({ aspectRatio: '512 / 512' })
-  })
-
-  it('starts with no active region when empty', () => {
-    const c = setup()
-    expect(c.hasRegions.value).toBe(false)
-    expect(c.activeRegion.value).toBeNull()
-  })
-})
-
-describe('useBoundingBoxes drawing', () => {
-  it('draws a new region and syncs it to the model value', async () => {
-    const c = setup()
-    c.onPointerDown(pe(10, 10))
-    c.onCanvasPointerMove(pe(60, 60))
-    c.onDocPointerUp(pe(60, 60))
-    await flush()
-    expect(c.modelValue.value).toHaveLength(1)
-    expect(c.modelValue.value[0].width).toBeGreaterThan(0)
-  })
-
-  it('discards a zero-size draw', async () => {
-    const c = setup()
-    c.onPointerDown(pe(10, 10))
-    c.onDocPointerUp(pe(10, 10))
-    await flush()
-    expect(c.modelValue.value).toHaveLength(0)
-  })
-
-  it('selects an existing region instead of drawing when clicking inside it', async () => {
-    const c = setup([box()])
-    c.onPointerDown(pe(30, 30))
-    c.onDocPointerUp(pe(30, 30))
-    await flush()
-    expect(c.modelValue.value).toHaveLength(1)
-  })
-})
-
-describe('useBoundingBoxes region editing', () => {
-  it('changes the active region type', async () => {
-    const c = setup([box()])
-    c.setActiveType('text')
-    await flush()
-    expect(c.modelValue.value[0].metadata.type).toBe('text')
-  })
-
-  it('deletes the active region on Delete', async () => {
-    const c = setup([box()])
-    c.onCanvasKeyDown({
-      key: 'Delete',
-      preventDefault: () => {},
-      stopPropagation: () => {}
-    } as unknown as KeyboardEvent)
-    await flush()
-    expect(c.modelValue.value).toHaveLength(0)
-  })
-
-  it('clears all regions', async () => {
-    const c = setup([box(), box({ x: 0 })])
-    c.clearAll()
-    await flush()
-    expect(c.modelValue.value).toHaveLength(0)
-  })
-})
-
-describe('useBoundingBoxes inline editor', () => {
-  it('opens on double click and commits the description', async () => {
-    const c = setup([box()])
-    c.onDoubleClick(pe(30, 30) as unknown as MouseEvent)
-    await flush()
-    expect(c.inlineEditor.value).not.toBeNull()
-
-    c.inlineEditor.value!.value = 'a label'
-    c.commitInlineEditor()
-    await flush()
-    expect(c.modelValue.value[0].metadata.desc).toBe('a label')
-    expect(c.inlineEditor.value).toBeNull()
-  })
-
-  it('closes the inline editor on Escape', async () => {
-    const c = setup([box()])
-    c.onDoubleClick(pe(30, 30) as unknown as MouseEvent)
-    await flush()
-    c.onInlineKeyDown({ key: 'Escape' } as KeyboardEvent)
-    expect(c.inlineEditor.value).toBeNull()
-  })
-})
-
-describe('useBoundingBoxes hover cursor', () => {
-  it('switches to a pointer cursor over a tag', async () => {
-    const c = setup([box({ x: 10, y: 10, width: 256, height: 256 })])
-    expect(c.canvasCursor.value).toBe('crosshair')
-    c.onCanvasPointerMove(pe(15, 15))
-    await flush()
-    expect(c.canvasCursor.value).toBe('pointer')
-  })
-})

src/composables/boundingBoxes/useBoundingBoxes.ts

@@ -1,614 +0,0 @@
-import { useElementSize } from '@vueuse/core'
-import { storeToRefs } from 'pinia'
-import type { Ref, ShallowRef } from 'vue'
-import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
-
-import {
-  applyDrag,
-  boxesAt,
-  fromBoundingBoxes,
-  tagRects,
-  toBoundingBoxes
-} from '@/composables/boundingBoxes/boundingBoxesUtil'
-import type {
-  HitMode,
-  Region
-} from '@/composables/boundingBoxes/boundingBoxesUtil'
-import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { app } from '@/scripts/app'
-import { useNodeOutputStore } from '@/stores/nodeOutputStore'
-import type { BoundingBox } from '@/types/boundingBoxes'
-import { readableTextColor, textOnColor } from '@/utils/colorUtil'
-
-const HANDLE_PX = 8
-const DIMENSION_STEP = 16
-const BG_DIM = 0.75
-const MAX_ELEMENT_COLORS = 5
-
-interface InlineEditorState {
-  value: string
-  style: Record<string, string>
-  index: number
-}
-
-interface UseBoundingBoxesOptions {
-  canvasEl: Readonly<ShallowRef<HTMLCanvasElement | null>>
-  canvasContainer: Readonly<ShallowRef<HTMLDivElement | null>>
-  inlineEditorEl: Readonly<ShallowRef<HTMLTextAreaElement | null>>
-  modelValue: Ref<BoundingBox[]>
-}
-
-export function useBoundingBoxes(
-  nodeId: string,
-  {
-    canvasEl,
-    canvasContainer,
-    inlineEditorEl,
-    modelValue
-  }: UseBoundingBoxesOptions
-) {
-  const focused = ref(false)
-  const drawing = ref(false)
-  const dragMode = ref<HitMode | null>(null)
-  const dragStartNorm = ref<{ x: number; y: number } | null>(null)
-  const boxAtStart = ref<Region | null>(null)
-  const hoverIndex = ref<number | null>(null)
-  const hoverTagIndex = ref<number | null>(null)
-  const bgImage = ref<HTMLImageElement | null>(null)
-  const inlineEditor = ref<InlineEditorState | null>(null)
-
-  const { width: containerWidth } = useElementSize(canvasContainer)
-
-  const litegraphNode = computed(() =>
-    nodeId && app.canvas?.graph ? app.canvas.graph.getNodeById(nodeId) : null
-  )
-  const { selectedNodeIds } = storeToRefs(useCanvasStore())
-  const isNodeSelected = computed(() =>
-    selectedNodeIds.value.has(String(nodeId))
-  )
-
-  function dimWidget(name: 'width' | 'height'): number | undefined {
-    const v = litegraphNode.value?.widgets?.find((w) => w.name === name)?.value
-    return typeof v === 'number' && v > 0 ? v : undefined
-  }
-  const widthValue = computed(() => dimWidget('width') ?? 1024)
-  const heightValue = computed(() => dimWidget('height') ?? 1024)
-
-  const state = ref({
-    regions: fromBoundingBoxes(
-      modelValue.value ?? [],
-      widthValue.value,
-      heightValue.value
-    )
-  })
-  const activeIndex = ref(state.value.regions.length ? 0 : -1)
-
-  const aspectRatio = computed(
-    () => `${widthValue.value} / ${heightValue.value}`
-  )
-  const canvasStyle = computed(() => ({ aspectRatio: aspectRatio.value }))
-
-  const activeRegion = computed(() =>
-    activeIndex.value >= 0 ? state.value.regions[activeIndex.value] : null
-  )
-  const hasRegions = computed(() => state.value.regions.length > 0)
-
-  function clampToCanvas(n: number) {
-    return Math.max(0, Math.min(1, n))
-  }
-
-  function logicalSize() {
-    const el = canvasEl.value
-    return { w: el?.clientWidth || 1, h: el?.clientHeight || 1 }
-  }
-
-  function pointerNorm(e: PointerEvent) {
-    const el = canvasEl.value
-    if (!el) return { x: 0, y: 0 }
-    const r = el.getBoundingClientRect()
-    return {
-      x: clampToCanvas((e.clientX - r.left) / r.width),
-      y: clampToCanvas((e.clientY - r.top) / r.height)
-    }
-  }
-
-  let rafHandle = 0
-  function requestDraw() {
-    if (rafHandle) return
-    rafHandle = requestAnimationFrame(() => {
-      rafHandle = 0
-      drawCanvas()
-    })
-  }
-
-  function measureWidth(ctx: CanvasRenderingContext2D, s: string) {
-    return ctx.measureText(s).width
-  }
-
-  function drawCanvas() {
-    const el = canvasEl.value
-    if (!el) return
-    const { w: W, h: H } = logicalSize()
-    const dpr = window.devicePixelRatio || 1
-    const bw = Math.max(1, Math.round(W * dpr))
-    const bh = Math.max(1, Math.round(H * dpr))
-    if (el.width !== bw || el.height !== bh) {
-      el.width = bw
-      el.height = bh
-    }
-    const ctx = el.getContext('2d')
-    if (!ctx) return
-    ctx.setTransform(dpr, 0, 0, dpr, 0, 0)
-    ctx.clearRect(0, 0, W, H)
-
-    if (bgImage.value) {
-      ctx.drawImage(bgImage.value, 0, 0, W, H)
-      ctx.fillStyle = `rgba(0,0,0,${BG_DIM})`
-      ctx.fillRect(0, 0, W, H)
-    }
-
-    const showActive = focused.value || isNodeSelected.value
-    const aIdx = showActive ? activeIndex.value : -1
-    const order = state.value.regions
-      .map((_, i) => i)
-      .filter((i) => i !== aIdx)
-      .reverse()
-    if (aIdx >= 0 && aIdx < state.value.regions.length) order.push(aIdx)
-
-    ctx.font = 'bold 11px monospace'
-    const tag_rects = tagRects(state.value.regions, W, H, (s) =>
-      measureWidth(ctx, s)
-    )
-
-    for (const i of order) {
-      const b = state.value.regions[i]
-      const active = i === aIdx
-      const pal = (b.palette || []).filter(Boolean)
-      const col = pal.length ? pal[0] : '#8c8c8c'
-      const x1 = b.x * W
-      const y1 = b.y * H
-      const x2 = (b.x + b.w) * W
-      const y2 = (b.y + b.h) * H
-      const w = x2 - x1
-      const h = y2 - y1
-      const hovered = i === hoverIndex.value || active
-
-      if (active) {
-        ctx.fillStyle = 'rgba(26,26,26,0.88)'
-        ctx.fillRect(x1, y1, w, h)
-      }
-      ctx.fillStyle = col + (hovered ? '3a' : '22')
-      ctx.fillRect(x1, y1, w, h)
-
-      const lw = active ? 2 : hovered ? 1.5 : 1
-      ctx.strokeStyle = col
-      ctx.lineWidth = lw
-      ctx.strokeRect(x1 + lw / 2, y1 + lw / 2, w - lw, h - lw)
-
-      if (pal.length) {
-        const sw = w / pal.length
-        const sh = 7
-        for (let p = 0; p < pal.length; p++) {
-          const sx = x1 + Math.round(p * sw)
-          ctx.fillStyle = pal[p]
-          ctx.fillRect(sx, y1, x1 + Math.round((p + 1) * sw) - sx, sh)
-        }
-      }
-
-      ctx.save()
-      ctx.beginPath()
-      ctx.rect(x1, y1, w, h)
-      ctx.clip()
-
-      let body = b.desc || ''
-      if (b.type === 'text' && b.text)
-        body = `"${b.text}"` + (body ? ` — ${body}` : '')
-      if (body) {
-        ctx.font = '12px monospace'
-        ctx.fillStyle = readableTextColor(col)
-        const pad = 4
-        const lh = 14
-        let ty = y1 + 15 + 12
-        for (const line of wrapLines(ctx, body, w - pad * 2)) {
-          if (ty > y1 + h) break
-          ctx.fillText(line, x1 + pad, ty)
-          ty += lh
-        }
-      }
-
-      const tr = tag_rects[i]
-      ctx.font = 'bold 11px monospace'
-      ctx.fillStyle = col
-      ctx.fillRect(tr.x, tr.y, tr.w, 14)
-      if (i === hoverTagIndex.value) {
-        ctx.fillStyle = 'rgba(255,255,255,0.25)'
-        ctx.fillRect(tr.x, tr.y, tr.w, 14)
-        ctx.strokeStyle = '#fff'
-        ctx.lineWidth = 1
-        ctx.strokeRect(tr.x + 0.5, tr.y + 0.5, tr.w - 1, 13)
-      }
-      ctx.fillStyle = textOnColor(col)
-      ctx.fillText(tr.tag, tr.x + 4, tr.y + 11)
-      ctx.restore()
-    }
-  }
-
-  function wrapLines(
-    ctx: CanvasRenderingContext2D,
-    text: string,
-    maxW: number
-  ): string[] {
-    const out: string[] = []
-    for (const para of text.split('\n')) {
-      let line = ''
-      for (const word of para.split(/\s+/)) {
-        if (!word) continue
-        const test = line ? `${line} ${word}` : word
-        if (line && ctx.measureText(test).width > maxW) {
-          out.push(line)
-          line = word
-        } else {
-          line = test
-        }
-      }
-      out.push(line)
-    }
-    return out
-  }
-
-  const hitTestPoint = (mN: { x: number; y: number }) => {
-    const { w: W, h: H } = logicalSize()
-    const cands = boxesAt(
-      state.value.regions,
-      mN.x,
-      mN.y,
-      HANDLE_PX,
-      W,
-      H,
-      activeIndex.value
-    )
-    if (!cands.length) return null
-    return (
-      cands.find((c) => c.index === activeIndex.value && c.mode !== 'move') ||
-      cands[0]
-    )
-  }
-
-  const titleAt = (mN: { x: number; y: number }) => {
-    const el = canvasEl.value
-    if (!el) return null
-    const ctx = el.getContext('2d')
-    if (!ctx) return null
-    const { w: W, h: H } = logicalSize()
-    const rects = tagRects(state.value.regions, W, H, (s) =>
-      measureWidth(ctx, s)
-    )
-    const px = mN.x * W
-    const py = mN.y * H
-    for (let i = state.value.regions.length - 1; i >= 0; i--) {
-      const r = rects[i]
-      if (r && px >= r.x && px <= r.x + r.w && py >= r.y && py <= r.y + r.h)
-        return i
-    }
-    return null
-  }
-
-  function pickForSelection(mN: { x: number; y: number }, cycle: boolean) {
-    const { w: W, h: H } = logicalSize()
-    const cands = boxesAt(
-      state.value.regions,
-      mN.x,
-      mN.y,
-      HANDLE_PX,
-      W,
-      H,
-      activeIndex.value
-    )
-    if (!cands.length) return null
-    const activeResize = cands.find(
-      (c) => c.index === activeIndex.value && c.mode !== 'move'
-    )
-    if (activeResize && !cycle) return activeResize
-    const ti = titleAt(mN)
-    if (ti !== null && !cycle) return { index: ti, mode: 'move' as HitMode }
-    if (cycle && cands.length > 1) {
-      const pos = cands.findIndex((c) => c.index === activeIndex.value)
-      return cands[(pos + 1) % cands.length]
-    }
-    return (
-      cands.find((c) => c.index === activeIndex.value && c.mode !== 'move') ||
-      cands[0]
-    )
-  }
-
-  function onPointerDown(e: PointerEvent) {
-    if (e.button !== 0) return
-    canvasEl.value?.focus()
-    hoverTagIndex.value = null
-    hoverIndex.value = null
-    const mN = pointerNorm(e)
-    const hit = pickForSelection(mN, e.altKey)
-    if (hit) {
-      activeIndex.value = hit.index
-      dragMode.value = hit.mode
-      boxAtStart.value = { ...state.value.regions[hit.index] }
-    } else {
-      dragMode.value = 'draw'
-      const nb: Region = {
-        x: mN.x,
-        y: mN.y,
-        w: 0,
-        h: 0,
-        type: 'obj',
-        text: '',
-        desc: '',
-        palette: []
-      }
-      state.value.regions.push(nb)
-      activeIndex.value = state.value.regions.length - 1
-      boxAtStart.value = { ...nb }
-    }
-    drawing.value = true
-    dragStartNorm.value = mN
-    canvasEl.value?.setPointerCapture(e.pointerId)
-    e.preventDefault()
-    requestDraw()
-  }
-
-  function onDocPointerMove(e: PointerEvent) {
-    if (
-      !drawing.value ||
-      !boxAtStart.value ||
-      !dragStartNorm.value ||
-      !dragMode.value
-    )
-      return
-    const mN = pointerNorm(e)
-    const dx = mN.x - dragStartNorm.value.x
-    const dy = mN.y - dragStartNorm.value.y
-    const nb = applyDrag(dragMode.value, boxAtStart.value, dx, dy)
-    state.value.regions[activeIndex.value] = nb
-    requestDraw()
-  }
-
-  function onDocPointerUp(e: PointerEvent) {
-    if (!drawing.value) return
-    drawing.value = false
-    canvasEl.value?.releasePointerCapture?.(e.pointerId)
-    const b = state.value.regions[activeIndex.value]
-    if (b && (b.w < 0.005 || b.h < 0.005) && dragMode.value === 'draw') {
-      removeRegion(activeIndex.value)
-    }
-    syncState()
-  }
-
-  function onCanvasPointerMove(e: PointerEvent) {
-    if (drawing.value) onDocPointerMove(e)
-    else onPointerMove(e)
-  }
-
-  function onPointerMove(e: PointerEvent) {
-    if (drawing.value) return
-    const mN = pointerNorm(e)
-    const ti = titleAt(mN)
-    const hit = hitTestPoint(mN)
-    const hb = ti !== null ? ti : hit ? hit.index : null
-    if (ti !== hoverTagIndex.value || hb !== hoverIndex.value) {
-      hoverTagIndex.value = ti
-      hoverIndex.value = hb
-      requestDraw()
-    }
-  }
-
-  function onPointerLeave() {
-    if (hoverTagIndex.value !== null || hoverIndex.value !== null) {
-      hoverTagIndex.value = null
-      hoverIndex.value = null
-      requestDraw()
-    }
-  }
-
-  const canvasCursor = computed(() =>
-    hoverTagIndex.value !== null ? 'pointer' : 'crosshair'
-  )
-
-  function onDoubleClick(e: MouseEvent) {
-    e.preventDefault()
-    const mN = pointerNormFromMouse(e)
-    const { w: W, h: H } = logicalSize()
-    const cands = boxesAt(
-      state.value.regions,
-      mN.x,
-      mN.y,
-      HANDLE_PX,
-      W,
-      H,
-      activeIndex.value
-    )
-    const target = cands.find((c) => c.index === activeIndex.value) || cands[0]
-    if (!target) return
-    openInlineEditor(target.index)
-  }
-
-  function pointerNormFromMouse(e: MouseEvent) {
-    const el = canvasEl.value
-    if (!el) return { x: 0, y: 0 }
-    const r = el.getBoundingClientRect()
-    return {
-      x: clampToCanvas((e.clientX - r.left) / r.width),
-      y: clampToCanvas((e.clientY - r.top) / r.height)
-    }
-  }
-
-  function openInlineEditor(index: number) {
-    const b = state.value.regions[index]
-    if (!b) return
-    activeIndex.value = index
-    const { w: W, h: H } = logicalSize()
-    const w = Math.min(W, Math.max(70, b.w * W))
-    const h = Math.min(H, Math.max(42, b.h * H))
-    const left = Math.max(0, Math.min(b.x * W, W - w))
-    const top = Math.max(0, Math.min(b.y * H, H - h))
-    inlineEditor.value = {
-      value: b.desc || '',
-      index,
-      style: {
-        left: `${left}px`,
-        top: `${top}px`,
-        width: `${w}px`,
-        height: `${h}px`,
-        borderColor: (b.palette || []).find(Boolean) || '#46b4e6'
-      }
-    }
-    void nextTick(() => {
-      inlineEditorEl.value?.focus()
-      inlineEditorEl.value?.select()
-    })
-  }
-
-  function onInlineKeyDown(e: KeyboardEvent) {
-    if (e.key === 'Escape') {
-      inlineEditor.value = null
-    } else if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
-      commitInlineEditor()
-    }
-  }
-
-  function commitInlineEditor() {
-    const ed = inlineEditor.value
-    if (!ed) return
-    const b = state.value.regions[ed.index]
-    if (b) b.desc = ed.value
-    inlineEditor.value = null
-    syncState()
-  }
-
-  function onCanvasKeyDown(e: KeyboardEvent) {
-    if (drawing.value) return
-    const idx = activeIndex.value
-    if ((e.key === 'Delete' || e.key === 'Backspace') && idx >= 0) {
-      e.preventDefault()
-      e.stopPropagation()
-      removeRegion(idx)
-      syncState()
-    }
-  }
-
-  function removeRegion(i: number) {
-    state.value.regions.splice(i, 1)
-    if (!state.value.regions.length) activeIndex.value = -1
-    else if (i <= activeIndex.value)
-      activeIndex.value = Math.max(0, activeIndex.value - 1)
-  }
-
-  function setActiveType(t: 'obj' | 'text') {
-    if (activeRegion.value) {
-      activeRegion.value.type = t
-      syncState()
-    }
-  }
-
-  function clearAll() {
-    state.value.regions = []
-    activeIndex.value = -1
-    syncState()
-  }
-
-  function syncState() {
-    modelValue.value = toBoundingBoxes(
-      state.value.regions,
-      widthValue.value,
-      heightValue.value
-    )
-    requestDraw()
-  }
-
-  watch(containerWidth, () => requestDraw())
-  watch(
-    () => state.value.regions.length,
-    () => requestDraw()
-  )
-  watch(isNodeSelected, () => requestDraw())
-  watch([widthValue, heightValue], () => syncState())
-
-  const nodeOutputStore = useNodeOutputStore()
-  function applyImageDimensions(naturalWidth: number, naturalHeight: number) {
-    const node = litegraphNode.value
-    if (!node) return
-    const snap = (v: number) =>
-      Math.max(DIMENSION_STEP, Math.round(v / DIMENSION_STEP) * DIMENSION_STEP)
-    const targetW = snap(naturalWidth)
-    const targetH = snap(naturalHeight)
-    const widthWidget = node.widgets?.find((w) => w.name === 'width')
-    const heightWidget = node.widgets?.find((w) => w.name === 'height')
-    if (widthWidget && widthWidget.value !== targetW) {
-      widthWidget.value = targetW
-      widthWidget.callback?.(targetW)
-    }
-    if (heightWidget && heightWidget.value !== targetH) {
-      heightWidget.value = targetH
-      heightWidget.callback?.(targetH)
-    }
-  }
-
-  let lastBgUrl = ''
-  function updateBgImage() {
-    const node = litegraphNode.value
-    if (!node) return
-    const slot = node.findInputSlot('background')
-    const inputNode = slot >= 0 ? node.getInputNode(slot) : null
-    const url = inputNode
-      ? nodeOutputStore.getNodeImageUrls(inputNode)?.[0]
-      : undefined
-    if (!url) {
-      if (bgImage.value) {
-        bgImage.value = null
-        lastBgUrl = ''
-        requestDraw()
-      }
-      return
-    }
-    if (url === lastBgUrl) return
-    lastBgUrl = url
-    const currentUrl = url
-    const img = new Image()
-    img.crossOrigin = 'anonymous'
-    img.onload = () => {
-      if (currentUrl !== lastBgUrl) return
-      bgImage.value = img
-      applyImageDimensions(img.naturalWidth, img.naturalHeight)
-      requestDraw()
-    }
-    img.src = url
-  }
-  watch(() => nodeOutputStore.nodeOutputs, updateBgImage, { deep: true })
-  watch(() => nodeOutputStore.nodePreviewImages, updateBgImage, { deep: true })
-
-  updateBgImage()
-  void nextTick(() => requestDraw())
-
-  onBeforeUnmount(() => {
-    if (rafHandle) cancelAnimationFrame(rafHandle)
-  })
-
-  return {
-    canvasStyle,
-    canvasCursor,
-    focused,
-    activeRegion,
-    hasRegions,
-    inlineEditor,
-    maxColors: MAX_ELEMENT_COLORS,
-    onPointerDown,
-    onCanvasPointerMove,
-    onDocPointerUp,
-    onPointerLeave,
-    onDoubleClick,
-    onCanvasKeyDown,
-    onInlineKeyDown,
-    commitInlineEditor,
-    setActiveType,
-    clearAll,
-    syncState
-  }
-}

src/composables/element/useAbsolutePosition.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, Ref } from 'vue'
+import type { CSSProperties } from 'vue'
 import { ref, watch } from 'vue'
 
 import { useCanvasPositionConversion } from '@/composables/element/useCanvasPositionConversion'
@@ -15,14 +15,7 @@ export interface PositionConfig {
   scale?: number
 }
 
-interface UseAbsolutePositionReturn {
-  style: Ref<CSSProperties>
-  updatePosition: (config: PositionConfig) => void
-}
-
-export function useAbsolutePosition(
-  options: { useTransform?: boolean } = {}
-): UseAbsolutePositionReturn {
+export function useAbsolutePosition(options: { useTransform?: boolean } = {}) {
   const { useTransform = false } = options
 
   const canvasStore = useCanvasStore()

src/composables/element/useDomClipping.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, Ref } from 'vue'
+import type { CSSProperties } from 'vue'
 import { ref } from 'vue'
 
 interface Rect {
@@ -28,26 +28,7 @@ interface ClippingOptions {
   margin?: number
 }
 
-interface UseDomClippingReturn {
-  style: Ref<CSSProperties>
-  updateClipPath: (
-    element: HTMLElement,
-    canvasElement: HTMLCanvasElement,
-    isSelected: boolean,
-    selectedArea?: {
-      x: number
-      y: number
-      width: number
-      height: number
-      scale: number
-      offset: [number, number]
-    }
-  ) => void
-}
-
-export function useDomClipping(
-  options: ClippingOptions = {}
-): UseDomClippingReturn {
+export const useDomClipping = (options: ClippingOptions = {}) => {
   const style = ref<CSSProperties>({})
   const { margin = 4 } = options
 

src/composables/graph/useErrorClearingHooks.test.ts

@@ -21,7 +21,6 @@ import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import { useMissingNodesErrorStore } from '@/platform/nodeReplacement/missingNodesErrorStore'
 import { app } from '@/scripts/app'
 import { useExecutionErrorStore } from '@/stores/executionErrorStore'
-import { createNodeExecutionId } from '@/types/nodeIdentification'
 import { seedRequiredInputMissingNodeError } from '@/utils/__tests__/executionErrorTestUtils'
 import type { MissingMediaCandidate } from '@/platform/missingMedia/types'
 import type { MissingModelCandidate } from '@/platform/missingModel/types'
@@ -51,11 +50,7 @@ describe('Connection error clearing via onConnectionsChange', () => {
 
     const store = useExecutionErrorStore()
     vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
-    seedRequiredInputMissingNodeError(
-      store,
-      createNodeExecutionId([node.id]),
-      'clip'
-    )
+    seedRequiredInputMissingNodeError(store, String(node.id), 'clip')
 
     node.onConnectionsChange!(NodeSlotType.INPUT, 0, true, null, node.inputs[0])
 
@@ -67,11 +62,7 @@ describe('Connection error clearing via onConnectionsChange', () => {
     installErrorClearingHooks(graph)
 
     const store = useExecutionErrorStore()
-    seedRequiredInputMissingNodeError(
-      store,
-      createNodeExecutionId([node.id]),
-      'clip'
-    )
+    seedRequiredInputMissingNodeError(store, String(node.id), 'clip')
 
     node.onConnectionsChange!(
       NodeSlotType.INPUT,
@@ -90,11 +81,7 @@ describe('Connection error clearing via onConnectionsChange', () => {
     installErrorClearingHooks(graph)
 
     const store = useExecutionErrorStore()
-    seedRequiredInputMissingNodeError(
-      store,
-      createNodeExecutionId([node.id]),
-      'clip'
-    )
+    seedRequiredInputMissingNodeError(store, String(node.id), 'clip')
 
     node.onConnectionsChange!(
       NodeSlotType.OUTPUT,
@@ -116,11 +103,7 @@ describe('Connection error clearing via onConnectionsChange', () => {
 
     const store = useExecutionErrorStore()
     vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
-    seedRequiredInputMissingNodeError(
-      store,
-      createNodeExecutionId([node.id]),
-      'model'
-    )
+    seedRequiredInputMissingNodeError(store, String(node.id), 'model')
 
     node.onConnectionsChange!(NodeSlotType.INPUT, 0, true, null, node.inputs[0])
 
@@ -246,11 +229,7 @@ describe('Widget change error clearing via onWidgetChanged', () => {
     const store = useExecutionErrorStore()
     const mediaStore = useMissingMediaStore()
     vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
-    seedRequiredInputMissingNodeError(
-      store,
-      createNodeExecutionId([node.id]),
-      'image'
-    )
+    seedRequiredInputMissingNodeError(store, String(node.id), 'image')
     mediaStore.setMissingMedia([
       {
         nodeId: String(node.id),
@@ -300,11 +279,7 @@ describe('installErrorClearingHooks lifecycle', () => {
     // Verify the hooks actually work
     const store = useExecutionErrorStore()
     vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
-    seedRequiredInputMissingNodeError(
-      store,
-      createNodeExecutionId([lateNode.id]),
-      'value'
-    )
+    seedRequiredInputMissingNodeError(store, String(lateNode.id), 'value')
 
     lateNode.onConnectionsChange!(
       NodeSlotType.INPUT,

src/composables/graph/useErrorClearingHooks.ts

@@ -34,7 +34,6 @@ import { useNodeReplacementStore } from '@/platform/nodeReplacement/nodeReplacem
 import { getCnrIdFromNode } from '@/platform/nodeReplacement/cnrIdUtil'
 import { app } from '@/scripts/app'
 import { useExecutionErrorStore } from '@/stores/executionErrorStore'
-import { appendNodeExecutionId } from '@/types/nodeIdentification'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 import {
   collectAllNodes,
@@ -84,7 +83,7 @@ function installNodeHooks(node: LGraphNode): void {
 
       const promotedSource = widgetPromotedSource(node, widget)
       const executionId = promotedSource
-        ? appendNodeExecutionId(hostExecId, promotedSource.nodeId)
+        ? `${hostExecId}:${promotedSource.nodeId}`
         : hostExecId
       const widgetName = promotedSource?.widgetName ?? widget.name