Repository navigation
refactor: split litegraph interfaces into leaf and graph-bound types - #19088
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configuration
📒 Files selected for processing (1)
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 6 remain after this review. Your free on-demand review promotion remains active until October 9, 2026 at 6:00 PM UTC. 📝 WalkthroughWalkthroughLiteGraph type declarations move into dedicated modules or their owning modules. Imports and barrel exports across LiteGraph and its application consumers now reference those locations. The summaries report no runtime behavior changes. ChangesLiteGraph type modules
Priority: ⬇️ Low Estimated code review effort: 3 (Moderate) | ~25 minutes Change: Refactor Suggested reviewers: Merge Risk: ⚪ Minimal · up to This test-only import change presents no identified user-facing or operational risk and is mergeable with normal checks. 🚥 Pre-merge checks | ✅ 6 | ❓ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (6 passed)
Full details: End-To-End Regression Coverage For FixesExplanation The PR contains a bug-fix signal ( ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment |
🎭 Playwright: ✅ 2243 passed, 0 failed📊 Browser Reports
🎨 Storybook: ✅ Built — View Storybook🌾 Fallow: ✅ PassedFallow audits the diff for duplication, complexity and dead code. It gates on new findings only, so when the audit completes, a red is something this PR introduced or moved — never inherited backlog. A red can also mean the audit itself did not finish; the details below say which happened. No new findings in the changed files. Reproduce locally# the base the gate compared against
npx fallow audit --root . --quiet --format json \
--changed-since 6b0f2bd013fa16c33932085ba519cf8967b03fa7
Full docs: ADR-DEVEX-LINT-0015 🧩 Custom Nodes Ecosystem Matrix: ✅ PassedExecutes the frontend JS of every registry pack that ships any, against this change, in both renderers. The eight
On a pin-bump PR, a red gate means the ecosystem moved — not that your diff broke something. That is what the bump PR is for. Outside a pin bump or a cold rebuild of the unpinned tail, a red means the diff. Note the corpus size and the executed count are different numbers, and the verdict is against the executed count: roughly 3,100 of ~5,100 packs ship no extension-shaped JS and are skipped. Reproduce locally# build one shard's fixture, then run it
python3 scripts/registry-census/build_matrix.py --shard 1/4
MATRIX_RENDERER=vue MATRIX_VUE=1 \
npx vitest run --config vitest.matrix.config.mts
Full docs: scripts/registry-census/README.md 📦 Bundle: 9.35 MB gzip ⚪ 0 BDetailsSummary
Category Glance App Entry Points — 4.43 kB (baseline 4.43 kB) • ⚪ 0 BMain entry bundles and manifests Status: 1 unchanged Graph Workspace — 2.14 MB (baseline 2.14 MB) • ⚪ 0 BGraph editor runtime, canvas, workflow orchestration Status: 3 unchanged Views & Navigation — 154 kB (baseline 154 kB) • ⚪ 0 BTop-level views, pages, and routed surfaces Status: 19 unchanged Panels & Settings — 671 kB (baseline 671 kB) • ⚪ 0 BConfiguration panels, inspectors, and settings screens Status: 30 unchanged User & Accounts — 54.4 kB (baseline 54.4 kB) • ⚪ 0 BAuthentication, profile, and account management bundles Status: 15 unchanged Editors & Dialogs — 325 kB (baseline 325 kB) • ⚪ 0 BModals, dialogs, drawers, and in-app editors Status: 13 unchanged UI Components — 201 kB (baseline 201 kB) • ⚪ 0 BReusable component library chunks Status: 24 unchanged Data & Services — 3.07 MB (baseline 3.07 MB) • ⚪ 0 BStores, services, APIs, and repositories Status: 22 unchanged Utilities & Hooks — 812 kB (baseline 812 kB) • ⚪ 0 BHelpers, composables, and utility bundles Status: 50 unchanged Vendor & Third-Party — 14.2 MB (baseline 14.2 MB) • ⚪ 0 BExternal libraries and shared vendor chunks Status: 18 unchanged Other — 18.7 MB (baseline 18.7 MB) • ⚪ 0 BBundles that do not match a named category Status: 347 unchanged ⚡ Performance Report
Show regressions
All metrics
Historical variance (last 15 runs)
Trend (last 15 commits on main)
Raw data{
"timestamp": "2026-10-08T07:50:03.906Z",
"gitSha": "ec654bf9fa2181cc001738b5d035a8bab88d3434",
"branch": "drjkl/litegraph-interfaces-split",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2023.1660000000034,
"styleRecalcs": 11,
"styleRecalcDurationMs": 3.7619999999999996,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 452.1410000000001,
"heapDeltaBytes": -50102236,
"heapUsedBytes": 60480412,
"domNodes": -212,
"jsHeapTotalBytes": 1048576,
"scriptDurationMs": 9.161000000000001,
"eventListeners": -148,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66639344262295,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-idle",
"durationMs": 2043.1310000000167,
"styleRecalcs": 11,
"styleRecalcDurationMs": 2.8210000000000006,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 435.47499999999997,
"heapDeltaBytes": -49204128,
"heapUsedBytes": 61510064,
"domNodes": -212,
"jsHeapTotalBytes": 2097152,
"scriptDurationMs": 8.987,
"eventListeners": -148,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665853658536584,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1694.7999999999865,
"styleRecalcs": 72,
"styleRecalcDurationMs": 12.455,
"layouts": 12,
"layoutDurationMs": 3.272,
"taskDurationMs": 564.95,
"heapDeltaBytes": 7602876,
"heapUsedBytes": 78021608,
"domNodes": 0,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 113.703,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665686274509806,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1695.7599999999502,
"styleRecalcs": 72,
"styleRecalcDurationMs": 12.032,
"layouts": 12,
"layoutDurationMs": 3.768,
"taskDurationMs": 672.4010000000001,
"heapDeltaBytes": 3454480,
"heapUsedBytes": 66146804,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 116.86700000000002,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.6656862745098,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1728.1189999999924,
"styleRecalcs": 18,
"styleRecalcDurationMs": 5.173000000000001,
"layouts": 3,
"layoutDurationMs": 0.949,
"taskDurationMs": 231.566,
"heapDeltaBytes": 9151472,
"heapUsedBytes": 73422312,
"domNodes": 45,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 9.467999999999998,
"eventListeners": 39,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665384615384617,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1723.9519999999402,
"styleRecalcs": 18,
"styleRecalcDurationMs": 5.769,
"layouts": 3,
"layoutDurationMs": 1.0170000000000001,
"taskDurationMs": 377.877,
"heapDeltaBytes": -49245816,
"heapUsedBytes": 61662356,
"domNodes": -167,
"jsHeapTotalBytes": 2097152,
"scriptDurationMs": 10.299,
"eventListeners": -109,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666346153846145,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 544.3919999999594,
"styleRecalcs": 17,
"styleRecalcDurationMs": 3.9060000000000006,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 340.95699999999994,
"heapDeltaBytes": 2009400,
"heapUsedBytes": 111817928,
"domNodes": 0,
"jsHeapTotalBytes": 7077888,
"scriptDurationMs": 132.556,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.662499999999994,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "dom-widget-clipping",
"durationMs": 538.4290000000647,
"styleRecalcs": 12,
"styleRecalcDurationMs": 1.9540000000000008,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 328.75600000000003,
"heapDeltaBytes": 19190028,
"heapUsedBytes": 76045916,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 127.586,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665625000000006,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-order-dense-n200-w200-i120",
"durationMs": 1078.6359999999604,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 717.6039999999999,
"heapDeltaBytes": 14557356,
"heapUsedBytes": 94653172,
"domNodes": 0,
"jsHeapTotalBytes": 4096000,
"scriptDurationMs": 51.775,
"eventListeners": 0,
"totalBlockingTimeMs": 450,
"frameDurationMs": 31.858823529411787,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-order-dense-n200-w200-i120",
"durationMs": 1058.2709999999906,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 662.073,
"heapDeltaBytes": 18161296,
"heapUsedBytes": 103908524,
"domNodes": 0,
"jsHeapTotalBytes": 1474560,
"scriptDurationMs": 49.139,
"eventListeners": 0,
"totalBlockingTimeMs": 424,
"frameDurationMs": 31.818181818181817,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-order-sparse-n1000-w20-i120",
"durationMs": 763.9320000000112,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 354.91800000000006,
"heapDeltaBytes": -7666728,
"heapUsedBytes": 81825168,
"domNodes": 0,
"jsHeapTotalBytes": 528384,
"scriptDurationMs": 119.86100000000002,
"eventListeners": 0,
"totalBlockingTimeMs": 142,
"frameDurationMs": 22.549999999999994,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-order-sparse-n1000-w20-i120",
"durationMs": 743.7979999999698,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 350.18200000000024,
"heapDeltaBytes": -8339168,
"heapUsedBytes": 80939480,
"domNodes": 0,
"jsHeapTotalBytes": 528384,
"scriptDurationMs": 102.53699999999999,
"eventListeners": 0,
"totalBlockingTimeMs": 127,
"frameDurationMs": 22.058823529411764,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "extension-clean-combined-draw",
"durationMs": 7707.367000000033,
"styleRecalcs": 3,
"styleRecalcDurationMs": 0.8390000000000012,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 6839.610000000001,
"heapDeltaBytes": 2395868,
"heapUsedBytes": 92771900,
"domNodes": -143,
"jsHeapTotalBytes": -659456,
"scriptDurationMs": 5647.183999999999,
"eventListeners": -77,
"totalBlockingTimeMs": 239,
"frameDurationMs": 27.40142348754448,
"p95FrameDurationMs": 50
},
{
"name": "extension-clean-combined-draw",
"durationMs": 6495.033999999919,
"styleRecalcs": 4,
"styleRecalcDurationMs": 0.9099999999999994,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 5797.384,
"heapDeltaBytes": 12410348,
"heapUsedBytes": 87152308,
"domNodes": -141,
"jsHeapTotalBytes": -10883072,
"scriptDurationMs": 4716.956999999999,
"eventListeners": -69,
"totalBlockingTimeMs": 49,
"frameDurationMs": 25.128682170542636,
"p95FrameDurationMs": 33.400000000001455
},
{
"name": "extension-rgthree-prototype-draw",
"durationMs": 6789.577000000008,
"styleRecalcs": 4,
"styleRecalcDurationMs": 1.1960000000000008,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 6051.987999999999,
"heapDeltaBytes": 9927924,
"heapUsedBytes": 84033124,
"domNodes": -141,
"jsHeapTotalBytes": -11145216,
"scriptDurationMs": 4704.446,
"eventListeners": -69,
"totalBlockingTimeMs": 88,
"frameDurationMs": 25.215613382899633,
"p95FrameDurationMs": 33.400000000000546
},
{
"name": "extension-rgthree-prototype-draw",
"durationMs": 6674.472000000037,
"styleRecalcs": 1,
"styleRecalcDurationMs": 0.18400000000000014,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 5918.6269999999995,
"heapDeltaBytes": 11884240,
"heapUsedBytes": 95576428,
"domNodes": 0,
"jsHeapTotalBytes": -21495808,
"scriptDurationMs": 4579.358,
"eventListeners": 0,
"totalBlockingTimeMs": 41,
"frameDurationMs": 24.69074074074074,
"p95FrameDurationMs": 33.400000000000546
},
{
"name": "large-graph-idle",
"durationMs": 2030.326999999943,
"styleRecalcs": 7,
"styleRecalcDurationMs": 1.6539999999999992,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 474.098,
"heapDeltaBytes": -18815712,
"heapUsedBytes": 87478032,
"domNodes": -308,
"jsHeapTotalBytes": -5378048,
"scriptDurationMs": 27.283999999999995,
"eventListeners": -148,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66639344262295,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2008.7689999999156,
"styleRecalcs": 10,
"styleRecalcDurationMs": 2.581,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 457.894,
"heapDeltaBytes": 884736,
"heapUsedBytes": 84606036,
"domNodes": 0,
"jsHeapTotalBytes": -225280,
"scriptDurationMs": 30.126999999999995,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666115702479335,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2114.4039999999222,
"styleRecalcs": 69,
"styleRecalcDurationMs": 5.92,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1163.221,
"heapDeltaBytes": -397700,
"heapUsedBytes": 83542500,
"domNodes": 0,
"jsHeapTotalBytes": 786432,
"scriptDurationMs": 639.4040000000001,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666141732283467,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-pan",
"durationMs": 2115.605999999957,
"styleRecalcs": 65,
"styleRecalcDurationMs": 3.7890000000000006,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1276.683,
"heapDeltaBytes": 22843000,
"heapUsedBytes": 89067612,
"domNodes": 0,
"jsHeapTotalBytes": 749568,
"scriptDurationMs": 618.424,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665354330708663,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3193.61600000002,
"styleRecalcs": 70,
"styleRecalcDurationMs": 5.925,
"layouts": 60,
"layoutDurationMs": 13.700000000000001,
"taskDurationMs": 1336.946,
"heapDeltaBytes": 10178872,
"heapUsedBytes": 76706848,
"domNodes": 24,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 589.4820000000001,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665968586387432,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3205.8529999999337,
"styleRecalcs": 72,
"styleRecalcDurationMs": 7.401000000000002,
"layouts": 60,
"layoutDurationMs": 15.714000000000002,
"taskDurationMs": 1379.1890000000003,
"heapDeltaBytes": -15308544,
"heapUsedBytes": 71000700,
"domNodes": 24,
"jsHeapTotalBytes": 299008,
"scriptDurationMs": 611.93,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2222.065999999927,
"styleRecalcs": 42,
"styleRecalcDurationMs": 3.842000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1470.8279999999997,
"heapDeltaBytes": 19781136,
"heapUsedBytes": 87232500,
"domNodes": 0,
"jsHeapTotalBytes": 679936,
"scriptDurationMs": 714.744,
"eventListeners": 182,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.791666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2166.6230000000724,
"styleRecalcs": 43,
"styleRecalcDurationMs": 3.1849999999999987,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1398.9769999999999,
"heapDeltaBytes": 9279812,
"heapUsedBytes": 75893784,
"domNodes": -308,
"jsHeapTotalBytes": 749568,
"scriptDurationMs": 668.825,
"eventListeners": 182,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.794573643410853,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "minimap-idle",
"durationMs": 2023.6039999999775,
"styleRecalcs": 6,
"styleRecalcDurationMs": 1.3640000000000005,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 428.949,
"heapDeltaBytes": 23410560,
"heapUsedBytes": 89126628,
"domNodes": -308,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 30.074000000000005,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666115702479342,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "minimap-idle",
"durationMs": 2020.7020000000284,
"styleRecalcs": 8,
"styleRecalcDurationMs": 1.8859999999999988,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 442.949,
"heapDeltaBytes": 23480420,
"heapUsedBytes": 88804392,
"domNodes": -308,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 28.900000000000002,
"eventListeners": -148,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666115702479342,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 494.78099999998904,
"styleRecalcs": 47,
"styleRecalcDurationMs": 3.865,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 328.31399999999996,
"heapDeltaBytes": -8095968,
"heapUsedBytes": 64632864,
"domNodes": 0,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 107.096,
"eventListeners": 46,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000273
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 529.0219999999408,
"styleRecalcs": 48,
"styleRecalcDurationMs": 4.496,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 342.888,
"heapDeltaBytes": -8022540,
"heapUsedBytes": 65227576,
"domNodes": 0,
"jsHeapTotalBytes": 786432,
"scriptDurationMs": 114.801,
"eventListeners": 46,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66562499999999,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2038.7269999999944,
"styleRecalcs": 11,
"styleRecalcDurationMs": 2.458,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 321.218,
"heapDeltaBytes": -48904384,
"heapUsedBytes": 63780084,
"domNodes": -230,
"jsHeapTotalBytes": -3670016,
"scriptDurationMs": 7.920000000000002,
"eventListeners": -194,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666664,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2009.5019999999977,
"styleRecalcs": 10,
"styleRecalcDurationMs": 2.3129999999999993,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 387.791,
"heapDeltaBytes": 9448196,
"heapUsedBytes": 76145588,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 7.324000000000001,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666115702479342,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1733.9489999999387,
"styleRecalcs": 79,
"styleRecalcDurationMs": 13.681,
"layouts": 16,
"layoutDurationMs": 5.322,
"taskDurationMs": 700.011,
"heapDeltaBytes": -12184544,
"heapUsedBytes": 80086180,
"domNodes": -230,
"jsHeapTotalBytes": -5242880,
"scriptDurationMs": 81.919,
"eventListeners": -194,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666346153846153,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1692.7570000000287,
"styleRecalcs": 60,
"styleRecalcDurationMs": 13.688,
"layouts": 16,
"layoutDurationMs": 5.098,
"taskDurationMs": 638.2280000000001,
"heapDeltaBytes": -240336,
"heapUsedBytes": 63164148,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 79.232,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.6656862745098,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-transition-enter",
"durationMs": 916.217999999958,
"styleRecalcs": 18,
"styleRecalcDurationMs": 24.081,
"layouts": 6,
"layoutDurationMs": 10.391999999999998,
"taskDurationMs": 752.977,
"heapDeltaBytes": 33933892,
"heapUsedBytes": 114192336,
"domNodes": 14650,
"jsHeapTotalBytes": 6815744,
"scriptDurationMs": 25.862999999999996,
"eventListeners": 2456,
"totalBlockingTimeMs": 115,
"frameDurationMs": 20.829545454545453,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8201.748999999949,
"styleRecalcs": 251,
"styleRecalcDurationMs": 13.494000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4404.347,
"heapDeltaBytes": -12940196,
"heapUsedBytes": 93534832,
"domNodes": -308,
"jsHeapTotalBytes": -2301952,
"scriptDurationMs": 1997.553,
"eventListeners": -146,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666056910569107,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "viewport-pan-sweep",
"durationMs": 8145.528000000013,
"styleRecalcs": 250,
"styleRecalcDurationMs": 13.924000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4553.528,
"heapDeltaBytes": 7767848,
"heapUsedBytes": 88156200,
"domNodes": 0,
"jsHeapTotalBytes": 1048576,
"scriptDurationMs": 2093.347,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665848670756645,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 12988.471000000005,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 12156.696,
"heapDeltaBytes": -45943356,
"heapUsedBytes": 185992916,
"domNodes": -3046,
"jsHeapTotalBytes": 7884800,
"scriptDurationMs": 179.702,
"eventListeners": -14915,
"totalBlockingTimeMs": 0,
"frameDurationMs": 21.71036789297659,
"p95FrameDurationMs": 33.400000000001455
},
{
"name": "vue-large-graph-idle",
"durationMs": 13328.836000000025,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 12510.395,
"heapDeltaBytes": -45952556,
"heapUsedBytes": 183083920,
"domNodes": -3046,
"jsHeapTotalBytes": 1855488,
"scriptDurationMs": 194.40400000000002,
"eventListeners": -14915,
"totalBlockingTimeMs": 0,
"frameDurationMs": 22.34261744966443,
"p95FrameDurationMs": 33.400000000001455
},
{
"name": "vue-large-graph-pan",
"durationMs": 15647.557000000006,
"styleRecalcs": 82,
"styleRecalcDurationMs": 8.154999999999996,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 15182.185999999998,
"heapDeltaBytes": -29480332,
"heapUsedBytes": 190799528,
"domNodes": -3046,
"jsHeapTotalBytes": 5767168,
"scriptDurationMs": 735.665,
"eventListeners": -14913,
"totalBlockingTimeMs": 0,
"frameDurationMs": 27.79626998223801,
"p95FrameDurationMs": 66.60000000000036
},
{
"name": "vue-large-graph-pan",
"durationMs": 16291.780000000017,
"styleRecalcs": 110,
"styleRecalcDurationMs": 9.941000000000006,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 15748.944000000001,
"heapDeltaBytes": -41341156,
"heapUsedBytes": 188932732,
"domNodes": -3046,
"jsHeapTotalBytes": 8728576,
"scriptDurationMs": 734.65,
"eventListeners": -14913,
"totalBlockingTimeMs": 0,
"frameDurationMs": 28.674868189806674,
"p95FrameDurationMs": 66.60000000000218
},
{
"name": "vue-node-resize-workload",
"durationMs": 4851.49899999999,
"styleRecalcs": 20,
"styleRecalcDurationMs": 56.005,
"layouts": 20,
"layoutDurationMs": 22.58099999999999,
"taskDurationMs": 4696.292,
"heapDeltaBytes": 1230848,
"heapUsedBytes": 221218612,
"domNodes": 0,
"jsHeapTotalBytes": 1048576,
"scriptDurationMs": 83.91100000000002,
"eventListeners": 0,
"totalBlockingTimeMs": 5,
"frameDurationMs": 26.647802197802207,
"p95FrameDurationMs": 50.100000000000364
},
{
"name": "vue-node-resize-workload",
"durationMs": 4908.731999999986,
"styleRecalcs": 20,
"styleRecalcDurationMs": 59.15199999999998,
"layouts": 20,
"layoutDurationMs": 23.022000000000002,
"taskDurationMs": 4742.811000000001,
"heapDeltaBytes": 1269572,
"heapUsedBytes": 219777556,
"domNodes": 0,
"jsHeapTotalBytes": 1310720,
"scriptDurationMs": 82.16,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 29.978048780487814,
"p95FrameDurationMs": 50.100000000000364
},
{
"name": "vue-zoom-out-idle",
"durationMs": 6890.848000000005,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 6456.210999999999,
"heapDeltaBytes": -40737492,
"heapUsedBytes": 186084504,
"domNodes": -3046,
"jsHeapTotalBytes": 1417216,
"scriptDurationMs": 111.35000000000001,
"eventListeners": -14915,
"totalBlockingTimeMs": 0,
"frameDurationMs": 23.38915254237288,
"p95FrameDurationMs": 33.400000000001455
},
{
"name": "vue-zoom-out-idle",
"durationMs": 6497.281999999927,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 6163.432000000002,
"heapDeltaBytes": -30383324,
"heapUsedBytes": 185653788,
"domNodes": -3046,
"jsHeapTotalBytes": 8773632,
"scriptDurationMs": 99.83400000000003,
"eventListeners": -14915,
"totalBlockingTimeMs": 0,
"frameDurationMs": 21.665666666666663,
"p95FrameDurationMs": 33.400000000001455
},
{
"name": "workflow-execution",
"durationMs": 469.3969999999581,
"styleRecalcs": 23,
"styleRecalcDurationMs": 19.724,
"layouts": 5,
"layoutDurationMs": 2.575999999999999,
"taskDurationMs": 140.35000000000002,
"heapDeltaBytes": 6739512,
"heapUsedBytes": 67254940,
"domNodes": 138,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 13.746,
"eventListeners": 81,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66428571428573,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 102.3289999999406,
"styleRecalcs": 7,
"styleRecalcDurationMs": 7.856999999999999,
"layouts": 3,
"layoutDurationMs": 0.7619999999999999,
"taskDurationMs": 86.59400000000001,
"heapDeltaBytes": 4168772,
"heapUsedBytes": 111575328,
"domNodes": 98,
"jsHeapTotalBytes": 1310720,
"scriptDurationMs": 5.104000000000001,
"eventListeners": 33,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.650000000000016,
"p95FrameDurationMs": 16.700000000000273
},
{
"name": "agent-composer-empty-conversation-typing",
"durationMs": 468.77900000004047,
"styleRecalcs": 77,
"styleRecalcDurationMs": 67.048,
"layouts": 76,
"layoutDurationMs": 16.762,
"taskDurationMs": 425.932,
"heapDeltaBytes": 14082220,
"heapUsedBytes": 84004224,
"domNodes": 77,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 158.23999999999998,
"eventListeners": 876,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.664285714285693,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "agent-composer-empty-conversation-typing",
"durationMs": 511.3560000000916,
"styleRecalcs": 77,
"styleRecalcDurationMs": 71.816,
"layouts": 76,
"layoutDurationMs": 18.118,
"taskDurationMs": 477.343,
"heapDeltaBytes": 14521344,
"heapUsedBytes": 86893112,
"domNodes": 77,
"jsHeapTotalBytes": 786432,
"scriptDurationMs": 173.38400000000001,
"eventListeners": 876,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.667741935483896,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "agent-composer-long-conversation-typing",
"durationMs": 879.3709999999919,
"styleRecalcs": 77,
"styleRecalcDurationMs": 197.584,
"layouts": 76,
"layoutDurationMs": 18.270000000000003,
"taskDurationMs": 854.029,
"heapDeltaBytes": 6973212,
"heapUsedBytes": 120157548,
"domNodes": 77,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 247.458,
"eventListeners": 876,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.9811320754717,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "agent-composer-long-conversation-typing",
"durationMs": 803.9750000000367,
"styleRecalcs": 77,
"styleRecalcDurationMs": 184.975,
"layouts": 76,
"layoutDurationMs": 17.358999999999998,
"taskDurationMs": 776.663,
"heapDeltaBytes": -16167952,
"heapUsedBytes": 114545484,
"domNodes": 77,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 219.89399999999998,
"eventListeners": 876,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665306122448968,
"p95FrameDurationMs": 16.800000000000182
}
]
}🔬 E2E Coverage
Top 10 files by uncovered lines
|
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## main #19088 +/- ##
==========================================
+ Coverage 85.82% 86.65% +0.82%
==========================================
Files 3586 2531 -1055
Lines 171877 143637 -28240
Branches 47151 39121 -8030
==========================================
- Hits 147521 124472 -23049
+ Misses 22341 18779 -3562
+ Partials 2015 386 -1629
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 1062 files with indirect coverage changes 🚀 New features to boost your workflow:
|
interfaces.ts now imports only branded IDs and enums, so Rectangle, measure, ConstrainedSize, LGraphBadge, LGraphButton, SlotBase and 15 app modules (linkStore, rerouteStore, ...) leave the import-cycle SCC (923 -> 905). Graph-bound contracts move to types/slots.ts, types/linkNetwork.ts, types/contextMenu.ts, types/panel.ts; CreateNodeOptions to LiteGraphGlobal, NewNodePosition/IBoundaryNodes to utils/arrange, Hoverable to types/events. The litegraph barrel exports are unchanged. Amp-Thread-ID: https://ampcode.com/threads/T-01a0dcdd-4461-71d3-be73-0705e36d5297
8d57382
84bb457 to
8d57382
Compare
christian-byrne
left a comment
There was a problem hiding this comment.
The interface relocation preserves the LiteGraph type contracts and public barrel exports. I verified the current head, the type-only migration, and the required checks.
…sion (Comfy-Org#19109) ## Summary Cuts `services/litegraphService.ts -> composables/maskeditor/useMaskEditor.ts`, the edge that pulled the mask editor composables and components into the services import cycle. Import cycles in the original stack, on top of Comfy-Org#19108: 496 -> 484 cyclic modules, largest SCC 284 -> 272; frees 12 modules (`composables/maskeditor/*`, `components/maskeditor/*`). Alone on current `main` the counts do not change (1027 cyclic modules, largest SCC 983, 4562 cyclic edges). Targets `main` directly; in the original stack it sat on Comfy-Org#19108. Tracks FE-2769 / FE-3037. ## Changes - `Comfy.MaskEditor` extension contributes the "Open in MaskEditor | Image Canvas" node menu item from `beforeRegisterNodeDef`, wrapping `nodeType.prototype.getExtraMenuOptions` (calls the existing handler, keeps its return value, then pushes the item), with the same `clipspace_return_node` and `isImageNode` guards and the same `'preview'` media-action marking. - `litegraphService.ts` drops the item and the `useMaskEditor` import. - `maskeditor.test.ts` covers the guards, the callback target, the preview marking, and chaining with an existing `getExtraMenuOptions` handler. ## Review Focus - Extension contract: the item stays in the `options` array that `getExtraMenuOptions` fills, so custom nodes that wrap `getExtraMenuOptions` and look the item up by label (ComfyUI-prompt-formula, ComfyUI-PreviewBridgeExtended) keep working. Core extensions register before custom ones, so `litegraphService` installs the prototype handler, this wrapper runs next, and later wrappers see the item. Menu position is unchanged in both the litegraph and the Vue menu. - Blueprint subgraph node classes (`litegraphService` creates them without calling `beforeRegisterNodeDef`) do not get the item. Before, they got it only with an image preview, which blueprints do not have. - `filterUnavailableCoreMediaMenuActions` in `useMoreOptionsMenu` still hides the item when the node has no preview, because the callback keeps the `'preview'` mark. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | **Comfy-Org#19109** (this PR) | **`main`** | **Mask editor menu item into `Comfy.MaskEditor` extension** | **1027 -> 1027** | **983 -> 983** | **4562 -> 4562** | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> --------- Co-authored-by: Amp <amp@ampcode.com>
…ab (Comfy-Org#19113) ## Summary Stacked on Comfy-Org#19111, in a chain rooted on `main` (Comfy-Org#19091 -> Comfy-Org#19107 -> Comfy-Org#19108 -> Comfy-Org#19111 -> Comfy-Org#19113). In the original stack it sat on Comfy-Org#19112. Tracks FE-2769 / FE-3037. `sidebarTabStore` hard-coded the model-library tab: when `Comfy.ModelLibrary.UseAssetBrowser` and the `assetsEnabled` flag were set, its toggle command opened the asset browser instead of the sidebar. That single tab pulled `openModelLibraryBrowser`, `useFeatureFlags`, and `settingStore` into the store and into the stores/scripts import cycle. Import cycles, measured with dependency-cruiser on `src` (the `pnpm lint:cycles` script arrives with Comfy-Org#19085) against Comfy-Org#19111's branch: cyclic modules 751 -> 747, largest cycle 698 -> 694, cyclic edges 3480 -> 3460. ## Changes - `SidebarTabExtension` gains an optional `onToggle?: () => boolean | Promise<boolean>` hook. The toggle command calls it first and only toggles the sidebar when the hook returns false or is absent. - `useModelLibrarySidebarTab` sets `onToggle` with the asset browser routing that used to live in the store. - `sidebarTabStore` loses the tab-id special case and its three imports. - Tests: the model-library cases move to `useModelLibrarySidebarTab.test.ts`; `sidebarTabStore.test.ts` covers the hook contract (absent, declines, handles) as a table. ## Review Focus - `onToggle` is new public API: `SidebarTabExtension` is exported from `src/types`, so the field ships in the published types package. Extensions that register a sidebar tab can now intercept the toggle by returning true; nothing else changes for them. - The routing now belongs to the core tab object, not to the `model-library` id. A tab registered under that id by anything other than `useModelLibrarySidebarTab` no longer opens the asset browser. - The tab and its `Workspace.ToggleSidebarTab.model-library` command keep their ids, so the keybinding default is unaffected. `missingModelDownload` sets `activeSidebarTabId` directly and never ran the toggle command, so it opens the sidebar tree as before. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | **Comfy-Org#19113** (this PR) | **Comfy-Org#19111 (measured on Comfy-Org#19112)** | **Model library asset-browser routing onto the sidebar tab** | **471 -> 467** | **257 -> 253** | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> --------- Co-authored-by: Amp <amp@ampcode.com>
…ce (Comfy-Org#19092) ## Summary Targets `main` (Comfy-Org#19088, Comfy-Org#19089 and Comfy-Org#19091 merged; rebased onto `main` at 0ef0276). Moves `loadExtensions` out of `extensionService` into `src/services/extensionLoader.ts`, called from `GraphCanvas.vue` before `app.setup()`. `extensionService` imported `extensions/core/index` so `loadExtensions` could pull the core extensions in. Every core extension imports `app`, which imports `extensionService`, so the whole `extensions/core` tree and the UI it reaches (load3d, mask editor, painter, image compare, agent panel, ...) sat in the same import cycle as the app object. `GraphCanvas.vue` already owns the bootstrap sequence and is outside the cycle, so it is the right owner of the "load extensions" step. Measured with dependency-cruiser on `src` (the Comfy-Org#19085 config, run locally), against `main` at 0ef0276: | | before | after | | --- | --- | --- | | modules in any cycle | 631 | 500 | | largest cycle | 421 | 285 | | cyclic edges | 2451 | 2034 | Tracks FE-2769 / FE-3037. ## Changes - New `src/services/extensionLoader.ts` with `loadExtensions()`, `shouldLoadExtension()`, `importCustomExtension()` and `reportExtensionLoadFailures()` (moved verbatim from `main`, including the `extensions-load-core` / `extensions-load-custom` subphases from Comfy-Org#19888 and the aggregate failure report). `extensionService.test.ts` becomes `extensionLoader.test.ts`. - `extensionService` drops `loadExtensions` and its `api`, `bootstrapTracer`, `reportError` and `getErrorMessage` imports; it keeps `registerExtension`, `invokeExtensions`, `invokeExtensionsAsync`. - Comfy-Org#19730 (subphase timings, previously merged into this branch) is dropped from the branch because `main` carries the same instrumentation via Comfy-Org#19888. - `GraphCanvas.vue` runs `bootstrapTracer.settle('bootstrap/extensions-load', loadExtensions)` right before `comfyApp.setup()`. `app.setup()` no longer loads extensions. - `GraphCanvas.test.ts` mocks the loader; `SelectionToolbox.test.ts` drops `loadExtensions` from its service mock. - `browser_tests/types/globals.d.ts` imports `@/types` explicitly. The browser typecheck (`lint-pr / typecheck-aux`) only reached the app's `Window` augmentation through `app -> extensionService -> extensions/core`, and that path is gone. ## Review Focus - Ordering change: extension modules now import before `app.setup()` runs `syncWorkflows()` and `fetchSubgraphs()` and before `bodyTop`/`canvasContainer`/`canvasElRef` are assigned, instead of after. Extension hooks (`init`, `setup`, `registerCustomNodes`, `addCustomNodeDefs`) still run inside `app.setup()` exactly as before, so an extension only notices if it reads those at module top level. Nothing in `extensions/core` does. - The `bootstrap/extensions-load` tracer phase keeps its name and position between `workflows` and `extensions-init`. - `src/services/` is a frozen directory per the pre-commit hook; the loader sits next to `extensionService`, which it was split from. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | **Comfy-Org#19092** (this PR) | **Comfy-Org#19091** | **Load extensions from bootstrap, not `extensionService`** | **669 -> 580** | **465 -> 371** | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> Co-authored-by: Amp <amp@ampcode.com>
…fy-Org#19118) ## Summary Re-implemented on current `main` (the original commit no longer applied after `api.ts` gained `authCredential`, the web-session fetch and unified remint). Now targets `main` directly. Tracks FE-2769 / FE-3037. `ComfyApi` reached into the auth layer itself: it lazily imported `authStore` for the Firebase header and WebSocket token, and imported `remintRetry` for the 401 re-mint fetch. Both pull the cloud auth graph (workspace store, session cookie, feature flags, SSO dialogs) into `api.ts`, the most imported module in `src/`. The client now takes an `ApiAuthProvider`; the cloud provider is installed from `main.ts`. Import cycles (dependency-cruiser on `src`, against `main` at 18a9c42): 511 -> 457 cyclic modules, largest SCC 296 -> 232, cyclic edges 2121 -> 1811 (15 -> 17 cycles: the big SCC splits). ## Changes - `src/platform/auth/apiAuthProvider.ts` (leaf): `ApiAuthProvider` interface (`waitForInitialization`, `getAuthHeader`, `getAuthToken`, `shouldRetryOn401`, `fetch`), `RetrySignalLifecycle`, and `anonymousApiAuthProvider` (no header, no token, no retry, plain `fetch`). - `src/platform/auth/cloudApiAuthProvider.ts`: the moved token logic (auth-store wait bounded by `AUTH_INIT_TIMEOUT_MS` from `@/scripts/apiTimeouts`, header/token lookup with the same `console.warn` fallbacks, WebSocket token telemetry, `shouldRemintCloudRequest`, `fetchWithUnifiedRemint`). `installCloudApiAuth()` sets it on `api`. - `api.ts`: `setAuthProvider`; `addCloudAuthHeader`, `addSocketAuth` and the token-path `fetch` delegate to the provider. No more `authStore` or `remintRetry` imports. The web-session path (`webSessionRequests`, `scopeMediaRoute`), `authCredentialOf` / `notifyAuthCredential` reporting and the `isCloud` gates stay where they are: those modules are leaves. - `main.ts`: `installCloudApiAuth()` in the existing `isCloud` block, before any request. - `remintRetry.ts` imports `RetrySignalLifecycle` from the leaf instead of declaring it. - Second commit: `ToastAction` / `ToastOptions` move from `types/extensionTypes.ts` to a new leaf `types/toastOptions.ts` (`extensionTypes` re-exports them, so `@/types` is unchanged). Comfy-Org#16313 made `api.ts` import `components/ui/toast/toastStore`, which took these types from `extensionTypes`, and `extensionTypes` reaches `workflowStore`, `dialogService` and `commandStore` through type imports. Without this move the provider split leaves `api.ts` inside the application SCC and the numbers above do not change at all. - Tests: cloud integration suites (`api.fetchApi`, `api.socketReset`, `webSessionFlagOff`, `webSessionFlagOn`, `nonWebClientsStayOnTokens`) call `installCloudApiAuth()` where they previously relied on the lazy import; the localhost row installs the anonymous provider, as a local build does. New `it.for` table in `api.fetchApi.test.ts` checks the header is applied, the retry decision is consulted only for authenticated requests, and the request goes through the provider's `fetch`. ## Review Focus - Install ordering. Requests made before `installCloudApiAuth()` are anonymous. `main.ts` installs it first thing in the cloud block; `refreshRemoteConfig({ useAuth: false })` uses bare `fetch`, so nothing earlier needs credentials. - Difference from the first version of this PR: `fetchApi` and `createSocket` keep their `isCloud` gates. On `main` the web session is switched on by a server feature flag, not by distribution, so dropping the gate could route a local build's requests through the session. Keeping it also leaves the local `createSocket` path synchronous, so `api.featureFlags.test.ts` needs no change. - Behavior moved, not changed: same timeout, warnings, and telemetry event for a missing WebSocket token. The telemetry import in the provider is static; `api.ts` already imported `useTelemetry` statically, so the old dynamic import saved nothing. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | **Comfy-Org#19118** (this PR) | **Comfy-Org#19116** | **Inject the api auth provider from `main.ts`** | **464 -> 447** | **250 -> 233** | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end -->
… of scripts/widgets (Comfy-Org#19093) ## Summary Targets `main` (Comfy-Org#19092 merged). Splits `src/scripts/widgets.ts` into the `ComfyWidgets` registry, a leaf type module, and the control_after_generate helpers. `widgets.ts` imported all 22 widget composables to build the registry, and every composable imported `ComfyWidgetConstructorV2` from `widgets.ts`. That type edge put the whole `vueNodes/widgets/composables` tree into the app import cycle even though the type only needs `LGraphNode`, `InputSpec` and `IBaseWidget`. Measured with dependency-cruiser on `src` (the Comfy-Org#19085 config, run locally), against `main` at 18a9c42: | | before | after | | --- | --- | --- | | modules in any cycle | 511 | 496 | | largest cycle | 296 | 281 | | cyclic edges | 2121 | 2085 | Tracks FE-2769 / FE-3037. ## Changes - New `src/types/widgetConstructor.ts` with `ComfyWidgetConstructorV2`. The 22 composables and `widgets.ts` import it from there. `ComfyWidgetConstructor` (V1) and `CustomComfyWidgetConstructor` stay in `widgets.ts` because they take `ComfyApp`. - New `src/core/graph/widgets/valueControlWidgets.ts` with `addValueControlWidget`, `addValueControlWidgets`, `updateControlWidgetLabel` and their private helpers, moved verbatim from current `main` (including `controlAfterGenerateNameOverride` and the `isValueControlMode` handling added since the branch forked). `useIntWidget`, `useFloatWidget`, `useComboWidget`, `widgetInputs.ts` and `GraphCanvas.vue` import from it. `widgets.controlAfterGenerateName.test.ts` moves with them as `valueControlWidgets.controlAfterGenerateName.test.ts`. - `useLightInfoWidget.ts` (added on `main` since the original PR) imports `ComfyWidgetConstructorV2` from `@/types/widgetConstructor` like the other composables. - `widgets.ts` no longer re-exports `IS_CONTROL_WIDGET`; `GraphCanvas.vue` imports it from `core/graph/widgets/controlWidgetMarker`. - `valueControl.ts`, `controlWidgetMarker.ts` and `promotedWidgetControl.ts` move out of `scripts/` into `core/graph/widgets` and `core/graph/subgraph`; `health.json` follows `valueControl.ts`. - `widgets.ts` keeps `export const` declarations of the three value-control helpers because `comfyAPIPlugin` only exposes declarations through the `scripts/widgets.js` shim that custom nodes import (`.fallowrc.jsonc` lists them as public, `build/plugins/comfyAPIPlugin.test.ts` asserts them). `useComboWidget.test.ts` mocks all three, since the shim reads them at module load. - `useIntWidget.test.ts` and `useFloatWidget.test.ts` add `vi.mock(import('@/scripts/app'))` (the repo's manual mock). Their old `vi.mock('@/scripts/widgets')` had also been preventing the registry from evaluating; with the registry no longer mocked, the pre-existing `settingStore -> app -> extensionService -> widgetStore -> widgets` runtime cycle reached `useIntWidget()` before its definition. Production import order is unaffected: `app.ts` is entered first there, as before. ## Review Focus - `valueControlWidgets.ts` stays in the cycle (it needs `useSettingStore`); it did not go into `valueControl.ts` because that would have pulled `valueControl.ts` and `promotedWidgetControl.ts` into the cycle too. - The 7 composables still in the cycle (`useComboWidget`, `useIntWidget`, `useFloatWidget`, `useImageUploadWidget`, ...) reach it through `settingStore`, `assetService` or node output stores, not through `widgets.ts`. - `src/types/` was chosen for the type because `simplifiedWidget.ts` and `widgetState.ts` already live there as widget leaf types. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | **Comfy-Org#19093** (this PR) | **Comfy-Org#19092** | **Split `scripts/widgets.ts` registry, types, helpers** | **580 -> 566** | **371 -> 357** | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> --------- Co-authored-by: Amp <amp@ampcode.com>
…Comfy-Org#19121) ## Summary Re-implemented on current `main` (the original commit no longer applied after `workspaceApi` gained the web-session adapter path). Comfy-Org#19118 has merged, so this is now one commit on `main`. Tracks FE-2769 / FE-3037. `workspaceApi` imported `authStore` for its request headers and `remintRetry` to attach the 401 re-mint interceptor at module load. Both edges put the workspace billing SDK, capability composables, and churnkey modules inside the auth cycle. The client now receives its credentials through `setWorkspaceApiAuth`, wired from `main.ts`, the same shape as Comfy-Org#19118. Import cycles (dependency-cruiser on `src`, against `origin/main` at b835c9d): 459 -> 439 cyclic modules, largest SCC 234 -> 214, cyclic edges 1815 -> 1730. ## Changes - `workspaceApi.ts`: module-private `WorkspaceApiAuth` (`getWorkspaceAuthHeader`, `getFirebaseAuthHeader`, `attachRetryInterceptor`) and exported `setWorkspaceApiAuth`, which stores the auth and attaches the interceptor to the axios client. `requestAuth` keeps its web-session adapter branch and falls back to the installed workspace header; `acceptInvite` uses the installed Firebase header. Calls that reach the token path before installation throw `WorkspaceApiError('Workspace API auth is not installed', 401)`. No more `authStore` or `remintRetry` imports; `capabilityRevision` still attaches at module load because it has no auth dependency. - New `workspaceApiAuth.ts`: `installWorkspaceApiAuth()` binds the auth-store `*OrThrow` getters and `attachUnifiedRemintInterceptor`. - `main.ts` calls `installWorkspaceApiAuth()` on every distribution, right after the cloud block. It cannot share the `isCloud` gate with `installCloudApiAuth()`: `authStore.getWorkspaceAuthToken` initializes `teamWorkspaceStore` (and so calls `workspaceApi.list()`) for a signed-in user on desktop/local too. - `workspaceApi.test.ts` installs the auth once at module scope; the store actions it stubs are the same ones the installer binds. `webSessionFlagOn.test.ts` installs it next to `installCloudApiAuth()` so the suite runs the production wiring. ## Review Focus - The interceptor is attached in `setWorkspaceApiAuth`, so calling it twice attaches two re-mint interceptors. `main.ts` calls it once; the test files install once at module scope for the same reason. - Unconfigured state only exists before `main.ts` runs. Previously a header lookup in that window would have thrown `AuthStoreError`; it now throws `WorkspaceApiError`. The web-session path never needed the auth store and is unaffected. - `WorkspaceApiAuth` is module-private; nothing outside `workspaceApi.ts` names the type. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | **Comfy-Org#19121** (this PR) | **Comfy-Org#19118** | **Install workspace api credentials from `main.ts`** | **447 -> 428** | **233 -> 214** | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end -->
…g#19116) ## Summary Targets `main`; the rest of this chain (Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19113) has merged. Tracks FE-2769 / FE-3037. `executionStore` drove the node text preview widget itself: it bound the `progress_text` socket event, resolved the node on the canvas, called `showTextPreview`, and on job reset walked the job's nodes to `removeTextPreview`. That pulled `useNodeProgressText` (and through it the widget layer and `app`) plus `canvasStore` into the store. Separately, `workflowStore` imported `executionStore` to rewrite session job paths on rename, while `executionStore` imports `workflowStore`; fallow flags that two-module cycle once this PR touches `executionStore`. Import cycles, measured with dependency-cruiser on `src` (the `pnpm lint:cycles` script arrives with Comfy-Org#19085) against `main`: cyclic modules 421 -> 418, largest cycle 196 -> 193, cyclic edges 1687 -> 1679. The rename change removes one of those edges; both stores stay in the large cycle through other paths. ## Changes - `executionStore` exposes `onJobReset` (vueuse `createEventHook`) and triggers it with the finished `QueuedJob` inside `resetExecutionState`, before the job is dropped. `QueuedJob` is exported for the listener type. The store no longer imports `useNodeProgressText`, `canvasStore`, or `parseNodeId`, and `progress_text` is no longer bound in `bindExecutionEvents`. - New `useProgressTextPreviews` composable listens to `api` `progress_text` and `executionStore.onJobReset` and owns the widget calls. GraphView mounts it next to `useProgressFavicon`. `GraphView.test.ts` is unchanged. - `workflowStore` no longer imports `executionStore`. `renameWorkflow` triggers a new `onWorkflowRenamed` hook where it used to call `rewriteSessionWorkflowPaths`, and `executionStore` subscribes in its setup. `rewriteSessionWorkflowPaths` is now private. - Tests: the progress_text and widget-removal cases move to `useProgressTextPreviews.test.ts` (real execution store, the shared `api` automock, fixtures built in each test, scope stopped with `onTestFinished`), which adds cases for the active-prompt filter, for mapping a nested execution id, and for disposal removing both listeners. Removal there is driven through `clearActiveJobIfStale`. `executionStore.test.ts` keeps one table asserting `onJobReset` fires with the job after success, interrupt, and error, and drops `progress_text` from the unbind list. Its session-path tests now drive a real `renameWorkflow`; the matching rename test in `workflowStore.test.ts` is removed and its duplicate-graph-id case lives in `executionStore.test.ts`. - E2E: the Flux2 rerun spec's progress-text test now checks the status line is visible on the node while it runs, then hidden and gone from the widget store after `execution_success`. Before, it only checked removal, so it passed even if the preview never appeared. ## Review Focus - `createEventHook` follows the existing pattern in `cloudWebSessionStore` (`onSignedOutElsewhere`). Its `on` auto-unsubscribes when the calling scope (GraphView) is disposed, and `trigger` calls listeners synchronously, so the listener sees the job before `resetExecutionState` deletes it. - Listener lifetime: `useEventListener(api, 'progress_text')` binds at GraphView setup and unbinds when GraphView's scope is disposed. Before, the store bound it in `bindExecutionEvents` (GraphView `onMounted`) and unbound it in `unbindExecutionEvents` (`onBeforeUnmount`). `progress_text` only matters once the canvas exists, and the handler already ignores events with no canvas. - Rename timing: the hook fires synchronously at the point the direct call ran, right after `workflow.rename` and before the lookup swap and bookmark awaits, so linear-mode outputs keep matching the renamed workflow. When `executionStore` does not exist yet there is no session state to rewrite. - Behavior is otherwise unchanged. The filters (active prompt only, nested execution ids mapped through `workflowStore`, active workflow only on reset) keep the same logic; node lookup is now one shared `findNode` helper. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | **Comfy-Org#19116** (this PR) | **Comfy-Org#19113** | **Progress text previews out of `executionStore`** | **467 -> 464** | **253 -> 250** | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> --------- Co-authored-by: Amp <amp@ampcode.com>
## Summary Targets `main` directly, rebased onto cb72d45 after Comfy-Org#19093 merged (6067dee). The original sat on Comfy-Org#19121; Comfy-Org#19118 and Comfy-Org#19121 are no longer in this chain. Tracks FE-2769 / FE-3037. `dialogService` bundled the core prompt/confirm/error dialogs with every auth, billing, workspace, cloud-notification and ComfyHub dialog. Any module that called `confirm()` transitively imported the billing and workspace layers, and `workspaceStore -> dialogService -> useBillingContext -> ... -> workspaceStore` held the whole platform layer in the app SCC. The core service keeps `showExecutionErrorDialog`, `showErrorDialog`, `prompt`, `confirm`, `showExtensionDialog`, `showLayoutDialog` and `showSmallLayoutDialog`. Feature dialogs move verbatim into per-feature composables. Extensions still see every dialog on `app.extensionManager.dialog`. Import cycles on `main` cb72d45: 421 -> 412 cyclic modules, largest SCC 196 -> 187, 1687 -> 1648 cyclic edges. ## Changes - `dialogService.ts`: core dialogs only. Declares `ExtensionDialogService` (core + feature signatures, leaf types only), `registerExtensionDialogService()` and `useExtensionDialogService()`. - `extensionDialogService.ts`: `createExtensionDialogService()` spreads the core service and the feature composables. `App.vue` registers it before `useWorkspaceStore()` is created; `workspaceStore.dialog` reads the registry. `ExtensionManager.dialog` is typed `ExtensionDialogService`. - New composables, functions moved unchanged: `composables/auth/useAuthDialogs.ts`, `composables/billing/useBillingDialogs.ts`, `platform/workspace/composables/useWorkspaceDialogs.ts`, `platform/cloud/notification/composables/useCloudNotificationDialog.ts`; `showPublishDialog` joins `useComfyHubPublishDialog`. The shared `workspaceDialogProps` object becomes `SELF_STYLED_PANEL_DIALOG_PROPS` in `components/ui/dialog/dialog.variants.ts`, next to `HUG_CONTENT_CLASS` and `SELF_STYLED_PANEL_CONTENT_CLASS`, which `main` already has there. - `composables/billing/types.ts` gains `TopUpCreditsDialogOptions`, `SubscriptionDialogOptions`, `DowngradeToPersonalResult`. `ConfirmationDialogType` moves to `components/dialog/content/confirmationDialogTypes.ts`. - `useSettingsDialog` calls `dialogStore.showDialog` directly with the same renderer/headless/closable props `showLayoutDialog` applied. - Callers switch from `useDialogService().showX` to the owning composable. Tests get a `__mocks__` per feature composable; billing dialog tests move next to `useBillingDialogs` (`git mv`), and the two `showCancelSubscriptionDialog` guard tests move from `dialogService.concurrency.test.ts` into `useBillingDialogs.cancelSubscription.test.ts`. `useInviteUrlLoader` and `UserPanel` (added on `main` since the original) switch to `useWorkspaceDialogs` / `useAuthDialogs` too. The downgrade-failure toast in `useBillingDialogs` uses the `useToast()` API from Comfy-Org#16313, as the moved code on `main` does. ## Review Focus - Registry over direct import: `workspaceStore` importing the aggregator directly keeps every feature composable in the SCC (in the original stack, simulated 185 vs 172). The registry is a module-level `let` guarded by `assert` from `@/base/assert`; `App.vue` is the only registration site. - `useExtensionDialogService()` before registration is a programming error: `assert` throws in DEV and reports in production. - Browser test fixtures (`PublishDialog.ts`, `CloudNotification.ts`) call `window.app.extensionManager.dialog.showPublishDialog/showCloudNotification`; both remain on the extension surface. - Feature dialog composables are still in the SCC through their dialog components, which import `app`. That is the next PR (`app` -> root graph leaf). - `.fallow-baselines/health.json`: one `crap_high` entry added for `useBillingDialogs.ts`; `showTopUpCreditsDialog` moved verbatim, fallow re-estimates coverage per file from export references, and the composable has fewer importers than `dialogService`. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | **Comfy-Org#19131** (this PR) | **Comfy-Org#19121 (measured on Comfy-Org#19127)** | **Feature dialogs out of `dialogService`** | **400 -> 391** | **181 -> 172** | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> Co-authored-by: Amp <amp@ampcode.com>
…omfy-Org#19143) ## Summary Modules below `scripts/app.ts` in the import graph stop importing the `app` value from it. They call `useApp()` from `scripts/appInstance`, which reads a registry that `app.ts` fills right after constructing `ComfyApp`. Type-only consumers import the new `ComfyApp` interface from `types/comfy`. Clipspace state moves out of the class into `scripts/clipspace`. Import cycles: 409 -> 371 cyclic modules, largest SCC 184 -> 154 (litegraph is now the largest), 1640 -> 1451 cyclic edges, measured with dependency-cruiser on `main` a2dba8f. Targets `main` directly, rebased onto a2dba8f. Tracks FE-2769 / FE-3037. ## Changes - `types/comfy.ts`: `ComfyApp` interface (public instance surface), `QueuePromptOptions`, `LoadGraphDataOptions`. `types/index.ts` re-exports the type from here instead of from `scripts/app`. - `scripts/appRegistry.ts`: `registerApp` / `useApp` (asserts registration). `scripts/appInstance.ts` re-exports `useApp` as the consumer-facing seam so tests can mock it without re-entering `app.ts`. - `scripts/clipspace.ts`: clipspace state plus `copyToClipspace` / `pasteFromClipspace`. `ComfyApp` statics stay as accessors for custom-node compatibility; `litegraphService` and `changeTracker` use the leaf directly. - `class ComfyApp implements ComfyApp` (aliased `IComfyApp` inside `app.ts`). `ANIM_PREVIEW_WIDGET` now lives in `useNodeAnimatedImage.ts` and is re-exported from `app.ts`. - ~40 SCC importers switched to `useApp()` (all call sites are inside functions). On the current base that includes the mask editor composables, `useNodeProgressText` and `useProgressTextWidget`, which joined the SCC after the original PR. Type positions use `ComfyApp['rootGraph']` / `Parameters<ComfyApp['loadGraphData']>[0]`. - `commandStore.loadExtensionCommands` takes `{ name; commands? }` so it no longer imports `ComfyExtension`. - `vitest.setup.ts`: global mock of `@/scripts/appInstance` that resolves `useApp()` to whatever `@/scripts/app` is in the test file (real or per-file mock), awaited in `beforeAll` / `beforeEach`. `firstRunEntry.test.ts`'s `createSharedComposable` stand-in now resets every composable it created rather than only the last one registered. - `scripts/README.md`: documents the interface / `useApp()` / clipspace pattern. - Baselines: `.fallow-baselines/dead-code.json` gains 32 pre-existing cycles (auth, billing, `workflowStore` <-> `executionStore`, the billing paths through `useBillingDialogs`, and `comfyWorkflow -> changeTracker -> workflowStore`) that fallow only enumerates once the hub edges are gone; every entry's modules sit in one SCC on `main`; the entries use fallow's sorted-path key. `health.json` entry for `clipspace.ts`. ## Review Focus - Only modules below `app.ts` use `useApp()`. Top-level code (extensions, components, `App.vue`) keeps `import { app }`. - `useApp()` asserts that `registerApp` has run; every migrated call site runs after `app.ts` evaluates. `appRegistry.test.ts` covers both branches. - The vitest bridge loads `@/scripts/app` asynchronously, so modules in its tree now evaluate after the test subject's imports. `firstRunEntry.test.ts` was the one test sensitive to that ordering. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | **Comfy-Org#19143** (this PR) | **Comfy-Org#19131** | **Invert `scripts/app` behind `useApp()`** | **391 -> 352** | **172 -> 149** | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> --------- Co-authored-by: Amp <amp@ampcode.com>
## Summary `types/comfy.ts` is the public extension contract, yet it imported `scripts/widgets`, `scripts/ui`, and the workflow store, so every module that typed against `ComfyApp` was pulled into the app's largest import cycle. This PR makes `types/comfy.ts`, `types/extensionTypes.ts`, and `comfyWorkflow.ts` leaves: they no longer reach `scripts/appInstance`. Before the review fixes, depcruise measured the 273-module app SCC splitting into 119 + 58 modules. Import-cycle measurements before the review fixes: 371 -> 341 cyclic modules, largest SCC 154 -> 154 (litegraph), 1451 -> 1335 cyclic edges, on `main` df4ea6d (Comfy-Org#19143 merged as cdc9fe0). These counts have not been remeasured after restoring the extension hooks. `workflowStoreTypes.ts` carries main's `nodeLocatorIdToNodeId: ... => NodeId | null` signature, which landed on `main` after the interface moved. Targets `main` directly, rebased onto df4ea6d after Comfy-Org#19143 merged (cdc9fe0). Tracks FE-2769 / FE-3037. ## Changes - `ComfyWidgetConstructor` / `CustomComfyWidgetConstructor` are declared in `types/comfy.ts`; `scripts/widgets.ts` imports them. `ComfyApp.widgets` is typed as `Record<string, ComfyWidgetConstructor | CustomComfyWidgetConstructor>` instead of `typeof ComfyWidgets`, and `dynamicComboWidget` narrows the result of `app.widgets.COMBO`. - `MissingModelPipelineResult` moves to `platform/missingModel/types.ts`; `groupCandidatesByName` moves into `missingModelGrouping.ts` so grouping stops importing scan. - `scripts/ui.ts`: `ComfyUI(app, host)` takes the app and a `LegacyMenuHost` (`resetView`, `restoreOutputs`, `trackRunButton`, `enterFocusMode`) instead of calling `useApp()`, `litegraphService`, `nodeOutputStore`, `workspaceStore`, and `useRunButtonTelemetry`. `app.ts` wires the host. - `comfyWorkflow.ts` becomes a leaf. `WorkflowChangeTracker` is an interface `ChangeTracker` implements. A `WorkflowRuntime` (`createChangeTracker`, draft get/remove/markUsed, `isDraftPersistenceEnabled`) is registered by `workflowStore.ts` at module scope, replacing the dynamic `import('@/scripts/changeTracker')` and the direct settings/draft-store imports. - `ComfyWorkflow.promptSave()` remains an extension override point. Its default delegates to the registered `WorkflowRuntime`, which opens the dialog using `saveNamePrompt` i18n keys, overridden by `SubgraphBlueprint`. `workflowService.saveWorkflowAs` continues calling the hook. - Clipspace editor save honors `ComfyApp.pasteFromClipspace` overrides. Image paste updates store-backed outputs without requiring legacy previews and skips absent selections while still pasting widget values. - New leaf `workflowStoreTypes.ts` exports the `WorkflowStore` interface; `ExtensionManager.workflow` is typed as `WorkflowStore`. - New leaf `services/dialogServiceTypes.ts` with `CoreDialogService`, `ExtensionDialogService`, `ConfirmOptions`, `ExecutionErrorDialogInput`; `useDialogService()` returns `CoreDialogService` and `extensionTypes.ts` imports the leaf. `ExtensionDialogService` carries main's current signatures (`showCancelSubscriptionDialog` scope/confirmed args, `paymentIntentSource`, `showInviteLinkInvalidDialog`, `showInviteWrongAccountDialog`). - `comfyWorkflow.test.ts` deleted (it tested the dynamic-import failure path that no longer exists); `workflowService.test.ts` mocks `useDialogService().prompt` and asserts the save-name copy; `ui.test.ts` / `ui.setStatus.test.ts` pass the app and a stub host. ## Review Focus - `ComfyApp.widgets` loses the `typeof ComfyWidgets` key typing. Core widget constructors are still reachable as `useWidgetStore().coreWidgets`; extension code indexing `app.widgets.<Name>` now gets the union type. - `ExtensionManager.workflow` no longer exposes Pinia `$`-methods on the public type. Extensions calling `app.extensionManager.workflow.$patch` would be a type break (runtime unchanged). - `ComfyWorkflow.promptSave` is preserved because [RigShare](https://github.com/xiaodoudou/ComfyUI-RigShare/blob/3de3cc32e2a5bd266879dd6b346f8960ad4dd619/web/rigshare/save-dialog.js#L22) and [Bada-Utils](https://github.com/bada-ya/ComfyUI-Bada-Utils/blob/0898b33e803df8e169501d8fe0cf1fd04044f7bf/web/workflow_organizer.js#L2996) wrap its prototype implementation to customize Save As. A regression test checks that an override's filename reaches the save path. - `workflowStore.ts` now imports `ChangeTracker` statically. fallow sees the previously dynamic `comfyWorkflow -> workflowStore -> changeTracker` 3-cycle reshaped into two short `workflowStore <-> changeTracker` cycles; this plus 28 pre-existing cycles fallow newly enumerates (auth/session, api <-> authStore <-> dialogService, promotionUtils through canvasStore and litegraphService, useAppMode -> workflowStore -> changeTracker -> executionStore, workflowStore <-> executionStore, canvasStore <-> litegraphUtil) are baselined in `.fallow-baselines/dead-code.json`. Breaking `changeTracker -> workflowStore` needs a host injection into `ChangeTracker` and a rewrite of its 1400-line test, so it is left for a follow-up. - `dynamicComboWidget` keeps the runtime lookup through `app.widgets.COMBO`. A static import of `useComboWidget` or `widgetStore` from `dynamicWidgets.ts` creates a module-evaluation cycle with `scripts/widgets.ts` (`...dynamicWidgets` spread sees an uninitialised binding), which is why the assert-based narrowing is used instead. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | **Comfy-Org#19153** (this PR) | **Comfy-Org#19148** | **`types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves** | **324 -> 293** | **149 (baseline)** | | Comfy-Org#19186 | Comfy-Org#19153 | Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves | 293 -> 259 | 149 (baseline) | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> --------- Co-authored-by: Amp <amp@ampcode.com>
## Summary Removes the import cycles left inside `src/workbench`: the 28-module manager cycle and the agent CRDT status cycle. `workbench/` is now cycle-free, which is a prerequisite for giving it its own TypeScript project reference. Import cycles: 341 -> 311 cyclic modules, 20 -> 18 cycles, largest SCC 154 -> 154 (litegraph), 1335 -> 1262 cyclic edges, on top of Comfy-Org#19153 (rebased onto `main` df4ea6d). Stacked on Comfy-Org#19153 (rebased onto the `drjkl/comfy-types-leaf` chain). Tracks FE-2769 / FE-3037. ## Changes - Manager: `useManagerState` had two responsibilities, deriving the manager UI state and opening the manager. Opening needs `useManagerDialog`, which imports `ManagerDialog.vue`, whose subtree imports `useManagerState` again. `openManager` moves to `useManagerDialog`, which already owns `show()`/`hide()`. `useManagerState` keeps the state derivations and the once-per-session upgrade toast, and exports `showIncompatibleManagerToast({ force })` so the explicit-click re-emit lives with `openManager`. - Callers (`useCoreCommands`, `TopMenuSection`, `ComfyMenuButton`, `HelpCenterMenuContent`, `ErrorGroupList`, `MissingPackGroupRow`) call `useManagerDialog().openManager(...)`. `ComfyMenuButton` no longer needs `useManagerState`. The legacy-menu error toast in `openManager` uses the `useToast()` API from Comfy-Org#16313, as `useManagerState` does on `main`. - Tests: `openManager` coverage moves from `useManagerState.test.ts` to `useManagerDialog.test.ts` and now covers all four states (DISABLED, INCOMPATIBLE, LEGACY_UI with and without `showToastOnLegacyError`, NEW_UI with and without `isLegacyOnly`) by driving the real `useManagerState` through `systemStatsStore` and spied `api` feature flags. The shared `__mocks__/useManagerState.ts` drops `openManager`; a new `__mocks__/useManagerDialog.ts` covers component tests. - Agent composer: the `ComposerAttachment` leaf this PR originally introduced already landed on main (`types/composerAttachment.ts`), so that part is dropped. - Agent CRDT: `AgentCrdtStatus` and `AgentCrdtOutcomeCounters` move to a new leaf `crdt/agentCrdtStatus.ts` so `crdtSnapshot.ts` stops importing `useAgentCrdtFollower.ts`. - fallow baselines: `dead-code.json` is unchanged (the stale manager entries stay as unused baseline rows); the `crap_high` entry for `openManager` moves from `useManagerState.ts` to `useManagerDialog.ts` in `health.json` (same function, new file). ## Review Focus - `openManager` now calls `useManagerState()` per invocation. Its `watch(..., { immediate: true })` runs once per call and can fire the once-per-session INCOMPATIBLE toast if no component had instantiated the composable yet. That matches the previous behaviour, where every caller instantiated `useManagerState()` before calling `openManager`. - `useManagerDialog` now imports `useManagerState`; the dependency direction is dialog -> state, matching `useManagerDialog -> ManagerDialog.vue -> ... -> useManagerState`. <!-- stack-table:start --> ## Stack Import-cycle progress for FE-3037, measured with `pnpm lint:cycles` (dependency-cruiser on `src`). ### Standalone PRs targeting `main` Each is one commit on current `main` and can merge on its own. Numbers are that PR alone against `origin/main` (1027 cyclic modules, largest cycle 983, 4562 cyclic edges). | PR | Base | Change | Cyclic modules | Largest cycle | Cyclic edges | | --- | --- | --- | --- | --- | --- | | Comfy-Org#19089 | `main` | `ServerFeatureFlag` enum to a leaf module | 1027 -> 884 | 983 -> 677 | 4562 -> 3382 | | Comfy-Org#19094 | `main` | Empty-workflow dialog out of `appModeStore` | 1027 -> 1026 | 983 -> 982 | 4562 -> 4558 | | Comfy-Org#19109 | `main` | Mask editor menu item into `Comfy.MaskEditor` extension | 1027 -> 1027 | 983 -> 983 | 4562 -> 4562 | | Comfy-Org#19112 | `main` | `PositionConfig` and layer editor dialog key to leaf modules | 1027 -> 1027 | 983 -> 983 | 4562 -> 4558 | | Comfy-Org#19122 | `main` | `settingStore` off `scripts/app`; `$el` to a leaf | 1027 -> 1025 | 983 -> 981 | 4562 -> 4552 | | Comfy-Org#19124 | `main` | `MissingNodeType` to the nodeReplacement leaf | 1027 -> 1027 | 983 -> 983 | 4562 -> 4555 | | Comfy-Org#19125 | `main` | Blueprint node defs owned by `nodeDefStore` | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | | Comfy-Org#19127 | `main` | Thumbnail and minimap data from explicit inputs | 1027 -> 1027 | 983 -> 983 | 4562 -> 4561 | All eight together on `main`, plus Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19108, Comfy-Org#19111, Comfy-Org#19116 and Comfy-Org#19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges. ### Remaining stack Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older `main` the stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses. Comfy-Org#19091, Comfy-Org#19107, Comfy-Org#19111, Comfy-Org#19113 and Comfy-Org#19131 still carry the old commits of the PRs they were moved off (Comfy-Org#19131 carries Comfy-Org#19122, Comfy-Org#19124, Comfy-Org#19125 and Comfy-Org#19127), so their GitHub diffs are wider than one PR until the stack is rebased. | PR | Base | Change | Cyclic modules | Largest cycle | | --- | --- | --- | --- | --- | | Comfy-Org#19085 | `main` | Import-cycle baseline check (`pnpm lint:cycles`) | 967 (baseline) | 923 (baseline) | | Comfy-Org#19088 | Comfy-Org#19085 | Split litegraph `interfaces.ts` into leaf types | 967 -> 949 | 923 -> 905 | | Comfy-Org#19091 | Comfy-Org#19088 (measured on Comfy-Org#19089) | Register core sidebar tabs outside `sidebarTabStore` | 816 -> 669 | 618 -> 465 | | Comfy-Org#19092 | Comfy-Org#19091 | Load extensions from bootstrap, not `extensionService` | 669 -> 580 | 465 -> 371 | | Comfy-Org#19093 | Comfy-Org#19092 | Split `scripts/widgets.ts` registry, types, helpers | 580 -> 566 | 371 -> 357 | | Comfy-Org#19107 | Comfy-Org#19093 (measured on Comfy-Org#19094) | Register settings dialog from the app shell | 558 -> 509 | 349 -> 297 | | Comfy-Org#19108 | Comfy-Org#19107 | Register asset browser modal from the app shell | 509 -> 496 | 297 -> 284 | | Comfy-Org#19111 | Comfy-Org#19108 (measured on Comfy-Org#19109) | Register core bottom panel tabs from GraphView | 484 -> 476 | 272 -> 264 | | Comfy-Org#19113 | Comfy-Org#19111 (measured on Comfy-Org#19112) | Model library asset-browser routing onto the sidebar tab | 471 -> 467 | 257 -> 253 | | Comfy-Org#19116 | Comfy-Org#19113 | Progress text previews out of `executionStore` | 467 -> 464 | 253 -> 250 | | Comfy-Org#19118 | Comfy-Org#19116 | Inject the api auth provider from `main.ts` | 464 -> 447 | 250 -> 233 | | Comfy-Org#19121 | Comfy-Org#19118 | Install workspace api credentials from `main.ts` | 447 -> 428 | 233 -> 214 | | Comfy-Org#19131 | Comfy-Org#19121 (measured on Comfy-Org#19127) | Feature dialogs out of `dialogService` | 400 -> 391 | 181 -> 172 | | Comfy-Org#19143 | Comfy-Org#19131 | Invert `scripts/app` behind `useApp()` | 391 -> 352 | 172 -> 149 | | Comfy-Org#19148 | Comfy-Org#19143 | Billing rails announce refreshes; dialogs above the facade | 352 -> 324 | 149 (baseline) | | Comfy-Org#19153 | Comfy-Org#19148 | `types/comfy`, `comfyWorkflow`, dialog/workflow contracts as leaves | 324 -> 293 | 149 (baseline) | | **Comfy-Org#19186** (this PR) | **Comfy-Org#19153** | **Workbench cycles: `openManager` onto `useManagerDialog`, agent leaves** | **293 -> 259** | **149 (baseline)** | | Comfy-Org#19189 | Comfy-Org#19186 | Thirteen small app cycles: ui, nodeDef, auth dialogs, menu, and more | 259 -> 211 | 149 (baseline) | <!-- stack-table:end --> --------- Co-authored-by: Amp <amp@ampcode.com>
Resolve conflicts with Comfy-Org#19088, which split litegraph interfaces into leaf and graph-bound modules: move the INodeOutputSlot.widget declaration to types/slots.ts and point the src/types/litegraph.ts re-exports at the modules that now own each type. Drop the deleted litegraph-augmentation.d.ts from the extension-runtime architecture record and regenerate boundaries.json.
Summary
Second slice of FE-3037.
src/lib/litegraph/src/interfaces.ts(589 lines) mixed geometry primitives, utility types, slot data, link-network contracts, context-menu options, panel widgets, and node-creation options. Its type imports ofLGraphNode,LLink,Reroute,ContextMenu,Rectangle,types/widgetsandtypes/eventsput every importer ofPointorReadOnlyRectinto the largest import cycle.This PR keeps
interfaces.tsas a leaf (it now imports only branded IDs fromsrc/types/*andtypes/globalEnums) and moves the graph-bound contracts into files named by responsibility.Measured with dependency-cruiser on
src(the #19085 config, run locally), rebased onmainat 03bca8a: cyclic modules 660 -> 653, largest SCC 444 (unchanged), cyclic edges 2577 -> 2520. Originally cycle-free after this slice, before the merged slices above it moved the numbers:Rectangle,measure,ConstrainedSize,LGraphBadge,LGraphButton,node/SlotBase,interfacesinside litegraph;linkStore,rerouteStore,linkTopology,mathUtil,positionBounds,nodeDefUtil,boundsCalculator,marqueeSelectionUtil,useAssetGridSelection,useTimelineScrub,gradients,GradientSlider.vue,NodeBadge.vue,GizmoManager,load3dViewportin the app.Rebased onto
mainafter #19085 was closed in favour of #20461 (warn-onlypnpm deps:audit). Targetsmaindirectly; the rest of the stack (#19092 and up) is rebased on this branch.Tracks FE-2769 / FE-3037.
Changes
interfaces.ts: leaf. KeepsPoint,Size,Rect,ReadOnlyRect,Positionable,HasBoundingRect,INodeSlot,INodeFlags,ISlotType,IWidgetLocator,LinkSegment,DefaultConnectionColors, colour and utility types.LinkId/RerouteIdnow come from@/types/linkIdand@/types/rerouteIdinstead of viaLLink/Reroute.types/slots.ts:INodeInputSlot,INodeOutputSlot,IWidgetInputSlot,ISubgraphInput,IFoundSlot,INodeSlotContextItem,ConnectingLink.INodeInputSlotcannot be a leaf because_widget?: IBaseWidgetreferencestypes/widgets, which referencesLGraphNode/LGraphCanvas.types/linkNetwork.ts:LinkNetwork,ReadonlyLinkNetwork,ItemLocator.types/contextMenu.ts:IContextMenuOptions,IContextMenuValue,ContextMenuDivElement.types/panel.ts:Panel*.CreateNodeOptions->LiteGraphGlobal.ts;NewNodePosition,IBoundaryNodes->utils/arrange.ts;Hoverable->types/events.ts.node/widgetsView.ts,contextMenuFilter.ts, and the agent CRDT files added onmainsince the branch forked. Declarations moved verbatim. Thelitegraph.tsbarrel exports the same names, so the extension API is unchanged.Review Focus
pnpm typecheck,oxlint --type-aware,eslint(warnings only, same as main),pnpm knip,fallow audit, litegraph and touched-area unit tests (217 files) pass on the rebased head.git diff -M --statis mostly import-line churn; the only new code is import headers in the four new files.interfaces.tsre-applies main'sISlotType = number | string | string[]andslot_index?: SlotIndexonINodeSlot;types/slots.tscarries main's_pendingDemotionTokenonINodeInputSlot;types/panel.tscarries main's widenedPanelWidgetOptions.values;nodeDataStore.tsis taken from main.types/widgets.ts(657 lines) and thesimplifiedWidgettwo-cycle, which is what keepsINodeInputSlotand the ~26 widget classes in the SCC.Stack
Import-cycle progress for FE-3037, measured with
pnpm lint:cycles(dependency-cruiser onsrc).Standalone PRs targeting
mainEach is one commit on current
mainand can merge on its own. Numbers are that PR alone againstorigin/main(1027 cyclic modules, largest cycle 983, 4562 cyclic edges).mainServerFeatureFlagenum to a leaf modulemainappModeStoremainComfy.MaskEditorextensionmainPositionConfigand layer editor dialog key to leaf modulesmainsettingStoreoffscripts/app;$elto a leafmainMissingNodeTypeto the nodeReplacement leafmainnodeDefStoremainAll eight together on
main, plus #19091, #19107, #19108, #19111, #19116 and #19113 (checked locally; those six are not retargeted yet): 630 cyclic modules, largest cycle 412, 2476 cyclic edges.Remaining stack
Bottom to top, with current bases. Numbers are from the original 26-PR stack, each PR against its parent at the time, on the older
mainthe stack forked from (967 cyclic modules then). They have not been remeasured since the eight PRs above left the stack. Where the base changed, the parent the numbers were measured on is in parentheses.#19091, #19107, #19111, #19113 and #19131 still carry the old commits of the PRs they were moved off (#19131 carries #19122, #19124, #19125 and #19127), so their GitHub diffs are wider than one PR until the stack is rebased.
mainpnpm lint:cycles)interfaces.tsinto leaf typessidebarTabStoreextensionServicescripts/widgets.tsregistry, types, helpersexecutionStoremain.tsmain.tsdialogServicescripts/appbehinduseApp()types/comfy,comfyWorkflow, dialog/workflow contracts as leavesopenManagerontouseManagerDialog, agent leaves