Repository navigation
fix(types): drop duplicate CurrentWorkspaceResponse from ingest types - #16085
Conversation
Two backports each added CurrentWorkspaceResponse to the generated ingest-types package. #15953 introduced it; #15939 regenerated the package and added it a second time. Git merged both cleanly, so cloud/1.52 has carried a duplicate identifier since 15939 landed and no longer typechecks. Restores both files to the generator output already on main.
|
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: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
🌐 Website E2ECaution Some tests failed.
Warning 2 non-screenshot failures — these require manual review. 🎨 Storybook: ✅ Built — View Storybook🎭 Playwright: ✅ 1983 passed, 0 failed · 2 flaky📊 Browser Reports
📦 Bundle Size
⚡ Performance Report
Absolute values
Raw data{
"timestamp": "2026-08-27T03:35:35.179Z",
"gitSha": "bd12baf6ab53161144f57e0be1be2c9fc85c3d50",
"branch": "fix-ingest-types-dup",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2055.078999999978,
"styleRecalcs": 9,
"styleRecalcDurationMs": 8.308000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 545.945,
"heapDeltaBytes": 832740,
"heapUsedBytes": 62975772,
"domNodes": -281,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 8.287,
"eventListeners": -181,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-idle",
"durationMs": 2015.7489999999143,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.226000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 482.49800000000005,
"heapDeltaBytes": -155988,
"heapUsedBytes": 62109788,
"domNodes": -282,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 6.322000000000001,
"eventListeners": -181,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 2037.3799999999846,
"styleRecalcs": 74,
"styleRecalcDurationMs": 38.055,
"layouts": 12,
"layoutDurationMs": 3.5590000000000006,
"taskDurationMs": 948.9130000000001,
"heapDeltaBytes": 20109416,
"heapUsedBytes": 82006884,
"domNodes": -284,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 115.40799999999999,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1806.308999999942,
"styleRecalcs": 73,
"styleRecalcDurationMs": 33.09,
"layouts": 12,
"layoutDurationMs": 3.604,
"taskDurationMs": 836.8059999999999,
"heapDeltaBytes": -6761032,
"heapUsedBytes": 56237908,
"domNodes": -280,
"jsHeapTotalBytes": 4972544,
"scriptDurationMs": 106.298,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1682.4630000000411,
"styleRecalcs": 31,
"styleRecalcDurationMs": 15.703000000000001,
"layouts": 6,
"layoutDurationMs": 0.503,
"taskDurationMs": 341.068,
"heapDeltaBytes": 3240240,
"heapUsedBytes": 66325592,
"domNodes": 76,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 8.347999999999999,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1724.7029999999768,
"styleRecalcs": 31,
"styleRecalcDurationMs": 15.190999999999999,
"layouts": 6,
"layoutDurationMs": 0.5790000000000001,
"taskDurationMs": 347.63899999999995,
"heapDeltaBytes": 3031572,
"heapUsedBytes": 65792724,
"domNodes": 75,
"jsHeapTotalBytes": 4456448,
"scriptDurationMs": 8.307,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-clipping",
"durationMs": 579.3209999999931,
"styleRecalcs": 12,
"styleRecalcDurationMs": 8.166999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 349.815,
"heapDeltaBytes": 10995340,
"heapUsedBytes": 73468140,
"domNodes": 20,
"jsHeapTotalBytes": 4980736,
"scriptDurationMs": 53.60399999999999,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "dom-widget-clipping",
"durationMs": 568.9609999999448,
"styleRecalcs": 11,
"styleRecalcDurationMs": 6.612000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 346.56399999999996,
"heapDeltaBytes": 10774940,
"heapUsedBytes": 73807116,
"domNodes": 18,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 53.9,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-idle",
"durationMs": 2040.3009999999995,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.972999999999997,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 603.553,
"heapDeltaBytes": -12152668,
"heapUsedBytes": 64118444,
"domNodes": -281,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 14.150000000000002,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-idle",
"durationMs": 2058.8089999999966,
"styleRecalcs": 10,
"styleRecalcDurationMs": 9.586,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 617.4139999999999,
"heapDeltaBytes": -3582904,
"heapUsedBytes": 73904616,
"domNodes": -272,
"jsHeapTotalBytes": -1843200,
"scriptDurationMs": 13.952999999999996,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-pan",
"durationMs": 2182.1620000000053,
"styleRecalcs": 70,
"styleRecalcDurationMs": 15.971999999999996,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1177.804,
"heapDeltaBytes": -5544292,
"heapUsedBytes": 72456968,
"domNodes": -275,
"jsHeapTotalBytes": -45056,
"scriptDurationMs": 337.23600000000005,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-pan",
"durationMs": 2187.196999999969,
"styleRecalcs": 69,
"styleRecalcDurationMs": 14.373000000000005,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1191.2589999999998,
"heapDeltaBytes": -5935240,
"heapUsedBytes": 72114712,
"domNodes": -275,
"jsHeapTotalBytes": -307200,
"scriptDurationMs": 337.09299999999996,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3182.169999999985,
"styleRecalcs": 66,
"styleRecalcDurationMs": 15.585,
"layouts": 60,
"layoutDurationMs": 7.248,
"taskDurationMs": 1388.371,
"heapDeltaBytes": -10860312,
"heapUsedBytes": 67924276,
"domNodes": -287,
"jsHeapTotalBytes": 6545408,
"scriptDurationMs": 410.78999999999996,
"eventListeners": -155,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3130.5019999999786,
"styleRecalcs": 65,
"styleRecalcDurationMs": 13.822000000000001,
"layouts": 60,
"layoutDurationMs": 7.268000000000001,
"taskDurationMs": 1355.0469999999998,
"heapDeltaBytes": -14003772,
"heapUsedBytes": 65199000,
"domNodes": -287,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 391.356,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2180.4860000000303,
"styleRecalcs": 45,
"styleRecalcDurationMs": 9.153999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1375.8089999999997,
"heapDeltaBytes": 12008892,
"heapUsedBytes": 97388964,
"domNodes": 10,
"jsHeapTotalBytes": 9105408,
"scriptDurationMs": 453.348,
"eventListeners": 186,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2137.7080000000888,
"styleRecalcs": 45,
"styleRecalcDurationMs": 8.756,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1391.206,
"heapDeltaBytes": -14310828,
"heapUsedBytes": 70398664,
"domNodes": 10,
"jsHeapTotalBytes": 6852608,
"scriptDurationMs": 455.221,
"eventListeners": 184,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "minimap-idle",
"durationMs": 2045.754000000045,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.451,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 598.835,
"heapDeltaBytes": -10666020,
"heapUsedBytes": 72938084,
"domNodes": -280,
"jsHeapTotalBytes": 3923968,
"scriptDurationMs": 13.752999999999998,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "minimap-idle",
"durationMs": 2044.3740000000616,
"styleRecalcs": 7,
"styleRecalcDurationMs": 5.568,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 580.0490000000001,
"heapDeltaBytes": -11793852,
"heapUsedBytes": 71838292,
"domNodes": -282,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 12.34,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 572.6160000000391,
"styleRecalcs": 46,
"styleRecalcDurationMs": 9.299999999999997,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 376.985,
"heapDeltaBytes": 11755756,
"heapUsedBytes": 74962056,
"domNodes": 18,
"jsHeapTotalBytes": 4980736,
"scriptDurationMs": 113.21400000000001,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 578.6930000000439,
"styleRecalcs": 46,
"styleRecalcDurationMs": 9.637,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 375.42999999999995,
"heapDeltaBytes": 11869552,
"heapUsedBytes": 74893564,
"domNodes": 18,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 114.773,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2007.6350000000502,
"styleRecalcs": 10,
"styleRecalcDurationMs": 8.372,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 472.904,
"heapDeltaBytes": 18147008,
"heapUsedBytes": 80713976,
"domNodes": -279,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 5.568,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 1998.2760000000326,
"styleRecalcs": 10,
"styleRecalcDurationMs": 8.765,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 474.4200000000001,
"heapDeltaBytes": -6565936,
"heapUsedBytes": 55964628,
"domNodes": -282,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 5.889999999999998,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1722.59200000002,
"styleRecalcs": 75,
"styleRecalcDurationMs": 33.401,
"layouts": 16,
"layoutDurationMs": 3.999,
"taskDurationMs": 785.342,
"heapDeltaBytes": 2512508,
"heapUsedBytes": 65561820,
"domNodes": -281,
"jsHeapTotalBytes": 6021120,
"scriptDurationMs": 85.264,
"eventListeners": -183,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1737.8130000000738,
"styleRecalcs": 76,
"styleRecalcDurationMs": 34.811,
"layouts": 16,
"layoutDurationMs": 3.838,
"taskDurationMs": 774.5340000000001,
"heapDeltaBytes": 13917292,
"heapUsedBytes": 76738780,
"domNodes": -281,
"jsHeapTotalBytes": 5234688,
"scriptDurationMs": 82.419,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "subgraph-transition-enter",
"durationMs": 1399.6400000000904,
"styleRecalcs": 20,
"styleRecalcDurationMs": 31.262000000000004,
"layouts": 15,
"layoutDurationMs": 14.155000000000001,
"taskDurationMs": 881.3220000000001,
"heapDeltaBytes": -6130328,
"heapUsedBytes": 88607264,
"domNodes": 13673,
"jsHeapTotalBytes": 12845056,
"scriptDurationMs": 15.876999999999995,
"eventListeners": 2375,
"totalBlockingTimeMs": 139,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8220.687999999995,
"styleRecalcs": 251,
"styleRecalcDurationMs": 37.339999999999996,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4070.341,
"heapDeltaBytes": 3078956,
"heapUsedBytes": 80031540,
"domNodes": -271,
"jsHeapTotalBytes": -45056,
"scriptDurationMs": 1029.992,
"eventListeners": -135,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.80000000000109
},
{
"name": "viewport-pan-sweep",
"durationMs": 8277.899999999932,
"styleRecalcs": 252,
"styleRecalcDurationMs": 37.431,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4028.645,
"heapDeltaBytes": 3182508,
"heapUsedBytes": 80327444,
"domNodes": -270,
"jsHeapTotalBytes": -45056,
"scriptDurationMs": 1031.191,
"eventListeners": -133,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 16748.38600000004,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 16044.342,
"heapDeltaBytes": -31387620,
"heapUsedBytes": 181068036,
"domNodes": -8312,
"jsHeapTotalBytes": -15818752,
"scriptDurationMs": 109.058,
"eventListeners": -16389,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.780000000000047,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 16635.063999999944,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 15606.616,
"heapDeltaBytes": -44885044,
"heapUsedBytes": 180662524,
"domNodes": -8312,
"jsHeapTotalBytes": -18391040,
"scriptDurationMs": 102.89899999999999,
"eventListeners": -16395,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.223333333333358,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 20639.178000000073,
"styleRecalcs": 171,
"styleRecalcDurationMs": 16.61499999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 20035.08,
"heapDeltaBytes": -32000812,
"heapUsedBytes": 193103828,
"domNodes": -8312,
"jsHeapTotalBytes": -17149952,
"scriptDurationMs": 397.331,
"eventListeners": -16389,
"totalBlockingTimeMs": 93,
"frameDurationMs": 17.776666666666763,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 19985.20300000007,
"styleRecalcs": 172,
"styleRecalcDurationMs": 16.367999999999995,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 19527.299,
"heapDeltaBytes": -39560632,
"heapUsedBytes": 186284024,
"domNodes": -8312,
"jsHeapTotalBytes": -19513344,
"scriptDurationMs": 396.77099999999996,
"eventListeners": -16387,
"totalBlockingTimeMs": 18,
"frameDurationMs": 17.780000000000047,
"p95FrameDurationMs": 16.80000000000291
},
{
"name": "workflow-execution",
"durationMs": 110.13300000001891,
"styleRecalcs": 9,
"styleRecalcDurationMs": 15.231000000000002,
"layouts": 2,
"layoutDurationMs": 0.9579999999999999,
"taskDurationMs": 80.13199999999998,
"heapDeltaBytes": 3233984,
"heapUsedBytes": 65749420,
"domNodes": 114,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 5.929999999999998,
"eventListeners": 49,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "workflow-execution",
"durationMs": 472.1509999999398,
"styleRecalcs": 18,
"styleRecalcDurationMs": 21.726999999999997,
"layouts": 3,
"layoutDurationMs": 1.3880000000000001,
"taskDurationMs": 108.69199999999998,
"heapDeltaBytes": 5117876,
"heapUsedBytes": 67669912,
"domNodes": 143,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 7.463999999999999,
"eventListeners": 99,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
}
]
} |
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## cloud/1.52 #16085 +/- ##
=============================================
Coverage ? 79.58%
=============================================
Files ? 2240
Lines ? 114659
Branches ? 31730
=============================================
Hits ? 91246
Misses ? 22932
Partials ? 481
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
Diagnosis of the one remaining red (
It surfaced here rather than on #16084 or #16059 because Nothing to change here — this PR touches only The two fixes are mutually blocked: this PR is red on #16086's breakage, #16086 is red on this one's. They are independent, so either can merge first; the second then just needs its branch updated to go green. Full order once both land: #16085 + #16086 → #16084 → #16059. |
## Summary Prevent release branches from accepting merge-skew type failures without ownership. ## Changes - run the application typecheck in the shared PR, merge-queue, and post-merge verification path - alert `#frontend-releases` when that check fails after a release-branch push - document that ingest types must be generated from the Cloud contract, never hand-written during backports ## Review Focus The alert is limited to failed push runs on `cloud/**` and `core/**`; PR and merge-queue failures do not notify Slack. ## Verification - `pnpm typecheck` - oxfmt check on changed files - actionlint on the new workflow Related: Comfy-Org#16085
## Summary Prevent release branches from accepting merge-skew type failures without ownership. ## Changes - run the application typecheck in the shared PR, merge-queue, and post-merge verification path - alert `#frontend-releases` when that check fails after a release-branch push - document that ingest types must be generated from the Cloud contract, never hand-written during backports ## Review Focus The alert is limited to failed push runs on `cloud/**` and `core/**`; PR and merge-queue failures do not notify Slack. ## Verification - `pnpm typecheck` - oxfmt check on changed files - actionlint on the new workflow Related: #16085
cloud/1.52does not typecheck. Every PR opened against it is red on a diff it does not own.Confirmed blocked: #16080 and #16084 are both red solely on this.
Root cause
A semantic conflict between two backports — clean for git, broken for TypeScript.
CurrentWorkspaceResponsedeclarations afterc143e62b5d9e00f921ingest-typesregeneration#15953 introduced the type. #15939 regenerated the package from the cloud OpenAPI spec and added it again. Neither touched the same lines, so git reported no conflict and the duplicate landed silently.
CI did not catch it because #15939's checks last ran 8/25 23:33 — roughly 24 hours before it merged, and before #15953 was on the branch. It was green against a merge ref that no longer described reality.
The second block also swallowed the JSDoc belonging to
CreateWorkspaceRequest, leaving that type undocumented:In
index.tsthe stray re-export is visible as a break in the otherwise alphabetical list (CreateWorkspaceResponse, CurrentWorkspaceResponse, CreateWorkspaceResponses).Changes
Pure deletion, 15 lines, no additions:
types.gen.ts— remove the duplicatedCurrentWorkspaceResponseblock; theRequest body for creating a new workspace.JSDoc returns toCreateWorkspaceRequestindex.ts— remove the duplicated re-exportBoth files are generated, so the target was not a judgement call: both edited regions are now byte-identical to
main, which carries exactly one declaration. This restores the generator's real output rather than hand-authoring it. Re-runningpnpm --filter @comfyorg/ingest-types generateagainst the spec is the alternative and should produce the same result — happy to swap to that if the team prefers a regeneration commit, though it would pull in unrelated spec drift on a release branch.Verification
tscon the package, before and after:Also verified
CurrentWorkspaceResponseis the only duplicated identifier in either file, so this is the whole breakage and not the first of several.Follow-ups (not in this PR)
cloud/*, or re-running checks on merge, would close it.pr-backport.yamldiscards partial success. Separately, one failing target aborts the whole step, so succeeding targets never get a PR and their pushed branches are deleted in cleanup. That is why fix(billing): gate subscribe-to-run only on Cloud #16032 never reachedcloud/1.52and why [backport cloud/1.52] fix(billing): gate subscribe-to-run only on Cloud #16084 had to be made by hand.Merge order
This → #16084 (backport of #16032, Run silently does nothing on Local at 0 credits) → #16059 (its E2E regression test).