Repository navigation
FE-3046 feat(billing-web): render the shared embedded checkout - #19101
Conversation
…resolved A checkout entry named a plan but its return_to did not resolve through buildReturnUrl, so the form rendered with a Back and Close that led nowhere. readEntry now records UNKNOWN_RETURN_TARGET for that entry, the same path a plan-less link takes.
…stem The cva recipe behind Button.vue lived in the app, so a workspace package could not render a button with the app's classes. It now ships from @comfyorg/design-system/button.variants and every importer reads it there. apps/website keeps its own copy.
…ants' into jaewon/account-ui-checkout-surfaces
…stem The saved-method picker moves into @comfyorg/account-ui next, and it has to render the app's select classes. The recipe now ships from @comfyorg/design-system/select.variants and its three importers read it there.
…form and success The cloud app's embedded checkout steps, as components billing-web can render too: the new-subscription confirm (price breakdown, promo code, saved methods, card form, 3DS and parked-checkout recovery), the plan-change confirm with its reactivation disclosure, the terms notice and the success screen. Hosts pass translated copy, the plan they resolved and the quote. The class recipes and cn() are bundled into the published build, reka-ui is a peer.
…unt-ui The new-subscription confirm, the plan-change confirm and the success step now render @comfyorg/account-ui's checkout components. The app components keep their props and events and bind the app's catalog, translations, Stripe key, theme, subscription status and journey telemetry. The copies they replace (the card-form wrapper, the terms note and the quote formatting helpers) are deleted; their tests move to the package or to the binding.
…ace-adopt-account-ui-checkout
billing-web resolves the plan it checks out from the quote, but the quote does not carry the monthly credit grant the confirm shows. The tiers' prices and grants move here so the app and billing-web read one table.
…ace-adopt-account-ui-checkout
CheckoutView now renders the cloud app's checkout steps from @comfyorg/account-ui in the app's dialog frame: the new-subscription confirm with its saved-method picker, promo code and card form, the plan-change confirm with its reactivation disclosure, and the success step. A plan change still confirms without a card form (#18684). EmbeddedCheckout, CheckoutPayment and CheckoutSubmit are deleted, with the billing-web-only copy they carried.
🎨 Storybook: ✅ Built — View Storybook🎭 Playwright: ✅ 2157 passed, 0 failed · 1 flaky📊 Browser Reports
🌐 Website E2ETip All tests passed.
🌾 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 dab0dbee1ca7ca733724febd558aa9708699176f
Full docs: ADR-DEVEX-LINT-0015 📦 Bundle: 10 MB gzip 🟢 -3.63 kBDetailsSummary
Category Glance App Entry Points — 3.77 kB (baseline 3.77 kB) • ⚪ 0 BMain entry bundles and manifests
Status: 1 added / 1 removed Graph Workspace — 1.45 MB (baseline 1.45 MB) • ⚪ 0 BGraph editor runtime, canvas, workflow orchestration
Status: 2 added / 2 removed / 1 unchanged Views & Navigation — 133 kB (baseline 133 kB) • ⚪ 0 BTop-level views, pages, and routed surfaces
Status: 14 added / 14 removed / 4 unchanged Panels & Settings — 643 kB (baseline 643 kB) • ⚪ 0 BConfiguration panels, inspectors, and settings screens
Status: 10 added / 10 removed / 18 unchanged User & Accounts — 39.4 kB (baseline 39.4 kB) • ⚪ 0 BAuthentication, profile, and account management bundles
Status: 6 added / 6 removed / 5 unchanged Editors & Dialogs — 126 kB (baseline 126 kB) • ⚪ 0 BModals, dialogs, drawers, and in-app editors
Status: 7 added / 7 removed / 1 unchanged UI Components — 125 kB (baseline 125 kB) • ⚪ 0 BReusable component library chunks
Status: 7 added / 7 removed / 9 unchanged Data & Services — 4.04 MB (baseline 4.06 MB) • 🟢 -13.9 kBStores, services, APIs, and repositories
Status: 12 added / 12 removed / 3 unchanged Utilities & Hooks — 582 kB (baseline 582 kB) • ⚪ 0 BHelpers, composables, and utility bundles
Status: 20 added / 20 removed / 17 unchanged Vendor & Third-Party — 17.4 MB (baseline 17.4 MB) • ⚪ 0 BExternal libraries and shared vendor chunks Status: 18 unchanged Other — 17.9 MB (baseline 17.9 MB) • 🔴 +1.38 kBBundles that do not match a named category
Status: 74 added / 74 removed / 226 unchanged ⚡ Performance Report
Show regressions
All metrics
Historical variance (last 15 runs)
Trend (last 15 commits on main)
Raw data{
"timestamp": "2026-09-29T00:24:30.805Z",
"gitSha": "7c4f4caea0fe045975724bfaafd96e8fcf10bcb8",
"branch": "jaewon/billing-web-shared-checkout",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2089.66300000003,
"styleRecalcs": 10,
"styleRecalcDurationMs": 4.539999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 562.9,
"heapDeltaBytes": -28896112,
"heapUsedBytes": 69333764,
"domNodes": -228,
"jsHeapTotalBytes": 3670016,
"scriptDurationMs": 13.503999999999998,
"eventListeners": -142,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665599999999998,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-idle",
"durationMs": 2039.7360000000617,
"styleRecalcs": 10,
"styleRecalcDurationMs": 4.5409999999999995,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 546.3580000000001,
"heapDeltaBytes": -1667124,
"heapUsedBytes": 77127532,
"domNodes": -228,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 14.162,
"eventListeners": -164,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.6655737704918,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1925.670000000025,
"styleRecalcs": 78,
"styleRecalcDurationMs": 20.785999999999998,
"layouts": 12,
"layoutDurationMs": 5.018,
"taskDurationMs": 953.389,
"heapDeltaBytes": -33038512,
"heapUsedBytes": 65006600,
"domNodes": -228,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 189.393,
"eventListeners": -142,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.812280701754382,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1863.4089999999333,
"styleRecalcs": 75,
"styleRecalcDurationMs": 18.29,
"layouts": 12,
"layoutDurationMs": 4.566000000000001,
"taskDurationMs": 919.805,
"heapDeltaBytes": -15005928,
"heapUsedBytes": 63900596,
"domNodes": -228,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 176.786,
"eventListeners": -142,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.81621621621622,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1725.1420000000053,
"styleRecalcs": 30,
"styleRecalcDurationMs": 10.468000000000002,
"layouts": 6,
"layoutDurationMs": 1.37,
"taskDurationMs": 304.574,
"heapDeltaBytes": -18585088,
"heapUsedBytes": 80136232,
"domNodes": 53,
"jsHeapTotalBytes": 7602176,
"scriptDurationMs": 14.571000000000002,
"eventListeners": 15,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666019417475724,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1739.5270000000664,
"styleRecalcs": 30,
"styleRecalcDurationMs": 10.959,
"layouts": 6,
"layoutDurationMs": 1.245,
"taskDurationMs": 433.955,
"heapDeltaBytes": -18741520,
"heapUsedBytes": 78807184,
"domNodes": 53,
"jsHeapTotalBytes": 7340032,
"scriptDurationMs": 17.232999999999997,
"eventListeners": 15,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666346153846156,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 716.7379999999639,
"styleRecalcs": 12,
"styleRecalcDurationMs": 4.114,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 479.13100000000003,
"heapDeltaBytes": 18546288,
"heapUsedBytes": 97268336,
"domNodes": 0,
"jsHeapTotalBytes": 4194304,
"scriptDurationMs": 173.898,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665116279069775,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 737.577999999985,
"styleRecalcs": 13,
"styleRecalcDurationMs": 4.892,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 492.73,
"heapDeltaBytes": -1915100,
"heapUsedBytes": 96622452,
"domNodes": 0,
"jsHeapTotalBytes": 7602176,
"scriptDurationMs": 181.441,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66363636363636,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-order-dense-n200-w200-i120",
"durationMs": 1234.5070000000078,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 932.4890000000001,
"heapDeltaBytes": 9969768,
"heapUsedBytes": 87007888,
"domNodes": 0,
"jsHeapTotalBytes": 2523136,
"scriptDurationMs": 77.862,
"eventListeners": 0,
"totalBlockingTimeMs": 609,
"frameDurationMs": 37.37575757575757,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-order-dense-n200-w200-i120",
"durationMs": 1219.385000000102,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 903.756,
"heapDeltaBytes": 6328884,
"heapUsedBytes": 82372572,
"domNodes": 0,
"jsHeapTotalBytes": 4096000,
"scriptDurationMs": 71.465,
"eventListeners": 0,
"totalBlockingTimeMs": 587,
"frameDurationMs": 35.782352941176455,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-order-sparse-n1000-w20-i120",
"durationMs": 869.5409999999697,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 505.5430000000003,
"heapDeltaBytes": 16922568,
"heapUsedBytes": 91569808,
"domNodes": 0,
"jsHeapTotalBytes": 266240,
"scriptDurationMs": 170.71999999999997,
"eventListeners": 0,
"totalBlockingTimeMs": 229,
"frameDurationMs": 25.488235294117658,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "dom-widget-order-sparse-n1000-w20-i120",
"durationMs": 877.7049999999917,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 509.9359999999997,
"heapDeltaBytes": 14674296,
"heapUsedBytes": 89691628,
"domNodes": 0,
"jsHeapTotalBytes": 266240,
"scriptDurationMs": 179.79199999999994,
"eventListeners": 0,
"totalBlockingTimeMs": 238,
"frameDurationMs": 25.979411764705915,
"p95FrameDurationMs": 33.399999999999636
},
{
"name": "extension-clean-combined-draw",
"durationMs": 11740.56300000001,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 10679.466,
"heapDeltaBytes": -13096916,
"heapUsedBytes": 66701536,
"domNodes": 0,
"jsHeapTotalBytes": -13369344,
"scriptDurationMs": 8807.338000000002,
"eventListeners": 0,
"totalBlockingTimeMs": 1615,
"frameDurationMs": 33.81239193083574,
"p95FrameDurationMs": 66.70000000000073
},
{
"name": "extension-clean-combined-draw",
"durationMs": 10416.388999999981,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 9558.232,
"heapDeltaBytes": -2207412,
"heapUsedBytes": 79572972,
"domNodes": 0,
"jsHeapTotalBytes": -3407872,
"scriptDurationMs": 8154.18,
"eventListeners": 0,
"totalBlockingTimeMs": 1669,
"frameDurationMs": 35.98477508650519,
"p95FrameDurationMs": 66.70000000000073
},
{
"name": "extension-rgthree-prototype-draw",
"durationMs": 10936.461000000008,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 9868.516999999998,
"heapDeltaBytes": 4082932,
"heapUsedBytes": 84150920,
"domNodes": 0,
"jsHeapTotalBytes": -14942208,
"scriptDurationMs": 8062.427,
"eventListeners": 0,
"totalBlockingTimeMs": 1261,
"frameDurationMs": 31.416379310344826,
"p95FrameDurationMs": 66.60000000000036
},
{
"name": "extension-rgthree-prototype-draw",
"durationMs": 11452.538000000004,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 10396.666,
"heapDeltaBytes": -1412548,
"heapUsedBytes": 79420948,
"domNodes": 0,
"jsHeapTotalBytes": -14942208,
"scriptDurationMs": 8618.355,
"eventListeners": 0,
"totalBlockingTimeMs": 1361,
"frameDurationMs": 32.34350282485876,
"p95FrameDurationMs": 66.69999999999891
},
{
"name": "large-graph-idle",
"durationMs": 2058.936000000017,
"styleRecalcs": 7,
"styleRecalcDurationMs": 3.053,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 711.03,
"heapDeltaBytes": -35793812,
"heapUsedBytes": 83369556,
"domNodes": -228,
"jsHeapTotalBytes": -360448,
"scriptDurationMs": 42.336999999999996,
"eventListeners": -142,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665853658536584,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2044.6210000000065,
"styleRecalcs": 7,
"styleRecalcDurationMs": 2.8910000000000013,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 751.6579999999999,
"heapDeltaBytes": -36581996,
"heapUsedBytes": 83041652,
"domNodes": -228,
"jsHeapTotalBytes": -98304,
"scriptDurationMs": 41.38699999999999,
"eventListeners": -164,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66639344262295,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2652.992999999981,
"styleRecalcs": 68,
"styleRecalcDurationMs": 9.898999999999997,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1733.4399999999998,
"heapDeltaBytes": -31604312,
"heapUsedBytes": 88192156,
"domNodes": -228,
"jsHeapTotalBytes": 389120,
"scriptDurationMs": 868.2840000000001,
"eventListeners": -142,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666242038216563,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 3113.411000000042,
"styleRecalcs": 67,
"styleRecalcDurationMs": 10.342999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1845.412,
"heapDeltaBytes": 24322272,
"heapUsedBytes": 87601492,
"domNodes": 0,
"jsHeapTotalBytes": 749568,
"scriptDurationMs": 941.824,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-zoom",
"durationMs": 3708.769000000018,
"styleRecalcs": 62,
"styleRecalcDurationMs": 10.931,
"layouts": 60,
"layoutDurationMs": 14.21,
"taskDurationMs": 1745.878,
"heapDeltaBytes": 7713084,
"heapUsedBytes": 73021524,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 802.42,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66591928251121,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3999.1240000000516,
"styleRecalcs": 61,
"styleRecalcDurationMs": 11.148000000000001,
"layouts": 60,
"layoutDurationMs": 14.920000000000002,
"taskDurationMs": 1892.0620000000001,
"heapDeltaBytes": 8496884,
"heapUsedBytes": 72442956,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 872.861,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66583333333333,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "legacy-node-drag",
"durationMs": 3209.144999999978,
"styleRecalcs": 44,
"styleRecalcDurationMs": 6.350000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 2004.8689999999997,
"heapDeltaBytes": 503244,
"heapUsedBytes": 65565696,
"domNodes": 0,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 1009.404,
"eventListeners": 180,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.841578947368426,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "legacy-node-drag",
"durationMs": 3222.9770000000144,
"styleRecalcs": 41,
"styleRecalcDurationMs": 5.536,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 2140.053,
"heapDeltaBytes": 287560,
"heapUsedBytes": 65377048,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 1087.9959999999999,
"eventListeners": 180,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.84031413612566,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "minimap-idle",
"durationMs": 2009.9739999999997,
"styleRecalcs": 5,
"styleRecalcDurationMs": 1.7859999999999994,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 440.06,
"heapDeltaBytes": 20548020,
"heapUsedBytes": 84251624,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 34.267,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666115702479335,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "minimap-idle",
"durationMs": 2023.3899999999494,
"styleRecalcs": 5,
"styleRecalcDurationMs": 2.234999999999997,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 680.939,
"heapDeltaBytes": 21305256,
"heapUsedBytes": 83824508,
"domNodes": -4,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 44.268,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666115702479335,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 663.6849999999868,
"styleRecalcs": 46,
"styleRecalcDurationMs": 6.536000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 418.945,
"heapDeltaBytes": 13300164,
"heapUsedBytes": 93637752,
"domNodes": 0,
"jsHeapTotalBytes": 4456448,
"scriptDurationMs": 152.118,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66500000000001,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 683.2650000000058,
"styleRecalcs": 46,
"styleRecalcDurationMs": 6.332999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 433.388,
"heapDeltaBytes": 13293796,
"heapUsedBytes": 94169916,
"domNodes": 0,
"jsHeapTotalBytes": 4456448,
"scriptDurationMs": 153.917,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66585365853659,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "subgraph-idle",
"durationMs": 2039.7439999999847,
"styleRecalcs": 9,
"styleRecalcDurationMs": 4.532999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 531.1629999999999,
"heapDeltaBytes": -14586448,
"heapUsedBytes": 66260636,
"domNodes": -244,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 12.708,
"eventListeners": -188,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66475409836066,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-idle",
"durationMs": 2024.3770000000723,
"styleRecalcs": 9,
"styleRecalcDurationMs": 4.409999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 401.72200000000004,
"heapDeltaBytes": -16082548,
"heapUsedBytes": 64684796,
"domNodes": -244,
"jsHeapTotalBytes": -1310720,
"scriptDurationMs": 11.294000000000002,
"eventListeners": -188,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.6655737704918,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1773.7529999999992,
"styleRecalcs": 73,
"styleRecalcDurationMs": 19.865000000000002,
"layouts": 16,
"layoutDurationMs": 7.076,
"taskDurationMs": 851.2520000000001,
"heapDeltaBytes": -5288072,
"heapUsedBytes": 75691472,
"domNodes": -244,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 121.143,
"eventListeners": -210,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66698113207547,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1761.9760000000042,
"styleRecalcs": 76,
"styleRecalcDurationMs": 22.978,
"layouts": 16,
"layoutDurationMs": 6.436999999999999,
"taskDurationMs": 902.4920000000001,
"heapDeltaBytes": -19726700,
"heapUsedBytes": 60594540,
"domNodes": -244,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 129.139,
"eventListeners": -188,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666037735849052,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-transition-enter",
"durationMs": 1435.7210000000578,
"styleRecalcs": 18,
"styleRecalcDurationMs": 29.584,
"layouts": 5,
"layoutDurationMs": 13.431999999999999,
"taskDurationMs": 983.6839999999997,
"heapDeltaBytes": 23174556,
"heapUsedBytes": 104737076,
"domNodes": 13667,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 33.69800000000001,
"eventListeners": 2383,
"totalBlockingTimeMs": 144,
"frameDurationMs": 19.333333333333332,
"p95FrameDurationMs": 16.80000000000109
},
{
"name": "viewport-pan-sweep",
"durationMs": 9395.379999999988,
"styleRecalcs": 251,
"styleRecalcDurationMs": 34.857,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 6217.439,
"heapDeltaBytes": -35021500,
"heapUsedBytes": 84251368,
"domNodes": -228,
"jsHeapTotalBytes": 1404928,
"scriptDurationMs": 2924.799,
"eventListeners": -164,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665896980461813,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 11238.731000000029,
"styleRecalcs": 250,
"styleRecalcDurationMs": 37.035,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 6815.0380000000005,
"heapDeltaBytes": -27182436,
"heapUsedBytes": 92336692,
"domNodes": -228,
"jsHeapTotalBytes": 94208,
"scriptDurationMs": 3257.835,
"eventListeners": -142,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66612184249629,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 17261.998000000007,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 16960.774999999998,
"heapDeltaBytes": -18251704,
"heapUsedBytes": 175328008,
"domNodes": -3045,
"jsHeapTotalBytes": 9682944,
"scriptDurationMs": 293.04600000000005,
"eventListeners": -14915,
"totalBlockingTimeMs": 0,
"frameDurationMs": 32.06171003717471,
"p95FrameDurationMs": 66.60000000000036
},
{
"name": "vue-large-graph-idle",
"durationMs": 18771.35099999998,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 18460.696,
"heapDeltaBytes": -28604556,
"heapUsedBytes": 195487960,
"domNodes": -8049,
"jsHeapTotalBytes": -17571840,
"scriptDurationMs": 315.684,
"eventListeners": -14923,
"totalBlockingTimeMs": 0,
"frameDurationMs": 34.62814814814814,
"p95FrameDurationMs": 66.70000000000073
},
{
"name": "vue-large-graph-pan",
"durationMs": 21569.396999999983,
"styleRecalcs": 152,
"styleRecalcDurationMs": 21.05299999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 21409.695,
"heapDeltaBytes": -38113448,
"heapUsedBytes": 190490284,
"domNodes": -3045,
"jsHeapTotalBytes": 3588096,
"scriptDurationMs": 967.581,
"eventListeners": -14915,
"totalBlockingTimeMs": 51,
"frameDurationMs": 42.03840155945419,
"p95FrameDurationMs": 83.39999999999782
},
{
"name": "vue-large-graph-pan",
"durationMs": 22922.605999999974,
"styleRecalcs": 174,
"styleRecalcDurationMs": 23.599000000000007,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 22743.748000000003,
"heapDeltaBytes": 3870456,
"heapUsedBytes": 189885532,
"domNodes": -8049,
"jsHeapTotalBytes": -28119040,
"scriptDurationMs": 947.7829999999999,
"eventListeners": -14923,
"totalBlockingTimeMs": 132,
"frameDurationMs": 44.81232876712328,
"p95FrameDurationMs": 83.40000000000146
},
{
"name": "vue-node-resize-workload",
"durationMs": 6290.960000000041,
"styleRecalcs": 20,
"styleRecalcDurationMs": 81.49499999999999,
"layouts": 20,
"layoutDurationMs": 24.935,
"taskDurationMs": 6237.728,
"heapDeltaBytes": 21539952,
"heapUsedBytes": 224197612,
"domNodes": 0,
"jsHeapTotalBytes": 1048576,
"scriptDurationMs": 114.58500000000001,
"eventListeners": 0,
"totalBlockingTimeMs": 475,
"frameDurationMs": 38.649079754601225,
"p95FrameDurationMs": 66.79999999999927
},
{
"name": "vue-node-resize-workload",
"durationMs": 6623.295999999982,
"styleRecalcs": 20,
"styleRecalcDurationMs": 82.80500000000002,
"layouts": 20,
"layoutDurationMs": 25.56900000000001,
"taskDurationMs": 6600.052000000001,
"heapDeltaBytes": 1146528,
"heapUsedBytes": 212338208,
"domNodes": 0,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 126.45,
"eventListeners": 0,
"totalBlockingTimeMs": 575,
"frameDurationMs": 41.048148148148144,
"p95FrameDurationMs": 83.39999999999964
},
{
"name": "vue-zoom-out-idle",
"durationMs": 8823.960999999941,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 8642.928999999998,
"heapDeltaBytes": -32424808,
"heapUsedBytes": 169368800,
"domNodes": 0,
"jsHeapTotalBytes": -32768000,
"scriptDurationMs": 139.88100000000003,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 32.0036231884058,
"p95FrameDurationMs": 66.59999999999854
},
{
"name": "vue-zoom-out-idle",
"durationMs": 9260.516000000052,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 9038.151999999998,
"heapDeltaBytes": -47870804,
"heapUsedBytes": 160994308,
"domNodes": -3046,
"jsHeapTotalBytes": 6778880,
"scriptDurationMs": 149.93600000000006,
"eventListeners": -14915,
"totalBlockingTimeMs": 0,
"frameDurationMs": 33.942490842490855,
"p95FrameDurationMs": 66.70000000000073
},
{
"name": "workflow-execution",
"durationMs": 528.1350000000202,
"styleRecalcs": 23,
"styleRecalcDurationMs": 25.563000000000002,
"layouts": 6,
"layoutDurationMs": 3.8260000000000005,
"taskDurationMs": 249.142,
"heapDeltaBytes": -44182904,
"heapUsedBytes": 52604528,
"domNodes": -131,
"jsHeapTotalBytes": 3407872,
"scriptDurationMs": 20.233,
"eventListeners": -102,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.667741935483864,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 488.0989999999201,
"styleRecalcs": 15,
"styleRecalcDurationMs": 15.500000000000002,
"layouts": 3,
"layoutDurationMs": 0.9159999999999999,
"taskDurationMs": 131.858,
"heapDeltaBytes": -14712288,
"heapUsedBytes": 81573564,
"domNodes": 101,
"jsHeapTotalBytes": 4194304,
"scriptDurationMs": 12.579,
"eventListeners": 81,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.665517241379316,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "agent-composer-empty-conversation-typing",
"durationMs": 1026.7989999999827,
"styleRecalcs": 78,
"styleRecalcDurationMs": 116.902,
"layouts": 76,
"layoutDurationMs": 24.840999999999998,
"taskDurationMs": 985.155,
"heapDeltaBytes": 18736800,
"heapUsedBytes": 90672932,
"domNodes": 76,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 401.19,
"eventListeners": 876,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66612903225808,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "agent-composer-empty-conversation-typing",
"durationMs": 1202.921999999944,
"styleRecalcs": 78,
"styleRecalcDurationMs": 120.718,
"layouts": 76,
"layoutDurationMs": 28.332,
"taskDurationMs": 1174.982,
"heapDeltaBytes": -4523676,
"heapUsedBytes": 67450032,
"domNodes": 76,
"jsHeapTotalBytes": 1835008,
"scriptDurationMs": 489.888,
"eventListeners": 876,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.89861111111111,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "agent-composer-long-conversation-typing",
"durationMs": 1506.5490000000636,
"styleRecalcs": 78,
"styleRecalcDurationMs": 273.86899999999997,
"layouts": 76,
"layoutDurationMs": 26.904,
"taskDurationMs": 1488.625,
"heapDeltaBytes": 9146108,
"heapUsedBytes": 115465792,
"domNodes": 76,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 495.268,
"eventListeners": 876,
"totalBlockingTimeMs": 0,
"frameDurationMs": 18.92962962962962,
"p95FrameDurationMs": 33.30000000000109
},
{
"name": "agent-composer-long-conversation-typing",
"durationMs": 1521.996999999942,
"styleRecalcs": 78,
"styleRecalcDurationMs": 284.16999999999996,
"layouts": 76,
"layoutDurationMs": 27.073,
"taskDurationMs": 1509.262,
"heapDeltaBytes": 9188936,
"heapUsedBytes": 115482496,
"domNodes": 76,
"jsHeapTotalBytes": 1048576,
"scriptDurationMs": 510.79299999999995,
"eventListeners": 876,
"totalBlockingTimeMs": 0,
"frameDurationMs": 18.874698795180706,
"p95FrameDurationMs": 33.399999999999636
}
]
}🔬 E2E Coverage
Top 10 files by uncovered lines
🧩 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 |
|
Navigate logical layers of code changes, visualize relationships, and explore their blast radius. Important Review skippedReview was skipped due to path filters ⛔ Files ignored due to path filters (1)
CodeRabbit blocks several paths by default. You can override this behavior by explicitly including those paths in the path filters. For example, including ⚙️ Run configurationConfiguration used: Repository: Comfy-Org/ComfyUI_frontend/.coderabbit.yaml Review profile: ASSERTIVE Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository: Comfy-Org/ComfyUI_frontend/.coderabbit.yaml Review profile: ASSERTIVE Plan: Advanced Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (5)
Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 4 remain after this review. 📝 WalkthroughWalkthroughThe billing web checkout now uses shared pricing and request helpers, reusable checkout presentation components, and billing operation state. Shared account packages provide team-credit pricing and operation-classification helpers used by checkout and workspace billing flows. ChangesBilling checkout and shared billing
Priority: ➖ Normal Estimated code review effort: 4 (Complex) | ~50 minutes Change: Feature Sequence Diagram(s)sequenceDiagram
participant CheckoutView
participant CheckoutFrame
participant BillingAPI
participant HostApp
CheckoutView->>CheckoutFrame: Render the current checkout step
CheckoutView->>BillingAPI: Submit the subscription request
BillingAPI-->>CheckoutView: Return operation state
CheckoutView->>CheckoutFrame: Render confirmation or success state
CheckoutView->>HostApp: Navigate on close
Suggested reviewers: Merge Risk: 🟡 Moderate · up to Checkout may fail to collect a new card when its Stripe key is missing or differs from the SDK’s key. Resolve that payment-path risk before merging; the promo and localization issues also remain open. Security Architecture ReviewSecurity architecture risk: 🟡 Moderate · up to The checkout design now handles more payment choices and recovery states. The reviewed client paths retain important safeguards, and no introduced security vulnerability was established. Server-side authorization of the submitted billing identifiers remains unverified. Retained concerns Security review detailsSecurity Blast Radius
Trust Boundaries and Controls
Resilience and Maintainability Implications
Hardening Proposals
🚥 Pre-merge checks | ✅ 6 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (6 passed)
Full details: End-To-End Regression Coverage For FixesExplanation The PR contains bug-fix signals, including multiple ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment |
Codecov Report❌ Patch coverage is @@ Coverage Diff @@
## main #19101 +/- ##
==========================================
- Coverage 85.07% 84.18% -0.90%
==========================================
Files 2338 3218 +880
Lines 134365 156569 +22204
Branches 34338 40755 +6417
==========================================
+ Hits 114310 131804 +17494
- Misses 19702 23049 +3347
- Partials 353 1716 +1363
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 880 files with indirect coverage changes 🚀 New features to boost your workflow:
|
…atalog its own entry Both confirm templates exceeded the complexity gate. The new-subscription confirm now composes a summary and a pay-actions component, and picks one pay action in script; the plan-change confirm moves its reactivation banner and plan block into components. Rendered markup is unchanged. The tier catalog moves to @comfyorg/account-ui/billing/catalog, a TS-only entry, so importing it does not pull Vue components into non-Vue consumers such as the Playwright runner.
…ace-adopt-account-ui-checkout
✅ Action performedComments resolved and changes approved. |
christian-byrne
left a comment
There was a problem hiding this comment.
Approved at exact head cc922af708889fe98854c08b844a0242ff8ea9f7.
- The shared checkout preserves tab-local workspace binding through the existing scoped billing client and does not introduce cross-tab workspace state.
- The app and billing-web now share decline copy, hosted-action prompting, team-stop pricing, pending-operation recovery, and checkout surfaces.
- Exact-head CI is settled green and every review thread is resolved.
Full context for agent readers
Reviewed the current main-based diff and the fixes after the prior review. The server-held-operation path is recovered before a new subscribe attempt, saved payment and promotion inputs remain bound to the active quote, hosted verification distinguishes an external action URL from an in-page challenge, and the shared catalog/copy helpers keep the two hosts aligned. The live parity evidence in the PR covers declines, 3DS, reactivation, pending operations, toasts, and success framing.
…rom account-ui (Comfy-Org#19100) - Linear: FE-3046 ## Why Comfy-Org#19099 moved the app's checkout steps into `@comfyorg/account-ui`. Until the app renders those components, the package holds a second copy that nothing keeps in step. This PR makes the app render them, so the app and (in D) billing-web share one implementation. No visual change in the app. ## How - `SubscriptionAddPaymentPreviewWorkspace.vue`, `SubscriptionTransitionPreviewWorkspace.vue` and `SubscriptionSuccessWorkspace.vue` keep their props and events, so their parents are untouched. Each now renders `CheckoutSubscribeConfirm`, `CheckoutTransitionConfirm` or `CheckoutSuccess` and binds what only the app knows: - copy from vue-i18n (`useCheckoutCopy`), including the `CheckoutPlan` built from the tier catalog or the team credit stop, - the Stripe publishable key, the colour-palette theme key and checkout-journey telemetry (previously in `UnifiedStripePaymentSelector.vue`), - subscription status from `useBillingContext` (loaded, cancelled, end date) for the reactivation banner, - the team invite block and Send invites action through `CheckoutSuccess`'s slots. - Deleted, now in the package: `UnifiedStripePaymentSelector.vue`, `SubscriptionTermsNote.vue`, `subscriptionQuoteFormatting.ts` and `planDuration.ts` (plus their tests, which the package's `checkoutQuote.test.ts` and component tests cover). `useSubscriptionCheckout` imports `amountDueTodayChanged` from the package. - `TIER_PRICING` spreads the shared `TIER_CATALOG` (same numbers) and keeps its app-only `videoEstimate`. - `UnifiedStripePaymentSelector.test.ts` becomes `SubscriptionAddPaymentPreviewWorkspace.stripe.test.ts`: the same key, copy, theme and telemetry assertions against the binding. ## Review Focus Parity evidence: the existing component tests for the three steps (`SubscriptionAddPaymentPreviewWorkspace.test.ts`, `SubscriptionTransitionPreviewWorkspace*.test.ts`, `SubscriptionSuccessWorkspace.test.ts`) pass unchanged, apart from renaming the stubbed children (`UnifiedStripePaymentSelector` → `CheckoutPaymentForm`, `SingleSelect` → `CheckoutSavedMethodSelect`, `SubscriptionTermsNote` → `CheckoutTermsNote`). ## Stack | PR | branch | base | title | |---|---|---|---| | Comfy-Org#19097 | `jaewon/billing-web-remove-plan-grid` | `main` | `FE-3045 refactor(billing-web): drop the billing-web plan grid; hosts own plan selection` | | A Comfy-Org#19098 | `jaewon/design-system-button-variants` | Comfy-Org#19097 | `FE-3046 refactor(design-system): move buttonVariants into @comfyorg/design-system` | | B Comfy-Org#19099 | `jaewon/account-ui-checkout-surfaces` | A | `FE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and success` | | **C (this PR)** | **`jaewon/workspace-adopt-account-ui-checkout`** | **B** | **`FE-3046 refactor(workspace): render the subscription checkout steps from account-ui`** | | D Comfy-Org#19101 | `jaewon/billing-web-shared-checkout` | C | `FE-3046 feat(billing-web): render the shared embedded checkout` | | E Comfy-Org#19104 | `jaewon/billing-web-success-invite` | D | `FE-3046 feat(billing-web): invite your team from the checkout success step` | | F Comfy-Org#19105 | `jaewon/checkout-3ds-failure-copy` | E | `FE-3047 fix(account-ui): clear decline toasts once a retry succeeds` | | G Comfy-Org#19106 | `jaewon/billing-web-return-close-tab` | F | `FE-3048 fix(billing-web): return to the host by closing the checkout tab` | | H Comfy-Org#19115 | `jaewon/checkout-cta-reachable` | G | `FE-3050 fix(account-ui): keep the checkout CTA reachable when notices grow the confirm step` | ```mermaid graph LR P0[Comfy-Org#19097: remove plan grid] --> A[A: design-system buttonVariants] A --> B[B: account-ui checkout surfaces] B --> C[C: workspace adopts account-ui] C --> D[D: billing-web shared checkout] D --> E[E: billing-web success invite] E --> F[F: stale decline toasts] F --> G[G: close the billing tab] G --> H[H: reachable checkout CTA] style C fill:#f9d71c,stroke:Comfy-Org#333,color:#000 ``` ## AS IS / TO BE Each image: **left = AS IS** (app on Comfy-Org#19099, old components), **right = TO BE** (this PR). Rendered in Storybook (a temporary story, not committed) with the app components' real props, the checkout dialog's frame classes, dark theme, 1440x900, and a fake `js.stripe.com` (the same fake billing-web's e2e uses), so the card element area is blank in both. Not against a live backend. AS IS and TO BE are pixel-identical for all four steps (PIL diff: no differing pixels). **Confirm + card entry (new subscription, no saved method)** <img width="1448" alt="card" src="https://github.com/user-attachments/assets/c00c89fb-1eaa-46bd-b335-9bf51e09fff1" /> **Confirm + saved-card selector (two saved cards)** <img width="1448" alt="saved" src="https://github.com/user-attachments/assets/d2db71b9-2e7f-4e99-bd89-45624e771ce5" /> **Plan change (upgrade, no card form)** <img width="1448" alt="change" src="https://github.com/user-attachments/assets/740beba9-fbb0-41ac-a2a6-9bb3815665da" /> **Success** <img width="1448" alt="success" src="https://github.com/user-attachments/assets/42a18550-21fa-41b7-8e7d-c2ebc7349520" /> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
… everywhere (Comfy-Org#19330) ## Summary The embedded checkout card form, its enable gate and the 3DS challenge now read the Stripe publishable key server-first, the same way the billing SDK store already does. - Fixes FE-3074 - Context: Comfy-Org#19101 (comment) ## Why A build whose `VITE_STRIPE_PUBLISHABLE_KEY` is empty or belongs to another Stripe account mounts the embedded card form with the wrong key, or hides it, even when `/features` serves the right `stripe_publishable_key`. Payment intents are created on the server's Stripe account, so a mismatched key fails to confirm them. ## Root cause `resolvedStripePublishableKey()` (server key, env fallback) was private to `billingSdkStore.ts`. Three other readers kept reading the env var directly: | Reader | Effect of a wrong/empty env key | | --- | --- | | `SubscriptionAddPaymentPreviewWorkspace.vue` | card form mounted with the build key | | `SubscriptionRequiredDialogContentUnified.vue` | payment element disabled despite a server key | | `billingOperationStore.ts` (3DS) | challenge loaded Stripe with the build key | ## How Move the resolver to `src/platform/workspace/billing/stripePublishableKey.ts` and use it in all four readers. No `src/` code reads `VITE_STRIPE_PUBLISHABLE_KEY` directly afterwards. Red-green: the first commit adds only the tests (server key wins over env; env is the fallback) at each consumer, the second commit is the fix. - Red run (a830742, tests only): https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36508655664 — `test` / shards 3, 4, 6 fail on the three server-key cases - Green run (3c1962a, fix): https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36512468736 — all shards pass ## AS IS / TO BE | AS IS | TO BE | | --- | --- | | _pending_ | _pending_ | Verified on testcloud with `VITE_STRIPE_PUBLISHABLE_KEY` empty: at this head the confirm step receives the server `pk_test_…` key and `usePaymentElement` is `true` (on `main` it is `false`). The card form itself does not mount there because testcloud's subscribe quote omits `quote_id` / `quote_version`, so the screenshot pair needs a backend that returns a complete quote (a pr-N testenv). ## Plan position Single PR; no stack. ```mermaid flowchart LR A["billingSdkStore resolver (on main)"] --> B["FE-3074: shared resolver for every Stripe key reader (this PR)"] style B stroke-width:3px ```
…tor, card form and success (#19099) - Linear: FE-3046 **Merge order:** #19096 (ADR 0034 amendment) merges first. Until it does, ADR 0034 rule 4 still forbids account-ui from using the design system, which B does. ## Why billing-web is the cloud app's embedded checkout moved to a new tab, with no UX change (ADR BILLING-WEB-0038, #19096). Today billing-web renders a checkout of its own (`EmbeddedCheckout`, `CheckoutPayment`, `CheckoutSubmit`) that has drifted from the app's: different price layout, no saved-card selection, different copy. For both to render the same screens, the app's confirm, price breakdown, saved-card selector, card form, terms notice and success step have to live where both can import them. This PR adds them to `@comfyorg/account-ui`. Nothing renders them yet, so no visual change. ## How - New entry `@comfyorg/account-ui/billing/checkout`, ported line for line from the app components. Same markup, same classes, same conditions: - `CheckoutSubscribeConfirm` ← `SubscriptionAddPaymentPreviewWorkspace.vue` (plan header, credits, total due, discounts, promo code, saved methods, card form, 3DS prompt, parked-checkout recovery, terms). - `CheckoutTransitionConfirm` ← `SubscriptionTransitionPreviewWorkspace.vue` (immediate vs scheduled change, reactivation banner and threshold checkbox). - `CheckoutSavedMethods` + `CheckoutSavedMethodSelect` ← the saved-method row / `SingleSelect` picker (Reka select with the app's select classes). - `CheckoutPaymentForm` ← `UnifiedStripePaymentSelector.vue` minus the app bindings (key, theme and telemetry become props and a `phase` event). - `CheckoutSuccess` ← `SubscriptionSuccessWorkspace.vue`, with `details`/`actions` slots for the app's team invite. - `CheckoutTermsNote`, `CheckoutPromotionCode`, `CheckoutPaymentNotices`, `CheckoutVerificationPrompt`: blocks both confirms repeated. `CheckoutSubscribeSummary`/`CheckoutSubscribeActions` and `CheckoutReactivationBanner`/`CheckoutTransitionSummary` split the two confirm templates under the fallow complexity gate; the rendered markup is the same. - `checkoutQuote.ts`: the app's `subscriptionQuoteFormatting.ts` + `planDuration.ts`. - `@comfyorg/account-ui/billing/catalog` (TS-only entry): the tiers' prices and monthly credit grants (the numbers in the app's `TIER_PRICING`). The app's confirm reads the grant from this table (`TIER_PRICING`), not from the quote's `new_plan.credits_cents`, so billing-web reads the same table to show the same number; C points the app at it. A separate entry so non-Vue consumers (the Playwright runner imports `tierPricing`) never load the components. - The package has no i18n runtime. Hosts pass a typed `CheckoutCopy`; interpolated strings are functions, and sentences that wrap an element (terms links, reactivation amount) keep `{token}`s that the component splits. - Hosts pass a resolved `CheckoutPlan` (name, monthly/yearly price, credits, `pricedByQuote`) instead of the package reading the tier catalog. - `selectVariants` moves to `@comfyorg/design-system/select.variants` (same move as `buttonVariants` in #19098), so the picker renders the app's select classes. - Packaging: `design-system` variants and `tailwind-utils`'s `cn` are bundled into the published build (dev dependencies). `tailwind-utils` is not on npm and `design-system` ships TS source, so neither can be a runtime dependency of a published package. `reka-ui` is a peer. The rendered classes need the design-system theme and primeicons at runtime, so `@comfyorg/design-system` and `primeicons` are peers too, and the package description says to load their CSS and add the package's dist to the consumer's Tailwind sources. The smoke test imports the new entry in the typed consumer and treats it as bundler-only, like `billing/stripe`. ### Reactivation renewal date (live testcloud recording) The reactivation notice and the summary could name different renewal days for the same quote. On `m2-qa-0925-3ds` the notice said "renew … on Oct 27" and the summary "Renews … on Oct 25, 2026". - **Summary:** reads `renewal_at ?? new_plan.period_end` (`resolveRenewalDate`). - **Notice:** read `new_plan.period_end` only. When that was absent, it computed `effective_at` + one period on the client (Sep 27 + 1 month = Oct 27). - **Not a server inconsistency:** the server sent one renewal date, `renewal_at`, which the contract defines as "the next recurring charge and target-plan period end". - **Fix:** the notice now reads the same server date as the summary (`resolveRenewalDate`: `renewal_at`, else the plan's server `period_end`). The client-side computation is gone. With no server date, the notice drops its renewal clause through new `reactivation.withoutRenewalDate` copy, the way the summary drops its date. - **Contract:** `renewal_at` is optional in `PreviewSubscribeResponse` ("Optional in the schema for older clients"; "current servers always return this"). The server should always send it; the client no longer computes one when it doesn't. - **Tests:** - A new test fails on the old code (Oct 27 vs Oct 25). - The tests that pinned the client computation (account-ui and the app's `SubscriptionTransitionPreviewWorkspaceReactivation.test.ts`, in C) are replaced by a no-renewal-date test. - C adds the app's `withoutRenewalDate` strings. ## Review Focus - The ports are meant to be verbatim. C (the next PR) swaps the app onto these components and the app's existing component tests (about 2,100 lines across the two confirms and the success step) pass with only stub names changed. That is the parity check. - `CheckoutPlan.pricedByQuote` reproduces the app's price rules exactly, including the odd ones: a tier plan shows the quote's price once one arrives and `$0` on the success step without one; a team credit stop always shows its own price. ## Stack | PR | branch | base | title | |---|---|---|---| | #19097 | `jaewon/billing-web-remove-plan-grid` | `main` | `FE-3045 refactor(billing-web): drop the billing-web plan grid; hosts own plan selection` | | A #19098 | `jaewon/design-system-button-variants` | #19097 | `FE-3046 refactor(design-system): move buttonVariants into @comfyorg/design-system` | | **B (this PR)** | **`jaewon/account-ui-checkout-surfaces`** | **A** | **`FE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and success`** | | C #19100 | `jaewon/workspace-adopt-account-ui-checkout` | B | `FE-3046 refactor(workspace): render the subscription checkout steps from account-ui` | | D #19101 | `jaewon/billing-web-shared-checkout` | C | `FE-3046 feat(billing-web): render the shared embedded checkout` | | E #19104 | `jaewon/billing-web-success-invite` | D | `FE-3046 feat(billing-web): invite your team from the checkout success step` | | F #19105 | `jaewon/checkout-3ds-failure-copy` | E | `FE-3047 fix(account-ui): clear decline toasts once a retry succeeds` | | G #19106 | `jaewon/billing-web-return-close-tab` | F | `FE-3048 fix(billing-web): return to the host by closing the checkout tab` | | H #19115 | `jaewon/checkout-cta-reachable` | G | `FE-3050 fix(account-ui): keep the checkout CTA reachable when notices grow the confirm step` | ```mermaid graph LR P0[#19097: remove plan grid] --> A[A: design-system buttonVariants] A --> B[B: account-ui checkout surfaces] B --> C[C: workspace adopts account-ui] C --> D[D: billing-web shared checkout] D --> E[E: billing-web success invite] E --> F[F: stale decline toasts] F --> G[G: close the billing tab] G --> H[H: reachable checkout CTA] style B fill:#f9d71c,stroke:#333,color:#000 ``` ## AS IS / TO BE No rendered change: nothing renders these components in this PR. The parity screenshots are on C (#19100, app before/after, pixel-identical) and D (#19101, billing-web before/after next to the app). --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…tor, card form and success (#19099) - Linear: FE-3046 **Merge order:** #19096 (ADR 0034 amendment) merges first. Until it does, ADR 0034 rule 4 still forbids account-ui from using the design system, which B does. ## Why billing-web is the cloud app's embedded checkout moved to a new tab, with no UX change (ADR BILLING-WEB-0038, #19096). Today billing-web renders a checkout of its own (`EmbeddedCheckout`, `CheckoutPayment`, `CheckoutSubmit`) that has drifted from the app's: different price layout, no saved-card selection, different copy. For both to render the same screens, the app's confirm, price breakdown, saved-card selector, card form, terms notice and success step have to live where both can import them. This PR adds them to `@comfyorg/account-ui`. Nothing renders them yet, so no visual change. ## How - New entry `@comfyorg/account-ui/billing/checkout`, ported line for line from the app components. Same markup, same classes, same conditions: - `CheckoutSubscribeConfirm` ← `SubscriptionAddPaymentPreviewWorkspace.vue` (plan header, credits, total due, discounts, promo code, saved methods, card form, 3DS prompt, parked-checkout recovery, terms). - `CheckoutTransitionConfirm` ← `SubscriptionTransitionPreviewWorkspace.vue` (immediate vs scheduled change, reactivation banner and threshold checkbox). - `CheckoutSavedMethods` + `CheckoutSavedMethodSelect` ← the saved-method row / `SingleSelect` picker (Reka select with the app's select classes). - `CheckoutPaymentForm` ← `UnifiedStripePaymentSelector.vue` minus the app bindings (key, theme and telemetry become props and a `phase` event). - `CheckoutSuccess` ← `SubscriptionSuccessWorkspace.vue`, with `details`/`actions` slots for the app's team invite. - `CheckoutTermsNote`, `CheckoutPromotionCode`, `CheckoutPaymentNotices`, `CheckoutVerificationPrompt`: blocks both confirms repeated. `CheckoutSubscribeSummary`/`CheckoutSubscribeActions` and `CheckoutReactivationBanner`/`CheckoutTransitionSummary` split the two confirm templates under the fallow complexity gate; the rendered markup is the same. - `checkoutQuote.ts`: the app's `subscriptionQuoteFormatting.ts` + `planDuration.ts`. - `@comfyorg/account-ui/billing/catalog` (TS-only entry): the tiers' prices and monthly credit grants (the numbers in the app's `TIER_PRICING`). The app's confirm reads the grant from this table (`TIER_PRICING`), not from the quote's `new_plan.credits_cents`, so billing-web reads the same table to show the same number; C points the app at it. A separate entry so non-Vue consumers (the Playwright runner imports `tierPricing`) never load the components. - The package has no i18n runtime. Hosts pass a typed `CheckoutCopy`; interpolated strings are functions, and sentences that wrap an element (terms links, reactivation amount) keep `{token}`s that the component splits. - Hosts pass a resolved `CheckoutPlan` (name, monthly/yearly price, credits, `pricedByQuote`) instead of the package reading the tier catalog. - `selectVariants` moves to `@comfyorg/design-system/select.variants` (same move as `buttonVariants` in #19098), so the picker renders the app's select classes. - Packaging: `design-system` variants and `tailwind-utils`'s `cn` are bundled into the published build (dev dependencies). `tailwind-utils` is not on npm and `design-system` ships TS source, so neither can be a runtime dependency of a published package. `reka-ui` is a peer. The rendered classes need the design-system theme and primeicons at runtime, so `@comfyorg/design-system` and `primeicons` are peers too, and the package description says to load their CSS and add the package's dist to the consumer's Tailwind sources. The smoke test imports the new entry in the typed consumer and treats it as bundler-only, like `billing/stripe`. ### Reactivation renewal date (live testcloud recording) The reactivation notice and the summary could name different renewal days for the same quote. On `m2-qa-0925-3ds` the notice said "renew … on Oct 27" and the summary "Renews … on Oct 25, 2026". - **Summary:** reads `renewal_at ?? new_plan.period_end` (`resolveRenewalDate`). - **Notice:** read `new_plan.period_end` only. When that was absent, it computed `effective_at` + one period on the client (Sep 27 + 1 month = Oct 27). - **Not a server inconsistency:** the server sent one renewal date, `renewal_at`, which the contract defines as "the next recurring charge and target-plan period end". - **Fix:** the notice now reads the same server date as the summary (`resolveRenewalDate`: `renewal_at`, else the plan's server `period_end`). The client-side computation is gone. With no server date, the notice drops its renewal clause through new `reactivation.withoutRenewalDate` copy, the way the summary drops its date. - **Contract:** `renewal_at` is optional in `PreviewSubscribeResponse` ("Optional in the schema for older clients"; "current servers always return this"). The server should always send it; the client no longer computes one when it doesn't. - **Tests:** - A new test fails on the old code (Oct 27 vs Oct 25). - The tests that pinned the client computation (account-ui and the app's `SubscriptionTransitionPreviewWorkspaceReactivation.test.ts`, in C) are replaced by a no-renewal-date test. - C adds the app's `withoutRenewalDate` strings. ## Review Focus - The ports are meant to be verbatim. C (the next PR) swaps the app onto these components and the app's existing component tests (about 2,100 lines across the two confirms and the success step) pass with only stub names changed. That is the parity check. - `CheckoutPlan.pricedByQuote` reproduces the app's price rules exactly, including the odd ones: a tier plan shows the quote's price once one arrives and `$0` on the success step without one; a team credit stop always shows its own price. ## Stack | PR | branch | base | title | |---|---|---|---| | #19097 | `jaewon/billing-web-remove-plan-grid` | `main` | `FE-3045 refactor(billing-web): drop the billing-web plan grid; hosts own plan selection` | | A #19098 | `jaewon/design-system-button-variants` | #19097 | `FE-3046 refactor(design-system): move buttonVariants into @comfyorg/design-system` | | **B (this PR)** | **`jaewon/account-ui-checkout-surfaces`** | **A** | **`FE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and success`** | | C #19100 | `jaewon/workspace-adopt-account-ui-checkout` | B | `FE-3046 refactor(workspace): render the subscription checkout steps from account-ui` | | D #19101 | `jaewon/billing-web-shared-checkout` | C | `FE-3046 feat(billing-web): render the shared embedded checkout` | | E #19104 | `jaewon/billing-web-success-invite` | D | `FE-3046 feat(billing-web): invite your team from the checkout success step` | | F #19105 | `jaewon/checkout-3ds-failure-copy` | E | `FE-3047 fix(account-ui): clear decline toasts once a retry succeeds` | | G #19106 | `jaewon/billing-web-return-close-tab` | F | `FE-3048 fix(billing-web): return to the host by closing the checkout tab` | | H #19115 | `jaewon/checkout-cta-reachable` | G | `FE-3050 fix(account-ui): keep the checkout CTA reachable when notices grow the confirm step` | ```mermaid graph LR P0[#19097: remove plan grid] --> A[A: design-system buttonVariants] A --> B[B: account-ui checkout surfaces] B --> C[C: workspace adopts account-ui] C --> D[D: billing-web shared checkout] D --> E[E: billing-web success invite] E --> F[F: stale decline toasts] F --> G[G: close the billing tab] G --> H[H: reachable checkout CTA] style B fill:#f9d71c,stroke:#333,color:#000 ``` ## AS IS / TO BE No rendered change: nothing renders these components in this PR. The parity screenshots are on C (#19100, app before/after, pixel-identical) and D (#19101, billing-web before/after next to the app). --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
… grow the confirm step (#19115) - Linear: FE-3050 ## Why M2 QA: after a failed 3DS on a reactivating upgrade, the verification notice pushed "Confirm & reactivate" and the terms below the checkout frame, with no way to scroll to them. This happened in both the app and billing-web. ## Root cause Both hosts pin the narrow confirm and success steps to `h-[min(740px,85vh|90vh)]` with `overflow-hidden`, so the dialog does not grow with the Stripe iframe. The shared step inside (`CheckoutTransitionConfirm`, `CheckoutSubscribeConfirm`, `CheckoutSuccess`) is `h-full` with nothing that scrolls. Once notices, the reactivation banner or the invite chips make it taller than the box, the bottom is clipped. ## How - `CheckoutTransitionConfirm`, `CheckoutSubscribeConfirm` and `CheckoutSuccess` (account-ui) scroll inside the box: `min-h-0 overflow-y-auto` on the step root. Both hosts keep their pinned height. - The wide card-capture split at xl keeps its current layout (`xl:overflow-visible`). Its payment column already handles the Stripe iframe there. - Red-green (billing-web e2e, same component in both hosts): - Red: `77110aa425`, `billing-web-e2e` [failed](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36342728733/job/108685901864). - Green: `f02bdd6738`. - The test ("a reactivating upgrade taller than the frame scrolls to its confirm") uses a 520px-tall viewport and scrolls the wheel over the confirm, then asserts "Confirm & reactivate" is in view. ## AS IS / TO BE ### Live (testcloud) Live (testcloud) recordings of the whole stack (stack top f02bdd6, embedded vs billing-web, AS IS and TO BE videos and per-step screenshots) are in #19101 under "Live (testcloud) AS IS / TO BE". TO BE live (f02bdd6), reactivating upgrade. The "Reactivating your subscription" notice pushes the terms line below the frame; the confirm now scrolls inside the frame so "Confirm & reactivate" and the terms line are reachable on both hosts. Embedded (left) | billing-web (right), top of the step and scrolled: <img width="1400" alt="live-confirm-top" src="https://github.com/user-attachments/assets/20bbd27d-361c-48d4-8857-ddd6bc71ced3" /> <img width="1400" alt="live-confirm-scrolled" src="https://github.com/user-attachments/assets/2f3d6e40-6819-4f52-b2f8-b76d829fca1c" /> Not run live: the tallest case, a failed 3DS adding its notice under the reactivation banner. A failed reactivating upgrade leaves the operation pending and the workspace cannot be cancelled afterwards (QA N6), so it stays in the harness. ### Harness This is a parity-harness step with mocked Cloud: P2c, a reactivating upgrade in a 1440x560 window, with the wheel scrolled over the confirm. It reproduces the same clipping QA recorded after a failed 3DS: here the reactivation banner does the growing instead of the verification notice. The full harness rerun on this branch shows 0% copy/element difference on all 18 steps, and P2c is 0% between the hosts. **Cloud app, AS IS | TO BE** <img width="1448" alt="H-app" src="https://github.com/user-attachments/assets/33076467-ac1e-4695-942e-75d1f235346a" /> **billing-web, AS IS | TO BE** <img width="1448" alt="H-web" src="https://github.com/user-attachments/assets/61773efd-fbbd-4fcf-a48c-3a31944076e3" /> ## Stack | PR | branch | base | title | |---|---|---|---| | #19097 | `jaewon/billing-web-remove-plan-grid` | `main` | `FE-3045 refactor(billing-web): drop the billing-web plan grid; hosts own plan selection` | | A #19098 | `jaewon/design-system-button-variants` | #19097 | `FE-3046 refactor(design-system): move buttonVariants into @comfyorg/design-system` | | B #19099 | `jaewon/account-ui-checkout-surfaces` | A | `FE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and success` | | C #19100 | `jaewon/workspace-adopt-account-ui-checkout` | B | `FE-3046 refactor(workspace): render the subscription checkout steps from account-ui` | | D #19101 | `jaewon/billing-web-shared-checkout` | C | `FE-3046 feat(billing-web): render the shared embedded checkout` | | E #19104 | `jaewon/billing-web-success-invite` | D | `FE-3046 feat(billing-web): invite your team from the checkout success step` | | F #19105 | `jaewon/checkout-3ds-failure-copy` | E | `FE-3047 fix(account-ui): clear decline toasts once a retry succeeds` | | G #19106 | `jaewon/billing-web-return-close-tab` | F | `FE-3048 fix(billing-web): return to the host by closing the checkout tab` | | **H (this PR)** | **`jaewon/checkout-cta-reachable`** | **G** | **`FE-3050 fix(account-ui): keep the checkout CTA reachable when notices grow the confirm step`** | ```mermaid graph LR P0[#19097: remove plan grid] --> A[A: design-system buttonVariants] A --> B[B: account-ui checkout surfaces] B --> C[C: workspace adopts account-ui] C --> D[D: billing-web shared checkout] D --> E[E: billing-web success invite] E --> F[F: stale decline toasts] F --> G[G: close the billing tab] G --> H[H: reachable checkout CTA] style H fill:#f9d71c,stroke:#333,color:#000 ```
…tab (#19106) - Linear: FE-3048 ## Why Close / "Return to ComfyUI" on billing-web navigated the billing tab to `<host>/?billing_result=success&billing_ref=…`. The customer ended with two product tabs, the outcome query in the URL, and no confirmation in the tab they came from. The embedded checkout's Close just returns to the app in place. ## Root cause billing-web treated "return to the host" as a navigation. The host opens billing-web in a tab of its own (`openHostedBillingTab`), so the host's tab is still there. The way back is to close the billing tab. The app also never removed `billing_result`/`billing_ref` from its URL. ## How - billing-web `returnToHost`: `window.close()`, and only if the tab is still open (`closed` stays false because the customer opened it directly) navigate to the host's URL as before. A tab opened by script may close itself even with `noopener`. Used by the checkout's Back / Close / success Close and by the hosted pages' "Return to …" link. - App: `stripPaymentReturnParams` (run at boot on cloud) also strips `billing_result`/`billing_ref`. They do not count as a pending Stripe payment, and the URL loaders treat them as handled. The app already refreshes billing on return (FE-2618). - Tests: - Unit: CheckoutView closes instead of navigating for Back, Close and the success Close; the app strips the params. - billing-web e2e: a tab opened with `window.open` closes on Close, and a directly opened tab goes back to the host on Back. 31/31 locally. - Red-green: failing tests in `8b7c880b1b`, fix in `4dd355511b`. - Red: Billing Web Unit [https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36335085117](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36335085117), Billing Web E2E [https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36335085068](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36335085068) (rerun). - Green: Billing Web Unit [https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36335184604](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36335184604), Billing Web E2E [https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36335184605](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36335184605). ## AS IS / TO BE ### Live (testcloud) Live (testcloud) recordings of the whole stack (stack top f02bdd6, embedded vs billing-web, AS IS and TO BE videos and per-step screenshots) are in #19101 under "Live (testcloud) AS IS / TO BE". TO BE live (f02bdd6): Change plan in the local app (`ff:hosted_billing_destination="billing_web"`, workspace `m2-qa-0927-full`) opens billing-web on :5174 in a new tab. Pay → "You're all set" → Close. The billing tab closes, the app tab is back in front with a clean URL, and its account menu shows 294,054 credits (147,700 before) with no Resubscribe. https://github.com/user-attachments/assets/1da3540f-fcf6-4691-a075-997b07c364f1 After Close, embedded (left) | billing-web (right): <img width="1400" alt="live-after-close" src="https://github.com/user-attachments/assets/4989f353-1d96-4255-b7a4-cd78a092f86e" /> ### Harness billing-web e2e harness (mocked Cloud). The checkout tab is opened with `window.open` from another billing-web tab, which stands in for the product tab. The subscribe succeeds, then Close is clicked. The captions give each open tab's URL afterwards. **AS IS (#19105):** the billing tab navigates to the host with `billing_result`/`billing_ref`, so there are two tabs. <img width="1938" alt="G-asis" src="https://github.com/user-attachments/assets/2e97e750-989b-425a-a60e-8800fafa511f" /> **TO BE:** the billing tab closes and only the original tab remains. <img width="1938" alt="G-tobe" src="https://github.com/user-attachments/assets/b95ab6fd-f891-4379-bc39-361a3a6c1f94" /> ## Stack | PR | branch | base | title | |---|---|---|---| | #19097 | `jaewon/billing-web-remove-plan-grid` | `main` | `FE-3045 refactor(billing-web): drop the billing-web plan grid; hosts own plan selection` | | A #19098 | `jaewon/design-system-button-variants` | #19097 | `FE-3046 refactor(design-system): move buttonVariants into @comfyorg/design-system` | | B #19099 | `jaewon/account-ui-checkout-surfaces` | A | `FE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and success` | | C #19100 | `jaewon/workspace-adopt-account-ui-checkout` | B | `FE-3046 refactor(workspace): render the subscription checkout steps from account-ui` | | D #19101 | `jaewon/billing-web-shared-checkout` | C | `FE-3046 feat(billing-web): render the shared embedded checkout` | | E #19104 | `jaewon/billing-web-success-invite` | D | `FE-3046 feat(billing-web): invite your team from the checkout success step` | | F #19105 | `jaewon/checkout-3ds-failure-copy` | E | `FE-3047 fix(account-ui): clear decline toasts once a retry succeeds` | | **G (this PR)** | **`jaewon/billing-web-return-close-tab`** | **F** | **`FE-3048 fix(billing-web): return to the host by closing the checkout tab`** | | H #19115 | `jaewon/checkout-cta-reachable` | G | `FE-3050 fix(account-ui): keep the checkout CTA reachable when notices grow the confirm step` | ```mermaid graph LR P0[#19097: remove plan grid] --> A[A: design-system buttonVariants] A --> B[B: account-ui checkout surfaces] B --> C[C: workspace adopts account-ui] C --> D[D: billing-web shared checkout] D --> E[E: billing-web success invite] E --> F[F: stale decline toasts] F --> G[G: close the billing tab] G --> H[H: reachable checkout CTA] style G fill:#f9d71c,stroke:#333,color:#000 ```
…19105) - Linear: FE-3047 ## Why In the real run, a failed 3DS challenge (card 3184, then Fail) first showed "We couldn't complete payment verification. Please try again.". A toast then replaced it with "Your bank declined this payment. Try another payment method or contact your bank.". Separately, after one or more declines, a retry that succeeded left the old decline toasts on screen over "You're all set". ## Root cause - **Wrong copy after a failed 3DS: a server-side cause.** The backend recorded a failed 3DS as a generic decline. It is fixed in BE-17429 / Comfy-Org/cloud#10828, which records `payment_intent_authentication_failure`. With that fix, `GET /api/billing/ops/{id}` returns `decline_reason: authentication_failed`. The frontend already maps that reason to the verification copy, so it does not re-derive it. **The live copy depends on BE-17429 deploying.** - **Stale toasts:** `useSubscriptionCheckout.showSubscribeError` adds a sticky error toast for each refused attempt. Nothing removed those toasts when a later attempt succeeded. - **"Update payment to run" in the top bar:** a different root cause, left out of this PR. The label is the run button's `paymentRecovery` state, which comes from the billing status and not from the checkout's failure copy. ## How - `useSubscriptionCheckout` remembers the error toasts from its attempts and removes them when the checkout reaches success. - Table tests pin the server-reason mapping on every surface. `decline_reason: authentication_failed` and `authentication_required` read as "We couldn't complete payment verification. Please try again." in all four: - the shared lifecycle (`account-core` `operationState`), - the app's SDK rail (`subscriptionOperationView`), - the app's legacy poller (`billingOperationStore`), - billing-web (`CheckoutView`). - There are no lifecycle or poller code changes, so F's diff over E is the toast cleanup plus tests. - Red-green for the toast cleanup: failing test in `5f86dba8a0`, fix in `5982f627c2`. - Red: [CI Tests Unit, run 36334659973](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36334659973). - Green: [CI Tests Unit, run 36334977694](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36334977694). - `08f850f705` removes the client-side override those commits had added, since the server now sends the reason. ## AS IS / TO BE ### Live (testcloud) Live (testcloud) recordings of the whole stack (stack top f02bdd6, embedded vs billing-web, AS IS and TO BE videos and per-step screenshots) are in #19101 under "Live (testcloud) AS IS / TO BE". Not recorded live for this PR: a decline followed by a successful retry needs the card form, which only the new-subscription path shows. No unsubscribed Stripe-billed workspace is free on the test account (10-workspace limit, and `parity-emb-0927` holds a pending operation). The live TO BE upgrade in #19101 settles without a decline, and neither host shows a stale toast over "You're all set" there. ### Harness Evidence comes from the parity harness with mocked Cloud, not a live backend. **P6c: 3DS fails, then the server settles with `decline_reason: authentication_failed` (what BE-17429 sends).** Both surfaces show the verification copy. The left half is the Cloud app and the right half is billing-web. E shows the same copy, because the mapping already existed. <img width="1448" alt="F-3ds" src="https://github.com/user-attachments/assets/108260c7-5a66-424a-8eb5-3b93b04f0571" /> **P6d: a saved card is declined, then a retry succeeds.** In the Cloud app, E (left) keeps the decline toast over "You're all set". F (right) clears it. <img width="1448" alt="F-toast" src="https://github.com/user-attachments/assets/5a173b2e-7f6e-46ad-9d47-3c6323953fda" /> P6a, P6b, P7 and P7T are unchanged. P6b has the known 0.003% spinner frame. ## Stack | PR | branch | base | title | |---|---|---|---| | #19097 | `jaewon/billing-web-remove-plan-grid` | `main` | `FE-3045 refactor(billing-web): drop the billing-web plan grid; hosts own plan selection` | | A #19098 | `jaewon/design-system-button-variants` | #19097 | `FE-3046 refactor(design-system): move buttonVariants into @comfyorg/design-system` | | B #19099 | `jaewon/account-ui-checkout-surfaces` | A | `FE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and success` | | C #19100 | `jaewon/workspace-adopt-account-ui-checkout` | B | `FE-3046 refactor(workspace): render the subscription checkout steps from account-ui` | | D #19101 | `jaewon/billing-web-shared-checkout` | C | `FE-3046 feat(billing-web): render the shared embedded checkout` | | E #19104 | `jaewon/billing-web-success-invite` | D | `FE-3046 feat(billing-web): invite your team from the checkout success step` | | **F (this PR)** | **`jaewon/checkout-3ds-failure-copy`** | **E** | **`FE-3047 fix(account-ui): clear decline toasts once a retry succeeds`** | | G #19106 | `jaewon/billing-web-return-close-tab` | F | `FE-3048 fix(billing-web): return to the host by closing the checkout tab` | | H #19115 | `jaewon/checkout-cta-reachable` | G | `FE-3050 fix(account-ui): keep the checkout CTA reachable when notices grow the confirm step` | ```mermaid graph LR P0[#19097: remove plan grid] --> A[A: design-system buttonVariants] A --> B[B: account-ui checkout surfaces] B --> C[C: workspace adopts account-ui] C --> D[D: billing-web shared checkout] D --> E[E: billing-web success invite] E --> F[F: stale decline toasts] F --> G[G: close the billing tab] G --> H[H: reachable checkout CTA] style F fill:#f9d71c,stroke:#333,color:#000 ```
…9099, #19100, #19101, #19104) (#19442) ## Why Backport of the FE-3046 billing-web shared-checkout stack to `core/1.55`. The auto-backport bot hit cherry-pick conflicts on each of these. The 1.55 release needs billing-web to render the same checkout as the app, including the team invite on success. ## How ### Cherry-picked (in order, `-x`) | PR | main squash | | |---|---|---| | #19098 (A) | | skipped: already on `core/1.55` via #19231 | | #19099 (B) | | skipped: already on `core/1.55` via #19308 | | #19100 (C) | `4bfdc8a68c` | render the subscription checkout steps from account-ui | | #19101 (D) | `d5cf71ce27` | billing-web renders the shared embedded checkout | | #19104 (E) | `592588bdd6` | team invite on the checkout success step (squash includes #19105, #19106, #19115) | No other prerequisite was cherry-picked. ### Conflicts and resolutions - **C, `SubscriptionAddPaymentPreviewWorkspace.stripe.test.ts`** (renamed from `UnifiedStripePaymentSelector.test.ts`). 1.55 mocks telemetry with an explicit factory because it lacks #18497; main automocks it. Took C's file as is. `src/platform/telemetry/__mocks__/index.ts` exists on 1.55, so the automock resolves and the test passes. - **D, `apps/billing-web/src/views/CheckoutView.vue`**. 1.55 has #19305 (backport of #19185, show the server's refusal reason), which main does not have yet. Kept D's checkout and kept 1.55's `refusal()` on the subscribe failure and the quote-failure panel. Also used `refusal()` for D's new promotion-code re-quote failure, as the upstream `jaewon/checkout-quote-stale-recovery` stack does. Dropped the now-unused `coded`. - **E, `apps/billing-web/src/session/billingWebAuth.ts`** (modify/delete). The file does not exist on 1.55 because the unified web session work (#18880, #18881) is not backported. Deleted it and applied E's change to what 1.55 has: `billingWebClient.ts` gains the `BillingWebClient` type (`BillingClient & { invites }`) and `invites: createWorkspaceInviteCommands({ transport })` on its single `createBillingWebClient`. - **E, `BillingShell.vue`**. Kept 1.55's `createBillingWebClient(billingWebSessionClient())` and added E's `provideWorkspaceInvites(client.invites)`. - **E, `HostedSurface.vue`**. Kept 1.55's `useBillingWebSession` and added E's `returnToHost` import (the return link now closes the tab, from #19106). - **E, `CheckoutView.vue`**. Kept `refusal` as above and took E's `inviteCopy` and `useWorkspaceInvites()`. - **E, `useSubscriptionCheckout.ts`**. Kept 1.55's `useEventListener` import and added E's `watch` and `ToastMessageOptions`. 1.55 does not use `onScopeDispose`, so it is not imported. - **E, `useSubscriptionCheckout.test.ts`**. The toast mock gains E's `remove`. 1.55 has no `removeGroup` usage, so `mockToastRemoveGroup` is not added. One extra commit updates a #19305 test case. For a refused subscribe with `OPERATION_ALREADY_PENDING`, it expected the generic failure copy because 1.55 had no copy for that code. D adds that copy, so the case now expects billing-web's own wording, matching the upstream stack. ## Verification - `pnpm typecheck` (app, account-core, billing-web, account-ui, billing-contract): pass - billing-web unit tests: 277/277 - account-ui unit tests: 224/224 - account-core unit tests: 1227/1227 - `src/platform/workspace` + `src/platform/cloud/subscription`: 2320 passed, 1 expected fail - oxfmt, oxlint and eslint on the changed files: clean ## AS IS / TO BE Same UI as the original PRs; see the AS IS / TO BE media in #19101 and #19104. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…19099, #19100, #19101, #19104) (#19443) ## Why Backport of the FE-3046 billing-web shared-checkout stack to `cloud/1.55`. The auto-backport bot hit cherry-pick conflicts on each of these. The 1.55 release needs billing-web to render the same checkout as the app, including the team invite on success. ## How ### Cherry-picked (in order, `-x`) | PR | main squash | | |---|---|---| | #19098 (A) | | skipped: already on `cloud/1.55` via #19232 | | #19099 (B) | | skipped: already on `cloud/1.55` via #19309 | | #19100 (C) | `4bfdc8a68c` | render the subscription checkout steps from account-ui | | #19101 (D) | `d5cf71ce27` | billing-web renders the shared embedded checkout | | #19104 (E) | `592588bdd6` | team invite on the checkout success step (squash includes #19105, #19106, #19115) | No other prerequisite was cherry-picked. ### Conflicts and resolutions - **C, `SubscriptionAddPaymentPreviewWorkspace.stripe.test.ts`** (renamed from `UnifiedStripePaymentSelector.test.ts`). 1.55 mocks telemetry with an explicit factory because it lacks #18497; main automocks it. Took C's file as is. `src/platform/telemetry/__mocks__/index.ts` exists on 1.55, so the automock resolves and the test passes. - **D, `apps/billing-web/src/views/CheckoutView.vue`**. 1.55 has #19304 (backport of #19185, show the server's refusal reason), which main does not have yet. Kept D's checkout and kept 1.55's `refusal()` on the subscribe failure and the quote-failure panel. Also used `refusal()` for D's new promotion-code re-quote failure, as the upstream `jaewon/checkout-quote-stale-recovery` stack does. Dropped the now-unused `coded`. - **E, `apps/billing-web/src/session/billingWebAuth.ts`** (modify/delete). The file does not exist on 1.55 because the unified web session work (#18880, #18881) is not backported. Deleted it and applied E's change to what 1.55 has: `billingWebClient.ts` gains the `BillingWebClient` type (`BillingClient & { invites }`) and `invites: createWorkspaceInviteCommands({ transport })` on its single `createBillingWebClient`. - **E, `BillingShell.vue`**. Kept 1.55's `createBillingWebClient(billingWebSessionClient())` and added E's `provideWorkspaceInvites(client.invites)`. - **E, `HostedSurface.vue`**. Kept 1.55's `useBillingWebSession` and added E's `returnToHost` import (the return link now closes the tab, from #19106). - **E, `CheckoutView.vue`**. Kept `refusal` as above and took E's `inviteCopy` and `useWorkspaceInvites()`. - **E, `useSubscriptionCheckout.ts`**. Kept 1.55's `useEventListener` import and added E's `watch` and `ToastMessageOptions`. 1.55 does not use `onScopeDispose`, so it is not imported. - **E, `useSubscriptionCheckout.test.ts`**. The toast mock gains E's `remove`. 1.55 has no `removeGroup` usage, so `mockToastRemoveGroup` is not added. The cloud branch takes the same resolved commits from the core backport; they applied without further conflicts. One extra commit updates a #19304 test case. For a refused subscribe with `OPERATION_ALREADY_PENDING`, it expected the generic failure copy because 1.55 had no copy for that code. D adds that copy, so the case now expects billing-web's own wording, matching the upstream stack. ## Verification - `pnpm typecheck` (app, account-core, billing-web, account-ui, billing-contract): pass - billing-web unit tests: 277/277 - account-ui unit tests: 224/224 - account-core unit tests: 1226/1226 - `src/platform/workspace` + `src/platform/cloud/subscription`: 2325 passed, 1 expected fail - oxfmt, oxlint and eslint on the changed files: clean ## AS IS / TO BE Same UI as the original PRs; see the AS IS / TO BE media in #19101 and #19104. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
… step (Comfy-Org#19104) - Linear: FE-3046 ## Why After a multi-seat (team) subscribe, the cloud app's success step invites the team (`SubscriptionSuccessWorkspace` + `InviteMembersForm`). billing-web's success step (Comfy-Org#19101) showed the plan card and Close only. billing-web is the embedded checkout in a new tab (ADR BILLING-WEB-0038), so it gets the same step. ## How - `@comfyorg/account-core/billing`: `createWorkspaceInviteCommands({ transport })` with `listPendingInvites` and `createInvite` (`GET`/`POST /workspace/invites`, parsed against the generated contract). It runs over the billing session transport, so invites go to the workspace the entry link bound — no second client, no hand-rolled fetch. - `@comfyorg/account-ui/billing/checkout`: `CheckoutTeamSuccess` wraps `CheckoutSuccess` with the app's invite block: same heading, subtext, email tags, invalid / already-invited / seat-cap hints, one invite per address, confirmation message, "Send invites" leading and Close demoted. The invite rules (`inviteEmails.ts`) move from the app into the package and the app imports them from there. - `@comfyorg/design-system/tag.variants`: the tag recipe moves out of the app, as `buttonVariants`/`selectVariants` did, so the package's email tags use the app's classes. - billing-web: the client carries the invite commands; `CheckoutView` reads seats from billing status on success (and again after invites, as the app refreshes status) and renders `CheckoutTeamSuccess`. A failed invite shows the app's "Couldn't send N invites" toast. - `CheckoutFrame`: the app's browser defaults for inputs and links move to a base-layer rule, so a utility (the tags input's `text-sm`) still wins, as it does in the app. ## Review Focus - The app still renders its own `InviteMembersForm` (also used by the invite dialog, with telemetry and the app toast). Switching the app to `CheckoutTeamSuccess` is a follow-up; this PR moves the shared rules, recipe and client so that step is small. - CORS for `/api/workspace/invites` from the billing-web origin is not verified against a live backend (mocked here). ### Checkbox margin (parity) The app has no Tailwind preflight, so its reactivation checkbox keeps the browser's margin. `[data-app-defaults]` now reverts that margin too, which removes a 2px shift in the reactivation notice (harness P2e: 3.4% to 0.01%). ## Stack | PR | branch | base | title | |---|---|---|---| | Comfy-Org#19097 | `jaewon/billing-web-remove-plan-grid` | `main` | `FE-3045 refactor(billing-web): drop the billing-web plan grid; hosts own plan selection` | | A Comfy-Org#19098 | `jaewon/design-system-button-variants` | Comfy-Org#19097 | `FE-3046 refactor(design-system): move buttonVariants into @comfyorg/design-system` | | B Comfy-Org#19099 | `jaewon/account-ui-checkout-surfaces` | A | `FE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and success` | | C Comfy-Org#19100 | `jaewon/workspace-adopt-account-ui-checkout` | B | `FE-3046 refactor(workspace): render the subscription checkout steps from account-ui` | | D Comfy-Org#19101 | `jaewon/billing-web-shared-checkout` | C | `FE-3046 feat(billing-web): render the shared embedded checkout` | | **E (this PR)** | **`jaewon/billing-web-success-invite`** | **D** | **`FE-3046 feat(billing-web): invite your team from the checkout success step`** | | F Comfy-Org#19105 | `jaewon/checkout-3ds-failure-copy` | E | `FE-3047 fix(account-ui): clear decline toasts once a retry succeeds` | | G Comfy-Org#19106 | `jaewon/billing-web-return-close-tab` | F | `FE-3048 fix(billing-web): return to the host by closing the checkout tab` | | H Comfy-Org#19115 | `jaewon/checkout-cta-reachable` | G | `FE-3050 fix(account-ui): keep the checkout CTA reachable when notices grow the confirm step` | ```mermaid graph LR P0[Comfy-Org#19097: remove plan grid] --> A[A: design-system buttonVariants] A --> B[B: account-ui checkout surfaces] B --> C[C: workspace adopts account-ui] C --> D[D: billing-web shared checkout] D --> E[E: billing-web success invite] E --> F[F: stale decline toasts] F --> G[G: close the billing tab] G --> H[H: reachable checkout CTA] style E fill:#f9d71c,stroke:Comfy-Org#333,color:#000 ``` ## AS IS / TO BE ### Live (testcloud) Live (testcloud) recordings of the whole stack (stack top f02bdd6, embedded vs billing-web, AS IS and TO BE videos and per-step screenshots) are in Comfy-Org#19101 under "Live (testcloud) AS IS / TO BE". TO BE live, team reactivating upgrade paid on both hosts: "You're all set" with Invite your team on the embedded checkout (left) and billing-web (right). <img width="1400" alt="live-success-invite" src="https://github.com/user-attachments/assets/42b820df-b6b8-4748-a768-5969d7474fb4" /> ### Harness Checkout parity harness step P7T (new: team subscribe → success; mocked Cloud, not a live backend). **billing-web AS IS** (Comfy-Org#19101) | **billing-web TO BE** (this PR) | **cloud app**. TO BE vs app: 0% panel pixel diff, no copy or element differences. The other 11 steps are unchanged (all 0% except the busy spinner frame on P5/P6b, 0.003%). <img width="1558" alt="P7T" src="https://github.com/user-attachments/assets/2af1e0c9-d5f3-4270-8621-b2fb71cdeff3" /> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ling-web takes the payment (Comfy-Org#19129) - Linear: FE-3057 ## Why With the embedded checkout the app shows "Processing payment — setting up your workspace…" while the payment settles, then "Subscription updated successfully". With the billing-web handoff those toasts appear only in the billing-web tab; the app tab shows nothing until the return refresh re-reads the plan. The owner expects the app to keep showing the payment progress as it did before, with only the checkout screen moved. ## Root cause The app already turns any operation the server reports pending into those toasts: every billing status read calls `resumePendingOperation` (`useWorkspaceBilling.ts`), which hands the operation to the SDK store (`recover()`) or the legacy poller, and both settle with the success / failure toasts. Nothing reads the status while billing-web is paying, so the app never sees the operation billing-web started. ## How - `openHostedBillingTab`: when it opens a `checkout` or `subscription` tab, it re-reads the billing status every 4s for up to 15 minutes. The next open or `disarmHostedBillingReturnRefresh` stops it. Other intents (payment methods, invoices) start no payment and are not watched. - No new toast and no client-side inference: the server's own `pending_billing_op_id` drives the existing resume path. - Relies on Comfy-Org#19120 so an operation the app resumes this way never auto-opens a payment page. - CI: red https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/36357332886 (the two new tests fail), green on fca3937. ## AS IS / TO BE **AS IS** — the app tab shows nothing while billing-web takes the payment; it only re-reads the plan on return (see the billing-web upgrade recording in Comfy-Org#19101: https://github.com/user-attachments/assets/7bb0e7d7-9b89-42e9-8521-330996622f7d). **TO BE** — local build of the stack top + Comfy-Org#19120 + Comfy-Org#19123 + this PR against testcloud, Stripe test mode, workspace `parity-bw-0927`, Team 295.4K → 527.5K reactivating upgrade paid on billing-web with the 3DS card: mid-payment the app tab shows "Verify your payment to finish setting up your workspace"; after 3DS completes and Close closes the billing tab, the app tab shows "Subscription updated successfully" and the plan is active. https://github.com/user-attachments/assets/8501d67c-9724-4974-9d8c-2a867b633e53 ## Plan position M2 (billing-web checkout in a new tab). Stacked on Comfy-Org#19123 (FE-3054, return refresh on every return), off `main`. ```mermaid graph LR R[Comfy-Org#19123 FE-3054 refresh on every return] --> W[FE-3057 app shows payment progress]:::me X[Comfy-Org#19120 FE-3051 no auto-open on resume] -.relies on.-> W classDef me fill:#f9d71c,stroke:Comfy-Org#333,color:#000 ```
…lestone 3 full-page checkout behind billing_web_checkout_ui (Comfy-Org#19253) > **Now carries the whole Milestone 3 full-page checkout.** The approved stacked PRs above were squash-merged top-down into this branch; each was reviewed and approved at its own head: Comfy-Org#19263 (saved methods, rail failures), Comfy-Org#19264 (inline outcomes, keep-subscription consent, re-quote failure), Comfy-Org#19268 (mount reconciliation), Comfy-Org#19271 (bfcache, cross-tab), Comfy-Org#19279 (ending screens), Comfy-Org#19280 (refusal, plan not available, couldn't load), Comfy-Org#19285 (3DS / redirect two-phase submit), Comfy-Org#19266 + Comfy-Org#19267 (summary ledger), Comfy-Org#19276 + Comfy-Org#19277 + Comfy-Org#19278 (promo codes). Everything stays behind `billing_web_checkout_ui = full_page`; flag off is the Milestone 2 checkout unchanged. Design review: Alex Tov confirmed the PRs match the guidebooks (#proj-billing, 2026-09-28). ## Why FE-3018 (Milestone 3, checkout guidebook 1: flow and entry). With `billing_web_checkout_ui = full_page`, `/v1/checkout` rendered an empty "Checkout" stub. This PR turns it into the two-tone full-page capture from Figma 187-8080, with the loading rule from 479-4848 (DES-1014) and the element-failure column from 360-4874. ## Root cause n/a, feature. ## How - `useFullPageCheckout` reads capabilities, the quote and the Stripe key in parallel on arrival and dispatches one event into the `CheckoutPage` reducer from the PR below: a denied `can_subscribe_self_serve` goes to `refused`, a failed read goes to `unavailable`, a quote goes to `capture`. Nothing renders capture before all three are in; the key is awaited because `StripePaymentForm` reads it only on mount. - Skeleton: the header, the "Total due today" label, both payment group labels, the Pay button and the terms line render for real; eyebrow, headline and total are skeleton bars. No spinner. - Pay enables only when the quote has arrived and the Stripe payment element reports `payment_element_ready` (the address element's ready does not count). A started operation keeps Pay locked so a second click cannot charge twice; rendering the post-Pay outcome is PR 2 / PR 3. - Eyebrow is `Subscribe to {tier} Plan · {workspace.name}`, with the name read from the minted session credential, not the quote. - The back arrow goes to the entry's allowlisted `return_to` through `buildReturnUrl`, the same helper the embedded view uses. When this family has no destination for the target, it falls back to the workspace's Plan & Credits settings on the cloud origin (`checkout/cloudLinks.ts`, `/?settings=plan-credits&workspace=<id>`, the same deep link the contract's `comfyui_credits` target names), so the arrow always renders and always has somewhere to go. - Design review (Alex 2026-09-28): D4. Back arrow destination is `return_to` with the Plan & Credits fallback; the `canGoBack` prop is gone since there is always a destination. - A `payment_element_failed` replaces the whole payment column with the 360-4874 card and a Try again that remounts `StripePaymentForm` and re-disables Pay until the new element is ready. - A plan change (`transition_type` other than `new_subscription`) renders Pay without a card form and subscribes without a confirmation token, as the embedded view does. - Subscribe goes through `useCheckout().subscribe` with the same request fields as the embedded view (quote id and version, proration, credit stop, `return_url` to `/v1/result`). - Reuse: `StripePaymentForm`, `usePreviewSubscribe`, `useCheckout`, `formatQuoteMoney`, and `CheckoutTermsNote` (now exported from `@comfyorg/account-ui/billing/checkout`, one line). - The refusal is a minimal placeholder with i18n copy; FE-3021 owns the real ending screen. - Rebased onto main: the `CheckoutView.vue` refactor is dropped because Comfy-Org#19101 owns the M2 `CheckoutView`, the seven `checkout.*` locale keys the full page reads are restored, and `subscribeRequest.ts` serves the full page only. ## Tradeoffs - The subscribe-request builder and `resultUrl` are a copy of the embedded view's, because that view must stay untouched while the flag is off. The copy goes when the embedded variant is retired. - The left column is eyebrow, headline and total only; the ledger grammar, credits line and promo chip are FE-3019 / FE-3020. - The refusal copy is one generic line; the reason stays in the state for FE-3021. - `h-84` placeholder boxes stand in for the Stripe elements until the quote arrives, because `StripePaymentForm` never mounts its elements when the amount is not yet known. - Known gaps, all parity with the embedded view and all for PR 2 (listed so nobody serves `full_page` before then): after Pay the page shows no outcome and keeps Pay locked; a quote needing reactivation confirmation gets the server's coded refusal on Pay instead of the confirm checkbox; a zero-amount quote, an `allowed: false` quote, or one without a payment method configuration leaves Pay disabled with no explanation. - The page is split into `CheckoutSummaryColumn` and `CheckoutPaymentColumn` so the view template stays under the fallow complexity gate. ## Blast Radius Only `billing_web_checkout_ui = full_page`, which Cloud does not serve yet (cloud PR 10904, merged); targeted per account in PostHog. Flag off is byte-identical: `CheckoutView.vue`, `CheckoutPayment.vue`, `EmbeddedCheckout.vue` are untouched and the embedded e2e still passes. The e2e fake Stripe now fires element `ready`, which the embedded view ignores. ## Verification - `pnpm --filter @comfyorg/billing-web typecheck`: clean. - `pnpm --filter @comfyorg/billing-web test:unit`: 25 files, 266 tests pass (13 new component cases in `FullPageCheckoutView.test.ts`; mutating the operation lock, the `canPay` guard in `pay()`, or the `allowed` check each turns one red). - `pnpm exec playwright test` in `apps/billing-web` (fresh production build, `CI=1`): 33 passed. New `e2e/full-page-checkout.spec.ts` asserts the eyebrow names plan and workspace, Pay is labelled "Pay and subscribe" and enabled once ready, and the failed-element column plus Try again. `checkout-ui.spec.ts` still asserts flag-off shows "Confirm your payment". - `pnpm --filter @comfyorg/billing-web lint` (eslint + stylelint), oxfmt and oxlint on changed files, `pnpm knip`: clean. - After the design review: `cloudLinks.test.ts` (the settings deep link with and without a workspace) and a two-row table in `FullPageCheckoutView.test.ts` (Back to `comfyui_workspace`, Back to Plan & Credits for `platform_account`, which the test family cannot resolve). Typecheck and 294 unit tests pass at this head. ## Design questions - 360-4874 drops the back arrow in the whole-column failure; the 368 frames keep it. This PR keeps it, since the summary column stays live and the customer still needs a way back. Intentional in Figma, or a frame slip? - The error card background in Figma is `#2d2e32` (`semantic/secondary/background-hover`), which has no repo token. This uses `bg-secondary-background-hover` (`#313235` in dark). Retoken, or accept? ## AS IS / TO BE Captured from the e2e harness (production build, mocked Cloud, fake Stripe) at 1512x982, `full_page` on. The fake Stripe mounts no real element, so the ready state shows the element area empty. | AS IS (base: empty stub) | TO BE: capture skeleton (479-4848) | |---|---| |  |  | | TO BE: capture ready, Pay enabled | TO BE: element failed, whole column (360-4874) | |---|---| |  |  | ## Where this sits in the plan One linear stack on `main`: each PR is based on the one above it in the table. The former FE-3019/FE-3020 sibling stack now sits on top of FE-3022. | Step | PR | Scope | |---|---|---| | FE-3067 | Comfy-Org#19248 (merged) | flag and variant switch | | FE-3018 PR 0 | Comfy-Org#19252 | page state union and pure transition | | **FE-3018 PR 1** | **this PR** | **shell, eyebrow, capture skeleton** | | FE-3018 PR 2a | Comfy-Org#19263 | saved-method tabs, rail failure taxonomy | | FE-3018 PR 2b | Comfy-Org#19264 | inline Pay outcomes, backstop, reactivation | | FE-3018 PR 3a | Comfy-Org#19268 | mount reconciliation, placeholders | | FE-3018 PR 3b | Comfy-Org#19271 | bfcache and cross-tab re-reconciliation | | FE-3021 PR 1 | Comfy-Org#19279 | success, already completed, in progress, received, unconfirmed | | FE-3021 PR 2 | Comfy-Org#19280 | refusal, plan not available, couldn't load | | FE-3022 | Comfy-Org#19285 | two-phase submit area, 3DS re-open, redirect methods, verification failed | | FE-3019 PR 1 | Comfy-Org#19266 | summary ledger model and builder | | FE-3019 PR 2 | Comfy-Org#19267 | left-column ledger rendering | | FE-3020 1/3 | Comfy-Org#19276 | discount rows, fold rule, Subtotal | | FE-3020 2/3 | Comfy-Org#19277 | promo entry state, Pay binding, URL promo | | FE-3020 3/3 | Comfy-Org#19278 | promo entry UI, chips, expired card | ```mermaid graph LR M["main (19248 merged)"] --> N19252["19252 page state"] --> N19253["19253 shell"] --> N19263["19263 rails"] --> N19264["19264 outcomes"] --> N19268["19268 mount reconciliation"] --> N19271["19271 bfcache and cross-tab"] --> N19279["19279 money endings"] --> N19280["19280 refusal screens"] --> N19285["19285 payment authentication"] --> N19266["19266 ledger model"] --> N19267["19267 ledger UI"] --> N19276["19276 discount rows"] --> N19277["19277 promo entry state"] --> N19278["19278 promo entry UI"] style N19253 stroke-width:3px ```
…e app does (Comfy-Org#19126) - Linear: FE-3056 ## Why When the server refuses a subscribe because the quote went stale, the embedded checkout re-quotes and tells the customer "Your quote changed. Review the updated amount and try again." billing-web instead shows "We couldn't reach the billing service. Please try again." and keeps the old quote, so every retry is refused the same way. Seen live on testcloud with a Team monthly → annual change (`POST /api/billing/subscribe` → 400 `SUBSCRIPTION_QUOTE_STALE`). ## Root cause `issueSubscribe` in `packages/account-core/src/core/billing/subscriptionCommands.ts` maps only `REACTIVATION_CONFIRMATION_REQUIRED`; any other coded 4xx reaches the host as a generic failure. `CheckoutView.pay` in billing-web has no branch for a stale quote, so the failure copy is the transport one. The app's legacy rail handles the code in `useSubscriptionCheckout.recoverStaleQuote`. ## How - account-core: `SUBSCRIPTION_QUOTE_STALE` becomes the command code `QUOTE_STALE`, the same way the reactivation code is mapped. - billing-web: on `QUOTE_STALE`, re-quote the plan and show the app's copy ("Your quote changed. Review the updated amount and try again."); if the re-quote itself fails, show the app's "quote refresh failed" copy. - Tests: an account-core case for the mapping and a CheckoutView case for the re-quote and copy. Both fail before the fix. - Red: the two new tests fail locally on edd1324 (the CI run for that commit was cancelled by the fix push); green: CI on 2ca20d8. The stale quotes themselves come from the server (non-deterministic `renewal_at` on preview for a monthly → annual change); that was reported to backend separately. ## AS IS / TO BE **AS IS:** billing-web monthly → annual shows "We couldn't reach the billing service" (server 400 `SUBSCRIPTION_QUOTE_STALE`); the same change in the embedded checkout then goes through. https://github.com/user-attachments/assets/b31ba7c9-0db0-4a84-a329-804ed28dac4f **TO BE:** Unit and view tests (CheckoutView re-quotes and shows "Your quote changed. Review the updated amount and try again."). The stale quote is intermittent server-side, so a live TO BE capture is pending the backend fix. ## Stack | PR | Title | |---|---| | Comfy-Org#19097 | FE-3045 drop the billing-web plan grid | | Comfy-Org#19098 | FE-3046 A buttonVariants into design-system | | Comfy-Org#19099 | FE-3046 B account-ui checkout surfaces | | Comfy-Org#19100 | FE-3046 C app renders account-ui checkout | | Comfy-Org#19101 | FE-3046 D billing-web shared checkout | | Comfy-Org#19104 | FE-3046 E invite from the success step | | Comfy-Org#19105 | FE-3047 F clear decline toasts on success | | Comfy-Org#19106 | FE-3048 G return closes the tab | | Comfy-Org#19115 | FE-3050 H CTA reachable | | **this PR** | **FE-3056 I stale quote re-quoted** | ```mermaid graph LR P97[Comfy-Org#19097] --> A[Comfy-Org#19098] --> B[Comfy-Org#19099] --> C[Comfy-Org#19100] --> D[Comfy-Org#19101] --> E[Comfy-Org#19104] --> F[Comfy-Org#19105] --> G[Comfy-Org#19106] --> H[Comfy-Org#19115] --> I[FE-3056]:::me classDef me fill:#f9d71c,stroke:#333,color:#000 ``` --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…toast (Comfy-Org#22880) ## Summary `CheckoutToast` was a hand-built replica of PrimeVue's dark Aura toast (Comfy-Org#19101). It was written while the app still rendered that toast, because PrimeVue was banned in billing-web. Comfy-Org#16313 then moved the app to the design-system toast, but this copy was left behind with Aura's hex colors and shape. This PR deletes it. `CheckoutToasts` now renders the design-system `ToastRoot`, `ToastTitle`, `ToastDescription`, `ToastClose` and `ToastViewport` with the same severity icon map as the app's `AppToaster`. - Fixes FRONT-3812 Behavior kept: - Toast lifetime still belongs to `CheckoutView`. The provider's duration is infinite, so Reka never auto-closes a toast, and closing (button or Escape) emits `close` as before. Swipe is disabled, matching `AppToaster`. - Each toast keeps `role="alert"`, `aria-live="assertive"` and `aria-atomic="true"`. The design-system `ToastRoot` excludes its content from Reka's announcer, so without these the toasts would stop announcing. Visible change: neutral `bg-background` cards with a severity-colored icon and muted description, positioned by `ToastViewport` as in the app, instead of tinted severity panels. Main on the left, this PR on the right:   The remaining Fallow `css-token-drift` findings are the five `icon-[lucide--*]` classes, which are the iconify plugin's class syntax and the same ones `AppToaster` uses. The `prefer-design-system-button` suppression for the old close button is removed with the file. ## Verification - Captures above come from the real billing app: a production build driven by the billing-web e2e fixtures (mocked Cloud, fake Stripe). They cover the processing, verify-payment, declined-card and success toasts at 1280px and 360px. In the same run, clicking Close removed the alert. - `pnpm --filter @comfyorg/billing-web test:e2e` passes in full, including the specs that assert on `getByRole('alert')`. `vitest run src/views` passes, as do lint, format and `typecheck:billing-web`.
Why
billing-web is the cloud app's embedded checkout moved to a new tab, with no UX change (ADR BILLING-WEB-0038, #19096). Its checkout was a separate implementation (
EmbeddedCheckout,CheckoutPayment,CheckoutSubmit) with its own layout and copy, no saved-card selection and no promo code. With the app now rendering@comfyorg/account-ui/billing/checkout(#19100), billing-web can render the same steps.How
CheckoutView.vuerenders the shared steps insideCheckoutFrame.vue, which reproduces the app's checkout dialog box (the dialog content class fromuseSubscriptionDialogand the embedded-step classes fromSubscriptionRequiredDialogContentUnified):new_subscriptionquote →CheckoutSubscribeConfirmwith the card form, the saved methods fromusePaymentMethods(default preselected; Change / Add new payment method swap in the card form) and the promo code.CheckoutTransitionConfirm, single column, no card form: the server charges the method on file (the FE-2767 fix(billing-web): confirm scheduled plan changes without a card form #18684 rule, now through the same component as the app). A reactivation the quote or the server demands shows the app's banner and threshold checkbox.CheckoutSuccess(plan card, credits per month); Close returns to the product with the outcome.CheckoutToast.vueis that toast.saved_payment_method_idfor a saved method andpromotion_codefor an applied promo, next to the existing token, quote identity, proration and return URL.@comfyorg/account-ui/billing/catalog(FE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and success #19099). A team stop's price and credits come from the/billing/plansstop the link names, through the same catalog functions as the app's slider and confirm.checkout.*keys are replaced with the app's English strings, key for key.--interface-stroke,color-scheme: dark, and browser defaults for inputs, the select trigger and links (the app has no Tailwind preflight).styles.csssources all of account-ui's billing components (the Stripe form's layout classes were missing);primeiconsandreka-uiare added.CheckoutView.test.tsrewritten against the shared components (saved method, Change, promo, reactivation, decline/3DS outcomes, FE-2767 fix(billing-web): confirm scheduled plan changes without a card form #18684 cases kept);e2e/checkout.spec.tsupdated plus a saved-method e2e. billing-web e2e 29/29 locally.billing-web-only UI deleted
EmbeddedCheckout's split card layout (5/12 summary sidebar, its own card, mutedh1, lucide back arrow and close X).{tier} · {duration}("Pro · Monthly"), hero$28.00with "USD per month"/"USD per year", "{amount} billed yearly", "Starting today".credits_centsas dollars ("$211.00" for 21,100 credits).CheckoutSubmit's pay button and its reactivation checkbox on the card form ("Your subscription was cancelled. I confirm the {amount} charge to reactivate it."); reactivation now uses the app's banner on the plan-change confirm.CheckoutStepspanel that replaced the checkout while paying and after a failure ("Review payment", "Payment declined", "Payment could not be processed", Try again / Use a different payment method / Contact support).billing-web-only UI kept
CheckoutToast, standing in for the app's toast host (outside the checkout panel).Not closed here (see Review Focus)
StripePaymentFormwith the same options; what remains comes from the server'spayment_method_configuration_idand Stripe's per-domain wallet registration, which need a live backend check.Shared with the app, so the hosts can't drift (review fixes)
declineDetailKey(reason)in account-core is one exhaustive switch over the contract'sBillingDeclineReason. The app's SDK rail (topupOperationView.declineDetail) and billing-web both call it. Before this, billing-web had its own list that omittedgeneric. A reason-less decline (account-core defaults it togeneric) therefore read "We couldn't update your subscription." on billing-web and "Your bank declined this payment." in the app. The list also carried 15 strings outside the enum.awaitsHostedAction, now shared, notawaitsVerification.mapApiTeamCreditStopsandgetStopDiscountedMonthlyUsdmove from the app into@comfyorg/account-ui/billing/catalog. The app's pricing table, credit slider and subscription dialog import them from there, and billing-web'steamCheckoutPlanprices the stop with them instead ofprice_cents / months.declineDetailKey(all 8 reasons) andawaitsVerification, the moved stop tests, billing-web decline rows forgeneric/incorrect_cvc/processing_error, and team monthly/annual stop prices. The e2e that pinned the old reason-less copy now expects the app's decline copy.decline_reason. Rerun on D: 0% copy/element difference on every step except P7T, whose team invite is E. Rerun on G (top of stack): 0% on all 15 steps.Toasts and success frame (live testcloud recording)
Why a replica: billing-web's toast is a measured replica of the app's PrimeVue Aura toast, because AGENTS.md forbids new PrimeVue usage. The parity harness compares every toast (size, colors, fonts, icon, close button, each part's position) and fails on drift.
Assistive tech: every toast is
role="alert",aria-live="assertive",aria-atomic="true", as PrimeVue renders the app's. The harness compares these too.Anchor: toasts sit top-right. The app anchors its message toasts to the graph canvas panel, which billing-web does not have.
End date: the reactivation notice's "set to end on" date now comes from the billing status's
cancel_at, the field the app reads, instead of the quote'scurrent_plan.period_end. Harness step P2e gives the two server values different dates; both hosts showcancel_at(Oct 25 vs the quote's Oct 27).Toast:
CheckoutToastwas a look-alike: neutral, no close button, one at a time. It now renders the app's dark Aura PrimeVue toast.blur(10px), and a 28px close button.Lifetimes match the app:
requiredPayment). A plan the server activated on the spot gets none.Prompt vs spinner: the app shows the "Verify your payment" prompt only when a hosted action page is waiting. An in-page 3DS challenge keeps the spinner.
awaitsVerification(adopted in review) also counted the challenge, and the harness showed it disagreed with the app. The app's rule is nowawaitsHostedActionin account-core, used by the app'sbillingSdkStoreand by billing-web.Success frame: the app pins the success frame only after a new subscription. After a plan change it uses the dialog's content-sized box.
CheckoutFramegets thatfitstep, so the blank band above "Send invites" is gone.Harness: it now captures the toast region and the frame box on both sides, not just the panel. Toasts are paired by text and compared on size, colors, fonts, icon, close button and each part's position. New step P7C covers success after a plan change that took a payment. At the stack top, all 19 steps show no copy or element difference, the same toasts with the same measurements, and equal frame boxes.
Toasts, app (left) vs billing-web (right): progress, decline, success
billing-web progress toast, AS IS | TO BE
P7C success after a plan change: billing-web AS IS | TO BE, then app | billing-web
A checkout the server still holds (M2 QA N1)
lifecycle.recover()), the way the app resumespending_billing_op_id. Before this, opening checkout while an earlier subscription was pending showed a fresh card form or an enabled confirm. Pressing it sent nothing and showed "Something went wrong."action-url,authentication-errorandparked-checkout-recovery, andpayingfollows the app'sisPollingrule. An operation parked onawaiting_payment_methodoffers "Complete your payment", and a settling invoice holds the pay action.OPERATION_ALREADY_PENDINGshows the app's sentence ("A payment you started earlier is still going through…") instead of the generic failure.P8a: parked checkout, Cloud app (left) | billing-web (right)
P8b: settling invoice, Cloud app (left) | billing-web (right)
P6a2: reason-less decline, Cloud app (left) | billing-web (right)
Review Focus
Stack
jaewon/billing-web-remove-plan-gridmainFE-3045 refactor(billing-web): drop the billing-web plan grid; hosts own plan selectionjaewon/design-system-button-variantsFE-3046 refactor(design-system): move buttonVariants into @comfyorg/design-systemjaewon/account-ui-checkout-surfacesFE-3046 feat(account-ui): shared checkout confirm, saved-method selector, card form and successjaewon/workspace-adopt-account-ui-checkoutFE-3046 refactor(workspace): render the subscription checkout steps from account-uijaewon/billing-web-shared-checkoutFE-3046 feat(billing-web): render the shared embedded checkoutjaewon/billing-web-success-inviteFE-3046 feat(billing-web): invite your team from the checkout success stepjaewon/checkout-3ds-failure-copyFE-3047 fix(account-ui): clear decline toasts once a retry succeedsjaewon/billing-web-return-close-tabFE-3048 fix(billing-web): return to the host by closing the checkout tabjaewon/checkout-cta-reachableFE-3050 fix(account-ui): keep the checkout CTA reachable when notices grow the confirm stepAS IS / TO BE
Live (testcloud) AS IS / TO BE
Real app and real billing-web against testcloud, not the harness. Same account and plan change on both sides: Team Monthly team_700 → team_1400 ($1,295/mo) on a cancelled team workspace, which reactivates it (the "Confirm your upgrade" path). Both subscriptions were cancelled again afterwards.
mainec7764f. Embedded = local app on testcloud withff:hosted_billing_destination="stripe". billing-web = testcloud (billing_web) → testbilling. Team Monthly team_700, new subscription.DEV_SERVER_COMFYUI_URL=https://testcloud.comfy.org/, testcloudpk_test) and local billing-web on :5174 (VITE_BILLING_ENV=test). Embedded =ff:hosted_billing_destination="stripe"onm2-qa-0925-3ds(saved card needs 3DS). billing-web ="billing_web"onm2-qa-0927-full, handed off from the app's Change plan; the server'sbilling_web_urlwas cleared in the page so the app opens the local billing-web.TO BE video, embedded (left) | billing-web (right). Plan picked in the app → confirm → pay → (3DS on the embedded side's saved card) → "You're all set" with Invite your team → Close. On billing-web, Close closes the tab and the app shows the new credit balance.
tobe-side-by-side-embedded-vs-billing-web.mp4
Full-size recordings: embedded https://github.com/user-attachments/assets/fd8f0ea7-6480-4b54-bb28-afc7fffbfdd6 · billing-web https://github.com/user-attachments/assets/1da3540f-fcf6-4691-a075-997b07c364f1
AS IS video, embedded (left) | billing-web (right) (new subscription, recorded separately so the timelines do not line up).
asis-side-by-side-embedded-vs-billing-web.mp4
TO BE per step, embedded (left) | billing-web (right)
AS IS per step, embedded (left) | billing-web (right)
Differences still visible live (TO BE)
CheckoutToastis a neutral dark toast without one.m2-qa-0925-3ds: the notice says it renews on Oct 27, 2026 while the summary says "Renews at $1,295.00 on Oct 25, 2026". Not compared on billing-web, whose workspace has both dates on Oct 27.Not recorded live yet
New subscription (card entry, decline 0002, 3DS 3184 complete and fail).Recorded on billing-web in the live rerun below (workspacem2-qa-0927-new). An embedded new-subscription run on the same build was not possible: the account has one free workspace, so the embedded side is covered by the AS IS recording above and the upgrade side-by-side below.Live rerun on stack top 9dab83d (2026-09-27)
Upgrade, AS IS embedded (left) | TO BE billing-web (right): Team 147.7K → 295.4K in the app dialog and Team 295.4K → 527.5K on billing-web, both with 3DS complete; same confirm, 3DS and success screens.
m2-upgrade-asis-embedded-vs-tobe-billing-web.mp4
TO BE billing-web, new Team Monthly subscription: decline (0002) → 3DS fail (3184) → 3DS complete → "You're all set" with Invite your team → Close closes the tab and the app shows the plan.
m2-tobe-billing-web-new-team-subscription.mp4
Mocked harness
Checkout parity harness (
temp/scripts/checkout-parity, same fixtures on both surfaces, fakejs.stripe.commasking the Stripe elements; mocked Cloud, not a live backend). Each image: billing-web AS IS (mainec7764f) | billing-web TO BE (this PR, d24d242) | cloud app (same build). Copy/element diff app vs billing-web TO BE: none on all 11 steps. Panel pixel diff (app vs TO BE) below; the non-zero ones are the busy button's spinner frame. The harness's style notes that remain pair two same-named elements (the two Stripe masks, the two Close buttons) and are identical in the structure dumps.P1-confirm-new-personal — pixel diff 0%
P1T-confirm-new-team — pixel diff 0%
P2a-confirm-upgrade-immediate — pixel diff 0%
P2b-confirm-downgrade-zero-due — pixel diff 0%
P3-saved-card-selector — pixel diff 0%
P3b-no-saved-cards — pixel diff 0.000%
P4-card-entry — pixel diff 0.000%
P5-3ds-in-progress — pixel diff 0.003%
P6a-declined — pixel diff 0%
P6b-3ds-failed — pixel diff 0.003%
P7-success — pixel diff 0%