diff --git a/src/composables/graph/useErrorClearingHooks.test.ts b/src/composables/graph/useErrorClearingHooks.test.ts index 8a64fb3f0aa..6d32aaaed26 100644 --- a/src/composables/graph/useErrorClearingHooks.test.ts +++ b/src/composables/graph/useErrorClearingHooks.test.ts @@ -87,13 +87,12 @@ async function startPendingPromotedMediaVerification() { rootGraph, hosts: [outerHost], sourceNodes: [leafNode] - } = createPromotedMediaRuntime({ depth: 2 }) + } = createPromotedMediaRuntime({ depth: 2, hostValue: 'pending.png' }) outerHost.mode = LGraphEventMode.BYPASS vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(rootGraph) const pendingCandidate = { ...createPromotedMissingMediaCandidate(outerHost), - name: 'pending.png', isMissing: undefined } vi.spyOn(missingModelScan, 'scanNodeModelCandidates').mockReturnValue([]) @@ -963,6 +962,19 @@ describe('realtime verification staleness guards', () => { }) }) + it('skips verified media whose host widget value changed while verification was pending', async () => { + const { outerHost, resolveVerification } = + await startPendingPromotedMediaVerification() + const hostWidget = outerHost.widgets?.[0] + if (!hostWidget) throw new Error('Expected promoted image host widget') + + hostWidget.value = 'corrected.png' + resolveVerification() + await new Promise((resolve) => setTimeout(resolve, 0)) + + expect(useMissingMediaStore().missingMediaCandidates).toBeNull() + }) + it('skips verified media when its sole promoted consumer becomes bypassed', async () => { const { leafNode, resolveVerification } = await startPendingPromotedMediaVerification() diff --git a/src/platform/missingMedia/missingMediaScan.test.ts b/src/platform/missingMedia/missingMediaScan.test.ts index 404f3a64115..a5346be7cdc 100644 --- a/src/platform/missingMedia/missingMediaScan.test.ts +++ b/src/platform/missingMedia/missingMediaScan.test.ts @@ -503,6 +503,17 @@ describe('isMissingMediaCandidateScopeActive', () => { expect(isMissingMediaCandidateScopeActive(graph, candidate)).toBe(false) }) + + it('drops a candidate whose widget value changed while verification was pending', () => { + const { graph, node, widget } = createLoadImageGraph() + const candidate = makeCandidate(String(node.id), 'missing.png') + + expect.soft(isMissingMediaCandidateScopeActive(graph, candidate)).toBe(true) + + widget.value = 'valid.png' + + expect(isMissingMediaCandidateScopeActive(graph, candidate)).toBe(false) + }) }) describe('scanAllMediaCandidates', () => { diff --git a/src/platform/missingMedia/missingMediaScan.ts b/src/platform/missingMedia/missingMediaScan.ts index 7560e64390c..40b6f05fd5d 100644 --- a/src/platform/missingMedia/missingMediaScan.ts +++ b/src/platform/missingMedia/missingMediaScan.ts @@ -176,7 +176,7 @@ export function isMissingMediaCandidateScopeActive( // Removed or renamed while verification was pending: nothing owns the value. if (!widget) return false - return isEditableValueOwner(node, widget) + return widget.value === candidate.name && isEditableValueOwner(node, widget) } export function isMissingMediaCandidateActive(