From 61c3c266588455948da78473f9425fe1eb232c23 Mon Sep 17 00:00:00 2001 From: bymyself Date: Tue, 22 Sep 2026 22:18:13 -0700 Subject: [PATCH 1/2] fix: backport numeric insert_workflow link ids --- package.json | 4 +- pnpm-lock.yaml | 14 ++- pnpm-workspace.yaml | 3 +- .../ecsFollowerAdapter.integration.test.ts | 97 +++++++++++++++++++ 4 files changed, 110 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index d85194a556c..b1e554391d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@comfyorg/comfyui-frontend", - "version": "1.54.14", + "version": "1.54.8", "private": true, "description": "Official front-end implementation of ComfyUI", "homepage": "https://comfy.org", @@ -84,7 +84,7 @@ "dependencies": { "@alloc/quick-lru": "catalog:", "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", - "@comfyorg/comfy-multi-player": "0.3.3", + "@comfyorg/comfy-multi-player": "catalog:", "@comfyorg/comfyui-desktop-bridge-types": "catalog:", "@comfyorg/comfyui-electron-types": "catalog:", "@comfyorg/design-system": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d51157d5409..e00d3767cb3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,6 +21,9 @@ catalogs: '@astrojs/vue': specifier: ^7.0.2 version: 7.0.2 + '@comfyorg/comfy-multi-player': + specifier: https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634 + version: 0.3.3 '@comfyorg/comfyui-desktop-bridge-types': specifier: 0.2.0 version: 0.2.0 @@ -476,8 +479,8 @@ importers: specifier: ^1.3.1 version: 1.8.1 '@comfyorg/comfy-multi-player': - specifier: 0.3.3 - version: 0.3.3 + specifier: 'catalog:' + version: https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634 '@comfyorg/comfyui-desktop-bridge-types': specifier: 'catalog:' version: 0.2.0 @@ -1605,8 +1608,9 @@ packages: resolution: {integrity: sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A==} engines: {node: '>= 20.12.0'} - '@comfyorg/comfy-multi-player@0.3.3': - resolution: {integrity: sha512-Km9XY+D6SHO2+swsdzpUdiNayXTItXkeJxKtxvtrMVRpSlf/76PyIWumDLRhunuQNPvPLeqFTFBCtl3S55VF6w==} + '@comfyorg/comfy-multi-player@https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634': + resolution: {gitHosted: true, integrity: sha512-YhGP8rTlRGZjSgZVAfvdJOWaKvR7dF6Oo6w+IicyK+4f7XqQk30yW5hUFoHaGLFJH6RGwDvSey0/BS2Iq2r/PA==, tarball: https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634} + version: 0.3.3 '@comfyorg/comfyui-desktop-bridge-types@0.2.0': resolution: {integrity: sha512-V5Wj5KXDzTDm5GJAa0xBISjmndNIY5P79pRHQbLkkqJxgp/GPb/QGvcI+xG4ogol0ODJ4j/UBnUmkzpSafw8Aw==} @@ -10109,7 +10113,7 @@ snapshots: fast-wrap-ansi: 0.2.2 sisteransi: 1.0.5 - '@comfyorg/comfy-multi-player@0.3.3': + '@comfyorg/comfy-multi-player@https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634': dependencies: yjs: 13.6.31 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 23e4d4baa7f..15f9fc57220 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -159,11 +159,12 @@ catalog: zod: ^3.23.8 zod-to-json-schema: ^3.24.1 zod-validation-error: ^3.3.0 + '@comfyorg/comfy-multi-player': https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634 cleanupUnusedCatalogs: true allowBuilds: - '@comfyorg/comfy-multi-player@https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/58e2333ce3bb6375fd2efbc1e9d7df17327f37e0': true + '@comfyorg/comfy-multi-player@https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634': true '@firebase/util': false '@sentry/cli': true '@tailwindcss/oxide': true diff --git a/src/workbench/extensions/agent/crdt/ecsFollowerAdapter.integration.test.ts b/src/workbench/extensions/agent/crdt/ecsFollowerAdapter.integration.test.ts index 422801caef9..c681f9e407e 100644 --- a/src/workbench/extensions/agent/crdt/ecsFollowerAdapter.integration.test.ts +++ b/src/workbench/extensions/agent/crdt/ecsFollowerAdapter.integration.test.ts @@ -1150,6 +1150,103 @@ describe('EcsFollowerAdapter integration', () => { followerB.destroy() }) + it('projects links inserted with a workflow batch', () => { + const host = mint({ nodes: [], links: [] }, catalog) + const follower = new FollowerDoc() + const adapter = new EcsFollowerAdapter( + createGraphMutations({ + placement: inertPlacementPort, + getScope: () => scope, + layout: { createNode: vi.fn(), deleteNodes: vi.fn() } + }) + ) + adapter.bind('wf', follower) + + try { + const insertWorkflow = op('insert-workflow', 1, { + op: 'insert_workflow', + workflow: { + nodes: [ + { + id: 101, + type: 'Source', + outputs: [{ name: 'image', type: 'IMAGE', links: [201] }] + }, + { + id: 102, + type: 'Source', + inputs: [{ name: 'image', type: 'IMAGE', link: 201 }], + outputs: [{ name: 'image', type: 'IMAGE', links: [202] }] + }, + { + id: 103, + type: 'Sink', + inputs: [{ name: 'image', type: 'IMAGE', link: 202 }] + } + ], + links: [ + [201, 101, 0, 102, 0, 'IMAGE'], + [202, 102, 0, 103, 0, 'IMAGE'] + ] + } + }) + const result = applyOps( + host, + [insertWorkflow] as Parameters[1], + catalog + ) + expect(result.outcomes).toEqual([ + { op_id: 'insert-workflow', outcome: 'applied' } + ]) + + const insertedLinks = [...linksMap(host).entries()].map( + ([key, value]) => { + const id = + value instanceof Y.Array + ? value.get(0) + : Array.isArray(value) + ? value[0] + : null + return [key, id] as const + } + ) + expect(insertedLinks).toHaveLength(2) + expect( + insertedLinks.every( + ([key, id]) => + typeof id === 'number' && + Number.isSafeInteger(id) && + id >= 0 && + String(id) === key + ) + ).toBe(true) + + const update = Y.encodeStateAsUpdate(host) + follower.applyRemoteUpdate(update) + expect( + adapter.applyFrame({ + workflowId: 'wf', + seq: 1, + update, + actor: 'agent:test', + opIds: [insertWorkflow.op_id] + }) + ).toBe(true) + + for (const [, id] of insertedLinks) { + expect(typeof id).toBe('number') + if (typeof id !== 'number') continue + expect( + useLinkStore().getTopology(scope.rootGraphId, toLinkId(id)) + ).toBeDefined() + } + } finally { + adapter.destroy() + follower.destroy() + host.destroy() + } + }) + it('populates node slot arrays identically whether add+connect ops arrive in one combined frame or separate singleton frames (R-96)', () => { const buildOps = (prefix: string) => [ op(`${prefix}-1`, 1, { From 4b892da008125158a136ece3f83dc704423af1dc Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 22 Sep 2026 22:33:32 -0700 Subject: [PATCH 2/2] fix: use published multiplayer package in backport --- package.json | 4 ++-- pnpm-lock.yaml | 14 +++++--------- pnpm-workspace.yaml | 4 +--- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index b1e554391d0..f56abed406e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@comfyorg/comfyui-frontend", - "version": "1.54.8", + "version": "1.54.14", "private": true, "description": "Official front-end implementation of ComfyUI", "homepage": "https://comfy.org", @@ -84,7 +84,7 @@ "dependencies": { "@alloc/quick-lru": "catalog:", "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", - "@comfyorg/comfy-multi-player": "catalog:", + "@comfyorg/comfy-multi-player": "0.3.4", "@comfyorg/comfyui-desktop-bridge-types": "catalog:", "@comfyorg/comfyui-electron-types": "catalog:", "@comfyorg/design-system": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e00d3767cb3..a33a5ff40ee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,9 +21,6 @@ catalogs: '@astrojs/vue': specifier: ^7.0.2 version: 7.0.2 - '@comfyorg/comfy-multi-player': - specifier: https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634 - version: 0.3.3 '@comfyorg/comfyui-desktop-bridge-types': specifier: 0.2.0 version: 0.2.0 @@ -479,8 +476,8 @@ importers: specifier: ^1.3.1 version: 1.8.1 '@comfyorg/comfy-multi-player': - specifier: 'catalog:' - version: https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634 + specifier: 0.3.4 + version: 0.3.4 '@comfyorg/comfyui-desktop-bridge-types': specifier: 'catalog:' version: 0.2.0 @@ -1608,9 +1605,8 @@ packages: resolution: {integrity: sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A==} engines: {node: '>= 20.12.0'} - '@comfyorg/comfy-multi-player@https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634': - resolution: {gitHosted: true, integrity: sha512-YhGP8rTlRGZjSgZVAfvdJOWaKvR7dF6Oo6w+IicyK+4f7XqQk30yW5hUFoHaGLFJH6RGwDvSey0/BS2Iq2r/PA==, tarball: https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634} - version: 0.3.3 + '@comfyorg/comfy-multi-player@0.3.4': + resolution: {integrity: sha512-B4WQAvzHnlbVFk14jvuQTZ6bFu3E2BTNi/aj+dVKXAIvnwT/buZ9hlsV4CMW357eJNvIiYv4xYda3/1byk9wgQ==} '@comfyorg/comfyui-desktop-bridge-types@0.2.0': resolution: {integrity: sha512-V5Wj5KXDzTDm5GJAa0xBISjmndNIY5P79pRHQbLkkqJxgp/GPb/QGvcI+xG4ogol0ODJ4j/UBnUmkzpSafw8Aw==} @@ -10113,7 +10109,7 @@ snapshots: fast-wrap-ansi: 0.2.2 sisteransi: 1.0.5 - '@comfyorg/comfy-multi-player@https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634': + '@comfyorg/comfy-multi-player@0.3.4': dependencies: yjs: 13.6.31 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 15f9fc57220..938fa40614a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -159,12 +159,10 @@ catalog: zod: ^3.23.8 zod-to-json-schema: ^3.24.1 zod-validation-error: ^3.3.0 - '@comfyorg/comfy-multi-player': https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634 cleanupUnusedCatalogs: true allowBuilds: - '@comfyorg/comfy-multi-player@https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634': true '@firebase/util': false '@sentry/cli': true '@tailwindcss/oxide': true @@ -200,4 +198,4 @@ overrides: # Transitional - drop once 0.2.0 is older than the release-age gate. minimumReleaseAgeExclude: - '@comfyorg/comfyui-desktop-bridge-types@0.2.0' - - '@comfyorg/comfy-multi-player@0.2.0 || 0.2.1 || 0.3.0 || 0.3.2 || 0.3.3' + - '@comfyorg/comfy-multi-player@0.2.0 || 0.2.1 || 0.3.0 || 0.3.2 || 0.3.3 || 0.3.4'