From b2ed9af24f6174e57a50154ef0458573262fdf91 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 22 Sep 2026 22:34:59 -0700 Subject: [PATCH 1/3] chore: use published comfy-multi-player 0.3.4 --- pnpm-lock.yaml | 13 ++++++------- pnpm-workspace.yaml | 7 +++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d384fa538e..ee2a9d4e5b6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,8 +22,8 @@ catalogs: 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 + specifier: 0.3.4 + version: 0.3.4 '@comfyorg/comfyui-desktop-bridge-types': specifier: 0.2.0 version: 0.2.0 @@ -514,7 +514,7 @@ importers: version: link:packages/billing-contract '@comfyorg/comfy-multi-player': specifier: 'catalog:' - version: https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634 + version: 0.3.4 '@comfyorg/comfyui-desktop-bridge-types': specifier: 'catalog:' version: 0.2.0 @@ -1961,9 +1961,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==} @@ -10611,7 +10610,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 f69a9838155..1e0fedf4042 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -169,12 +169,11 @@ catalog: zod-to-json-schema: ^3.24.1 zod-validation-error: ^3.3.0 '@datadog/browser-logs': 6.33.0 - '@comfyorg/comfy-multi-player': https://codeload.github.com/Comfy-Org/comfy-multi-player/tar.gz/b475423a0f8b019bbac261ce218dfc016e9aa634 + '@comfyorg/comfy-multi-player': 0.3.4 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 @@ -208,7 +207,7 @@ overrides: brace-expansion@^5.0.0: ^5.0.9 sharp@^0.34.0: ^0.35.0 -# Transitional - drop once 0.2.0 is older than the release-age gate. +# Transitional - drop each entry once that version 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.3.4' From 3bfd12daaba109b6ca28f99e348c28ebd98cf4fa Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 23 Sep 2026 06:36:33 +0000 Subject: [PATCH 2/3] chore: bump comfy-multi-player to 0.3.5 0.3.5 (comfy-multi-player#248) publishes the structuredClone/TS2304 ambient-declaration fix from comfy-multi-player#247. Pin the catalog entry and minimumReleaseAgeExclude to 0.3.5, and regenerate the lockfile with a scoped `pnpm update --recursive @comfyorg/comfy-multi-player@0.3.5` (not a full reinstall) so only that package and its yjs transitive bump change. Verified: a cold `pnpm install --frozen-lockfile` (fresh --store-dir) resolves and installs cleanly. --- pnpm-lock.yaml | 22 +++++++++++++++------- pnpm-workspace.yaml | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ee2a9d4e5b6..700f2db3260 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,8 +22,8 @@ catalogs: specifier: ^7.0.2 version: 7.0.2 '@comfyorg/comfy-multi-player': - specifier: 0.3.4 - version: 0.3.4 + specifier: 0.3.5 + version: 0.3.5 '@comfyorg/comfyui-desktop-bridge-types': specifier: 0.2.0 version: 0.2.0 @@ -514,7 +514,7 @@ importers: version: link:packages/billing-contract '@comfyorg/comfy-multi-player': specifier: 'catalog:' - version: 0.3.4 + version: 0.3.5 '@comfyorg/comfyui-desktop-bridge-types': specifier: 'catalog:' version: 0.2.0 @@ -1961,8 +1961,8 @@ packages: resolution: {integrity: sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A==} engines: {node: '>= 20.12.0'} - '@comfyorg/comfy-multi-player@0.3.4': - resolution: {integrity: sha512-B4WQAvzHnlbVFk14jvuQTZ6bFu3E2BTNi/aj+dVKXAIvnwT/buZ9hlsV4CMW357eJNvIiYv4xYda3/1byk9wgQ==} + '@comfyorg/comfy-multi-player@0.3.5': + resolution: {integrity: sha512-stsag63SdKI/EFzdbEFPO3IhGzftyDcuJnT0WyPLMc08nEWkwg0M8kmVHAc4akRsIeWoj7mXSLzbHxpcbCm3lg==} '@comfyorg/comfyui-desktop-bridge-types@0.2.0': resolution: {integrity: sha512-V5Wj5KXDzTDm5GJAa0xBISjmndNIY5P79pRHQbLkkqJxgp/GPb/QGvcI+xG4ogol0ODJ4j/UBnUmkzpSafw8Aw==} @@ -9920,6 +9920,10 @@ packages: resolution: {integrity: sha512-Eq+5BRfbeGyqGVrTJL3bEcr8gKkxPuyuoHmAwpk52fDb8kOVMrfVSTRPd6yiGgX5Fskb96qCRjzjbRjrL4YEnw==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} + yjs@13.6.32: + resolution: {integrity: sha512-lfiJIIC4Xayt5ItynE407ehlE03pCjeOc4hkR4yxxvvNJ4kuiN25B0g+Qp8XagYz361LLL7DCzR5bvFJ81QKtQ==} + engines: {node: '>=16.0.0', npm: '>=8.0.0'} + yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} @@ -10610,9 +10614,9 @@ snapshots: fast-wrap-ansi: 0.2.2 sisteransi: 1.0.5 - '@comfyorg/comfy-multi-player@0.3.4': + '@comfyorg/comfy-multi-player@0.3.5': dependencies: - yjs: 13.6.31 + yjs: 13.6.32 '@comfyorg/comfyui-desktop-bridge-types@0.2.0': {} @@ -19224,6 +19228,10 @@ snapshots: dependencies: lib0: 0.2.117 + yjs@13.6.32: + dependencies: + lib0: 0.2.117 + yocto-queue@0.1.0: {} yocto-queue@1.2.2: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1e0fedf4042..1b46e11ca5b 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -169,7 +169,7 @@ catalog: zod-to-json-schema: ^3.24.1 zod-validation-error: ^3.3.0 '@datadog/browser-logs': 6.33.0 - '@comfyorg/comfy-multi-player': 0.3.4 + '@comfyorg/comfy-multi-player': 0.3.5 cleanupUnusedCatalogs: true @@ -210,4 +210,4 @@ overrides: # Transitional - drop each entry once that version is older than the release-age gate. minimumReleaseAgeExclude: - '@comfyorg/comfyui-desktop-bridge-types@0.2.0' - - '@comfyorg/comfy-multi-player@0.3.4' + - '@comfyorg/comfy-multi-player@0.3.5' From a80497335b9427b923f1dca5059e0e122a940391 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 23 Sep 2026 07:02:47 +0000 Subject: [PATCH 3/3] chore: dedupe yjs to fix typecheck after comfy-multi-player 0.3.5 bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit comfy-multi-player@0.3.5 depends on yjs ^13.6.27, which pnpm resolved to 13.6.32 (newest matching at publish time). The frontend's own yjs catalog pin was still ^13.6.27, resolving to the older 13.6.31 — so two separate yjs package instances coexisted in node_modules, and vue-tsc treated their Doc/AbstractType/Item types as structurally incompatible (TS2345) in schemaGuard.ts and useAgentCrdtFollower.integration.test.ts. Bump the yjs catalog pin to ^13.6.32 so both resolve to the same instance. Regenerated via plain `pnpm install` (not `pnpm update @`, which bypasses the catalog and pins a direct version instead — reverted that first attempt before committing). Verified: cold `pnpm install --frozen-lockfile` succeeds, and `vue-tsc --noEmit` now passes with no yjs type errors (previously failed with TS2345 at schemaGuard.ts:51 and useAgentCrdtFollower.integration.test.ts:81,116). --- pnpm-lock.yaml | 14 +++----------- pnpm-workspace.yaml | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 700f2db3260..e16e74a88bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -460,8 +460,8 @@ catalogs: specifier: ^6.2.1 version: 6.2.1 yjs: - specifier: ^13.6.27 - version: 13.6.31 + specifier: ^13.6.32 + version: 13.6.32 zod: specifier: ^3.23.8 version: 3.25.76 @@ -706,7 +706,7 @@ importers: version: 6.2.1(three@0.184.0) yjs: specifier: 'catalog:' - version: 13.6.31 + version: 13.6.32 zod: specifier: 'catalog:' version: 3.25.76 @@ -9916,10 +9916,6 @@ packages: resolution: {integrity: sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==} engines: {node: ^20.19.0 || ^22.12.0 || >=23} - yjs@13.6.31: - resolution: {integrity: sha512-Eq+5BRfbeGyqGVrTJL3bEcr8gKkxPuyuoHmAwpk52fDb8kOVMrfVSTRPd6yiGgX5Fskb96qCRjzjbRjrL4YEnw==} - engines: {node: '>=16.0.0', npm: '>=8.0.0'} - yjs@13.6.32: resolution: {integrity: sha512-lfiJIIC4Xayt5ItynE407ehlE03pCjeOc4hkR4yxxvvNJ4kuiN25B0g+Qp8XagYz361LLL7DCzR5bvFJ81QKtQ==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} @@ -19224,10 +19220,6 @@ snapshots: y18n: 5.0.8 yargs-parser: 22.0.0 - yjs@13.6.31: - dependencies: - lib0: 0.2.117 - yjs@13.6.32: dependencies: lib0: 0.2.117 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1b46e11ca5b..17af0003e40 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -164,7 +164,7 @@ catalog: vue-tsc: ^3.3.11 wwobjloader2: ^6.2.1 yaml: ^2.8.3 - yjs: ^13.6.27 + yjs: ^13.6.32 zod: ^3.23.8 zod-to-json-schema: ^3.24.1 zod-validation-error: ^3.3.0