From bf4f49ba882b9071b8c728cc7dc691dab5fe856a Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 28 Oct 2026 00:57:33 +0000 Subject: [PATCH 1/7] test: replayed reconnect outputs reach an expanded node's display node (FE-3481) --- .../useReconnectQueueRefresh.test.ts | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/composables/useReconnectQueueRefresh.test.ts b/src/composables/useReconnectQueueRefresh.test.ts index 13cb2dfd72f..74a87ee3053 100644 --- a/src/composables/useReconnectQueueRefresh.test.ts +++ b/src/composables/useReconnectQueueRefresh.test.ts @@ -144,6 +144,60 @@ describe('useReconnectQueueRefresh', () => { ]) }) + it('sends an expanded node output to the node it is displayed on', async () => { + followRun('job-1') + vi.mocked(api.getJobDetail).mockResolvedValue({ + ...makeJob('job-1', 'completed'), + outputs: { '15.0.0.3': { images: [image] }, '9': { images: [image] } }, + execution_meta: { + '15.0.0.3': { + node_id: '5', + display_node: '15', + parent_node: '15', + real_node_id: '5' + }, + '9': { node_id: '9', display_node: '9' } + } + }) + + await useReconnectQueueRefresh()() + + expect( + replayedExecutedFrames().map(([, detail]) => [ + detail?.node, + detail?.display_node + ]) + ).toEqual([ + ['9', '9'], + ['15.0.0.3', '15'] + ]) + }) + + it.for([ + ['no metadata', undefined], + ['malformed metadata', 'not-an-object'], + ['metadata without a display node', { '15.0.0.3': { node_id: '5' } }] + ] as const)( + 'falls back to the output key when the job detail has %s', + async ([, executionMeta]) => { + followRun('job-1') + vi.mocked(api.getJobDetail).mockResolvedValue({ + ...makeJob('job-1', 'completed'), + outputs: { '15.0.0.3': { images: [image] } }, + execution_meta: executionMeta + }) + + await useReconnectQueueRefresh()() + + expect(replayedExecutedFrames()).toEqual([ + [ + 'executed', + expect.objectContaining({ node: '15.0.0.3', display_node: '15.0.0.3' }) + ] + ]) + } + ) + it('lets the terminal event clear the run after its output event', async () => { followRun('job-1') vi.mocked(api.getJobDetail).mockResolvedValue(finishedJob) From 59f3fb5e7bc1ba43b51eebeea5f577ecb6f15d47 Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 28 Oct 2026 00:58:35 +0000 Subject: [PATCH 2/7] fix: send a replayed reconnect output to its display node (FE-3481) After a /ws reconnect, a run that finished while the socket was down has its outputs replayed as executed frames. The replay set display_node to the output key, so an expanded node's output went to the expanded id instead of the node it is shown on. Read the mapping from the job detail's execution_meta, the same display_node a live frame carries, and fall back to the key when the metadata is missing or malformed. --- src/composables/useReconnectQueueRefresh.ts | 27 +++++++++++++++++--- src/platform/remote/comfyui/jobs/jobTypes.ts | 14 ++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/composables/useReconnectQueueRefresh.ts b/src/composables/useReconnectQueueRefresh.ts index 9970ba23ce9..d3c25a6ee98 100644 --- a/src/composables/useReconnectQueueRefresh.ts +++ b/src/composables/useReconnectQueueRefresh.ts @@ -1,6 +1,7 @@ import { Semaphore, delay, withTimeout } from 'es-toolkit' import { t } from '@/i18n' +import { zExecutionMeta } from '@/platform/remote/comfyui/jobs/jobTypes' import type { ExecutionError, JobDetail @@ -22,6 +23,7 @@ type JobOutcome = state: 'ended' status: EndedStatus outputs?: TaskOutput + displayNodes?: Map executionError?: ExecutionError timestamp: number } @@ -86,6 +88,18 @@ export function useReconnectQueueRefresh() { return historyTask.outputs } + function displayNodesOf(detail: JobDetail | undefined) { + const meta = zExecutionMeta.safeParse(detail?.execution_meta) + if (!meta.success) return undefined + const displayNodes = new Map() + for (const [node, { display_node }] of Object.entries(meta.data)) { + if (display_node != null && display_node !== '') { + displayNodes.set(node, String(display_node)) + } + } + return displayNodes + } + function completedOutcome( detail: JobDetail | undefined, historyTask: TaskItemImpl | undefined @@ -96,6 +110,7 @@ export function useReconnectQueueRefresh() { state: 'ended', status: 'completed', outputs, + displayNodes: displayNodesOf(detail), timestamp: outcomeTimestamp(detail, historyTask) } } @@ -140,11 +155,15 @@ export function useReconnectQueueRefresh() { return readOutcome(jobId, historyTask) } - function replayOutputs(jobId: JobId, outputs: TaskOutput) { + function replayOutputs( + jobId: JobId, + outputs: TaskOutput, + displayNodes: Map | undefined + ) { for (const [node, output] of Object.entries(outputs)) { api.dispatchCustomEvent('executed', { node, - display_node: node, + display_node: displayNodes?.get(node) ?? node, output, prompt_id: jobId }) @@ -218,7 +237,9 @@ export function useReconnectQueueRefresh() { function replayOutcome(jobId: JobId, outcome: JobOutcome) { if (outcome.state !== 'ended' || !isFollowed(jobId)) return - if (outcome.outputs) replayOutputs(jobId, outcome.outputs) + if (outcome.outputs) { + replayOutputs(jobId, outcome.outputs, outcome.displayNodes) + } dispatchTerminal(jobId, outcome) } diff --git a/src/platform/remote/comfyui/jobs/jobTypes.ts b/src/platform/remote/comfyui/jobs/jobTypes.ts index bbe2dc02235..5c78f0d908f 100644 --- a/src/platform/remote/comfyui/jobs/jobTypes.ts +++ b/src/platform/remote/comfyui/jobs/jobTypes.ts @@ -78,6 +78,20 @@ const zRawJobListItem = z }) .passthrough() +/** + * Node-level execution metadata from the job detail (`execution_meta`), keyed + * by the executed node id. An expanded node reports the node it is shown on + * as `display_node`, the same id a live `executed` frame carries. + */ +export const zExecutionMeta = z.record( + z.string(), + z + .object({ + display_node: z.union([z.string(), z.number()]).nullable().optional() + }) + .passthrough() +) + /** * Job detail - returned by GET /api/jobs/{job_id} (detail endpoint) * Includes full workflow and outputs for re-execution and downloads From a9e4ca1dfc4d083f06bfc16103bae94c22945284 Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 28 Oct 2026 01:18:17 +0000 Subject: [PATCH 3/7] test: assert replayed frames without narrowing the event detail type --- .../useReconnectQueueRefresh.test.ts | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/composables/useReconnectQueueRefresh.test.ts b/src/composables/useReconnectQueueRefresh.test.ts index 74a87ee3053..6c5eb3ce492 100644 --- a/src/composables/useReconnectQueueRefresh.test.ts +++ b/src/composables/useReconnectQueueRefresh.test.ts @@ -148,7 +148,10 @@ describe('useReconnectQueueRefresh', () => { followRun('job-1') vi.mocked(api.getJobDetail).mockResolvedValue({ ...makeJob('job-1', 'completed'), - outputs: { '15.0.0.3': { images: [image] }, '9': { images: [image] } }, + outputs: { + '15.0.0.3': { images: [image] }, + '9': { images: [image] } + }, execution_meta: { '15.0.0.3': { node_id: '5', @@ -162,14 +165,12 @@ describe('useReconnectQueueRefresh', () => { await useReconnectQueueRefresh()() - expect( - replayedExecutedFrames().map(([, detail]) => [ - detail?.node, - detail?.display_node - ]) - ).toEqual([ - ['9', '9'], - ['15.0.0.3', '15'] + expect(replayedExecutedFrames()).toEqual([ + ['executed', expect.objectContaining({ node: '9', display_node: '9' })], + [ + 'executed', + expect.objectContaining({ node: '15.0.0.3', display_node: '15' }) + ] ]) }) @@ -192,7 +193,10 @@ describe('useReconnectQueueRefresh', () => { expect(replayedExecutedFrames()).toEqual([ [ 'executed', - expect.objectContaining({ node: '15.0.0.3', display_node: '15.0.0.3' }) + expect.objectContaining({ + node: '15.0.0.3', + display_node: '15.0.0.3' + }) ] ]) } From 32d393de939ccc51bb9cc0ecaa58651d8d2bd5cc Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 28 Oct 2026 01:28:26 +0000 Subject: [PATCH 4/7] fix: keep the display node mapping when one execution_meta entry is malformed Review: parsing execution_meta as one record dropped every mapping when a single entry was not an object. Parse each entry on its own. --- .../useReconnectQueueRefresh.test.ts | 3 ++- src/composables/useReconnectQueueRefresh.ts | 14 ++++++++------ src/platform/remote/comfyui/jobs/jobTypes.ts | 19 ++++++------------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/composables/useReconnectQueueRefresh.test.ts b/src/composables/useReconnectQueueRefresh.test.ts index 6c5eb3ce492..f93c4a614cf 100644 --- a/src/composables/useReconnectQueueRefresh.test.ts +++ b/src/composables/useReconnectQueueRefresh.test.ts @@ -159,7 +159,8 @@ describe('useReconnectQueueRefresh', () => { parent_node: '15', real_node_id: '5' }, - '9': { node_id: '9', display_node: '9' } + '9': { node_id: '9', display_node: '9' }, + '4': null } }) diff --git a/src/composables/useReconnectQueueRefresh.ts b/src/composables/useReconnectQueueRefresh.ts index d3c25a6ee98..3b207dc7574 100644 --- a/src/composables/useReconnectQueueRefresh.ts +++ b/src/composables/useReconnectQueueRefresh.ts @@ -1,7 +1,7 @@ import { Semaphore, delay, withTimeout } from 'es-toolkit' import { t } from '@/i18n' -import { zExecutionMeta } from '@/platform/remote/comfyui/jobs/jobTypes' +import { zExecutionMetaEntry } from '@/platform/remote/comfyui/jobs/jobTypes' import type { ExecutionError, JobDetail @@ -89,12 +89,14 @@ export function useReconnectQueueRefresh() { } function displayNodesOf(detail: JobDetail | undefined) { - const meta = zExecutionMeta.safeParse(detail?.execution_meta) - if (!meta.success) return undefined + const meta = detail?.execution_meta + if (meta == null || typeof meta !== 'object') return undefined const displayNodes = new Map() - for (const [node, { display_node }] of Object.entries(meta.data)) { - if (display_node != null && display_node !== '') { - displayNodes.set(node, String(display_node)) + for (const [node, entry] of Object.entries(meta)) { + const parsed = zExecutionMetaEntry.safeParse(entry) + const displayNode = parsed.success ? parsed.data.display_node : null + if (displayNode != null && displayNode !== '') { + displayNodes.set(node, String(displayNode)) } } return displayNodes diff --git a/src/platform/remote/comfyui/jobs/jobTypes.ts b/src/platform/remote/comfyui/jobs/jobTypes.ts index 5c78f0d908f..1017530fffa 100644 --- a/src/platform/remote/comfyui/jobs/jobTypes.ts +++ b/src/platform/remote/comfyui/jobs/jobTypes.ts @@ -78,19 +78,12 @@ const zRawJobListItem = z }) .passthrough() -/** - * Node-level execution metadata from the job detail (`execution_meta`), keyed - * by the executed node id. An expanded node reports the node it is shown on - * as `display_node`, the same id a live `executed` frame carries. - */ -export const zExecutionMeta = z.record( - z.string(), - z - .object({ - display_node: z.union([z.string(), z.number()]).nullable().optional() - }) - .passthrough() -) +/** One node's `execution_meta` entry, keyed by executed node id. */ +export const zExecutionMetaEntry = z + .object({ + display_node: z.union([z.string(), z.number()]).nullable().optional() + }) + .passthrough() /** * Job detail - returned by GET /api/jobs/{job_id} (detail endpoint) From 4994ac9af9f57a7df082ea0cbf39b3affb126992 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sat, 31 Oct 2026 10:10:58 +0000 Subject: [PATCH 5/7] fix: read the display node from the generated execution_meta entry Drop the hand-written schema for the generated zJobExecutionMetaEntry, ignore a list-shaped execution_meta, and replay a node's own output after the outputs of nodes it expanded into, so the reconnect result matches the live one when several outputs share a display node. --- packages/api-client/src/jobTypes.ts | 7 --- .../useReconnectQueueRefresh.test.ts | 54 ++++++++++++++++++- src/composables/useReconnectQueueRefresh.ts | 30 +++++++---- 3 files changed, 73 insertions(+), 18 deletions(-) diff --git a/packages/api-client/src/jobTypes.ts b/packages/api-client/src/jobTypes.ts index 6d305496b24..ec67a0ad152 100644 --- a/packages/api-client/src/jobTypes.ts +++ b/packages/api-client/src/jobTypes.ts @@ -78,13 +78,6 @@ const zRawJobListItem = z }) .passthrough() -/** One node's `execution_meta` entry, keyed by executed node id. */ -export const zExecutionMetaEntry = z - .object({ - display_node: z.union([z.string(), z.number()]).nullable().optional() - }) - .passthrough() - /** * Job detail - returned by GET /api/jobs/{job_id} (detail endpoint) * Includes full workflow and outputs for re-execution and downloads diff --git a/src/composables/useReconnectQueueRefresh.test.ts b/src/composables/useReconnectQueueRefresh.test.ts index f3caa11d21e..28236260677 100644 --- a/src/composables/useReconnectQueueRefresh.test.ts +++ b/src/composables/useReconnectQueueRefresh.test.ts @@ -167,11 +167,11 @@ describe('useReconnectQueueRefresh', () => { await useReconnectQueueRefresh()() expect(replayedExecutedFrames()).toEqual([ - ['executed', expect.objectContaining({ node: '9', display_node: '9' })], [ 'executed', expect.objectContaining({ node: '15.0.0.3', display_node: '15' }) - ] + ], + ['executed', expect.objectContaining({ node: '9', display_node: '9' })] ]) }) @@ -203,6 +203,56 @@ describe('useReconnectQueueRefresh', () => { } ) + it('replays an expanded output before the display node own output', async () => { + const own = { images: [{ ...image, filename: 'own.png' }] } + const child = { images: [{ ...image, filename: 'child.png' }] } + followRun('job-1') + vi.mocked(api.getJobDetail).mockResolvedValue({ + ...makeJob('job-1', 'completed'), + outputs: { '15': own, '15.0.0.3': child }, + execution_meta: { + '15': { display_node: '15' }, + '15.0.0.3': { display_node: '15', parent_node: '15' } + } + }) + + await useReconnectQueueRefresh()() + + expect(replayedExecutedFrames()).toEqual([ + [ + 'executed', + expect.objectContaining({ + node: '15.0.0.3', + display_node: '15', + output: child + }) + ], + [ + 'executed', + expect.objectContaining({ + node: '15', + display_node: '15', + output: own + }) + ] + ]) + }) + + it('ignores execution_meta that comes back as a list', async () => { + followRun('job-1') + vi.mocked(api.getJobDetail).mockResolvedValue({ + ...makeJob('job-1', 'completed'), + outputs: { '0': { images: [image] } }, + execution_meta: [{ display_node: '9' }] + }) + + await useReconnectQueueRefresh()() + + expect(replayedExecutedFrames()).toEqual([ + ['executed', expect.objectContaining({ node: '0', display_node: '0' })] + ]) + }) + it('lets the terminal event clear the run after its output event', async () => { followRun('job-1') vi.mocked(api.getJobDetail).mockResolvedValue(finishedJob) diff --git a/src/composables/useReconnectQueueRefresh.ts b/src/composables/useReconnectQueueRefresh.ts index 525b6938c2d..0ba8074ea50 100644 --- a/src/composables/useReconnectQueueRefresh.ts +++ b/src/composables/useReconnectQueueRefresh.ts @@ -1,7 +1,7 @@ -import { Semaphore, delay, withTimeout } from 'es-toolkit' +import { zJobExecutionMetaEntry } from '@comfyorg/ingest-types/zod' +import { Semaphore, delay, partition, withTimeout } from 'es-toolkit' import { t } from '@/i18n' -import { zExecutionMetaEntry } from '@comfyorg/api-client/jobTypes' import type { ExecutionError, JobDetail } from '@comfyorg/api-client/jobTypes' import { api } from '@/scripts/api' import { useExecutionStore } from '@/stores/executionStore' @@ -87,13 +87,14 @@ export function useReconnectQueueRefresh() { function displayNodesOf(detail: JobDetail | undefined) { const meta = detail?.execution_meta - if (meta == null || typeof meta !== 'object') return undefined + if (meta == null || typeof meta !== 'object' || Array.isArray(meta)) { + return undefined + } const displayNodes = new Map() for (const [node, entry] of Object.entries(meta)) { - const parsed = zExecutionMetaEntry.safeParse(entry) - const displayNode = parsed.success ? parsed.data.display_node : null - if (displayNode != null && displayNode !== '') { - displayNodes.set(node, String(displayNode)) + const parsed = zJobExecutionMetaEntry.safeParse(entry) + if (parsed.success && parsed.data.display_node) { + displayNodes.set(node, parsed.data.display_node) } } return displayNodes @@ -159,10 +160,21 @@ export function useReconnectQueueRefresh() { outputs: TaskOutput, displayNodes: Map | undefined ) { - for (const [node, output] of Object.entries(outputs)) { + const frames = Object.entries(outputs).map(([node, output]) => ({ + node, + output, + displayNode: displayNodes?.get(node) ?? node + })) + // Replayed frames replace each other on a shared display node. A node's + // own output finishes after the nodes it expanded into, so it goes last. + const [expanded, own] = partition( + frames, + ({ node, displayNode }) => node !== displayNode + ) + for (const { node, output, displayNode } of [...expanded, ...own]) { api.dispatchCustomEvent('executed', { node, - display_node: displayNodes?.get(node) ?? node, + display_node: displayNode, output, prompt_id: jobId }) From 2ead37b5f92c9e6c123889673ec98dd7c4e0d8e6 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sat, 31 Oct 2026 10:21:23 +0000 Subject: [PATCH 6/7] fix: match the live order of replayed outputs and skip copied cache metadata ComfyUI sends a node's own output before the nodes it expanded into, so replay the expanded outputs last. Ignore an execution_meta entry that names a different node, which is what a cached output carries before ComfyUI 17397. --- packages/api-client/src/jobTypes.ts | 4 +- .../useReconnectQueueRefresh.test.ts | 46 ++++++++++++++----- src/composables/useReconnectQueueRefresh.ts | 26 +++++++---- 3 files changed, 53 insertions(+), 23 deletions(-) diff --git a/packages/api-client/src/jobTypes.ts b/packages/api-client/src/jobTypes.ts index ec67a0ad152..ec1ee8b1a78 100644 --- a/packages/api-client/src/jobTypes.ts +++ b/packages/api-client/src/jobTypes.ts @@ -6,12 +6,14 @@ * Jobs API provides a memory-optimized alternative to history API. */ -import { zJobEntry } from '@comfyorg/ingest-types/zod' +import { zJobEntry, zJobExecutionMetaEntry } from '@comfyorg/ingest-types/zod' import { z } from 'zod' import { resultItemType } from './resultItemTypeSchema' import { zTaskOutput } from './executionTypes' +export { zJobExecutionMetaEntry } + const zJobStatus = z.enum([ 'pending', 'in_progress', diff --git a/src/composables/useReconnectQueueRefresh.test.ts b/src/composables/useReconnectQueueRefresh.test.ts index 28236260677..0c54638d909 100644 --- a/src/composables/useReconnectQueueRefresh.test.ts +++ b/src/composables/useReconnectQueueRefresh.test.ts @@ -154,7 +154,7 @@ describe('useReconnectQueueRefresh', () => { }, execution_meta: { '15.0.0.3': { - node_id: '5', + node_id: '15.0.0.3', display_node: '15', parent_node: '15', real_node_id: '5' @@ -167,18 +167,21 @@ describe('useReconnectQueueRefresh', () => { await useReconnectQueueRefresh()() expect(replayedExecutedFrames()).toEqual([ + ['executed', expect.objectContaining({ node: '9', display_node: '9' })], [ 'executed', expect.objectContaining({ node: '15.0.0.3', display_node: '15' }) - ], - ['executed', expect.objectContaining({ node: '9', display_node: '9' })] + ] ]) }) it.for([ ['no metadata', undefined], ['malformed metadata', 'not-an-object'], - ['metadata without a display node', { '15.0.0.3': { node_id: '5' } }] + [ + 'metadata without a display node', + { '15.0.0.3': { node_id: '15.0.0.3' } } + ] ] as const)( 'falls back to the output key when the job detail has %s', async ([, executionMeta]) => { @@ -203,16 +206,20 @@ describe('useReconnectQueueRefresh', () => { } ) - it('replays an expanded output before the display node own output', async () => { + it('replays a display node output before the expanded output, as live', async () => { const own = { images: [{ ...image, filename: 'own.png' }] } const child = { images: [{ ...image, filename: 'child.png' }] } followRun('job-1') vi.mocked(api.getJobDetail).mockResolvedValue({ ...makeJob('job-1', 'completed'), - outputs: { '15': own, '15.0.0.3': child }, + outputs: { '15.0.0.3': child, '15': own }, execution_meta: { - '15': { display_node: '15' }, - '15.0.0.3': { display_node: '15', parent_node: '15' } + '15': { node_id: '15', display_node: '15' }, + '15.0.0.3': { + node_id: '15.0.0.3', + display_node: '15', + parent_node: '15' + } } }) @@ -222,22 +229,37 @@ describe('useReconnectQueueRefresh', () => { [ 'executed', expect.objectContaining({ - node: '15.0.0.3', + node: '15', display_node: '15', - output: child + output: own }) ], [ 'executed', expect.objectContaining({ - node: '15', + node: '15.0.0.3', display_node: '15', - output: own + output: child }) ] ]) }) + it('keeps a cached output on its own node when its metadata names the node that first ran it', async () => { + followRun('job-1') + vi.mocked(api.getJobDetail).mockResolvedValue({ + ...makeJob('job-1', 'completed'), + outputs: { '7': { images: [image] } }, + execution_meta: { '7': { node_id: '4', display_node: '4' } } + }) + + await useReconnectQueueRefresh()() + + expect(replayedExecutedFrames()).toEqual([ + ['executed', expect.objectContaining({ node: '7', display_node: '7' })] + ]) + }) + it('ignores execution_meta that comes back as a list', async () => { followRun('job-1') vi.mocked(api.getJobDetail).mockResolvedValue({ diff --git a/src/composables/useReconnectQueueRefresh.ts b/src/composables/useReconnectQueueRefresh.ts index 0ba8074ea50..b2e2ba5f5c1 100644 --- a/src/composables/useReconnectQueueRefresh.ts +++ b/src/composables/useReconnectQueueRefresh.ts @@ -1,7 +1,7 @@ -import { zJobExecutionMetaEntry } from '@comfyorg/ingest-types/zod' import { Semaphore, delay, partition, withTimeout } from 'es-toolkit' import { t } from '@/i18n' +import { zJobExecutionMetaEntry } from '@comfyorg/api-client/jobTypes' import type { ExecutionError, JobDetail } from '@comfyorg/api-client/jobTypes' import { api } from '@/scripts/api' import { useExecutionStore } from '@/stores/executionStore' @@ -46,6 +46,14 @@ function unknownExecutionError(): ExecutionError { /** * Returns the handler for the `reconnected` api event. */ +function ownDisplayNode(node: string, metaEntry: unknown) { + const entry = zJobExecutionMetaEntry.safeParse(metaEntry) + if (!entry.success) return undefined + const { node_id: metaNode = node, display_node: displayNode } = entry.data + // A cached output can carry the metadata of the node that first ran it. + return metaNode === node ? displayNode : undefined +} + export function useReconnectQueueRefresh() { const queueStore = useQueueStore() const executionStore = useExecutionStore() @@ -92,10 +100,8 @@ export function useReconnectQueueRefresh() { } const displayNodes = new Map() for (const [node, entry] of Object.entries(meta)) { - const parsed = zJobExecutionMetaEntry.safeParse(entry) - if (parsed.success && parsed.data.display_node) { - displayNodes.set(node, parsed.data.display_node) - } + const displayNode = ownDisplayNode(node, entry) + if (displayNode) displayNodes.set(node, displayNode) } return displayNodes } @@ -165,13 +171,13 @@ export function useReconnectQueueRefresh() { output, displayNode: displayNodes?.get(node) ?? node })) - // Replayed frames replace each other on a shared display node. A node's - // own output finishes after the nodes it expanded into, so it goes last. - const [expanded, own] = partition( + // Frames on one display node replace each other. ComfyUI sends a node's + // own output before the nodes it expanded into, so those replay last. + const [own, expanded] = partition( frames, - ({ node, displayNode }) => node !== displayNode + ({ node, displayNode }) => node === displayNode ) - for (const { node, output, displayNode } of [...expanded, ...own]) { + for (const { node, output, displayNode } of [...own, ...expanded]) { api.dispatchCustomEvent('executed', { node, display_node: displayNode, From 7ff1172574bcbb7b1c9d4cd16d1658348e4c2457 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sat, 31 Oct 2026 10:53:34 +0000 Subject: [PATCH 7/7] fix: fall back to the output key for an invalid display node id --- .../useReconnectQueueRefresh.test.ts | 35 +++++++++++++------ src/composables/useReconnectQueueRefresh.ts | 14 ++++---- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/composables/useReconnectQueueRefresh.test.ts b/src/composables/useReconnectQueueRefresh.test.ts index 0c54638d909..b1ee3a9dbac 100644 --- a/src/composables/useReconnectQueueRefresh.test.ts +++ b/src/composables/useReconnectQueueRefresh.test.ts @@ -212,13 +212,13 @@ describe('useReconnectQueueRefresh', () => { followRun('job-1') vi.mocked(api.getJobDetail).mockResolvedValue({ ...makeJob('job-1', 'completed'), - outputs: { '15.0.0.3': child, '15': own }, + outputs: { '17:15.0.0.3': child, '17:15': own }, execution_meta: { - '15': { node_id: '15', display_node: '15' }, - '15.0.0.3': { - node_id: '15.0.0.3', - display_node: '15', - parent_node: '15' + '17:15': { node_id: '17:15', display_node: '17:15' }, + '17:15.0.0.3': { + node_id: '17:15.0.0.3', + display_node: '17:15', + parent_node: '17:15' } } }) @@ -229,16 +229,16 @@ describe('useReconnectQueueRefresh', () => { [ 'executed', expect.objectContaining({ - node: '15', - display_node: '15', + node: '17:15', + display_node: '17:15', output: own }) ], [ 'executed', expect.objectContaining({ - node: '15.0.0.3', - display_node: '15', + node: '17:15.0.0.3', + display_node: '17:15', output: child }) ] @@ -260,6 +260,21 @@ describe('useReconnectQueueRefresh', () => { ]) }) + it('falls back to the output key when the display node is not a node id', async () => { + followRun('job-1') + vi.mocked(api.getJobDetail).mockResolvedValue({ + ...makeJob('job-1', 'completed'), + outputs: { '7': { images: [image] } }, + execution_meta: { '7': { node_id: '7', display_node: ':' } } + }) + + await useReconnectQueueRefresh()() + + expect(replayedExecutedFrames()).toEqual([ + ['executed', expect.objectContaining({ node: '7', display_node: '7' })] + ]) + }) + it('ignores execution_meta that comes back as a list', async () => { followRun('job-1') vi.mocked(api.getJobDetail).mockResolvedValue({ diff --git a/src/composables/useReconnectQueueRefresh.ts b/src/composables/useReconnectQueueRefresh.ts index b2e2ba5f5c1..2bd9320315c 100644 --- a/src/composables/useReconnectQueueRefresh.ts +++ b/src/composables/useReconnectQueueRefresh.ts @@ -1,3 +1,4 @@ +import { tryNormalizeNodeExecutionId } from '@comfyorg/graph-model/nodeIdentification' import { Semaphore, delay, partition, withTimeout } from 'es-toolkit' import { t } from '@/i18n' @@ -43,17 +44,16 @@ function unknownExecutionError(): ExecutionError { } } -/** - * Returns the handler for the `reconnected` api event. - */ function ownDisplayNode(node: string, metaEntry: unknown) { const entry = zJobExecutionMetaEntry.safeParse(metaEntry) - if (!entry.success) return undefined + if (!entry.success || !entry.data.display_node) return null const { node_id: metaNode = node, display_node: displayNode } = entry.data - // A cached output can carry the metadata of the node that first ran it. - return metaNode === node ? displayNode : undefined + return metaNode === node ? tryNormalizeNodeExecutionId(displayNode) : null } +/** + * Returns the handler for the `reconnected` api event. + */ export function useReconnectQueueRefresh() { const queueStore = useQueueStore() const executionStore = useExecutionStore() @@ -171,8 +171,6 @@ export function useReconnectQueueRefresh() { output, displayNode: displayNodes?.get(node) ?? node })) - // Frames on one display node replace each other. ComfyUI sends a node's - // own output before the nodes it expanded into, so those replay last. const [own, expanded] = partition( frames, ({ node, displayNode }) => node === displayNode