Repository navigation
ci(backport): flag likely stacking conflicts in the failure comment - #14681
christian-byrne wants to merge 1 commit into
Conversation
The backport workflow cherry-picks each labelled PR onto the release branch independently. A *stack* of PRs therefore conflicts at every level above the first until the PR below it has actually merged into the target branch — the conflict is an artifact of picking each commit in isolation, not a real incompatibility between the changes. Confirmed on #14142-#14145 -> core/1.49: cherry-picking #14144 alone onto the release branch conflicts in six files, while cherry-picking all four in stack order applies cleanly with zero conflicts. Today that surfaces as a bare "⚠️ Backport failed / merge conflicts" comment, which reads as though the changes genuinely collide and sends the author off to resolve conflicts by hand. When other backport PRs are still open against the same target, note that the failure is probably a stacking artifact and point at the actual remedy: wait for the lower PR to merge, then remove and re-add the `needs-backport` label to re-fire the workflow. This does not make the workflow stack-aware — see #14679 for that. It only stops the failure comment from being misleading. The lookup is best-effort and can never fail the step or block the existing comment. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
📄 Knowledge reviewDosu skipped reviewing this PR because your organization has used its |
|
Warning Review limit reachedYou’ve reached a temporary PR review limit under our Fair Usage Limits Policy. Next review available in: 22 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
Comment |
🎭 Playwright: ✅ 1788 passed, 0 failed · 1 flaky📊 Browser Reports
📦 Bundle: 8.24 MB gzip ⚪ 0 BDetailsSummary
Category Glance App Entry Points — 3.64 kB (baseline 3.64 kB) • ⚪ 0 BMain entry bundles and manifests Status: 1 unchanged Graph Workspace — 1.35 MB (baseline 1.35 MB) • ⚪ 0 BGraph editor runtime, canvas, workflow orchestration Status: 2 unchanged Views & Navigation — 111 kB (baseline 111 kB) • ⚪ 0 BTop-level views, pages, and routed surfaces Status: 16 unchanged Panels & Settings — 551 kB (baseline 551 kB) • ⚪ 0 BConfiguration panels, inspectors, and settings screens Status: 26 unchanged User & Accounts — 28.7 kB (baseline 28.7 kB) • ⚪ 0 BAuthentication, profile, and account management bundles Status: 10 unchanged Editors & Dialogs — 124 kB (baseline 124 kB) • ⚪ 0 BModals, dialogs, drawers, and in-app editors Status: 7 unchanged UI Components — 70 kB (baseline 70 kB) • ⚪ 0 BReusable component library chunks Status: 15 unchanged Data & Services — 3.47 MB (baseline 3.47 MB) • ⚪ 0 BStores, services, APIs, and repositories Status: 17 unchanged Utilities & Hooks — 386 kB (baseline 386 kB) • ⚪ 0 BHelpers, composables, and utility bundles Status: 36 unchanged Vendor & Third-Party — 15.7 MB (baseline 15.7 MB) • ⚪ 0 BExternal libraries and shared vendor chunks Status: 16 unchanged Other — 12.8 MB (baseline 12.8 MB) • ⚪ 0 BBundles that do not match a named category Status: 281 unchanged ⚡ Performance Report
Show regressions
All metrics
Historical variance (last 15 runs)
Trend (last 15 commits on main)
Raw data{
"timestamp": "2026-08-04T07:19:09.120Z",
"gitSha": "210f86646e05b96491673ada0607a0fad60cfed6",
"branch": "ci/backport-stacking-hint",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2014.6180000000413,
"styleRecalcs": 10,
"styleRecalcDurationMs": 7.736,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 458.671,
"heapDeltaBytes": 5392060,
"heapUsedBytes": 69479356,
"domNodes": 20,
"jsHeapTotalBytes": 24903680,
"scriptDurationMs": 19.430999999999997,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-idle",
"durationMs": 2007.9320000000962,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.009999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 446.71200000000005,
"heapDeltaBytes": 5948884,
"heapUsedBytes": 69968864,
"domNodes": 18,
"jsHeapTotalBytes": 24379392,
"scriptDurationMs": 22.583,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 2088.4230000000343,
"styleRecalcs": 78,
"styleRecalcDurationMs": 45.25,
"layouts": 12,
"layoutDurationMs": 3.8659999999999997,
"taskDurationMs": 1059.183,
"heapDeltaBytes": -17630788,
"heapUsedBytes": 46645552,
"domNodes": -283,
"jsHeapTotalBytes": 24891392,
"scriptDurationMs": 120.653,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1842.0889999999872,
"styleRecalcs": 73,
"styleRecalcDurationMs": 32.275,
"layouts": 12,
"layoutDurationMs": 3.578,
"taskDurationMs": 811.289,
"heapDeltaBytes": -262284,
"heapUsedBytes": 64148208,
"domNodes": 55,
"jsHeapTotalBytes": 25690112,
"scriptDurationMs": 102.76599999999999,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1755.565000000047,
"styleRecalcs": 31,
"styleRecalcDurationMs": 16.649,
"layouts": 6,
"layoutDurationMs": 0.748,
"taskDurationMs": 364.72700000000003,
"heapDeltaBytes": 8529072,
"heapUsedBytes": 72611112,
"domNodes": 78,
"jsHeapTotalBytes": 24379392,
"scriptDurationMs": 20.651000000000003,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1711.1850000000004,
"styleRecalcs": 30,
"styleRecalcDurationMs": 14.613999999999999,
"layouts": 6,
"layoutDurationMs": 0.5660000000000001,
"taskDurationMs": 360.234,
"heapDeltaBytes": 8617716,
"heapUsedBytes": 72638168,
"domNodes": 77,
"jsHeapTotalBytes": 24903680,
"scriptDurationMs": 19.416999999999998,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 553.8329999999974,
"styleRecalcs": 11,
"styleRecalcDurationMs": 5.521,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 343.023,
"heapDeltaBytes": -11092444,
"heapUsedBytes": 52997084,
"domNodes": 18,
"jsHeapTotalBytes": 24903680,
"scriptDurationMs": 48.620000000000005,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66666666666665,
"p95FrameDurationMs": 16.700000000000273
},
{
"name": "dom-widget-clipping",
"durationMs": 571.4839999999413,
"styleRecalcs": 12,
"styleRecalcDurationMs": 7.521000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 355.082,
"heapDeltaBytes": -10912488,
"heapUsedBytes": 52997920,
"domNodes": 20,
"jsHeapTotalBytes": 25165824,
"scriptDurationMs": 51.661,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000273
},
{
"name": "large-graph-idle",
"durationMs": 2040.6300000000215,
"styleRecalcs": 7,
"styleRecalcDurationMs": 5.3069999999999995,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 646.949,
"heapDeltaBytes": 7433184,
"heapUsedBytes": 67674332,
"domNodes": -282,
"jsHeapTotalBytes": 3784704,
"scriptDurationMs": 94.051,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2018.5010000000148,
"styleRecalcs": 10,
"styleRecalcDurationMs": 7.856999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 659.445,
"heapDeltaBytes": 6336480,
"heapUsedBytes": 65830112,
"domNodes": -281,
"jsHeapTotalBytes": 2998272,
"scriptDurationMs": 94.479,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2156.2250000000063,
"styleRecalcs": 69,
"styleRecalcDurationMs": 13.049999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1186.382,
"heapDeltaBytes": 4645748,
"heapUsedBytes": 64949548,
"domNodes": -282,
"jsHeapTotalBytes": 3715072,
"scriptDurationMs": 385.759,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-pan",
"durationMs": 2176.9670000001042,
"styleRecalcs": 69,
"styleRecalcDurationMs": 14.133,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1230.094,
"heapDeltaBytes": 2109804,
"heapUsedBytes": 65156108,
"domNodes": -282,
"jsHeapTotalBytes": 4763648,
"scriptDurationMs": 397.401,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66999999999998,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-zoom",
"durationMs": 3149.5610000000056,
"styleRecalcs": 66,
"styleRecalcDurationMs": 13.661000000000003,
"layouts": 60,
"layoutDurationMs": 7.449000000000001,
"taskDurationMs": 1280.5539999999999,
"heapDeltaBytes": -6023280,
"heapUsedBytes": 56428364,
"domNodes": -287,
"jsHeapTotalBytes": 6144000,
"scriptDurationMs": 475.207,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3116.7729999999665,
"styleRecalcs": 66,
"styleRecalcDurationMs": 13.807,
"layouts": 60,
"layoutDurationMs": 7.291,
"taskDurationMs": 1353.4639999999997,
"heapDeltaBytes": 22731812,
"heapUsedBytes": 85556672,
"domNodes": 14,
"jsHeapTotalBytes": 7602176,
"scriptDurationMs": 458.97499999999997,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "minimap-idle",
"durationMs": 2024.3130000000065,
"styleRecalcs": 8,
"styleRecalcDurationMs": 5.599,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 649.5649999999999,
"heapDeltaBytes": 5804452,
"heapUsedBytes": 66369756,
"domNodes": -285,
"jsHeapTotalBytes": 3784704,
"scriptDurationMs": 98.44,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "minimap-idle",
"durationMs": 2026.6429999999218,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.317999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 649.725,
"heapDeltaBytes": 5777656,
"heapUsedBytes": 66606504,
"domNodes": -282,
"jsHeapTotalBytes": 3784704,
"scriptDurationMs": 87.479,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 566.9129999999996,
"styleRecalcs": 48,
"styleRecalcDurationMs": 8.852000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 375.281,
"heapDeltaBytes": -10585328,
"heapUsedBytes": 53620484,
"domNodes": 22,
"jsHeapTotalBytes": 25427968,
"scriptDurationMs": 110.62499999999999,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 526.7260000000533,
"styleRecalcs": 46,
"styleRecalcDurationMs": 8.305,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 373.38699999999994,
"heapDeltaBytes": -10704432,
"heapUsedBytes": 53287616,
"domNodes": 18,
"jsHeapTotalBytes": 26214400,
"scriptDurationMs": 112.52999999999999,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999727
},
{
"name": "subgraph-idle",
"durationMs": 1992.3829999999612,
"styleRecalcs": 9,
"styleRecalcDurationMs": 6.447000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 460.843,
"heapDeltaBytes": 5113380,
"heapUsedBytes": 69263112,
"domNodes": 18,
"jsHeapTotalBytes": 25690112,
"scriptDurationMs": 16.364000000000004,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 1993.4319999999843,
"styleRecalcs": 10,
"styleRecalcDurationMs": 7.262,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 440.42299999999994,
"heapDeltaBytes": 5100260,
"heapUsedBytes": 69332592,
"domNodes": 20,
"jsHeapTotalBytes": 25165824,
"scriptDurationMs": 17.269999999999996,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1695.5709999999726,
"styleRecalcs": 75,
"styleRecalcDurationMs": 30.961000000000002,
"layouts": 16,
"layoutDurationMs": 4.457,
"taskDurationMs": 722.42,
"heapDeltaBytes": -3908456,
"heapUsedBytes": 60214020,
"domNodes": 60,
"jsHeapTotalBytes": 25427968,
"scriptDurationMs": 79.142,
"eventListeners": 4,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1707.798999999909,
"styleRecalcs": 76,
"styleRecalcDurationMs": 36.257,
"layouts": 16,
"layoutDurationMs": 4.744,
"taskDurationMs": 751.515,
"heapDeltaBytes": -4010400,
"heapUsedBytes": 60105236,
"domNodes": 63,
"jsHeapTotalBytes": 24903680,
"scriptDurationMs": 80.708,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-transition-enter",
"durationMs": 1367.7799999999252,
"styleRecalcs": 18,
"styleRecalcDurationMs": 26.353999999999996,
"layouts": 14,
"layoutDurationMs": 10.883,
"taskDurationMs": 858.149,
"heapDeltaBytes": 31054720,
"heapUsedBytes": 100507188,
"domNodes": 13673,
"jsHeapTotalBytes": 15728640,
"scriptDurationMs": 40.781,
"eventListeners": 2373,
"totalBlockingTimeMs": 123,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "viewport-pan-sweep",
"durationMs": 8150.375999999995,
"styleRecalcs": 251,
"styleRecalcDurationMs": 35.684,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 3577.6020000000003,
"heapDeltaBytes": 10919228,
"heapUsedBytes": 70700780,
"domNodes": -280,
"jsHeapTotalBytes": 5287936,
"scriptDurationMs": 1229.379,
"eventListeners": -133,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8154.044999999996,
"styleRecalcs": 250,
"styleRecalcDurationMs": 35.007000000000005,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4210.026999999999,
"heapDeltaBytes": 10530256,
"heapUsedBytes": 69798204,
"domNodes": -281,
"jsHeapTotalBytes": 5025792,
"scriptDurationMs": 1256.6840000000002,
"eventListeners": -133,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 14849.863000000027,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 14817.321000000002,
"heapDeltaBytes": -49938888,
"heapUsedBytes": 168113812,
"domNodes": -8312,
"jsHeapTotalBytes": -8069120,
"scriptDurationMs": 544.9219999999999,
"eventListeners": -16389,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.223333333333237,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 14617.122000000109,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 14587.867999999999,
"heapDeltaBytes": -56454924,
"heapUsedBytes": 166788900,
"domNodes": -8312,
"jsHeapTotalBytes": -8327168,
"scriptDurationMs": 517.915,
"eventListeners": -16387,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.219999999999953,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 18371.004000000026,
"styleRecalcs": 125,
"styleRecalcDurationMs": 14.02600000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 18337.815,
"heapDeltaBytes": -57408448,
"heapUsedBytes": 156735428,
"domNodes": -8312,
"jsHeapTotalBytes": -7020544,
"scriptDurationMs": 903.3699999999999,
"eventListeners": -16385,
"totalBlockingTimeMs": 65,
"frameDurationMs": 17.77333333333336,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 18206.632000000012,
"styleRecalcs": 123,
"styleRecalcDurationMs": 13.856000000000007,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 18179.223,
"heapDeltaBytes": -39909520,
"heapUsedBytes": 167110236,
"domNodes": -8312,
"jsHeapTotalBytes": -11444224,
"scriptDurationMs": 896.7010000000001,
"eventListeners": -16383,
"totalBlockingTimeMs": 36,
"frameDurationMs": 17.219999999999953,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "workflow-execution",
"durationMs": 472.0429999999851,
"styleRecalcs": 20,
"styleRecalcDurationMs": 22.12,
"layouts": 3,
"layoutDurationMs": 1.5530000000000002,
"taskDurationMs": 124.974,
"heapDeltaBytes": 5460856,
"heapUsedBytes": 68564260,
"domNodes": 160,
"jsHeapTotalBytes": 6029312,
"scriptDurationMs": 9.428,
"eventListeners": 97,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66666666666665,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "workflow-execution",
"durationMs": 453.27499999996235,
"styleRecalcs": 12,
"styleRecalcDurationMs": 21.342999999999996,
"layouts": 2,
"layoutDurationMs": 0.415,
"taskDurationMs": 109.376,
"heapDeltaBytes": 5075444,
"heapUsedBytes": 68115364,
"domNodes": 121,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 9.302999999999999,
"eventListeners": 97,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.663333333333338,
"p95FrameDurationMs": 16.700000000000273
}
]
} |
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## main #14681 +/- ##
=======================================
Coverage 78.46% 78.46%
=======================================
Files 1790 1790
Lines 105382 105382
Branches 32178 32178
=======================================
Hits 82683 82683
Misses 22257 22257
Partials 442 442
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
superseded by #14767 |
|
Closing in favor of #14767, which absorbed this PR's Generated by Claude Code |
…the comment and agent prompt (Comfy-Org#14767) _Requested by **Christian Byrne** · [Slack thread](https://comfy-organization.slack.com/archives/C09EM82R2HL/p1785914376142729)_ ## Summary Flags likely stacking conflicts — with the actual open PR numbers — in both the human-facing backport-failure comment and its "Prompt for AI Agents" block. ## Changes - **What**: `pr-backport.yaml` cherry-picks each labelled PR onto the target branch independently, so a stack of PRs conflicts at every level above the first until the PR below it actually merges — the conflict is an artifact of picking in isolation, not a real incompatibility. This PR computes a single `STACK_HINT` via `gh pr list --state open --base "$target" --label backport`, naming the real open PR numbers, and threads it into both `COMMENT_BODY_TEMPLATE` (the human-facing comment) and `BACKPORT_AGENT_PROMPT_TEMPLATE` (the "🤖 Prompt for AI Agents" block) — so a human reading the comment and an agent acting on the prompt both see the same real numbers instead of generic wording. The lookup runs once and is best-effort: on failure, or when nothing else is open against the target, `STACK_HINT` is empty and neither template mentions stacking. - **Supersedes**: Comfy-Org#14681, which added the dynamic `gh pr list` lookup for the human-facing comment only. That PR is being closed in favor of this one, which folds its lookup in and extends it to the agent prompt too. - **Breaking**: none ## Review Focus `STACK_HINT` is computed once per conflicting target and exported alongside the other template variables already in scope, matching the file's existing templating convention (`export ... && envsubst '...' <<<"$TEMPLATE"`). No control-flow, trigger, or permission changes — template text and one best-effort `gh pr list` call only. ## Screenshots (if applicable) N/A — no UI change. --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Christian Byrne <cbyrne@comfy.org>
Partial mitigation for #14679. This does not make the backport workflow stack-aware — it only stops the failure comment from being misleading.
Why
pr-backport.yamlbuilds every backport branch straight off the target:so each labelled PR is cherry-picked independently. A stack of PRs therefore conflicts at every level above the first, until the PR below it has actually merged into the target branch. Those conflicts are an artifact of picking each commit in isolation, not a real incompatibility.
Verified on #14142–#14145 →
core/1.49, from the release branch tip immediately before any of the four landed:Live evidence: #14145's backport failed at
03:12Z, failed again at04:41Z— the moment #14144's backports were merely created — and only succeeded at05:00Z, once #14144's backport had actually merged.What the author sees today
A bare "⚠️ Backport to
core/1.49failed — merge conflicts detected" plus a six-file conflict list and an AI-agent prompt telling them to go resolve it by hand. Nothing indicates the conflict will evaporate on its own once the PR below merges, so the rational response is to do redundant manual conflict resolution.Change
When a cherry-pick conflicts, check whether other PRs labelled
backportare still open against the same target branch. If so, add one blockquote to the existing failure comment:The
needs-backportremove/re-add is the re-trigger that actually works —workflow_dispatchis broken today for an unrelated reason (itsgh pr viewcalls run beforeactions/checkoutand so have no repo context; fix pending in #13699).Safety
2>/dev/nullplus|| OPEN_BACKPORTS="", so aghfailure cannot abort the step (the defaultbash -eshell would otherwise) or suppress the existing comment.STACK_HINTis empty and the comment renders exactly as before.Verification
bash -nclean on the step'srunblock. Remainingshellcheckfindings in that block are pre-existing${{ }}templating noise.envsubstwith the real template for both cases (hint present / absent) — output verified.gh pr listquery against this repo, including a nonexistent base branch: returns empty with exit 0 in both cases.Cannot be end-to-end tested without merging, since the failure path only runs inside a real
pull_request_targetbackport run.