refactor: extract model-to-node mappings into data file

Move all quickRegister() mapping data from modelToNodeStore.ts into a
separate modelNodeMappings.ts constants file. The store now iterates
over this data array instead of having 75 inline quickRegister() calls.

This makes adding new model-to-node mappings a pure data change (no
store logic touched), enabling separate CODEOWNERS for the data file.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

browser_tests/tests/resultGallery.spec.ts

@@ -0,0 +1,70 @@
+import { expect } from '@playwright/test'
+
+import type { ComfyPage } from '../fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+test.describe('MediaLightbox', { tag: ['@slow'] }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.setup()
+  })
+
+  async function runAndOpenGallery(comfyPage: ComfyPage) {
+    await comfyPage.workflow.loadWorkflow(
+      'widgets/save_image_and_animated_webp'
+    )
+    await comfyPage.vueNodes.waitForNodes()
+    await comfyPage.runButton.click()
+
+    // Wait for SaveImage node to produce output
+    const saveImageNode = comfyPage.vueNodes.getNodeByTitle('Save Image')
+    await expect(saveImageNode.locator('.image-preview img')).toBeVisible({
+      timeout: 30_000
+    })
+
+    // Open Assets sidebar tab and wait for it to load
+    await comfyPage.page.locator('.assets-tab-button').click()
+    await comfyPage.page
+      .locator('.sidebar-content-container')
+      .waitFor({ state: 'visible' })
+
+    // Wait for any asset card to appear (may contain img or video)
+    const assetCard = comfyPage.page
+      .locator('[role="button"]')
+      .filter({ has: comfyPage.page.locator('img, video') })
+      .first()
+
+    await expect(assetCard).toBeVisible({ timeout: 30_000 })
+
+    // Hover to reveal zoom button, then click it
+    await assetCard.hover()
+    await assetCard.getByLabel('Zoom in').click()
+
+    const gallery = comfyPage.page.getByRole('dialog')
+    await expect(gallery).toBeVisible()
+
+    return { gallery }
+  }
+
+  test('opens gallery and shows dialog with close button', async ({
+    comfyPage
+  }) => {
+    const { gallery } = await runAndOpenGallery(comfyPage)
+    await expect(gallery.getByLabel('Close')).toBeVisible()
+  })
+
+  test('closes gallery on Escape key', async ({ comfyPage }) => {
+    await runAndOpenGallery(comfyPage)
+
+    await comfyPage.page.keyboard.press('Escape')
+    await expect(comfyPage.page.getByRole('dialog')).not.toBeVisible()
+  })
+
+  test('closes gallery when clicking close button', async ({ comfyPage }) => {
+    const { gallery } = await runAndOpenGallery(comfyPage)
+
+    await gallery.getByLabel('Close').click()
+    await expect(comfyPage.page.getByRole('dialog')).not.toBeVisible()
+  })
+})

docs/adr/0007-node-execution-output-passthrough-schema.md

@@ -0,0 +1,71 @@
+# 7. NodeExecutionOutput Passthrough Schema Design
+
+Date: 2026-03-11
+
+## Status
+
+Accepted
+
+## Context
+
+`NodeExecutionOutput` represents the output data from a ComfyUI node execution. The backend API is intentionally open-ended: custom nodes can output any key (`gifs`, `3d`, `meshes`, `point_clouds`, etc.) alongside the well-known keys (`images`, `audio`, `video`, `animated`, `text`).
+
+The Zod schema uses `.passthrough()` to allow unknown keys through without validation:
+
+```ts
+const zOutputs = z
+  .object({
+    audio: z.array(zResultItem).optional(),
+    images: z.array(zResultItem).optional(),
+    video: z.array(zResultItem).optional(),
+    animated: z.array(z.boolean()).optional(),
+    text: z.union([z.string(), z.array(z.string())]).optional()
+  })
+  .passthrough()
+```
+
+This means unknown keys are typed as `unknown` in TypeScript, requiring runtime validation when iterating over all output entries (e.g., to build a unified media list).
+
+### Why not `.catchall(z.array(zResultItem))`?
+
+`.catchall()` correctly handles this at the Zod runtime level — explicit keys override the catchall, so `animated: [true]` parses fine even when the catchall expects `ResultItem[]`.
+
+However, TypeScript's type inference creates an index signature `[k: string]: ResultItem[]` that **conflicts** with the explicit fields `animated: boolean[]` and `text: string | string[]`. These types don't extend `ResultItem[]`, so TypeScript errors on any assignment.
+
+This is a TypeScript limitation, not a Zod or schema design issue. TypeScript cannot express "index signature applies only to keys not explicitly defined."
+
+### Why not remove `animated` and `text` from the schema?
+
+- `animated` is consumed by `isAnimatedOutput()` in `litegraphUtil.ts` and by `litegraphService.ts` to determine whether to render images as static or animated. Removing it would break typing for the graph editor path.
+- `text` is part of the `zExecutedWsMessage` validation pipeline. Removing it from `zOutputs` would cause `.catchall()` to reject `{ text: "hello" }` as invalid (it's not `ResultItem[]`).
+- Both are structurally different from media outputs — they are metadata, not file references. Mixing them in the same object is a backend API constraint we cannot change here.
+
+## Decision
+
+1. **Keep `.passthrough()`** on `zOutputs`. It correctly reflects the extensible nature of the backend API.
+
+2. **Use `resultItemType` (the Zod enum) for `type` field validation** in the shared `isResultItem` guard. We cannot use `zResultItem.safeParse()` directly because the Zod schema marks `filename` and `subfolder` as `.optional()` (matching the wire format), but a `ResultItemImpl` needs both fields to construct a valid preview URL. The shared guard requires `filename` and `subfolder` as strings while delegating `type` validation to the Zod enum.
+
+3. **Accept the `unknown[]` cast** when iterating passthrough entries. The cast is honest — passthrough values genuinely are `unknown`, and runtime validation narrows them correctly.
+
+4. **Centralize the `NodeExecutionOutput → ResultItemImpl[]` conversion** into a shared utility (`parseNodeOutput` / `parseTaskOutput` in `src/stores/resultItemParsing.ts`) to eliminate duplicated, inconsistent validation across `flattenNodeOutput.ts`, `jobOutputCache.ts`, and `queueStore.ts`.
+
+## Consequences
+
+### Positive
+
+- Single source of truth for `ResultItem` validation (shared `isResultItem` guard using Zod's `resultItemType` enum)
+- Consistent validation strictness across all code paths
+- Clear documentation of why `.passthrough()` is intentional, preventing future "fix" attempts
+- The `unknown[]` cast is contained to one location
+
+### Negative
+
+- Manual `isResultItem` guard is stricter than `zResultItem` Zod schema (requires `filename` and `subfolder`); if the Zod schema changes, the guard must be updated manually
+- The `unknown[]` cast remains necessary — cannot be eliminated without a TypeScript language change or backend API restructuring
+
+## Notes
+
+The backend API's extensible output format is a deliberate design choice for ComfyUI's plugin architecture. Custom nodes define their own output types, and the frontend must handle arbitrary keys gracefully. Any future attempt to make the schema stricter must account for this extensibility requirement.
+
+If TypeScript adds support for "rest index signatures" or "exclusive index signatures" in the future, `.catchall()` could replace `.passthrough()` and the `unknown[]` cast would be eliminated.

docs/adr/README.md

@@ -8,13 +8,15 @@ An Architecture Decision Record captures an important architectural decision mad
 
 ## ADR Index
 
-| ADR                                                 | Title                                    | Status   | Date       |
-| --------------------------------------------------- | ---------------------------------------- | -------- | ---------- |
-| [0001](0001-merge-litegraph-into-frontend.md)       | Merge LiteGraph.js into ComfyUI Frontend | Accepted | 2025-08-05 |
-| [0002](0002-monorepo-conversion.md)                 | Restructure as a Monorepo                | Accepted | 2025-08-25 |
-| [0003](0003-crdt-based-layout-system.md)            | Centralized Layout Management with CRDT  | Proposed | 2025-08-27 |
-| [0004](0004-fork-primevue-ui-library.md)            | Fork PrimeVue UI Library                 | Rejected | 2025-08-27 |
-| [0005](0005-remove-importmap-for-vue-extensions.md) | Remove Import Map for Vue Extensions     | Accepted | 2025-12-13 |
+| ADR                                                      | Title                                    | Status   | Date       |
+| -------------------------------------------------------- | ---------------------------------------- | -------- | ---------- |
+| [0001](0001-merge-litegraph-into-frontend.md)            | Merge LiteGraph.js into ComfyUI Frontend | Accepted | 2025-08-05 |
+| [0002](0002-monorepo-conversion.md)                      | Restructure as a Monorepo                | Accepted | 2025-08-25 |
+| [0003](0003-crdt-based-layout-system.md)                 | Centralized Layout Management with CRDT  | Proposed | 2025-08-27 |
+| [0004](0004-fork-primevue-ui-library.md)                 | Fork PrimeVue UI Library                 | Rejected | 2025-08-27 |
+| [0005](0005-remove-importmap-for-vue-extensions.md)      | Remove Import Map for Vue Extensions     | Accepted | 2025-12-13 |
+| [0006](0006-primitive-node-copy-paste-lifecycle.md)      | PrimitiveNode Copy/Paste Lifecycle       | Proposed | 2026-02-22 |
+| [0007](0007-node-execution-output-passthrough-schema.md) | NodeExecutionOutput Passthrough Schema   | Accepted | 2026-03-11 |
 
 ## Creating a New ADR
 

src/components/queue/QueueProgressOverlay.test.ts

@@ -60,7 +60,7 @@ const mountComponent = (
       stubs: {
         QueueOverlayExpanded: QueueOverlayExpandedStub,
         QueueOverlayActive: true,
-        ResultGallery: true
+        MediaLightbox: true
       },
       directives: {
         tooltip: () => {}

src/components/queue/QueueProgressOverlay.vue

@@ -45,7 +45,7 @@
     </div>
   </div>
 
-  <ResultGallery
+  <MediaLightbox
     v-model:active-index="galleryActiveIndex"
     :all-gallery-items="galleryItems"
   />
@@ -57,7 +57,7 @@ import { useI18n } from 'vue-i18n'
 
 import QueueOverlayActive from '@/components/queue/QueueOverlayActive.vue'
 import QueueOverlayExpanded from '@/components/queue/QueueOverlayExpanded.vue'
-import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
+import MediaLightbox from '@/components/sidebar/tabs/queue/MediaLightbox.vue'
 import { useJobList } from '@/composables/queue/useJobList'
 import type { JobListItem } from '@/composables/queue/useJobList'
 import { useQueueClearHistoryDialog } from '@/composables/queue/useQueueClearHistoryDialog'

src/components/sidebar/tabs/AssetsSidebarTab.vue

@@ -170,7 +170,7 @@
       </div>
     </template>
   </SidebarTabTemplate>
-  <ResultGallery
+  <MediaLightbox
     v-model:active-index="galleryActiveIndex"
     :all-gallery-items="galleryItems"
   />
@@ -220,7 +220,7 @@ import AssetsSidebarGridView from '@/components/sidebar/tabs/AssetsSidebarGridVi
 import AssetsSidebarListView from '@/components/sidebar/tabs/AssetsSidebarListView.vue'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
 import Skeleton from '@/components/ui/skeleton/Skeleton.vue'
-import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
+import MediaLightbox from '@/components/sidebar/tabs/queue/MediaLightbox.vue'
 import Tab from '@/components/tab/Tab.vue'
 import TabList from '@/components/tab/TabList.vue'
 import Button from '@/components/ui/button/Button.vue'

src/components/sidebar/tabs/JobHistorySidebarTab.vue

@@ -58,7 +58,7 @@
         :entries="jobMenuEntries"
         @action="onJobMenuAction"
       />
-      <ResultGallery
+      <MediaLightbox
         v-model:active-index="galleryActiveIndex"
         :all-gallery-items="galleryItems"
       />
@@ -83,7 +83,7 @@ import { useQueueClearHistoryDialog } from '@/composables/queue/useQueueClearHis
 import { useResultGallery } from '@/composables/queue/useResultGallery'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
-import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
+import MediaLightbox from '@/components/sidebar/tabs/queue/MediaLightbox.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useCommandStore } from '@/stores/commandStore'
 import { useDialogStore } from '@/stores/dialogStore'

src/components/sidebar/tabs/queue/MediaLightbox.test.ts

@@ -0,0 +1,229 @@
+import { enableAutoUnmount, mount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+enableAutoUnmount(afterEach)
+
+import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+import MediaLightbox from './MediaLightbox.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: {
+        close: 'Close',
+        gallery: 'Gallery',
+        previous: 'Previous',
+        next: 'Next'
+      }
+    }
+  }
+})
+
+type MockResultItem = Partial<ResultItemImpl> & {
+  filename: string
+  subfolder: string
+  type: string
+  nodeId: NodeId
+  mediaType: string
+  id?: string
+  url?: string
+  isImage?: boolean
+  isVideo?: boolean
+  isAudio?: boolean
+}
+
+describe('MediaLightbox', () => {
+  const mockComfyImage = {
+    name: 'ComfyImage',
+    template: '<div class="mock-comfy-image" data-testid="comfy-image"></div>',
+    props: ['src', 'contain', 'alt']
+  }
+
+  const mockResultVideo = {
+    name: 'ResultVideo',
+    template:
+      '<div class="mock-result-video" data-testid="result-video"></div>',
+    props: ['result']
+  }
+
+  const mockResultAudio = {
+    name: 'ResultAudio',
+    template:
+      '<div class="mock-result-audio" data-testid="result-audio"></div>',
+    props: ['result']
+  }
+
+  const mockGalleryItems: MockResultItem[] = [
+    {
+      filename: 'image1.jpg',
+      subfolder: 'outputs',
+      type: 'output',
+      nodeId: '123' as NodeId,
+      mediaType: 'images',
+      isImage: true,
+      isVideo: false,
+      isAudio: false,
+      url: 'image1.jpg',
+      id: '1'
+    },
+    {
+      filename: 'image2.jpg',
+      subfolder: 'outputs',
+      type: 'output',
+      nodeId: '456' as NodeId,
+      mediaType: 'images',
+      isImage: true,
+      isVideo: false,
+      isAudio: false,
+      url: 'image2.jpg',
+      id: '2'
+    },
+    {
+      filename: 'image3.jpg',
+      subfolder: 'outputs',
+      type: 'output',
+      nodeId: '789' as NodeId,
+      mediaType: 'images',
+      isImage: true,
+      isVideo: false,
+      isAudio: false,
+      url: 'image3.jpg',
+      id: '3'
+    }
+  ]
+
+  beforeEach(() => {
+    document.body.innerHTML = '<div id="app"></div>'
+  })
+
+  afterEach(() => {
+    document.body.innerHTML = ''
+    vi.restoreAllMocks()
+  })
+
+  const mountGallery = (props = {}) => {
+    return mount(MediaLightbox, {
+      global: {
+        plugins: [i18n],
+        components: {
+          ComfyImage: mockComfyImage,
+          ResultVideo: mockResultVideo,
+          ResultAudio: mockResultAudio
+        },
+        stubs: {
+          teleport: true
+        }
+      },
+      props: {
+        allGalleryItems: mockGalleryItems as ResultItemImpl[],
+        activeIndex: 0,
+        ...props
+      },
+      attachTo: document.getElementById('app') || undefined
+    })
+  }
+
+  it('renders overlay with role="dialog" and aria-modal', async () => {
+    const wrapper = mountGallery()
+    await nextTick()
+
+    const dialog = wrapper.find('[role="dialog"]')
+    expect(dialog.exists()).toBe(true)
+    expect(dialog.attributes('aria-modal')).toBe('true')
+  })
+
+  it('shows navigation buttons when multiple items', async () => {
+    const wrapper = mountGallery()
+    await nextTick()
+
+    expect(wrapper.find('[aria-label="Previous"]').exists()).toBe(true)
+    expect(wrapper.find('[aria-label="Next"]').exists()).toBe(true)
+  })
+
+  it('hides navigation buttons for single item', async () => {
+    const wrapper = mountGallery({
+      allGalleryItems: [mockGalleryItems[0]] as ResultItemImpl[]
+    })
+    await nextTick()
+
+    expect(wrapper.find('[aria-label="Previous"]').exists()).toBe(false)
+    expect(wrapper.find('[aria-label="Next"]').exists()).toBe(false)
+  })
+
+  it('shows gallery when activeIndex changes from -1', async () => {
+    const wrapper = mountGallery({ activeIndex: -1 })
+
+    expect(wrapper.find('[data-mask]').exists()).toBe(false)
+
+    await wrapper.setProps({ activeIndex: 0 })
+    await nextTick()
+
+    expect(wrapper.find('[data-mask]').exists()).toBe(true)
+  })
+
+  it('emits update:activeIndex with -1 when close button clicked', async () => {
+    const wrapper = mountGallery()
+    await nextTick()
+
+    await wrapper.find('[aria-label="Close"]').trigger('click')
+    await nextTick()
+
+    expect(wrapper.emitted('update:activeIndex')?.[0]).toEqual([-1])
+  })
+
+  describe('keyboard navigation', () => {
+    it('navigates to next item on ArrowRight', async () => {
+      const wrapper = mountGallery({ activeIndex: 0 })
+      await nextTick()
+
+      await wrapper
+        .find('[role="dialog"]')
+        .trigger('keydown', { key: 'ArrowRight' })
+      await nextTick()
+
+      expect(wrapper.emitted('update:activeIndex')?.[0]).toEqual([1])
+    })
+
+    it('navigates to previous item on ArrowLeft', async () => {
+      const wrapper = mountGallery({ activeIndex: 1 })
+      await nextTick()
+
+      await wrapper
+        .find('[role="dialog"]')
+        .trigger('keydown', { key: 'ArrowLeft' })
+      await nextTick()
+
+      expect(wrapper.emitted('update:activeIndex')?.[0]).toEqual([0])
+    })
+
+    it('wraps to last item on ArrowLeft from first', async () => {
+      const wrapper = mountGallery({ activeIndex: 0 })
+      await nextTick()
+
+      await wrapper
+        .find('[role="dialog"]')
+        .trigger('keydown', { key: 'ArrowLeft' })
+      await nextTick()
+
+      expect(wrapper.emitted('update:activeIndex')?.[0]).toEqual([2])
+    })
+
+    it('closes gallery on Escape', async () => {
+      const wrapper = mountGallery({ activeIndex: 0 })
+      await nextTick()
+
+      await wrapper
+        .find('[role="dialog"]')
+        .trigger('keydown', { key: 'Escape' })
+      await nextTick()
+
+      expect(wrapper.emitted('update:activeIndex')?.[0]).toEqual([-1])
+    })
+  })
+})

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

@@ -0,0 +1,149 @@
+<template>
+  <Teleport to="body">
+    <div
+      v-if="galleryVisible"
+      ref="dialogRef"
+      role="dialog"
+      aria-modal="true"
+      :aria-label="$t('g.gallery')"
+      tabindex="-1"
+      class="fixed inset-0 z-9999 flex items-center justify-center bg-black/90 outline-none"
+      data-mask
+      @mousedown="onMaskMouseDown"
+      @mouseup="onMaskMouseUp"
+      @keydown.stop="handleKeyDown"
+    >
+      <!-- Close Button -->
+      <Button
+        variant="secondary"
+        size="icon-lg"
+        class="absolute top-4 right-4 z-10 rounded-full"
+        :aria-label="$t('g.close')"
+        @click="close"
+      >
+        <i class="icon-[lucide--x] size-5" />
+      </Button>
+
+      <!-- Previous Button -->
+      <Button
+        v-if="hasMultiple"
+        variant="secondary"
+        size="icon-lg"
+        class="fixed top-1/2 left-4 z-10 -translate-y-1/2 rounded-full"
+        :aria-label="$t('g.previous')"
+        @click="navigateImage(-1)"
+      >
+        <i class="icon-[lucide--chevron-left] size-6" />
+      </Button>
+
+      <!-- Content -->
+      <div class="flex max-h-full max-w-full items-center justify-center">
+        <template v-if="activeItem">
+          <ComfyImage
+            v-if="activeItem.isImage"
+            :key="activeItem.url"
+            :src="activeItem.url"
+            :contain="false"
+            :alt="activeItem.filename"
+            class="size-auto max-h-[90vh] max-w-[90vw] object-contain"
+          />
+          <ResultVideo v-else-if="activeItem.isVideo" :result="activeItem" />
+          <ResultAudio v-else-if="activeItem.isAudio" :result="activeItem" />
+        </template>
+      </div>
+
+      <!-- Next Button -->
+      <Button
+        v-if="hasMultiple"
+        variant="secondary"
+        size="icon-lg"
+        class="fixed top-1/2 right-4 z-10 -translate-y-1/2 rounded-full"
+        :aria-label="$t('g.next')"
+        @click="navigateImage(1)"
+      >
+        <i class="icon-[lucide--chevron-right] size-6" />
+      </Button>
+    </div>
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import { computed, nextTick, ref, watch } from 'vue'
+
+import ComfyImage from '@/components/common/ComfyImage.vue'
+import Button from '@/components/ui/button/Button.vue'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+import ResultAudio from './ResultAudio.vue'
+import ResultVideo from './ResultVideo.vue'
+
+const emit = defineEmits<{
+  (e: 'update:activeIndex', value: number): void
+}>()
+
+const props = defineProps<{
+  allGalleryItems: ResultItemImpl[]
+  activeIndex: number
+}>()
+
+const galleryVisible = ref(false)
+const dialogRef = ref<HTMLElement>()
+let previouslyFocusedElement: HTMLElement | null = null
+const hasMultiple = computed(() => props.allGalleryItems.length > 1)
+const activeItem = computed(() => props.allGalleryItems[props.activeIndex])
+
+watch(
+  () => props.activeIndex,
+  (index) => {
+    galleryVisible.value = index !== -1
+    if (index !== -1) {
+      previouslyFocusedElement = document.activeElement as HTMLElement | null
+      void nextTick(() => dialogRef.value?.focus())
+    }
+  },
+  { immediate: true }
+)
+
+function close() {
+  galleryVisible.value = false
+  emit('update:activeIndex', -1)
+  previouslyFocusedElement?.focus()
+  previouslyFocusedElement = null
+}
+
+function navigateImage(direction: number) {
+  const newIndex =
+    (props.activeIndex + direction + props.allGalleryItems.length) %
+    props.allGalleryItems.length
+  emit('update:activeIndex', newIndex)
+}
+
+let maskMouseDownTarget: EventTarget | null = null
+
+function onMaskMouseDown(event: MouseEvent) {
+  maskMouseDownTarget = event.target
+}
+
+function onMaskMouseUp(event: MouseEvent) {
+  if (
+    maskMouseDownTarget === event.target &&
+    (event.target as HTMLElement)?.hasAttribute('data-mask')
+  ) {
+    close()
+  }
+}
+
+function handleKeyDown(event: KeyboardEvent) {
+  const actions: Record<string, () => void> = {
+    ArrowLeft: () => navigateImage(-1),
+    ArrowRight: () => navigateImage(1),
+    Escape: () => close()
+  }
+
+  const action = actions[event.key]
+  if (action) {
+    event.preventDefault()
+    action()
+  }
+}
+</script>

src/components/sidebar/tabs/queue/ResultGallery.test.ts

@@ -1,184 +0,0 @@
-import { mount } from '@vue/test-utils'
-import PrimeVue from 'primevue/config'
-import Galleria from 'primevue/galleria'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createApp, nextTick } from 'vue'
-
-import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
-import type { ResultItemImpl } from '@/stores/queueStore'
-
-import ResultGallery from './ResultGallery.vue'
-
-type MockResultItem = Partial<ResultItemImpl> & {
-  filename: string
-  subfolder: string
-  type: string
-  nodeId: NodeId
-  mediaType: string
-  id?: string
-  url?: string
-  isImage?: boolean
-  isVideo?: boolean
-}
-
-describe('ResultGallery', () => {
-  // Mock ComfyImage and ResultVideo components
-  const mockComfyImage = {
-    name: 'ComfyImage',
-    template: '<div class="mock-comfy-image" data-testid="comfy-image"></div>',
-    props: ['src', 'contain', 'alt']
-  }
-
-  const mockResultVideo = {
-    name: 'ResultVideo',
-    template:
-      '<div class="mock-result-video" data-testid="result-video"></div>',
-    props: ['result']
-  }
-
-  // Sample gallery items - using mock instances with only required properties
-  const mockGalleryItems: MockResultItem[] = [
-    {
-      filename: 'image1.jpg',
-      subfolder: 'outputs',
-      type: 'output',
-      nodeId: '123' as NodeId,
-      mediaType: 'images',
-      isImage: true,
-      isVideo: false,
-      url: 'image1.jpg',
-      id: '1'
-    },
-    {
-      filename: 'image2.jpg',
-      subfolder: 'outputs',
-      type: 'output',
-      nodeId: '456' as NodeId,
-      mediaType: 'images',
-      isImage: true,
-      isVideo: false,
-      url: 'image2.jpg',
-      id: '2'
-    }
-  ]
-
-  beforeEach(() => {
-    const app = createApp({})
-    app.use(PrimeVue)
-
-    // Create mock elements for Galleria to find
-    document.body.innerHTML = `
-      <div id="app"></div>
-    `
-  })
-
-  afterEach(() => {
-    // Clean up any elements added to body
-    document.body.innerHTML = ''
-    vi.restoreAllMocks()
-  })
-
-  const mountGallery = (props = {}) => {
-    return mount(ResultGallery, {
-      global: {
-        plugins: [PrimeVue],
-        components: {
-          Galleria,
-          ComfyImage: mockComfyImage,
-          ResultVideo: mockResultVideo
-        },
-        stubs: {
-          teleport: true
-        }
-      },
-      props: {
-        allGalleryItems: mockGalleryItems as ResultItemImpl[],
-        activeIndex: 0,
-        ...props
-      },
-      attachTo: document.getElementById('app') || undefined
-    })
-  }
-
-  it('renders Galleria component with correct props', async () => {
-    const wrapper = mountGallery()
-
-    await nextTick() // Wait for component to mount
-
-    const galleria = wrapper.findComponent(Galleria)
-    expect(galleria.exists()).toBe(true)
-    expect(galleria.props('value')).toEqual(mockGalleryItems)
-    expect(galleria.props('showIndicators')).toBe(false)
-    expect(galleria.props('showItemNavigators')).toBe(true)
-    expect(galleria.props('fullScreen')).toBe(true)
-  })
-
-  it('shows gallery when activeIndex changes from -1', async () => {
-    const wrapper = mountGallery({ activeIndex: -1 })
-
-    // Initially galleryVisible should be false
-    type GalleryVM = typeof wrapper.vm & {
-      galleryVisible: boolean
-    }
-    const vm = wrapper.vm as GalleryVM
-    expect(vm.galleryVisible).toBe(false)
-
-    // Change activeIndex
-    await wrapper.setProps({ activeIndex: 0 })
-    await nextTick()
-
-    // galleryVisible should become true
-    expect(vm.galleryVisible).toBe(true)
-  })
-
-  it('should render the component properly', () => {
-    // This is a meta-test to confirm the component mounts properly
-    const wrapper = mountGallery()
-
-    // We can't directly test the compiled CSS, but we can verify the component renders
-    expect(wrapper.exists()).toBe(true)
-
-    // Verify that the Galleria component exists and is properly mounted
-    const galleria = wrapper.findComponent(Galleria)
-    expect(galleria.exists()).toBe(true)
-  })
-
-  it('ensures correct configuration for mobile viewport', async () => {
-    // Mock window.matchMedia to simulate mobile viewport
-    Object.defineProperty(window, 'matchMedia', {
-      writable: true,
-      value: vi.fn().mockImplementation((query) => ({
-        matches: query.includes('max-width: 768px'),
-        media: query,
-        onchange: null,
-        addListener: vi.fn(),
-        removeListener: vi.fn(),
-        addEventListener: vi.fn(),
-        removeEventListener: vi.fn(),
-        dispatchEvent: vi.fn()
-      }))
-    })
-
-    const wrapper = mountGallery()
-    await nextTick()
-
-    // Verify mobile media query is working
-    expect(window.matchMedia('(max-width: 768px)').matches).toBe(true)
-
-    // Check if the component renders with Galleria
-    const galleria = wrapper.findComponent(Galleria)
-    expect(galleria.exists()).toBe(true)
-
-    // Check that our PT props for positioning work correctly
-    interface GalleriaPT {
-      prevButton?: { style?: string }
-      nextButton?: { style?: string }
-    }
-    const pt = galleria.props('pt') as GalleriaPT
-    expect(pt?.prevButton?.style).toContain('position: fixed')
-    expect(pt?.nextButton?.style).toContain('position: fixed')
-  })
-
-  // Additional tests for interaction could be added once we can reliably
-  // test Galleria component in fullscreen mode
-})

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

@@ -1,151 +0,0 @@
-<template>
-  <Galleria
-    v-model:visible="galleryVisible"
-    :active-index="activeIndex"
-    :value="allGalleryItems"
-    :show-indicators="false"
-    change-item-on-indicator-hover
-    :show-item-navigators="hasMultiple"
-    full-screen
-    :circular="hasMultiple"
-    :show-thumbnails="false"
-    :pt="{
-      mask: {
-        onMousedown: onMaskMouseDown,
-        onMouseup: onMaskMouseUp,
-        'data-mask': true
-      },
-      prevButton: {
-        style: 'position: fixed !important'
-      },
-      nextButton: {
-        style: 'position: fixed !important'
-      }
-    }"
-    @update:visible="handleVisibilityChange"
-    @update:active-index="handleActiveIndexChange"
-  >
-    <template #item="{ item }">
-      <ComfyImage
-        v-if="item.isImage"
-        :key="item.url"
-        :src="item.url"
-        :contain="false"
-        :alt="item.filename"
-        class="size-auto max-h-[90vh] max-w-[90vw] object-contain"
-      />
-      <ResultVideo v-else-if="item.isVideo" :result="item" />
-      <ResultAudio v-else-if="item.isAudio" :result="item" />
-    </template>
-  </Galleria>
-</template>
-
-<script setup lang="ts">
-import Galleria from 'primevue/galleria'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
-
-import ComfyImage from '@/components/common/ComfyImage.vue'
-import type { ResultItemImpl } from '@/stores/queueStore'
-
-import ResultAudio from './ResultAudio.vue'
-import ResultVideo from './ResultVideo.vue'
-
-const galleryVisible = ref(false)
-
-const emit = defineEmits<{
-  (e: 'update:activeIndex', value: number): void
-}>()
-
-const props = defineProps<{
-  allGalleryItems: ResultItemImpl[]
-  activeIndex: number
-}>()
-
-const hasMultiple = computed(() => props.allGalleryItems.length > 1)
-
-let maskMouseDownTarget: EventTarget | null = null
-
-const onMaskMouseDown = (event: MouseEvent) => {
-  maskMouseDownTarget = event.target
-}
-
-const onMaskMouseUp = (event: MouseEvent) => {
-  const maskEl = document.querySelector('[data-mask]')
-  if (
-    galleryVisible.value &&
-    maskMouseDownTarget === event.target &&
-    maskMouseDownTarget === maskEl
-  ) {
-    galleryVisible.value = false
-    handleVisibilityChange(false)
-  }
-}
-
-watch(
-  () => props.activeIndex,
-  (index) => {
-    if (index !== -1) {
-      galleryVisible.value = true
-    }
-  }
-)
-
-const handleVisibilityChange = (visible: boolean) => {
-  if (!visible) {
-    emit('update:activeIndex', -1)
-  }
-}
-
-const handleActiveIndexChange = (index: number) => {
-  emit('update:activeIndex', index)
-}
-
-const handleKeyDown = (event: KeyboardEvent) => {
-  if (!galleryVisible.value) return
-
-  switch (event.key) {
-    case 'ArrowLeft':
-      navigateImage(-1)
-      break
-    case 'ArrowRight':
-      navigateImage(1)
-      break
-    case 'Escape':
-      galleryVisible.value = false
-      handleVisibilityChange(false)
-      break
-  }
-}
-
-const navigateImage = (direction: number) => {
-  const newIndex =
-    (props.activeIndex + direction + props.allGalleryItems.length) %
-    props.allGalleryItems.length
-  emit('update:activeIndex', newIndex)
-}
-
-onMounted(() => {
-  window.addEventListener('keydown', handleKeyDown)
-})
-
-onUnmounted(() => {
-  window.removeEventListener('keydown', handleKeyDown)
-})
-</script>
-
-<style>
-/* PrimeVue's galleria teleports the fullscreen gallery out of subtree so we
-cannot use scoped style here. */
-.p-galleria-close-button {
-  /* Set z-index so the close button doesn't get hidden behind the image when image is large */
-  z-index: 1;
-}
-
-/* Mobile/tablet specific fixes */
-@media screen and (max-width: 768px) {
-  .p-galleria-prev-button,
-  .p-galleria-next-button {
-    z-index: 2;
-  }
-}
-</style>

src/components/ui/button/button.variants.ts

@@ -28,8 +28,9 @@ export const buttonVariants = cva({
       sm: 'h-6 rounded-sm px-2 py-1 text-xs',
       md: 'h-8 rounded-lg p-2 text-xs',
       lg: 'h-10 rounded-lg px-4 py-2 text-sm',
-      icon: 'size-8',
       'icon-sm': 'size-5 p-0',
+      icon: 'size-8',
+      'icon-lg': 'size-10',
       unset: ''
     }
   },
@@ -54,8 +55,13 @@ const variants = [
   'overlay-white',
   'gradient'
 ] as const satisfies Array<ButtonVariants['variant']>
-const sizes = ['sm', 'md', 'lg', 'icon', 'icon-sm'] as const satisfies Array<
-  ButtonVariants['size']
->
+const sizes = [
+  'sm',
+  'md',
+  'lg',
+  'icon-sm',
+  'icon',
+  'icon-lg'
+] as const satisfies Array<ButtonVariants['size']>
 
 export const FOR_STORIES = { variants, sizes } as const

src/locales/en/main.json

@@ -136,9 +136,11 @@
     "enableOrDisablePack": "Enable or disable pack",
     "openManager": "Open Manager",
     "manageExtensions": "Manage extensions",
+    "gallery": "Gallery",
     "graphNavigation": "Graph navigation",
     "dropYourFileOr": "Drop your file or",
     "back": "Back",
+    "previous": "Previous",
     "next": "Next",
     "submit": "Submit",
     "install": "Install",

src/platform/assets/components/MediaAssetCard.stories.ts

@@ -1,6 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
+import MediaLightbox from '@/components/sidebar/tabs/queue/MediaLightbox.vue'
+import { getMediaTypeFromFilename } from '@/utils/formatUtil'
 
 import { useMediaAssetGalleryStore } from '../composables/useMediaAssetGalleryStore'
 import type { AssetItem } from '../schemas/assetSchema'
@@ -10,16 +11,27 @@ const meta: Meta<typeof MediaAssetCard> = {
   title: 'Platform/Assets/MediaAssetCard',
   component: MediaAssetCard,
   decorators: [
-    () => ({
-      components: { ResultGallery },
+    (_story, context) => ({
+      components: { MediaLightbox },
       setup() {
         const galleryStore = useMediaAssetGalleryStore()
+        const args = context.args as {
+          onZoom?: (asset: AssetItem) => void
+        }
+        args.onZoom = (asset: AssetItem) => {
+          const kind = getMediaTypeFromFilename(asset.name)
+          galleryStore.openSingle({
+            ...asset,
+            kind,
+            src: asset.preview_url || ''
+          })
+        }
         return { galleryStore }
       },
       template: `
         <div>
           <story />
-          <ResultGallery 
+          <MediaLightbox
             v-model:active-index="galleryStore.activeIndex"
             :all-gallery-items="galleryStore.items"
           />

src/platform/assets/components/MediaLightbox.stories.ts

@@ -0,0 +1,134 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { ref } from 'vue'
+
+import MediaLightbox from '@/components/sidebar/tabs/queue/MediaLightbox.vue'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+type MockItem = Pick<
+  ResultItemImpl,
+  'filename' | 'url' | 'isImage' | 'isVideo' | 'isAudio'
+>
+
+const SAMPLE_IMAGES: MockItem[] = [
+  {
+    filename: 'landscape.jpg',
+    url: 'https://i.imgur.com/OB0y6MR.jpg',
+    isImage: true,
+    isVideo: false,
+    isAudio: false
+  },
+  {
+    filename: 'portrait.jpg',
+    url: 'https://i.imgur.com/CzXTtJV.jpg',
+    isImage: true,
+    isVideo: false,
+    isAudio: false
+  },
+  {
+    filename: 'nature.jpg',
+    url: 'https://farm9.staticflickr.com/8505/8441256181_4e98d8bff5_z_d.jpg',
+    isImage: true,
+    isVideo: false,
+    isAudio: false
+  }
+]
+
+const meta: Meta<typeof MediaLightbox> = {
+  title: 'Platform/Assets/MediaLightbox',
+  component: MediaLightbox
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const MultipleImages: Story = {
+  render: () => ({
+    components: { MediaLightbox },
+    setup() {
+      const activeIndex = ref(0)
+      const items = SAMPLE_IMAGES as ResultItemImpl[]
+      return { activeIndex, items }
+    },
+    template: `
+      <div>
+        <p class="mb-4 text-sm text-muted-foreground">
+          Use arrow keys to navigate, Escape to close. Click backdrop to close.
+        </p>
+        <div class="flex gap-2">
+          <button
+            v-for="(item, i) in items"
+            :key="i"
+            class="rounded border px-3 py-1 text-sm"
+            @click="activeIndex = i"
+          >
+            Open {{ item.filename }}
+          </button>
+        </div>
+        <MediaLightbox
+          v-model:active-index="activeIndex"
+          :all-gallery-items="items"
+        />
+      </div>
+    `
+  })
+}
+
+export const SingleImage: Story = {
+  render: () => ({
+    components: { MediaLightbox },
+    setup() {
+      const activeIndex = ref(-1)
+      const items = [SAMPLE_IMAGES[0]] as ResultItemImpl[]
+      return { activeIndex, items }
+    },
+    template: `
+      <div>
+        <p class="mb-4 text-sm text-muted-foreground">
+          Single image — no navigation buttons shown.
+        </p>
+        <button
+          class="rounded border px-3 py-1 text-sm"
+          @click="activeIndex = 0"
+        >
+          Open lightbox
+        </button>
+        <MediaLightbox
+          v-model:active-index="activeIndex"
+          :all-gallery-items="items"
+        />
+      </div>
+    `
+  })
+}
+
+export const Closed: Story = {
+  render: () => ({
+    components: { MediaLightbox },
+    setup() {
+      const activeIndex = ref(-1)
+      const items = SAMPLE_IMAGES as ResultItemImpl[]
+      return { activeIndex, items }
+    },
+    template: `
+      <div>
+        <p class="mb-4 text-sm text-muted-foreground">
+          Lightbox is closed (activeIndex = -1). Click a button to open.
+        </p>
+        <div class="flex gap-2">
+          <button
+            v-for="(item, i) in items"
+            :key="i"
+            class="rounded border px-3 py-1 text-sm"
+            @click="activeIndex = i"
+          >
+            {{ item.filename }}
+          </button>
+        </div>
+        <MediaLightbox
+          v-model:active-index="activeIndex"
+          :all-gallery-items="items"
+        />
+      </div>
+    `
+  })
+}

src/renderer/extensions/linearMode/Preview3d.test.ts

@@ -0,0 +1,127 @@
+import { mount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+const initializeStandaloneViewer = vi.fn()
+const cleanup = vi.fn()
+
+vi.mock('@/composables/useLoad3dViewer', () => ({
+  useLoad3dViewer: () => ({
+    initializeStandaloneViewer,
+    cleanup,
+    handleMouseEnter: vi.fn(),
+    handleMouseLeave: vi.fn(),
+    handleResize: vi.fn(),
+    handleBackgroundImageUpdate: vi.fn(),
+    exportModel: vi.fn(),
+    handleSeek: vi.fn(),
+    isSplatModel: false,
+    isPlyModel: false,
+    hasSkeleton: false,
+    animations: [],
+    playing: false,
+    selectedSpeed: 1,
+    selectedAnimation: 0,
+    animationProgress: 0,
+    animationDuration: 0
+  })
+}))
+
+vi.mock('@/components/load3d/Load3DControls.vue', () => ({
+  default: { template: '<div />' }
+}))
+
+vi.mock('@/components/load3d/controls/AnimationControls.vue', () => ({
+  default: { template: '<div />' }
+}))
+
+describe('Preview3d', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  async function mountPreview3d(
+    modelUrl = 'http://localhost/view?filename=model.glb'
+  ) {
+    const wrapper = mount(
+      (await import('@/renderer/extensions/linearMode/Preview3d.vue')).default,
+      { props: { modelUrl } }
+    )
+    await nextTick()
+    await nextTick()
+    return wrapper
+  }
+
+  it('initializes the viewer on mount', async () => {
+    const wrapper = await mountPreview3d()
+
+    expect(initializeStandaloneViewer).toHaveBeenCalledOnce()
+    expect(initializeStandaloneViewer).toHaveBeenCalledWith(
+      expect.any(HTMLElement),
+      'http://localhost/view?filename=model.glb'
+    )
+
+    wrapper.unmount()
+  })
+
+  it('cleans up the viewer on unmount', async () => {
+    const wrapper = await mountPreview3d()
+    cleanup.mockClear()
+
+    wrapper.unmount()
+
+    expect(cleanup).toHaveBeenCalledOnce()
+  })
+
+  it('reinitializes correctly after unmount and remount', async () => {
+    const url = 'http://localhost/view?filename=model.glb'
+
+    const wrapper1 = await mountPreview3d(url)
+    expect(initializeStandaloneViewer).toHaveBeenCalledTimes(1)
+
+    cleanup.mockClear()
+    wrapper1.unmount()
+    expect(cleanup).toHaveBeenCalledOnce()
+
+    vi.clearAllMocks()
+
+    const wrapper2 = await mountPreview3d(url)
+    expect(initializeStandaloneViewer).toHaveBeenCalledTimes(1)
+    expect(initializeStandaloneViewer).toHaveBeenCalledWith(
+      expect.any(HTMLElement),
+      url
+    )
+
+    cleanup.mockClear()
+    wrapper2.unmount()
+    expect(cleanup).toHaveBeenCalledOnce()
+  })
+
+  it('reinitializes when modelUrl changes on existing instance', async () => {
+    const wrapper = await mountPreview3d(
+      'http://localhost/view?filename=model-a.glb'
+    )
+    expect(initializeStandaloneViewer).toHaveBeenCalledOnce()
+
+    vi.clearAllMocks()
+
+    await wrapper.setProps({
+      modelUrl: 'http://localhost/view?filename=model-b.glb'
+    })
+    await nextTick()
+    await nextTick()
+
+    expect(cleanup).toHaveBeenCalledOnce()
+    expect(initializeStandaloneViewer).toHaveBeenCalledOnce()
+    expect(initializeStandaloneViewer).toHaveBeenCalledWith(
+      expect.any(HTMLElement),
+      'http://localhost/view?filename=model-b.glb'
+    )
+
+    wrapper.unmount()
+  })
+})

src/renderer/extensions/linearMode/Preview3d.vue

@@ -13,11 +13,16 @@ const containerRef = useTemplateRef('containerRef')
 
 const viewer = ref(useLoad3dViewer())
 
-watch([containerRef, () => modelUrl], async () => {
-  if (!containerRef.value || !modelUrl) return
+watch(
+  [containerRef, () => modelUrl],
+  async () => {
+    if (!containerRef.value || !modelUrl) return
 
-  await viewer.value.initializeStandaloneViewer(containerRef.value, modelUrl)
-})
+    viewer.value.cleanup()
+    await viewer.value.initializeStandaloneViewer(containerRef.value, modelUrl)
+  },
+  { flush: 'post' }
+)
 
 onUnmounted(() => {
   viewer.value.cleanup()

src/renderer/extensions/linearMode/flattenNodeOutput.test.ts

@@ -82,4 +82,71 @@ describe(flattenNodeOutput, () => {
     const result = flattenNodeOutput(['1', output])
     expect(result).toEqual([])
   })
+
+  it('flattens non-standard output keys with ResultItem-like values', () => {
+    const output = makeOutput({
+      a_images: [{ filename: 'before.png', subfolder: '', type: 'output' }],
+      b_images: [{ filename: 'after.png', subfolder: '', type: 'output' }]
+    } as unknown as Partial<NodeExecutionOutput>)
+
+    const result = flattenNodeOutput(['10', output])
+
+    expect(result).toHaveLength(2)
+    expect(result.map((r) => r.filename)).toContain('before.png')
+    expect(result.map((r) => r.filename)).toContain('after.png')
+  })
+
+  it('excludes animated key', () => {
+    const output = makeOutput({
+      images: [{ filename: 'img.png', subfolder: '', type: 'output' }],
+      animated: [true]
+    })
+
+    const result = flattenNodeOutput(['1', output])
+
+    expect(result).toHaveLength(1)
+    expect(result[0].mediaType).toBe('images')
+  })
+
+  it('excludes non-ResultItem array items', () => {
+    const output = {
+      images: [{ filename: 'img.png', subfolder: '', type: 'output' }],
+      custom_data: [{ randomKey: 123 }]
+    } as unknown as NodeExecutionOutput
+
+    const result = flattenNodeOutput(['1', output])
+
+    expect(result).toHaveLength(1)
+    expect(result[0].mediaType).toBe('images')
+  })
+
+  it('accepts items with filename but no subfolder', () => {
+    const output = {
+      images: [
+        { filename: 'valid.png', subfolder: '', type: 'output' },
+        { filename: 'no-subfolder.png' }
+      ]
+    } as unknown as NodeExecutionOutput
+
+    const result = flattenNodeOutput(['1', output])
+
+    expect(result).toHaveLength(2)
+    expect(result[0].filename).toBe('valid.png')
+    expect(result[1].filename).toBe('no-subfolder.png')
+    expect(result[1].subfolder).toBe('')
+  })
+
+  it('excludes items missing filename', () => {
+    const output = {
+      images: [
+        { filename: 'valid.png', subfolder: '', type: 'output' },
+        { subfolder: '', type: 'output' }
+      ]
+    } as unknown as NodeExecutionOutput
+
+    const result = flattenNodeOutput(['1', output])
+
+    expect(result).toHaveLength(1)
+    expect(result[0].filename).toBe('valid.png')
+  })
 })

src/renderer/extensions/linearMode/flattenNodeOutput.ts

@@ -1,20 +1,10 @@
-import type { NodeExecutionOutput, ResultItem } from '@/schemas/apiSchema'
-import { ResultItemImpl } from '@/stores/queueStore'
+import type { NodeExecutionOutput } from '@/schemas/apiSchema'
+import { parseNodeOutput } from '@/stores/resultItemParsing'
+import type { ResultItemImpl } from '@/stores/queueStore'
 
 export function flattenNodeOutput([nodeId, nodeOutput]: [
   string | number,
   NodeExecutionOutput
 ]): ResultItemImpl[] {
-  const knownOutputs: Record<string, ResultItem[]> = {}
-  if (nodeOutput.audio) knownOutputs.audio = nodeOutput.audio
-  if (nodeOutput.images) knownOutputs.images = nodeOutput.images
-  if (nodeOutput.video) knownOutputs.video = nodeOutput.video
-  if (nodeOutput.gifs) knownOutputs.gifs = nodeOutput.gifs as ResultItem[]
-  if (nodeOutput['3d']) knownOutputs['3d'] = nodeOutput['3d'] as ResultItem[]
-
-  return Object.entries(knownOutputs).flatMap(([mediaType, outputs]) =>
-    outputs.map(
-      (output) => new ResultItemImpl({ ...output, mediaType, nodeId })
-    )
-  )
+  return parseNodeOutput(nodeId, nodeOutput)
 }

src/schemas/apiSchema.ts

@@ -23,6 +23,8 @@ const zResultItem = z.object({
   display_name: z.string().optional()
 })
 export type ResultItem = z.infer<typeof zResultItem>
+// Uses .passthrough() because custom nodes can output arbitrary keys.
+// See docs/adr/0007-node-execution-output-passthrough-schema.md
 const zOutputs = z
   .object({
     audio: z.array(zResultItem).optional(),

src/services/jobOutputCache.ts

@@ -11,11 +11,11 @@ import QuickLRU from '@alloc/quick-lru'
 import type { JobDetail } from '@/platform/remote/comfyui/jobs/jobTypes'
 import { extractWorkflow } from '@/platform/remote/comfyui/jobs/fetchJobs'
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
-import { resultItemType } from '@/schemas/apiSchema'
-import type { ResultItem, TaskOutput } from '@/schemas/apiSchema'
+import type { TaskOutput } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { ResultItemImpl } from '@/stores/queueStore'
 import type { TaskItemImpl } from '@/stores/queueStore'
+import { parseTaskOutput } from '@/stores/resultItemParsing'
 
 const MAX_TASK_CACHE_SIZE = 50
 const MAX_JOB_DETAIL_CACHE_SIZE = 50
@@ -79,65 +79,7 @@ export async function getOutputsForTask(
 
 function getPreviewableOutputs(outputs?: TaskOutput): ResultItemImpl[] {
   if (!outputs) return []
-  const resultItems = Object.entries(outputs).flatMap(([nodeId, nodeOutputs]) =>
-    Object.entries(nodeOutputs)
-      .filter(([mediaType, _]) => mediaType !== 'animated')
-      .flatMap(([mediaType, items]) => {
-        if (!Array.isArray(items)) {
-          return []
-        }
-
-        return items.filter(isResultItemLike).map(
-          (item) =>
-            new ResultItemImpl({
-              ...item,
-              nodeId,
-              mediaType
-            })
-        )
-      })
-  )
-
-  return ResultItemImpl.filterPreviewable(resultItems)
-}
-
-function isResultItemLike(item: unknown): item is ResultItem {
-  if (!item || typeof item !== 'object' || Array.isArray(item)) {
-    return false
-  }
-
-  const candidate = item as Record<string, unknown>
-
-  if (
-    candidate.filename !== undefined &&
-    typeof candidate.filename !== 'string'
-  ) {
-    return false
-  }
-
-  if (
-    candidate.subfolder !== undefined &&
-    typeof candidate.subfolder !== 'string'
-  ) {
-    return false
-  }
-
-  if (
-    candidate.type !== undefined &&
-    !resultItemType.safeParse(candidate.type).success
-  ) {
-    return false
-  }
-
-  if (
-    candidate.filename === undefined &&
-    candidate.subfolder === undefined &&
-    candidate.type === undefined
-  ) {
-    return false
-  }
-
-  return true
+  return ResultItemImpl.filterPreviewable(parseTaskOutput(outputs))
 }
 
 export function getPreviewableOutputsFromJobDetail(

src/stores/modelNodeMappings.ts

@@ -0,0 +1,174 @@
+/**
+ * Default mappings from model directories to loader nodes.
+ *
+ * Each entry maps a model folder (as it appears in the model browser)
+ * to the node class that loads models from that folder and the
+ * input key where the model name is inserted.
+ *
+ * An empty key ('') means the node auto-loads models without a widget
+ * selector (createModelNodeFromAsset skips widget assignment).
+ *
+ * Hierarchical fallback is handled by the store: "a/b/c" tries
+ * "a/b/c" → "a/b" → "a", so registering a parent directory covers
+ * all its children unless a more specific entry exists.
+ *
+ * Format: [modelDirectory, nodeClass, inputKey]
+ */
+export const MODEL_NODE_MAPPINGS: ReadonlyArray<
+  readonly [string, string, string]
+> = [
+  // ---- ComfyUI core loaders ----
+  ['checkpoints', 'CheckpointLoaderSimple', 'ckpt_name'],
+  ['checkpoints', 'ImageOnlyCheckpointLoader', 'ckpt_name'],
+  ['loras', 'LoraLoader', 'lora_name'],
+  ['loras', 'LoraLoaderModelOnly', 'lora_name'],
+  ['vae', 'VAELoader', 'vae_name'],
+  ['controlnet', 'ControlNetLoader', 'control_net_name'],
+  ['diffusion_models', 'UNETLoader', 'unet_name'],
+  ['upscale_models', 'UpscaleModelLoader', 'model_name'],
+  ['style_models', 'StyleModelLoader', 'style_model_name'],
+  ['gligen', 'GLIGENLoader', 'gligen_name'],
+  ['clip_vision', 'CLIPVisionLoader', 'clip_name'],
+  ['text_encoders', 'CLIPLoader', 'clip_name'],
+  ['audio_encoders', 'AudioEncoderLoader', 'audio_encoder_name'],
+  ['model_patches', 'ModelPatchLoader', 'name'],
+  ['latent_upscale_models', 'LatentUpscaleModelLoader', 'model_name'],
+  ['clip', 'CLIPVisionLoader', 'clip_name'],
+
+  // ---- AnimateDiff (comfyui-animatediff-evolved) ----
+  ['animatediff_models', 'ADE_LoadAnimateDiffModel', 'model_name'],
+  ['animatediff_motion_lora', 'ADE_AnimateDiffLoRALoader', 'name'],
+
+  // ---- Chatterbox TTS (ComfyUI-Fill-Nodes) ----
+  ['chatterbox/chatterbox', 'FL_ChatterboxTTS', ''],
+  ['chatterbox/chatterbox_turbo', 'FL_ChatterboxTurboTTS', ''],
+  ['chatterbox/chatterbox_multilingual', 'FL_ChatterboxMultilingualTTS', ''],
+  ['chatterbox/chatterbox_vc', 'FL_ChatterboxVC', ''],
+
+  // ---- SAM / SAM2 (comfyui-segment-anything-2, comfyui-impact-pack) ----
+  ['sam2', 'DownloadAndLoadSAM2Model', 'model'],
+  ['sams', 'SAMLoader', 'model_name'],
+
+  // ---- SAM3 3D segmentation (comfyui-sam3) ----
+  ['sam3', 'LoadSAM3Model', 'model_path'],
+
+  // ---- Ultralytics detection (comfyui-impact-subpack) ----
+  ['ultralytics', 'UltralyticsDetectorProvider', 'model_name'],
+
+  // ---- DepthAnything (comfyui-depthanythingv2, comfyui-depthanythingv3) ----
+  ['depthanything', 'DownloadAndLoadDepthAnythingV2Model', 'model'],
+  ['depthanything3', 'DownloadAndLoadDepthAnythingV3Model', 'model'],
+
+  // ---- IP-Adapter (comfyui_ipadapter_plus) ----
+  ['ipadapter', 'IPAdapterModelLoader', 'ipadapter_file'],
+
+  // ---- Segformer (comfyui_layerstyle) ----
+  ['segformer_b2_clothes', 'LS_LoadSegformerModel', 'model_name'],
+  ['segformer_b3_clothes', 'LS_LoadSegformerModel', 'model_name'],
+  ['segformer_b3_fashion', 'LS_LoadSegformerModel', 'model_name'],
+
+  // ---- NLF pose estimation (ComfyUI-WanVideoWrapper) ----
+  ['nlf', 'LoadNLFModel', 'nlf_model'],
+
+  // ---- FlashVSR video super-resolution (ComfyUI-FlashVSR_Ultra_Fast) ----
+  ['FlashVSR', 'FlashVSRNode', ''],
+  ['FlashVSR-v1.1', 'FlashVSRNode', ''],
+
+  // ---- SEEDVR2 video upscaling (comfyui-seedvr2) ----
+  ['SEEDVR2', 'SeedVR2LoadDiTModel', 'model'],
+
+  // ---- Qwen VL vision-language (comfyui-qwen-vl) ----
+  ['LLM/Qwen-VL/Qwen2.5-VL-3B-Instruct', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen2.5-VL-7B-Instruct', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-VL-2B-Instruct', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-VL-2B-Thinking', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-VL-4B-Instruct', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-VL-4B-Thinking', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-VL-8B-Instruct', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-VL-8B-Thinking', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-VL-32B-Instruct', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-VL-32B-Thinking', 'AILab_QwenVL', 'model_name'],
+  ['LLM/Qwen-VL/Qwen3-0.6B', 'AILab_QwenVL_PromptEnhancer', 'model_name'],
+  [
+    'LLM/Qwen-VL/Qwen3-4B-Instruct-2507',
+    'AILab_QwenVL_PromptEnhancer',
+    'model_name'
+  ],
+  ['LLM/checkpoints', 'LoadChatGLM3', 'chatglm3_checkpoint'],
+
+  // ---- Qwen3 TTS (ComfyUI-FunBox) ----
+  ['qwen-tts', 'FB_Qwen3TTSVoiceClone', 'model_choice'],
+
+  // ---- LivePortrait (comfyui-liveportrait) ----
+  ['liveportrait', 'DownloadAndLoadLivePortraitModels', ''],
+
+  // ---- MimicMotion (ComfyUI-MimicMotionWrapper) ----
+  ['mimicmotion', 'DownloadAndLoadMimicMotionModel', 'model'],
+  ['dwpose', 'MimicMotionGetPoses', ''],
+
+  // ---- Face parsing (comfyui_face_parsing) ----
+  ['face_parsing', 'FaceParsingModelLoader(FaceParsing)', ''],
+
+  // ---- Kolors (ComfyUI-KolorsWrapper) ----
+  ['diffusers', 'DownloadAndLoadKolorsModel', 'model'],
+
+  // ---- RIFE video frame interpolation (ComfyUI-RIFE) ----
+  ['rife', 'RIFE VFI', 'ckpt_name'],
+
+  // ---- UltraShape 3D model generation ----
+  ['UltraShape', 'UltraShapeLoadModel', 'checkpoint'],
+
+  // ---- SHaRP depth estimation ----
+  ['sharp', 'LoadSharpModel', 'checkpoint_path'],
+
+  // ---- ONNX upscale models ----
+  ['onnx', 'UpscaleModelLoader', 'model_name'],
+
+  // ---- Detection models (vitpose, yolo) ----
+  ['detection', 'OnnxDetectionModelLoader', 'yolo_model'],
+
+  // ---- HunyuanVideo text encoders (ComfyUI-HunyuanVideoWrapper) ----
+  [
+    'LLM/llava-llama-3-8b-text-encoder-tokenizer',
+    'DownloadAndLoadHyVideoTextEncoder',
+    'llm_model'
+  ],
+  [
+    'LLM/llava-llama-3-8b-v1_1-transformers',
+    'DownloadAndLoadHyVideoTextEncoder',
+    'llm_model'
+  ],
+
+  // ---- CogVideoX (comfyui-cogvideoxwrapper) ----
+  ['CogVideo', 'DownloadAndLoadCogVideoModel', 'model'],
+  ['CogVideo/GGUF', 'DownloadAndLoadCogVideoGGUFModel', 'model'],
+  ['CogVideo/ControlNet', 'DownloadAndLoadCogVideoControlNet', 'model'],
+
+  // ---- DynamiCrafter (ComfyUI-DynamiCrafterWrapper) ----
+  ['checkpoints/dynamicrafter', 'DownloadAndLoadDynamiCrafterModel', 'model'],
+  [
+    'checkpoints/dynamicrafter/controlnet',
+    'DownloadAndLoadDynamiCrafterCNModel',
+    'model'
+  ],
+
+  // ---- LayerStyle (ComfyUI_LayerStyle_Advance) ----
+  ['BEN', 'LS_LoadBenModel', 'model'],
+  ['BiRefNet/pth', 'LS_LoadBiRefNetModel', 'model'],
+  ['onnx/human-parts', 'LS_HumanPartsUltra', ''],
+  ['lama', 'LaMa', 'lama_model'],
+
+  // ---- Inpaint (comfyui-inpaint-nodes) ----
+  ['inpaint', 'INPAINT_LoadInpaintModel', 'model_name'],
+
+  // ---- LayerDiffuse (comfyui-layerdiffuse) ----
+  ['layer_model', 'LayeredDiffusionApply', 'config'],
+
+  // ---- LTX Video prompt enhancer (ComfyUI-LTXTricks) ----
+  ['LLM/Llama-3.2-3B-Instruct', 'LTXVPromptEnhancerLoader', 'llm_name'],
+  [
+    'LLM/Florence-2-large-PromptGen-v2.0',
+    'LTXVPromptEnhancerLoader',
+    'image_captioner_name'
+  ]
+]

src/stores/modelToNodeStore.ts

@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
+import { MODEL_NODE_MAPPINGS } from '@/stores/modelNodeMappings'
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 
@@ -159,240 +160,9 @@ export const useModelToNodeStore = defineStore('modelToNode', () => {
     }
     haveDefaultsLoaded.value = true
 
-    quickRegister('checkpoints', 'CheckpointLoaderSimple', 'ckpt_name')
-    quickRegister('checkpoints', 'ImageOnlyCheckpointLoader', 'ckpt_name')
-    quickRegister('loras', 'LoraLoader', 'lora_name')
-    quickRegister('loras', 'LoraLoaderModelOnly', 'lora_name')
-    quickRegister('vae', 'VAELoader', 'vae_name')
-    quickRegister('controlnet', 'ControlNetLoader', 'control_net_name')
-    quickRegister('diffusion_models', 'UNETLoader', 'unet_name')
-    quickRegister('upscale_models', 'UpscaleModelLoader', 'model_name')
-    quickRegister('style_models', 'StyleModelLoader', 'style_model_name')
-    quickRegister('gligen', 'GLIGENLoader', 'gligen_name')
-    quickRegister('clip_vision', 'CLIPVisionLoader', 'clip_name')
-    quickRegister('text_encoders', 'CLIPLoader', 'clip_name')
-    quickRegister('audio_encoders', 'AudioEncoderLoader', 'audio_encoder_name')
-    quickRegister('model_patches', 'ModelPatchLoader', 'name')
-    quickRegister(
-      'animatediff_models',
-      'ADE_LoadAnimateDiffModel',
-      'model_name'
-    )
-    quickRegister(
-      'animatediff_motion_lora',
-      'ADE_AnimateDiffLoRALoader',
-      'name'
-    )
-
-    // Chatterbox TTS nodes: empty key means the node auto-loads models without
-    // a widget selector (createModelNodeFromAsset skips widget assignment)
-    quickRegister('chatterbox/chatterbox', 'FL_ChatterboxTTS', '')
-    quickRegister('chatterbox/chatterbox_turbo', 'FL_ChatterboxTurboTTS', '')
-    quickRegister(
-      'chatterbox/chatterbox_multilingual',
-      'FL_ChatterboxMultilingualTTS',
-      ''
-    )
-    quickRegister('chatterbox/chatterbox_vc', 'FL_ChatterboxVC', '')
-
-    // Latent upscale models (ComfyUI core - nodes_hunyuan.py)
-    quickRegister(
-      'latent_upscale_models',
-      'LatentUpscaleModelLoader',
-      'model_name'
-    )
-
-    // SAM/SAM2 segmentation models (comfyui-segment-anything-2, comfyui-impact-pack)
-    quickRegister('sam2', 'DownloadAndLoadSAM2Model', 'model')
-    quickRegister('sams', 'SAMLoader', 'model_name')
-
-    // Ultralytics detection models (comfyui-impact-subpack)
-    // Note: ultralytics/bbox and ultralytics/segm fall back to this via hierarchical lookup
-    quickRegister('ultralytics', 'UltralyticsDetectorProvider', 'model_name')
-
-    // DepthAnything models (comfyui-depthanythingv2)
-    quickRegister(
-      'depthanything',
-      'DownloadAndLoadDepthAnythingV2Model',
-      'model'
-    )
-
-    // IP-Adapter models (comfyui_ipadapter_plus)
-    quickRegister('ipadapter', 'IPAdapterModelLoader', 'ipadapter_file')
-
-    // Segformer clothing/fashion segmentation models (comfyui_layerstyle)
-    quickRegister('segformer_b2_clothes', 'LS_LoadSegformerModel', 'model_name')
-    quickRegister('segformer_b3_clothes', 'LS_LoadSegformerModel', 'model_name')
-    quickRegister('segformer_b3_fashion', 'LS_LoadSegformerModel', 'model_name')
-
-    // NLF pose estimation models (ComfyUI-WanVideoWrapper)
-    quickRegister('nlf', 'LoadNLFModel', 'nlf_model')
-
-    // FlashVSR video super-resolution (ComfyUI-FlashVSR_Ultra_Fast)
-    // Empty key means the node auto-loads models without a widget selector
-    quickRegister('FlashVSR', 'FlashVSRNode', '')
-    quickRegister('FlashVSR-v1.1', 'FlashVSRNode', '')
-
-    // SEEDVR2 video upscaling (comfyui-seedvr2)
-    quickRegister('SEEDVR2', 'SeedVR2LoadDiTModel', 'model')
-
-    // Qwen VL vision-language models (comfyui-qwen-vl)
-    // Register each specific path to avoid LLM fallback catching unrelated models
-    // (e.g., LLM/llava-* should NOT map to AILab_QwenVL)
-    quickRegister(
-      'LLM/Qwen-VL/Qwen2.5-VL-3B-Instruct',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen2.5-VL-7B-Instruct',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-VL-2B-Instruct',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-VL-2B-Thinking',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-VL-4B-Instruct',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-VL-4B-Thinking',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-VL-8B-Instruct',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-VL-8B-Thinking',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-VL-32B-Instruct',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-VL-32B-Thinking',
-      'AILab_QwenVL',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-0.6B',
-      'AILab_QwenVL_PromptEnhancer',
-      'model_name'
-    )
-    quickRegister(
-      'LLM/Qwen-VL/Qwen3-4B-Instruct-2507',
-      'AILab_QwenVL_PromptEnhancer',
-      'model_name'
-    )
-    quickRegister('LLM/checkpoints', 'LoadChatGLM3', 'chatglm3_checkpoint')
-
-    // Qwen3 TTS speech models (ComfyUI-FunBox)
-    // Top-level 'qwen-tts' catches all qwen-tts/* subdirs via hierarchical fallback
-    quickRegister('qwen-tts', 'FB_Qwen3TTSVoiceClone', 'model_choice')
-
-    // DepthAnything V3 models (comfyui-depthanythingv2)
-    quickRegister(
-      'depthanything3',
-      'DownloadAndLoadDepthAnythingV3Model',
-      'model'
-    )
-
-    // LivePortrait face animation models (comfyui-liveportrait)
-    quickRegister('liveportrait', 'DownloadAndLoadLivePortraitModels', '')
-
-    // MimicMotion video generation models (ComfyUI-MimicMotionWrapper)
-    quickRegister('mimicmotion', 'DownloadAndLoadMimicMotionModel', 'model')
-    quickRegister('dwpose', 'MimicMotionGetPoses', '')
-
-    // Face parsing segmentation models (comfyui_face_parsing)
-    quickRegister('face_parsing', 'FaceParsingModelLoader(FaceParsing)', '')
-
-    // Kolors image generation models (ComfyUI-KolorsWrapper)
-    // Top-level 'diffusers' catches diffusers/Kolors/* subdirs
-    quickRegister('diffusers', 'DownloadAndLoadKolorsModel', 'model')
-
-    // CLIP models for HunyuanVideo (clip/clip-vit-large-patch14 subdir)
-    quickRegister('clip', 'CLIPVisionLoader', 'clip_name')
-
-    // RIFE video frame interpolation (ComfyUI-RIFE)
-    quickRegister('rife', 'RIFE VFI', 'ckpt_name')
-
-    // SAM3 3D segmentation models (comfyui-sam3)
-    quickRegister('sam3', 'LoadSAM3Model', 'model_path')
-
-    // UltraShape 3D model generation
-    quickRegister('UltraShape', 'UltraShapeLoadModel', 'checkpoint')
-
-    // SHaRP depth estimation
-    quickRegister('sharp', 'LoadSharpModel', 'checkpoint_path')
-
-    // ONNX upscale models (used by OnnxDetectionModelLoader and upscale nodes)
-    quickRegister('onnx', 'UpscaleModelLoader', 'model_name')
-
-    // Detection models (vitpose, yolo)
-    quickRegister('detection', 'OnnxDetectionModelLoader', 'yolo_model')
-
-    // HunyuanVideo text encoders (ComfyUI-HunyuanVideoWrapper)
-    quickRegister(
-      'LLM/llava-llama-3-8b-text-encoder-tokenizer',
-      'DownloadAndLoadHyVideoTextEncoder',
-      'llm_model'
-    )
-    quickRegister(
-      'LLM/llava-llama-3-8b-v1_1-transformers',
-      'DownloadAndLoadHyVideoTextEncoder',
-      'llm_model'
-    )
-
-    // CogVideoX models (comfyui-cogvideoxwrapper)
-    quickRegister('CogVideo/GGUF', 'DownloadAndLoadCogVideoGGUFModel', 'model')
-    quickRegister(
-      'CogVideo/ControlNet',
-      'DownloadAndLoadCogVideoControlNet',
-      'model'
-    )
-
-    // DynamiCrafter models (ComfyUI-DynamiCrafterWrapper)
-    quickRegister(
-      'checkpoints/dynamicrafter',
-      'DownloadAndLoadDynamiCrafterModel',
-      'model'
-    )
-    quickRegister(
-      'checkpoints/dynamicrafter/controlnet',
-      'DownloadAndLoadDynamiCrafterCNModel',
-      'model'
-    )
-
-    // LayerStyle models (ComfyUI_LayerStyle_Advance)
-    quickRegister('BEN', 'LS_LoadBenModel', 'model')
-    quickRegister('BiRefNet/pth', 'LS_LoadBiRefNetModel', 'model')
-    quickRegister('onnx/human-parts', 'LS_HumanPartsUltra', '')
-    quickRegister('lama', 'LaMa', 'lama_model')
-
-    // CogVideoX video generation models (comfyui-cogvideoxwrapper)
-    quickRegister('CogVideo', 'DownloadAndLoadCogVideoModel', 'model')
-
-    // Inpaint models (comfyui-inpaint-nodes)
-    quickRegister('inpaint', 'INPAINT_LoadInpaintModel', 'model_name')
-
-    // LayerDiffuse transparent image generation (comfyui-layerdiffuse)
-    quickRegister('layer_model', 'LayeredDiffusionApply', 'config')
+    for (const [modelType, nodeClass, key] of MODEL_NODE_MAPPINGS) {
+      quickRegister(modelType, nodeClass, key)
+    }
   }
 
   return {

src/stores/queueStore.test.ts

@@ -66,7 +66,7 @@ vi.mock('@/scripts/api', () => ({
 }))
 
 describe('TaskItemImpl', () => {
-  it('should remove animated property from outputs during construction', () => {
+  it('should exclude animated from flatOutputs', () => {
     const job = createHistoryJob(0, 'job-id')
     const taskItem = new TaskItemImpl(job, {
       'node-1': {
@@ -75,11 +75,9 @@ describe('TaskItemImpl', () => {
       }
     })
 
-    // Check that animated property was removed
-    expect('animated' in taskItem.outputs['node-1']).toBe(false)
-
-    expect(taskItem.outputs['node-1'].images).toBeDefined()
-    expect(taskItem.outputs['node-1'].images?.[0]?.filename).toBe('test.png')
+    expect(taskItem.flatOutputs).toHaveLength(1)
+    expect(taskItem.flatOutputs[0].filename).toBe('test.png')
+    expect(taskItem.flatOutputs[0].mediaType).toBe('images')
   })
 
   it('should handle outputs without animated property', () => {
@@ -202,8 +200,7 @@ describe('TaskItemImpl', () => {
 
     const task = new TaskItemImpl(job)
 
-    expect(task.flatOutputs).toHaveLength(1)
-    expect(task.flatOutputs[0].filename).toBe('')
+    expect(task.flatOutputs).toHaveLength(0)
     expect(task.previewableOutputs).toHaveLength(0)
     expect(task.previewOutput).toBeUndefined()
   })

src/stores/queueStore.ts

@@ -1,4 +1,3 @@
-import _ from 'es-toolkit/compat'
 import { defineStore } from 'pinia'
 import { computed, ref, shallowRef, toRaw, toValue } from 'vue'
 
@@ -16,6 +15,7 @@ import type {
 } from '@/schemas/apiSchema'
 import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
 import { api } from '@/scripts/api'
+import { parseTaskOutput } from '@/stores/resultItemParsing'
 import type { ComfyApp } from '@/scripts/app'
 import { useExtensionService } from '@/services/extensionService'
 import { getJobDetail } from '@/services/jobOutputCache'
@@ -256,10 +256,7 @@ export class TaskItemImpl {
             }
           }
         : {})
-    // Remove animated outputs from the outputs object
-    this.outputs = _.mapValues(effectiveOutputs, (nodeOutputs) =>
-      _.omit(nodeOutputs, 'animated')
-    )
+    this.outputs = effectiveOutputs
     this.flatOutputs = flatOutputs ?? this.calculateFlatOutputs()
   }
 
@@ -267,18 +264,7 @@ export class TaskItemImpl {
     if (!this.outputs) {
       return []
     }
-    return Object.entries(this.outputs).flatMap(([nodeId, nodeOutputs]) =>
-      Object.entries(nodeOutputs).flatMap(([mediaType, items]) =>
-        (items as ResultItem[]).map(
-          (item: ResultItem) =>
-            new ResultItemImpl({
-              ...item,
-              nodeId,
-              mediaType
-            })
-        )
-      )
-    )
+    return parseTaskOutput(this.outputs)
   }
 
   /** All outputs that support preview (images, videos, audio, 3D) */

src/stores/resultItemParsing.test.ts

@@ -0,0 +1,172 @@
+import { describe, expect, it } from 'vitest'
+
+import type { NodeExecutionOutput } from '@/schemas/apiSchema'
+import { parseNodeOutput, parseTaskOutput } from '@/stores/resultItemParsing'
+
+function makeOutput(
+  overrides: Partial<NodeExecutionOutput> = {}
+): NodeExecutionOutput {
+  return { ...overrides }
+}
+
+describe(parseNodeOutput, () => {
+  it('returns empty array for output with no known media types', () => {
+    const result = parseNodeOutput('1', makeOutput({ text: 'hello' }))
+    expect(result).toEqual([])
+  })
+
+  it('flattens images into ResultItemImpl instances', () => {
+    const output = makeOutput({
+      images: [
+        { filename: 'a.png', subfolder: '', type: 'output' },
+        { filename: 'b.png', subfolder: 'sub', type: 'output' }
+      ]
+    })
+
+    const result = parseNodeOutput('42', output)
+
+    expect(result).toHaveLength(2)
+    expect(result[0].filename).toBe('a.png')
+    expect(result[0].nodeId).toBe('42')
+    expect(result[0].mediaType).toBe('images')
+    expect(result[1].filename).toBe('b.png')
+    expect(result[1].subfolder).toBe('sub')
+  })
+
+  it('flattens audio outputs', () => {
+    const output = makeOutput({
+      audio: [{ filename: 'sound.wav', subfolder: '', type: 'output' }]
+    })
+
+    const result = parseNodeOutput(7, output)
+
+    expect(result).toHaveLength(1)
+    expect(result[0].mediaType).toBe('audio')
+    expect(result[0].nodeId).toBe(7)
+  })
+
+  it('flattens multiple media types in a single output', () => {
+    const output = makeOutput({
+      images: [{ filename: 'img.png', subfolder: '', type: 'output' }],
+      video: [{ filename: 'vid.mp4', subfolder: '', type: 'output' }]
+    })
+
+    const result = parseNodeOutput('1', output)
+
+    expect(result).toHaveLength(2)
+    const types = result.map((r) => r.mediaType)
+    expect(types).toContain('images')
+    expect(types).toContain('video')
+  })
+
+  it('handles gifs and 3d output types', () => {
+    const output = makeOutput({
+      gifs: [
+        { filename: 'anim.gif', subfolder: '', type: 'output' }
+      ] as NodeExecutionOutput['gifs'],
+      '3d': [
+        { filename: 'model.glb', subfolder: '', type: 'output' }
+      ] as NodeExecutionOutput['3d']
+    })
+
+    const result = parseNodeOutput('5', output)
+
+    expect(result).toHaveLength(2)
+    const types = result.map((r) => r.mediaType)
+    expect(types).toContain('gifs')
+    expect(types).toContain('3d')
+  })
+
+  it('ignores empty arrays', () => {
+    const output = makeOutput({ images: [], audio: [] })
+    const result = parseNodeOutput('1', output)
+    expect(result).toEqual([])
+  })
+
+  it('excludes animated key', () => {
+    const output = makeOutput({
+      images: [{ filename: 'img.png', subfolder: '', type: 'output' }],
+      animated: [true]
+    })
+
+    const result = parseNodeOutput('1', output)
+
+    expect(result).toHaveLength(1)
+    expect(result[0].mediaType).toBe('images')
+  })
+
+  it('excludes text key', () => {
+    const output = makeOutput({
+      images: [{ filename: 'img.png', subfolder: '', type: 'output' }],
+      text: 'some text output'
+    })
+
+    const result = parseNodeOutput('1', output)
+
+    expect(result).toHaveLength(1)
+    expect(result[0].mediaType).toBe('images')
+  })
+
+  it('excludes non-ResultItem array items', () => {
+    const output = {
+      images: [{ filename: 'img.png', subfolder: '', type: 'output' }],
+      custom_data: [{ randomKey: 123 }]
+    } as unknown as NodeExecutionOutput
+
+    const result = parseNodeOutput('1', output)
+
+    expect(result).toHaveLength(1)
+    expect(result[0].mediaType).toBe('images')
+  })
+
+  it('accepts items with filename but no subfolder', () => {
+    const output = {
+      images: [
+        { filename: 'valid.png', subfolder: '', type: 'output' },
+        { filename: 'no-subfolder.png' }
+      ]
+    } as unknown as NodeExecutionOutput
+
+    const result = parseNodeOutput('1', output)
+
+    expect(result).toHaveLength(2)
+    expect(result[0].filename).toBe('valid.png')
+    expect(result[1].filename).toBe('no-subfolder.png')
+    expect(result[1].subfolder).toBe('')
+  })
+
+  it('excludes items missing filename', () => {
+    const output = {
+      images: [
+        { filename: 'valid.png', subfolder: '', type: 'output' },
+        { subfolder: '', type: 'output' }
+      ]
+    } as unknown as NodeExecutionOutput
+
+    const result = parseNodeOutput('1', output)
+
+    expect(result).toHaveLength(1)
+    expect(result[0].filename).toBe('valid.png')
+  })
+})
+
+describe(parseTaskOutput, () => {
+  it('flattens across multiple nodes', () => {
+    const taskOutput: Record<string, NodeExecutionOutput> = {
+      '1': makeOutput({
+        images: [{ filename: 'a.png', subfolder: '', type: 'output' }]
+      }),
+      '2': makeOutput({
+        audio: [{ filename: 'b.wav', subfolder: '', type: 'output' }]
+      })
+    }
+
+    const result = parseTaskOutput(taskOutput)
+
+    expect(result).toHaveLength(2)
+    expect(result[0].nodeId).toBe('1')
+    expect(result[0].filename).toBe('a.png')
+    expect(result[1].nodeId).toBe('2')
+    expect(result[1].filename).toBe('b.wav')
+  })
+})

src/stores/resultItemParsing.ts

@@ -0,0 +1,49 @@
+import type { NodeExecutionOutput, ResultItem } from '@/schemas/apiSchema'
+import { resultItemType } from '@/schemas/apiSchema'
+import { ResultItemImpl } from '@/stores/queueStore'
+
+const METADATA_KEYS = new Set(['animated', 'text'])
+
+/**
+ * Validates that an unknown value is a well-formed ResultItem.
+ *
+ * Requires `filename` (string) since ResultItemImpl needs it for a valid URL.
+ * `subfolder` is optional here — ResultItemImpl constructor falls back to ''.
+ */
+function isResultItem(item: unknown): item is ResultItem {
+  if (!item || typeof item !== 'object' || Array.isArray(item)) return false
+
+  const candidate = item as Record<string, unknown>
+
+  if (typeof candidate.filename !== 'string') return false
+
+  if (
+    candidate.type !== undefined &&
+    !resultItemType.safeParse(candidate.type).success
+  ) {
+    return false
+  }
+
+  return true
+}
+
+export function parseNodeOutput(
+  nodeId: string | number,
+  nodeOutput: NodeExecutionOutput
+): ResultItemImpl[] {
+  return Object.entries(nodeOutput)
+    .filter(([key, value]) => !METADATA_KEYS.has(key) && Array.isArray(value))
+    .flatMap(([mediaType, items]) =>
+      (items as unknown[])
+        .filter(isResultItem)
+        .map((item) => new ResultItemImpl({ ...item, mediaType, nodeId }))
+    )
+}
+
+export function parseTaskOutput(
+  taskOutput: Record<string, NodeExecutionOutput>
+): ResultItemImpl[] {
+  return Object.entries(taskOutput).flatMap(([nodeId, nodeOutput]) =>
+    parseNodeOutput(nodeId, nodeOutput)
+  )
+}