Repository navigation
[backport core/1.54] Agent fixes catch-up 2, cloud parity (PM-1656) - #18637
CodeJuggernaut wants to merge 9 commits into
Conversation
Backport source PR 18073 to the pre-split cloud/1.54 follower with bounded unanswered-subscribe retries and release-native unit coverage. (cherry picked from commit f39439a)
Backport adaptation: test-only. The #18063 carrier's race test mints its ops by hand with the three-part stamp of comfy-multi-player 0.2.1. core/1.54 runs 0.3.6, whose applyOps rejects that stamp as malformed_op, so two cases failed during setup. Cloud made the same fix when it adopted 0.3.2 (#18304): the test now mints through the runtime's mintWireOps. This takes main's file, which is byte-identical to cloud's after #18304. No runtime file changes, and #18304 changed none of the carrier's runtime code either.
#18064) (#18317) ## Summary Backports source PR #18064 to Cloud 1.54 so same-tick human graph operations are coalesced and pending batches are aborted on a document reset, preventing a cleared canvas from returning in a new chat. Source: #18064, merged as `42d44cd31e56071cea90e4a5027ee1d2d7a46830`. Target: `cloud/1.54` at `19a4f18b799f228a0faf39d951c22a4fdb53daf8`. Tracking: https://github.com/christian-byrne/blocked-on-christian/issues/827 ## Changes - **What**: Preserves same-tick operation coalescing, aborts admitted/in-flight human batches on `doc_reset`, and retains the saved workflow identity plus empty current draft for a new chat. - **Dependencies**: None. The release lockfile is unchanged. - **Target adaptation**: Keeps the release's `EcsFollowerAdapter`; adapts the removed conversation/socket regression to `agentConversationHostDoc` and `agentRequestResponseFixture` coverage. ## Review Focus - Coalescer admission/flush ordering around retarget and reset. - Release-specific adapter integration and target-harness regression coverage. - Backend authority behavior is not proven here; authentic served Cloud acceptance remains unavailable. Validation: focused Vitest 8 files / 355 tests; main and browser typechecks; full lint; format; ADR validation. All passed. Backport note (core/1.54): two mechanical conflicts, both resolved to main's end state. - browser_tests/fixtures/agentConversationHostDoc.test.ts keeps core's file. The carrier's extra "coalesced canvas clear" test exists only on cloud (main's #18064 never added it). It also calls HostDoc.applyClient, which core and main replaced with applyWire. - useAgentCrdtFollower.test.ts keeps both imports: core's GraphOperation and the carrier's BatchOutcome. (cherry picked from commit 06068f3)
…rkflows (#18330) Backport of [source workflow repair](#18033) to `cloud/1.54` Automatically created by backport workflow. <details><summary>Full context for agent readers</summary> Justification: Necessary Cloud release backport under Christian’s explicit admin-merge authorization. Exact-head target-aware guard, required lint/unit/browser checks, substantive review and normal hooks passed; no recorded human objection. No standing human approval is claimed. Authenticated edit/save/reload acceptance remains separate and open. </details> Co-authored-by: Christian Byrne <cbyrne@comfy.org> (cherry picked from commit 86d76db)
… refresh (PM-1496) [cloud/1.54] (#18386) Reconnect repair qualified. Required checks passed. Authenticated reload remains open. <details><summary>Full context for agent readers</summary> Reviewed [head 1f35e0f](1f35e0f) against [tested Cloud target 9199835](9199835). The unmodified target-aware guard passed at that target: 76 successes, 12 skips, no unresolved threads or later objections. Fully paginated review and inline-comment collections are empty; issue comments contain only bots. No standing human approval is claimed. The [hosted unit job](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/35700635510/job/106658136560) tested [merge b13fbb6](b13fbb6), whose parents are exactly that target and head. Its full tree equals the published head, 2ce4434. Results: 1552 frontend files, 21396 passes, six expected failures and seven skips. This includes dynamicWidgets 27, graphMutations 58, nodeDataStore 32 and materializer input-order two tests in the combined run. Required [lint](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/35700635579/job/106657540942) and [browser aggregate](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/35700635809/job/106664200450) passed. The newer [risk grading](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/35700636057/job/106658217608) succeeded at this head; earlier cancelled risk jobs remain historical, not green evidence. The separate risk-publish step is skipped. The runtime change has the same stable patch identity as [merged source repair](#18289). The backport retained both release Pinia setup imports and the new assertion/callback imports. It preserves the source's immediate disconnect/reconnect and occupied-slot behavior, without importing unrelated main-branch changes. Prior browser evidence covers plain conversion, autogrow load and selected autogrow conversion only; unpack and authenticated in-app acceptance are not credited. The target then advanced by exactly [workflow carrier 18330](86d76db). The normal guard now refuses staleness; it has not passed at that newer target. There is zero file overlap: the target delta changes workflowStore.ts, its tests and test-only composer caret setup; this carrier changes dynamicWidgets.ts, its tests and the subgraph browser specification. The workflow delta filters missing tab entries and aligns tab reorder/navigation with that filtered list. It does not alter graph link storage, slot ordering, connection callbacks or this repair's frame lifecycle. The reconnect repair does not read those workflow-list APIs. A conflict-free merge-tree calculation produces 9757b73. This combined tree has not been executed as a new runtime; compatibility is the explicit inspected-delta judgment authorized by the coordinator, not a fabricated passing guard or repeated CI run. Justification: Necessary Cloud reconnect backport under Christian's explicit admin-merge grant and documented moving-target compatibility decision. Substantive source/backport review and exact-head required checks passed, with no recorded human objection. No new approval round or human approval is invented. Fresh target, head, reviews/comments and checks precede the merge. Authenticated edit/save/reload remains a separate open product blocker; landing does not authorize deployment or exposure widening. Carrier means release backport PR; patch identity compares code changes independently of line offsets; merge-tree checks textual integration, not runtime behavior. </details> <!-- authored-by:agent slack-claude-pilot --> <details><summary>Original author description (historical)</summary> <!-- ccr-slack-attribution --> _Requested by **Christian Byrne** · [Slack thread](https://comfy-organization.slack.com/archives/C0BGH348Z0C/p1789991789275729?thread_ts=1789991789.275729&cid=C0BGH348Z0C)_ Backport of [source reconnect repair](#18289) to `cloud/1.54`. Manual cherry-pick — the automated backport (run [35692714741](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/35692714741)) reported a merge conflict in `src/core/graph/widgets/dynamicWidgets.test.ts`. ## Summary (from [source reconnect repair](#18289)) An autogrow image slot (e.g. `model.images.image_2`) that gets disconnected immediately after being connected — with no render frame in between, as happens when the in-app agent applies connect/disconnect CRDT ops back-to-back — was misclassified by `withComfyAutogrow`'s same-slot swap guard as the tail end of an atomic same-slot swap, so the real compaction was never scheduled. The slot stayed stuck, disconnected, in the middle of the group, and the UI refused a new link into it until a full page reload. The swap guard now tracks two things instead of relying only on "did a render frame elapse": whether the slot's own connect event has already fired (`pendingConnectionSeen`), and which specific slot is mid-swap (`swappingSlot`, scoped per-slot rather than node-wide). A disconnect arriving after its slot's connect event already fired is now correctly treated as a separate, later operation, so `autogrowInputDisconnected` runs and the group compacts back down. Scoping the guard per-slot also stops a genuine connect on a *different* slot of the same node from being mistaken for the swap's own connect and silently dropped. ## Conflict resolution Only `src/core/graph/widgets/dynamicWidgets.test.ts` conflicted, in the import block: - `cloud/1.54`'s copy of this test file already sets up `createTestingPinia`/`setActivePinia` (a `beforeEach` Pinia reset used by describe blocks not present in [source reconnect repair](#18289 diff), which `main`'s copy at the time of [source reconnect repair](#18289) didn't need. - [source reconnect repair](#18289) added `assert` (used at `assert.exists(oldLink)` / `assert.exists(newLink)`) and `useChainCallback` (used to compose `node.onConnectionsChange` in the new tests) to the `vitest`/local imports. Resolved by keeping both import sets — the existing Pinia setup imports plus the new `assert`/`useChainCallback` imports — with no other changes. `src/core/graph/widgets/dynamicWidgets.ts` (the runtime fix) and `browser_tests/tests/subgraph/subgraphConvertAutogrowInputs.spec.ts` auto-merged cleanly with no conflicts; nothing else from `main` was pulled in. No lockfile or `package.json` changes were needed. ## Verification - `pnpm vitest run src/core/graph/widgets/dynamicWidgets.test.ts` — 27 passed. - `pnpm typecheck` and `pnpm typecheck:browser` — passed (via pre-commit hook). - `pnpm exec eslint --fix` / `pnpm exec oxlint --type-aware --fix` / `pnpm exec oxfmt --write` on changed files — clean, no warnings. - `.github/scripts/check-ai-co-authors.sh` against the merge-base with `origin/cloud/1.54` — no AI co-author trailers (the inherited `Co-authored-by: Claude <noreply@anthropic.com>` trailer from the `main` squash commit was stripped via `git commit --amend`). ## Coverage note The browser test spec (`browser_tests/tests/subgraph/subgraphConvertAutogrowInputs.spec.ts`) carried over cleanly with its full diff — no browser coverage was dropped in this backport. Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01CoKpwnbrjRvnAyVd6dnPiq --- _Generated by [Claude Code](https://claude.ai/code/session_01CoKpwnbrjRvnAyVd6dnPiq)_ </details> (cherry picked from commit b06429b)
…ets when execId derivation fails (PM-1580 follow-up) (#18608) <!-- ccr-slack-attribution --> _Requested by **Christian Byrne** · [Slack thread](https://comfy-organization.slack.com/archives/C0BGH348Z0C/p1790058330774449?thread_ts=1790058330.774449&cid=C0BGH348Z0C)_ Backport of #18604 to `cloud/1.54`. Opened manually: the `PR Backport` workflow (`pr-backport.yaml`) only runs when the PR carries the `needs-backport` label — `core/1.54` + `cloud/1.54` alone (added manually before merge) don't trigger it, so it never ran at merge time. After adding `needs-backport`, the workflow did run and this target (`cloud/1.54`) cherry-picked `035d9056b0` cleanly, but the run's overall job still failed because the `core/1.54` target hit a real conflict (that target is missing #18598 entirely, since its own backport #18600 is still open/unmerged against `core/1.54`) — and the workflow's "Cleanup stranded backport branches" step then deleted the `cloud/1.54` branch it had just successfully pushed, because it runs on `failure()` for the *job*, not per-target. So this clean backport never got a PR from the bot despite succeeding. Re-cherry-picked `035d9056b0` onto `cloud/1.54` (which already has #18598 via #18601) by hand — clean apply, no conflicts. `core/1.54` is intentionally not backported here: it needs #18600 (the #18598 backport) merged first. --- 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01UqyourCBfi97xzpBx2W7oY --- _Generated by [Claude Code](https://claude.ai/code/session_01UqyourCBfi97xzpBx2W7oY)_ (cherry picked from commit a55ce3d)
…w node ids in locator/callback path (#18616) (#18618) <!-- ccr-slack-attribution --> _Requested by **Christian Byrne** · [Slack thread](https://comfy-organization.slack.com/archives/C0BGH348Z0C/p1790058330774449)_ Backport of #18616 to `cloud/1.54`. Manual cherry-pick, same approach as #18608: `cloud/1.54` now has #18604's execution-id fix (via #18608), and #18616 is the follow-up that fixes the *sibling* locator-id path (`createNodeLocatorId`/`locatorIdFromState`/`getNodeByLocatorId`), used to resolve the live `LGraphNode` for widget callback dispatch and navigation, for the same colon-bearing `insert_workflow` node ids. ## Before Moving a widget on an `insert_workflow`-materialized node (comfy-multi-player, PM-1580) updates the widget's stored value, but the underlying node's `widget.callback` — which drives dependent UI, control-after-generate, dynamic input wiring, etc. — never fires, because `createNodeLocatorId` rejected the colon-bearing id and `getHostNode` resolved no live `LGraphNode`. The same path also silently broke "Enter Subgraph" navigation and promoted-widget preview locator ids for these nodes. ## After `createLeafNodeLocatorId` (mirroring `createLeafNodeExecutionId` from #18604) keeps a root-level colon-bearing id whole instead of rejecting it, while a genuinely subgraph-nested id still goes through the strict, delimiter-aware path unchanged. `locatorIdFromState`, `getNodeByLocatorId`, and the promoted-widget preview locator (`widgetNodeLocatorId`) now agree on this leaf-tolerant encoding/decoding, so `getHostNode` resolves the real `LGraphNode` and `live.widget.callback` fires normally. ## Cherry-pick details - Source commit: 5d85b04 (single self-contained commit from #18616, `claude/fix-node-locator-id-colon-rejection`) - `git cherry-pick -m 1` applied cleanly onto `cloud/1.54` (post-#18608) — no conflicts, since `nodeIdentification.ts`, `graphTraversalUtil.ts`, and `processedWidgetRenderModel.ts` already had #18604/#18608's sibling execution-id fix in place. - Committer identity normalized to `claude[bot]` (author was already `claude[bot]`; no AI co-author trailer was present in the original commit body, so none needed stripping). ## Testing - `pnpm vitest run` on `nodeIdentification.test.ts`, `graphTraversalUtil.test.ts`, and `useProcessedWidgets.test.ts` (which exercises `processedWidgetRenderModel.ts`'s `getHostNode`) against `cloud/1.54`'s actual code — 186 tests passed. - `vue-tsc --noEmit` — clean. - `eslint` and `oxfmt --check` on all 6 touched files — clean. Ref: #18616 (source PR, still open on `main` at cherry-pick time but CI-green and single-commit) 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01UqyourCBfi97xzpBx2W7oY --- _Generated by [Claude Code](https://claude.ai/code/session_01UqyourCBfi97xzpBx2W7oY)_ (cherry picked from commit 0ec045e)
## Summary Forward all frontend agent telemetry through the existing desktop host bridge so desktop/local agent usage is no longer telemetry-blind. PM-1509 was originally filed against the desktop app repo, but `HostTelemetrySink` lives in this frontend repo. The downstream transport is already event-agnostic, so no desktop transport change is needed. ## Changes - **What**: Add `HostTelemetrySink` handlers and transport assertions for: - `app:agent_message_feedback` - `app:agent_panel_opened` - `app:agent_panel_closed` - `app:agent_entry_button_clicked` - `app:agent_close_button_clicked` - `app:agent_message_sent` - `app:agent_node_tagged` - `app:agent_attach_button_clicked` - `app:agent_workflow_applied` - **Breaking**: None. - **Dependencies**: None; BE-13139 is not a blocker. ## Review Focus `app:agent_workflow_applied` is included because the frontend currently emits it. PM-1468 may retire that event separately. ## E2E Regression Coverage A Playwright regression test is not practical for this change. The browser suite runs the web frontend and does not load the Electron preload bridge or desktop main process, while the changed behavior has no browser-visible output. A browser test could only replace `window.__comfyDesktop2.Telemetry.capture` with a test double and assert the same method call; it could not exercise the real Electron IPC transport. The focused `HostTelemetrySink` test is therefore the lowest test that executes the changed production code and proves all nine event names and payloads reach the host boundary. ## Validation - `pnpm test:unit src/platform/telemetry/providers/host/HostTelemetrySink.test.ts` — 19 passed - `pnpm typecheck` — passed - pre-commit oxfmt, oxlint, ESLint, and typecheck — passed - pre-push knip — passed - CI Playwright — 2087 passed, 0 failed, 1 flaky Linear: PM-1509 (cherry picked from commit d37324f)
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
|
Important Review skippedIgnore keyword(s) in the title. ⛔ Ignored keywords (2)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository: Comfy-Org/ComfyUI_frontend/.coderabbit.yaml Review profile: ASSERTIVE Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
🎭 Playwright: ✅ 1944 passed, 0 failed · 1 flaky📊 Browser Reports
🎨 Storybook: ✅ Built — View Storybook📦 Bundle Size
⚡ Performance Report
Show regressions
All metrics
Historical variance (last 15 runs)
Trend (last 15 commits on main)
Raw data{
"timestamp": "2026-09-23T21:28:29.916Z",
"gitSha": "c967adccfe5dcf88d20da1c437badb6f7cab7fa6",
"branch": "backport-agent-fixes-2-core-1.54",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2054.7109999999975,
"styleRecalcs": 8,
"styleRecalcDurationMs": 8.158,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 509.98600000000005,
"heapDeltaBytes": 4289064,
"heapUsedBytes": 75449036,
"domNodes": -281,
"jsHeapTotalBytes": 5234688,
"scriptDurationMs": 9.089999999999998,
"eventListeners": -164,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-idle",
"durationMs": 2049.7589999999946,
"styleRecalcs": 6,
"styleRecalcDurationMs": 5.982999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 506.2679999999999,
"heapDeltaBytes": 3550772,
"heapUsedBytes": 74399756,
"domNodes": -282,
"jsHeapTotalBytes": 5496832,
"scriptDurationMs": 9.054999999999998,
"eventListeners": -164,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-mouse-sweep",
"durationMs": 2095.7390000000373,
"styleRecalcs": 79,
"styleRecalcDurationMs": 36.511,
"layouts": 14,
"layoutDurationMs": 4.409,
"taskDurationMs": 1027.684,
"heapDeltaBytes": -3421580,
"heapUsedBytes": 66876836,
"domNodes": -282,
"jsHeapTotalBytes": 6021120,
"scriptDurationMs": 185.446,
"eventListeners": -196,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66999999999998,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1923.483000000033,
"styleRecalcs": 78,
"styleRecalcDurationMs": 30.765,
"layouts": 14,
"layoutDurationMs": 4.143,
"taskDurationMs": 915.851,
"heapDeltaBytes": -5259176,
"heapUsedBytes": 65066176,
"domNodes": -280,
"jsHeapTotalBytes": 6021120,
"scriptDurationMs": 167.643,
"eventListeners": -194,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1722.5590000000466,
"styleRecalcs": 32,
"styleRecalcDurationMs": 15.787999999999997,
"layouts": 6,
"layoutDurationMs": 0.9910000000000001,
"taskDurationMs": 354.755,
"heapDeltaBytes": 4640444,
"heapUsedBytes": 75610792,
"domNodes": 76,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 10.425,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1723.965000000021,
"styleRecalcs": 31,
"styleRecalcDurationMs": 15.938,
"layouts": 6,
"layoutDurationMs": 1.1449999999999998,
"taskDurationMs": 352.71200000000005,
"heapDeltaBytes": 4648928,
"heapUsedBytes": 75337428,
"domNodes": 77,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 10.518999999999997,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 637.1430000000373,
"styleRecalcs": 11,
"styleRecalcDurationMs": 7.414000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 455.537,
"heapDeltaBytes": -7558124,
"heapUsedBytes": 63488684,
"domNodes": 18,
"jsHeapTotalBytes": 6553600,
"scriptDurationMs": 159.41699999999997,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 641.2169999999833,
"styleRecalcs": 12,
"styleRecalcDurationMs": 7.872999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 441.999,
"heapDeltaBytes": 18368236,
"heapUsedBytes": 88571408,
"domNodes": 20,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 161.299,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2034.2829999999594,
"styleRecalcs": 4,
"styleRecalcDurationMs": 4.179000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 571.606,
"heapDeltaBytes": 11043616,
"heapUsedBytes": 87408236,
"domNodes": -270,
"jsHeapTotalBytes": -2727936,
"scriptDurationMs": 31.794000000000004,
"eventListeners": -162,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "large-graph-idle",
"durationMs": 2034.992000000102,
"styleRecalcs": 5,
"styleRecalcDurationMs": 5.850000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 626.6270000000001,
"heapDeltaBytes": 5812824,
"heapUsedBytes": 82360524,
"domNodes": -279,
"jsHeapTotalBytes": -1155072,
"scriptDurationMs": 32.36600000000001,
"eventListeners": -192,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2266.521999999952,
"styleRecalcs": 63,
"styleRecalcDurationMs": 8.648999999999997,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1599.3370000000002,
"heapDeltaBytes": 14469872,
"heapUsedBytes": 80593348,
"domNodes": -278,
"jsHeapTotalBytes": 1536000,
"scriptDurationMs": 801.8240000000001,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-pan",
"durationMs": 2365.4149999999845,
"styleRecalcs": 65,
"styleRecalcDurationMs": 10.239,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1655.5619999999997,
"heapDeltaBytes": 19040520,
"heapUsedBytes": 85376852,
"domNodes": -272,
"jsHeapTotalBytes": 225280,
"scriptDurationMs": 813.3269999999999,
"eventListeners": -162,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "large-graph-zoom",
"durationMs": 3554.1239999999448,
"styleRecalcs": 61,
"styleRecalcDurationMs": 10.510000000000002,
"layouts": 60,
"layoutDurationMs": 11.669,
"taskDurationMs": 1691.1180000000004,
"heapDeltaBytes": 10211820,
"heapUsedBytes": 76515152,
"domNodes": -280,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 773.498,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333338,
"p95FrameDurationMs": 16.80000000000109
},
{
"name": "large-graph-zoom",
"durationMs": 3550.192999999922,
"styleRecalcs": 63,
"styleRecalcDurationMs": 13.055999999999997,
"layouts": 60,
"layoutDurationMs": 11.483,
"taskDurationMs": 1731.2709999999997,
"heapDeltaBytes": -2386592,
"heapUsedBytes": 76156320,
"domNodes": -276,
"jsHeapTotalBytes": -2465792,
"scriptDurationMs": 763.535,
"eventListeners": -190,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "legacy-node-drag",
"durationMs": 2998.287000000005,
"styleRecalcs": 40,
"styleRecalcDurationMs": 4.743,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1891.2710000000002,
"heapDeltaBytes": 19892936,
"heapUsedBytes": 87360388,
"domNodes": 0,
"jsHeapTotalBytes": 417792,
"scriptDurationMs": 940.074,
"eventListeners": 188,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.80000000000109
},
{
"name": "legacy-node-drag",
"durationMs": 3070.726000000036,
"styleRecalcs": 41,
"styleRecalcDurationMs": 5.329999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1869.6730000000002,
"heapDeltaBytes": 21793316,
"heapUsedBytes": 90236528,
"domNodes": 2,
"jsHeapTotalBytes": 417792,
"scriptDurationMs": 945.7339999999998,
"eventListeners": 188,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666636,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "minimap-idle",
"durationMs": 2031.4220000000205,
"styleRecalcs": 4,
"styleRecalcDurationMs": 3.0329999999999977,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 576.482,
"heapDeltaBytes": 10167148,
"heapUsedBytes": 87745920,
"domNodes": -275,
"jsHeapTotalBytes": -2727936,
"scriptDurationMs": 32.288,
"eventListeners": -162,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "minimap-idle",
"durationMs": 2026.5379999999595,
"styleRecalcs": 5,
"styleRecalcDurationMs": 4.275000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 611.5279999999998,
"heapDeltaBytes": 9344124,
"heapUsedBytes": 87247888,
"domNodes": -270,
"jsHeapTotalBytes": -2203648,
"scriptDurationMs": 37.87799999999999,
"eventListeners": -162,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 570.0010000000475,
"styleRecalcs": 46,
"styleRecalcDurationMs": 9.575,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 398.07800000000003,
"heapDeltaBytes": 14997780,
"heapUsedBytes": 88240572,
"domNodes": 18,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 139.234,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 627.8559999999516,
"styleRecalcs": 45,
"styleRecalcDurationMs": 9.775,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 421.18100000000004,
"heapDeltaBytes": 15061540,
"heapUsedBytes": 88156908,
"domNodes": 16,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 147.10000000000002,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2021.6879999999833,
"styleRecalcs": 9,
"styleRecalcDurationMs": 8.583,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 487.429,
"heapDeltaBytes": -5611540,
"heapUsedBytes": 67674880,
"domNodes": -296,
"jsHeapTotalBytes": 6021120,
"scriptDurationMs": 7.907000000000001,
"eventListeners": -240,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "subgraph-idle",
"durationMs": 2004.2989999999463,
"styleRecalcs": 9,
"styleRecalcDurationMs": 9.024,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 497.483,
"heapDeltaBytes": -8097132,
"heapUsedBytes": 64369084,
"domNodes": -296,
"jsHeapTotalBytes": 5758976,
"scriptDurationMs": 8.071000000000002,
"eventListeners": -240,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.670000000000012,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1723.5200000000077,
"styleRecalcs": 77,
"styleRecalcDurationMs": 26.642000000000003,
"layouts": 18,
"layoutDurationMs": 4.515999999999999,
"taskDurationMs": 806.609,
"heapDeltaBytes": -7930072,
"heapUsedBytes": 64468424,
"domNodes": -294,
"jsHeapTotalBytes": 6283264,
"scriptDurationMs": 104.975,
"eventListeners": -242,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1784.191000000078,
"styleRecalcs": 77,
"styleRecalcDurationMs": 27.873,
"layouts": 18,
"layoutDurationMs": 4.777,
"taskDurationMs": 810.3639999999999,
"heapDeltaBytes": 3649372,
"heapUsedBytes": 75741320,
"domNodes": -296,
"jsHeapTotalBytes": 5758976,
"scriptDurationMs": 111.02300000000001,
"eventListeners": -212,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-transition-enter",
"durationMs": 1384.6680000000333,
"styleRecalcs": 18,
"styleRecalcDurationMs": 32.03,
"layouts": 14,
"layoutDurationMs": 15.252999999999998,
"taskDurationMs": 914.6419999999999,
"heapDeltaBytes": -5248572,
"heapUsedBytes": 86401724,
"domNodes": 13751,
"jsHeapTotalBytes": 11010048,
"scriptDurationMs": 30.594000000000005,
"eventListeners": 2385,
"totalBlockingTimeMs": 142,
"frameDurationMs": 16.670000000000012,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8489.631999999972,
"styleRecalcs": 246,
"styleRecalcDurationMs": 33.217,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 5803.254,
"heapDeltaBytes": 9866972,
"heapUsedBytes": 86302808,
"domNodes": -280,
"jsHeapTotalBytes": 118784,
"scriptDurationMs": 2668.523,
"eventListeners": -176,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "viewport-pan-sweep",
"durationMs": 8536.245000000008,
"styleRecalcs": 247,
"styleRecalcDurationMs": 34.431999999999995,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 5843.517000000001,
"heapDeltaBytes": 8478240,
"heapUsedBytes": 85206840,
"domNodes": -269,
"jsHeapTotalBytes": -1191936,
"scriptDurationMs": 2678.126,
"eventListeners": -146,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 17255.881999999987,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 16729.012000000002,
"heapDeltaBytes": -60241792,
"heapUsedBytes": 178408632,
"domNodes": -8072,
"jsHeapTotalBytes": -19316736,
"scriptDurationMs": 277.90500000000003,
"eventListeners": -14933,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.773333333333238,
"p95FrameDurationMs": 16.80000000000291
},
{
"name": "vue-large-graph-idle",
"durationMs": 17484.127999999942,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 16914.192,
"heapDeltaBytes": -54704020,
"heapUsedBytes": 178350908,
"domNodes": -8068,
"jsHeapTotalBytes": -15929344,
"scriptDurationMs": 307.57500000000005,
"eventListeners": -14933,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 20589.916999999958,
"styleRecalcs": 171,
"styleRecalcDurationMs": 16.834000000000017,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 20276.775999999998,
"heapDeltaBytes": -52762652,
"heapUsedBytes": 165072096,
"domNodes": -8068,
"jsHeapTotalBytes": -11808768,
"scriptDurationMs": 916.0350000000001,
"eventListeners": -14927,
"totalBlockingTimeMs": 91,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.80000000000291
},
{
"name": "vue-large-graph-pan",
"durationMs": 21529.359999999997,
"styleRecalcs": 168,
"styleRecalcDurationMs": 18.522999999999957,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 21112.395999999997,
"heapDeltaBytes": -43257436,
"heapUsedBytes": 182529580,
"domNodes": -8068,
"jsHeapTotalBytes": -17784832,
"scriptDurationMs": 965.886,
"eventListeners": -14925,
"totalBlockingTimeMs": 176,
"frameDurationMs": 18.890000000000025,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-node-resize-workload",
"durationMs": 6229.975000000024,
"styleRecalcs": 20,
"styleRecalcDurationMs": 82.60400000000001,
"layouts": 20,
"layoutDurationMs": 23.624000000000006,
"taskDurationMs": 6113.082,
"heapDeltaBytes": -51355604,
"heapUsedBytes": 181372160,
"domNodes": -8068,
"jsHeapTotalBytes": 10285056,
"scriptDurationMs": 112.67500000000001,
"eventListeners": -14929,
"totalBlockingTimeMs": 444,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.80000000000109
},
{
"name": "vue-node-resize-workload",
"durationMs": 6178.806000000009,
"styleRecalcs": 20,
"styleRecalcDurationMs": 78.72900000000004,
"layouts": 20,
"layoutDurationMs": 22.630999999999986,
"taskDurationMs": 6065.914000000002,
"heapDeltaBytes": -55822368,
"heapUsedBytes": 183284328,
"domNodes": -8068,
"jsHeapTotalBytes": 10854400,
"scriptDurationMs": 106.124,
"eventListeners": -14929,
"totalBlockingTimeMs": 445,
"frameDurationMs": 17.77333333333336,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-zoom-out-idle",
"durationMs": 8848.448000000077,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 8502.536,
"heapDeltaBytes": 6672032,
"heapUsedBytes": 177975536,
"domNodes": 0,
"jsHeapTotalBytes": -22282240,
"scriptDurationMs": 154.70100000000008,
"eventListeners": -12,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.219999999999953,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-zoom-out-idle",
"durationMs": 8487.56800000001,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 8299.050000000001,
"heapDeltaBytes": 3906896,
"heapUsedBytes": 178412072,
"domNodes": 0,
"jsHeapTotalBytes": -17825792,
"scriptDurationMs": 127.24999999999997,
"eventListeners": -12,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.223333333333358,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "workflow-execution",
"durationMs": 101.62900000000263,
"styleRecalcs": 7,
"styleRecalcDurationMs": 13.339,
"layouts": 2,
"layoutDurationMs": 0.6000000000000001,
"taskDurationMs": 75.14000000000001,
"heapDeltaBytes": 3110708,
"heapUsedBytes": 72527516,
"domNodes": 110,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 6.527000000000002,
"eventListeners": 35,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 447.4190000000817,
"styleRecalcs": 13,
"styleRecalcDurationMs": 18.104,
"layouts": 2,
"layoutDurationMs": 0.544,
"taskDurationMs": 94.718,
"heapDeltaBytes": 4748284,
"heapUsedBytes": 73142616,
"domNodes": 119,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 7.724999999999998,
"eventListeners": 67,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.670000000000012,
"p95FrameDurationMs": 16.800000000000182
}
]
}🔬 E2E CoverageNote Shard completeness could not be verified for this run, so these totals may not be comparable with a whole merge.
Top 10 files by uncovered lines
|
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## core/1.54 #18637 +/- ##
=============================================
+ Coverage 83.41% 83.68% +0.27%
=============================================
Files 2098 2099 +1
Lines 124150 124366 +216
Branches 31418 33330 +1912
=============================================
+ Hits 103556 104081 +525
+ Misses 20415 20106 -309
Partials 179 179
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 62 files with indirect coverage changes 🚀 New features to boost your workflow:
|
|
Folded into #18631 so core gets one PR. |
## Summary Ports to `core/1.54` every merged `main` Agent fix that `cloud/1.54` carries and core does not (the Agent UI catch-up from #18622, the cloud-only CRDT and workflow fixes, and the round-2 fixes), so both release lines are symmetric ahead of the local-agent rollout. ## Changes - **What**: `cherry-pick -x`, in three groups: - Agent UI, as in #18622: #17339, #17908, #17420, #18348, #18043, #17621 (without its two `src/lib/litegraph/` files; a 5 px HUD offset in `SideToolbar.vue` compensates), #17471, #17690. - Cloud-only fixes: #18063, #18073, #18064, #18033, #18289, #18604, #18616, #18376. - Round 2: #17568, #17628, #16491, #18453, #17767, #18431 (from #18571), #18603. - **Already on `core/1.54`**: #17439 (#18161), #17912 (#18186), #18391 (#18595). - **Excluded**: #17730 (core lacks its three files), #18421 (dead code on core builds), #16917 (conflicts with later core changes), #18066 (Christian's request), #18375 and #18251 (need their litegraph hunks). ## Review Focus - On this line the Agent panel registers only in cloud builds (`src/extensions/core/index.ts:41-44`); the shared chrome from #17621 and #17471 and the host telemetry from #18376 and #18603 ship in every build. - `HostTelemetrySink.ts` and its test equal `main`'s files (#18376, then #18603 on top). - #18064: `agentConversationHostDoc.test.ts` keeps this line's file; #18063's new test uses `main`'s version (multi-player 0.3.x stamps). - Supersedes #18571 and the closed #18637. Linear: [PM-1657](https://linear.app/comfyorg/issue/PM-1657), [PM-1656](https://linear.app/comfyorg/issue/PM-1656) ## Screenshots (if applicable) Visual changes are the ones reviewed on `main` and carried to cloud in #18622. --------- Co-authored-by: uytieu <uytieu@users.noreply.github.com> Co-authored-by: ryan-di <ryan.weihao.di@gmail.com> Co-authored-by: jaeone lee <89377375+jaeone94@users.noreply.github.com> Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Alexander Brown <drjkl@comfy.org> Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com> Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> Co-authored-by: Hunter <huntcsg@users.noreply.github.com> Co-authored-by: Maanil Verma <vermaMaanil97@gmail.com>
Summary
Ports to
core/1.54the merged Agent fixes thatcloud/1.54already carries andcore/1.54does not, so the two release lines stay symmetric ahead of the local-agent rollout. Seven come from theircloud/1.54carriers, in cloud merge order; #18376 comes frommain.On this line the Agent panel registers only in cloud builds (
src/extensions/core/index.ts:41-44), so none of this turns the Agent on for core builds. #18376 does reach desktop builds:src/platform/telemetry/initHostTelemetry.ts:21registersHostTelemetrySink.Linear: PM-1656
Changes
cherry-pick -xof 8 merged fixes, in cloud merge order:main)b7ac01d37b: fix(agent-crdt): keep a human delete across a workflow tab switch #18063's new testagentDeleteTabSwitchRace.test.tsis set tomain's version. The carrier's copy hand-mints multi-player 0.2.1 stamps, which the 0.3.x this line pins rejects; cloud fixed the same test the same way in [backport cloud/1.54] adopt multiplayer 0.3.2 #18304.useMediaAssetActions.ts, andisCloudis a build-time constant that is false on core builds.reportError.ts, its test andcrdt/agentNodeMaterializer.ts, which this line changed in Catalogue-wide Agent backports for core/1.54 #18161, [backport core/1.54] fix: guard reportError against re-entrant reports from Sentry normalization #18528, [backport core/1.54] feat(agent): report a node-id write dropped by CRDT last-write-wins #18417, [backport core/1.54] fix: render widgets on insert_workflow-materialized nodes #18600 and [backport core/1.54] fix(agent): preserve fresher live widget values during CRDT reconcile #18536. A separate port if wanted.package.jsonand the lockfile are unchanged.Review Focus
browser_tests/fixtures/agentConversationHostDoc.test.tskeeps this line's file (the carrier's extra "coalesced canvas clear" test exists only on cloud and callsapplyClient, which this line andmainreplaced withapplyWire);useAgentCrdtFollower.test.tstakes the union of both sides' imports.HostTelemetrySink.ts, +76 in its test).subgraphConvertAutogrowInputs.spec.ts; hosted e2e covers it.Co-authored-by: claude[bot]lines that cloud's squash merges added, since this repo's AI trailer check rejects them. Trees, authors and dates are unchanged; the human co-author line on fix(workflow): drop missing entries from openWorkflows #18033 stays.Resolution and verification, per source
Resolution
git patch-id --stableequals the source's for each.b7ac01d37b(test-only):agentDeleteTabSwitchRace.test.ts=main's blobdbabdfba71, which equals cloud's file after [backport cloud/1.54] adopt multiplayer 0.3.2 #18304. This line'scrdt/opEnvelope.tsalready equalsmain's, somintWireOps, which the fixed test uses, is present.Verification
0f8270a75a:pnpm typecheckandpnpm typecheck:browserexit 0;pnpm test:uniton 89 suites (the 17 the branch changes, 6 colocated suites, 66 importers): 2444 passed, 3 expected-fail and 1 skip, all pre-existing (it.failsinuseAgentSession.test.ts:906,929anduseAgentCrdtFollower.rejectedHumanAdd.test.ts:44;it.skipIf(!isCloud)inapp.test.ts:773).git diff --name-only origin/core/1.54...HEAD -- ':/src/lib/litegraph/'prints nothing (control: the same probe on this line's last litegraph commit5da711f1fblists 3 files)..github/scripts/check-ai-co-authors.sh origin/core/1.54 HEADexits 0.Screenshots (if applicable)
No visual changes beyond those already reviewed on
main.🤖 Generated with Claude Code