Repository navigation
[backport cloud/1.52] fix(billing): gate subscribe-to-run only on Cloud - #16084
dante01yoon wants to merge 2 commits into
Conversation
## Summary On Local, clicking Run silently did nothing when the active workspace has no active subscription (e.g. 0 credits) — for any workflow, with or without API nodes, on any login method. Scope the subscribe-to-run gate in the queue commands to Cloud so Local always queues. Found during 1.51 QA of the local workspace switcher ([Slack report](https://comfy-organization.slack.com/archives/C0932CGKT5K/p1787740255008649?thread_ts=1787034725.224329&cid=C0932CGKT5K)). ## Root cause The break is an interaction of three pieces: 1. `Comfy.QueuePrompt` / `Comfy.QueuePromptFront` / `Comfy.QueueSelectedOutputNodes` return early when `canAccessSubscriptionFeatures` is false (`useCoreCommands.ts`), with no distribution check. 2. Since the local workspace switcher (#15558), Local routes billing to the workspace rail once workspace context loads (`useBillingRouting`). `useWorkspaceBilling.canAccessSubscriptionFeatures` is `statusData?.is_active ?? false` — unlike the legacy rail (`useSubscription.ts`), it has no `!isCloud → true` exemption, so an unsubscribed/zero-credit workspace reports false on Local. 3. The gate's fallback `showSubscriptionDialog` → `showPricingTable` starts with `if (!isCloud) return` (`useSubscriptionDialog.ts`), so on Local the block is invisible: no dialog, no toast, nothing. ```mermaid flowchart LR A[Run click] --> B[Comfy.QueuePrompt] B --> C{canAccessSubscriptionFeatures?} C -- "Local + workspace rail, is_active=false" --> D[showSubscriptionDialog] D --> E["showPricingTable: if (!isCloud) return"] E --> F[silent no-op — Run does nothing] C -- true --> G[app.queuePrompt] ``` ## How we change it Gate the three queue commands with `isCloud && !canAccessSubscriptionFeatures` — subscription gating is a Cloud concept, and this mirrors the legacy rail's own `!isCloud` exemption. The gate flag itself is left untouched: flipping `useWorkspaceBilling.canAccessSubscriptionFeatures` to true on Local would regress the Plan & Credits UI, which intentionally renders the unsubscribed state on Local (#15828). Insufficient-credit handling for partner nodes is unaffected: the backend still rejects the prompt and the error-catalog path (`insufficient_credits` → top-up dialog) handles it, so Local behavior returns to server-driven. ## AS IS / TO BE - **AS IS**: Local + workspace with 0 credits → Run click is a silent no-op for every workflow (QA video in the Slack thread above). - **TO BE**: Local always queues. OSS workflows run; partner-node workflows surface the backend insufficient-credits error with top-up CTA. Cloud gating is unchanged (dialog still shown when unsubscribed). ## Tests - Unit (`useCoreCommands.test.ts`): Local + `canAccessSubscriptionFeatures=false` queues and shows no dialog (fails against the previous code); Cloud unsubscribed still blocks with the `subscribe_to_run` dialog; Cloud subscribed queues. ## Review Focus - The guard intentionally keys on distribution (`isCloud`), not on billing-rail internals, so bootstrap-time rail flapping on Local can never block Run.⚠️ Needs backport to `core/1.51` — this is a 1.51 release blocker.
|
Important Review skippedIgnore keyword(s) in the title. ⛔ Ignored keywords (2)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
🎭 Playwright: ✅ 1987 passed, 0 failed📊 Browser Reports
🎨 Storybook: ✅ Built — View Storybook📦 Bundle Size
⚡ Performance Report
Absolute values
Raw data{
"timestamp": "2026-08-27T03:54:37.501Z",
"gitSha": "cda3869d4c55ba159c96d093649b0a0dcbab9618",
"branch": "backport-16032-to-cloud-1.52",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2025.2300000000218,
"styleRecalcs": 9,
"styleRecalcDurationMs": 8.200000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 504.45700000000005,
"heapDeltaBytes": 15356496,
"heapUsedBytes": 77964672,
"domNodes": -281,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 7.189000000000001,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-idle",
"durationMs": 2038.7620000000197,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.493000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 518.06,
"heapDeltaBytes": 16396088,
"heapUsedBytes": 78616640,
"domNodes": -281,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 7.516,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66999999999998,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1843.9390000000344,
"styleRecalcs": 72,
"styleRecalcDurationMs": 33.712999999999994,
"layouts": 12,
"layoutDurationMs": 3.489,
"taskDurationMs": 851.7479999999999,
"heapDeltaBytes": 19109108,
"heapUsedBytes": 81698952,
"domNodes": -279,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 101.578,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1857.580999999982,
"styleRecalcs": 75,
"styleRecalcDurationMs": 39.074999999999996,
"layouts": 12,
"layoutDurationMs": 3.7289999999999996,
"taskDurationMs": 856.3459999999999,
"heapDeltaBytes": -6120536,
"heapUsedBytes": 56624140,
"domNodes": -280,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 102.25699999999999,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1686.4390000000071,
"styleRecalcs": 30,
"styleRecalcDurationMs": 15.973,
"layouts": 6,
"layoutDurationMs": 0.657,
"taskDurationMs": 350.576,
"heapDeltaBytes": 3385604,
"heapUsedBytes": 65252156,
"domNodes": 75,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 9.588,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1681.8890000000692,
"styleRecalcs": 29,
"styleRecalcDurationMs": 16.125,
"layouts": 6,
"layoutDurationMs": 0.6579999999999999,
"taskDurationMs": 361.41200000000003,
"heapDeltaBytes": 3314372,
"heapUsedBytes": 66217808,
"domNodes": 76,
"jsHeapTotalBytes": 4980736,
"scriptDurationMs": 10.427,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-clipping",
"durationMs": 719.9589999999603,
"styleRecalcs": 6,
"styleRecalcDurationMs": 5.494000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 420.68500000000006,
"heapDeltaBytes": 10844604,
"heapUsedBytes": 72326836,
"domNodes": 8,
"jsHeapTotalBytes": 4980736,
"scriptDurationMs": 59.589999999999996,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 545.344,
"styleRecalcs": 11,
"styleRecalcDurationMs": 7.762,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 348.143,
"heapDeltaBytes": 10906920,
"heapUsedBytes": 73893288,
"domNodes": 18,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 50.668000000000006,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2055.7979999999816,
"styleRecalcs": 9,
"styleRecalcDurationMs": 10.995000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 629.1929999999999,
"heapDeltaBytes": -4478544,
"heapUsedBytes": 73014112,
"domNodes": -274,
"jsHeapTotalBytes": -532480,
"scriptDurationMs": 14.131999999999998,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-idle",
"durationMs": 2055.91400000003,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.636999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 627.836,
"heapDeltaBytes": -1876344,
"heapUsedBytes": 75329660,
"domNodes": -273,
"jsHeapTotalBytes": -532480,
"scriptDurationMs": 15.556000000000001,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2147.3139999999944,
"styleRecalcs": 68,
"styleRecalcDurationMs": 13.402999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1188.0600000000002,
"heapDeltaBytes": -5729640,
"heapUsedBytes": 72490260,
"domNodes": -280,
"jsHeapTotalBytes": -1355776,
"scriptDurationMs": 335.18299999999994,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "large-graph-pan",
"durationMs": 2138.7039999999615,
"styleRecalcs": 69,
"styleRecalcDurationMs": 17.789999999999996,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1182.5480000000002,
"heapDeltaBytes": -8150724,
"heapUsedBytes": 70140272,
"domNodes": -273,
"jsHeapTotalBytes": 217088,
"scriptDurationMs": 320.49699999999996,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-zoom",
"durationMs": 3168.2330000000434,
"styleRecalcs": 64,
"styleRecalcDurationMs": 14.488000000000001,
"layouts": 60,
"layoutDurationMs": 8.228,
"taskDurationMs": 1377.704,
"heapDeltaBytes": -13244780,
"heapUsedBytes": 65570404,
"domNodes": -289,
"jsHeapTotalBytes": 5496832,
"scriptDurationMs": 395.49799999999993,
"eventListeners": -185,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3164.312999999993,
"styleRecalcs": 63,
"styleRecalcDurationMs": 13.600000000000001,
"layouts": 60,
"layoutDurationMs": 8.285,
"taskDurationMs": 1396.349,
"heapDeltaBytes": -14390648,
"heapUsedBytes": 65242424,
"domNodes": -288,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 392.00399999999996,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2218.0890000000204,
"styleRecalcs": 46,
"styleRecalcDurationMs": 9.964,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1435.6550000000002,
"heapDeltaBytes": 10862388,
"heapUsedBytes": 91241628,
"domNodes": 12,
"jsHeapTotalBytes": 7270400,
"scriptDurationMs": 459.751,
"eventListeners": 186,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "legacy-node-drag",
"durationMs": 2204.246000000012,
"styleRecalcs": 44,
"styleRecalcDurationMs": 8.931999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1437.1419999999998,
"heapDeltaBytes": 11159936,
"heapUsedBytes": 96600628,
"domNodes": 8,
"jsHeapTotalBytes": 8843264,
"scriptDurationMs": 465.222,
"eventListeners": 186,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "minimap-idle",
"durationMs": 2061.3180000000284,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.559,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 620.3639999999999,
"heapDeltaBytes": -11941352,
"heapUsedBytes": 71250280,
"domNodes": -279,
"jsHeapTotalBytes": 3923968,
"scriptDurationMs": 14.417999999999997,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "minimap-idle",
"durationMs": 2077.124000000026,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.862000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 647.4680000000002,
"heapDeltaBytes": -11982152,
"heapUsedBytes": 73527644,
"domNodes": -279,
"jsHeapTotalBytes": 3923968,
"scriptDurationMs": 15.862999999999996,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 588.6649999999918,
"styleRecalcs": 46,
"styleRecalcDurationMs": 9.324,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 377.1650000000001,
"heapDeltaBytes": 11497900,
"heapUsedBytes": 74534708,
"domNodes": 18,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 116.95299999999999,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 606.9080000000895,
"styleRecalcs": 46,
"styleRecalcDurationMs": 10.056000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 392.3329999999999,
"heapDeltaBytes": 11553236,
"heapUsedBytes": 74397424,
"domNodes": 18,
"jsHeapTotalBytes": 5767168,
"scriptDurationMs": 122.57200000000002,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-idle",
"durationMs": 2051.6660000000115,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.664999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 428.03900000000004,
"heapDeltaBytes": -5683840,
"heapUsedBytes": 56648188,
"domNodes": -280,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 7.263000000000001,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2020.842000000016,
"styleRecalcs": 8,
"styleRecalcDurationMs": 6.211000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 481.61,
"heapDeltaBytes": 16663400,
"heapUsedBytes": 79490376,
"domNodes": -283,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 6.6480000000000015,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1723.0539999999905,
"styleRecalcs": 75,
"styleRecalcDurationMs": 36.324,
"layouts": 16,
"layoutDurationMs": 4.724,
"taskDurationMs": 782.207,
"heapDeltaBytes": 7266412,
"heapUsedBytes": 70409036,
"domNodes": -284,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 82.37400000000001,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1707.031000000029,
"styleRecalcs": 75,
"styleRecalcDurationMs": 36.537,
"layouts": 16,
"layoutDurationMs": 4.5200000000000005,
"taskDurationMs": 794.0079999999999,
"heapDeltaBytes": 1742968,
"heapUsedBytes": 64980044,
"domNodes": -281,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 84.42399999999999,
"eventListeners": -183,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "subgraph-transition-enter",
"durationMs": 1385.116000000039,
"styleRecalcs": 19,
"styleRecalcDurationMs": 30.322000000000003,
"layouts": 14,
"layoutDurationMs": 13.03,
"taskDurationMs": 920.8620000000001,
"heapDeltaBytes": -4157720,
"heapUsedBytes": 86832024,
"domNodes": 13673,
"jsHeapTotalBytes": 11272192,
"scriptDurationMs": 16.930999999999994,
"eventListeners": 2375,
"totalBlockingTimeMs": 128,
"frameDurationMs": 16.666666666666636,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8229.959999999948,
"styleRecalcs": 250,
"styleRecalcDurationMs": 40.623000000000005,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4040.1600000000003,
"heapDeltaBytes": 987140,
"heapUsedBytes": 78587540,
"domNodes": -280,
"jsHeapTotalBytes": -569344,
"scriptDurationMs": 989.2669999999999,
"eventListeners": -131,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8246.533999999996,
"styleRecalcs": 251,
"styleRecalcDurationMs": 42.251,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4212.702,
"heapDeltaBytes": -4215580,
"heapUsedBytes": 72283172,
"domNodes": -281,
"jsHeapTotalBytes": 4673536,
"scriptDurationMs": 1042.344,
"eventListeners": -163,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.80000000000109
},
{
"name": "vue-large-graph-idle",
"durationMs": 18187.494000000013,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 17253.465000000004,
"heapDeltaBytes": -34946960,
"heapUsedBytes": 181478312,
"domNodes": -8312,
"jsHeapTotalBytes": -19685376,
"scriptDurationMs": 126.14999999999998,
"eventListeners": -16391,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.77333333333336,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 18582.636999999977,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 17489.248,
"heapDeltaBytes": -45774644,
"heapUsedBytes": 180638676,
"domNodes": -8312,
"jsHeapTotalBytes": -10670080,
"scriptDurationMs": 116.33300000000001,
"eventListeners": -16389,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666763,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-pan",
"durationMs": 21872.04300000002,
"styleRecalcs": 175,
"styleRecalcDurationMs": 20.067999999999977,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 21244.401,
"heapDeltaBytes": -37113392,
"heapUsedBytes": 195439224,
"domNodes": -8312,
"jsHeapTotalBytes": -22016000,
"scriptDurationMs": 451.046,
"eventListeners": -16385,
"totalBlockingTimeMs": 105,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 22322.97899999992,
"styleRecalcs": 169,
"styleRecalcDurationMs": 22.028999999999964,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 21717.848,
"heapDeltaBytes": -40169636,
"heapUsedBytes": 186367500,
"domNodes": -8312,
"jsHeapTotalBytes": -18341888,
"scriptDurationMs": 431.62000000000006,
"eventListeners": -16385,
"totalBlockingTimeMs": 188,
"frameDurationMs": 18.333333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 444.65100000002167,
"styleRecalcs": 15,
"styleRecalcDurationMs": 22.711999999999996,
"layouts": 3,
"layoutDurationMs": 1.242,
"taskDurationMs": 108.184,
"heapDeltaBytes": 5086040,
"heapUsedBytes": 67847712,
"domNodes": 126,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 7.929,
"eventListeners": 99,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 470.8749999999782,
"styleRecalcs": 11,
"styleRecalcDurationMs": 21.288999999999994,
"layouts": 4,
"layoutDurationMs": 1.4739999999999998,
"taskDurationMs": 110.16400000000002,
"heapDeltaBytes": 4996836,
"heapUsedBytes": 67622032,
"domNodes": 119,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 7.7940000000000005,
"eventListeners": 99,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
}
]
} |
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## cloud/1.52 #16084 +/- ##
=============================================
Coverage ? 81.97%
=============================================
Files ? 1910
Lines ? 109656
Branches ? 31014
=============================================
Hits ? 89889
Misses ? 19421
Partials ? 346
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
|
CI status: all 7 failures are inherited from Every failing job —
Evidence this PR's diff is not involved:
Not rebasing or pushing anything here — the diff is correct as-is and a retrigger would just reproduce the same base failure. Merge order: #16085 → this → #16059. On review tooling: CodeRabbit auto-skipped because |
…#16085) `cloud/1.52` does not typecheck. Every PR opened against it is red on a diff it does not own. ``` packages/ingest-types/src/index.ts(237,3): error TS2300: Duplicate identifier 'CurrentWorkspaceResponse'. packages/ingest-types/src/index.ts(240,3): error TS2300: Duplicate identifier 'CurrentWorkspaceResponse'. packages/ingest-types/src/types.gen.ts(3263,13): error TS2300: Duplicate identifier 'CurrentWorkspaceResponse'. packages/ingest-types/src/types.gen.ts(3280,13): error TS2300: Duplicate identifier 'CurrentWorkspaceResponse'. ``` Confirmed blocked: #16080 and #16084 are both red solely on this. ## Root cause A semantic conflict between two backports — clean for git, broken for TypeScript. | commit | PR | merged (UTC) | `CurrentWorkspaceResponse` declarations after | | --- | --- | --- | --- | | `c143e62b5` | #15953 — establish workspace context for API-key sessions | 8/26 04:43 | 1 | | `d9e00f921` | #15939 — ENTERPRISE tier + `ingest-types` regeneration | 8/26 23:36 | **2** | #15953 introduced the type. #15939 regenerated the package from the cloud OpenAPI spec and added it again. Neither touched the same lines, so git reported no conflict and the duplicate landed silently. CI did not catch it because **#15939's checks last ran 8/25 23:33 — roughly 24 hours before it merged, and before #15953 was on the branch.** It was green against a merge ref that no longer described reality. The second block also swallowed the JSDoc belonging to `CreateWorkspaceRequest`, leaving that type undocumented: ```ts /** * Request body for creating a new workspace. */ export type CurrentWorkspaceResponse = { // <- stray ``` In `index.ts` the stray re-export is visible as a break in the otherwise alphabetical list (`CreateWorkspaceResponse, CurrentWorkspaceResponse, CreateWorkspaceResponses`). ## Changes Pure deletion, 15 lines, no additions: - `types.gen.ts` — remove the duplicated `CurrentWorkspaceResponse` block; the `Request body for creating a new workspace.` JSDoc returns to `CreateWorkspaceRequest` - `index.ts` — remove the duplicated re-export Both files are generated, so the target was not a judgement call: **both edited regions are now byte-identical to `main`**, which carries exactly one declaration. This restores the generator's real output rather than hand-authoring it. Re-running `pnpm --filter @comfyorg/ingest-types generate` against the spec is the alternative and should produce the same result — happy to swap to that if the team prefers a regeneration commit, though it would pull in unrelated spec drift on a release branch. ## Verification `tsc` on the package, before and after: ``` ### BASE (cloud/1.52) exit=2 TS2300 x4 <- reproduces the CI failure exactly ### THIS PR exit=0 TS2300 x0 total errors 0 ``` Also verified `CurrentWorkspaceResponse` is the only duplicated identifier in either file, so this is the whole breakage and not the first of several. ## Follow-ups (not in this PR) 1. **The stale-merge-base gap.** A PR merging on day-old checks is how this shipped. Requiring branches be up to date before merge on `cloud/*`, or re-running checks on merge, would close it. 2. **`pr-backport.yaml` discards partial success.** Separately, one failing target aborts the whole step, so succeeding targets never get a PR and their pushed branches are deleted in cleanup. That is why #16032 never reached `cloud/1.52` and why #16084 had to be made by hand. ## Merge order This → #16084 (backport of #16032, *Run silently does nothing on Local at 0 credits*) → #16059 (its E2E regression test).
…gh server capabilities (#16094) Backport of #16067 to `cloud/1.52`. ## Merge order — this PR is stacked Base is deliberately `backport-16046-to-cloud-1.52`, not `cloud/1.52`. GitHub retargets this PR to `cloud/1.52` once its parent merges. `cloud/1.52` → #15799 → #15803 → #15804 → #15675 → #15967 → #16043 → #16046 → #16067 Every commit in this chain cherry-picks cleanly; there are no hand-resolved conflicts anywhere in the stack. ## Verification Run at the tip of the full stack: 93 unit test files, 1745 tests, 0 failures (`src/platform/workspace`, `src/platform/cloud/subscription`, `src/composables/useCoreCommands.test.ts`, `src/components/actionbar`). ## Also carries #16032 and #16041 #16067's unit tests need mocks (`app.queuePrompt`, `trackWorkflowExecution`, `useQueueSettingsStore`) that #16032 introduced, and its run-gate coverage comes from #16041. Both are already backported independently as #16084 and #16059. This branch therefore contains them; whichever lands first makes the other's patch a no-op. Without #16032 the `useCoreCommands` hunks conflict and 8 tests fail. --------- Co-authored-by: comfydesigner <247099495+comfydesigner@users.noreply.github.com>
|
Working the pre-17600 backlog. This one is already on the branch it targets — recommending close. This PR adds an - if (!canAccessSubscriptionFeatures.value) {
+ if (isCloud && !canAccessSubscriptionFeatures.value) {
// cloud/1.52, useCoreCommands.ts:83
function blockRunWithoutSubscription(): boolean {
if (!isCloud || canAccessSubscriptionFeatures.value) return false
...
}Verified rather than assumed: all three call sites on
Approved 2026-09-04 and Recommend closing. Your call — we are not going to close another author's PR. If there is a case on that branch we have missed, point at it and we will re-check. |
|
This backport looks redundant — the fix is already on the target branch by another route. Your call to close, since it is your PR, but here is the proof so it is a one-line decision rather than an investigation.
So the gating this PR backports is already there, and the PR is If we have that wrong — if the gate on Flagging it because it is one of eleven items that have been sitting on a decision rather than on work, and this one needed only a two-line check to resolve. |
|
closing, it's stale PR |
Backport of #16032 to
cloud/1.52. Manual — the automated backport silently lost this target (see below).Why this is needed
On Local, clicking Run silently does nothing when the active workspace has no active subscription (0 credits) — any workflow, any login method. That bug is still live on
cloud/1.52, and it shipped in the1.52.6cut (#15976).It is also blocking #16059, the backport of the regression test for this exact bug. That PR's only CI failure is the test it adds:
Initial run plus all 3 retries — deterministic, not flake. The test is correct; the fix underneath it is missing.
Root cause
Comfy.QueuePrompt/Comfy.QueuePromptFront/Comfy.QueueSelectedOutputNodesinuseCoreCommands.tsreturn early whencanAccessSubscriptionFeaturesis false, with no distribution check. On Cloud that gate is intended; on Local it swallows the run.useCoreCommands.ts:509main,core/1.51,core/1.52if (isCloud && !canAccessSubscriptionFeatures.value)cloud/1.52(before this PR)if (!canAccessSubscriptionFeatures.value)With no
isCloudguard, the Run click opens the subscription dialog and returns before ever issuingPOST /api/prompt.Why the automated backport didn't produce this
#16032 carries the
cloud/1.52label, but only #16039 (core/1.51) and #16040 (core/1.52) were ever opened. The re-run at 02:45 UTC (run 33034284539) shows why:The
cloud/1.52cherry-pick succeeded and was pushed. Butcore/1.51andcore/1.52conflicted (the commit is already on both), soFAILEDwas non-empty and the step exited 1. That skippedCreate backport PRs(gated onsteps.backport.outputs.success), and thenCleanup stranded backport branchesdeleted the branch that had just succeeded.Net effect: in
pr-backport.yaml, one failing target discards every succeeding target. Re-adding the label will keep reproducing this as long as any already-applied target is in the list. Worth splitting success/failure per target so partial progress survives — happy to open that separately.Changes
Cherry-pick of
4a67eb43149bf633d522bd9b5311b6f6f28a6a76, clean, no conflicts:src/composables/useCoreCommands.ts— scope the subscribe-to-run gate to Cloud in all three queue commands (3 lines)src/composables/useCoreCommands.test.ts— unit coverage for the Local-queues / Cloud-gates splitNo behavior change on Cloud.
Verification
cloud/1.52; the three gates now readisCloud && !canAccessSubscriptionFeatures.value.cloud/1.52today and should go green once this merges. Merge this first, then re-run [backport cloud/1.52] test(e2e): cover Run through the real button on an unsubscribed Local workspace #16059.Regression / E2E coverage
Covered. Unit:
useCoreCommands.test.ts(in this commit). E2E:localWorkspaceSwitcher.spec.tsvia #16059, which is the dedicated regression test for this bug driven through the real Run button.