Repository navigation
[backport cloud/1.51] chore: regenerate ingest types from cloud openapi - #15927
Conversation
Regenerate packages/ingest-types from the Comfy-Org/cloud ingest OpenAPI spec at 8c26db3a68 (2026-08-21), projected through the FE-facing openapi-project -fe tool, so cloud/1.51 carries the billing contract that the embedded-checkout backport (#15906) consumes. Regenerated rather than cherry-picked: main's ingest-types commits are interleaved with an @hey-api/openapi-ts bump and the ENTERPRISE tier addition, neither of which belongs on 1.51. Pinned deliberately to 8c26db3a68 rather than current cloud main: that spec carries every billing symbol #14483 needs while predating the ENTERPRISE subscription tier. Regenerating from current main would widen SubscriptionTier with ENTERPRISE, breaking the `satisfies never` exhaustiveness guard in useBillingPolicyState.ts and tierPricing.ts -- files #14483 never touches. Enterprise is scoped to 1.52. Purely additive: 13 new exported types (SavedPaymentMethod, SubscriptionDiscount, ListSavedPaymentMethods*, GetCurrentWorkspace*, CurrentWorkspaceResponse), zero exported symbols removed. The only non-comment line changes widen BillingOpStatusResponse.status with 'reconciliation_needed'. Generated with this branch's pinned @hey-api/openapi-ts 0.93.0 and normalized with oxfmt. Zero Admin/internal refs in the generated output.
|
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 |
🎨 Storybook: ✅ Built — View Storybook🎭 Playwright: ✅ 1830 passed, 0 failed · 1 flaky📊 Browser Reports
📦 Bundle Size
⚡ Performance Report
Absolute values
Raw data{
"timestamp": "2026-08-25T23:32:45.844Z",
"gitSha": "b986f339f8c2ff5bdd99524bea56b03c3560fa3b",
"branch": "backport-ingest-types-to-cloud-1.51",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2049.973999999992,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.622,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 557.236,
"heapDeltaBytes": 5462988,
"heapUsedBytes": 70996784,
"domNodes": 16,
"jsHeapTotalBytes": 24379392,
"scriptDurationMs": 10.855,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "canvas-idle",
"durationMs": 2048.414999999977,
"styleRecalcs": 9,
"styleRecalcDurationMs": 8.524000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 567.53,
"heapDeltaBytes": 5314808,
"heapUsedBytes": 70807476,
"domNodes": 18,
"jsHeapTotalBytes": 23592960,
"scriptDurationMs": 9.993,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 2202.676999999994,
"styleRecalcs": 78,
"styleRecalcDurationMs": 53.394999999999996,
"layouts": 12,
"layoutDurationMs": 4.404,
"taskDurationMs": 1204.514,
"heapDeltaBytes": -13723304,
"heapUsedBytes": 51746988,
"domNodes": -282,
"jsHeapTotalBytes": 23957504,
"scriptDurationMs": 139.91,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1889.4050000000107,
"styleRecalcs": 77,
"styleRecalcDurationMs": 42.842999999999996,
"layouts": 12,
"layoutDurationMs": 3.9040000000000004,
"taskDurationMs": 974.6750000000001,
"heapDeltaBytes": -18842988,
"heapUsedBytes": 46742016,
"domNodes": 60,
"jsHeapTotalBytes": 22122496,
"scriptDurationMs": 116.53,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1751.5510000000063,
"styleRecalcs": 31,
"styleRecalcDurationMs": 19.039999999999996,
"layouts": 6,
"layoutDurationMs": 0.6860000000000002,
"taskDurationMs": 467.83799999999997,
"heapDeltaBytes": 7934280,
"heapUsedBytes": 73340992,
"domNodes": 77,
"jsHeapTotalBytes": 24117248,
"scriptDurationMs": 14.098999999999998,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1733.3130000000665,
"styleRecalcs": 30,
"styleRecalcDurationMs": 19.692999999999994,
"layouts": 6,
"layoutDurationMs": 0.7229999999999999,
"taskDurationMs": 465.549,
"heapDeltaBytes": 8057028,
"heapUsedBytes": 73622740,
"domNodes": 77,
"jsHeapTotalBytes": 24117248,
"scriptDurationMs": 14.369000000000002,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-clipping",
"durationMs": 641.4540000000102,
"styleRecalcs": 10,
"styleRecalcDurationMs": 6.599000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 410.498,
"heapDeltaBytes": -11484116,
"heapUsedBytes": 54087744,
"domNodes": 16,
"jsHeapTotalBytes": 24903680,
"scriptDurationMs": 60.269999999999996,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 607.4539999999615,
"styleRecalcs": 10,
"styleRecalcDurationMs": 6.915000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 411.71999999999997,
"heapDeltaBytes": -11345260,
"heapUsedBytes": 54104708,
"domNodes": 16,
"jsHeapTotalBytes": 24641536,
"scriptDurationMs": 58.27,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2058.339999999987,
"styleRecalcs": 9,
"styleRecalcDurationMs": 8.675000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 818.2070000000001,
"heapDeltaBytes": 13361344,
"heapUsedBytes": 73943116,
"domNodes": -280,
"jsHeapTotalBytes": 3768320,
"scriptDurationMs": 20.810999999999996,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-idle",
"durationMs": 2056.5410000000384,
"styleRecalcs": 8,
"styleRecalcDurationMs": 8.611,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 759.063,
"heapDeltaBytes": 8083300,
"heapUsedBytes": 68264840,
"domNodes": -282,
"jsHeapTotalBytes": 2719744,
"scriptDurationMs": 20.452,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2242.2559999999976,
"styleRecalcs": 67,
"styleRecalcDurationMs": 15.128999999999996,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1339.261,
"heapDeltaBytes": 2219980,
"heapUsedBytes": 63296532,
"domNodes": -284,
"jsHeapTotalBytes": 3174400,
"scriptDurationMs": 339.004,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-pan",
"durationMs": 2221.7299999999796,
"styleRecalcs": 66,
"styleRecalcDurationMs": 13.022999999999996,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1270.365,
"heapDeltaBytes": 2148144,
"heapUsedBytes": 63143140,
"domNodes": -288,
"jsHeapTotalBytes": 4222976,
"scriptDurationMs": 322.759,
"eventListeners": -181,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3381.4840000000004,
"styleRecalcs": 64,
"styleRecalcDurationMs": 16.553999999999995,
"layouts": 60,
"layoutDurationMs": 9.104000000000001,
"taskDurationMs": 1574.763,
"heapDeltaBytes": 3813772,
"heapUsedBytes": 66579172,
"domNodes": -289,
"jsHeapTotalBytes": 5079040,
"scriptDurationMs": 407.822,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-zoom",
"durationMs": 3262.8089999999474,
"styleRecalcs": 64,
"styleRecalcDurationMs": 16.342000000000002,
"layouts": 60,
"layoutDurationMs": 8.834999999999999,
"taskDurationMs": 1524.1070000000002,
"heapDeltaBytes": -1487960,
"heapUsedBytes": 61303368,
"domNodes": -288,
"jsHeapTotalBytes": 3244032,
"scriptDurationMs": 403.57,
"eventListeners": -183,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "minimap-idle",
"durationMs": 2028.7399999999707,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.976000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 799.388,
"heapDeltaBytes": 13325656,
"heapUsedBytes": 74765028,
"domNodes": -285,
"jsHeapTotalBytes": 2719744,
"scriptDurationMs": 18.500000000000004,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "minimap-idle",
"durationMs": 2026.0510000000522,
"styleRecalcs": 7,
"styleRecalcDurationMs": 6.973,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 784.354,
"heapDeltaBytes": 12695800,
"heapUsedBytes": 73711184,
"domNodes": -282,
"jsHeapTotalBytes": 2457600,
"scriptDurationMs": 18.393,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 720.643999999993,
"styleRecalcs": 45,
"styleRecalcDurationMs": 10.939,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 474.76800000000003,
"heapDeltaBytes": -9992592,
"heapUsedBytes": 55552800,
"domNodes": 16,
"jsHeapTotalBytes": 24379392,
"scriptDurationMs": 132.92100000000002,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 657.29900000008,
"styleRecalcs": 47,
"styleRecalcDurationMs": 11.922999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 443.18800000000005,
"heapDeltaBytes": -9845264,
"heapUsedBytes": 55744828,
"domNodes": 20,
"jsHeapTotalBytes": 24117248,
"scriptDurationMs": 125.98600000000002,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2025.2310000000193,
"styleRecalcs": 10,
"styleRecalcDurationMs": 9.248,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 598.9250000000001,
"heapDeltaBytes": 5525208,
"heapUsedBytes": 71260904,
"domNodes": 20,
"jsHeapTotalBytes": 24379392,
"scriptDurationMs": 11.271,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-idle",
"durationMs": 2005.0400000000081,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.726,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 582.6279999999999,
"heapDeltaBytes": 5589416,
"heapUsedBytes": 71171556,
"domNodes": 16,
"jsHeapTotalBytes": 24117248,
"scriptDurationMs": 10.126999999999997,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1775.1049999999964,
"styleRecalcs": 77,
"styleRecalcDurationMs": 43.525999999999996,
"layouts": 16,
"layoutDurationMs": 5.461,
"taskDurationMs": 882.2459999999999,
"heapDeltaBytes": -3243428,
"heapUsedBytes": 62263160,
"domNodes": 63,
"jsHeapTotalBytes": 24379392,
"scriptDurationMs": 95.9,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1723.372999999924,
"styleRecalcs": 77,
"styleRecalcDurationMs": 41.81799999999999,
"layouts": 16,
"layoutDurationMs": 5.166,
"taskDurationMs": 835.473,
"heapDeltaBytes": -3487044,
"heapUsedBytes": 62018404,
"domNodes": 63,
"jsHeapTotalBytes": 24379392,
"scriptDurationMs": 91.15299999999999,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.670000000000012,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-transition-enter",
"durationMs": 1400.5739999999491,
"styleRecalcs": 20,
"styleRecalcDurationMs": 30.667,
"layouts": 15,
"layoutDurationMs": 11.879000000000001,
"taskDurationMs": 1037.288,
"heapDeltaBytes": -7870992,
"heapUsedBytes": 78813248,
"domNodes": 13673,
"jsHeapTotalBytes": 10223616,
"scriptDurationMs": 18.956,
"eventListeners": 2375,
"totalBlockingTimeMs": 129,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8846.181,
"styleRecalcs": 249,
"styleRecalcDurationMs": 45.93800000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4778.656000000001,
"heapDeltaBytes": 15665364,
"heapUsedBytes": 75914664,
"domNodes": -282,
"jsHeapTotalBytes": 3960832,
"scriptDurationMs": 1042.674,
"eventListeners": -163,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.80000000000109
},
{
"name": "viewport-pan-sweep",
"durationMs": 8606.942000000003,
"styleRecalcs": 249,
"styleRecalcDurationMs": 44.00900000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4527.504000000001,
"heapDeltaBytes": 16782820,
"heapUsedBytes": 76517880,
"domNodes": -283,
"jsHeapTotalBytes": 4222976,
"scriptDurationMs": 1008.753,
"eventListeners": -131,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 18760.122000000025,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 17945.049,
"heapDeltaBytes": -45843668,
"heapUsedBytes": 168547508,
"domNodes": -8312,
"jsHeapTotalBytes": -14360576,
"scriptDurationMs": 126.83800000000001,
"eventListeners": -16389,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666763,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 19079.050999999934,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 18478.378,
"heapDeltaBytes": -28756472,
"heapUsedBytes": 168654344,
"domNodes": -8312,
"jsHeapTotalBytes": -10424320,
"scriptDurationMs": 149.38800000000003,
"eventListeners": -16387,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 22925.26200000003,
"styleRecalcs": 171,
"styleRecalcDurationMs": 25.680000000000035,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 22501.991,
"heapDeltaBytes": -25211408,
"heapUsedBytes": 185547400,
"domNodes": -8312,
"jsHeapTotalBytes": -11804672,
"scriptDurationMs": 454.973,
"eventListeners": -16383,
"totalBlockingTimeMs": 94,
"frameDurationMs": 17.779999999999927,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 24249.188000000002,
"styleRecalcs": 181,
"styleRecalcDurationMs": 27.029999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 23446.818,
"heapDeltaBytes": -11762984,
"heapUsedBytes": 185770712,
"domNodes": -8312,
"jsHeapTotalBytes": -11804672,
"scriptDurationMs": 453.83900000000006,
"eventListeners": -16379,
"totalBlockingTimeMs": 121,
"frameDurationMs": 17.773333333333238,
"p95FrameDurationMs": 16.80000000000291
},
{
"name": "workflow-execution",
"durationMs": 460.59600000000955,
"styleRecalcs": 10,
"styleRecalcDurationMs": 21.248000000000005,
"layouts": 4,
"layoutDurationMs": 1.6569999999999998,
"taskDurationMs": 116.08500000000002,
"heapDeltaBytes": 4990800,
"heapUsedBytes": 69744784,
"domNodes": 120,
"jsHeapTotalBytes": 4980736,
"scriptDurationMs": 8.215,
"eventListeners": 99,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "workflow-execution",
"durationMs": 474.92299999998977,
"styleRecalcs": 12,
"styleRecalcDurationMs": 22.025999999999996,
"layouts": 3,
"layoutDurationMs": 0.71,
"taskDurationMs": 117.98500000000001,
"heapDeltaBytes": 4974248,
"heapUsedBytes": 69641048,
"domNodes": 121,
"jsHeapTotalBytes": 4980736,
"scriptDurationMs": 8.698,
"eventListeners": 99,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
}
]
} |
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## cloud/1.51 #15927 +/- ##
=============================================
Coverage ? 79.24%
=============================================
Files ? 2212
Lines ? 122756
Branches ? 38432
=============================================
Hits ? 97274
Misses ? 24901
Partials ? 581
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
…ontend (#15906) Manual backport of #14483 to `cloud/1.51`. The auto-backport workflow failed on merge conflicts, so this was cherry-picked and resolved by hand. Source commit: `8c48cb56506c47fd082afdff971e6fc2372b3fcd` (single-parent squash; plain `cherry-pick`, no `-m 1`). > [!IMPORTANT] > **Stacked PR — merge order matters.** This is based on [#15927](#15927) (`chore: regenerate ingest types from cloud openapi`), not directly on `cloud/1.51`. **Merge #15927 first.** GitHub will auto-retarget this PR to `cloud/1.51` once #15927 lands. Without #15927 this branch fails `pnpm typecheck` with 94 errors. ## Blocker resolved The previous revision of this PR was a draft blocked by 94 typecheck errors: `cloud/1.51` carried an older generated `@comfyorg/ingest-types` contract lacking the embedded-checkout fields this PR consumes (`SavedPaymentMethod`, `authentication_state`, `payment_intent_client_secret`, `decline_reason`, `reconciliation_needed`, `confirmation_token`, `quote_id`, `quote_version`, `saved_payment_method_id`, `promotion_code`, `amount_due_cents`, `requires_reactivation_confirmation`, `renewal_at`, `renewal_amount_cents`, `discounts`, `currency`, `payment_method_configuration_id`). #15927 supplies exactly that contract, regenerated from cloud spec `8c26db3a68` (2026-08-21) — pinned deliberately to a snapshot that has all 17 symbols but **predates the ENTERPRISE tier**, so it does not widen `SubscriptionTier` and trip the `satisfies never` guards in `useBillingPolicyState.ts` / `tierPricing.ts`. Enterprise is 1.52-scoped. **`pnpm typecheck` now: 94 errors → 0 errors (exit 0).** ## Conflicts and how each was resolved Three files conflicted. The root cause in all three is that **#15281 ("fix: use generated workspace API response types") is on `main` but has not been backported to `cloud/1.51`.** #15281 removed the frontend-only `billing_cycle` field from the preview-subscribe request; `cloud/1.51` still has it. #14483 was written on top of that removal. **`src/platform/workspace/api/workspaceApi.ts`** — two hunks, both the same underlying issue. `PreviewSubscribeOptions` and the `previewSubscribe` request body. `main` has only `teamCreditStopId` (post-#15281) and #14483 adds `promotionCode`; `cloud/1.51` still has `billingCycle`. Resolved as a **union**: kept `cloud/1.51`'s `billingCycle` / `billing_cycle` and added #14483's `promotionCode` / `promotion_code`. Dropping `billingCycle` would have silently reverted `cloud/1.51` behaviour that #15281 has not yet removed there. **`src/platform/workspace/composables/useSubscriptionCheckout.ts`** — the team preview call. `cloud/1.51` calls `previewSubscribe(planSlug, { teamCreditStopId, billingCycle })`; #14483 rewrites it as `Promise.all([previewSubscribe(...), loadSavedPaymentMethods()])`. Kept #14483's parallel structure (that is the PR's intent — warm saved payment methods alongside the preview) and retained `cloud/1.51`'s `billingCycle` argument. **`src/platform/workspace/api/workspaceApi.test.ts`** — kept all five tests #14483 adds (`listSavedPaymentMethods`, promotion-code preview, quote/saved-method echo, promotion-code omission, mutually-exclusive credentials). The only other difference was a test rename that came from #15281, not #14483: `'previewSubscribe() sends POST with plan_slug'` → `'…sends fields defined by the ingest contract'`. **Kept `cloud/1.51`'s original name**, because on `cloud/1.51` the request still sends `billing_cycle`, which #15281 explicitly describes as *not* defined by the ingest contract — importing that wording here would have made the test name false. One follow-on change outside the conflict regions, in its own commit: `useSubscriptionCheckout.test.ts` asserted `previewSubscribe` was called with `{ teamCreditStopId }` only. On `cloud/1.51` that call legitimately also carries `billingCycle`, so the assertion was updated to match — consistent with the sibling team-change test at line 1255 which already asserts `{ teamCreditStopId: 'team_1400', billingCycle: 'monthly' }`. ## The `billing_cycle` union — re-verified against the new contract Re-checked against the newly generated types from #15927, because if the regenerated `PreviewSubscribeRequest` had gained `billing_cycle`, the local augmentation would be redundant. It has not: ```ts // packages/ingest-types/src/types.gen.ts — generated export type PreviewSubscribeRequest = { plan_slug: string promotion_code?: string team_credit_stop_id?: string } // <- no billing_cycle export type SubscribeRequest = { billing_cycle?: 'monthly' | 'yearly' // <- has it promotion_code?: string // <- and promotion_code ... } ``` - **`PreviewSubscribeRequest` still has no `billing_cycle`.** `cloud/1.51` supplies it through a local augmentation at `workspaceApi.ts:88`, which predates this backport: ```ts interface PreviewSubscribeRequest extends GeneratedPreviewSubscribeRequest { billing_cycle?: SubscribeBillingCycle } ``` That augmentation is load-bearing — the `satisfies PreviewSubscribeRequest` on the request body would not compile without it. - **`SubscribeRequest` has both `billing_cycle` and `promotion_code`**, so no augmentation is needed there. **Verdict: the union resolution stands and is still required.** Taking #14483's side verbatim would have dropped `billingCycle` from the preview request and silently reverted live `cloud/1.51` behaviour. ## #15401 ordering — not a stacking conflict The workflow flagged that #15401 (`[backport cloud/1.51] refactor(workspace): simplify ended subscription state`) is open against this branch and might be the cause. **It is not.** This is genuine `main` ↔ `cloud/1.51` divergence. - #15401 touches exactly one file, `SubscriptionPanelContentWorkspace.vue`. That file is not among #14483's 49 files, nor among the three conflicted files. - Verified empirically: merging #15401 into `cloud/1.51` and *then* cherry-picking #14483 produces the **identical three conflicts**. **#15401 and this PR are independent and can land in either order.** No ordering constraint. ## Verification Run in the checkout, real results, on the rebased branch: - `pnpm install --frozen-lockfile` — passes (exit 0) - `pnpm typecheck` — **exit 0, zero errors**. Before the rebase onto #15927 this same tree produced **94 errors** (exit 2); all 94 were the contract gap and none were resolution mistakes. - `pnpm vitest run src/platform/workspace src/platform/cloud/subscription src/composables/useUrlActionLoaders.test.ts src/composables/useFeatureFlags.test.ts src/components/dialog/GlobalDialog.test.ts src/components/graph/GraphCanvas.firstRunEntry.test.ts` — **91 files, 1656 tests, all pass** (exit 0) - `oxfmt --check`, `oxlint --type-aware`, `eslint` across all **41** changed `.ts`/`.vue` files — all pass (exit 0) Note that green Vitest is not evidence of type safety on its own — Vitest strips types. The `pnpm typecheck` exit 0 above is the type-level evidence. **No `--no-verify` commits remain on this branch.** The earlier `460b275120` was made with `--no-verify` because the pre-commit hook runs whole-project typecheck, which no commit could pass before the contract landed. It has been dropped and recommitted as `89bcd823b1` **through** the full hook chain (oxfmt, `oxlint --type-aware`, eslint, `pnpm typecheck`), which now passes. Per the workflow rules: no `browser_tests/**/*-snapshots/` files were involved; `package.json` version correctly stays at `cloud/1.51`'s version; `pnpm-lock.yaml` passes `--frozen-lockfile`. ## Not done Not merged, auto-merge not enabled. `main`, #14483, #15401 and all other branches untouched. ## CI status **65 checks pass, 1 fails: `playwright-video-new-tests`.** That failure is a pre-existing tagging/workflow mismatch, not a broken test and not a regression from this backport: ``` NEW_SPEC_FILES: browser_tests/tests/dialogs/checkoutRecovery.spec.ts $ pnpm exec playwright test --project=chromium browser_tests/tests/dialogs/checkoutRecovery.spec.ts Error: No tests found. ``` - Every test in `checkoutRecovery.spec.ts` is under `test.describe('Redirect checkout recovery', { tag: '@cloud' }, …)`. - `playwright.config.ts`'s `chromium` project sets `grepInvert: /@mobile|@Perf|@Audit|@cloud/`, so it deliberately excludes `@cloud`. A `@cloud`-tagged spec can only run under the `cloud` project. - The `playwright-video-new-tests` job hardcodes `--project=chromium`, so for any newly added `@cloud`-only spec it matches zero tests and exits 1. No test executed and none failed. This backport does not touch `playwright.config.ts`, and `checkoutRecovery.spec.ts` is **byte-identical** to the version #14483 merged to `main` — where the `chromium` project carries the same `@cloud` grepInvert. Fixing the job to select the right project is out of scope for a backport; flagging it for whoever owns `ci-tests-e2e.yaml`. The `@cloud` specs themselves are exercised by the `cloud` project, and `website-e2e`, `perf-tests`, `lint-and-format`, `build`, `storybook-build`, `scan`, `validate-licenses` and `validate-fonts` all pass. --------- Co-authored-by: Amp <amp@ampcode.com>
Regenerates
packages/ingest-typesoncloud/1.51so the branch carries the billing contract that the embedded-checkout backport #15906 consumes. Types only — no runtime code, no behaviour change.Regenerated, not cherry-picked
Per team guidance (Jaewon), this is a regeneration rather than a cherry-pick of
main's ingest-types commits. Those commits are interleaved with an@hey-api/openapi-tsbump (#15166) and the ENTERPRISE tier addition (#15855), neither of which belongs on a release branch. Regenerating lets us pick the exact contract snapshot 1.51 needs.Spec pin: cloud
8c26db3a68, not current mainSource:
Comfy-Org/cloud@8c26db3a684a0595254c5051cba88b60e40810c8(2026-08-21),services/ingest/openapi.yaml.That commit is pinned deliberately. It carries all 17 billing symbols #14483 needs while predating the ENTERPRISE tier:
SavedPaymentMethod,authentication_state,decline_reason,payment_intent_client_secret,reconciliation_needed,confirmation_token,quote_id,quote_version,saved_payment_method_id,promotion_code,amount_due_cents,requires_reactivation_confirmation,renewal_at,renewal_amount_cents,discounts,currency,payment_method_configuration_idare present.ENTERPRISEoccurrences.Regenerating from current cloud main would widen
SubscriptionTierwithENTERPRISE, which trips thesatisfies neverexhaustiveness guard inuseBillingPolicyState.tsandtierPricing.ts— breaking files #14483 never touches, and pulling a product decision into a release branch. Enterprise is scoped to 1.52 (confirmed by Jaewon and Wei Hai), not 1.51.Generated
SubscriptionTieron this branch stays at six members:Pipeline
Followed
cloud/.github/workflows/push-ingest-types-to-frontend.ymlexactly —pnpm generatealone is not sufficient:go run ./services/ingest/scripts/openapi-project -fe -in services/ingest/openapi.yaml -out <fe>/packages/ingest-types/openapi.yamlResult:
kept 186 ops | excluded 41 x-internal | removed 36 empty paths + 3 orphaned tag decls | kept 192 schemas, pruned 40 schemas + 1 security scheme(17070 → 13436 lines).pnpm generateusing this branch's own pinned@hey-api/openapi-ts0.93.0 (not bumped; handles this spec cleanly).npx oxfmt --write src/— raw generator output is 4-space + semicolons; committed files are oxfmt-normalized. Skipping this makes the diff ~99% whitespace noise (+11499/−12702unformatted vs+413/−7formatted).Skipping step 1 is what leaked cloud's internal admin surface previously (52
Admin*refs), the defect #15878 reverted.Leak guard:
git grep -c 'Admin' packages/ingest-types/src/types.gen.ts→ 0. The workflow's full guard pattern (/admin|/api/internal|/api/webhooks|/m2m|/monitoring|/debug) also returns clean on the projected spec,types.gen.tsandzod.gen.ts.packages/ingest-types/openapi.yamlis gitignored and is not committed. Onlysrc/*.gen.tsandsrc/index.tsare.Delta — purely additive
SavedPaymentMethod,SubscriptionDiscount,CurrentWorkspaceResponse,ListSavedPaymentMethods{Data,Error,Errors,Response,Responses},GetCurrentWorkspace{Data,Error,Errors,Response,Responses}.status: 'pending' | 'succeeded' | 'failed'→… | 'reconciliation_needed'(plus its Zod counterpart). No narrowing anywhere.Verification
pnpm typecheck→ exit 0, zero errors, with feat(billing): consolidate embedded checkout frontend #14483 not applied. Because the spec predates ENTERPRISE this is genuinely types-only: nosatisfies neverbreakage and no compatibility shims were needed.npx oxfmt --check packages/ingest-types/src/→ clean.oxlint --type-aware, eslint, whole-projectpnpm typecheck) — no--no-verify.Merge order
Prerequisite for #15906 (embedded-checkout backport), which is stacked on this branch and fails typecheck with 94 errors without it. Merge this first. Not merged here, auto-merge not enabled.