Repository navigation
🌱 Forward-merge v5 into v6 (82 commits, manual: conflicts) - #16997
Conversation
A pack agent moved onto an inference gateway had its model cleared so the gateway's default_model would apply. When the gateway has none (the operator picked a model per agent on the dashboard), the agent launched with no model, crash-looped and was paused by the watchdog. It now takes the model the operator's agents on that gateway run, and a crash-loop pause on an agent this repairs is resumed. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: MikeSpreitzer <14296719+MikeSpreitzer@users.noreply.github.com>
* fix(packs): clarify gateway model reconciliation logs Hive-Run: #16732 Hive-Plan: gateway model reconciliation review Hive-Spec: issue-16732#gateway-model-log Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> * fix: document gateway model log change Hive-Run: #16732 Hive-Plan: gateway model reconciliation logs Hive-Spec: gateway-model-logging#changelog Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> --------- Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com>
Hive-Run: #16733 Hive-Plan: gateway model fallback Hive-Spec: gateway-model-reconciliation#override-loss Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com>
Hive-Run: #16737 Hive-Plan: docs-currency Hive-Spec: repo-acmm-onboarding#readiness Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Hive-Run: #16742 Hive-Plan: citation drift correction Hive-Spec: repo-acmm-onboarding#hive-wide-readiness Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com>
…ntime error (#16749) * 🐛 fix(ioscan): do not fleet-report an unconfigured classifier as a runtime error Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * 🐛 fix(ioscan): address review findings on unconfigured-classifier WARN - Add isNoEndpointErr helper so fail-closed and fail-open share the no-endpoint special-case instead of duplicating the substring check. - Add classifierFixHintOpen so the fail-open branches no longer recommend fail_mode: open, which is already in effect there. - Update fleet-report.md: the fail-open no-endpoint case now logs "ioscan classifier not configured" and is not fleet-reported. Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…16719) Keep governor-supplied work discovery restrictions while describing merged-only history reads as conditional on wrapper and tier permissions. Add regression coverage for the injected header and remove its categorical proxy-block claim. Hive-Run: #16714 Hive-Plan: kick-header-work-source-rule Hive-Spec: issue-16714#governorWorkSourceRule Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: thatguywob <thatguywob@users.noreply.github.com>
* 🐛 fix: keep superseder decision questions parked Preserve a sign-off-only superseder park and show the reviewer's question instead of silently approving it through the automatic superseder rule. Hive-Run: #16679 Hive-Plan: superseder-decision-question Hive-Spec: issue-16679#decision-question Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> * 🐛 fix: preserve scope auto-decisions for hive superseders Classify recorded reviewer questions with the existing review classifier and keep the superseder parked only for policy sign-off questions. Read every changed-file page, including rename origins, and fail the delegated run if the classification cannot read the files. Cover scope approval, policy sign-off recommendations, hard-stop precedence, workflow and config policy edits, pagination, renames, and file-read failures. Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> --------- Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: thatguywob <thatguywob@users.noreply.github.com>
* 🐛 fix(packs): retain gateway placement after override loss Use persisted pack gateway placements as fallback votes when runtime overrides disappear and no operator backend picks remain. Carry their copied model to agents added at later ACMM levels while preserving operator choices and gateway defaults. Fixes #16740 Hive-Run: #16740 Hive-Plan: preserve gateway placement after override loss Hive-Spec: #16740#gateway-placement Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> * 🐛 fix(packs): wire named gateway in placement regression Register the gateway backend checker in the named-gateway regression setup, matching production validation before setting overrides. Document how retained pack-owned gateway placements count after operator overrides disappear. Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> * 🐛 fix(packs): use host interface for gateway test wiring Access the gateway backend checker through crux.Host, since the dashboard dependency exposes the narrower crux.Runtime interface. Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> --------- Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: thatguywob <thatguywob@users.noreply.github.com>
Honor usable Retry-After headers after HTTP 429 and suppress ntfy delivery until the deadline. Without a usable header, back off from one minute to one hour and reset after successful delivery. Keep other notification channels independent. Hive-Run: #16689 Hive-Plan: ntfy-rate-limit-recovery Hive-Spec: issue-16689#evidence Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: thatguywob <thatguywob@users.noreply.github.com>
* ✨ feat(settings): expose merge-train controls in Auto-merge Expose nested merge-train controls with owner-only partial API updates and persistence-aware explicit-zero stall warnings. Hive-Run: #16677 Hive-Plan: merge-train-settings Hive-Spec: #16677#proposed Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> * 📖 docs: refresh dashboard API source citations Resync the 201 route citations shifted by the new merge-train PATCH registrations using the repository citation fixer. Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> * 📖 docs: publish merge-train PATCH API contracts Document the registered auto-merge and governor PATCH routes in OpenAPI and the API reference, including merge-train validation and effective responses. Fixes the CI route parity failure. Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> --------- Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
StateIdle is published before runSandboxKick finishes its deferred disk writes. Join the real sandbox run persister in test cleanup so temporary work-dir removal cannot race the remaining writes, including when assertions fail. Hive-Run: #16724 Hive-Plan: stabilize-review-spool-registration Hive-Spec: issue-16724#ci-flake Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: thatguywob <thatguywob@users.noreply.github.com>
…e loads (#16755) * 🐛 fix: decision pills no longer flash disabled while the viewer's role loads On a hard reload the stage tracker's first paint ran before the auth fetch had named the viewer, so stageTrackerActionCtx read the missing role as 'read' and every role-gated decision option rendered aria-disabled with a sign-in reason until the next tracker poll. - stageTrackerAuthPending: unknown is not read. While auth is pending the ctx is optimistic (user/canHuman true, canHold null), so the pills render enabled and a click that beats auth gets the server's 403. - showGHAuthState marks auth known on both paths (and checkGHAuth when both endpoints fail) and repaints the tracker once when the user/role actually changed. - Logged-out viewers still see the disabled pills with the sign-in reason once auth is known. Fixes #16754 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * test: selection-bar assertion checks the role-gated chips, not row state Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…await a verdict (#16757) The stage engine files every base-refresh reason under 050, and the 050 caption and next-move line are composed from the stage alone, before the review track for the head is attached. A train member with an approved head therefore read "waiting for a verdict on the current head" next to a Review 5/5 approved chevron. Once the review track is known, rewrite the queued-behind 050 row to "Approved N/M · queued for base refresh behind PR #<front>"; reviewing heads and the 060 wording are unchanged. Fixes #16756 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
* 📖 docs: clarify permitted merged PR history reads Keep quality work discovery scoped to the governor-supplied queue while documenting merged-only history reads conditional on wrapper and tier permissions. Hive-Run: #16700 Hive-Plan: docs-currency-quality-prompt Hive-Spec: #16700#merged-pr-history Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> * 📖 docs: align quality variants with merged history guidance Keep every quality mode consistent with the conditional history guidance and cover both source and embedded copies in the regression. Hive-Run: #16715 Hive-Plan: quality-policy-variant-parity Hive-Spec: #16715#quality-policy-variants Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> --------- Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
The capture walk's depth and entry budgets, the newest-wins ordering in consider, and the id checks that keep a transcript-read id shell-safe (over-length, non-hex codex uuids, unterminated goose session.id, dot-prefixed names) had no test reaching them; neither had omp's -tmp-<relative> and bare-root session buckets. These are the guards that stop a large or hostile session tree from stalling the PR-opened hook or smuggling metacharacters into a resume command, so each now has a test that fails without it. Signed-off-by: quality <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: quality <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…16760) * fix(github): post the prow/lgtm warning once with a live context Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix(github): keep the prow/lgtm warning on the caller's cancellation The detached warning context ignored lifecycle cancellation, so a hung comment bridge held the operator queue for the full warning timeout. Only the deadline is renewed now; a withdrawn caller posts nothing. The fake API gains the /user route the marker lookup needs, and the scale-envelope citation is re-anchored. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix(github): follow only the caller's cancellation for the prow/lgtm warning The AfterFunc tied the warning context to any Done() of the caller, so a caller whose deadline expired mid-warning still cancelled the lookup and post, reproducing the deadline-exceeded error from #16753 with no marker left behind. Cancel the warning context only on context.Canceled, and cover a live-but-short caller deadline against a slow comment handler. Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * docs(scale-envelope): re-anchor the RankActionableIssues citation The client.go edit shifted the function; the docs-citations check anchors on AgeMinutes inside the cited range. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The ⋯ decision Next sentences, the Approve-and-let-hive-merge consequence and the GitHub approval note used the lane's internal word "sweep"; they now say "next merge pass" per #15575. Adds a ratchet test over the decision result/option/note builders. Fixes #16767 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…16771) * ✨ feat: PR in progress chevron names the actor with their kind icon A lit PR in progress chevron reads "PR in progress · @login" with the actor's kind glyph (hive / clanker / person), the way "Waiting for @x" names its person. The recorded holder leads, then stage_actor.login, then the PR's author; the name rides inside the clamped chevron copy so it truncates like every holder, the icon sits outside it, the tooltip carries the full text, and nobody known keeps the bare word. Fixes #16770 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * fix: PR in progress actor never names the issue's own author An issue drawn through a covering PR with no author fell back to the issue's author via stageTrackerReturnedAuthor; the helper now resolves the one PR drawn here itself and keeps the bare word when it has none. Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Hive-Run: #16763 Hive-Plan: community-meeting-links Hive-Spec: issue-16763#proposed-action Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…16736) * feat(github): auto-approve gated workflow runs for trusted actors Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(github): bind workflow-run approval admission to the approved head The sweep trusted a PR for the automerge label alone, which is bound to no head and names no approver. Read the stage record's head-bound admission (dashboard Approve by a verified owner or merger, #15136) instead; a label on its own never approves a run. Move the ledger mutations into markDeniedCounted/claim so the once-per-head invariant lives on the ledger type. Document that the default-on sweep needs the App's Actions: Read and write and how it relates to /ok-to-test. Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * docs(github): state the App-actor trust boundary for gated-run approval Document why trusting the App as a run's triggering actor cannot approve contributor code: GitHub gates only fork pull_request runs and the App cannot push to a fork, so an App-pushed same-repository branch is never gated. Code comment on workflowApprovalTrusted and the operator reference. The default of governor.ci.auto_approve_workflows stays as #16603 specifies (on); flipping it is the owner's call, not a code defect. Hive-Fix-Attempt: 2/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * docs(github): state which approval paths reach fork heads github-app-setup.md still said Hive never approves fork heads, which the gated-run approval sweep contradicts: GitHub holds only fork pull_request runs behind the gate, so the sweep (and the registry-trusted contributor lane) are exactly the paths that approve fork heads with the App token. Say so, keep the sentinel-alert exclusion, note the same second exception in the operator-reference automerge bullet, and document that a trusted author covers runs a fork collaborator pushed to the head. Hive-Fix-Attempt: 3/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * docs(github): name the approval sweep as the primary cure for held runs operator-reference "Held and never-started required checks" now leads with the default-on gated-run approval sweep (App token, Actions: Read and write) and describes /ok-to-test as the fallback that never reaches fork heads; hive-merge.md no longer claims the hive never approves a human-authored lane's held runs, since dashboard-admitted heads are approved by the sweep. Hive-Fix-Attempt: 4/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * docs(github): state that a recorded approval refusal is not retried on the same head Spell out the operational consequence of the once-per-head ledger in the operator reference and App setup guide: granting Actions: write after a 403 was recorded does not retry that head; a new push, a restart, or Approve and run on GitHub is needed. Hive-Fix-Attempt: 5/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * docs: align operator docs with the workflow auto-approval sweep Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…goes offline (#16776) * 🐛 fix(stream): watchdog restarts ffmpeg and the pod when the channel goes offline ffmpeg can sit at speed=1x for hours after Twitch drops the ingest session, with the pod 1/1 Running and the channel offline (hivecommons, 2026-11-04 and 2026-11-05). Move the stall watchdog into stream-watchdog.sh and teach it to ask Twitch whether TWITCH_CHANNEL_LOGIN is live (public GQL Client-Id, or Helix with app creds): N misses outside a grace window restart ffmpeg with exponential backoff, M relaunches still offline exit the supervisor so Kubernetes restarts the container. A heartbeat touched only while frames advance and the channel is live drives healthcheck.sh; probe windows now cover the ~2 min key lock Twitch holds after a publisher drops, which today's startup probe tripped on. Fleet, base and matrix get TWITCH_CHANNEL_LOGIN and a 15 s terminationGracePeriodSeconds. Fixes #16775 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * 🌱 stream: silence SC2329 on the trap handler so the new shellcheck step passes Signed-off-by: Andrew Anderson <andy@clubanderson.com> * 🌱 stream: resync PR head after GitHub push outage Signed-off-by: Andrew Anderson <andy@clubanderson.com> * 🌱 stream: re-pin the hivecommons stream config hashes for the watchdog change The pin guards against the fleet work touching twitch.tv/hivecommons by accident; this PR changes it on purpose (TWITCH_CHANNEL_LOGIN, probe windows, terminationGracePeriodSeconds, compose passthrough). Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…of "hive unavailable" (#16782) The preview answered every failure as 502 — a PR merged since the row loaded, an intermittent GitHub 500 on check-runs — and the hosted Ingress intercepts 502/503 and swaps the body for its generic outage page, so the owner read "hive unavailable" for a hive that was up. - retry transient GitHub failures twice with backoff before giving up - answer not-open as 409 and unrecoverable reads as 424, never 502/503, with {reason, retryable, attempts, elapsed_ms, hive, hint} - log a Warn with the real error on every failed plan - the dialog names the hive, explains the failure (merged since the row loaded / GitHub failed after N attempts / no GitHub client / gateway 502), hides Retry when it cannot help, and says Let hive do that stays off until a preview loads Refs #16776 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
* docs: correct Prow LGTM error comment Hive-Run: #16761 Hive-Plan: correct bindProwLgtm documentation Hive-Spec: issue-16761#reporting-error Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> * docs: add changelog for Prow LGTM comment Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> --------- Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…es transient POST failures, and distrusts fork heads on the actor path (#16783) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…the check digest (#16781) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Hive-Run: #16690 Hive-Plan: phone navigation label Hive-Spec: issue-16690#phone-navigation-label Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
* fix: classify REST reserve shedding as rate limiting Hive-Run: #16784 Hive-Plan: issue-activity-reserve-classification Hive-Spec: fleet-report#unclassified-error-repeated Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> * chore: add changelog fragment for #16784 Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. clubanderson this PR is held at Failing checks:
Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path. |
|
CI report for 1. On this head -`src/pkg/config/governor_config.go:303-314`
+`src/pkg/config/governor_config.go:317-336`or run 2. DCO / dco / tide: non-blocking on forward-merges carrying others' commits, as the body notes. 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
… landed Part of #7563 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
3e788b5
ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @clubanderson, head
Hive did not add the |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Signed-off-by: Danathar <Danathar@users.noreply.github.com>
…verdict Signed-off-by: Danathar <Danathar@users.noreply.github.com>
…ner-edits Signed-off-by: Danathar <Danathar@users.noreply.github.com>
…p-bots Signed-off-by: Danathar <Danathar@users.noreply.github.com>
…doption Signed-off-by: Danathar <Danathar@users.noreply.github.com>
Signed-off-by: Danathar <Danathar@users.noreply.github.com>
Manual forward-merge of
v5intov6(82 commits; merge base4b4177cea, v5 tip9a485a7f9). The automatedv6-topup.ymlrun has refused to open a PR since 2026-11-06 becausegit merge v5conflicts. 62 files conflicted; each was resolved by hand under the standing top-up rules (v5 wins unless the v6 side is intentional v6-only restructuring; port v5 behaviour into v6's structure rather than resurrecting v5 files; keepDashboardMatrixConfig;discord/stays deleted; 7-tile grid; v6 dispatch relocation + v5 fixQueue both kept; the two auto-resolve patterns in the workflow file).Part of #7563
Conflicts and resolutions
bin/gh-wrapper.sh,bin/gh-wrapper.test.shgh pr list --state mergedallowance) over v6 #16686 narrowing — judgement call.hold_guard_mergeability_test.go,main_helpers.go,main_sweeps.go,dependency_bot_*automerge_update_branch*.goupdateBranchAndSkipwithpr *gh.PullRequest.automerge_contributor_workflow_approval.go(+test),automerge_review_gate.go,automerge_review_head_binding_test.go,automerge_human_changes_requested.goreviewReachesHead) with v5 #16858BaseRefreshCheckercomment/marker carry into oneworkflowApproval{Login,Typed,AnswersVerdict,CarriedFrom};latestTrustedHumanApprovalReachreturns(login, carriedFrom, ok); audit marker getsfrom=<sha>whenever carried by either mechanism. v5 wording ported intostagelabels/human.go,prstage/causes.go,pr_approve_command.go;decisionActionsstays removed on v6 (stagelabels.DecisionActions).automerge_stage_sharedci.go,automerge_stage_labels.go,prstage/types.go,automerge_fork_guard_test.gofoldForkGuarddigest check, v6 #16814carriedForkGuardby lane reason). Kept both: a carried guard is flaggedForkGuardCarriedand verified against the head's check digest infoldForkGuard; dropped when another check is red, so a real failure is still nudged/adopted. v5 test adapted to v6'sforkPRfixture and the #14306 "never re-home a fork" rule.api_repo_item_decide_delegated_plan.go,delegated_gather_error.go(+tests),tracker-actions.js,index.html{ok,error,reason,retryable,attempts,elapsed_ms,hive,hint}+ retries and v6 #16951 429/Retry-After. Rate-limit is the first classification case (429,reason: github, not retried);delegatedGatherErrorwriter replaced bywriteDelegatedPlanFailure.config-helpers.js,index.htmlindex.htmlregenerated viawebstatic/gen.pkg/config/config.go→governor_config.go,dashboard_config.go,github_api_budget.goconfig.gokept at v6 (workflow auto-resolve rule); v5GovernorCIConfig,merge_train_stall_warn_sexplicit-zero handling ported into v6's split files.audit.goconfig_governorrow.pkg/policies/defaults/quality*.md,src/policies/quality*.md,scheduler/kickmessage.gogovernorWorkSourceRule= v5 merged-history allowance + v6--comments/hive-ghcompact form; the five quality templates carry the identical sentence (otherwiseaddGovernorWorkSourceRuleappends a second copy).pkg/github/issue_blocked*.goTestReconcileBlockedIssuesBlockedOnIssueadapted to v6's marker-less →needs-humanask behaviour.docs/api-reference/*.md(9 files),operator-reference/README.md,hive-merge.md,scale-envelope.md,agent-configuration.md,labels-and-control-signals/{reference,stage-labels}.md,dashboard-sections/activity-monitor.md,github-cli-compact.mdbehind, blocked-on-issue #16852, plan failure body). API-reference tables: ours rows + v5-only rows, citations re-resolved withcheck-api-reference-citations.sh --fix.kickmessage.go,issue_blocked_test.go,pr_decision_base_refresh_test.go,notify,delegatedecision,fleetreport,hub,review,crux/*Verification (local)
gofmt -lclean (two pre-existing v6 files unchanged),go build ./...,go vet ./...,golangci-lint run ./...→ 0 issues.go test -coveron touched packages: config 90.3, delegatedecision 92.8, fleetreport 93.0, hub 89.0, notify 94.7, review 92.3, stageengine 92.3, prstage 94.7, stagelabels 91.6, cmd/hive 75.0; dashboard / github / automerge / policies / scheduler re-run after the test adaptations above (CI shards confirm).bin/gh-wrapper.test.sh,bin/contributor-agent.test.shrunning.Ignore probot
DCO/ prowdco/native-queue-policy: they always fail on forward-merges carrying others' commits.