test: verify generated output deletion

Amp-Thread-ID: https://ampcode.com/threads/T-019fb9b3-7fcf-705f-93b9-c7ff0b98a7ee
Co-authored-by: Amp <amp@ampcode.com>

Author: Jaewon Yoon

browser_tests/tests/sidebar/assetsSidebarTab.spec.ts

@@ -1,6 +1,7 @@
 import { expect, mergeTests } from '@playwright/test'
 import type { Page, Response } from '@playwright/test'
 
+import type { Asset, ListAssetsResponse } from '@comfyorg/ingest-types'
 import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
 import { expectNoErrorUiAfterVerification } from '@e2e/fixtures/helpers/ErrorsTabHelper'
 import {
@@ -10,11 +11,14 @@ import {
   routeMockJobTimestamp
 } from '@e2e/fixtures/jobsRouteFixture'
 import { TestIds } from '@e2e/fixtures/selectors'
+import { mockBilling } from '@e2e/fixtures/utils/cloudBillingMocks'
+import { mockCloudBoot } from '@e2e/fixtures/utils/cloudBootMocks'
 import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper'
 import type {
   JobDetail,
   RawJobListItem
 } from '@/platform/remote/comfyui/jobs/jobTypes'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 
 const test = mergeTests(comfyPageFixture, jobsRouteFixture)
 
@@ -103,6 +107,19 @@ const viewFiles = {
   'multi-output-b.png': {}
 }
 
+const alphaOutputAsset: Asset = {
+  id: 'alpha-asset-id',
+  name: 'ComfyUI_alpha.png',
+  hash: 'alpha.png',
+  mime_type: 'image/png',
+  tags: ['output'],
+  created_at: '2026-01-01T12:00:00Z',
+  updated_at: '2026-01-01T12:00:00Z'
+}
+
+const outputAssetsByPage = new WeakMap<Page, Asset[]>()
+const generatedJobsByPage = new WeakMap<Page, RawJobListItem[]>()
+
 async function mockInputFiles(page: Page, files: readonly string[]) {
   await page.route('**/internal/files/input**', async (route) => {
     if (route.request().method().toUpperCase() !== 'GET') {
@@ -170,6 +187,89 @@ const bulkInsertionTest = comfyPageFixture.extend({
   }
 })
 
+const loadImageNodeDef: ComfyNodeDef = {
+  name: 'LoadImage',
+  display_name: 'Load Image',
+  description: '',
+  category: 'image',
+  input: {
+    required: {
+      image: [['alpha.png [output]'], { image_upload: true }]
+    }
+  },
+  output: ['IMAGE', 'MASK'],
+  output_is_list: [false, false],
+  output_name: ['IMAGE', 'MASK'],
+  output_node: false,
+  python_module: 'nodes',
+  deprecated: false,
+  experimental: false
+}
+
+const cloudAssetDeletionTest = test.extend({
+  page: async ({ page }, use) => {
+    outputAssetsByPage.set(page, [alphaOutputAsset])
+    generatedJobsByPage.set(page, [alphaJob])
+    await mockCloudBoot(page, {
+      features: {},
+      settings: {
+        'Comfy.Queue.QPOV2': false,
+        'Comfy.RightSidePanel.ShowErrorsTab': false,
+        'Comfy.TutorialCompleted': true,
+        'Comfy.UseNewMenu': 'Top',
+        'Comfy.VersionCompatibility.DisableWarnings': true,
+        'Comfy.VueNodes.Enabled': true
+      }
+    })
+    await mockBilling(page)
+    await page.route('**/api/devtools/set_settings', (route) =>
+      route.fulfill({ json: {} })
+    )
+    await page.route(/\/api\/assets(?:\?.*)?$/, (route) => {
+      const assets = new URL(route.request().url()).searchParams
+        .get('include_tags')
+        ?.split(',')
+        .includes('output')
+        ? (outputAssetsByPage.get(page) ?? [])
+        : []
+      return route.fulfill({
+        json: {
+          assets,
+          total: assets.length,
+          has_more: false
+        } satisfies ListAssetsResponse
+      })
+    })
+    await page.route(/\/api\/jobs(?:\?.*)?$/, (route) => {
+      const url = new URL(route.request().url())
+      const isHistory = url.searchParams
+        .get('status')
+        ?.split(',')
+        .includes('completed')
+      const jobs = isHistory ? (generatedJobsByPage.get(page) ?? []) : []
+      const limit = Number(url.searchParams.get('limit') ?? 200)
+      const offset = Number(url.searchParams.get('offset') ?? 0)
+      return route.fulfill({
+        json: {
+          jobs,
+          pagination: {
+            offset,
+            limit,
+            total: jobs.length,
+            has_more: false
+          }
+        }
+      })
+    })
+    await page.route('**/api/object_info', (route) =>
+      route.fulfill({ json: { LoadImage: loadImageNodeDef } })
+    )
+    await use(page)
+    outputAssetsByPage.delete(page)
+    generatedJobsByPage.delete(page)
+  }
+})
+
 test.describe('FE-130 assets sidebar route mocks', () => {
   test.beforeEach(async ({ jobsRoutes, page }) => {
     await jobsRoutes.mockJobsQueue([])
@@ -309,6 +409,79 @@ test.describe('FE-130 assets sidebar route mocks', () => {
   })
 })
 
+cloudAssetDeletionTest.describe(
+  'IR-91 generated output deletion',
+  { tag: '@cloud' },
+  () => {
+    cloudAssetDeletionTest.beforeEach(async ({ page }) => {
+      await mockInputFiles(page, [])
+      await mockViewFiles(page, viewFiles)
+    })
+
+    cloudAssetDeletionTest(
+      'removes a deleted generated output from Load Image options',
+      async ({ comfyPage, page }) => {
+        const deletedAssetIds: string[] = []
+        await page.route('**/api/jobs/alpha/assets?*', async (route) => {
+          await route.fulfill({
+            json: {
+              assets: [{ id: 'alpha-asset-id' }],
+              pagination: {
+                offset: 0,
+                limit: 500,
+                total: 1,
+                has_more: false
+              }
+            }
+          })
+        })
+        await page.route('**/api/assets/alpha-asset-id', async (route) => {
+          deletedAssetIds.push('alpha-asset-id')
+          outputAssetsByPage.set(page, [])
+          await route.fulfill({ status: 204, body: '' })
+        })
+
+        await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+        await comfyPage.vueNodes.waitForNodes(1)
+        const imageWidgetButton = comfyPage.vueNodes
+          .getNodeByTitle('Load Image')
+          .getByRole('button', { name: 'Select image...' })
+        await imageWidgetButton.click()
+        const imagePicker = page.getByRole('dialog')
+        await expect(
+          imagePicker.getByText('ComfyUI_alpha.png [output]', { exact: true })
+        ).toBeVisible()
+        await page.keyboard.press('Escape')
+
+        const tab = comfyPage.menu.assetsTab
+        await tab.open()
+        await expect(tab.getAssetCardByName('alpha')).toBeVisible()
+        const historyDeleteRequests: { delete: string[] }[] = []
+        await page.route('**/api/history', async (route) => {
+          historyDeleteRequests.push(route.request().postDataJSON())
+          generatedJobsByPage.set(page, [])
+          await route.fulfill({ json: {} })
+        })
+        await tab.getAssetCardByName('alpha').click({ button: 'right' })
+        await tab.contextMenuItem('Delete').click()
+        await comfyPage.confirmDialog.delete.click()
+
+        await expect.poll(() => deletedAssetIds).toEqual(['alpha-asset-id'])
+        await expect
+          .poll(() => historyDeleteRequests)
+          .toEqual([{ delete: ['alpha'] }])
+        await expect(tab.getAssetCardByName('alpha')).toHaveCount(0)
+        await tab.dismissToasts()
+        await tab.close()
+        await imageWidgetButton.click()
+        await expect(
+          imagePicker.getByText('ComfyUI_alpha.png [output]', { exact: true })
+        ).toHaveCount(0)
+      }
+    )
+  }
+)
+
 bulkInsertionTest.describe(
   'Assets sidebar - bulk insert as nodes',
   { tag: ['@vue-nodes', '@ui', '@node', '@widget'] },

src/platform/assets/composables/useMediaAssetActions.test.ts

@@ -1350,6 +1350,31 @@ describe('useMediaAssetActions', () => {
       expect(mockUpdateFlatOutputs).toHaveBeenCalled()
     })
 
+    it('cleans up a selected output job only once', async () => {
+      mockIsCloud.value = true
+      mockGetOutputAssetMetadata.mockReturnValue({ jobId: 'job-1' })
+      mockGetJobAssetIds.mockResolvedValue(['output-uuid-1', 'output-uuid-2'])
+      mockDeleteAsset.mockResolvedValue(undefined)
+      const actions = useMediaAssetActions()
+
+      await actions.deleteAssets([
+        createMockAsset({
+          id: 'generated-card-1',
+          name: 'generated-1.png',
+          tags: ['output']
+        }),
+        createMockAsset({
+          id: 'generated-card-2',
+          name: 'generated-2.png',
+          tags: ['output']
+        })
+      ])
+
+      expect(mockGetJobAssetIds).toHaveBeenCalledOnce()
+      expect(mockDeleteAsset).toHaveBeenCalledTimes(2)
+      expect(vi.mocked(api.fetchApi)).toHaveBeenCalledOnce()
+    })
+
     it('keeps history when linked asset lookup fails', async () => {
       mockIsCloud.value = true
       mockGetJobAssetIds.mockRejectedValue(new Error('lookup failed'))

src/platform/assets/composables/useMediaAssetActions.ts

@@ -107,7 +107,8 @@ export function useMediaAssetActions() {
 
   const deleteAssetApi = async (
     asset: AssetItem,
-    assetType: string
+    assetType: string,
+    outputDeletionByJob: Map<string, Promise<void>>
   ): Promise<void> => {
     if (assetType === 'output' || assetType === 'temp') {
       const jobId =
@@ -116,13 +117,21 @@ export function useMediaAssetActions() {
         throw new Error('Unable to extract job ID from asset')
       }
 
-      const assetIds = isCloud ? await assetService.getJobAssetIds(jobId) : []
-      const results = await Promise.allSettled(
-        assetIds.map((id) => assetService.deleteAsset(id))
-      )
-      const failure = results.find((result) => result.status === 'rejected')
-      if (failure?.status === 'rejected') throw failure.reason
-      await deleteHistoryJob(jobId)
+      const pendingDeletion =
+        outputDeletionByJob.get(jobId) ??
+        (async () => {
+          const assetIds = isCloud
+            ? await assetService.getJobAssetIds(jobId)
+            : []
+          const results = await Promise.allSettled(
+            assetIds.map((id) => assetService.deleteAsset(id))
+          )
+          const failure = results.find((result) => result.status === 'rejected')
+          if (failure?.status === 'rejected') throw failure.reason
+          await deleteHistoryJob(jobId)
+        })()
+      outputDeletionByJob.set(jobId, pendingDeletion)
+      await pendingDeletion
     } else {
       // Input assets can only be deleted in cloud environment
       if (!isCloud) {
@@ -703,10 +712,15 @@ export function useMediaAssetActions() {
             )
 
             try {
+              const outputDeletionByJob = new Map<string, Promise<void>>()
               // Delete all assets using Promise.allSettled to track individual results
               const results = await Promise.allSettled(
                 assetArray.map((asset) =>
-                  deleteAssetApi(asset, getAssetType(asset))
+                  deleteAssetApi(
+                    asset,
+                    getAssetType(asset),
+                    outputDeletionByJob
+                  )
                 )
               )
 

src/platform/assets/services/assetService.test.ts

@@ -513,6 +513,30 @@ describe(assetService.getJobAssetIds, () => {
       'Invalid job assets pagination offset'
     )
   })
+
+  it('throws instead of deleting from an unbounded asset listing', async () => {
+    fetchApiMock.mockImplementation((input) => {
+      const offset = Number(
+        new URL(String(input), 'http://localhost').searchParams.get('offset')
+      )
+      return Promise.resolve(
+        buildResponse({
+          assets: [{ id: `asset-${offset}` }],
+          pagination: {
+            offset,
+            limit: 500,
+            total: Number.MAX_SAFE_INTEGER,
+            has_more: true
+          }
+        })
+      )
+    })
+
+    await expect(assetService.getJobAssetIds('job-1')).rejects.toThrow(
+      'exceeded 1000 batches'
+    )
+    expect(fetchApiMock).toHaveBeenCalledTimes(1000)
+  })
 })
 
 describe(assetService.getAssetModels, () => {

src/platform/assets/services/assetService.ts

@@ -882,8 +882,15 @@ function createAssetService() {
   async function getJobAssetIds(jobId: string): Promise<AssetId[]> {
     const assetIds: AssetId[] = []
     let offset = 0
+    let batchCount = 0
 
     while (true) {
+      if (batchCount++ >= MAX_PAGINATION_BATCHES) {
+        throw new Error(
+          `Job assets pagination exceeded ${MAX_PAGINATION_BATCHES} batches`
+        )
+      }
+
       const query = new URLSearchParams({
         limit: DEFAULT_LIMIT.toString(),
         offset: offset.toString()