Repository navigation
[backport cloud/1.52] feat(billing): render the ENTERPRISE tier through the generated contract - #15939
Conversation
…act (#15855) Backport of #15855 to cloud/1.52, combined with a regeneration of the ingest-types package from the cloud OpenAPI spec. The generated half is regenerated from the cloud spec rather than cherry-picked, per team guidance, using the full pipeline from cloud/.github/workflows/push-ingest-types-to-frontend.yml: 1. openapi-project -fe (projects the FE-facing spec subset, stripping cloud's x-internal / admin / M2M surface) 2. pnpm generate (pinned @hey-api/openapi-ts 0.97.3) 3. oxfmt --write src/ Cloud spec: Comfy-Org/cloud@3e3f06a The regeneration and the ENTERPRISE source support are one commit because neither compiles without the other: regenerating widens SubscriptionTier with ENTERPRISE, which breaks useBillingPolicyState.ts (TS1360) and tierPricing.ts (TS7053), while the source half alone references an ENTERPRISE member the generated contract does not yet have. Upstream did not split them either.
|
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: ✅ 1980 passed, 0 failed · 3 flaky📊 Browser Reports
🌐 Website E2ETip All tests passed.
🎨 Storybook: ✅ Built — View Storybook📦 Bundle Size
⚡ Performance Report
Absolute values
Raw data{
"timestamp": "2026-08-25T23:46:25.780Z",
"gitSha": "026f9bc25c7ba661cb9bbfff8d323802f6cf7779",
"branch": "backport-ingest-types-to-cloud-1.52",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2092.08000000001,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.828,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 566.666,
"heapDeltaBytes": 17530924,
"heapUsedBytes": 80041284,
"domNodes": -281,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 6.994999999999997,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-idle",
"durationMs": 2027.6790000000346,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.291999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 511.13199999999995,
"heapDeltaBytes": 17467852,
"heapUsedBytes": 79023432,
"domNodes": -282,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 7.302,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1834.8589999999945,
"styleRecalcs": 72,
"styleRecalcDurationMs": 34.429,
"layouts": 12,
"layoutDurationMs": 3.456000000000001,
"taskDurationMs": 860.773,
"heapDeltaBytes": -4149692,
"heapUsedBytes": 57740744,
"domNodes": -282,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 112.12,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1790.90199999996,
"styleRecalcs": 73,
"styleRecalcDurationMs": 34.516000000000005,
"layouts": 12,
"layoutDurationMs": 3.19,
"taskDurationMs": 847.4970000000001,
"heapDeltaBytes": -4719880,
"heapUsedBytes": 57800404,
"domNodes": -281,
"jsHeapTotalBytes": 5496832,
"scriptDurationMs": 106.604,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1722.3510000000033,
"styleRecalcs": 31,
"styleRecalcDurationMs": 16.877000000000002,
"layouts": 6,
"layoutDurationMs": 0.6510000000000001,
"taskDurationMs": 349.22800000000007,
"heapDeltaBytes": 3310436,
"heapUsedBytes": 66075552,
"domNodes": 76,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 9.619,
"eventListeners": 21,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1717.113999999924,
"styleRecalcs": 30,
"styleRecalcDurationMs": 15.737999999999998,
"layouts": 6,
"layoutDurationMs": 0.609,
"taskDurationMs": 354.442,
"heapDeltaBytes": 3502356,
"heapUsedBytes": 65453188,
"domNodes": 74,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 9.374,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "dom-widget-clipping",
"durationMs": 552.3529999999823,
"styleRecalcs": 9,
"styleRecalcDurationMs": 6.222999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 360.41999999999996,
"heapDeltaBytes": 10869048,
"heapUsedBytes": 73706892,
"domNodes": 14,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 56.214,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-clipping",
"durationMs": 578.1440000000657,
"styleRecalcs": 11,
"styleRecalcDurationMs": 7.823,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 356.938,
"heapDeltaBytes": 10842460,
"heapUsedBytes": 73406552,
"domNodes": 18,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 56.547,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-idle",
"durationMs": 2022.7929999999787,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.079000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 589.51,
"heapDeltaBytes": -13001988,
"heapUsedBytes": 64191128,
"domNodes": -283,
"jsHeapTotalBytes": 3403776,
"scriptDurationMs": 13.982999999999999,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2056.6299999999273,
"styleRecalcs": 8,
"styleRecalcDurationMs": 6.5360000000000005,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 610.687,
"heapDeltaBytes": -5520748,
"heapUsedBytes": 71234860,
"domNodes": -281,
"jsHeapTotalBytes": -1839104,
"scriptDurationMs": 15.870000000000003,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2131.1870000000113,
"styleRecalcs": 68,
"styleRecalcDurationMs": 12.412000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1167.208,
"heapDeltaBytes": -5405288,
"heapUsedBytes": 72527384,
"domNodes": -276,
"jsHeapTotalBytes": -565248,
"scriptDurationMs": 327.12,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "large-graph-pan",
"durationMs": 2135.3699999999662,
"styleRecalcs": 69,
"styleRecalcDurationMs": 14.041000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1062.464,
"heapDeltaBytes": 12222408,
"heapUsedBytes": 89520520,
"domNodes": -282,
"jsHeapTotalBytes": 4677632,
"scriptDurationMs": 341.39300000000003,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3217.8100000000427,
"styleRecalcs": 65,
"styleRecalcDurationMs": 14.591000000000003,
"layouts": 60,
"layoutDurationMs": 7.348999999999999,
"taskDurationMs": 1387.486,
"heapDeltaBytes": -11470156,
"heapUsedBytes": 68088252,
"domNodes": -288,
"jsHeapTotalBytes": 6025216,
"scriptDurationMs": 390.98699999999997,
"eventListeners": -185,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666636,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3182.250999999951,
"styleRecalcs": 65,
"styleRecalcDurationMs": 14.197999999999999,
"layouts": 60,
"layoutDurationMs": 7.2090000000000005,
"taskDurationMs": 1312.5870000000002,
"heapDeltaBytes": -9725908,
"heapUsedBytes": 69692552,
"domNodes": 12,
"jsHeapTotalBytes": 6328320,
"scriptDurationMs": 376.461,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2333.7549999999965,
"styleRecalcs": 47,
"styleRecalcDurationMs": 10.534000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1454.164,
"heapDeltaBytes": -14982924,
"heapUsedBytes": 70490132,
"domNodes": 14,
"jsHeapTotalBytes": 9211904,
"scriptDurationMs": 481.792,
"eventListeners": 184,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2190.8730000000105,
"styleRecalcs": 44,
"styleRecalcDurationMs": 8.755000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1403.6879999999999,
"heapDeltaBytes": 11583428,
"heapUsedBytes": 96148864,
"domNodes": 8,
"jsHeapTotalBytes": 8056832,
"scriptDurationMs": 447.023,
"eventListeners": 184,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "minimap-idle",
"durationMs": 2040.5910000000063,
"styleRecalcs": 7,
"styleRecalcDurationMs": 6.421000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 603.764,
"heapDeltaBytes": -12487832,
"heapUsedBytes": 70937304,
"domNodes": -284,
"jsHeapTotalBytes": 2617344,
"scriptDurationMs": 14.328000000000001,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.670000000000012,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "minimap-idle",
"durationMs": 2062.229000000002,
"styleRecalcs": 7,
"styleRecalcDurationMs": 9.207,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 622.4960000000001,
"heapDeltaBytes": -12052428,
"heapUsedBytes": 73440092,
"domNodes": -282,
"jsHeapTotalBytes": 3928064,
"scriptDurationMs": 15.433999999999996,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 590.4610000000048,
"styleRecalcs": 47,
"styleRecalcDurationMs": 10.578999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 371.794,
"heapDeltaBytes": 11485604,
"heapUsedBytes": 74499972,
"domNodes": 20,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 112.83400000000002,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 596.4159999999765,
"styleRecalcs": 46,
"styleRecalcDurationMs": 9.928,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 390.26099999999997,
"heapDeltaBytes": 11467892,
"heapUsedBytes": 74502648,
"domNodes": 18,
"jsHeapTotalBytes": 6029312,
"scriptDurationMs": 118.88699999999999,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-idle",
"durationMs": 2022.7820000000065,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.841999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 487.26800000000003,
"heapDeltaBytes": 2495024,
"heapUsedBytes": 65107428,
"domNodes": -282,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 6.656000000000001,
"eventListeners": -181,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2020.30400000001,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.944000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 491.56200000000007,
"heapDeltaBytes": 12867908,
"heapUsedBytes": 75855844,
"domNodes": -284,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 6.445000000000001,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1772.717,
"styleRecalcs": 76,
"styleRecalcDurationMs": 38.510999999999996,
"layouts": 16,
"layoutDurationMs": 4.626,
"taskDurationMs": 836.8720000000001,
"heapDeltaBytes": 19333788,
"heapUsedBytes": 82201728,
"domNodes": -283,
"jsHeapTotalBytes": 5234688,
"scriptDurationMs": 86.59299999999999,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1774.4199999999637,
"styleRecalcs": 75,
"styleRecalcDurationMs": 37.117000000000004,
"layouts": 16,
"layoutDurationMs": 4.831,
"taskDurationMs": 803.288,
"heapDeltaBytes": 19094640,
"heapUsedBytes": 81922072,
"domNodes": -283,
"jsHeapTotalBytes": 5234688,
"scriptDurationMs": 85.732,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-transition-enter",
"durationMs": 1399.1260000000239,
"styleRecalcs": 20,
"styleRecalcDurationMs": 32.634,
"layouts": 15,
"layoutDurationMs": 14.72,
"taskDurationMs": 926.4110000000001,
"heapDeltaBytes": -6189052,
"heapUsedBytes": 86228664,
"domNodes": 13673,
"jsHeapTotalBytes": 11272192,
"scriptDurationMs": 17.034,
"eventListeners": 2373,
"totalBlockingTimeMs": 149,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8243.39199999997,
"styleRecalcs": 249,
"styleRecalcDurationMs": 35.015,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4104.967000000001,
"heapDeltaBytes": -6693728,
"heapUsedBytes": 70513640,
"domNodes": -284,
"jsHeapTotalBytes": 5201920,
"scriptDurationMs": 1020.165,
"eventListeners": -135,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "viewport-pan-sweep",
"durationMs": 8311.954000000014,
"styleRecalcs": 250,
"styleRecalcDurationMs": 36.302,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4221.452,
"heapDeltaBytes": -4136604,
"heapUsedBytes": 73194068,
"domNodes": -283,
"jsHeapTotalBytes": 4677632,
"scriptDurationMs": 1049.6340000000002,
"eventListeners": -133,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 17040.90500000001,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 16552.137000000002,
"heapDeltaBytes": -52401144,
"heapUsedBytes": 177832544,
"domNodes": -8312,
"jsHeapTotalBytes": -21045248,
"scriptDurationMs": 112.43700000000001,
"eventListeners": -16387,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666763,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 17613.773000000037,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 16801.956000000002,
"heapDeltaBytes": -34836340,
"heapUsedBytes": 181919352,
"domNodes": -8312,
"jsHeapTotalBytes": -17686528,
"scriptDurationMs": 122.72,
"eventListeners": -16393,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 20184.26899999997,
"styleRecalcs": 170,
"styleRecalcDurationMs": 16.266999999999975,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 19666.148999999998,
"heapDeltaBytes": -39351704,
"heapUsedBytes": 186469272,
"domNodes": -8312,
"jsHeapTotalBytes": -15843328,
"scriptDurationMs": 391.258,
"eventListeners": -16387,
"totalBlockingTimeMs": 21,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 20832.442000000014,
"styleRecalcs": 175,
"styleRecalcDurationMs": 17.05799999999996,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 20249.268,
"heapDeltaBytes": -17189292,
"heapUsedBytes": 194876808,
"domNodes": -8312,
"jsHeapTotalBytes": -16932864,
"scriptDurationMs": 515.943,
"eventListeners": -16385,
"totalBlockingTimeMs": 155,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 99.60599999999431,
"styleRecalcs": 7,
"styleRecalcDurationMs": 11.939,
"layouts": 2,
"layoutDurationMs": 0.3930000000000001,
"taskDurationMs": 74.10600000000001,
"heapDeltaBytes": 3214808,
"heapUsedBytes": 65777480,
"domNodes": 112,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 5.599999999999999,
"eventListeners": 49,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 109.92099999998572,
"styleRecalcs": 8,
"styleRecalcDurationMs": 18.784,
"layouts": 2,
"layoutDurationMs": 0.5530000000000002,
"taskDurationMs": 80.63699999999999,
"heapDeltaBytes": 3088584,
"heapUsedBytes": 65839816,
"domNodes": 110,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 5.216,
"eventListeners": 51,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
}
]
} |
Codecov Report❌ Patch coverage is
@@ Coverage Diff @@
## cloud/1.52 #15939 +/- ##
=============================================
Coverage ? 79.55%
=============================================
Files ? 2235
Lines ? 113760
Branches ? 31294
=============================================
Hits ? 90505
Misses ? 22771
Partials ? 484
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
…ontend (#15941) Backport of #14483 to `cloud/1.52`. ##⚠️ Merge order — this PR is stacked **Base is deliberately set to `backport-ingest-types-to-cloud-1.52`, not `cloud/1.52`.** GitHub will auto-retarget this PR to `cloud/1.52` once the types PR merges. - Depends on: #15939 — `[backport cloud/1.52] feat(billing): render the ENTERPRISE tier through the generated contract` - **#15939 must merge first.** This branch does not compile without it: on `cloud/1.52` alone it produces **94 type errors**, every one of them a missing member on a generated `@comfyorg/ingest-types` type (`SavedPaymentMethod`, `quote_id`, `quote_version`, `discounts`, `currency`, `authentication_state`, `decline_reason`, `promotion_code`, `confirmation_token`, …). ## Verification **`pnpm typecheck`: 94 → 0.** Before (this branch's feature commit on `cloud/1.52`, types PR *not* applied) — `exit 2`, 94 errors, e.g.: ``` src/platform/workspace/api/workspaceApi.ts(28,3): error TS2305: Module '"@comfyorg/ingest-types"' has no exported member 'SavedPaymentMethod'. src/platform/workspace/api/workspaceApi.ts(119,27): error TS2339: Property 'authentication_state' does not exist on type 'BillingOpStatusResponse'. src/platform/workspace/api/workspaceApi.ts(478,11): error TS2353: Object literal may only specify known properties, and 'promotion_code' does not exist in type 'PreviewSubscribeRequest'. src/platform/workspace/components/SubscriptionAddPaymentPreviewWorkspace.vue(124,28): error TS2339: Property 'discounts' does not exist on type 'PreviewSubscribeResponse'. ... ``` After (rebased onto #15939) — **`exit 0`, empty output, 0 errors.** Tests (`pnpm vitest run`): | Suite | Result | |---|---| | `src/composables/useUrlActionLoaders.test.ts` | 6 passed (1 file) | | `src/platform/workspace/` + `src/platform/cloud/subscription/` | **1606 passed (88 files)** | | `useFeatureFlags`, `GlobalDialog`, `GraphCanvas.firstRunEntry` | 94 passed (3 files) | Lint/format on the 43 changed TS/Vue files: `eslint` exit 0, `oxfmt --check` — "All matched files use the correct format." Note that green Vitest is not evidence of type safety (Vitest strips types) — the `vue-tsc` result above is the type-safety evidence. ## Rebase Rebased conflict-free onto the types branch; the feature commit's own conflict resolutions were carried through unchanged. ## Conflict resolutions These were resolved, reviewed and verified in a prior pass and are **not** re-derived here. They cover two files: - `src/composables/useUrlActionLoaders.ts` - `src/composables/useUrlActionLoaders.test.ts` Both drop the `?settings` deep-link references. Those come from #15808, which is not on this branch — `src/composables/useSettingsUrlLoader.ts` does not exist on `cloud/1.52` (verified absent). No `settings` references remain in either file. ### Judgement call for reviewers 👀 The upstream test `isolates a settings-loader failure so it does not abort the boot chain` was **deleted** (its subject, the settings loader, doesn't exist on this branch). Its two tail assertions were **folded into the surviving top-up isolation test** rather than dropped, so the coverage they provided is retained: ```ts it('isolates a top-up-loader failure so it does not abort the boot chain', async () => { mocks.loadTopUp.mockRejectedValueOnce(new Error('boom')) const { runUrlActionLoaders } = useUrlActionLoaders() await expect(runUrlActionLoaders()).resolves.toBeUndefined() expect(mocks.loadPricingTable).toHaveBeenCalledOnce() expect(mocks.loadPaymentReturn).toHaveBeenCalledOnce() // folded in expect(mocks.resumePendingPricingFlow).toHaveBeenCalledOnce() // folded in }) ``` This leaves 6 tests in the file instead of upstream's 7. If reviewers would rather see the assertions dropped with the deleted test, that's a one-line change. --------- Co-authored-by: Amp <amp@ampcode.com>
…#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).
Backport of #15855 to
cloud/1.52, combined with a regeneration of theingest-typespackage from the cloud OpenAPI spec.Enterprise is scoped to the 1.52 release per Jaewon (frontend team lead), with Wei Hai confirming Enterprise targets 1.52. No new product sign-off is needed — this behaviour was already reviewed and merged on
mainas #15855.Why regeneration and ENTERPRISE support are one commit
They cannot be split into two green commits, and upstream didn't split them either:
SubscriptionTierwithENTERPRISE, which breaks two files:useBillingPolicyState.ts—TS1360: Type '"ENTERPRISE"' does not satisfy the expected type 'never'(plus a knock-onTS2322)tierPricing.ts—TS7053: Property 'ENTERPRISE' does not exist on Record<"FREE"|...>ENTERPRISEmember the generated contract does not yet carry.Generated half: regenerated, not cherry-picked
Per team guidance the generated files are regenerated from the cloud spec rather than taken from #15855's diff, using the full pipeline in
cloud/.github/workflows/push-ingest-types-to-frontend.yml:go run ./services/ingest/scripts/openapi-project -fe -in services/ingest/openapi.yaml -out <frontend>/packages/ingest-types/openapi.yaml— the mandatory spec-projection step, which strips cloud'sx-internal//admin// M2M surface before codegenpnpm generateinpackages/ingest-types(pinned@hey-api/openapi-ts0.97.3, unchanged)npx oxfmt --write src/— raw generator output is 4-space + semicolons; committing without this makes the diff ~99% whitespace noise (24k lines vs 2.8k)Cloud spec SHA:
Comfy-Org/cloud@3e3f06a7f43b99fe96b5da066379dbba6433e252origin/mainhas since advanced tob47b91183f, adding 73 spec lines — all of them thex-internal/admin/api/billing/credit-deductionendpoint. Projecting from either SHA yields a byte-identical projected spec, so the SHA choice is immaterial here.packages/ingest-types/openapi.yamlis gitignored and is not committed; onlysrc/*.gen.tsandsrc/index.tsare.Leak guard
The projection step is what the previous attempt on this branch skipped, which leaked 52
Admin*refs into the generated types and would have tripped the CI leak guard (the same defect #15878 was created to revert). This branch was rebuilt from scratch onorigin/cloud/1.52.The CI guard's own regex —
(/admin|/api/internal|/api/webhooks|/m2m|/monitoring|/debug)([^A-Za-z0-9_-]|$)— also matches 0 times in the projected spec and both generated files. Projection reportedkept 192 ops | excluded 45 x-internal | pruned 40 schemas.Delta shape
zod.gen.tsshows large churn because the committed files oncloud/1.52are stale, not because types were removed: 184 combinedz*Dataschemas are replaced by 186 splitz*Body/z*Path/z*Query/z*Responseschemas.cloud/1.52pins the same generator version (0.97.3) with an identicalopenapi-ts.config.tsasmain, so its committed output simply predates a regeneration.Verification that this output is correct: it is byte-identical to
origin/main's committedzod.gen.tsandindex.ts, and differs frommain'stypes.gen.tsby only 10 lines — three additive documentation/404: ErrorResponseentries on the agent-skill-packs routes, present because the pinned spec is slightly ahead ofmain's last regeneration. No types are removed relative tomain.Verification
pnpm typecheck— green (exit 0) with feat(billing): consolidate embedded checkout frontend #14483 not appliedpnpm vitest runover the four suites feat(billing): render the ENTERPRISE tier through the generated contract #15855 ships/touches — 102 passed (4 files):tierPricing.test.ts(new),useBillingPolicyState.test.ts,billingPolicyCapabilities.test.ts,useWorkspaceTierLabel.test.tspnpm lint+pnpm typecheckall passed); no--no-verify#15855's source half applied cleanly with
git apply --3wayacross 10 files:src/locales/en/main.json,billingPolicyCapabilities.ts/.test.ts,billingPolicyState.ts,useBillingPolicyState.ts/.test.ts,tierPricing.ts+ newtierPricing.test.ts,useWorkspaceTierLabel.ts/.test.ts.Merge order
This PR is a prerequisite for the #14483 embedded-checkout backport, which is stacked on top of it and should merge second.