From 9a5550f30072a02a01b818e595d373545c2ef61d Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Sat, 3 Oct 2026 16:01:54 -0700 Subject: [PATCH 1/3] fix: harden task cancellation reconciliation (#20031) - bound cancelled-task reconciliation and validate task statuses/results before restoring state - keep download/export cancellation rendering and close behavior consistent while polling is in flight - stop upload-wizard watchers when their owning scope is disposed - preserve export download URL behavior while adding regression coverage for malformed, mixed-shape, cancelled, and stale task responses This lands the hardening identified during the final review of #19858 (the `core/1.55` backport of #19281) on `main` first so release branches can consume it through normal backports. - `pnpm vitest run src/stores/assetDownloadStore.test.ts src/stores/assetExportStore.test.ts src/platform/tasks/services/taskService.test.ts src/platform/assets/components/ModelImportProgressDialog.test.ts src/platform/assets/components/AssetExportProgressDialog.test.ts src/platform/assets/composables/useUploadModelWizard.test.ts` (85 passed, 1 expected failure) - `pnpm typecheck:app` - `pnpm typecheck:browser` - targeted `oxfmt --check` - pre-push `knip` and changed-file `fallow audit` --- .../dialogs/modelImportProgressDialog.spec.ts | 4 +- .../ModelImportProgressDialog.test.ts | 36 ++- .../components/ModelImportProgressDialog.vue | 4 +- .../composables/useUploadModelWizard.test.ts | 144 ++++++++--- .../composables/useUploadModelWizard.ts | 37 ++- .../tasks/services/taskService.test.ts | 11 +- src/stores/assetDownloadStore.test.ts | 227 +++++++++++++++--- src/stores/assetDownloadStore.ts | 194 ++++++++++++--- src/stores/assetExportStore.test.ts | 141 ++++++++++- src/stores/assetExportStore.ts | 109 ++++++--- 10 files changed, 749 insertions(+), 158 deletions(-) diff --git a/browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts b/browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts index e5ac4c86c77..2c574bf6365 100644 --- a/browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts +++ b/browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts @@ -175,7 +175,7 @@ test.describe('Model import progress toast', { tag: ['@screenshot'] }, () => { await expect( toast.getByText('Cancelled', { exact: true }).first() ).toBeVisible() - await expect(toast.getByRole('button', { name: 'Close' })).toBeHidden() + await expect(toast.getByRole('button', { name: 'Close' })).toBeVisible() }) await test.step('keep the terminal backend state rendered', async () => { @@ -238,7 +238,7 @@ test.describe('Model import progress toast', { tag: ['@screenshot'] }, () => { await expect( toast.getByText('Cancelled', { exact: true }).first() ).toBeVisible() - await expect(toast.getByRole('button', { name: 'Close' })).toBeHidden() + await expect(toast.getByRole('button', { name: 'Close' })).toBeVisible() }) await test.step('settle the cancellation once the task lookup 404s', async () => { diff --git a/src/platform/assets/components/ModelImportProgressDialog.test.ts b/src/platform/assets/components/ModelImportProgressDialog.test.ts index 9a411f22612..53a6129b2bf 100644 --- a/src/platform/assets/components/ModelImportProgressDialog.test.ts +++ b/src/platform/assets/components/ModelImportProgressDialog.test.ts @@ -75,14 +75,44 @@ describe('ModelImportProgressDialog cancellation', () => { }) }) - it('keeps provisional cancellations open for authoritative reconciliation', async () => { + it('allows a provisional cancellation to be dismissed', async () => { + const user = userEvent.setup() const store = renderDialog() store.downloadList[0].status = 'cancellation_pending' await nextTick() - expect(screen.queryByRole('button', { name: 'Close' })).toBeNull() - expect(screen.getAllByText('Cancelled')).not.toHaveLength(0) + await user.click(screen.getByRole('button', { name: 'Close' })) + + await waitFor(() => expect(store.hasDownloads).toBe(false)) + expect(screen.queryByRole('status')).toBeNull() + }) + + it('restores the close control once a cancellation settles', async () => { + const store = renderDialog() + + store.downloadList[0].status = 'cancellation_pending' + await nextTick() + expect(screen.getByRole('button', { name: 'Close' })).toBeVisible() + + // The store bounds how long a cancellation stays provisional, so the + // dialog cannot be pinned open without a close control until a reload. + store.downloadList[0].status = 'cancelled' + await nextTick() + + expect(screen.getByRole('button', { name: 'Close' })).toBeVisible() + }) + + it('dismisses a settled cancellation', async () => { + const user = userEvent.setup() + const store = renderDialog() + + store.downloadList[0].status = 'cancelled' + await nextTick() + + await user.click(screen.getByRole('button', { name: 'Close' })) + + expect(screen.queryByRole('status')).toBeNull() }) it('restores the close control once a cancellation settles', async () => { diff --git a/src/platform/assets/components/ModelImportProgressDialog.vue b/src/platform/assets/components/ModelImportProgressDialog.vue index cc9f8ce608a..e6c3d891e03 100644 --- a/src/platform/assets/components/ModelImportProgressDialog.vue +++ b/src/platform/assets/components/ModelImportProgressDialog.vue @@ -93,7 +93,7 @@ const activeFilterLabel = computed(() => { }) function closeDialog() { - assetDownloadStore.clearFinishedDownloads() + assetDownloadStore.clearDismissibleDownloads() isExpanded.value = false } @@ -279,7 +279,7 @@ async function cancelDownload(taskId: TaskId) {