Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7e1d177
fix(canvas): make overlapping graph loads ownership-aware
christian-byrne Oct 3, 2026
dfb4756
fix(canvas): keep the viewport's DPR transform, CSS sizing and caches…
christian-byrne Oct 3, 2026
3652741
fix(canvas): give panel-aware framing a fallback and cancel stale sub…
christian-byrne Oct 3, 2026
356ae52
test(canvas): pin the DPR transform resets applyViewport performs
christian-byrne Oct 3, 2026
ebe1fc6
test(app): pin the supersession gates after afterLoadGraph and the as…
christian-byrne Oct 3, 2026
582e3f2
test(app): record why the retirement guard is asserted as a call
christian-byrne Oct 3, 2026
2278cf2
test(app): pin the supersession gate between beforeLoadGraph and conf…
christian-byrne Oct 3, 2026
d63d7f3
fix(app): extend graph-load ownership to the API JSON and A1111 imports
christian-byrne Oct 3, 2026
4f660aa
docs(canvas): record the intrinsic-size residual at the logical-style…
christian-byrne Oct 3, 2026
64d36ad
[automated] Apply ESLint and Oxfmt fixes
actions-user Oct 3, 2026
4e4adb2
fix(app): fence A1111 post-commit ownership
christian-byrne Oct 3, 2026
8a9a0fa
refactor: drop the justification comments flagged in review
christian-byrne Oct 3, 2026
5c02816
fix(app): gate loadApiJson's missing-node report on graph ownership
christian-byrne Oct 3, 2026
44455fc
fix(workflow): stop a superseded load activating inside afterLoadNewG…
christian-byrne Oct 3, 2026
c1d968b
refactor(canvas): complete the viewport/framing split onto #20025
christian-byrne Oct 4, 2026
60a260d
fix(app): finish superseded load activation
christian-byrne Oct 4, 2026
47623e6
fix(workflow): make graph load ownership transactional
christian-byrne Oct 8, 2026
67bf8b6
fix: preserve graph load ownership
christian-byrne Oct 8, 2026
48296c6
fix: restore graph load cleanup at commit
christian-byrne Oct 9, 2026
7f13a44
fix: normalize subgraphs before load hooks
christian-byrne Oct 9, 2026
8a7312c
Merge remote-tracking branch 'origin/main' into christian/fix-19971-v…
christian-byrne Oct 10, 2026
9367246
Merge remote-tracking branch 'origin/main' into christian/fix-19971-v…
christian-byrne Oct 11, 2026
42cdf9a
fix(workflow): serialize graph imports before preparation
christian-byrne Oct 13, 2026
3c07d60
Merge remote-tracking branch 'origin/main' into christian/fix-19971-f…
christian-byrne Oct 13, 2026
95b6702
Merge remote-tracking branch 'origin/main' into christian/fix-19971-f…
christian-byrne Oct 14, 2026
f416d0b
test: stabilize focused graph load browser shard
christian-byrne Oct 14, 2026
8802da2
test: remove obsolete workflow load guard
christian-byrne Oct 14, 2026
bc2dc75
test: cover graph load FIFO in browser
christian-byrne Oct 14, 2026
060ce19
Merge remote-tracking branch 'origin/main' into christian/fix-19971-f…
christian-byrne Oct 15, 2026
99dc256
fix(workflow): preserve clipspace override and strengthen FIFO proof
christian-byrne Oct 15, 2026
0ee4f10
fix(workflow): reject nested lifecycle loads
christian-byrne Oct 15, 2026
88f72b2
fix(workflow): preserve lifecycle context across awaits
christian-byrne Oct 15, 2026
0e68d58
fix(workflow): guard all nested load entrypoints
christian-byrne Oct 15, 2026
37559cc
Merge branch 'main' into christian/fix-19971-viewport-graph-load-defects
DrJKL Oct 15, 2026
86c6d31
fix(workflow): keep main's load suppression and replaced-load aborts …
DrJKL Oct 15, 2026
d9f973d
fix(extensions): limit the graph-load hook app to its own dispatch
DrJKL Oct 15, 2026
7245b72
test: run the workflow load queue spec in the OSS browser project
DrJKL Oct 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion browser_tests/tests/sidebar/workflows.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { Route } from '@playwright/test'
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
import { TestIds } from '@e2e/fixtures/selectors'
import { openErrorsTab } from '@e2e/fixtures/helpers/ErrorsTabHelper'
import defaultWorkflow from '@e2e/assets/default.json' with { type: 'json' }
import type { UserDataFullInfo } from '@/platform/remote/comfyui/types'

test.describe('Workflows sidebar', () => {
Expand Down Expand Up @@ -497,6 +498,6 @@ test.describe('Workflows sidebar', () => {
// Wait for nodes to be inserted after drag-drop with retryable assertion
await expect
.poll(() => comfyPage.nodeOps.getGraphNodesCount())
.toBe(nodeCount * 2)
.toBe(nodeCount + defaultWorkflow.nodes.length)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 question: nodeCount * 2 assumed the canvas already held workflow1's graph when nodeCount was read; this changes the oracle so it no longer does. The two only differ when the canvas holds some other graph at that point. Was a queued load still running when the count was taken? If so, the new expectation hides a readiness change instead of waiting for it. The commit that made the change is titled "stabilize" and doesn't say.

})
})
2 changes: 2 additions & 0 deletions browser_tests/tests/subgraph/subgraphSeed.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { webSocketFixture } from '@e2e/fixtures/ws'

const wstest = mergeTests(test, webSocketFixture)

wstest.use({ initialSettings: { 'Comfy.Minimap.Visible': false } })

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P3 question: Commit f416d0b5a3 ("stabilize focused graph load browser shard") hides the minimap here, and the commit has no body. What did the minimap break in this spec? If it covered the seed widget's click target, say so in the commit message. If this PR's load-order change made the spec flaky with the minimap visible, then this line hides that change instead of fixing it.


wstest(
'Seed handling',
{ tag: '@vue-nodes' },
Expand Down
94 changes: 94 additions & 0 deletions browser_tests/tests/workflow/workflowLoadQueue.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import { expect } from '@playwright/test'

import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'

import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'

function noteWorkflow(title: string): ComfyWorkflowJSON {
return {
last_node_id: 1,
last_link_id: 0,
nodes: [
{
id: 1,
type: 'Note',
title,
pos: [120, 120],
size: [260, 120],
flags: {},
order: 0,
mode: 0,
properties: {},
widgets_values: ['']
}
],
links: [],
groups: [],
config: {},
extra: {},
version: 0.4
}
}

test.describe('Workflow load queue', { tag: '@vue-nodes' }, () => {
test('workflow loads finish in FIFO order', async ({ comfyPage }) => {
const { page, vueNodes } = comfyPage

const result =
await test.step('hold the first load open, then queue a second', async () =>
await page.evaluate(
async ([older, newer]) => {
let release!: () => void
const held = new Promise<void>((resolve) => {
release = resolve
})
let entered!: () => void
const firstEntered = new Promise<void>((resolve) => {
entered = resolve
})
let holdNext = true
let beforeLoadGraphCalls = 0
window.app!.registerExtension({
name: 'e2e.stallBeforeLoadGraph',
beforeLoadGraph: async () => {
beforeLoadGraphCalls++
if (!holdNext) return
holdNext = false
entered()
await held
}
})

const order: string[] = []
const olderLoad = window.app!.loadGraphData(older)
await firstEntered
const newerLoad = window
.app!.loadGraphData(newer)
.then(() => order.push('newer'))
await Promise.resolve()
const loadsStartedWhileOlderWasHeld = beforeLoadGraphCalls
release()
await olderLoad.then(() => order.push('older'))
await newerLoad
return { order, loadsStartedWhileOlderWasHeld }
},
[
noteWorkflow('older workflow'),
noteWorkflow('newer workflow')
] as const
))

expect(result).toEqual({
order: ['older', 'newer'],
loadsStartedWhileOlderWasHeld: 1
})

await test.step('the canvas shows the last queued workflow', async () => {
await expect(vueNodes.nodes).toHaveCount(1)
await expect(
vueNodes.getNodeByTitle('newer workflow').first()
).toBeVisible()
await expect(vueNodes.getNodeByTitle('older workflow')).toHaveCount(0)
})
})
})
Loading
Loading