Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
169 commits
Select commit Hold shift + click to select a range
90c102c
πŸ› fix(crux/runs): resolve symlinks before the workspace_roots check (…
Karibhou Nov 8, 2026
6a38fcc
πŸ”– release: v5.205.0
actions-user Nov 8, 2026
b1eabc1
Merge pull request #17291 from hivecommons/release-gate/v5.205.0
clubanderson Nov 8, 2026
dc8c370
πŸ”– release: v5.206.0
actions-user Nov 8, 2026
8be9cbf
Merge pull request #17296 from hivecommons/release-gate/v5.206.0
clubanderson Nov 8, 2026
3f14802
πŸ› crux: confine agentstep workspace file access with os.Root (#17295)
hivecommons-hive[bot] Nov 8, 2026
95e6961
πŸ”– release: v5.206.1
actions-user Nov 8, 2026
4b55e4b
Merge pull request #17307 from hivecommons/release-gate/v5.206.1
clubanderson Nov 8, 2026
502dc96
πŸ› hold guard: log deferred base refresh at debug instead of WARN (#17…
hivecommons-hive[bot] Nov 8, 2026
9955acb
πŸ› pr-overlap: list every shared path, including add/add and clean pat…
hivecommons-hive[bot] Nov 8, 2026
f415681
πŸ”– release: v5.206.2
actions-user Nov 8, 2026
c4d89da
Merge pull request #17309 from hivecommons/release-gate/v5.206.2
clubanderson Nov 8, 2026
acb37ae
πŸ› contribute: keep a PR-covered contributor claim on lease revoke (#1…
hivecommons-hive[bot] Nov 8, 2026
ba9beab
πŸ”– release: v5.206.3
actions-user Nov 8, 2026
ea2130f
Merge pull request #17313 from hivecommons/release-gate/v5.206.3
clubanderson Nov 8, 2026
aa348d2
✨ hive-open-issue: claim a self-filed next-step issue in the same req…
hivecommons-hive[bot] Nov 9, 2026
31f5c38
πŸ› pr-request: refuse Fixes/Closes targets claimed or covered by anoth…
hivecommons-hive[bot] Nov 9, 2026
d4d6a8b
πŸ”– release: v5.207.0
actions-user Nov 9, 2026
7812f9b
Merge pull request #17317 from hivecommons/release-gate/v5.207.0
clubanderson Nov 9, 2026
ff0eba9
πŸ”– release: v5.207.1
actions-user Nov 9, 2026
e8db562
Merge pull request #17322 from hivecommons/release-gate/v5.207.1
clubanderson Nov 9, 2026
cbcd8be
πŸ› fix: keep AGENTS.md injection-cap warning out of fleet selfreports …
hivecommons-hive[bot] Nov 9, 2026
eb6c66a
πŸ› watchdog: stop paging PaneShowsLogin on a relaunched CLI's login fl…
clubanderson Nov 9, 2026
cfdff40
dashboard: widen the Recent merges popover so titles are readable (#1…
clubanderson Nov 9, 2026
2fd05e6
πŸ› Activity Monitor: secondary issue of a shared PR rides the PR's lan…
clubanderson Nov 9, 2026
44fe65f
πŸ”– release: v5.207.2
actions-user Nov 9, 2026
d3b2820
Merge pull request #17330 from hivecommons/release-gate/v5.207.2
clubanderson Nov 9, 2026
e6422ad
πŸ› contributor nudge: per-PR CI-failure cooldown and failing-set dedup…
clubanderson Nov 9, 2026
79bbc6b
✨ activity monitor: show sentinel and hold as pills on the PR's real …
clubanderson Nov 9, 2026
3093c39
πŸ”– release: v5.207.3
actions-user Nov 9, 2026
77fc033
Merge pull request #17338 from hivecommons/release-gate/v5.207.3
clubanderson Nov 9, 2026
a94ef95
✨ Activity Monitor: shared-PR issues group under their primary row (#…
clubanderson Nov 9, 2026
c4abd0f
πŸ› Activity Monitor: exactly one lit stage chevron per row (#17337)
clubanderson Nov 9, 2026
76fc87d
πŸ”– release: v5.207.4
actions-user Nov 9, 2026
e9a3d13
Merge pull request #17342 from hivecommons/release-gate/v5.207.4
clubanderson Nov 9, 2026
6f3abbc
πŸ”– release: v5.207.5
actions-user Nov 9, 2026
caa0c91
Merge pull request #17343 from hivecommons/release-gate/v5.207.5
clubanderson Nov 9, 2026
9ebb700
🌱 build(deps): Bump docker/login-action from 4.7.0 to 4.8.0 (#17339)
dependabot[bot] Nov 9, 2026
c022e72
🌱 build(deps): Bump discord.js from 14.28.0 to 14.28.1 in /discord (#…
dependabot[bot] Nov 9, 2026
cfc5655
🌱 test: regression for an epic-driven PR on a contributor-claimed, PR…
Karibhou Nov 9, 2026
fd3fb7b
πŸ”– release: v5.208.0
actions-user Nov 9, 2026
22cee59
🌱 chore(deps): stop Dependabot bumping the compiler-owned gh-aw-actio…
hivecommons-hive[bot] Nov 9, 2026
4b4b59a
Merge pull request #17346 from hivecommons/release-gate/v5.208.0
clubanderson Nov 9, 2026
7491bb0
test(crux/agent): pin LastLaunchAt wiring from manager to watchdog ob…
hivecommons-hive[bot] Nov 9, 2026
4b2cc08
πŸ› fleetreport: classify the copilot hang detector as copilot_cli_hung…
Karibhou Nov 9, 2026
9b126fd
πŸ› fix: classify BuildKit-prefixed and golangci-lint-action 5xx releas…
hivecommons-hive[bot] Nov 9, 2026
3dd9b74
πŸ”– release: v5.208.1
actions-user Nov 9, 2026
397d5fc
Merge pull request #17356 from hivecommons/release-gate/v5.208.1
clubanderson Nov 9, 2026
415a213
✨ feature: activity monitor reads a hive deferral as "Deferred Β· wait…
Karibhou Nov 9, 2026
0aa6936
πŸ”– release: v5.209.0
actions-user Nov 9, 2026
10959d6
Merge pull request #17363 from hivecommons/release-gate/v5.209.0
clubanderson Nov 9, 2026
5ba49e0
πŸ› fix(crux): bound agentstep prompt_path and answer file reads (#17362)
hivecommons-hive[bot] Nov 9, 2026
b3bba23
πŸ”– release: v5.209.1
actions-user Nov 9, 2026
71bec6e
Merge pull request #17369 from hivecommons/release-gate/v5.209.1
clubanderson Nov 9, 2026
04c2270
πŸ› fix(crux): bound http method attribute in serve request metrics (#1…
hivecommons-hive[bot] Nov 9, 2026
8487100
πŸ› fix(fleetreport): review dispatch promotion WARN is an operational …
hivecommons-hive[bot] Nov 9, 2026
bdcac28
πŸ› fix: pricetable reconciler holds implausible quotes for review (#17…
hivecommons-hive[bot] Nov 9, 2026
517b4e8
πŸ”– release: v5.209.2
actions-user Nov 9, 2026
a46518e
Merge pull request #17384 from hivecommons/release-gate/v5.209.2
clubanderson Nov 9, 2026
8a1c22a
πŸ”– release: v5.209.3
actions-user Nov 9, 2026
8fb83af
Merge pull request #17390 from hivecommons/release-gate/v5.209.3
clubanderson Nov 9, 2026
c914660
πŸ› fix(maintainernotes): create the notes file owner-only and tighten …
hivecommons-hive[bot] Nov 9, 2026
930bb07
πŸ”– release: v5.209.4
actions-user Nov 9, 2026
cde7353
Merge pull request #17396 from hivecommons/release-gate/v5.209.4
clubanderson Nov 9, 2026
6174eed
πŸ› fix(crux): cmdlog next_seq never skips an unfinished command's ende…
hivecommons-hive[bot] Nov 9, 2026
ae60536
πŸ”– release: v5.209.5
actions-user Nov 9, 2026
01c5b0b
Merge pull request #17401 from hivecommons/release-gate/v5.209.5
clubanderson Nov 9, 2026
da1e113
πŸ› fix(fleetreport): skip self-authored merge guard contention (#17404)
Danathar Nov 9, 2026
263c96e
πŸ”– release: v5.209.6
actions-user Nov 9, 2026
5ea1239
Merge pull request #17408 from hivecommons/release-gate/v5.209.6
clubanderson Nov 9, 2026
4126d8b
πŸ› fix(crux): cmdlog next_seq no longer pins on an ended-unfinished or…
Karibhou Nov 9, 2026
27c7617
πŸ”– release: v5.209.7
actions-user Nov 9, 2026
14cd67f
Merge pull request #17422 from hivecommons/release-gate/v5.209.7
clubanderson Nov 9, 2026
1a9f925
πŸ› fix(crux): /v1/health reports tmux and returns 503 when it is missi…
hivecommons-hive[bot] Nov 9, 2026
9f33321
πŸ› fix(crux): surface the health 503 cause from WaitReady instead of a…
hivecommons-hive[bot] Nov 9, 2026
474a7b8
🌱 ci: advisory gremlins mutation job for changed Go packages (#17416)
hivecommons-hive[bot] Nov 9, 2026
a97912c
πŸ”– release: v5.209.8
actions-user Nov 9, 2026
9fb155a
πŸ› fix(dashboard): data_disk warning measures /data, not shared node r…
hivecommons-hive[bot] Nov 9, 2026
a7628e5
Merge pull request #17438 from hivecommons/release-gate/v5.209.8
clubanderson Nov 9, 2026
0564c7e
✨ Add opt-in redteam lane that measures attacks on hive defenses (#17…
Karibhou Nov 9, 2026
1b8bfe9
πŸ› fix(deploy): reflect intercepted 403/404 from the ingress error bac…
clubanderson Nov 9, 2026
34c28e2
πŸ› ci(scorecard): skip push runs on non-default branches (v5) (#17414)
clubanderson Nov 9, 2026
482c854
πŸ› advisory digest: one marker comment, rewrite a changed digest at mo…
clubanderson Nov 9, 2026
98a1a71
πŸ”– release: v5.210.0
actions-user Nov 9, 2026
5ac8f7f
Merge pull request #17447 from hivecommons/release-gate/v5.210.0
clubanderson Nov 9, 2026
697106b
πŸ› fix(heartbeat): bound the forge health probe and back off fleet-sta…
hivecommons-hive[bot] Nov 9, 2026
947a893
πŸ› fix(ci): retry 'Install just' curl on transient release-CDN errors …
Karibhou Nov 9, 2026
aeed957
🌱 tokens: refresh model price table 2026-11-09 (#17354)
clubanderson Nov 9, 2026
a97382d
πŸ”– release: v5.211.0
actions-user Nov 9, 2026
7987b04
Merge pull request #17456 from hivecommons/release-gate/v5.211.0
clubanderson Nov 9, 2026
64320ff
πŸ› fix(automerge): group the one-PR-per-issue rule by base branch (#17…
clubanderson Nov 9, 2026
029bfda
🌱 dashboard: Merge queue icon is a merge traffic sign, not a railcar …
clubanderson Nov 9, 2026
22724a4
πŸ› fix(dashboard): deflake TestGitHubWebhookReceiverSchedulesTargetedT…
Karibhou Nov 9, 2026
0c807ec
πŸ› dashboard: stabilize scroll across all repaint paths (#17458)
clubanderson Nov 9, 2026
758e442
πŸ› dashboard: settled-current stage chevron keeps its neutral fill whi…
clubanderson Nov 9, 2026
4cbefb7
πŸ› fix(sec-check): request Dependabot alerts read permission and docum…
hivecommons-hive[bot] Nov 9, 2026
3c3da3e
πŸ”– release: v5.211.1
actions-user Nov 9, 2026
ed4d55b
πŸ› fix(hub): label forge-unreachable hives by host instead of generic …
hivecommons-hive[bot] Nov 9, 2026
178e715
πŸ“– docs(runbook): recover fork PRs stalled on Prow presubmits (#17455)
hivecommons-hive[bot] Nov 9, 2026
4a960b4
Merge pull request #17465 from hivecommons/release-gate/v5.211.1
clubanderson Nov 9, 2026
aecaf86
πŸ› fix(automerge): hold same-issue PRs only at the merge gate and keep…
Karibhou Nov 9, 2026
a546424
πŸ› fix(knowledge): make advisor_llm endpoint path-aware for the Copilo…
hivecommons-hive[bot] Nov 9, 2026
5ec6426
πŸ”– release: v5.211.2
actions-user Nov 9, 2026
6683b96
Merge pull request #17477 from hivecommons/release-gate/v5.211.2
clubanderson Nov 9, 2026
7573389
πŸ”– release: v5.211.3
actions-user Nov 10, 2026
4aac05f
Merge pull request #17482 from hivecommons/release-gate/v5.211.3
clubanderson Nov 10, 2026
cb742f9
πŸ› activity monitor: light a needs-decision PR's real stage and carry …
clubanderson Nov 10, 2026
70e18aa
πŸ› fix(config): shrink cfgReloadMu critical section so hot-reload is a…
hivecommons-hive[bot] Nov 10, 2026
a580d9b
πŸ”– release: v5.211.4
actions-user Nov 10, 2026
99eb725
Merge pull request #17488 from hivecommons/release-gate/v5.211.4
clubanderson Nov 10, 2026
9612138
πŸ› agent: log the token-restart give-up once per episode, not once per…
hivecommons-hive[bot] Nov 10, 2026
0c71856
πŸ”– release: v5.211.5
actions-user Nov 10, 2026
113f50d
Merge pull request #17492 from hivecommons/release-gate/v5.211.5
clubanderson Nov 10, 2026
b5d366d
πŸ› dashboard: surface Prow's rejection of relayed /lgtm and /approve (…
hivecommons-hive[bot] Nov 10, 2026
b819219
πŸ› dashboard: show Tide's reason on a CI chevron with a missing Prow p…
Karibhou Nov 10, 2026
d3b1a11
πŸ”– release: v5.211.6
actions-user Nov 10, 2026
65a6b4c
Merge pull request #17497 from hivecommons/release-gate/v5.211.6
clubanderson Nov 10, 2026
a28c1c7
πŸ› fix(dashboard): exclude Prow merge-gate contexts from the CI chevro…
clubanderson Nov 10, 2026
38ba6b7
πŸ› fix(dashboard,scanner): name the shared-CI incident a deferral wait…
clubanderson Nov 10, 2026
235099b
πŸ› fix(hub): make /etc/hive/hive.yaml durable on hosted spokes (#17471)
hivecommons-hive[bot] Nov 10, 2026
97b01be
πŸ› fix(agentmode): sec-check keeps Dependabot alerts read above ISSUES…
hivecommons-hive[bot] Nov 10, 2026
6c03b7b
Merge remote-tracking branch 'origin/v5' into topup/v5-to-v6-20261109
clubanderson Nov 10, 2026
adae396
πŸ”– release: v5.211.7
actions-user Nov 10, 2026
920b31f
Merge pull request #17507 from hivecommons/release-gate/v5.211.7
clubanderson Nov 10, 2026
1af27be
πŸ”– release: v5.211.8
actions-user Nov 10, 2026
42f95be
Merge pull request #17511 from hivecommons/release-gate/v5.211.8
clubanderson Nov 10, 2026
0994434
πŸ› fix(dashboard): CI chevron no longer stays lit after every check ha…
clubanderson Nov 10, 2026
a725f11
πŸ› dashboard: one human-gate pill per gated row β€” fixed verbs per reas…
clubanderson Nov 10, 2026
4f80a29
πŸ”– release: v5.211.9
actions-user Nov 10, 2026
53d51e7
Merge pull request #17513 from hivecommons/release-gate/v5.211.9
clubanderson Nov 10, 2026
f52d84f
πŸ”– release: v5.211.10
actions-user Nov 10, 2026
385a7f8
Merge pull request #17516 from hivecommons/release-gate/v5.211.10
clubanderson Nov 10, 2026
6f78f44
🌱 test(config): pin the entrypoint's linked-config-path boot arm from…
hivecommons-hive[bot] Nov 10, 2026
22cbe10
πŸ› dashboard: fold the human-gate verbs at render time; … keeps its 44…
clubanderson Nov 10, 2026
337ab9a
πŸ› stage: classify workflow-opened PRs on a user PAT as author/clanker…
Karibhou Nov 10, 2026
ab1ac7c
πŸ”– release: v5.211.11
actions-user Nov 10, 2026
adcb848
Merge pull request #17523 from hivecommons/release-gate/v5.211.11
clubanderson Nov 10, 2026
2a4153a
πŸ› prow: post /ok-to-test once on admitted non-member fork PRs (#17479)
Karibhou Nov 10, 2026
d94ebb6
🌱 images: bump claude 2.1.319 -> 2.1.322 (#17521)
clubanderson Nov 10, 2026
b89499c
🌱 images: bump goose 1.57.0 -> 1.58.1 (#17522)
clubanderson Nov 10, 2026
fd9db5f
πŸ”– release: v5.211.12
actions-user Nov 10, 2026
f4d4ff4
Merge pull request #17526 from hivecommons/release-gate/v5.211.12
clubanderson Nov 10, 2026
81c925f
πŸ› docs-link check: ignore link syntax quoted in inline code spans (#1…
hivecommons-hive[bot] Nov 10, 2026
e432d78
πŸ”– release: v5.211.13
actions-user Nov 10, 2026
d0d7d64
Merge pull request #17529 from hivecommons/release-gate/v5.211.13
clubanderson Nov 10, 2026
398dc10
🌱 test(dashboard): pin the human-gate pill's stacked-head fold from #…
hivecommons-hive[bot] Nov 10, 2026
d8e53b0
πŸ› crux: record agent.send_kick span agent.name only after the target …
hivecommons-hive[bot] Nov 10, 2026
8623d98
πŸ”– release: v5.211.14
actions-user Nov 10, 2026
f58e70d
Merge pull request #17531 from hivecommons/release-gate/v5.211.14
clubanderson Nov 10, 2026
e28504c
πŸ”– release: v5.211.15
actions-user Nov 10, 2026
07b70f5
πŸ› kick: log a closed ref withheld by the freshness guard below WARN (…
hivecommons-hive[bot] Nov 10, 2026
5a44008
Merge pull request #17532 from hivecommons/release-gate/v5.211.15
clubanderson Nov 10, 2026
851c9b8
πŸ”– release: v5.211.16
actions-user Nov 10, 2026
09e2cd1
Merge pull request #17533 from hivecommons/release-gate/v5.211.16
clubanderson Nov 10, 2026
159b356
πŸ“– docs: link the How Hive works video from the README (#17535)
hivecommons-hive[bot] Nov 10, 2026
7b5af1b
πŸ“– docs: add a README index to docs/ (#17537)
hivecommons-hive[bot] Nov 10, 2026
b51bde3
πŸ› fix(crux/serve): record 1xx/3xx status classes and count panicking …
hivecommons-hive[bot] Nov 10, 2026
e591c2f
πŸ”– release: v5.211.17
actions-user Nov 10, 2026
73077ca
Merge pull request #17539 from hivecommons/release-gate/v5.211.17
clubanderson Nov 10, 2026
99a8e06
πŸ“– docs(readme): drop the colon from the How Hive works video link (#1…
hivecommons-hive[bot] Nov 10, 2026
90a17bf
πŸ› fix(crux/resumehandle): only UUID-named claude transcripts are resu…
hivecommons-hive[bot] Nov 10, 2026
cc040ef
πŸ”– release: v5.211.18
actions-user Nov 10, 2026
72b2770
Merge pull request #17563 from hivecommons/release-gate/v5.211.18
clubanderson Nov 10, 2026
ce0fdb7
🌱 Merge PR 17506 head (v5 top-up resolution as of 235099b00) into v6
clubanderson Nov 10, 2026
17f6d35
🌱 Merge origin/v5 into v6 (top-up 2026-11-10)
clubanderson Nov 10, 2026
c13107a
🌱 topup: reconcile v6-only tests with the v5 held-gate routing, resyn…
clubanderson Nov 10, 2026
6984a3a
🌱 topup: changelog fragment for the v5 β†’ v6 top-up
clubanderson Nov 10, 2026
3d6b0d6
🌱 topup: keep the needs-a-person chip beside the human-gate pill
clubanderson Nov 10, 2026
958e9ca
Merge remote-tracking branch 'origin/v6' into topup/v6-from-v5-20261110
clubanderson Nov 10, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ updates:
open-pull-requests-limit: 10
commit-message:
prefix: "🌱 build(deps)"
ignore:
# Pinned by the gh-aw compiler (gh-aw-compile.yml --pin) and written
# into the generated weekly-competitor-report.lock.yml and
# .github/aw/actions-lock.json; the compile guard regenerates both and
# reverts a hand bump, so Dependabot's PR for it can never go green.
# Bump the compiler pin and recompile instead.
- dependency-name: "github/gh-aw-actions/setup"

- package-ecosystem: "docker"
directory: "/src"
Expand Down
4 changes: 4 additions & 0 deletions .github/release-lines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ pinned:
# image is operator tooling, not a hive release channel, so it follows the
# default branch rather than every release line; v4 is feature-frozen.
stream-image.yml: [-v4, -v6]
# Advisory gremlins mutation report on changed Go packages (#17349). It is
# pull_request-only and never blocks, so it covers every line that takes Go
# PRs; surviving-mutant data is equally useful on v4 backports.
mutation-advisory.yml: []

# Workflows that deliberately do NOT pin to the release lines. Each must keep a
# wildcard branch filter; if one is ever narrowed to a fixed list, the guard
Expand Down
7 changes: 6 additions & 1 deletion .github/scripts/ci-infra-signatures.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
# upstream-download-5xx (2026-10-07, run 37638156130): a tool download from
# github.com releases (curl -f in "Install just") got an HTTP 5xx - a transient
# upstream outage. 4xx is deliberately NOT matched: a 404 is a wrong version pin.
# 2026-11-09 (#17351, release-asset 504 outage) added two shapes: curl inside
# `docker build`, where BuildKit prefixes each line with "#<step> <secs> " (run
# 42568390991), and golangci-lint-action's "Unexpected HTTP response: 504"
# (run 42568320263).
#
# Every class below was observed on the self-hosted pool on 2026-09-29; the
# fixtures under testdata/ci-infra/ are real excerpts from those jobs.
Expand All @@ -47,7 +51,8 @@ toolcache-clobbered step : (npm|node|go): command not found$
runner-lost annotation The runner has received a shutdown signal
test-list-empty step ^##\[error\]go test -list produced no test functions
test-list-empty silent-step \bgo test\b.*\s-list\b
upstream-download-5xx step ^curl: \(22\) The requested URL returned error: 5\d\d$
upstream-download-5xx step ^(?:#\d+ \d+(?:\.\d+)? )?curl: \(22\) The requested URL returned error: 5\d\d$
upstream-download-5xx step ^##\[error\]Unexpected HTTP response: 5\d\d$

# Reserved class `derived`: the job failed only to REPORT that other jobs
# failed (v2 Tests' shard gate). Keep these rows last.
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/integration-governance.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const MAX_COMMITS = 1000;
const MAX_AUTHOR_BATCH = 50;
// This literal is inside the enrolled .github closure. A caller-supplied
// preparedBy.sourceSHA must never choose a new executable verifier tree.
const TRUSTED_SCRIPTS_TREE = '925f525d22d99042bf0c41778d8de837a79ac3e9';
const TRUSTED_SCRIPTS_TREE = '7c365d4a9df3670491f8751464340e2dceb43e77';
const SOURCE = 'https://github.com/kubernetes-sigs/kubebuilder-release-tools/tree/012269a88fa4c034a0acf1ba84c26b195c0dbab4';
const sha = value => crypto.createHash('sha256').update(value).digest('hex');
const git = (args, cwd = process.cwd()) =>
Expand Down
25 changes: 20 additions & 5 deletions .github/scripts/pr-overlap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ changed_files() {
local base=$1 ref=$2
local mb
mb=$(git merge-base "origin/${base}" "$ref")
git diff --name-only "${mb}...${ref}" | sort -u
git diff --no-renames --name-only "${mb}...${ref}" | sort -u
}

join_files() {
Expand All @@ -101,6 +101,21 @@ intersect_files() {
done | sort -u
}

# Lists the union of conflicted and shared paths, marking the conflicted ones,
# so a CONFLICT row never hides shared paths that merged cleanly.
join_shared_files() {
local -n conflicts=$1
local -n shared=$2
local f out='' item
while IFS= read -r f; do
[[ -n "$f" ]] || continue
item=$(join_files '' "$f")
if printf '%s\n' "${conflicts[@]}" | grep -qxF -- "$f"; then item+=' (conflict)'; fi
if [[ -z "$out" ]]; then out=$item; else out+="<br>${item}"; fi
done < <(printf '%s\n' "${conflicts[@]}" "${shared[@]}" | sort -u)
[[ -n "$out" ]] && printf '%s' "$out" || printf 'β€”'
}

# Prints the paths `git merge-tree` reports as conflicted when merging $a and
# $b; prints nothing when they merge cleanly. With --name-only, a conflicted
# merge prints the tree OID, then one conflicted path per line, then a blank
Expand Down Expand Up @@ -177,17 +192,17 @@ make_report_for_pr() {
mapfile -t conflict_files < <(merge_conflicts "$target_on_base" "$other_on_base")
fi
fi
# shellcheck disable=SC2034 # consumed by intersect_files via nameref
mapfile -t other_files < <(changed_files "$base" "$other_ref")
mapfile -t overlap_files < <(intersect_files target_files other_files)
if ((${#conflict_files[@]})); then
relation='CONFLICT'
report_has_conflicts=1
report_has_any=1
files_md=$(join_files '<br>' "${conflict_files[@]}")
files_md=$(join_shared_files conflict_files overlap_files)
report_rows+="| #${number} | ${title//'|'/'\|'} | ${relation} | ${files_md} |"$'\n'
continue
fi
# shellcheck disable=SC2034 # consumed by intersect_files via nameref
mapfile -t other_files < <(changed_files "$base" "$other_ref")
mapfile -t overlap_files < <(intersect_files target_files other_files)
if ((${#overlap_files[@]})); then
relation='same files'
report_has_any=1
Expand Down
34 changes: 28 additions & 6 deletions .github/scripts/test-pr-overlap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,19 @@ commit_file c.txt "$(printf 'c%s\n' 1 2 3 4 5 6 7 8 9 PR3)" 'pr3 c'
git -C "$SEED" checkout -q -b pr4 "$b0"
commit_file d.txt 'd' 'pr4'

# PRs 5 and 6 both add new.txt with different content (add/add conflict); PRs 7
# and 8 both add same.txt with identical content (merges cleanly).
git -C "$SEED" checkout -q -b pr5 "$b1"
commit_file new.txt 'new-from-pr5' 'pr5'
git -C "$SEED" checkout -q -b pr6 "$b1"
commit_file new.txt 'new-from-pr6' 'pr6'
git -C "$SEED" checkout -q -b pr7 "$b1"
commit_file same.txt 'same-content' 'pr7'
git -C "$SEED" checkout -q -b pr8 "$b1"
commit_file same.txt 'same-content' 'pr8'

git -C "$SEED" push -q "$ORIGIN" v6
for n in 1 2 3 4; do
for n in 1 2 3 4 5 6 7 8; do
git -C "$SEED" push -q "$ORIGIN" "pr${n}:refs/pull/${n}/head"
done

Expand All @@ -94,7 +105,7 @@ shift
case "$*" in
-X*) printf '%s\n' "$*" >>"$GH_WRITE_LOG"; exit 0 ;;
*'/pulls?base=v6'*)
for n in 4 3 2 1; do printf '%s\tPR %s\t%s\t2026-01-01T00:00:00Z\n' "$n" "$n" "$REPO_SLUG"; done ;;
for n in 8 7 6 5 4 3 2 1; do printf '%s\tPR %s\t%s\t2026-01-01T00:00:00Z\n' "$n" "$n" "$REPO_SLUG"; done ;;
*'.head.repo.full_name'*) printf '%s\n' "$REPO_SLUG" ;;
*'.head.sha'*) printf '%s\n' "${FALLBACK_SHA:-}" ;;
*'.base.ref'*) printf 'v6\n' ;;
Expand Down Expand Up @@ -127,13 +138,24 @@ LABEL_DEL="-X DELETE repos/${REPO_SLUG}/issues/%s/labels/conflicts-with-open-pr"
echo 'PR 2: real sibling conflict with PR 3, stale PR 1 is not blamed'
run_pr 2
assert_exit0
assert_contains "$OUT" '| #3 | PR 3 | CONFLICT | `b.txt` |' 'reports the real b.txt conflict with PR 3, and only b.txt'
assert_not_contains "$OUT" 'c.txt' 'does not list the cleanly auto-merged c.txt'
assert_contains "$OUT" '| #3 | PR 3 | CONFLICT | `b.txt` (conflict)<br>`c.txt` |' 'marks b.txt as the conflict with PR 3 and lists shared clean c.txt unmarked'
assert_not_contains "$OUT" '`c.txt` (conflict)' 'does not mark the cleanly auto-merged c.txt as conflicting'
assert_not_contains "$OUT" '| #1 |' 'does not blame PR 1 for its conflict with the base'
assert_not_contains "$OUT" '| #4 |' 'does not link the unrelated stale PR 4'
# shellcheck disable=SC2059
assert_contains "$WRITES" "$(printf -- "$LABEL_ADD" 2)" 'labels PR 2 conflicts-with-open-pr'

echo 'PR 5: add/add of the same new path with different content'
run_pr 5
assert_exit0
assert_contains "$OUT" '| #6 | PR 6 | CONFLICT | `new.txt` (conflict) |' 'reports the add/add conflict on new.txt'

echo 'PR 7: add/add of the same new path with identical content'
run_pr 7
assert_exit0
assert_contains "$OUT" '| #8 | PR 8 | same files | `same.txt` |' 'reports same.txt as shared, not conflicting'
assert_not_contains "$OUT" 'CONFLICT |' 'does not call identical add/add a conflict'

echo 'PR 1: conflicts with the base itself'
run_pr 1
assert_exit0
Expand All @@ -158,12 +180,12 @@ git -C "$WORK" update-ref refs/heads/pr-3 "$(git -C "$SEED" rev-parse pr4)"
run_pr 2
assert_exit0
assert_contains "$OUT" 'PR #3 pull ref unavailable; fetching head' 'reports the fallback'
assert_contains "$OUT" '| #3 | PR 3 | CONFLICT | `b.txt` |' 'still detects the sibling conflict using the current head'
assert_contains "$OUT" '| #3 | PR 3 | CONFLICT | `b.txt` (conflict)<br>`c.txt` |' 'still detects the sibling conflict using the current head'

echo 'PR 3: fallback also works when the target PR has no pull ref'
run_pr 3
assert_exit0
assert_contains "$OUT" '| #2 | PR 2 | CONFLICT | `b.txt` |' 'checks the target fetched by SHA'
assert_contains "$OUT" '| #2 | PR 2 | CONFLICT | `b.txt` (conflict)<br>`c.txt` |' 'checks the target fetched by SHA'

echo 'PR 3: invalid API head fails without publishing a partial report'
FALLBACK_SHA=null
Expand Down
62 changes: 62 additions & 0 deletions .github/scripts/testdata/ci-infra/code-upstream-download-404.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
2026-11-09T05:38:04.5394499Z ##[group]Run docker buildx build --load --network host --build-arg BASE_REGISTRY="$BASE_REGISTRY" -f "src/Dockerfile.contributor" -t "hive-ci-contributor:test" .
2026-11-09T05:38:04.5395357Z ^[[36;1mdocker buildx build --load --network host --build-arg BASE_REGISTRY="$BASE_REGISTRY" -f "src/Dockerfile.contributor" -t "hive-ci-contributor:test" .^[[0m
2026-11-09T05:38:04.5408586Z shell: /usr/bin/bash -e {0}
2026-11-09T05:38:04.5408807Z env:
2026-11-09T05:38:04.5408996Z ACTIONS_CACHE_SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
2026-11-09T05:38:04.5409237Z GO_CACHE_GUARD_BUILD_CACHE: job
2026-11-09T05:38:04.5409447Z BASE_REGISTRY: mirror.gcr.io/library
2026-11-09T05:38:04.5409654Z ##[endgroup]
2026-11-09T05:38:04.8809509Z #0 building with "builder-9e62066e-81b1-48b5-9654-3d2862d8a5ec" instance using docker-container driver
2026-11-09T05:38:40.8576324Z
2026-11-09T05:38:51.7305872Z #17 11.03 /tmp/just.tar.gz: OK
2026-11-09T05:38:51.8654320Z #17 11.17 curl: (22) The requested URL returned error: 404
2026-11-09T05:39:01.8945014Z #17 21.19 curl: (22) The requested URL returned error: 404
2026-11-09T05:39:11.9226188Z #17 31.22 curl: (22) The requested URL returned error: 404
2026-11-09T05:39:21.9502710Z #17 41.25 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8186930Z #17 ERROR: process "/bin/sh -c ARCH=\"${TARGETARCH:-$(dpkg --print-architecture)}\" && case \"$ARCH\" in amd64|x86_64) JUST_TARGET=x86_64-unknown-linux-musl; JUST_SHA256=\"$JUST_SHA256_AMD64\"; YQ_ASSET=yq_linux_amd64; YQ_SHA256=\"$YQ_SHA256_AMD64\" ;; arm64|aarch64) JUST_TARGET=aarch64-unknown-linux-musl; JUST_SHA256=\"$JUST_SHA256_ARM64\"; YQ_ASSET=yq_linux_arm64; YQ_SHA256=\"$YQ_SHA256_ARM64\" ;; *) echo \"unsupported arch for just/yq: $ARCH\" >&2; exit 1 ;; esac && curl -fsSL --retry 30 --retry-delay 10 --retry-max-time 300 --retry-connrefused --retry-all-errors -o /tmp/just.tar.gz \"https://github.com/casey/just/releases/download/${JUST_VERSION}/just-${JUST_VERSION}-${JUST_TARGET}.tar.gz\" && echo \"${JUST_SHA256} /tmp/just.tar.gz\" | sha256sum -c - && tar -xzf /tmp/just.tar.gz -C /tmp just && install -m 0755 /tmp/just /usr/local/bin/just && rm -f /tmp/just.tar.gz /tmp/just && curl -fsSL --retry 30 --retry-delay 10 --retry-max-time 300 --retry-connrefused --retry-all-errors -o /tmp/yq \"https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_ASSET}\" && echo \"${YQ_SHA256} /tmp/yq\" | sha256sum -c - && install -m 0755 /tmp/yq /usr/local/bin/yq && rm -f /tmp/yq && just --version && yq --version" did not complete successfully: exit code: 22
2026-11-09T05:43:52.8191038Z ------
2026-11-09T05:43:52.8194559Z > [stage-1 5/37] RUN ARCH="amd64" && case "$ARCH" in amd64|x86_64) JUST_TARGET=x86_64-unknown-linux-musl; JUST_SHA256="4a5cc2f53e6f0f8c59092a6cc38291eb729d46a7dd95d3ae582008881b84931d"; YQ_ASSET=yq_linux_amd64; YQ_SHA256="c5f056448f973ae7d39b5401949648a78f2dc1947d6a8eb65be60d5c504b9385" ;; arm64|aarch64) JUST_TARGET=aarch64-unknown-linux-musl; JUST_SHA256="748237128c4c40cbdabc65e841d05ceba13cc23a91eaba395495894c1d9764df"; YQ_ASSET=yq_linux_arm64; YQ_SHA256="88a1016bc1d657375a35864e4f44b6f333df8ff97b559f51bba0adcb2169df09" ;; *) echo "unsupported arch for just/yq: $ARCH" >&2; exit 1 ;; esac && curl -fsSL --retry 30 --retry-delay 10 --retry-max-time 300 --retry-connrefused --retry-all-errors -o /tmp/just.tar.gz "https://github.com/casey/just/releases/download/1.58.0/just-1.58.0-${JUST_TARGET}.tar.gz" && echo "${JUST_SHA256} /tmp/just.tar.gz" | sha256sum -c - && tar -xzf /tmp/just.tar.gz -C /tmp just && install -m 0755 /tmp/just /usr/local/bin/just && rm -f /tmp/just.tar.gz /tmp/just && curl -fsSL --retry 30 --retry-delay 10 --retry-max-time 300 --retry-connrefused --retry-all-errors -o /tmp/yq "https://github.com/mikefarah/yq/releases/download/v4.53.6/${YQ_ASSET}" && echo "${YQ_SHA256} /tmp/yq" | sha256sum -c - && install -m 0755 /tmp/yq /usr/local/bin/yq && rm -f /tmp/yq && just --version && yq --version:
2026-11-09T05:43:52.8198817Z 221.8 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8199109Z 231.8 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8199369Z 241.9 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8199629Z 251.9 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8199892Z 261.9 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8200145Z 272.0 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8200396Z 282.0 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8200649Z 292.0 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8200901Z 302.1 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8201392Z 312.1 curl: (22) The requested URL returned error: 404
2026-11-09T05:43:52.8201610Z ------
2026-11-09T05:43:52.8201702Z
2026-11-09T05:43:52.8202097Z ^[[33m1 warning found (use docker --debug to expand):
2026-11-09T05:43:52.8202628Z ^[[0m - SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "NODESOURCE_KEY_SHA256") (line 222)
2026-11-09T05:43:52.8203073Z Dockerfile.contributor:189
2026-11-09T05:43:52.8203261Z --------------------
2026-11-09T05:43:52.8203576Z 188 | ARG YQ_SHA256_ARM64=88a1016bc1d657375a35864e4f44b6f333df8ff97b559f51bba0adcb2169df09
2026-11-09T05:43:52.8204079Z 189 | >>> RUN ARCH="${TARGETARCH:-$(dpkg --print-architecture)}" \
2026-11-09T05:43:52.8204344Z 190 | >>> && case "$ARCH" in \
2026-11-09T05:43:52.8204674Z 191 | >>> amd64|x86_64) JUST_TARGET=x86_64-unknown-linux-musl; JUST_SHA256="$JUST_SHA256_AMD64"; \
2026-11-09T05:43:52.8205096Z 192 | >>> YQ_ASSET=yq_linux_amd64; YQ_SHA256="$YQ_SHA256_AMD64" ;; \
2026-11-09T05:43:52.8205534Z 193 | >>> arm64|aarch64) JUST_TARGET=aarch64-unknown-linux-musl; JUST_SHA256="$JUST_SHA256_ARM64"; \
2026-11-09T05:43:52.8205954Z 194 | >>> YQ_ASSET=yq_linux_arm64; YQ_SHA256="$YQ_SHA256_ARM64" ;; \
2026-11-09T05:43:52.8206373Z 195 | >>> *) echo "unsupported arch for just/yq: $ARCH" >&2; exit 1 ;; \
2026-11-09T05:43:52.8206780Z 196 | >>> esac \
2026-11-09T05:43:52.8207453Z 197 | >>> && curl -fsSL --retry 30 --retry-delay 10 --retry-max-time 300 --retry-connrefused --retry-all-errors \
2026-11-09T05:43:52.8208088Z 198 | >>> -o /tmp/just.tar.gz \
2026-11-09T05:43:52.8208812Z 199 | >>> "https://github.com/casey/just/releases/download/${JUST_VERSION}/just-${JUST_VERSION}-${JUST_TARGET}.tar.gz" \
2026-11-09T05:43:52.8209444Z 200 | >>> && echo "${JUST_SHA256} /tmp/just.tar.gz" | sha256sum -c - \
2026-11-09T05:43:52.8209761Z 201 | >>> && tar -xzf /tmp/just.tar.gz -C /tmp just \
2026-11-09T05:43:52.8210045Z 202 | >>> && install -m 0755 /tmp/just /usr/local/bin/just \
2026-11-09T05:43:52.8210309Z 203 | >>> && rm -f /tmp/just.tar.gz /tmp/just \
2026-11-09T05:43:52.8210699Z 204 | >>> && curl -fsSL --retry 30 --retry-delay 10 --retry-max-time 300 --retry-connrefused --retry-all-errors \
2026-11-09T05:43:52.8211083Z 205 | >>> -o /tmp/yq \
2026-11-09T05:43:52.8211397Z 206 | >>> "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_ASSET}" \
2026-11-09T05:43:52.8211767Z 207 | >>> && echo "${YQ_SHA256} /tmp/yq" | sha256sum -c - \
2026-11-09T05:43:52.8212039Z 208 | >>> && install -m 0755 /tmp/yq /usr/local/bin/yq \
2026-11-09T05:43:52.8212275Z 209 | >>> && rm -f /tmp/yq \
2026-11-09T05:43:52.8212464Z 210 | >>> && just --version \
2026-11-09T05:43:52.8212655Z 211 | >>> && yq --version
2026-11-09T05:43:52.8212829Z 212 |
2026-11-09T05:43:52.8212978Z --------------------
2026-11-09T05:43:52.8216281Z ERROR: failed to build: failed to solve: process "/bin/sh -c ARCH=\"${TARGETARCH:-$(dpkg --print-architecture)}\" && case \"$ARCH\" in amd64|x86_64) JUST_TARGET=x86_64-unknown-linux-musl; JUST_SHA256=\"$JUST_SHA256_AMD64\"; YQ_ASSET=yq_linux_amd64; YQ_SHA256=\"$YQ_SHA256_AMD64\" ;; arm64|aarch64) JUST_TARGET=aarch64-unknown-linux-musl; JUST_SHA256=\"$JUST_SHA256_ARM64\"; YQ_ASSET=yq_linux_arm64; YQ_SHA256=\"$YQ_SHA256_ARM64\" ;; *) echo \"unsupported arch for just/yq: $ARCH\" >&2; exit 1 ;; esac && curl -fsSL --retry 30 --retry-delay 10 --retry-max-time 300 --retry-connrefused --retry-all-errors -o /tmp/just.tar.gz \"https://github.com/casey/just/releases/download/${JUST_VERSION}/just-${JUST_VERSION}-${JUST_TARGET}.tar.gz\" && echo \"${JUST_SHA256} /tmp/just.tar.gz\" | sha256sum -c - && tar -xzf /tmp/just.tar.gz -C /tmp just && install -m 0755 /tmp/just /usr/local/bin/just && rm -f /tmp/just.tar.gz /tmp/just && curl -fsSL --retry 30 --retry-delay 10 --retry-max-time 300 --retry-connrefused --retry-all-errors -o /tmp/yq \"https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_ASSET}\" && echo \"${YQ_SHA256} /tmp/yq\" | sha256sum -c - && install -m 0755 /tmp/yq /usr/local/bin/yq && rm -f /tmp/yq && just --version && yq --version" did not complete successfully: exit code: 22
2026-11-09T05:43:52.8268368Z ##[error]Process completed with exit code 1.
3 changes: 3 additions & 0 deletions .github/scripts/testdata/ci-infra/expected.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ infra-toolcache-clobbered-copyfile infra:toolcache-clobbered
infra-toolcache-clobbered-rmdir infra:toolcache-clobbered
infra-toolcache-clobbered-npm infra:toolcache-clobbered
infra-upstream-download-5xx infra:upstream-download-5xx
infra-upstream-download-5xx-buildkit infra:upstream-download-5xx
infra-upstream-download-5xx-golangci infra:upstream-download-5xx
code-upstream-download-404 code
derived-shard-gate derived
code-compile-redeclared code
code-vet-undefined code
Expand Down
Loading
Loading