Repository navigation
feat(account): coded billing error bodies and an embedded challenge driver (FE-2227) - #17656
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .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:
Comment |
🌐 Website E2ETip All tests passed.
🎭 Playwright: ✅ 2000 passed, 0 failed📊 Browser Reports
🎨 Storybook: ✅ Built — View Storybook📦 Bundle Size
⚡ Performance Report
Absolute values
Raw data{
"timestamp": "2026-09-15T11:58:31.118Z",
"gitSha": "0b635babb2f7e0c9110d7832ce98ace2853ee2b9",
"branch": "jaewon/fe-2227-core-error-codes-and-challenge-driver",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 1993.2979999999816,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.463000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 482.33699999999993,
"heapDeltaBytes": 10555276,
"heapUsedBytes": 72347236,
"domNodes": -261,
"jsHeapTotalBytes": 4972544,
"scriptDurationMs": 9.402000000000001,
"eventListeners": -154,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "canvas-idle",
"durationMs": 1990.4760000000579,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.965000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 378.484,
"heapDeltaBytes": 5327336,
"heapUsedBytes": 67466304,
"domNodes": -263,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 8.954999999999998,
"eventListeners": -154,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1999.9030000000175,
"styleRecalcs": 79,
"styleRecalcDurationMs": 35.581,
"layouts": 14,
"layoutDurationMs": 5.2379999999999995,
"taskDurationMs": 1015.139,
"heapDeltaBytes": -899544,
"heapUsedBytes": 61151528,
"domNodes": -266,
"jsHeapTotalBytes": 5496832,
"scriptDurationMs": 184.13600000000002,
"eventListeners": -194,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1888.657999999964,
"styleRecalcs": 77,
"styleRecalcDurationMs": 30.153000000000002,
"layouts": 14,
"layoutDurationMs": 4.801,
"taskDurationMs": 871.5919999999999,
"heapDeltaBytes": 14844648,
"heapUsedBytes": 77014952,
"domNodes": -261,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 152.668,
"eventListeners": -156,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1722.5630000000365,
"styleRecalcs": 33,
"styleRecalcDurationMs": 16.764000000000003,
"layouts": 6,
"layoutDurationMs": 1.142,
"taskDurationMs": 338.28700000000003,
"heapDeltaBytes": 2079900,
"heapUsedBytes": 64333864,
"domNodes": 77,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 11.303,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1735.1299999999128,
"styleRecalcs": 31,
"styleRecalcDurationMs": 17.939000000000004,
"layouts": 6,
"layoutDurationMs": 1.4130000000000003,
"taskDurationMs": 380.53700000000003,
"heapDeltaBytes": 2209020,
"heapUsedBytes": 64441720,
"domNodes": 75,
"jsHeapTotalBytes": 4980736,
"scriptDurationMs": 14.473000000000003,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-clipping",
"durationMs": 634.5029999999952,
"styleRecalcs": 11,
"styleRecalcDurationMs": 7.575999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 446.93499999999995,
"heapDeltaBytes": 18302984,
"heapUsedBytes": 80054148,
"domNodes": 18,
"jsHeapTotalBytes": 5767168,
"scriptDurationMs": 159.464,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-clipping",
"durationMs": 642.029999999977,
"styleRecalcs": 11,
"styleRecalcDurationMs": 7.719,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 439.187,
"heapDeltaBytes": 18218236,
"heapUsedBytes": 80443600,
"domNodes": 18,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 160.045,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2072.5820000000112,
"styleRecalcs": 7,
"styleRecalcDurationMs": 6.123,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 600.2040000000001,
"heapDeltaBytes": 674196,
"heapUsedBytes": 80776932,
"domNodes": -251,
"jsHeapTotalBytes": -270336,
"scriptDurationMs": 36.021,
"eventListeners": -184,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2030.4230000000416,
"styleRecalcs": 6,
"styleRecalcDurationMs": 5.551999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 591.2590000000001,
"heapDeltaBytes": 3650788,
"heapUsedBytes": 83003196,
"domNodes": -247,
"jsHeapTotalBytes": -1318912,
"scriptDurationMs": 36.21999999999999,
"eventListeners": -152,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "large-graph-pan",
"durationMs": 2143.8160000000153,
"styleRecalcs": 63,
"styleRecalcDurationMs": 9.944999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1555.492,
"heapDeltaBytes": 18118896,
"heapUsedBytes": 83167376,
"domNodes": 2,
"jsHeapTotalBytes": 487424,
"scriptDurationMs": 787.817,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2293.849000000023,
"styleRecalcs": 64,
"styleRecalcDurationMs": 11.267000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1654.5330000000004,
"heapDeltaBytes": 14332312,
"heapUsedBytes": 78983088,
"domNodes": -254,
"jsHeapTotalBytes": 1273856,
"scriptDurationMs": 812.784,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3565.1960000000145,
"styleRecalcs": 63,
"styleRecalcDurationMs": 14.535000000000002,
"layouts": 60,
"layoutDurationMs": 14.402999999999999,
"taskDurationMs": 1746.14,
"heapDeltaBytes": -8540068,
"heapUsedBytes": 73723652,
"domNodes": -255,
"jsHeapTotalBytes": -1318912,
"scriptDurationMs": 789.0140000000001,
"eventListeners": -178,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333338,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-zoom",
"durationMs": 3589.0550000000303,
"styleRecalcs": 60,
"styleRecalcDurationMs": 11.435,
"layouts": 60,
"layoutDurationMs": 15.454000000000002,
"taskDurationMs": 1768.879,
"heapDeltaBytes": 4326460,
"heapUsedBytes": 70081196,
"domNodes": 0,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 795.2210000000001,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 3079.1959999999676,
"styleRecalcs": 41,
"styleRecalcDurationMs": 6.329999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1957.4720000000002,
"heapDeltaBytes": 20591272,
"heapUsedBytes": 86668848,
"domNodes": 2,
"jsHeapTotalBytes": 417792,
"scriptDurationMs": 981.7130000000001,
"eventListeners": 188,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 3106.176000000005,
"styleRecalcs": 40,
"styleRecalcDurationMs": 5.541,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1980.2179999999998,
"heapDeltaBytes": 20142948,
"heapUsedBytes": 86147372,
"domNodes": 0,
"jsHeapTotalBytes": 942080,
"scriptDurationMs": 986.138,
"eventListeners": 188,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "minimap-idle",
"durationMs": 2003.8700000000063,
"styleRecalcs": 4,
"styleRecalcDurationMs": 3.0629999999999997,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 535.9409999999999,
"heapDeltaBytes": 20090068,
"heapUsedBytes": 84645936,
"domNodes": -253,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 34.11700000000001,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "minimap-idle",
"durationMs": 2004.1800000000194,
"styleRecalcs": 2,
"styleRecalcDurationMs": 1.6530000000000018,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 522.084,
"heapDeltaBytes": 19631420,
"heapUsedBytes": 83898932,
"domNodes": 4,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 35.57299999999999,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 591.4870000000292,
"styleRecalcs": 48,
"styleRecalcDurationMs": 11.307999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 402.4099999999999,
"heapDeltaBytes": 13193940,
"heapUsedBytes": 76649468,
"domNodes": 22,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 142.862,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 639.9209999999584,
"styleRecalcs": 47,
"styleRecalcDurationMs": 11.49,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 423.32200000000006,
"heapDeltaBytes": 13621500,
"heapUsedBytes": 76860356,
"domNodes": 20,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 143.82299999999998,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2000.3859999999918,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.2139999999999995,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 463.89099999999996,
"heapDeltaBytes": -3628904,
"heapUsedBytes": 59816920,
"domNodes": -276,
"jsHeapTotalBytes": 4972544,
"scriptDurationMs": 7.292,
"eventListeners": -230,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-idle",
"durationMs": 2022.4249999999984,
"styleRecalcs": 11,
"styleRecalcDurationMs": 9.102999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 477.123,
"heapDeltaBytes": 7978808,
"heapUsedBytes": 71439420,
"domNodes": -274,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 8.045,
"eventListeners": -200,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1703.0340000000024,
"styleRecalcs": 77,
"styleRecalcDurationMs": 27.804,
"layouts": 18,
"layoutDurationMs": 5.388000000000001,
"taskDurationMs": 772.1690000000001,
"heapDeltaBytes": -6698616,
"heapUsedBytes": 56776520,
"domNodes": -276,
"jsHeapTotalBytes": 5758976,
"scriptDurationMs": 103.001,
"eventListeners": -200,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1734.1890000000149,
"styleRecalcs": 77,
"styleRecalcDurationMs": 27.589000000000002,
"layouts": 18,
"layoutDurationMs": 5.701,
"taskDurationMs": 784.902,
"heapDeltaBytes": 16544492,
"heapUsedBytes": 78851596,
"domNodes": -277,
"jsHeapTotalBytes": 5758976,
"scriptDurationMs": 106.479,
"eventListeners": -200,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "subgraph-transition-enter",
"durationMs": 1385.5409999999893,
"styleRecalcs": 17,
"styleRecalcDurationMs": 27.682,
"layouts": 5,
"layoutDurationMs": 11.781999999999998,
"taskDurationMs": 899.187,
"heapDeltaBytes": 20059668,
"heapUsedBytes": 103059092,
"domNodes": 13587,
"jsHeapTotalBytes": 10747904,
"scriptDurationMs": 30.143000000000004,
"eventListeners": 2387,
"totalBlockingTimeMs": 131,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "viewport-pan-sweep",
"durationMs": 8316.666999999996,
"styleRecalcs": 247,
"styleRecalcDurationMs": 42.29999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 5820.219,
"heapDeltaBytes": -11808448,
"heapUsedBytes": 68158792,
"domNodes": -248,
"jsHeapTotalBytes": 3661824,
"scriptDurationMs": 2743.0809999999997,
"eventListeners": -138,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.670000000000012,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8517.523000000096,
"styleRecalcs": 249,
"styleRecalcDurationMs": 46.24399999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 5978.014,
"heapDeltaBytes": -4550324,
"heapUsedBytes": 75135996,
"domNodes": -248,
"jsHeapTotalBytes": 2281472,
"scriptDurationMs": 2780.769,
"eventListeners": -168,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333338,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 17874.881000000016,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 17288.655,
"heapDeltaBytes": -24917584,
"heapUsedBytes": 172609464,
"domNodes": -6542,
"jsHeapTotalBytes": -3629056,
"scriptDurationMs": 313.49399999999997,
"eventListeners": -7478,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 18057.530999999926,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 17826.189,
"heapDeltaBytes": -24813364,
"heapUsedBytes": 194528404,
"domNodes": -6542,
"jsHeapTotalBytes": -2719744,
"scriptDurationMs": 301.252,
"eventListeners": -7480,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.780000000000047,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-pan",
"durationMs": 21360.023999999954,
"styleRecalcs": 155,
"styleRecalcDurationMs": 19.293000000000006,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 21107.346999999998,
"heapDeltaBytes": -36614784,
"heapUsedBytes": 176752328,
"domNodes": -6542,
"jsHeapTotalBytes": 1007616,
"scriptDurationMs": 898.173,
"eventListeners": -7472,
"totalBlockingTimeMs": 56,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-pan",
"durationMs": 22178.393999999913,
"styleRecalcs": 160,
"styleRecalcDurationMs": 23.91400000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 22057.342,
"heapDeltaBytes": -12097076,
"heapUsedBytes": 189910196,
"domNodes": -6542,
"jsHeapTotalBytes": 1183744,
"scriptDurationMs": 901.0519999999999,
"eventListeners": -7472,
"totalBlockingTimeMs": 226,
"frameDurationMs": 17.77333333333336,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-node-resize-workload",
"durationMs": 6242.26299999998,
"styleRecalcs": 20,
"styleRecalcDurationMs": 75.17600000000002,
"layouts": 20,
"layoutDurationMs": 24.674000000000003,
"taskDurationMs": 6184.492999999999,
"heapDeltaBytes": -42543632,
"heapUsedBytes": 176196612,
"domNodes": -6542,
"jsHeapTotalBytes": 9076736,
"scriptDurationMs": 113.89900000000002,
"eventListeners": -7478,
"totalBlockingTimeMs": 422,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-node-resize-workload",
"durationMs": 6465.4540000000225,
"styleRecalcs": 20,
"styleRecalcDurationMs": 78.965,
"layouts": 20,
"layoutDurationMs": 26.667999999999996,
"taskDurationMs": 6410.485,
"heapDeltaBytes": -23832500,
"heapUsedBytes": 171149064,
"domNodes": -6542,
"jsHeapTotalBytes": 16457728,
"scriptDurationMs": 129.381,
"eventListeners": -7476,
"totalBlockingTimeMs": 532,
"frameDurationMs": 17.780000000000047,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-zoom-out-idle",
"durationMs": 8827.82400000002,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 8580.756,
"heapDeltaBytes": -8733328,
"heapUsedBytes": 171481408,
"domNodes": 0,
"jsHeapTotalBytes": -12845056,
"scriptDurationMs": 160.25500000000002,
"eventListeners": -10,
"totalBlockingTimeMs": 0,
"frameDurationMs": 18.333333333333332,
"p95FrameDurationMs": 16.80000000000291
},
{
"name": "vue-zoom-out-idle",
"durationMs": 9041.164999999979,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 8930.398,
"heapDeltaBytes": 3014436,
"heapUsedBytes": 190722436,
"domNodes": 0,
"jsHeapTotalBytes": -8388608,
"scriptDurationMs": 154.42100000000002,
"eventListeners": -14,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 461.25000000006366,
"styleRecalcs": 16,
"styleRecalcDurationMs": 24.423,
"layouts": 4,
"layoutDurationMs": 2.314,
"taskDurationMs": 123.664,
"heapDeltaBytes": 4968276,
"heapUsedBytes": 66203736,
"domNodes": 124,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 10.569,
"eventListeners": 83,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 107.1550000000343,
"styleRecalcs": 7,
"styleRecalcDurationMs": 12.714000000000002,
"layouts": 2,
"layoutDurationMs": 0.8899999999999997,
"taskDurationMs": 76.66400000000002,
"heapDeltaBytes": 3017608,
"heapUsedBytes": 64995420,
"domNodes": 106,
"jsHeapTotalBytes": 524288,
"scriptDurationMs": 5.860999999999998,
"eventListeners": 33,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
}
]
}🔬 E2E Coverage
Top 10 files by uncovered lines
|
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## jaewon/fe-2227-phase-3-core-sdk-owned-billing-operation-lifecycle-routing #17656 +/- ##
=============================================================================================================
- Coverage 82.71% 82.70% -0.01%
=============================================================================================================
Files 2785 2787 +2
Lines 140385 140411 +26
Branches 37706 37717 +11
=============================================================================================================
+ Hits 116114 116131 +17
- Misses 23184 23193 +9
Partials 1087 1087
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 10 files with indirect coverage changes 🚀 New features to boost your workflow:
|
bf5a706 to
bd6e0ce
Compare
4e6ff48 to
8c24dbc
Compare
…FE-2214) (#17689) ## Why FE-2214's done-when says all three current top-up hosts can integrate the top-up command. #17657 covers ComfyUI_frontend's route (`POST /api/billing/topup`, an operation to poll). Workshop (`apps/website`) and Platform ship on the other route, `POST /api/billing/topup/checkout`: a provider-hosted Checkout session with no `billing_op_id`, credits landing through a webhook. That route could not be decoded with generated schemas until the ingest-types regen #17396 merged; it now carries `CreateTopupCheckoutRequest` / `CreateTopupCheckoutResponse`, so this is the 3A-2 follow-up recorded on FE-2214. Stacked on #17657 (FE-2214 top-up command); merge after it. ## How `createTopupCommand` gains a second method on the same surface, `createHostedTopupCheckout({ amountCents, returnUrl, signal? })`: - input is validated by the generated `zCreateTopupCheckoutRequest`; `INVALID_AMOUNT` / `INVALID_RETURN_URL` are returned before anything is sent - the same capability gate as the in-app command (`ACCESS_DENIED` carrying the server's denial), then the pre-purchase balance is read - one idempotency key per attempt, in the body and on the request; a 404 maps to `NOT_AVAILABLE` so a host keeps its legacy path while `topup_checkout_enabled` is off - `checkout_url` must be https (`validateActionUrl`, the same rule every lifecycle continuation obeys), otherwise `MALFORMED_RESPONSE`; `session_id` passes through when present - nothing is adopted on the lifecycle and no operation id is invented (FE-2214 invariant): the result is `{ url, sessionId?, baselineMicros? }`. The host executes its `OpenUrlMode` on `url` (Workshop pre-opens a tab, Platform redirects) and on return arms the existing `createBalanceWatch` with `baselineMicros`, which is how the test proves completion `readTopupEligibility` (from the fallow split on #17657) now returns the two failures it can actually produce, which is what lets the hosted result union exclude `NO_PAYMENT_METHOD`. ## AS-IS / TO-BE AS-IS: `TopupCommand` exposes `createTopupCheckout` only; Workshop keeps its own `createTopUpCheckout` fetch with a hand-written `zTopUpCheckout` schema, and Platform its own. TO-BE: `TopupCommand` exposes `createHostedTopupCheckout` over the generated contract; a host adapter is a thin wrapper (validate → gate → POST → open → balance watch). No UI in this PR, so no screenshots; the consumer cutover for Workshop is a separate slice. ## Testing Eight new tests under `createHostedTopupCheckout` in `topup.test.ts`: success shape, request body and idempotency key, and no lifecycle operation; `can_top_up` false without a POST; amount and return-URL rejection without a request; 404 → `NOT_AVAILABLE`; missing or non-https URL → `MALFORMED_RESPONSE`; optional session id and baseline omitted when unknown; baseline handed to a balance watch that reconciles on return; no server or provider text on the failure path. Billing core suite 187 passing; oxlint, eslint, oxfmt, `vue-tsc` clean. ## Stack (2026-09-15) Merge top-down. After a parent is squash-merged, rebase each child with `git rebase --onto origin/main <parent tip>` and force-push; GitHub retargets the base. Solid edges are code dependencies, dashed edges are sequencing. ```mermaid flowchart TD P12["Phase 1 + 2 merged<br/>#17436 · #17442 · ingest-types regen #17396"] --> C["FE-2227 Phase 3 core<br/>#17655 · base main"] C --> P0["PR 0 coded error bodies + 3DS driver<br/>#17656"] P0 --> A["FE-2214 top-up command<br/>#17657"] A --> A2["FE-2214 3A-2 hosted top-up checkout<br/>this PR"] P0 --> B1["FE-2223 B1 subscription commands<br/>#17658"] B1 --> B2["FE-2223 B2 eight-state projection<br/>#17659"] A --> I["Integration, do not merge<br/>#17660"] B2 --> I I --> V1["FE-2215 @comfyorg/account-ui composables<br/>#17662"] V1 --> V2["FE-2215 CheckoutSteps<br/>#17663"] I --> SES["core: narrowed BillingSession type<br/>#17664"] SES --> AD1["FE-2216 slice 1 top-up behind a flag<br/>#17665"] A2 -.-> WS["Workshop adapter over createHostedTopupCheckout<br/>later slice"] AD1 -.-> AD2["FE-2216 slice 2 subscription<br/>needs previewSubscribe (FE-2331)"] AD1 --> E["FE-2217 Phase 6 evidence"] BW["billing-web #17370 → #17574"] --> H["FE-2218 Phase 7 separate origin"] AD1 --> H H --> H8["FE-2331 Phase 8 hosted surfaces"] ``` Design: [Billing SDK implementation plan (V2)](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8). Linear: FE-2214.
christian-byrne
left a comment
There was a problem hiding this comment.
source_url: #17656
type: github_pr_review
date_accessed: 2026-09-15
relevance: 5
note: Review posted on PR 17656 (coded error bodies + embedded challenge driver).
Reviewed at the head of jaewon/fe-2227-core-error-codes-and-challenge-driver. I read this specifically as the place a child could reach around the containment property #17655 establishes, since it opens a new path for server data into BillingFailure.
One item, plus a provenance note. And one concern I chased and dropped, which is worth recording because the reasoning matters more than the conclusion.
The concern I dropped
The denylist returning 'failed' for requires_payment_method | requires_action | canceled looked wrong to me, because production learned the opposite lesson the hard way and wrote it down at billingOperationStore.ts:554:
A browser-step error is not a verdict on the payment: the challenge may have completed server-side despite the client error (observed: the intent succeeded seconds after handleNextAction reported failure, and a paused UI stayed on "failed" for a live subscription). Keep polling so the server's state resolves the presentation.
So I went looking for a client-side verdict overriding the server. There isn't one. settleChallenge(state, 'failed') returns a still-pending operation with authenticationState: 'failed_retryable' and customerActionSeen: true — the operation keeps polling, the server's own authentication_state resolves it, and customerActionSeen moves it onto the 23h budget, which is production's AUTHENTICATION_TIMEOUT_MS. The outcome names a challenge attempt, not the payment.
That is production's lesson implemented correctly rather than contradicted. Recording it because "returns 'failed'" reads alarming at the call site and the reassurance lives two files away.
1. serverCode is an unbounded server string in a contract that forbids exactly that
billingContracts.ts opens with:
Billing reports failures as coded results rather than thrown errors, so a caller cannot accidentally surface a server or payment-provider string to a user. The codes carry no server text.
message really is dropped — readBillingErrorCode returns parsed.data.code and nothing else, and details goes with it. That part is clean.
But the generated contract types the field as free text:
export const zErrorResponse = z.object({
code: z.string(), // ← unbounded
details: z.record(z.unknown()).optional(),
message: z.string()
})So BillingFailure.serverCode?: string is server-controlled text reaching consumers, in the module whose opening sentence says a caller must not be able to surface server text. The safeguard described — "each command owns a closed allowlist of the codes it acts on" — is a convention, not something the type enforces, and the field is one {{ error.serverCode }} away from being rendered by a view package that treats it as a fallback when it recognizes nothing.
In practice backends send SCREAMING_SNAKE. Nothing in the contract requires it, and the whole point of the Phase 1 docstring was to make that class of accident impossible rather than unlikely.
Cheapest fix that keeps your design (commands owning their allowlists): make the field's shape carry the rule, so misuse is visible at the call site rather than in a docstring. A branded type BillingServerCode = string & { readonly __brand: 'BillingServerCode' } forces a deliberate unwrap before anything can interpolate it. Narrowing centrally would also work but conflicts with commands owning their own sets, which I think is the right call.
Not blocking, but it is the one place this stack widens the contract rather than keeping it.
2. Provenance note
The description says:
The unmoved-intent denylist (
requires_payment_method | requires_action | canceled→ failed) is ported frombillingOperationStore.runPaymentIntentAction.
It isn't. Those three status strings appear nowhere in cf-main/src, and runPaymentIntentAction (billingOperationStore.ts:490) inspects only result.error — on success it goes straight to authenticationState: 'processing' without looking at result.paymentIntent.status at all.
Inspecting the returned intent status is a reasonable improvement on production, and given the finding above it behaves safely. The issue is only that "ported from X" is doing real work in this stack: it is how I decide what to diff and what to trust. A claim that turns out to be an addition rather than a port costs the next reviewer the check. Worth relabelling as new behaviour with the rationale, which is a stronger claim anyway.
Verified
messageanddetailsare both dropped at the boundary; onlycodesurvives.- The challenge driver imports no provider SDK; the port is host-injected.
not_requiredcorrectly gates on phase, presentation andchallenge.status, so it cannot start a challenge on a hosted or settled operation.
I did not get a local suite run — my worktree cannot resolve zod through this package's workspace links, which is my harness rather than your branch. Read rather than executed, and saying so.
|
Both checked at 2. The port is real — the search was in the wrong tree
So Your point about provenance claims doing real work in this stack stands regardless, and the same goes the other way: worth naming the repo when a port claim is checked. 1.
|
…he billing boundary (FE-2227)
|
Decision on What changes here is the contract text, since that is where the contradiction actually lived. The module header claimed "the codes carry no server text" while the field two paragraphs down is server text. The opaque type is worth having, but as one pass over the finished stack rather than a mid-review force-push of #17657, #17658 and #17665 under you: |
christian-byrne
left a comment
There was a problem hiding this comment.
55c4192a0f addresses it, and I think the route you took is better than the one I suggested.
I proposed a brand, but the actual defect was that the module's opening contract had become false — it said "the codes carry no server text" while serverCode carried exactly that. Naming it in the contract fixes the thing that was wrong:
The one server value that crosses this boundary is
serverCode, a machine identifier and never copy: a command matches it against its own closed set, and a host stores it where it already keepsWorkspaceApiError.code.
Plus "Never render it; the contract does not bound its shape, so it is a value to match, not to show" at the declaration, which is where someone reaching for it will actually be looking. Citing the WorkspaceApiError.code precedent is the part that makes it stick — it tells a host what to do rather than only what not to do. A brand would have added friction without making the rule any clearer than that sentence does.
Approving. CI is green and packages/account reports 473/473; I could not run the suite locally (my worktree cannot resolve zod through this package's workspace links — my harness, not your branch), so I am taking CI as the verification run rather than claiming my own.
One thing still outstanding, non-blocking
The description still reads:
The unmoved-intent denylist … is ported from
billingOperationStore.runPaymentIntentAction.
It is new behaviour rather than a port — those three statuses appear nowhere in cf-main, and runPaymentIntentAction inspects only result.error. Not worth a commit on its own, but worth fixing whenever this is next touched: the description outlives the review thread and ends up as the context someone reads at merge, and in this stack "ported from X" is a load-bearing claim — it is how a reviewer decides what to diff against production and what to take on trust.
Calling it new, with the reasoning you already gave me (inspecting the returned intent status is strictly more information than production had), is a stronger claim than calling it a port.
|
Thanks for the approval, and for pushing on the provenance twice — the second pass found the real problem, which was ambiguity about which tree, not the claim itself. The description was accurate; I have made it unambiguousTaking the narrower claim first, since it is checkable in one paste. No function closes between And it is not mine to have invented: One correction on attribution: "inspecting the returned intent status is strictly more information than production had" is not the reasoning I gave. My argument was the opposite — production in this repo already inspects the returned intent status, at Your search was clean and your conclusion followed from it;
Description-only, no commit, approval untouched. Your point stands as stated — a port claim is load-bearing here, and it should name the tree it can be checked against. If you still read it as new behaviour after those line numbers, say so and I will change the wording to yours rather than re-litigate it; it is your call and it is not worth a third round. |
c28c2a0
into
jaewon/fe-2227-phase-3-core-sdk-owned-billing-operation-lifecycle-routing
…FE-2214) (#17689) ## Why FE-2214's done-when says all three current top-up hosts can integrate the top-up command. #17657 covers ComfyUI_frontend's route (`POST /api/billing/topup`, an operation to poll). Workshop (`apps/website`) and Platform ship on the other route, `POST /api/billing/topup/checkout`: a provider-hosted Checkout session with no `billing_op_id`, credits landing through a webhook. That route could not be decoded with generated schemas until the ingest-types regen #17396 merged; it now carries `CreateTopupCheckoutRequest` / `CreateTopupCheckoutResponse`, so this is the 3A-2 follow-up recorded on FE-2214. Stacked on #17657 (FE-2214 top-up command); merge after it. ## How `createTopupCommand` gains a second method on the same surface, `createHostedTopupCheckout({ amountCents, returnUrl, signal? })`: - input is validated by the generated `zCreateTopupCheckoutRequest`; `INVALID_AMOUNT` / `INVALID_RETURN_URL` are returned before anything is sent - the same capability gate as the in-app command (`ACCESS_DENIED` carrying the server's denial), then the pre-purchase balance is read - one idempotency key per attempt, in the body and on the request; a 404 maps to `NOT_AVAILABLE` so a host keeps its legacy path while `topup_checkout_enabled` is off - `checkout_url` must be https (`validateActionUrl`, the same rule every lifecycle continuation obeys), otherwise `MALFORMED_RESPONSE`; `session_id` passes through when present - nothing is adopted on the lifecycle and no operation id is invented (FE-2214 invariant): the result is `{ url, sessionId?, baselineMicros? }`. The host executes its `OpenUrlMode` on `url` (Workshop pre-opens a tab, Platform redirects) and on return arms the existing `createBalanceWatch` with `baselineMicros`, which is how the test proves completion `readTopupEligibility` (from the fallow split on #17657) now returns the two failures it can actually produce, which is what lets the hosted result union exclude `NO_PAYMENT_METHOD`. ## AS-IS / TO-BE AS-IS: `TopupCommand` exposes `createTopupCheckout` only; Workshop keeps its own `createTopUpCheckout` fetch with a hand-written `zTopUpCheckout` schema, and Platform its own. TO-BE: `TopupCommand` exposes `createHostedTopupCheckout` over the generated contract; a host adapter is a thin wrapper (validate → gate → POST → open → balance watch). No UI in this PR, so no screenshots; the consumer cutover for Workshop is a separate slice. ## Testing Eight new tests under `createHostedTopupCheckout` in `topup.test.ts`: success shape, request body and idempotency key, and no lifecycle operation; `can_top_up` false without a POST; amount and return-URL rejection without a request; 404 → `NOT_AVAILABLE`; missing or non-https URL → `MALFORMED_RESPONSE`; optional session id and baseline omitted when unknown; baseline handed to a balance watch that reconciles on return; no server or provider text on the failure path. Billing core suite 187 passing; oxlint, eslint, oxfmt, `vue-tsc` clean. ## Stack (2026-09-15) Merge top-down. After a parent is squash-merged, rebase each child with `git rebase --onto origin/main <parent tip>` and force-push; GitHub retargets the base. Solid edges are code dependencies, dashed edges are sequencing. ```mermaid flowchart TD P12["Phase 1 + 2 merged<br/>#17436 · #17442 · ingest-types regen #17396"] --> C["FE-2227 Phase 3 core<br/>#17655 · base main"] C --> P0["PR 0 coded error bodies + 3DS driver<br/>#17656"] P0 --> A["FE-2214 top-up command<br/>#17657"] A --> A2["FE-2214 3A-2 hosted top-up checkout<br/>this PR"] P0 --> B1["FE-2223 B1 subscription commands<br/>#17658"] B1 --> B2["FE-2223 B2 eight-state projection<br/>#17659"] A --> I["Integration, do not merge<br/>#17660"] B2 --> I I --> V1["FE-2215 @comfyorg/account-ui composables<br/>#17662"] V1 --> V2["FE-2215 CheckoutSteps<br/>#17663"] I --> SES["core: narrowed BillingSession type<br/>#17664"] SES --> AD1["FE-2216 slice 1 top-up behind a flag<br/>#17665"] A2 -.-> WS["Workshop adapter over createHostedTopupCheckout<br/>later slice"] AD1 -.-> AD2["FE-2216 slice 2 subscription<br/>needs previewSubscribe (FE-2331)"] AD1 --> E["FE-2217 Phase 6 evidence"] BW["billing-web #17370 → #17574"] --> H["FE-2218 Phase 7 separate origin"] AD1 --> H H --> H8["FE-2331 Phase 8 hosted surfaces"] ``` Design: [Billing SDK implementation plan (V2)](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8). Linear: FE-2214.
…e change as superseded (Comfy-Org#17828) Linear FE-2331. Follow-up from the Comfy-Org#17798 review. ## Why A billing read that fails is still an answer about the scope it was issued for. When the host switches workspace or disposes the reader while the request is in flight, the credits, status, and capabilities readers hand the caller back the original failure code — `REQUEST_FAILED`, `NOT_FOUND`, `CONFLICT` — instead of `SUPERSEDED`. A caller that distinguishes "this read no longer applies" from "this read failed" then retries, reports, or surfaces an error banner for a workspace the user already left. The same gap was fixed for `plans.ts` and `paymentMethods.ts` in Comfy-Org#17798; these three readers were written before that and kept the old shape. ## Root cause The lifecycle fence ran only on the success path: ```ts const result = await requestBalance(scope) if (result.status !== 'ok') { if (result.code === 'ACCESS_DENIED' && scopeTracker.isCurrent(context)) { snapshot = undefined } return result // <- returns before the fence } if (lifetime.disposed || !scopeTracker.isCurrent(context)) { return { status: 'error', code: 'SUPERSEDED' } } ``` Because the failure branch returned early, the failure never reached the fence. The `ACCESS_DENIED` snapshot drop compensated with its own `isCurrent` check, which is why the stale-scope case was handled for the cache but not for the returned result. ## How Move the fence to run immediately after the request settles, before `result.status` is inspected, in `credits.ts`, `status.ts`, and `capabilities.ts`. Any result — ok or error — that lands after a dispose or a scope change is now reported as `SUPERSEDED`. The denial drop keeps working for the current scope, and its now-redundant `isCurrent` guard is removed since the fence has already returned for a stale one. `capabilities.ts` is included because it carried the identical gap; `plans.ts` and `paymentMethods.ts` already have this shape from Comfy-Org#17798. ## AS-IS / TO-BE No UI change. This is SDK-internal error-code behavior on `packages/account`: | | AS-IS | TO-BE | | --- | --- | --- | | 500 lands after a workspace change | `{ code: 'REQUEST_FAILED', httpStatus: 500 }` | `{ code: 'SUPERSEDED' }` | | 500 lands after `dispose()` | `{ code: 'REQUEST_FAILED', httpStatus: 500 }` | `{ code: 'SUPERSEDED' }` | | 500 lands in the current scope | `{ code: 'REQUEST_FAILED', httpStatus: 500 }` | unchanged | | 403 lands in the current scope | drops the snapshot | unchanged | ## Testing - Added an `it.for` over two rows — the workspace changes, the reader is disposed — to each of `credits.test.ts`, `status.test.ts`, and `capabilities.test.ts`, gating a 500 behind the existing release-gate transport helper so the failure settles after the supersede. - All six new rows fail against the pre-fix source (`expected { status: 'error', code: 'REQUEST_FAILED', httpStatus: 500 } to deeply equal { status: 'error', code: 'SUPERSEDED' }`) and pass with the fence moved. - `packages/account` suite: 39 files, 634 tests passing. - `pnpm typecheck`, `pnpm lint`, `pnpm format:check`, `pnpm knip`, and `fallow audit --changed-since origin/main` all clean. ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | open (Comfy-Org#17783) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | local, opens after Comfy-Org#17783 and Comfy-Org#17794 | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | open (Comfy-Org#17798, whole Phase 8) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | in Comfy-Org#17798 | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | in Comfy-Org#17798 | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | open (Comfy-Org#17827) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | open (cloud PR 9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | in Comfy-Org#17798 | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests + live E2E per flow × consumer | FE-2217 | todo | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | open (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | open (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | **this PR** | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6["Phase 6 evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style FU13 stroke:#0366d6,stroke-width:4px ```
…g the previous scope's (Comfy-Org#17824) Linear FE-2215. Follow-up from the Comfy-Org#17799 review. ## Why The exposure this SDK track started from was a reader serving the previous account's balance. The core closed it: a read that settles after the host moved to another workspace is refused with `SUPERSEDED` rather than published. `useCredits` then reopened it in the view layer — it treated that refusal as an ordinary failure, kept `balance` untouched, and went on rendering the credits of the workspace the user had just left. ## Root cause `useCredits.refresh` had two branches: publish on `ok`, keep the previous balance and surface the failure on anything else. A scope change is neither. It is not something the user did, there is nothing to retry, and the value being kept belongs to an account that is no longer on screen. The three composables added in Comfy-Org#17799 already split that branch out; the five older ones never mentioned `SUPERSEDED`. ## How `useCredits` clears both `balance` and `failure` on a `SUPERSEDED` read, the same three lines as `usePaymentMethods`, and its docstring keeps the "a failed refresh keeps the previous balance" promise only for ordinary failures. The other four pre-existing composables are unchanged: - `useBillingOperation` — the lifecycle dispatches `superseded` to every operation on a scope change and republishes it, so the state this composable holds is already the truthful new one rather than a stale one. - `usePaymentAttempt` — its visible surface is `projection`, and `projectPaymentStep` maps a superseded operation back to `select`. - `useCheckout` / `useTopUp` — `result` is the outcome handed back to the caller of a command, carries no scope-bound data, and the step the shipped `CheckoutSteps` renders comes from the projection above. The test fixture's fake session can now move to another workspace, so the real credits reader produces `SUPERSEDED` the way the workspace switcher does. ## AS-IS / TO-BE No UI change. AS-IS: after a workspace switch, a host bound to `useCredits` keeps showing the previous workspace's balance until something else clears it. TO-BE: the balance goes undefined and the host renders its empty state until the read for the new workspace settles, with no error shown for a switch the user did not make. ## Testing `useCredits.test.ts` gains a row that moves the harness to another workspace mid-refresh and asserts the balance is dropped with no failure reported; it fails on pre-fix code. The existing row proving that an ordinary failed refresh keeps the previous balance stays. ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | open (Comfy-Org#17783) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | local, opens after Comfy-Org#17783 and Comfy-Org#17794 | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | open (Comfy-Org#17798) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | open (Comfy-Org#17799) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | open (Comfy-Org#17807) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | open (Comfy-Org#17809) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests + live E2E per flow × consumer | FE-2217 | todo | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | open (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | **this PR** | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6["Phase 6 evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 P5 --> P6 P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style FU12 stroke:#0366d6,stroke-width:4px ```
…g#17827) Linear FE-2218. ## Why `apps/billing-web` has a Vitest suite (`App.test.ts`, `EmbeddedCheckout.test.ts`, with ~10 more files landing in Comfy-Org#17798) that runs in zero CI steps today. `ci-tests-unit.yaml` runs the root Vitest suite and then loops over a fixed package list (`account account-ui billing-contract object-info-parser shared-frontend-utils design-system`) — `@comfyorg/billing-web` is not in that loop, and the workflow's `changes-filter` `should-run` gate excludes `apps/**` outright, so a billing-web-only PR skips the job entirely. `apps/website` has its own `ci-website-unit.yaml`; billing-web had no equivalent. A broken billing-web test could merge green. ## How New `.github/workflows/ci-billing-web-unit.yaml`, modelled on `ci-website-unit.yaml`: - Triggers on `push` to `main`, `pull_request` (`branches-ignore: [wip/*, draft/*, temp/*]`), and `merge_group`. No `paths:` filter on the triggers: a `paths:`-filtered workflow produces no check run at all when the paths do not match, so it can never be a required check, and it would leave the merge queue waiting. - Gating moves into the job graph instead. A `changes` job runs `./.github/actions/changes-filter`, and `billing-web-unit` is `needs: changes` with `if: app-billing-web-changes == 'true' || packages-changes == 'true'`. A new `app-billing-web-changes` output computed from `apps/billing-web/**` is added to that action, next to the existing `app-website-changes`; shared deps (`.nvmrc`, root `package.json`, `pnpm-lock.yaml`, `pnpm-workspace.yaml`) fold in automatically like every other `app-*` output, and the existing `packages-changes` already covers `packages/**` — including `account`, `account-ui`, and `billing-contract`. - A `billing-web-unit-gate` job (`needs: [changes, billing-web-unit]`, `if: always()`) emits the stable branch-protection context: it passes when the unit job succeeded, or when it was skipped *and* filtering itself succeeded and found no billing-web or package changes, and fails otherwise. Same success/skip logic as `website-unit-gate`, so a filter-step failure cannot be mistaken for "nothing to run". - Standard `ubuntu-latest` + `./.github/actions/setup-frontend` (pnpm, `.nvmrc` Node, lockfile-keyed pnpm store cache), plus the repo's usual `${{ github.workflow }}-${{ github.ref }}` cancel-in-progress concurrency and `contents: read`. - Runs `pnpm --filter @comfyorg/billing-web test:coverage` and uploads `apps/billing-web/coverage/lcov.info` to Codecov under flag `billing-web`, re-rooted with `network_prefix: apps/billing-web/` so paths cannot collide with root-app coverage. `fail_ci_if_error: ${{ github.event.pull_request.head.repo.fork != true }}`, matching the website workflow — forks have no token, so upload failures cannot block outside contributors. - `codecov.yml` declares the new flag with `paths: apps/billing-web/src/**` and `carryforward: false`, matching the `website-unit` entry, so patch coverage is attributed correctly and a missing upload is not papered over with stale data. No typecheck or build job here: `pnpm typecheck` (root) already fans out to `typecheck:billing-web`, `pnpm lint` already runs `pnpm --filter @comfyorg/billing-web lint`, and both run on every PR through the ungated `ci-lint-format.yaml`. `vite build` for billing-web is still uncovered by CI — out of scope for this PR. ## AS-IS / TO-BE No UI change. - AS-IS: `grep -rn "billing-web" .github/workflows/` returns nothing. The billing-web suite executes in no CI job on any event. - TO-BE: `CI: Billing Web Unit` reports on every PR and merge-queue candidate. A PR touching `apps/billing-web/**` or `packages/**` executes the suite with coverage and reports it to Codecov under the `billing-web` flag; any other PR skips the test job but still emits a passing `billing-web-unit-gate`, so the check can be marked required. ## Testing - `pnpm --filter @comfyorg/billing-web test:coverage` — 2 test files, 7 tests passed; 98.33% statements, 100% branches, 90% functions, 98.27% lines. `apps/billing-web/coverage/lcov.info` written at the path the workflow uploads. - `yamllint --config-file .yamllint .github/workflows/ci-billing-web-unit.yaml .github/actions/changes-filter/action.yaml codecov.yml` — clean (same linter and config as `ci-yaml-validation.yaml`). Workflow also parses and resolves to the expected `on` (`push`/`pull_request`/`merge_group`) and `jobs` (`changes`, `billing-web-unit`, `billing-web-unit-gate`) structure. - `diff` against `ci-website-unit.yaml` shows only name, path, and filter-output renames plus the narrower `push: branches: [main]` — the gate job's logic is byte-identical apart from those substitutions. - Action pinning matches `.pinact.yaml`: `actions/checkout@v7` is in `ignore_actions`, `codecov/codecov-action` is SHA-pinned to the same commit `ci-website-unit.yaml` uses. ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | open (Comfy-Org#17783) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | local, opens after Comfy-Org#17783 and Comfy-Org#17794 | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | open (Comfy-Org#17798, whole Phase 8) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | in Comfy-Org#17798 | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | in Comfy-Org#17798 | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | **this PR** | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | open (cloud PR 9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | in Comfy-Org#17798 | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests + live E2E per flow × consumer | FE-2217 | todo | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | open (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | open (Comfy-Org#17824) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6["Phase 6 evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style BWS stroke:#0366d6,stroke-width:4px ```
…own-origin session and v1 surfaces (#17799) Linear FE-2331. Stacked on #17798 (readers); carries #17797 (previewSubscribe, now on main) until #17798 lands. #17807 (billing-web own-origin session + sign-in) and #17809 (billing-web /v1 surfaces) were squash-merged into this branch, so this PR is the whole Phase 8 view layer: account-ui composables, the billing-web session/sign-in, and the subscription / payment-method surfaces. The plans catalog, the saved cards and the subscription quote are the three reads the hosted billing surfaces are built on, and the core now exposes all three. Nothing in the view layer could reach them: `BillingClient` carried only the balance, capability and status readers, so a host wanting a price had to call the core directly and invent its own loading, failure and cancellation handling per screen. - `BillingClient` gains `plans` and `paymentMethods`; `disposeBillingClient` disposes both, so a sign-out or workspace switch cannot leave a catalog or a card list serving the previous scope. - `usePlans` and `usePaymentMethods` follow `useCredits`: seeded from the reader's snapshot, `immediate` by default, and a failed refresh keeps the last good value beside the failure rather than blanking the screen. `usePaymentMethods` also exposes `defaultMethod` and `invalidateAndRefresh`, for a host coming back from the payment portal where a card was added or removed. - `usePreviewSubscribe` is on-demand and single-flight: each `quote` aborts the one before it through an `AbortController`, and only the latest settles into `preview`/`failure`, so a slow price for a plan the user has moved off never lands on screen. - The app composition root builds both readers and adds them to `dispose()`, keeping the two scope-holder lists in step. Commands stay unwired here. No UI change. These are headless composables; nothing renders them yet. `usePlans`, `usePaymentMethods` and `usePreviewSubscribe` tests run against the real core over the shared billing harness. Both the abort guard and the payment-methods invalidation were verified to fail when removed. A table in `createBillingSdk.test.ts` asserts every reader stops serving the disposed scope. Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (#17662, #17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | open (#17783) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | local, opens after #17783 and #17794 | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | open (#17798) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | **this PR** | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | **this PR** (was #17807) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | **this PR** (was #17809) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests + live E2E per flow × consumer | FE-2217 | todo | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the #17665 review) | FE-2216 | merged (#17792) | | follow-up | Opaque `BillingServerCode` (from the #17656 review) | FE-2227 | open (#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the #17799 review) | FE-2215 | open (#17824) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6["Phase 6 evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 P5 --> P6 P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style P8 stroke:#0366d6,stroke-width:4px style BWS stroke:#0366d6,stroke-width:4px style BWV stroke:#0366d6,stroke-width:4px ```
…the SDK rail behind billing_sdk_subscription_enabled (#17853) Stacked on #17783 (base branch `jaewon/fe-2210-hosted-destination-port`); merge that first. ## Why Phase 5 slice 1 (#17665) moved top-up onto the Billing SDK behind `billing_sdk_topup_enabled`. The subscription actions the host already owns — cancel, resubscribe, and opening the payment portal — still call the workspace API directly and rely on the legacy poller for settlement and telemetry. This slice moves those three onto the SDK's commands behind their own server flag, `billing_sdk_subscription_enabled` (already on `/api/features` via Comfy-Org/cloud#9248, PostHog at 0%), so the eight-state lifecycle, idempotency, recovery and telemetry come from one implementation. Subscribe and plan change are slice 2b, stacked on this PR. ## How - **Rail switch.** `billingSdkSubscriptionRailEnabled` = `billing_sdk_subscription_enabled` AND `unified_cloud_auth`, exactly like the top-up rail. `useSubscriptionRail()` reads it once, synchronously, at the start of an action, so a flag flip mid-flow cannot issue on one rail and observe on the other. - **Three actions, one adapter.** `useWorkspaceBilling.cancelSubscription / resubscribe / manageSubscription` try the rail first; the store runs `sdk.commands.cancelSubscription()`, `resubscribe()`, `openPaymentPortal({ returnUrl })` and projects the result onto what the adapter already does with the legacy calls: settle, or throw a `WorkspaceApiError` (message is the host's, since the SDK never carries server text; `serverCode` lands in `.code`). A command that settles in any phase but `succeeded` is a failure, matching the poller. The refresh after success mirrors the poller's: cancel → status + balance + capabilities; resubscribe → `reconcileSubscriptionSuccess` + capabilities. - **Fallback.** A 404 (backend gate closed while the client flag is on) projects to `unavailable`: the adapter runs its legacy body for that action, and the store latches the route as unavailable for the tab so later actions go straight to legacy without another failed round trip. Every other failure — including `SUPERSEDED` — is thrown, never retried on legacy, so a late or superseded result cannot double-issue. - **Telemetry.** Lifecycle events are now reported for non-topup operations (top-up keeps its resumed-only filter because its dialog reports). `toBillingTelemetryEvent` already emits the poller's payload shape, so dashboards cannot tell the rails apart. - **No client-derived server state.** Eligibility and already-held answers come from the SDK and the server, as for top-up. `subscribe`, `previewSubscribe`, `useSubscriptionCheckout` and `useLegacyBilling` are untouched. ## AS-IS / TO-BE | State | AS-IS (flag off) | TO-BE (flag on) | | --- | --- | --- | | Cancel dialog at rest | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-dialog.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-dialog.png"> | | Cancel in flight | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-in-flight.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-in-flight.png"> | | Cancel settled (success toast) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-settled.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-settled.png"> | | Cancel failed (error toast) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-failed.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-failed.png"> | | User popover after cancel (cancelled state) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-panel-after-cancel.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-panel-after-cancel.png"> | | Cancel request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-network.png"> | | Settings billing panel | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-billing-panel.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-billing-panel.png"> | | Resubscribe (Resume Pro) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-resubscribe.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-resubscribe.png"> | | Resubscribe request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-resubscribe-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-resubscribe-network.png"> | | Payment-portal request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-portal-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-portal-network.png"> | - AS-IS (flag off): cancel / resubscribe / portal POST the workspace API directly; settlement and telemetry come from the legacy poller. - TO-BE (flag on): the same dialogs and toasts, the POSTs go through the SDK transport (`Idempotency-Key` on the request), settlement through the operation lifecycle; a 404 falls back to the legacy call. ## Testing | Gate | Result | | --- | --- | | `vitest run src/platform/workspace/billing src/composables/billing src/platform/workspace/composables src/platform/workspace/stores src/composables/useFeatureFlags` | 41 files, 1138 tests (12 new projection tests, 13 new adapter rail tests, +5 store tests) | | `pnpm typecheck`, `pnpm typecheck:browser`, `lint`, `format:check`, `knip` | exit 0 | | `fallow audit --changed-since origin/jaewon/fe-2210-hosted-destination-port` | no issues in 11 changed files, complexity 0, duplication 0 | | Playwright `browser_tests/tests/dialogs/cancelSubscriptionSdkRail.spec.ts` (cloud project) | **3 passed** against a served cloud dev build — `PLAYWRIGHT_TEST_URL=http://localhost:5173 pnpm exec playwright test --project=cloud browser_tests/tests/dialogs/cancelSubscriptionSdkRail.spec.ts --reporter=list`. Flag off → legacy request, flow unchanged; flag on → SDK request (`Idempotency-Key`), same dialog outcome; flag on + 404 → legacy fallback. | ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (#17662, #17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | #17783 (review; parent of this PR) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | #17851 (review) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | #17798 (queued) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | #17798 (queued) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | #17798 (queued) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (#17827); #17844 (queued) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | #17798 (queued) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | #17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2a | Cancel, resubscribe and payment portal through the SDK behind `billing_sdk_subscription_enabled` | FE-2216 | **this PR** | | 5 slice 2b | Subscribe / plan change through the SDK (`previewSubscribe` quote, then subscribe; the SDK stops short-circuiting an active plan) | FE-2216 | next, stacked on this PR | | follow-up | One `needsCustomerAttention` predicate (from the #17665 review) | FE-2216 | merged (#17792) | | follow-up | Opaque `BillingServerCode` (from the #17656 review) | FE-2227 | merged (#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the #17799 review) | FE-2215 | merged (#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the #17798 review) | FE-2331 | merged (#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2A["Phase 5 slice 2a cancel / resubscribe / portal rail"] S2B["Phase 5 slice 2b subscribe + plan change"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2B HD --> S2A S2A --> S2B P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style S2A stroke:#0366d6,stroke-width:4px ```
…int one (Comfy-Org#17794) Linear FE-2227. Follow-up parked from the Comfy-Org#17656 review. ## Why `BillingFailure.serverCode` is an unbounded server string in a contract whose whole point is that server text never reaches a user. Its doc said "never render it", but the type said plain `string`, so a command could invent a code and compare against it as if the server had sent one. This closes provenance, not containment. After it, only `readBillingErrorCode` can mint a `BillingServerCode`, so a code that reaches a comparison is one the server actually sent. The value is still `string` underneath, so interpolating it into copy, widening it with `??`, concatenating it or passing it to `t()` all still compile — the rendering half of the Comfy-Org#17656 finding stays open, and the file comment says so. Full containment is costed in "Not done here" below. ## How - `BillingServerCode = string & { readonly [brand]: true }` with a module-private `unique symbol`, so the brand cannot be forged outside the module that declares it. - `readBillingErrorCode` is the single producer and the only place the brand is minted, at the decode boundary. The brand erases at runtime, so there is no cost. - Two contract-level helpers bound what a holder can do: `matchesServerCode` compares against a code a command names, and `unwrapServerCode` is the one widening back to `string`, so every widening is visible at its call site. - The four equality comparisons (`topup.ts` `commandFailure`, `subscriptionCommands.ts` `alreadyInRequestedState`, `mapServerCode`, and the reactivation check) now go through `matchesServerCode`. The named constants and their closed sets stay where they were. - The one host handoff, `topupFailureError` in `topupOperationView.ts`, calls `unwrapServerCode` to put the code where `WorkspaceApiError.code` already lives. It is the only widening in the tree. ## AS-IS / TO-BE No behaviour change; the change is type-level only. AS-IS, any caller could write `const code: BillingFailure['serverCode'] = 'NO_PAYMENT_METHOD'` and compare against a code no server ever sent. TO-BE that line is a compile error, and the only values in the field came through the decode boundary. Rendering paths are unchanged in both directions. Every existing test passes with the same assertions. ## Not done here Making the brand genuinely opaque — dropping the `string &` so nothing reads it without `unwrapServerCode` — is the containment half, and it is cheapest now: `topupOperationView.ts:98` is the only consumer today and it already calls `unwrapServerCode`. Measured cost of the switch, from compiling it: three errors, all inside the declaring module — `matchesServerCode`'s `===`, `unwrapServerCode`'s return, and the mint in `billingErrorBody.ts` — each needing an `as unknown as` that the current declaration does not. That tradeoff (containment bought with double casts in the owning module) is a deliberate call, not a default, and Comfy-Org#17798 / Comfy-Org#17799 add consumers this week. Flagged for a decision rather than taken here. ## Testing - New `billingContracts.test.ts`: a table over `matchesServerCode` for a matching code, a different code, and a failure with no error body; a `@ts-expect-error` case proving a plain string is not assignable to `serverCode`; and `unwrapServerCode` returning the string the server sent. - Fixtures mint codes through `readBillingErrorCode` on a real error body rather than casting, so the test exercises the production decode. - `pnpm typecheck`, `pnpm lint`, `pnpm format`, `pnpm knip`, `fallow audit --changed-since origin/main`, and the account, account-ui, and `src/platform/workspace/billing` suites all pass. ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | open (Comfy-Org#17783) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | open (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | local, opens after Comfy-Org#17782 and Comfy-Org#17783 | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | in progress | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | open (Comfy-Org#17793) | | 8 | `previewSubscribe`, plans, payment-methods readers + account-ui + billing-web views | FE-2331 | todo | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests + live E2E per flow × consumer | FE-2217 | todo | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | open (Comfy-Org#17792) | | follow-up | Unforgeable `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | **this PR** | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8["Phase 8 readers + billing-web views"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6["Phase 6 evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["unforgeable BillingServerCode"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P4 --> P8 P8 --> S2 P5 --> P6 P5 --> WS P5 --> FU9 P3 --> FU11 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style FU11 stroke:#0366d6,stroke-width:4px ```
…ders, hosted composables, own-origin session and v1 surfaces (Comfy-Org#17798) Linear FE-2331 / FE-2218. This PR is the whole Phase 8 view layer after the stack was consolidated: Comfy-Org#17799 (account-ui `usePlans` / `usePaymentMethods` / `usePreviewSubscribe` + app-root readers), Comfy-Org#17807 (billing-web own-origin session, sign-in, SDK composition) and Comfy-Org#17809 (billing-web `/v1` entry routing, subscription and payment-method surfaces) were squash-merged into this branch; their bodies, decisions and screenshots remain on those PRs. Rebased onto main after Comfy-Org#17782 (scopeSource), Comfy-Org#17795 (billing-contract) and Comfy-Org#17797 (previewSubscribe) landed, so none of that content is in this diff. ## Why Phase 8's hosted billing surfaces render plan management and saved payment methods, and both reads have to go through the billing SDK so they inherit the scope tracking, deduplication, and coded failures the other readers already have. The generated schemas for both routes exist, so nothing has to be hand-declared. ## How - `plans.ts`: `createPlansReader` over `GET /billing/plans`, decoded with `zGetBillingPlansResponse`. No freshness window — the catalog carries no declared lifetime, so the host decides when to re-read. - `paymentMethods.ts`: `createPaymentMethodsReader` over `GET /billing/payment-methods`, decoded with `zListSavedPaymentMethodsResponse`, plus `invalidate()` so a host returning from the payment portal can drop the list it holds without a scope change. - Both follow the existing reader shape exactly: `createBillingScopeTracker` drops the snapshot and any in-flight read on a scope change, concurrent reads for one scope share a single request, a 2xx that fails the schema is `MALFORMED_RESPONSE`, and HTTP failures map through `codeForHttpStatus`. - Exported from `@comfyorg/account/billing` alongside the credits, status, and capabilities readers. The four readers now share the same request/publish body, which `fallow audit` reports as a duplication warning. Factoring it out would touch `credits.ts` and `status.ts`, which two open PRs already modify, so it is left for a follow-up. ## AS-IS / TO-BE No UI change. The cloud app still calls `workspaceApi.getBillingPlans` and `workspaceApi.listSavedPaymentMethods`; the composables and host wiring that move it onto these readers land in separate PRs. ## Testing `plans.test.ts` and `paymentMethods.test.ts` cover the decode and scope of a successful read, the caller timeout reaching the request, deduplication of concurrent reads, a scope change in flight reporting `SUPERSEDED` with nothing cached, a signed-out reader reporting `NOT_AUTHENTICATED` without a request, the HTTP status table (401 replayed and unreplayed, 403, 404, 500), a malformed 2xx, and `dispose`. Payment methods additionally cover the empty list and `invalidate` dropping the snapshot so the next read refetches. `pnpm typecheck`, `pnpm lint`, `pnpm format`, `pnpm knip`, and `fallow audit --changed-since origin/main` pass. Follow-up, not in this PR: the four readers now share a 32-line scope/in-flight skeleton (`credits.ts`, `status.ts`, `plans.ts`, `paymentMethods.ts`; fallow reports it as one clone family). Comfy-Org#17782 has landed, but extracting it still touches files Comfy-Org#17794 is changing, so it waits for that to land. ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | open (Comfy-Org#17783) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | local, opens after Comfy-Org#17783 and Comfy-Org#17794 | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | **this PR** | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | **this PR** (was Comfy-Org#17799) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | **this PR** (was Comfy-Org#17807) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | **this PR** (was Comfy-Org#17809) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests + live E2E per flow × consumer | FE-2217 | todo | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | open (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | open (Comfy-Org#17824) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6["Phase 6 evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 P5 --> P6 P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style P8RD stroke:#0366d6,stroke-width:4px style P8 stroke:#0366d6,stroke-width:4px style BWS stroke:#0366d6,stroke-width:4px style BWV stroke:#0366d6,stroke-width:4px ```
… a status (Comfy-Org#17844) Follow-up to Comfy-Org#17827, from @huang47's review. ## Why Two of the three review points, both in files Comfy-Org#17827 touched. **1. The workflow does not gate on itself** ([comment](Comfy-Org#17827 (comment))). `app_billing_web` listed only `apps/billing-web/**`, so a PR that changes nothing but `ci-billing-web-unit.yaml` leaves `billing-web-unit` skipped and `billing-web-unit-gate` passing through its skip branch. Comfy-Org#17827 merged exactly that way — run [35103654481](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/35103654481) never executed the job it added. Only the post-merge push run on `main` ([35121739924](https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/35121739924)) did, because every filter output defaults to `'true'` off `pull_request`. **2. The flag has no status of its own** ([comment](Comfy-Org#17827 (comment))). `codecov.yml` declared the `billing-web` flag but no `project.billing-web` / `patch.billing-web` under `coverage.status`, while the website flag has both. The upload arrived with nothing attributing it, which is why Comfy-Org#17827 showed live `codecov/patch/website` and `codecov/project/website` checks and no billing-web counterparts. ## How - `app_billing_web` now lists `.github/workflows/ci-billing-web-unit.yaml`, the way `app_website` lists `ci-website-e2e.yaml` and its two scripts. Output description updated to match. - `project.billing-web` and `patch.billing-web` mirror the website entries verbatim apart from the path and flag: scoped to `apps/billing-web/src/**`, `informational: true`, `flag_coverage_not_uploaded_behavior: pass`, so a skipped job does not fail the status. ## Also in this PR (added after the first push) **The flag rename** (`billing-web` → `billing-web-unit`, @huang47's third point) landed as a second commit, 089a852. It changes `flags:` in `ci-billing-web-unit.yaml`, the `flags:` list of both new status entries and the `flags.` block in `codecov.yml` in one commit, so the upload and the config never disagree. The status keys stay `billing-web` (check names `codecov/project/billing-web`, `codecov/patch/billing-web`), mirroring how the website keeps status key `website` with flag `website-unit`. The first push could not include it because that session's token lacked the `workflow` scope; this push has it. Deliberately unchanged: `app_website` still does **not** list `ci-website-unit.yaml` (only the e2e workflow and its two scripts), so the website *unit* workflow keeps the blind spot this PR fixes for billing-web. @huang47 — worth the matching one-liner, or do you want the asymmetry left alone? ## AS-IS / TO-BE No UI change; CI configuration only. - AS-IS: a `ci-billing-web-unit.yaml`-only PR skips the suite and reports a green gate. The `billing-web` flag uploads with no dedicated status. - TO-BE: that PR runs the suite. The upload gets `codecov/project/billing-web` and `codecov/patch/billing-web`. ## Testing - `curl -X POST --data-binary @codecov.yml https://codecov.io/validate` → `Valid!`. Both new statuses resolve to flag `billing-web` and path `(?s:apps/billing\-web/src/.*)\Z`. - Cross-checked the three places the flag name appears — the workflow's `flags:`, `flags.billing-web`, and both status entries — all read `billing-web`, so the upload is attributed. - Both changed files parse as YAML; `app_billing_web` resolves to `['apps/billing-web/**', '.github/workflows/ci-billing-web-unit.yaml']`. - Not demonstrated end-to-end: this PR touches neither `apps/billing-web/**` nor the workflow, so `billing-web-unit` is expected to **skip** here too. The self-test behaviour can only be observed on a PR that edits the workflow file, which is the push this token cannot make. The mechanism is the same glob matching that already makes `app_website` react to `ci-website-e2e.yaml`. ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | Comfy-Org#17783 (review) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | todo (after Comfy-Org#17783, Comfy-Org#17794) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | Comfy-Org#17798 (review) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | Comfy-Org#17798 (review) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | Comfy-Org#17798 (review) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (Comfy-Org#17827); **this PR** (Comfy-Org#17844) self-tests the workflow and adds the flag statuses | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | Comfy-Org/cloud#9512 (approved x2, CI rerun) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | Comfy-Org#17798 (review) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | Comfy-Org#17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | Comfy-Org#17794 (review) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | merged (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | merged (Comfy-Org#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] CI["billing-web unit CI: PR 17827 (merged) + PR 17844 follow-up"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 BWS --> CI CI --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style CI stroke:#0366d6,stroke-width:4px ```
… billing reads (Comfy-Org#17852) Stacked on Comfy-Org#17798 (base branch `jaewon/fe-2331-plans-payment-methods-readers`); merge that first. Comfy-Org#17851 (the `account-core` rename) sits on the same parent: whichever of the two lands second is re-based mechanically (the rename has a replay script). ## Why `fallow audit` on Comfy-Org#17798 reported a clone family across the five billing readers: `credits.ts`, `status.ts`, `capabilities.ts`, `plans.ts` and `paymentMethods.ts` each re-implemented the same fetch-and-fence shape — capture the scope, share one request per scope, release a caller on its own signal, report a late answer (success or failure) as `SUPERSEDED`, and drop a published snapshot on a denial unless the request predates a change the host fenced. Five copies of that logic is five places the Comfy-Org#17828 late-failure fence had to be applied, and the next reader would have been a sixth. ## How One skeleton, `createScopedReader`, owns the request sharing, the caller release, the publish fence and the denial drop. A reader supplies only its route, decoder (`parse`) and projection into a snapshot, plus two optional hooks that absorb the real variants: `cached` (capabilities' freshness window) and `publish` (payment-methods' fenced list, capabilities' publish-as-stale). `setSnapshot` and `fenceInFlight({ detach })` let each reader assemble its own `invalidate` — capabilities fences without detaching, payment methods fences and detaches. The public API of every reader is unchanged in shape and semantics: `index.ts` is untouched and no consumer in `account-ui`, `billing-web` or `src/platform/workspace/billing` changed. Per-reader production size: credits 158→80, status 137→64, plans 163→78, paymentMethods 197→94, capabilities 317→235 lines. Tests: the fence family is proven once in `scopedReader.test.ts` with a five-reader case table (sparse filters for the one reader that paces itself), and each reader keeps only the tests of its own projection — capabilities' freshness, denials, revision invalidation and `resolved_for` checks; payment-methods' three invalidation cases. Coverage went up: status gained the signed-out-in-flight case, plans and payment methods gained dispose, all five gained sign-out-then-read. ## AS-IS / TO-BE No user-facing change; core package internals only. - AS-IS: five readers, each with its own copy of the scope fence; fallow reports 2 clone groups / 46 lines across three of them plus 4 groups spanning all four non-paced readers. - TO-BE: one skeleton, five thin readers; `fallow audit --changed-since <parent>` reports duplication 0 and no clone group above the 3-instance threshold. ## Testing | Gate | Result | | --- | --- | | `packages/account` vitest | 42 files, 659 tests (67 new shared cases replace 82 per-reader copies) | | `packages/account-ui` vitest | 9 files, 41 tests | | `@comfyorg/billing-web` test:unit | 10 files, 90 tests | | `pnpm typecheck`, `lint`, `format`, `knip` | exit 0 | | `fallow audit --changed-since origin/jaewon/fe-2331-plans-payment-methods-readers` | no issues in 13 changed files | ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | Comfy-Org#17783 (review) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | Comfy-Org#17851 (review, sibling of this PR on Comfy-Org#17798) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | Comfy-Org#17798 (review) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | Comfy-Org#17798 (review) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | Comfy-Org#17798 (review) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (Comfy-Org#17827); Comfy-Org#17844 follow-up (review) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | Comfy-Org#17798 (review) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | Comfy-Org#17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | merged (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | merged (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | merged (Comfy-Org#17828) | | follow-up | one scoped-reader skeleton behind the five billing reads (from the Comfy-Org#17798 fallow report) | FE-2331 | **this PR** | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] FU14["scoped reader skeleton"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 P8RD --> FU14 FU13 --> FU14 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style FU14 stroke:#0366d6,stroke-width:4px ```
…the SDK rail behind billing_sdk_subscription_enabled (#17853) Stacked on #17783 (base branch `jaewon/fe-2210-hosted-destination-port`); merge that first. Phase 5 slice 1 (#17665) moved top-up onto the Billing SDK behind `billing_sdk_topup_enabled`. The subscription actions the host already owns — cancel, resubscribe, and opening the payment portal — still call the workspace API directly and rely on the legacy poller for settlement and telemetry. This slice moves those three onto the SDK's commands behind their own server flag, `billing_sdk_subscription_enabled` (already on `/api/features` via Comfy-Org/cloud#9248, PostHog at 0%), so the eight-state lifecycle, idempotency, recovery and telemetry come from one implementation. Subscribe and plan change are slice 2b, stacked on this PR. - **Rail switch.** `billingSdkSubscriptionRailEnabled` = `billing_sdk_subscription_enabled` AND `unified_cloud_auth`, exactly like the top-up rail. `useSubscriptionRail()` reads it once, synchronously, at the start of an action, so a flag flip mid-flow cannot issue on one rail and observe on the other. - **Three actions, one adapter.** `useWorkspaceBilling.cancelSubscription / resubscribe / manageSubscription` try the rail first; the store runs `sdk.commands.cancelSubscription()`, `resubscribe()`, `openPaymentPortal({ returnUrl })` and projects the result onto what the adapter already does with the legacy calls: settle, or throw a `WorkspaceApiError` (message is the host's, since the SDK never carries server text; `serverCode` lands in `.code`). A command that settles in any phase but `succeeded` is a failure, matching the poller. The refresh after success mirrors the poller's: cancel → status + balance + capabilities; resubscribe → `reconcileSubscriptionSuccess` + capabilities. - **Fallback.** A 404 (backend gate closed while the client flag is on) projects to `unavailable`: the adapter runs its legacy body for that action, and the store latches the route as unavailable for the tab so later actions go straight to legacy without another failed round trip. Every other failure — including `SUPERSEDED` — is thrown, never retried on legacy, so a late or superseded result cannot double-issue. - **Telemetry.** Lifecycle events are now reported for non-topup operations (top-up keeps its resumed-only filter because its dialog reports). `toBillingTelemetryEvent` already emits the poller's payload shape, so dashboards cannot tell the rails apart. - **No client-derived server state.** Eligibility and already-held answers come from the SDK and the server, as for top-up. `subscribe`, `previewSubscribe`, `useSubscriptionCheckout` and `useLegacyBilling` are untouched. | State | AS-IS (flag off) | TO-BE (flag on) | | --- | --- | --- | | Cancel dialog at rest | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-dialog.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-dialog.png"> | | Cancel in flight | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-in-flight.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-in-flight.png"> | | Cancel settled (success toast) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-settled.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-settled.png"> | | Cancel failed (error toast) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-failed.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-failed.png"> | | User popover after cancel (cancelled state) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-panel-after-cancel.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-panel-after-cancel.png"> | | Cancel request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-network.png"> | | Settings billing panel | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-billing-panel.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-billing-panel.png"> | | Resubscribe (Resume Pro) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-resubscribe.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-resubscribe.png"> | | Resubscribe request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-resubscribe-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-resubscribe-network.png"> | | Payment-portal request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-portal-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-portal-network.png"> | - AS-IS (flag off): cancel / resubscribe / portal POST the workspace API directly; settlement and telemetry come from the legacy poller. - TO-BE (flag on): the same dialogs and toasts, the POSTs go through the SDK transport (`Idempotency-Key` on the request), settlement through the operation lifecycle; a 404 falls back to the legacy call. | Gate | Result | | --- | --- | | `vitest run src/platform/workspace/billing src/composables/billing src/platform/workspace/composables src/platform/workspace/stores src/composables/useFeatureFlags` | 41 files, 1138 tests (12 new projection tests, 13 new adapter rail tests, +5 store tests) | | `pnpm typecheck`, `pnpm typecheck:browser`, `lint`, `format:check`, `knip` | exit 0 | | `fallow audit --changed-since origin/jaewon/fe-2210-hosted-destination-port` | no issues in 11 changed files, complexity 0, duplication 0 | | Playwright `browser_tests/tests/dialogs/cancelSubscriptionSdkRail.spec.ts` (cloud project) | **3 passed** against a served cloud dev build — `PLAYWRIGHT_TEST_URL=http://localhost:5173 pnpm exec playwright test --project=cloud browser_tests/tests/dialogs/cancelSubscriptionSdkRail.spec.ts --reporter=list`. Flag off → legacy request, flow unchanged; flag on → SDK request (`Idempotency-Key`), same dialog outcome; flag on + 404 → legacy fallback. | Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (#17662, #17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | #17783 (review; parent of this PR) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | #17851 (review) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | #17798 (queued) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | #17798 (queued) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | #17798 (queued) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (#17827); #17844 (queued) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | #17798 (queued) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2a | Cancel, resubscribe and payment portal through the SDK behind `billing_sdk_subscription_enabled` | FE-2216 | **this PR** | | 5 slice 2b | Subscribe / plan change through the SDK (`previewSubscribe` quote, then subscribe; the SDK stops short-circuiting an active plan) | FE-2216 | next, stacked on this PR | | follow-up | One `needsCustomerAttention` predicate (from the #17665 review) | FE-2216 | merged (#17792) | | follow-up | Opaque `BillingServerCode` (from the #17656 review) | FE-2227 | merged (#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the #17799 review) | FE-2215 | merged (#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the #17798 review) | FE-2331 | merged (#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2A["Phase 5 slice 2a cancel / resubscribe / portal rail"] S2B["Phase 5 slice 2b subscribe + plan change"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2B HD --> S2A S2A --> S2B P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style S2A stroke:#0366d6,stroke-width:4px ```
…the SDK rail behind billing_sdk_subscription_enabled (#17853) Stacked on #17783 (base branch `jaewon/fe-2210-hosted-destination-port`); merge that first. Phase 5 slice 1 (#17665) moved top-up onto the Billing SDK behind `billing_sdk_topup_enabled`. The subscription actions the host already owns — cancel, resubscribe, and opening the payment portal — still call the workspace API directly and rely on the legacy poller for settlement and telemetry. This slice moves those three onto the SDK's commands behind their own server flag, `billing_sdk_subscription_enabled` (already on `/api/features` via Comfy-Org/cloud#9248, PostHog at 0%), so the eight-state lifecycle, idempotency, recovery and telemetry come from one implementation. Subscribe and plan change are slice 2b, stacked on this PR. - **Rail switch.** `billingSdkSubscriptionRailEnabled` = `billing_sdk_subscription_enabled` AND `unified_cloud_auth`, exactly like the top-up rail. `useSubscriptionRail()` reads it once, synchronously, at the start of an action, so a flag flip mid-flow cannot issue on one rail and observe on the other. - **Three actions, one adapter.** `useWorkspaceBilling.cancelSubscription / resubscribe / manageSubscription` try the rail first; the store runs `sdk.commands.cancelSubscription()`, `resubscribe()`, `openPaymentPortal({ returnUrl })` and projects the result onto what the adapter already does with the legacy calls: settle, or throw a `WorkspaceApiError` (message is the host's, since the SDK never carries server text; `serverCode` lands in `.code`). A command that settles in any phase but `succeeded` is a failure, matching the poller. The refresh after success mirrors the poller's: cancel → status + balance + capabilities; resubscribe → `reconcileSubscriptionSuccess` + capabilities. - **Fallback.** A 404 (backend gate closed while the client flag is on) projects to `unavailable`: the adapter runs its legacy body for that action, and the store latches the route as unavailable for the tab so later actions go straight to legacy without another failed round trip. Every other failure — including `SUPERSEDED` — is thrown, never retried on legacy, so a late or superseded result cannot double-issue. - **Telemetry.** Lifecycle events are now reported for non-topup operations (top-up keeps its resumed-only filter because its dialog reports). `toBillingTelemetryEvent` already emits the poller's payload shape, so dashboards cannot tell the rails apart. - **No client-derived server state.** Eligibility and already-held answers come from the SDK and the server, as for top-up. `subscribe`, `previewSubscribe`, `useSubscriptionCheckout` and `useLegacyBilling` are untouched. | State | AS-IS (flag off) | TO-BE (flag on) | | --- | --- | --- | | Cancel dialog at rest | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-dialog.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-dialog.png"> | | Cancel in flight | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-in-flight.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-in-flight.png"> | | Cancel settled (success toast) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-settled.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-settled.png"> | | Cancel failed (error toast) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-cancel-failed.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-cancel-failed.png"> | | User popover after cancel (cancelled state) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-panel-after-cancel.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-panel-after-cancel.png"> | | Cancel request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-network.png"> | | Settings billing panel | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-billing-panel.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-billing-panel.png"> | | Resubscribe (Resume Pro) | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-resubscribe.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-resubscribe.png"> | | Resubscribe request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-resubscribe-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-resubscribe-network.png"> | | Payment-portal request recorded | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/as-is-portal-network.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17853-screenshots/screenshots/to-be-portal-network.png"> | - AS-IS (flag off): cancel / resubscribe / portal POST the workspace API directly; settlement and telemetry come from the legacy poller. - TO-BE (flag on): the same dialogs and toasts, the POSTs go through the SDK transport (`Idempotency-Key` on the request), settlement through the operation lifecycle; a 404 falls back to the legacy call. | Gate | Result | | --- | --- | | `vitest run src/platform/workspace/billing src/composables/billing src/platform/workspace/composables src/platform/workspace/stores src/composables/useFeatureFlags` | 41 files, 1138 tests (12 new projection tests, 13 new adapter rail tests, +5 store tests) | | `pnpm typecheck`, `pnpm typecheck:browser`, `lint`, `format:check`, `knip` | exit 0 | | `fallow audit --changed-since origin/jaewon/fe-2210-hosted-destination-port` | no issues in 11 changed files, complexity 0, duplication 0 | | Playwright `browser_tests/tests/dialogs/cancelSubscriptionSdkRail.spec.ts` (cloud project) | **3 passed** against a served cloud dev build — `PLAYWRIGHT_TEST_URL=http://localhost:5173 pnpm exec playwright test --project=cloud browser_tests/tests/dialogs/cancelSubscriptionSdkRail.spec.ts --reporter=list`. Flag off → legacy request, flow unchanged; flag on → SDK request (`Idempotency-Key`), same dialog outcome; flag on + 404 → legacy fallback. | Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (#17662, #17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | #17783 (review; parent of this PR) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | #17851 (review) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | #17798 (queued) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | #17798 (queued) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | #17798 (queued) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (#17827); #17844 (queued) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | #17798 (queued) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2a | Cancel, resubscribe and payment portal through the SDK behind `billing_sdk_subscription_enabled` | FE-2216 | **this PR** | | 5 slice 2b | Subscribe / plan change through the SDK (`previewSubscribe` quote, then subscribe; the SDK stops short-circuiting an active plan) | FE-2216 | next, stacked on this PR | | follow-up | One `needsCustomerAttention` predicate (from the #17665 review) | FE-2216 | merged (#17792) | | follow-up | Opaque `BillingServerCode` (from the #17656 review) | FE-2227 | merged (#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the #17799 review) | FE-2215 | merged (#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the #17798 review) | FE-2331 | merged (#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2A["Phase 5 slice 2a cancel / resubscribe / portal rail"] S2B["Phase 5 slice 2b subscribe + plan change"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2B HD --> S2A S2A --> S2B P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style S2A stroke:#0366d6,stroke-width:4px ```
…unt-core (Comfy-Org#17851) Stacked on Comfy-Org#17798 (base branch `jaewon/fe-2331-plans-payment-methods-readers`); merge that first, then this rebases to `main` with no content change. ## Why Phase 7 (FE-2218) publishes the framework-free billing core to npm so Platform can install it from a clean non-workspace checkout, and the plan fixes the physical `account-core` / `account-ui` split as the boundary that gets published, not the transitional `packages/account`. The view package `@comfyorg/account-ui` already exists; the core still carries the old name. This is the one mechanical rename PR the plan schedules after Phase 5 slice 1 and before the first publish. ## How Two commits so the review is trivial: 1. `git mv packages/account packages/account-core` — 95 files, 0 insertions, 0 deletions, every path a 100% rename. 2. The specifier and config edits — package name `@comfyorg/account` → `@comfyorg/account-core`, every `workspace:*` dependency (root, `apps/billing-web`, `apps/website`, `packages/account-ui`), every import specifier under `src/`, `packages/`, `apps/`, `browser_tests/`, the root `typecheck` / `lint` scripts (`typecheck:account` → `typecheck:account-core`), `knip.config.ts`, `eslint.config.ts`, the per-package loop and codecov file list in `ci-tests-unit.yaml`, the lockfile importer keys, and the two ADRs that name the package in prose. The delta over a 1:1 swap is oxfmt reflowing import lines the five extra characters pushed past 80 columns. Left alone on purpose: the `./vue` entry (the auth Vue pieces move to `account-ui` in the next PR of this stack), the Firebase app name `comfy-account` in ADR-0028, and the ADR filenames and headings (renaming those would break the ADR index and inbound links). `git grep "@comfyorg/account\b"` and `git grep "packages/account/"` return nothing after this change. The replay script lives under `temp/scripts/rename-account-core.sh` (gitignored); if a sibling PR merges first, re-running it on a fresh base reproduces this diff. ## AS-IS / TO-BE No user-facing change; package boundary only. - AS-IS: `packages/account` publishes as `@comfyorg/account` and is the name Platform would have to install, while the view layer is already `@comfyorg/account-ui`. - TO-BE: `packages/account-core` publishes as `@comfyorg/account-core`; `account-ui` and `billing-web` depend on it by the final name. ## Testing | Gate | Result | | --- | --- | | `pnpm install --frozen-lockfile` | resolves with the new name | | `packages/account-core` vitest | 41 files, 674 tests | | `packages/account-ui` vitest | 9 files, 41 tests | | `@comfyorg/billing-web` test:unit / build | 10 files, 90 tests / built | | `@comfyorg/website` typecheck | 0 errors | | root `pnpm typecheck`, `lint`, `format`, `knip` | all exit 0 | | `vitest run src/platform/workspace/billing` | 5 files, 50 tests | | `pnpm typecheck:browser`, `typecheck:website` (pre-commit) | green | ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | Comfy-Org#17783 (review) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | **this PR** | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | Comfy-Org#17798 (review) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | Comfy-Org#17798 (review) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | Comfy-Org#17798 (review) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (Comfy-Org#17827); Comfy-Org#17844 follow-up (review) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | Comfy-Org#17798 (review) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | Comfy-Org#17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | merged (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | merged (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | merged (Comfy-Org#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style RN stroke:#0366d6,stroke-width:4px ```
…ling core (Comfy-Org#17854) Stacked on Comfy-Org#17851 (base branch `jaewon/fe-2218-account-core-rename`), which stacks on Comfy-Org#17798; merge those first. ## Why The plan's first decision was that the Vue layer leaves the account package: composables and unstyled components ship from `@comfyorg/account-ui`, and the core keeps zero Vue coupling by construction rather than by an import-guard test. The auth Vue pieces (`PasswordRules`, `SocialAuthButtons`, `TurnstileWidget`, the region and Turnstile gates, the lifecycle scope and generation guard) had shipped in the core's `./vue` entry days before that decision and were deliberately left for a later follow-up so the fresh auth stack was not destabilised. With the rename in Comfy-Org#17851 fixing `account-core` as the boundary that gets published (Phase 7), this is that follow-up: the published core must not drag `vue`, `@vueuse/core` or a `.vue` entry to Platform. ## How - `packages/account-core/src/vue/**` → `packages/account-ui/src/auth/**` with `git mv` (7 modules + their 7 tests; git records every file as a rename). The framework-free helpers stay in the core and keep their public subpaths (`/signInSchemas`, `/turnstileScript`, `/boundedOperation`); the moved files reach them through those. - `@comfyorg/account-ui` gains per-module `./auth/*` exports (mirroring how consumers already import these individually and how the app-side test mocks target one module each) plus the two workspace deps the moved files need (`@comfyorg/shared-frontend-utils`, `@comfyorg/tailwind-utils`; both fine in the view package, neither allowed in the core). - The core drops the `./vue/*` exports, `vue`, `@vueuse/core`, `vue-tsc`, `@vitejs/plugin-vue`, `@testing-library/vue|user-event`, `@comfyorg/tailwind-utils` and the `peerDependenciesMeta` block; `typecheck` becomes `tsc --noEmit`; the vitest `account-vue` project becomes `account-firebase` (happy-dom for `src/firebase/**` only). - `vueBoundary.test.ts` now proves the boundary three ways: no `vue` / `@vueuse` import anywhere under `src` (the old `vue/` carve-out is gone), no Vue dependency in any manifest field, and no `.vue` file behind any export. - 17 import sites in 13 files repointed (`apps/billing-web`, `apps/website`, `src/`); root and `apps/website` gain `@comfyorg/account-ui: workspace:*`. A pure `git mv` commit was not possible: the pre-commit hook lints and type-checks the staged tree, and a rename without repoints leaves 17 unresolved imports. Commit 1 is therefore the rename plus the mechanical repoints; commit 2 is the boundary guard. ## AS-IS / TO-BE No user-facing change; package boundary only. - AS-IS: `@comfyorg/account-core` exports `./vue/*` and depends on `vue`; a Platform install of the core would pull Vue and `.vue` files. - TO-BE: `@comfyorg/account-core` has no view entry and no Vue dependency; the sign-in pieces ship from `@comfyorg/account-ui/auth/*` next to `./billing`. ## Testing | Gate | Result | | --- | --- | | `packages/account-core` vitest | 34 files, 638 tests | | `packages/account-ui` vitest | 16 files, 79 tests (7 moved suites) | | `@comfyorg/billing-web` test:unit / build | 10 files, 90 tests / built | | `@comfyorg/website` typecheck | 0 errors | | root `pnpm typecheck`, `lint`, `format`, `knip` | exit 0 | | `vitest run src/components/dialog/content/signin src/components/auth src/platform/workspace/billing` | 11 files, 94 tests | | `git grep "account-core/vue"` | no matches | ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | Comfy-Org#17783 (review) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | Comfy-Org#17851 (review; parent of this PR) | | 4 follow-up | auth Vue pieces leave the core for `@comfyorg/account-ui` (`./auth/*`) | FE-2215 | **this PR** | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | Comfy-Org#17798 (queued) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | Comfy-Org#17798 (queued) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | Comfy-Org#17798 (queued) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (Comfy-Org#17827); Comfy-Org#17844 (queued) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | Comfy-Org#17798 (queued) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | Comfy-Org#17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | todo (plan-change decision) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | merged (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | merged (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | merged (Comfy-Org#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["PR 17851 account-core rename"] VUE["auth Vue pieces to account-ui"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RN --> VUE RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style VUE stroke:#0366d6,stroke-width:4px ```
…act when the hosted destination says billing_web (#17860) Stacked on #17856 (base branch `jaewon/fe-2216-plan-change`) → #17853 → #17783; merge those first. ## Why Rollout layer C (`hosted_billing_destination`, `stripe` | `billing_web`, PostHog at 100% `stripe`) decides where a hosted billing action lands. The plan says the host reads the flag, hands it to the SDK (#17783) and, when it says `billing_web`, mints a `/v1/<intent>` entry with `return_to` from `@comfyorg/billing-contract`, the one definition of that route surface (#17795); when it says `stripe`, the backend's URL is opened unchanged. Today the host only opens the bare billing-web origin from the user popover (#17716) with no intent and no `return_to`, and "Billing & invoices" in the settings panel always goes to the Stripe portal. This is the last un-opened code item before the Phase 7 host proof. ## How - `src/platform/workspace/billing/hostedBillingRoutes.ts`: `hostedBillingRoute(destination, intent)` returns `{ kind: 'billing_web', url }` built by `buildBillingEntryUrl({ billingOrigin, intent, product: 'comfyui', returnTo: 'comfyui_workspace' })`, or `{ kind: 'provider' }` meaning "use the server's URL". The environment is derived, not hardcoded: the cloud base URL's hostname through the existing `resolveDeployEnv` map (`prod-v2 | stg-v2 | test-v2` → `production | staging | test`), which also classifies a local dev session by the backend it talks to. Fails closed to the provider on: no configured origin, an unknown backend family, a return target with no destination in that family, or an entry the contract refuses. A path-prefixed `VITE_BILLING_WEB_URL` keeps its prefix under the minted route. - Consumers: the popover's "Plans and pricing" mints the `pricing` intent (billing-web routes it to the subscription view; the in-app dialog stays the `stripe` behaviour and the popup-blocked fallback); `useWorkspaceBilling.manageSubscription()` mints `payment-methods` **before** either rail is consulted, so on `billing_web` no portal URL is requested on the SDK rail or the legacy one, and `openPortalWindow` + `refreshOnPortalReturn` still run so the return re-reads status, balance and capabilities. - Also fixed on the way: the popover treated a falsy `window.open(…, "noopener,noreferrer")` result as a blocked popup and showed the in-app pricing dialog as a fallback. Per the HTML spec `noopener` always returns `null`, so on `billing_web` the tab and the dialog opened together — a latent defect inherited from #17370 on `main`, caught by this PR's evidence run. The fallback is gone; the E2E `window.open` stub now returns `null` for `noopener` like a browser does, and a popover case covers both destinations. - Left on the provider on purpose: `useSubscriptionCheckout.recoverOutstandingPayment` and the `payment_method_url` steps inside an operation are mid-checkout provider steps, not hosted management; `invoices` and `result` are not served by billing-web yet (`ComingSoonView`), so nothing mints them; the legacy `/customers` rail's `accessBillingPortal` is being retired by the personal-billing flip and is not touched. - `@comfyorg/billing-contract` becomes a root `workspace:*` dependency. The CI cloud build for E2E (`.github/actions/build-cloud-frontend`, used only by `ci-tests-e2e.yaml` and `pr-update-playwright-expectations.yaml`, never by a deploy) gets `VITE_BILLING_WEB_URL=https://billing-web.example`, a reserved origin the spec stubs, reachable only when the server flag says `billing_web`. - No frontend-derived server state: the destination is the flag as-is; the host chooses only the URL shape. ## AS-IS / TO-BE | AS-IS — `hosted_billing_destination: stripe` | TO-BE — `hosted_billing_destination: billing_web` | | --- | --- | | **1. User popover, "Plans and pricing" hovered**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-popover-plans.png"><br>Same menu item, unchanged by the flag. | **1. User popover, "Plans and pricing" hovered**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-popover-plans.png"><br>Same menu item, unchanged by the flag. | | **2. After clicking "Plans and pricing"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-plans-result.png"><br>In-app "Choose a Plan" dialog, no tab opened. | **2. After clicking "Plans and pricing"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-plans-result.png"><br>`billing-web.example/v1/pricing?product=comfyui&return_to=comfyui_workspace` tab opens and nothing else: `window.open` returns `null` under `noopener` as the spec requires, and no in-app dialog is left behind. | | **3. Settings ▸ Workspace ▸ Plan & Credits, before clicking "Billing & invoices"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-settings-billing.png"><br>Identical panel; the destination is only read on click. | **3. Settings ▸ Workspace ▸ Plan & Credits, before clicking "Billing & invoices"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-settings-billing.png"><br>Identical panel; the destination is only read on click. | | **4. After clicking "Billing & invoices"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-manage-result.png"><br>`POST /api/billing/payment-portal` recorded, and the URL it returned (`https://billing.example/portal`) opened. | **4. After clicking "Billing & invoices"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-manage-result.png"><br>No request to `/api/billing/payment-portal` on either rail; `billing-web.example/v1/payment-methods?product=comfyui&return_to=comfyui_workspace` minted and opened. | | **5. Return trip — refocusing the app tab after the hosted tab opened**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-return-refresh.png"><br>`/api/billing/status`, `/balance` and `/capabilities` re-read. | **5. Return trip — refocusing the app tab after the hosted tab opened**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-return-refresh.png"><br>Same three reads; `openPortalWindow` + `refreshOnPortalReturn` still run on the minted route. | - AS-IS (`stripe`, today's default): popover → in-app pricing dialog; settings → Stripe portal via `POST /billing/payment-portal`. - TO-BE (`billing_web`): popover → `<billing-web>/v1/pricing?product=comfyui&return_to=comfyui_workspace`; settings → `<billing-web>/v1/payment-methods?…`, no portal request on either rail; the app re-reads billing state on return. ## Testing | Gate | Result | | --- | --- | | `vitest run src/platform/workspace src/composables/billing src/composables/useFeatureFlags src/config` | 91 files, 1890 tests (19 new route cases: intent × destination × env × prefix × each fail-closed branch; 3 new adapter cases; 3 popover cases re-pointed) | | `packages/billing-contract` vitest | 3 files, 62 tests | | `pnpm typecheck`, `typecheck:browser`, `lint`, `format`, `knip` | exit 0 | | `fallow audit --changed-since origin/jaewon/fe-2216-plan-change` | no issues in 10 changed files | | `PLAYWRIGHT_TEST_URL=http://localhost:5431 pnpm exec playwright test --project=cloud browser_tests/tests/dialogs/hostedBillingDestination.spec.ts --reporter=list`, against `VITE_BILLING_WEB_URL=https://billing-web.example pnpm dev:cloud` | `4 passed (4.6s)` — settings on both destinations, plus the two new avatar-menu cases: `opens the in-app pricing table from the avatar menu while the destination is stripe` and `opens the billing-web pricing entry alone from the avatar menu while the destination is billing_web` | ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (#17662, #17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | #17783 (review) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | #17851 (review) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | merged (#17798) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | merged (#17798) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | merged (#17798) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (#17827, #17844) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | merged (#17798) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | #17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2a | Cancel, resubscribe and payment portal through the SDK behind `billing_sdk_subscription_enabled` | FE-2216 | #17853 (review) | | 5 slice 2b | Subscribe and plan change through the SDK, priced by the server | FE-2216 | #17856 (review; parent of this PR) | | 7 / rollout C | Host mints billing-web `/v1/<intent>` entries with `return_to` when `hosted_billing_destination` is `billing_web` | FE-2218 | **this PR** | | follow-up | One `needsCustomerAttention` predicate (from the #17665 review) | FE-2216 | merged (#17792) | | follow-up | Opaque `BillingServerCode` (from the #17656 review) | FE-2227 | merged (#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the #17799 review) | FE-2215 | merged (#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the #17798 review) | FE-2331 | merged (#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2A["PR 17853 slice 2a cancel / resubscribe / portal rail"] S2B["PR 17856 slice 2b subscribe + plan change"] LC["Layer C: host mints billing-web entries"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2B HD --> S2A S2A --> S2B S2B --> LC RB --> LC HD --> LC LC --> P7 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style BWV fill:#d4edda,stroke:#155724 style BWS fill:#d4edda,stroke:#155724 style P8 fill:#d4edda,stroke:#155724 style P8RD fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style LC stroke:#0366d6,stroke-width:4px ```
…act when the hosted destination says billing_web (#17860) Stacked on #17856 (base branch `jaewon/fe-2216-plan-change`) → #17853 → Rollout layer C (`hosted_billing_destination`, `stripe` | `billing_web`, PostHog at 100% `stripe`) decides where a hosted billing action lands. The plan says the host reads the flag, hands it to the SDK (#17783) and, when it says `billing_web`, mints a `/v1/<intent>` entry with `return_to` from `@comfyorg/billing-contract`, the one definition of that route surface (#17795); when it says `stripe`, the backend's URL is opened unchanged. Today the host only opens the bare billing-web origin from the user popover (#17716) with no intent and no `return_to`, and "Billing & invoices" in the settings panel always goes to the Stripe portal. This is the last un-opened code item before the Phase 7 host proof. - `src/platform/workspace/billing/hostedBillingRoutes.ts`: `hostedBillingRoute(destination, intent)` returns `{ kind: 'billing_web', url }` built by `buildBillingEntryUrl({ billingOrigin, intent, product: 'comfyui', returnTo: 'comfyui_workspace' })`, or `{ kind: 'provider' }` meaning "use the server's URL". The environment is derived, not hardcoded: the cloud base URL's hostname through the existing `resolveDeployEnv` map (`prod-v2 | stg-v2 | test-v2` → `production | staging | test`), which also classifies a local dev session by the backend it talks to. Fails closed to the provider on: no configured origin, an unknown backend family, a return target with no destination in that family, or an entry the contract refuses. A path-prefixed `VITE_BILLING_WEB_URL` keeps its prefix under the minted route. - Consumers: the popover's "Plans and pricing" mints the `pricing` intent (billing-web routes it to the subscription view; the in-app dialog stays the `stripe` behaviour and the popup-blocked fallback); `useWorkspaceBilling.manageSubscription()` mints `payment-methods` **before** either rail is consulted, so on `billing_web` no portal URL is requested on the SDK rail or the legacy one, and `openPortalWindow` + `refreshOnPortalReturn` still run so the return re-reads status, balance and capabilities. - Also fixed on the way: the popover treated a falsy `window.open(…, "noopener,noreferrer")` result as a blocked popup and showed the in-app pricing dialog as a fallback. Per the HTML spec `noopener` always returns `null`, so on `billing_web` the tab and the dialog opened together — a latent defect inherited from #17370 on `main`, caught by this PR's evidence run. The fallback is gone; the E2E `window.open` stub now returns `null` for `noopener` like a browser does, and a popover case covers both destinations. - Left on the provider on purpose: `useSubscriptionCheckout.recoverOutstandingPayment` and the `payment_method_url` steps inside an operation are mid-checkout provider steps, not hosted management; `invoices` and `result` are not served by billing-web yet (`ComingSoonView`), so nothing mints them; the legacy `/customers` rail's `accessBillingPortal` is being retired by the personal-billing flip and is not touched. - `@comfyorg/billing-contract` becomes a root `workspace:*` dependency. The CI cloud build for E2E (`.github/actions/build-cloud-frontend`, used only by `ci-tests-e2e.yaml` and `pr-update-playwright-expectations.yaml`, never by a deploy) gets `VITE_BILLING_WEB_URL=https://billing-web.example`, a reserved origin the spec stubs, reachable only when the server flag says `billing_web`. - No frontend-derived server state: the destination is the flag as-is; the host chooses only the URL shape. | AS-IS — `hosted_billing_destination: stripe` | TO-BE — `hosted_billing_destination: billing_web` | | --- | --- | | **1. User popover, "Plans and pricing" hovered**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-popover-plans.png"><br>Same menu item, unchanged by the flag. | **1. User popover, "Plans and pricing" hovered**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-popover-plans.png"><br>Same menu item, unchanged by the flag. | | **2. After clicking "Plans and pricing"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-plans-result.png"><br>In-app "Choose a Plan" dialog, no tab opened. | **2. After clicking "Plans and pricing"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-plans-result.png"><br>`billing-web.example/v1/pricing?product=comfyui&return_to=comfyui_workspace` tab opens and nothing else: `window.open` returns `null` under `noopener` as the spec requires, and no in-app dialog is left behind. | | **3. Settings ▸ Workspace ▸ Plan & Credits, before clicking "Billing & invoices"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-settings-billing.png"><br>Identical panel; the destination is only read on click. | **3. Settings ▸ Workspace ▸ Plan & Credits, before clicking "Billing & invoices"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-settings-billing.png"><br>Identical panel; the destination is only read on click. | | **4. After clicking "Billing & invoices"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-manage-result.png"><br>`POST /api/billing/payment-portal` recorded, and the URL it returned (`https://billing.example/portal`) opened. | **4. After clicking "Billing & invoices"**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-manage-result.png"><br>No request to `/api/billing/payment-portal` on either rail; `billing-web.example/v1/payment-methods?product=comfyui&return_to=comfyui_workspace` minted and opened. | | **5. Return trip — refocusing the app tab after the hosted tab opened**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/as-is-return-refresh.png"><br>`/api/billing/status`, `/balance` and `/capabilities` re-read. | **5. Return trip — refocusing the app tab after the hosted tab opened**<br><img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17860-screenshots/screenshots/to-be-return-refresh.png"><br>Same three reads; `openPortalWindow` + `refreshOnPortalReturn` still run on the minted route. | - AS-IS (`stripe`, today's default): popover → in-app pricing dialog; settings → Stripe portal via `POST /billing/payment-portal`. - TO-BE (`billing_web`): popover → `<billing-web>/v1/pricing?product=comfyui&return_to=comfyui_workspace`; settings → `<billing-web>/v1/payment-methods?…`, no portal request on either rail; the app re-reads billing state on return. | Gate | Result | | --- | --- | | `vitest run src/platform/workspace src/composables/billing src/composables/useFeatureFlags src/config` | 91 files, 1890 tests (19 new route cases: intent × destination × env × prefix × each fail-closed branch; 3 new adapter cases; 3 popover cases re-pointed) | | `packages/billing-contract` vitest | 3 files, 62 tests | | `pnpm typecheck`, `typecheck:browser`, `lint`, `format`, `knip` | exit 0 | | `fallow audit --changed-since origin/jaewon/fe-2216-plan-change` | no issues in 10 changed files | | `PLAYWRIGHT_TEST_URL=http://localhost:5431 pnpm exec playwright test --project=cloud browser_tests/tests/dialogs/hostedBillingDestination.spec.ts --reporter=list`, against `VITE_BILLING_WEB_URL=https://billing-web.example pnpm dev:cloud` | `4 passed (4.6s)` — settings on both destinations, plus the two new avatar-menu cases: `opens the in-app pricing table from the avatar menu while the destination is stripe` and `opens the billing-web pricing entry alone from the avatar menu while the destination is billing_web` | Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (#17662, #17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | #17783 (review) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | #17851 (review) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | merged (#17798) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | merged (#17798) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | merged (#17798) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (#17827, #17844) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | merged (#17798) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2a | Cancel, resubscribe and payment portal through the SDK behind `billing_sdk_subscription_enabled` | FE-2216 | #17853 (review) | | 5 slice 2b | Subscribe and plan change through the SDK, priced by the server | FE-2216 | #17856 (review; parent of this PR) | | 7 / rollout C | Host mints billing-web `/v1/<intent>` entries with `return_to` when `hosted_billing_destination` is `billing_web` | FE-2218 | **this PR** | | follow-up | One `needsCustomerAttention` predicate (from the #17665 review) | FE-2216 | merged (#17792) | | follow-up | Opaque `BillingServerCode` (from the #17656 review) | FE-2227 | merged (#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the #17799 review) | FE-2215 | merged (#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the #17798 review) | FE-2331 | merged (#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2A["PR 17853 slice 2a cancel / resubscribe / portal rail"] S2B["PR 17856 slice 2b subscribe + plan change"] LC["Layer C: host mints billing-web entries"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2B HD --> S2A S2A --> S2B S2B --> LC RB --> LC HD --> LC LC --> P7 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style BWV fill:#d4edda,stroke:#155724 style BWS fill:#d4edda,stroke:#155724 style P8 fill:#d4edda,stroke:#155724 style P8RD fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style LC stroke:#0366d6,stroke-width:4px ```
…contract and ingest-types (Comfy-Org#17882) ## Why `@comfyorg/account-core`, `@comfyorg/billing-contract` and `@comfyorg/ingest-types` are about to be installed by Platform from the public registry, and today none of them can be packed: `exports` point at `src/*.ts`, there is no `files` allowlist, no build, and the core still reaches into a private workspace utility. The release workflows on Comfy-Org#17881 assume `build` and `smoke:pack` exist; this PR is the part that makes a tarball installable in plain Node. Built on Comfy-Org#17854 (auth Vue surface → `account-ui`, now merged) so the core builds from a Vue-free tree, and it reproduces Maanil's Comfy-Org#17838 / Comfy-Org#17839 / Comfy-Org#17840 on the renamed tree as agreed in the review thread there. Base is `main`. ## How - **Private-utility cut** — the one remaining reach out of the core was `turnstileScript.ts` → `@comfyorg/shared-frontend-utils/loadExternalScript`. The loader is now package-owned (`packages/account-core/src/loadExternalScript.ts`, byte-identical) and `@comfyorg/shared-frontend-utils` leaves the core's dependencies. `publishBoundary.test.ts` fails on any future `workspace:` dependency that is not itself published (`@comfyorg/ingest-types` is the only allowed one). - **Manifests** — `files: ["dist"]`, `sideEffects: false`, `repository`/`homepage`/`author`, MIT `LICENSE` per package, `publishConfig.exports` mapping every dev `exports` entry to `dist/*.js` + `.d.ts`, `./package.json` export, `access: public`. `@comfyorg/ingest-types` moves `zod` to a peer so a consumer never gets two zod copies. `private: true` stays on all three (`ingest-types` had no `private` at all; it now has the latch). Flipping `private` is a one-line change per manifest in a later reviewed PR. - **Build** — `tsconfig.build.json` per package (`declaration`, `noEmitOnError`, `types: []`, tests and fixtures excluded), `build` = `clean` + `tsc -p`, `prepack` runs it. Relative imports carry `.js` so the emitted ESM resolves under `nodenext`; `openapi-ts.config.ts` sets `importFileExtension: '.js'` so regeneration keeps it. - **Smoke pack** — `scripts/smokePack.ts` (run as `pnpm --filter @comfyorg/account-core smoke:pack`) packs all three, checks each tarball (no source/test/fixture files, every export target present, no unrewritten `catalog:`/`workspace:`), installs them into a throwaway npm project, imports all 21 entries from plain Node ESM, and type-checks a `nodenext` consumer. Dropping one `.js` extension makes the typed step fail with `TS2835`, which the plain-Node step alone would not catch. - **CI** — `ci-packages-pack.yaml` on `pull_request` for the three package paths: matrix job per package (typecheck → build → `check:pack`) plus one `smoke-consumer` job. The tarball rules live in one pure module, `publishableTarball.ts`, with its own test file; the CLI and the smoke test are two entry points onto it, so CI and the smoke test cannot drift. Deliberate divergences from Comfy-Org#17839: no `region` export and no deletion in `shared-frontend-utils/networkUtil.ts` (the region gate moved to `account-ui` with the Vue surface and three app suites still import it); `createScriptLoader` stays in the shared package for its three `src/platform` callers. Open point: the root `LICENSE` is GPL-3.0 while all three manifests already declare MIT (as `@comfyorg/design-system` publishes). Without a per-package file pnpm would inject the GPL text into a tarball whose manifest says MIT, so the MIT files fix the actual defect; whether the SDK packages should be MIT at all is a call for the reviewer to confirm. ## AS-IS / TO-BE No UI change; packages, scripts and CI only. - AS-IS: `pnpm pack` on any of the three ships `src/*.ts` (or nothing) with `exports` a consumer cannot resolve, and the core depends on a private workspace package. - TO-BE: `smoke:pack` proves the three tarballs install and import from plain Node with types, and CI runs that proof on every change to the packages. ## Testing | Check | Result | | --- | --- | | `build` account-core / billing-contract / ingest-types | 92 / 18 / 6 dist files | | `smoke:pack` | 3 packed, 21 entries imported under Node ESM, `nodenext` tsc clean | | vitest account-core / account-ui / billing-contract / billing-web | 675 / 79 / 62 / 90 pass | | `pnpm typecheck`, `pnpm lint`, `pnpm format:check`, `pnpm knip` (with `dist` on disk) | exit 0 | | `yamllint` on the new workflow | clean | ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | Comfy-Org#17783 (review, carries slice 2a) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | merged (Comfy-Org#17851) | | 7 prep | Auth Vue surface → `account-ui`; core Vue-free by construction | FE-2215 | merged (Comfy-Org#17854) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | merged (Comfy-Org#17798) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | merged (Comfy-Org#17798) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | merged (Comfy-Org#17798) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (Comfy-Org#17827, Comfy-Org#17844) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | merged (Comfy-Org#17798) | | 7 | Package release workflows + versioning ADR (bump PR → publish on merge, snapshots) | FE-2218 | Comfy-Org#17881 (review) | | 7 | Publish readiness: dist build, files allowlist, pack smoke test, private-utility cut | FE-2218 | **this PR** | | 7 | First publish (`private` off), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | Comfy-Org#17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | Comfy-Org#17856 / Comfy-Org#17860 (review) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | merged (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | merged (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | merged (Comfy-Org#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename (merged)"] AV["auth Vue surface to account-ui (merged)"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] RW["PR 17881 release workflows + ADR"] PR["publish readiness: dist, files, smoke pack"] PUB["first publish account-core / billing-contract / ingest-types"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> AV AV --> PR RW --> PUB PR --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style BWV fill:#d4edda,stroke:#155724 style BWS fill:#d4edda,stroke:#155724 style P8 fill:#d4edda,stroke:#155724 style P8RD fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style RN fill:#d4edda,stroke:#155724 style AV fill:#d4edda,stroke:#155724 style PR stroke:#0366d6,stroke-width:4px ```
…codes (Comfy-Org#17829) Linear FE-2217. ## Why The billing SDK core decodes generated zod schemas from `@comfyorg/ingest-types/zod`, which a bot regenerates from the cloud OpenAPI whenever the backend moves. Today a regen that renames a field, drops it, or widens an enum the reducer switches on surfaces either as a typecheck error somewhere deep in the core or, worse, as a runtime `MALFORMED_RESPONSE` in front of a customer mid-payment. Nothing states, in one readable place, which fields of which schema the SDK actually depends on. This adds a contract test per generated schema the core decodes. Each pins the fields the core reads and the enum members it branches on, at the type level and at parse time, so a regen that changes one of them fails a named block whose name says what broke — the parse rows under `vitest run`, the `expectTypeOf` exhaustiveness pins under the package typecheck. A failure here means the backend contract moved: fix the SDK, not the test. These are pins, not behaviour: reader and command behaviour stays covered by the existing `credits.test.ts`, `status.test.ts`, `capabilities.test.ts`, `operationState.test.ts`, `subscriptionCommands.test.ts`, and `topup.test.ts`. ## How New folder `packages/account-core/src/core/billing/contracts/`, one file per endpoint contract, picked up by the package's existing `src/core/**/*.{test,spec}.ts` include. Each file holds a canonical fixture typed as `z.input<typeof schema>` built by a small typed builder (no casts), parses it with `safeParse`, pins the output type with `expectTypeOf`, and runs one `it.for` row per enum value the SDK branches on. | Schema | Module that decodes it | Fields pinned | | --- | --- | --- | | `zBillingBalanceResponse` | `credits.ts` (read by `topup.ts`, `balanceWatch.ts`) | `amount_micros` as a number; the four optional breakdown micros | | `zBillingStatusResponse` | `status.ts` (read by `operationLifecycle.ts`, `subscriptionCommands.ts`, `presentation.ts`) | `billing_rail` (3), `pending_billing_op_id`, `pending_billing_op_type` (2), `action_url`, `payment_intent_client_secret`, `is_active`, `subscription_tier` (7), `subscription_status` (3) | | `zBillingCapabilitiesResponse`, `zBillingCapabilities`, `zBillingCapabilityScope`, `zBillingCapabilityRolloutDefaults` | `capabilities.ts` (which parses the three named pieces, not the response schema) | the five response keys the reader recomposes into its own schema, reading `expires_at` as a plain string and `revision` as a number; all seven capability booleans; `resolved_for.user_id` / `workspace_id`; `expires_at`; `revision` as an int64 bounded to the JavaScript-safe range the reader reads it back as a number over; `denied_reasons` absent from the contract, which is why `capabilityDenials.ts` decodes it off the raw body | | `zBillingOpStatusResponse` | `operationLifecycle.ts`, `operationState.ts` | `id`; `status` (the 4 the reducer handles); `authentication_state` (the 5 it reads or assigns); `decline_reason` (8, incl. the `generic` fallback); `recovery_action` (4); `phase` (3); `action_url`; `payment_intent_client_secret`; `retryable` optional | | `zErrorResponse` | `billingErrorBody.ts` | `code` as an open string the commands match against their own closed set; a body without `message` yields no code | | `zSubscribeRequest`, `zSubscribeResponse` | `subscriptionCommands.ts` | `confirmation_token`, `saved_payment_method_id` (`pm_` prefix), `idempotency_key`, `confirm_reactivation`; `billing_op_id`, `status` (3), optional `payment_method_url` | | `zResubscribeResponse` | `subscriptionCommands.ts` | `billing_op_id` regardless of `status` (2) | | `zCancelSubscriptionResponse2` | `subscriptionCommands.ts` | `billing_op_id` on both members of the response union | | `zPaymentPortalResponse` | `subscriptionCommands.ts` | `url` required, and not https-checked by the schema, which is why the command re-checks it | | `zPreviewSubscribeRequest`, `zPreviewSubscribeResponse` | `subscriptionCommands.ts` | `plan_slug` required and the three optional request fields; `allowed`, `is_immediate`, `effective_at`, `transition_type` (4), the int64 money fields and their JSON-number coercion, `discounts`, `requires_reactivation_confirmation` | | `zCreateTopupRequest`, `zCreateTopupResponse` | `topup.ts` | `amount_cents` minimum and its int64 coercion of the JSON number the command validates but does not send; `idempotency_key`; `billing_op_id` regardless of `status` (3) | | `zCreateTopupCheckoutRequest`, `zCreateTopupCheckoutResponse` | `topup.ts` | the amount bounds and the `return_url` URL rule, pinned by the issue **path** the command reads to tell the two apart; `checkout_url` required, `session_id` optional | `capabilityDenials.ts` is the one billing module that decodes without a generated schema — deliberately, since a strict enum parse would lose the whole capability set the first time the server names an unfamiliar policy branch. Its absence from the generated contract is pinned in `billingCapabilities.contract.test.ts`. ## AS-IS / TO-BE No UI. A regenerated `zBillingOpStatusResponse` that adds a fifth `status`: - AS-IS: the new value falls through `terminalFromStatus` into the pending branch; the operation polls until its budget runs out and reports `timed_out`. - TO-BE: `billingOpStatus.contract.test.ts` fails on the regen PR, naming the reducer as what needs updating. Two gates, and which one fires depends on the pin: the enum rows (`accepts the %s status`) fail under `vitest run`, while the exhaustiveness pin at `billingOpStatus.contract.test.ts:36` sits at module scope and fails as a TS2344 under the package typecheck, not in the test run. ## Testing - `cd packages/account-core && vitest run src/core/billing/contracts` — 12 files, 90 tests, all passing. The type pins are not among them: they sit at module scope and fail `pnpm --filter @comfyorg/account-core typecheck` instead, because nothing here runs `vitest --typecheck`. - `cd packages/account-core && tsc --noEmit` — clean - `pnpm typecheck` — passing; verified the type pins bite by injecting a spurious enum member and watching `expectTypeOf` fail with TS2344 - `pnpm lint`, `pnpm format`, `pnpm knip` — passing - `fallow audit --changed-since origin/main` — no issues in the 13 changed files ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | open (Comfy-Org#17783, carries slice 2a) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | merged (Comfy-Org#17851) — this PR sits on it | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | merged (Comfy-Org#17798) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | merged (Comfy-Org#17798) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | merged (Comfy-Org#17798) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (Comfy-Org#17827, Comfy-Org#17844) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | merged (Comfy-Org#17798) | | 7 | Publish readiness: dist build, files allowlist, pack smoke test | FE-2218 | merged (Comfy-Org#17882) | | 7 | Package release workflows + versioning ADR | FE-2218 | open (Comfy-Org#17881) | | 7 | First publish (`private` off), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | **this PR** | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | open (Comfy-Org#17856, Comfy-Org#17860) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | merged (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | merged (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | open (Comfy-Org#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style P6C stroke:#0366d6,stroke-width:4px ```
…ced by the server (Comfy-Org#17856) Stacked on Comfy-Org#17853 (base branch `jaewon/fe-2216-subscription-rail`), which stacks on Comfy-Org#17783; merge those first. ## Why Slice 2a (Comfy-Org#17853) put cancel, resubscribe and the payment portal on the SDK rail. Subscribe — new subscriptions and plan changes — was left on the legacy call because the SDK's `subscribe` refused an active subscription on the client (`active → ALREADY_HELD`) and routed a scheduled cancel to `resubscribe()`, which carries no plan. Both contradict what the host already does: `useWorkspaceBilling.subscribe` posts `/billing/subscribe` whatever the subscription state, `useSubscriptionCheckout` quotes the change first with `previewSubscribe`, and the server prices the change, reactivates or refuses (`REACTIVATION_CONFIRMATION_REQUIRED` exists for exactly that). Decision (2026-09-16): mirror the host; no product change. ## How - **Core.** `subscribe()` issues `POST /billing/subscribe` for every subscription state and never short-circuits; the client-side eligibility switch, `eligibilityOf` and its type are gone (nothing else read them). `resubscribe()` stays the explicit "resume" command. `docs/billing-command-eligibility.md` (the path the module doc already referenced) now records the route per command and that the status read decides nothing for subscribe. - **Core, quote decoding.** The generated zod for the preview coerces every int64 to `bigint` while the generated TS type for the same fields is `number`, so the SDK's quote was not assignable to the host's `PreviewSubscribeResponse`. The cents fields are decoded as `z.number()` via `.extend` on the generated schemas (the precedent `capabilities.ts` sets for `revision`; money on this route is bounded to cents well inside the safe range). The two types are now structurally identical and `pnpm typecheck` proves the assignment with no hand-written projection. - **Host.** On the rail (read once per action, as in 2a) `useWorkspaceBilling.subscribe` maps `SubscribeOptions → SubscribeInput` field for field (`confirmationToken` / `savedPaymentMethodId` empty → dropped, as the workspace client does; nothing dropped otherwise) and runs `sdk.commands.subscribe`; `previewSubscribe` runs `sdk.commands.previewSubscribe`. Both share 2a's route latch (404 → legacy once), and every other failure is thrown as a `WorkspaceApiError` whose `.code` carries the server code verbatim, so `useSubscriptionCheckout` and `useDowngradeToPersonal` keep branching on `REACTIVATION_CONFIRMATION_REQUIRED`, `SUBSCRIPTION_PAYMENT_REQUIRED`, `OUTSTANDING_PAYMENT_REQUIRED`, `TRANSITION_NOT_ALLOWED`, `PRORATION_QUOTE_EXPIRED`, `SUBSCRIPTION_QUOTE_STALE` unchanged. - **Customer steps.** The SDK settles the operation inside `subscribe()`, so nothing else watches it: the store's lifecycle subscriber now handles non-topup pending states — the existing in-page challenge driver, and a once-per-operation `window.open(actionUrl)` with the same popup-blocked toast the checkout shows. Without both, a 3DS plan change or a `needs_payment_method` answer would time out with nothing on screen. - **Settled response.** A settled subscribe projects to the `{ billing_op_id, status: 'subscribed' }` body `handleSubscribeResponse` already handles; `needs_payment_method` / `pending_payment` never reach the host because the lifecycle drove them first. - Not on the rail: `teamSubscriptionCheckoutUtil.ts` calls `workspaceApi.subscribe` directly and stays legacy on both rails; `savePendingSubscriptionCheckout` and checkout-journey `billing_op_id` linking run after settlement rather than at issue, because the SDK does not surface the issued operation (recovery across reloads is the lifecycle's `recover()`). ## AS-IS / TO-BE Same journey on both: `?pricing=creator&cycle=yearly` against an active `standard-annual` subscription on the `stripe` rail, 1280×800, every endpoint mocked. | State | AS-IS — `billing_sdk_subscription_enabled: false` | TO-BE — `billing_sdk_subscription_enabled: true` | | --- | --- | --- | | "Confirm your upgrade" with the quote | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/as-is-confirm-upgrade.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/to-be-confirm-upgrade.png"> | | "You're all set" after confirming | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/as-is-all-set.png"> | <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/to-be-all-set.png"> | | Recorded `subscribe` request (quote above it carries no key on either rail) | no `Idempotency-Key` <br> <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/as-is-subscribe-headers.png"> | `Idempotency-Key` present and echoed as `idempotency_key` <br> <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/to-be-subscribe-headers.png"> | | `POST /billing/subscribe` answers 404 | one POST, the click fails ("Request failed with status code 404") <br> <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/as-is-404-fallback.png"> | two POSTs from one click — first with the key → 404, second without → 200, "You're all set" <br> <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/to-be-404-fallback.png"> | | Server answers `REACTIVATION_CONFIRMATION_REQUIRED` | re-quotes, shows the reactivation panel and the coded toast <br> <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/as-is-reactivation-required.png"> | identical panel, toast and CTA on the rail <br> <img width="480" src="https://raw.githubusercontent.com/Comfy-Org/ComfyUI_frontend/assets/pr-17856-screenshots/screenshots/to-be-reactivation-required.png"> | - AS-IS (flag off): quote and subscribe go through the workspace API; a 3DS or payment-method step is driven by the checkout composable off the raw response. - TO-BE (flag on): the same screens and copy; quote and subscribe go through the SDK transport (`Idempotency-Key` on the subscribe POST), settlement through the operation lifecycle; a 404 falls back to the legacy call. ## Testing | Gate | Result | | --- | --- | | `packages/account` vitest | 39 files, 634 tests (new: active plan change issues the request; canceled carries `plan_slug` + `confirm_reactivation`; `REACTIVATION_CONFIRMATION_REQUIRED` surfaces coded) | | host vitest (billing sdk, composables/billing, workspace composables + stores, feature flags) | 41 files, 1151 tests | | `pnpm typecheck`, `typecheck:browser`, `lint`, `format`, `knip` | exit 0 | | `fallow audit --changed-since origin/jaewon/fe-2216-subscription-rail` | no issues in 10 changed files, complexity 0, duplication 0 | | Playwright cloud: `planChangeSdkRail.spec.ts` (3) + `cancelSubscriptionSdkRail.spec.ts` (3) | `6 passed (11.5s)` — `PLAYWRIGHT_TEST_URL=http://localhost:5173 pnpm exec playwright test --project=cloud browser_tests/tests/dialogs/planChangeSdkRail.spec.ts browser_tests/tests/dialogs/cancelSubscriptionSdkRail.spec.ts --reporter=list` against a `pnpm dev:cloud` vite server, all endpoints mocked | ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | Comfy-Org#17783 (review) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | Comfy-Org#17851 (review) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | merged (Comfy-Org#17798) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | merged (Comfy-Org#17798) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | merged (Comfy-Org#17798) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (Comfy-Org#17827, Comfy-Org#17844) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | merged (Comfy-Org#17798) | | 7 | npm publish (`ingest-types`, `account-core`, `billing-contract`), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | Comfy-Org#17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2a | Cancel, resubscribe and payment portal through the SDK behind `billing_sdk_subscription_enabled` | FE-2216 | Comfy-Org#17853 (review; parent of this PR) | | 5 slice 2b | Subscribe and plan change through the SDK: quote, then subscribe; the SDK never short-circuits on the client | FE-2216 | **this PR** | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | merged (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | merged (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | merged (Comfy-Org#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2A["PR 17853 slice 2a cancel / resubscribe / portal rail"] S2B["Phase 5 slice 2b subscribe + plan change"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2B HD --> S2A S2A --> S2B P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style BWV fill:#d4edda,stroke:#155724 style BWS fill:#d4edda,stroke:#155724 style P8 fill:#d4edda,stroke:#155724 style P8RD fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style S2B stroke:#0366d6,stroke-width:4px ```
…Rs, with the versioning ADR (Comfy-Org#17881) ## Why `@comfyorg/account-core`, `@comfyorg/billing-contract` and `@comfyorg/ingest-types` are about to be installed by Platform from the public registry, and the plan had nothing on how their versions are cut. The monorepo already releases one package (`@comfyorg/design-system`) through a version-bump PR that publishes on merge; the decision (2026-09-16) is to follow that pattern for the SDK packages, generalized over a package input rather than copied, and to defer Changesets with the revisit conditions written down. ## How - `version-bump-package.yaml` — `workflow_dispatch` with `package` (account-core / billing-contract / ingest-types), `version_type`, `pre_release`; bumps on `main` and opens a `Release`-labelled PR titled `<package> <version>` (same pinned `create-pull-request` action as the design-system workflow). - `publish-package.yaml` — reusable (`workflow_dispatch` + `workflow_call`): name/version match, an explicit failure while `"private": true`, `build` and `smoke:pack` via `--if-present` (works before and after the publish-readiness PR lands), `npm view` skip on an existing version, `pnpm publish --access public --tag … --provenance` under `id-token: write`. - `publish-package-on-merge.yaml` — on a merged `Release` PR touching one of the three manifests, publishes every package whose `version` changed against the first parent (matrix), posts the release-links comment per package and the Slack notice. - `.github/actions/comment-release-links` — three additive cases so each package's summary has its own section. - `packages/{account-core,billing-contract,ingest-types}/package.json` — `"private": true` removed. Comfy-Org#17882 is merged and its smoke test proves the three tarballs install from plain Node, so the latch comes off here, in the same reviewed PR as the machinery that checks it. Nothing publishes on this merge: the on-merge job needs a `Release` label and a version change, and neither is present. - `docs/adr/RELEASES-PACKAGES-0033-sdk-packages-release-through-version-bump-prs.md` (+ index): context, the decision and each workflow's rationale, the versioning policy (`1.0.0-alpha.N` on `next` until the Phase 7 host proof, then `1.0.0`; generated-contract additions minor, removals major, decided on the regeneration PR), alternatives (Changesets, release-please, semantic-release, per-package copies) and the explicit "when to revisit Changesets" list. Written against the post-rename names (`packages/account-core`); the on-merge path filter matches once Comfy-Org#17851 lands. Design-system workflows are untouched. Not in this PR, on purpose: the `ingest-types` regeneration bump — the generator lives in Comfy-Org/cloud; the one-step change needed there is recorded in the ADR's follow-ups. **Snapshot publishing is not in this PR.** A `pull_request` run executes the workflow definition from the pull request's own merge ref, so a publish step triggered that way is PR-authored code holding `NPM_TOKEN`, and on `main` today no `pull_request` workflow reaches that secret. It returns in its own PR, publishing from a `workflow_run` job that runs the default branch's definition over an artifact the pull-request job produces. ## AS-IS / TO-BE No UI change; CI and docs only. - AS-IS: only `@comfyorg/design-system` has a release path; the SDK packages have no bump, no publish, no policy. - TO-BE: one dispatch bumps any of the three, the merged `Release` PR publishes with provenance, and the ADR records why Changesets waits and what the snapshot follow-up has to satisfy. ## Testing | Check | Result | | --- | --- | | `actionlint` on the four workflows | 0 findings | | `zizmor --min-severity medium` | clean apart from the repo-exempt `actions/checkout@v7` / `setup-node@v6` pins (`.pinact.yaml`); workflow-level `permissions: contents: read` added after its finding | | `yamllint` (as `ci-yaml-validation.yaml` runs it) | clean | | `pnpm adr:check`, `pnpm lint`, `pnpm format:check`, `pnpm knip` | exit 0 | After the second review round (860ef8a, 8f7972f, 41793c7): `publish-package.yaml` rejects a prerelease on `latest` and reports whether it published or skipped, and `version-bump-package.yaml` holds `account-core` and `billing-contract` on the `1.0.0-alpha.N` line, since `patch`, `minor` and `major` all turn `1.0.0-alpha.0` into `1.0.0`. The hardening that round added to the snapshot workflow left with it in 25b09c3. After the first review round (23b854e, 5985af7): the manual publish no longer takes a caller-supplied `ref` (it publishes the ref it was dispatched on), and the ADR scopes the prerelease-first gate to the hand-written packages, putting `ingest-types` outside it. The Slack notice posts to `#proj-billing` (`C0BNGQG2LCW`), not the design-system channel. Open points for review: `--provenance` is new relative to the design-system publish and is confirmed on the first real run; Follow-ups, not in this PR: a protected `environment` with required reviewers and an environment-scoped `NPM_TOKEN` on the publish job (repo configuration), and the same `ref` removal on `publish-design-system.yaml`. ## Where this sits in the plan Billing SDK track FE-2210 ([implementation plan V2](https://app.notion.com/p/3d86d73d36508152b92cdbdfdfe83ac8)). Hybrid model: top-up in-app, subscription management / invoices / payment methods on the hosted billing app. | Phase | Item | Ticket | Status | | --- | --- | --- | --- | | 1-2 | Session core, transport, readers | FE-2211/2212/2213 | merged | | 3 | Operation lifecycle, commands, eight-state projection | FE-2227/2214/2223 | merged (Comfy-Org#17655) | | 4 | `@comfyorg/account-ui` composables + `CheckoutSteps` | FE-2215 | merged (Comfy-Org#17662, Comfy-Org#17663) | | 5 slice 1 | Top-up through the SDK behind `billing_sdk_topup_enabled` | FE-2216 | merged (Comfy-Org#17665) | | rollout C | `hosted_billing_destination` server flag read by the host | FE-2218 | merged (Comfy-Org#17716) | | rollout C | `hostedDestination` port on the lifecycle, value on operation state | FE-2210/2218 | Comfy-Org#17783 (review, carries slice 2a) | | 7 prep | Scope-source port + credentialed transport (BFF / cookie hosts) | FE-2218 | merged (Comfy-Org#17782) | | 7 prep | `@comfyorg/account` → `@comfyorg/account-core` rename | FE-2218 | Comfy-Org#17851 (queued) | | 7 prep | `billing-contract` route builder + `return_to` registry | FE-2218 | merged (Comfy-Org#17795) | | 3A-3 | Workshop adapter over `createHostedTopupCheckout` | FE-2214 | merged (Comfy-Org#17793) | | 8 core | `previewSubscribe` command | FE-2331 | merged (Comfy-Org#17797) | | 8 core | Plans + saved payment-methods readers | FE-2331 | merged (Comfy-Org#17798) | | 8 ui | account-ui composables (`usePlans`, `usePaymentMethods`, `usePreviewSubscribe`) | FE-2331 | merged (Comfy-Org#17798) | | 7 | billing-web own-origin session, sign-in, SDK composition | FE-2218 | merged (Comfy-Org#17798) | | 7 | billing-web unit tests in CI (`ci-billing-web-unit.yaml`) | FE-2218 | merged (Comfy-Org#17827, Comfy-Org#17844) | | 7 | ingest CORS + top-up return hosts for billing.comfy.org and its previews (Comfy-Org/cloud) | FE-2218 | merged (Comfy-Org/cloud#9512) | | 8 ui | billing-web `/v1` entry routing + subscription / payment-method surfaces | FE-2331 | merged (Comfy-Org#17798) | | 7 | Package release workflows + versioning ADR (bump dispatch → publish on merge) | FE-2218 | **this PR** | | 7 | Pre-merge snapshots from a default-branch `workflow_run` job | FE-2218 | todo (split out of this PR) | | 7 | Publish readiness: dist build, files allowlist, pack smoke test, private-utility cut | FE-2218 | merged (Comfy-Org#17882) | | 7 | `private` off on the three manifests | FE-2218 | **this PR** | | 7 | First publish (bump PRs: ingest-types, then billing-contract, account-core), Platform install, billing-web live top-up | FE-2218 | todo | | 6 | Contract tests per generated schema (package layer) | FE-2217 | Comfy-Org#17829 (review) | | 6 | Live E2E per flow × consumer + evidence table | FE-2217 | todo (needs staging flags) | | 5 slice 2 | Subscription flows through the SDK | FE-2216 | Comfy-Org#17856 / Comfy-Org#17860 (review) | | follow-up | One `needsCustomerAttention` predicate (from the Comfy-Org#17665 review) | FE-2216 | merged (Comfy-Org#17792) | | follow-up | Opaque `BillingServerCode` (from the Comfy-Org#17656 review) | FE-2227 | merged (Comfy-Org#17794) | | follow-up | `useCredits` clears on `SUPERSEDED` (from the Comfy-Org#17799 review) | FE-2215 | merged (Comfy-Org#17824) | | follow-up | credits / status / capabilities readers fence a late failure as `SUPERSEDED` (from the Comfy-Org#17798 review) | FE-2331 | merged (Comfy-Org#17828) | ```mermaid flowchart LR P3["Phase 3 core lifecycle (merged)"] P4["Phase 4 account-ui (merged)"] P5["Phase 5 slice 1 top-up flag (merged)"] FC["PR 17716 hosted_billing_destination flag (merged)"] HD["PR 17783 hostedDestination port"] SS["PR 17782 scope-source port + credentialed transport"] RN["account-core rename"] RB["billing-contract route builder + return_to"] WS["Workshop adapter"] P8PV["previewSubscribe command"] P8RD["plans + payment-methods readers"] P8["account-ui hosted composables"] BWS["billing-web session + sign-in"] BWV["billing-web /v1 surfaces"] CORS["cloud PR 9512 ingest CORS + return hosts"] RW["release workflows + ADR"] PUB["npm publish account-core / billing-contract"] P7["Phase 7 host proof: Platform + billing-web live"] P6C["Phase 6 contract tests"] P6["Phase 6 live evidence"] S2["Phase 5 slice 2 subscription"] FU9["customer-attention predicate"] FU11["opaque BillingServerCode"] FU12["useCredits clears on SUPERSEDED"] FU13["reader late-failure fence"] P3 --> HD FC --> HD HD --> RB P3 --> SS SS --> P7 RB --> P7 P3 --> RN RN --> PUB RW --> PUB RB --> PUB PUB --> P7 P3 --> P8PV P3 --> P8RD P8PV --> P8 P8RD --> P8 P4 --> P8 P8 --> S2 P8 --> BWS BWS --> BWV RB --> BWV BWV --> P7 CORS --> P7 P5 --> P6 P3 --> P6C P5 --> WS P5 --> FU9 P3 --> FU11 P4 --> FU12 P3 --> FU13 style P3 fill:#d4edda,stroke:#155724 style P4 fill:#d4edda,stroke:#155724 style P5 fill:#d4edda,stroke:#155724 style FC fill:#d4edda,stroke:#155724 style SS fill:#d4edda,stroke:#155724 style RB fill:#d4edda,stroke:#155724 style WS fill:#d4edda,stroke:#155724 style FU9 fill:#d4edda,stroke:#155724 style BWV fill:#d4edda,stroke:#155724 style BWS fill:#d4edda,stroke:#155724 style P8 fill:#d4edda,stroke:#155724 style P8RD fill:#d4edda,stroke:#155724 style CORS fill:#d4edda,stroke:#155724 style FU13 fill:#d4edda,stroke:#155724 style FU12 fill:#d4edda,stroke:#155724 style FU11 fill:#d4edda,stroke:#155724 style P8PV fill:#d4edda,stroke:#155724 style RW stroke:#0366d6,stroke-width:4px ```
Why
Stacked on #17655 (FE-2227); merge after it. The two Phase 3 command PRs — top-up (FE-2214) and subscription (FE-2223) — both need to act on the server's coded error (
NO_PAYMENT_METHOD,ALREADY_CANCELED, …) and both need to drive an embedded 3DS challenge through the lifecycle. FE-2223 may not depend on FE-2214, so the shared pieces land here, on the core, and each command PR stacks on this one.How
BillingFailure.serverCode(additive, optional):readValidatedBillingResponsedecodes a non-2xx body with the generatedzErrorResponseand carries only itscode. Themessageis read by the schema and dropped inbillingErrorBody.ts, so server text still cannot travel into the SDK. The codes arez.string()in the generated contract, so each command owns a closed allowlist of the codes it acts on.driveEmbeddedChallenge(lifecycle, operationId, port):reportChallengeStarted→port.handleNextAction(clientSecret)→reportChallengeSettled. The port is Stripe'shandleNextActionshape; no provider SDK is imported in core, the host injects the object. The unmoved-intent denylist (requires_payment_method | requires_action | canceled→ failed) is ported frombillingOperationStore.runPaymentIntentActionon this repo'smain(src/platform/workspace/stores/billingOperationStore.ts:51-55,:555; landed ina39b1ce9fa3, 2026-09-03 — it is not incf-main), and fails toward the server: an unknown status reports completed and the next poll corrects it.AS-IS / TO-BE
AS-IS: a command sees only
REQUEST_FAILED+httpStatusfor a 4xx and cannot tell "no payment method" from "declined"; each command PR would re-implement the 3DS drive overreportChallenge*.TO-BE:
result.serverCode === 'NO_PAYMENT_METHOD'is one comparison; the challenge drive is one call. No UI surface, so no screenshots.Testing
packages/account473/473. Named tests: coded error carried without its message; non-contract error body yields no code; moved intent → completed; error / unmoved intent / throw → failed; nothing driven without a required embedded challenge.Stack (2026-09-14)
Merge top-down. After a parent is squash-merged, rebase each child with
git rebase --onto origin/main <parent tip>and force-push; GitHub retargets the base. Solid edges are code dependencies, dashed edges are sequencing.