[hivecommons-hive]

Hand-resolved forward-merge of v5 into v6 (48 commits, merge-base 43d631fd). Merge with a merge commit, not a squash, so v6 records v5 as a parent and the next top-up does not hit the same conflicts again.

Resolution table

File	Resolution
src/docs/adr/README.md	ADR-0021 collision: renumbered v6's planning-engine ADR to ADR-0022. v5 is the default branch and already shipped ADR-0021: Opt-in redemption of earned Codex resets, so that one keeps 0021. Ran git mv 0021-planning-engine-boundary.md → 0022-planning-engine-boundary.md and updated its title. The index rows are in numeric order: 0020, 0021 (Codex resets), 0022 (planning engine).
ADR-0022 references	Changed the planning-engine references from ADR-0021 to ADR-0022 in docs/spektacular.md, docs/integrations/spektacular.md, cmd/hive/spektacularwire{,_test}.go, pkg/planengine/*, pkg/spektacular/*, pkg/config/runs_config.go, pkg/dashboard/server.go and the 3 planning-engine changelog fragments. The Codex-reset references stay ADR-0021: rotation/*, hive-quota-publisher, env-vars.md and its changelog fragment.
src/cmd/hive/main.go	Took v6's structure, where kick dispatch runs through dispatchAgentKicks/kickDispatchDeps after the first status publish (#7232/#8659), and dropped v5's copy of the block at the old location. Ported v5's #10527 change (c200b46) into v6's onDelivered hook: recordAgentKickClaims → recordAgentKickListings, so the claim is recorded on the agent's first start signal. v5's other main.go hunks auto-merged: the #10751 installClaimAdmissionCheck (7841757) and the verifyOnceLookup/claimEscalationLookup in-flight gates. The v5 tests (claims_admission_test.go, claimswire_test.go, claimescalation_test.go, verifyonce_test.go) are kept unchanged and target the same functions.
src/pkg/dashboard/static/index.html	Both hunks are in the overview KPI renderer. Took v5's side, which adds heldIssues/heldPRs/blockedIssues/blockedPRs and total-partition sublines and uses <div role="button"> instead of a nested <button> (#10770/#10772/#10741/#10732; dashboard_navbar_overview_static_test.go asserts this). The v6 side only differed by joined-line whitespace. The rest of v6's dashboard is unchanged.
src/pkg/dashboard/webstatic/style_ratchet_test.go	Set the baselines to the merged tree's counts, computed by re-implementing the test's regex counters. The reimplementation gives exactly v5's current baselines on v5. Operator page: 1664/143/683/231/180. Hub static pages: 959/450/427/165/104.
src/docs/integration-guide.md	Union: v6's longer Spektacular row plus v5's new vibe-kanban (report-only) row.
src/docs/labels-and-control-signals.md	Took v5's needs-human row, which adds the claim escalation gate. Kept one governor.labels.exempt row with v6's citations, which point at v6's split config files.

Notes

• No test files were dropped by this merge. discord_commands_test.go, identity_setters_test.go and spektacular/adapter_test.go were already deleted on v6 before this merge, and v5 has not changed them since the merge-base.
• Builds and tests were not run locally; CI is authoritative.

Closes #10797

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

hive/awaiting-ci: pushed 9aaab16 — TestRecheckAttachesDiscoveryToRevision (merged from v5 #10752) now carries the same v6 skip guard as its siblings (Spek recheck disabled pending #10734). Probot DCO is non-blocking on forward-merges carrying others' commits (label dco-signoff: yes). CI pending — sweep will merge when green.

---

🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

Spot-checked the resolution table against the merged tree @9aaab16. Everything I could verify textually holds; I could not compile or run tests on this host, so CI remains authoritative for the Go side.

Verified:

• ADR renumber is complete. src/docs/adr/0021-opt-in-earned-codex-reset-redemption.md and 0022-planning-engine-boundary.md both exist; src/docs/adr/README.md:58-60 lists 0020/0021/0022 in order; a grep for ADR-0021 across src/**/*.{go,md,yaml} finds no remaining planning-engine references (only the Codex-reset ones that should stay).
• main.go port. src/cmd/hive/main.go:7483 calls recordAgentKickListings inside the v6 dispatchAgentKicks block (:7443); installClaimAdmissionCheck is wired at :3505; no recordAgentKickClaims reference remains anywhere under src/.
• index.html carries v5's heldIssues/heldPRs/blockedIssues KPI code (16 refs) and role="button" (11 refs), as the table says.
• No leftover conflict markers under src/ or bin/; every changelog.d/ fragment name uses a valid category prefix.

Not verified (no working Go toolchain here): that the style_ratchet_test.go baselines match the merged tree and that the v2-ci per-package coverage floors still hold — past v5→v6 top-ups have tripped those (e.g. #8854, #8886). CI will settle both.

One action for the merging maintainer: as the body says, merge with a merge commit, not squash, so v6 records v5 as a parent. The DCO failure is the usual forward-merge artefact (other authors' commits) and not something this PR can fix.

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

hive/awaiting-ci: the only red check is probot DCO, caused by 13 pre-existing merge commits already on v5 (maintainer merge commits, e.g. 3c3e35e, 19a6bb1, 1e219b1) carried over by this forward-merge. They cannot be re-signed without rewriting v5 history, so no fixup commit can turn DCO green. PR already carries dco-signoff: yes; remaining checks are pending — this needs a maintainer admin-merge once the gate finishes (same pattern as #8793).

---

🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

[kubestellar-prow]

Thanks for your pull request. Before we can look at it, you'll need to add a 'DCO signoff' to your commits.

📝 Please follow instructions in the contributing guide to update your commits with the DCO

Full details of the Developer Certificate of Origin can be found at developercertificate.org.

The list of commits missing DCO signoff:

• a8104b0 🐛 ci: keep stable promotion on hosted runners (script needs gh) (🐛 ci: keep stable promotion on hosted runners (promote-stable.sh needs gh) #10744)
• 692d068 🐛 hub: report real soak-crossing time as eligible_at, surface overdue promotions (🐛 hub: report real soak-crossing time as eligible_at and surface overdue promotions #10745)
• b893b01 🐛 release: accept later-candidate hives as smoke evidence for older eligible builds (🐛 release: accept later-candidate hives as smoke evidence for older eligible builds #10749)

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[hivecommons-hive]

🛑 Fix loop escalated — human attention needed

This PR has failed CI on 3 distinct fix attempts (new commits, still red). The hive has stopped dispatching further automated fixes for it.

Failing checks: DCO

Raw failure evidence (from check-run annotations):

test: Failing shard(s): test-rest,test-dashboard-shuffle
test (dashboard shuffle 1/2): dashboard shuffle 1/2: github.com/hivecommons/hive/pkg/dashboard.TestRecheckAttachesDiscoveryToRevision: 3 runs, 3 failures
test (rest 1/5): rest 1/5: github.com/hivecommons/hive/pkg/dashboard.TestRecheckAttachesDiscoveryToRevision: 3 runs, 3 failures
test (dashboard shuffle 1/2): pkg/dashboard failed under shuffled order (slice 1/2). Reproduce from src/ with: go test ./pkg/dashboard -short -race -count=1 -p 1 -parallel 4 -run '^(TestACMMCollapsedHeaderUsesReadableStatusPill|TestACMMEvaluation_ReportsIssueTracker|TestACMMIssue_LinearMisconfiguredIs500|TestACMMIssue_UnknownTra

Remove the needs-human label after addressing the root cause to return the PR to the automated fix lane.

[hivecommons-hive]

Scoped review only — this is a 53-commit / 166-file forward-merge and I did not read the merged bulk. What I did verify at 28457ad:

• ADR renumbering is consistent. src/docs/adr/ has 0021-opt-in-earned-codex-reset-redemption.md and 0022-planning-engine-boundary.md; README.md:60-61 lists them in order. Every remaining ADR-0021 reference in the tree (pkg/rotation/codex_reset_redeem.go, cmd/hive-quota-publisher/main.go, docs/env-vars.md:413, the codex-reset changelog fragment) is a Codex-reset reference, and there are no stale 0021-planning-engine paths. 17 files now reference ADR-0022. Matches the resolution table.
• The only red check is probot DCO, which fails on every forward-merge that carries other people's commits; it is not caused by this PR. build (linux/arm64) was still pending when I looked.

Info, not a defect of this merge: src/docs/adr/README.md:58-59 still lists two ADRs numbered 0020 (0020-external-work-source-boundary.md and 0020-spek-continuous-convergence.md). That collision already exists on v6 before this PR, so it's out of scope here, but since you were renumbering in the same file a follow-up could resolve it the same way.

For a maintainer: the body asks for a merge commit, not a squash so v6 records v5 as a parent — the one question a human needs to settle is whether CI (coverage gate, style ratchet baselines set by hand in webstatic/style_ratchet_test.go) goes green on this head; the author notes tests were not run locally. I have not reviewed the main.go or index.html conflict resolutions.

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

Reviewer adjudication: DE-ESCALATE — evidence: the only failing check is probot DCO; the 13 unsigned commits are hivecommons-hive[bot] squash-merge commits from already-merged v5 PRs (#10784, #10796, …) carried by this forward-merge, which DCO probot cannot verify — the known non-blocking false positive on v5→v6 syncs. Branch is 0 behind v6 (compare v6...head: ahead 53, behind 0), no files removed, test-file changes are additive (≈30 added/extended _test.go files, no test deletions), so the merge is lossless. changes: none needed — no rebase required since the branch is already current with v6 (and the diff carries .github/workflows/ files, which this tier cannot push anyway). tests: all GitHub Actions checks pass/skip except DCO; tide pending on approved/lgtm. remaining risk: none beyond the standard forward-merge; admin-merge should ignore DCO as on prior syncs (#8793, #8886).

— hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

[kubestellar-prow]

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[hivecommons-hive]

Conflict status at 28457ad (not pushing — this PR is labelled needs-human):

The branch was 0 behind v6 at review time; v6 has since advanced by two commits that overlap this forward-merge's ADR-0022 renumbering and Spek-recheck files, which is what flipped it to CONFLICTING:

• 1a7cf9af ✨ feat(dashboard): in-place Spek recheck on v6 (✨ feat(dashboard): in-place Spek recheck on v6 (revision bump, single lease) #10807)
• c77266a5 🐛 fix(dashboard): port v5 proxy-only outward discovery to v6 Spek recheck (🐛 fix(dashboard): port v5 proxy-only outward discovery to v6 Spek recheck #10809)

Overlapping paths: src/docs/spektacular.md, src/pkg/config/runs_config.go, src/pkg/dashboard/*recheck*, src/pkg/dashboard/campaign_discovery*.go. Note #10809 already ports part of the v5 discovery work this merge carries, so the resolution should prefer v6's versions of the recheck_discovery*/campaign_discovery* files and keep only the ADR-0021 → ADR-0022 renames from this branch in spektacular.md and runs_config.go.

Suggested human step: git merge origin/v6 into scanner/sync-v5-to-v6-10797 (merge commit, not rebase, to keep v5 as a parent), resolve the above, then admin-merge with a merge commit as the PR body describes. Covers #10797.

---

🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

Supersession sweep found that this PR's claimed issue is already closed by another merged PR.

• Claimed issue: hive#10797
• Closing PR: #10840

this PR touches files the merged PR did not. A human should decide whether to close this PR.

This comment is edited in place by the supersession sweep; it is not duplicated.

[clubanderson]

Closing as superseded by #10828, which forward-merges v5 through 1cdd8f1 (a superset of this branch) and resolves the ADR collision consistently with v5 (#10840: Codex reset → ADR-0022, planning-engine stays 0021).