Skip to content

🌱 Top up v6 with v5 (durable hosted hive.yaml, shared-CI deferral naming and 118 more) - #17506

Closed
clubanderson wants to merge 121 commits into
v6from
topup/v5-to-v6-20261109
Closed

clubanderson wants to merge 121 commits into
v6from
topup/v5-to-v6-20261109

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Forward-merge of origin/v5 into v6 (120 commits). Plain --no-ff merge commit β€” merge with --merge, not squash, so the v5 history is carried.

Commits carried

Conflict resolution (36 files)

File Resolution
discord/package.json, discord/package-lock.json kept removed (v6 dropped the legacy Discord bot in #9277)
src/cmd/hive/github_client_config.go both: v6 RedMain/MaxOpenHeldPRs setters + v5 SetAdvisoryDigestMinInterval
src/cmd/hive/main_helpers.go v5 IsBaseRefreshAwaitingAdmission deferral ahead of v6 ClassifyBranchUpdateError switch; a dirty held PR on a deferral still routes to UpdateStopConflict so the conflict notice posts (v5 TestMaintainHeldPRMergeabilityStillNotesConflictWhenBaseRefreshIsScheduled green)
src/crux/agent/manager_launch.go v6 clearStaleModelRejectionLocked + v5 markCLILaunchedLocked
src/pkg/github/app.go both: spektacular-read (v6) + agentmode.SecCheckTier (v5)
src/pkg/github/issue_blocked.go v5 stripHelpWanted + v6 liftBlockedMarkerless doc
src/pkg/fleetreport/runtime.go, _test.go both classes (ClassAgentGitHubCapReached + ClassCopilotCLIHung)
src/pkg/dashboard/contribute_ws.go v5 ordering (verify + recordCompletionPRClaim early), v6 completeImplementStage/releaseImplementStageUnverified inside the completion block
automerge_contributor_lane.go, automerge_sweep_loop.go c.mergeTrainEvalContext(mergeDecisionPriority(ctx), train, number) β€” v5 helper wrapped with v6 priority
automerge_stage_human.go v5 readyEntryCause + v5 condition with v6 && !headBound guard
src/pkg/stageengine/derive_pr_classify.go stageNeedsHumanReasons = v5 set + v6 contributorLaneReasonReviewOff; v5 held-gate block + v6 linked-issue guard
src/pkg/config/config.go v6 split layout kept; v5 hunks ported: SaveSeq β†’ config.go, DigestMinInterval β†’ advisory_config.go, CIFailureCooldown β†’ governor_config.go, ResolvedConfigPath/PersistedConfigPath/saveSeq.Add β†’ save.go
static-src/js/config-state.js, tracker-actions.js, tracker-row-render.js union of both sides
bin/hive-open-issue.sh, bin/test_hive_open_issue.sh union (v6 withdraw-decision/step-kind/release + v5 --claim); CLAIM_ON_CREATE is python argv[24]
src/docs/api-reference/*.md, scale-envelope.md v6 (current line numbers), v5 /api/heartbeat description kept in hub-server.md
github-app-setup.md, github-write-surface.md, hive-open-issue.md, glossary-and-operations.md, reference.md, activity-monitor.md, stage-labels.md hand-merged prose, both sides
CHANGELOG.md both; v5.205.0–v5.211.6 sections placed after the v6 sections
src/pkg/dashboard/static/index.html regenerated via make dashboard-gen (dashboard-gen-check passes)
.github/scripts/integration-governance.cjs TRUSTED_SCRIPTS_TREE re-pinned to 46dfc95a63a98448be26aceb92c8289c205776c2 (= git rev-parse HEAD:src/scripts)

Checks

  • go build ./..., go vet, targeted tests for config/github/stageengine/fleetreport/crux-agent/cmd-hive/webstatic: green except the pre-existing macOS /var-symlink memory-drain tests.
  • bin/test_hive_open_issue.sh: 71 PASS then the pre-existing urlbot exit on macOS bash (same on clean v6).
  • DCO / native-queue-policy reds expected on a top-up (carried v5 commits).

Karibhou and others added 30 commits November 8, 2026 20:23
…17274)

validateWorkspace cleaned workspace_path and compared it to
workspace_roots as a string prefix, then os.Stat followed symlinks. A
link under a root (<root>/x -> /), which a previous run can plant in its
read-write workspace, passed the check and the backend mounted its
target read-write.

The path is now resolved with filepath.EvalSymlinks and the resolved
form is checked against the resolved roots (so a root reached through a
link still works); a path resolving outside is refused 403. The run
mounts and records the resolved directory, so the backend never follows
a link the check did not see.

Fixes #17029

Hive-Run: #17029
Hive-Plan: review-backlog/security
Hive-Spec: crux-runs#workspace-roots

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>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.205.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.206.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
* πŸ› crux: confine agentstep workspace file access with os.Root

agentstep read and wrote step files on the host with plain os calls after only a lexical '..' check, so a symlink in the workspace (carried by a provisioned repo, or planted by the sandboxed agent for answer files) redirected host-side reads/writes as the serve uid. All prompt_path reads, prompt writes and answer reads now go through an os.Root opened on the workspace, as review_request_sandbox_spool.go and runs.validateWorkspace do.

Closes #17293

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ› crux: create .crux parent before symlinking steps dir in agentstep test

TestSymlinkedCruxDirCannotRedirectThePromptWrite symlinked .crux/steps without creating .crux first, so os.Symlink failed with ENOENT before the assertion ran.

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>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.206.1 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
)

* πŸ› hold guard: log deferred base refresh at debug instead of WARN

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ› hold guard: scope base-refresh deferral to behind so dirty held PRs keep their conflict notice

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>
…hs beside a conflict (#17304)

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.206.2 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…7305)

* πŸ› contribute: convert a PR-covered contributor claim instead of releasing it on lease revoke

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ“– api-reference: refresh claims_api.go citations after lease-revoke change

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ› contribute: hold the claim from the verified task_complete PR, not the scan ledger

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>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.206.3 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…uest (#17306)

* ✨ hive-open-issue: --claim files and claims a self-filed issue in one request

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* 🌱 test: decode the bare label array go-github posts in the create-claim fake

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* fix: route the --claim help-wanted strip through the shared blocked-sweep helper

TestDirectWriteRatchet failed on CI: the --claim path added an eighth
wrapper write (RemoveLabel) to issue_request_watcher.go, whose baseline
is 7 and may never be raised. Generalize the blocked sweep's
stripBlockedHelpWanted into stripHelpWanted in issue_blocked.go (where
that removal is already baselined) and call it from claimCreatedIssue, so
the watcher file gains no new direct write and the single help-wanted
removal the claim test asserts still happens.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ› hive-open-issue: refuse the filer on hub dispatch, bind the marker to the filer, ledger the --claim

Review findings on #17306 (#17299):

- The hub's own scanner dispatch (installClaimAdmissionCheck) still called
  the agent-less IssueDispatchBlockReason, so an issue a lane filed without
  --claim was handed back to that lane β€” the #17243β†’#17250 shape. A
  KindAgent request now goes through IssueStartBlockReason with req.Holder
  (the agent name), and a test asserts the filer's dispatch is refused with
  ClaimBlockReasonFiledForHelpPrefix while another agent is admitted.
- withFiledForHelpMarker left a body alone when it already carried any
  marker, so a filer could seed `<!-- hive:filed-for-help other -->` and
  never be bound. Any pre-existing marker is now dropped before the filer's
  own is appended; tested with a seeded foreign marker, and the agent name
  is validated against a named pattern instead of round-tripping through the
  marker regex.
- claimCreatedIssue applied the labels and facts but never raised the agent
  start signal, so the hub's claim ledger was not written for a --claim
  create. It now fires AgentStartSignalClaim like a `claim` request; the
  create-claim test records the hook and asserts one call for #99.
- Docs: the filed-for-help refusal sentence sits beside the other `claim`
  refusals; the filing section notes the dispatch refusal, marker
  replacement and ledger signal.

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>

* πŸ› hive-open-issue: ledger the --claim via a filed-claim start signal the hub lists

A self-filed issue was never in a kick, so the plain `claim` start signal
the create+claim path raised went through ClaimOnStart with started=false
and the hub's ledger never recorded the claim: dispatch admission Lookup,
the PR-request gate and the claim listing all saw it unclaimed. The create
path now raises AgentStartSignalFiledClaim; recordAgentStart treats that
signal as the issue's own listing (MarkListed, then ClaimOnStart through
the normal admission check). Ledger-backed test in cmd/hive.

Hive-Fix-Attempt: 2/6
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* 🌱 hive-open-issue: document the --claim allowlist exception, share the help-wanted strip, keep the marker off fold comments

The write-surface catalogue said same-path side effects ride the parent
operation's allowlist entry, but the claim performed on --claim is gated
on its own claim allowlist and audited as agent_issue_claimed; the
create_issue row and the side-effects paragraph now say so, and the
hive-open-issue doc names the allowlist requirement.

The --blocked-on-pr comment path removed help wanted directly, so
stripHelpWanted's single-call-site claim was false; it now goes through
the helper.

The filed-for-help marker was appended before consolidation and so landed
in file-set, component and subject fold comments on someone else's issue,
where nothing reads it. The fold renderers strip it.

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>

* πŸ› hive-open-issue: exempt --parent children from the filed-for-help marker, collapse blank lines only on strip

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>
…er author (#17303)

* πŸ› pr-request: refuse Fixes/Closes targets claimed or covered by another author

A PR request could close an issue a contributor had claimed and covered
with their own open PR (#17243: #17250 superseded #17248). The watcher
now checks each closing reference before booking a start: a live claim
by another principal, or an open covering PR by an author outside the
hive, rejects the request (gate claim) and posts one marker-deduplicated
notice on the issue. A failed lookup fails closed.

Closes #17298

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ› pr-request: own-claim exemption checks claim kind and hive; scope claim notice to served repos

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* 🌱 test: cover the closed-covering-PR release and the forge-assignee claim read

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ› issue-request: run the claim-target gate on the start path before notifyAgentStart

Review of #17303 (intent-alignment): #17298's acceptance criteria require
the kick/start path to run the claim/coverage check before a start is
booked, but only the PR-open leg was gated. A claim or a start-announcing
relay comment on an issue another principal has claimed, or covered with
an open PR, now goes through the same prRequestTargetBlock before any
write and before notifyAgentStart: refused with a policy reason and the
deduplicated notice, retried on a lookup error (fail closed). The retry
path is extracted into failIssueRequest so both callers share it.

Hive-Fix-Attempt: 1/6
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ› pr-request: name the refused action in the claim-target notice

The notice posted on a refused target issue hard-coded "asked to open a
pull request ... No PR was opened", so a refused `hive-open-issue claim`
or start comment described an event that never happened. Thread the
action (open-pr / claim / start) into the notice body, assert the
start-path wording in TestIssueRequestStart_RefusesContributorClaimedTarget,
and document the new refusal reason in the hive-open-issue `claim` section.

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>

* 🌱 test: serve the comments list in the in-progress relay fixture

With issue claims on, the start-path claim-target gate reads the forge
marker from the issue's comments before applying the claim; the fixture
404'd that read, so the gate failed closed and
TestIssueRequestWatcher_ClaimLeavesCommentToLedgerWhenClaimsOn lost its
ownership label.

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* πŸ› pr-request: claim-target gate rejects a missing target and skips pull requests

With issue claims on, a closing reference to a nonexistent issue 404ed
in prRequestTargetClaim and came back as a plain error, so the request
was failed and retried until the horizon quarantined it; before #17298
the same request was permanently rejected with the cross-repo hint. The
404 is now mapped to that policy error in validatePRRequestTargets.

The start-comment gate also fetched PRs via Issues.Get and inferred a
claim from assignees, refusing a hive start comment on a contributor-
assigned PR. A target that is a pull request now passes the gate.

Docs: name the dispatch-block gate explicitly where the inserted
claim-target paragraph left 'the same gate' ambiguous.

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>

---------

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>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.207.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.207.1 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…17321)

The scheduler's injection-cap WARN is the operator-side notice that a repository's AGENTS.md outgrew the cap (#12129): repo content, the cap working as designed, not a hive defect. Every kick re-logs it, so one oversized repo crossed the repeat threshold and was filed as an unclassified error (#17318). Exempt the exact message from the feed; 'agentsmd: parse failed, skipping injection' stays reportable.

The warning also printed cap_bytes=0, the config 'use default' sentinel. Log the effective cap instead.

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…ash (#17323)

* πŸ› watchdog: stop paging PaneShowsLogin on a relaunched CLI's login flash

A Copilot CLI relaunched mid-life (kick restart, memory-drain recycle,
watchdog restart) paints login chrome for ~0.5s while it re-validates its
token. Classify dated boot grace from the agent's original StartedAt, so a
22h-old agent got no grace and a single sighting flipped
Authenticated=False/PaneShowsLogin and paged the operator.

- Observation.LastLaunchAt records the most recent CLI spawn
  (markCLILaunchedLocked); boot grace uses the later of StartedAt and it.
- ApplyLoginStreak holds auth-required back until login chrome has been
  seen on Settings.LoginStreak consecutive polls (liveness.login_streak,
  default 3), mirroring the pane poller's loginStreak guard. Below the
  threshold the pane is unknown with reason 'login chrome seen 1/3 polls'.

Fixes #17320

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* test: add Liveness.LoginStreak to the agent-runtime config golden

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* dashboard: reference governor.watchdog.liveness.login_streak in the Watchdog settings help

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…7326)

The popover opened from the Merged pill was capped at 34rem, so every
PR title ellipsised at ~40 characters. Set it to 52rem, capped to the
viewport and to the sticky bar that clips it (it is right-anchored
under the pill and grows leftward). The title column is the grid's only
flexible track, so the width goes to titles; the by/lane/time meta
column keeps its natural nowrap width. The merge-queue popover keeps its
old 22–34rem sizing and the ≀720px phone sheet is a separate dialog and
is unchanged.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
#17325)

A PR closing two issues is drawn once, under the lower issue; the other
issue chips to it. Its row fell back to the issue's own 030/040 stage for
the lane while the merge-gate word still came from the PR, so #17302 read
"Soaking Β· 47s left" in the PR in progress lane while #17292 soaked in
the Merge queue. stageTrackerLinkedRiding picks the furthest covering PR
drawn elsewhere and the row, column map and sort order ride its stage;
the PR column stays empty and the "under #M" chip still names the PR.

Fixes #17324

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.207.2 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
#17331)

* πŸ› contributor nudge: per-PR CI-failure cooldown and failing-set dedupe

CI-failure nudges are keyed on the failing-check set rather than the lane's
reason prefix. The same set on a new head, or a check joining the set on the
same head, edits the PR's one nudge comment (marker gains checks=<digest>
attempt=<n>; no relay re-dispatch for the same head). A changed set on a new
head within governor.labels.stage.contributor_nudge.ci_failure_cooldown
(default 6h) is folded into the comment instead of counting as a fresh
nudge. The ledger persists in the stage-label store across restarts.

Fixes #17328

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* test(config): golden gains contributor_nudge.ci_failure_cooldown

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…stage instead of forcing needs-decision (#17334)

Sentinel alerts and hold-class labels are gates, not stages (owner decision
2026-11-08). The stage engine now routes a gated PR by its head's evidence
like any other human hand-off β€” CI / 070 while checks run or fail, 071 on a
reviewer question, 090-ready-for-human-merge when the head is otherwise
clean β€” and keeps the gate reason on the route so the entry comment reads
"Held: a sentinel alert is open on this PR. The hive never merges this head
while the gate stands." and the dashboard popover still explains the stop.

The gate remains a hard merge stop: the automerge lanes and the dashboard's
delegated human-merge shortcuts refuse on the label itself, never on the
stage number (tests pin a 090 PR with a sentinel alert or hold refused by
the contributor, self-authored and trusted-author prefilters and by the
dashboard's human-merge decision/outcome paths).

Dashboard: a held 090 row's Merge queue cell reads "Held Β· sentinel Β·
confirm intent" / "Held Β· hold" (amber ham-held, tooltip with the gate's
reason, the route reason and the rule), never "Queued for merge"; the
sentinel question's Approve / Let hive decide / direction / close actions
stay available from that cell. needs-human keeps parking at 085.

Fixes #17327

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.207.3 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
hivecommons-hive Bot and others added 2 commits November 10, 2026 02:36
* πŸ› fix(hub): make /etc/hive/hive.yaml durable on hosted spokes and report the persisted config path

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>

* πŸ“– docs(config): reconcile config-layering with the #17468 symlink and pin Save() in-place write

Review follow-ups for #17471:

- config-layering.md: the 'On Kubernetes' paragraph still said the entrypoint
  copies the runtime config over the config path; it now covers the linked
  steady state and the unlinked cases. The #17468 block moved below the
  'Outside Kubernetes' paragraph so that paragraph keeps its subject, which
  is now also named explicitly.
- config.go: comment at the Save() write site explaining that the in-place
  O_WRONLY|O_TRUNC write (not temp-file+rename) is what keeps the hosted-spoke
  symlink intact, and TestSaveThroughSymlinkKeepsLink pinning it.
- config.go: refresh the pre-#2402 'recovery copy' / 're-seeds on every boot'
  comments on the runtime write and DashboardOverlayFile.

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(config): scope /etc/hive/hive.yaml durability to re-provisioned spokes and add the boot-line verification step

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>
Signed-off-by: Andrew Anderson <andy@clubanderson.com>

# Conflicts:
#	.github/scripts/integration-governance.cjs
#	CHANGELOG.md
#	bin/hive-open-issue.sh
#	bin/test_hive_open_issue.sh
#	discord/package-lock.json
#	discord/package.json
#	src/cmd/hive/github_client_config.go
#	src/cmd/hive/main_helpers.go
#	src/crux/agent/manager_launch.go
#	src/docs/api-reference/auth.md
#	src/docs/api-reference/dashboard-misc.md
#	src/docs/api-reference/health-status-events.md
#	src/docs/api-reference/hub-server.md
#	src/docs/api-reference/snapshots-and-style.md
#	src/docs/dashboard-sections/activity-monitor.md
#	src/docs/github-app-setup.md
#	src/docs/github-write-surface.md
#	src/docs/hive-open-issue.md
#	src/docs/labels-and-control-signals/glossary-and-operations.md
#	src/docs/labels-and-control-signals/reference.md
#	src/docs/labels-and-control-signals/stage-labels.md
#	src/docs/scale-envelope.md
#	src/pkg/config/config.go
#	src/pkg/dashboard/contribute_ws.go
#	src/pkg/dashboard/static-src/js/config-state.js
#	src/pkg/dashboard/static-src/js/tracker-actions.js
#	src/pkg/dashboard/static-src/js/tracker-row-render.js
#	src/pkg/dashboard/static/index.html
#	src/pkg/fleetreport/runtime.go
#	src/pkg/fleetreport/runtime_test.go
#	src/pkg/github/app.go
#	src/pkg/github/automerge/automerge_contributor_lane.go
#	src/pkg/github/automerge/automerge_stage_human.go
#	src/pkg/github/automerge/automerge_sweep_loop.go
#	src/pkg/github/issue_blocked.go
#	src/pkg/stageengine/derive_pr_classify.go
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 10, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign danathar for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 10, 2026
@github-actions

github-actions Bot commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

This PR conflicts with v6 itself. Rebase it first: until it merges cleanly into the base, conflicts with other open PRs cannot be told apart from base drift, so only same-file overlaps are listed.

Conflicts are checked with every PR merged onto the current tip of v6, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#17329 πŸ› [v6] knowledge priming: search on what the issue is about, not hive routing same files src/docs/agent-knowledge-and-memory.md
src/pkg/scheduler/kick_priming.go

@hivecommons-hive

hivecommons-hive Bot commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Hive status β€” updated in place; edits do not notify. Full history is in the Activity Monitor.

@clubanderson this PR is held at stage/071-needs-author and the hive will not merge it yet.

Failing checks:

  • changelog-fragment-guard
  • native-queue-policy
  • relative links and anchors resolve

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.

hive/awaiting-ci: CI red at 6c03b7b β€” baseline v6 v2 Tests is green (19fdfa2, 46965af), so these are PR-local to the merge resolution (FIX_DIFF). Deterministic (3/3 reruns), not flakes. Human-authored top-up branch, so I am not pushing; the fixes below are what the two red shards and the guard ask for.

test (rest 1/4)

  • pkg/github/automerge: TestManualMergeNamedWhileHoldLabelBlocks, TestManualMergeNotClaimedWithoutWorkflowFence/*, TestWorkflowFenceScopeStageNoteAgreesWithLane/* β€” automerge_stage_human_manual_merge_test.go:105/124, automerge_workflow_fence_scope_test.go:266: stage=090-ready-for-human-merge want 085 / stage=071-needs-author want 085. The v5 tests expect the manual-merge human park to resolve to stage 085; the merged v6 resolver still returns 090/071. One side of the merge (stage constants/resolver vs. tests) was taken without the other.
  • pkg/policies: TestLanePoliciesParkOwnerOnlyHandOffs β€” needs_decision_filing_test.go:99/102: redteam-holdgated.md lacks the owner-only park rule naming hive-open-issue comment --repo OWNER/REPO NUMBER --body-file FILE --needs-decision, the typed release flags --step-kind release --release-tag TAG --release-target FULL-COMMIT-SHA, and -R OWNER/REPO on the owner's gh commands. The v5 policy-text edit did not land on that file.

test (rest 3/4)

  • pkg/stagelabels: TestDecisionCommentNamesActionsPerLane β€” human_test.go:571: the hold-park decision comment (<!-- hive:stage-needs-decision -->) does not name the labels to clear (do-not-merge/wip, hold) in the actions list.

changelog-fragment-guard (fragment check itself passes) β€” api-reference citation drift from the server.go merge: api-reference.md:36-39 (GET /api/health, /api/health/deep, /api/livez, /metrics β†’ pkg/dashboard/server.go:1823-1831 no longer register them). Run bash src/scripts/check-api-reference-citations.sh --fix and commit; if static pages under src/pkg/dashboard/ changed, lower the matching styleRatchetBaselines entry in style_ratchet_test.go too.

Reminder from the body: land with --merge, not squash, so v6 records the v5 parent.


🐝 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

Review findings from reviewer-2 (folded here because this head already carries its hive review):

Merge resolution verified; one fix needed before this is green: the api-reference citation guard.

What I checked. Re-ran git merge-tree 19fdfa238 235099b00 and diffed the mechanical result against this head. Every divergence is a conflict hunk you resolved by hand, no stray edits; no conflict markers remain in Go/JS/sh/JSON/HTML. The non-trivial resolutions hold up against both parents:

  • src/pkg/config/: all 39 substantive lines v5 added to config.go are present in the v6 split files (advisory_config.go, governor_config.go, save.go, config.go).
  • src/pkg/stageengine/derive_pr_classify.go:287-291: contributorLaneReasonSentinelBlocked is gone from stageNeedsHumanReasons, but that's correct β€” v5's Sentinel alerts and hold labels should be pills on the PR's real stage, not a forced needs-decision stageΒ #17327 moved it into stageHeldGateReasons (:319-321), which the classifier consults first (:489), so the v6 entry would have been dead anyway. contributorLaneReasonReviewOff (v6) is retained at :289.
  • automerge_stage_human.go:798-805: v5's || route.Stage != ReadyForHumanMerge condition wrapped by v6's && !headBound (:791) β€” matches both parents.
  • automerge_sweep_loop.go / automerge_contributor_lane.go: c.mergeTrainEvalContext(mergeDecisionPriority(ctx), …) composes v5's helper with v6's priority, as the body says.
  • issue_blocked.go: stripHelpWanted (v5) and liftBlockedMarkerless (:660, v6) both present.

The red that is this PR's to fix β€” changelog-fragment-guard and Docs Link Check both fail on the same thing: src/docs/api-reference.md still cites the pre-merge v6 line numbers. The merge adds lines to src/pkg/dashboard/server.go (+20), src/pkg/hub/server.go (+9) and src/pkg/dashboard/claims_api.go (+104), so e.g. api-reference.md:36 β†’ pkg/dashboard/server.go:1823 now points at a }; the GET /api/health registration moved. ~25 citations drift (rows 36–46, 89, 117–119, 488–491, 657, 681–685). The body's "v6 (current line numbers)" covers src/docs/api-reference/*.md but the top-level src/docs/api-reference.md was missed. Fix per AGENTS.md:

bash src/scripts/check-api-reference-citations.sh --fix

and commit the result on this branch.

Expected reds, not findings. DCO: action_required (29 carried GitHub-generated merge commits with no sign-off) and the dependent native-queue-policy failure are inherent to carrying v5 history; the previous top-up #17290 merged with the identical pair red. The merge commit itself is signed off.

I have not approved or changed anything; the merge is a maintainer's call (--merge, not squash, as the body says).

Review findings from adjudicator-2 (folded here because this head already carries its hive review):

Security perspective, read at head 6c03b7b. Workflow changes are otherwise mechanical: docker/login-action bump stays SHA-pinned, the Install just curl retries are still gated by sha256sum -c (.github/workflows/v2-ci.yml:1061-1062), and the new sec-check tier in src/pkg/github/app.go:345-357 is exactly the contributor set plus vulnerability_alerts:read, keyed on a single role (src/crux/agentmode/agentmode.go:128-130). No blocker; one advisory hardening, best landed on v5 so it rides forward:

mutation-advisory.yml: the "no token" isolation leaks via checkout's persisted credentials (low, in-scope)

.github/workflows/mutation-advisory.yml:35-37 states the mutation run "gets no token" and src/scripts/mutation-report.sh:50-52 only checks GH_TOKEN/GITHUB_TOKEN env. But actions/checkout at mutation-advisory.yml:27-29 keeps its default persist-credentials: true, which writes github.token into .git/config as an http.extraheader. The job token carries pull-requests: write (mutation-advisory.yml:23-25), and gremlins unleash (mutation-report.sh:99-101) executes PR-controlled go test code with that file readable. Impact is bounded today β€” a fork PR's token is read-only regardless β€” but a same-repo PR's test code can lift a pull-requests: write token, which the design explicitly meant to prevent. The script only does local git diff against origin/<base> after fetch-depth: 0, so it does not need the credential:

      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          fetch-depth: 0
          persist-credentials: false

Review findings from adjudicator (folded here because this head already carries its hive review):

Correctness review @ 6c03b7b β€” the merge is mechanically clean but it regresses three Go test packages that are green on the v6 base (v2 Tests run 42741969712 on 19fdfa2 passed; on this head test (rest 1/4) and test (rest 3/4) fail deterministically, 3 re-runs each). All three are v6-only tests colliding with carried v5 behavior, and none of the three packages is in the body's "targeted tests" list (config/github/stageengine/fleetreport/crux-agent/cmd-hive/webstatic).

1. pkg/github/automerge β€” v5 #17334 turns hold/sentinel into gates (090 + pill); v6 tests still expect an 085 park

src/pkg/stageengine/derive_pr_classify.go:290-296 drops "held", "label:hold", "sentinel", contributorLaneReasonSentinelBlocked from stageNeedsHumanReasons, and the new stageHeldGateReasons branch at :489-511 routes them to 090 / fixing instead. The v6-only tests (not present on origin/v5, untouched by this PR) assert the old route:

  • automerge_stage_human_manual_merge_test.go:99-108 TestManualMergeNamedWhileHoldLabelBlocks β†’ stage=090-ready-for-human-merge want 085
  • automerge_stage_human_manual_merge_test.go:112-124 TestManualMergeNotClaimedWithoutWorkflowFence β†’ stage=071-needs-author want 085 (both subtests)
  • automerge_workflow_fence_scope_test.go:262-266 TestWorkflowFenceScopeStageNoteAgreesWithLane/unlisted_workflow β†’ stage=071-needs-author want 085

The v6 "manual merge is named in the 085 comment" feature was built on hold β‡’ 085; with v5's semantics the hold now rides 090 as a pill and no 085 comment is posted, so the manual-merge ask is not surfaced for a held workflow-path PR. This is a behavior change on v6, not just a stale assertion. Options:

  • (a) keep v5 semantics and re-base these three tests on the 090/071 route, and extend the 090 Held: line (automerge_stage_human.go:796-803 only rewrites the 085/090 entry cause) to carry the manual-merge ask; or
  • (b) keep "held"/"label:hold"/"sentinel"/contributorLaneReasonSentinelBlocked in stageNeedsHumanReasons when the observation also carries a human-merge-path / workflow-fence reason, so the v6 manual-merge park survives.

I'd take (a); (b) re-forks the two lines on the rule v5 just unified.

2. pkg/stagelabels β€” same root cause, v6-only assertion left in a merged test file

src/pkg/stagelabels/human_test.go:566-571 (present on v6 base, absent on origin/v5; this PR edited the file but kept the block) builds readyEvidence() with Holds = {hold, do-not-merge/wip}, SelfAuthored=true, and expects DecisionComment to name the labels. After v5's RouteHuman change the hold is a gate, the route is not a hold park, and the comment reads "Needs a decision, not a merge … labels: do-not-merge/wip, hold" without the "resolve the reason for hold" lines β†’ TestDecisionCommentNamesActionsPerLane fails. Drop the block or re-target it at ReadyComment(r, ""), which does carry the Held: line (cf. the merged TestRouteHumanGates).

3. pkg/policies β€” new v5 lane policy fails the v6 -R <owner/repo> guard

needs_decision_filing_test.go:84-86 (v6-only, +140 lines vs v5) requires every lane policy's owner-only section to contain the literal (each `gh` command with `-R <owner/repo>`). The carried v5 file src/pkg/policies/defaults/redteam-holdgated.md (new in #17421, not on v6 base) only has gh issue create --repo "<org>/<corpus-repo>" at :153 β†’ TestLanePoliciesParkOwnerOnlyHandOffs fails. Fix in the policy's Owner-only steps. paragraph:

-**Owner-only steps.** …
+**Owner-only steps.** (each `gh` command with `-R <owner/repo>`) …

and switch :153 to gh issue create -R "<org>/<corpus-repo>".

Not verified

  • relative links and anchors resolve (Docs Link Check, run 42746400956) is also red on this head and green on base; I did not trace which hand-merged doc broke it.
  • go test is disabled in this environment, so the above is from the CI logs for run 42746401329 plus reading the files at head; I did not re-run locally.

Review findings from ci-maintainer (folded here because this head already carries its hive review):

Intent alignment β€” reviewed head 6c03b7b (true --no-ff merge of 19fdfa2 ← 235099b, 120 v5 commits). I reproduced the merge with git merge-tree and diffed the result against head: all 39 hand-edited files map to the body's resolution table, the TRUSTED_SCRIPTS_TREE re-pin equals HEAD:src/scripts (46dfc95a…), and every v5 config.go hunk landed in the split files. The merge itself is clean. Three things the body's "Checks" section does not cover are red in CI and are introduced by this merge (all pass on v6 base 19fdfa2):

1. derive_pr_classify.go resolution regresses v6's manual-merge-named 085 stage β€” src/pkg/stageengine/derive_pr_classify.go:287-290
The body says stageNeedsHumanReasons = "v5 set + v6 contributorLaneReasonReviewOff", but v6 base also had contributorLaneReasonSentinelBlocked: true there (19fdfa2:derive_pr_classify.go:290); head drops it and routes sentinel/label:hold only through stageHeldGateReasons (:320). That takes v5 #17334 semantics wholesale and breaks the v6-only tests TestManualMergeNamedWhileHoldLabelBlocks / …WithoutWorkflowFence (automerge_stage_human_manual_merge_test.go:105,124: stage=090-ready-for-human-merge want 085, stage=071-needs-author want 085). This is a real semantic conflict between the two lines, not a stray hunk β€” please reconcile it explicitly (either keep v6's "a maintainer must review and merge this PR manually" 085 route when a workflow-path fence accompanies a sentinel/hold gate, or retire those v6 tests) and record the choice in the body.

2. v5's new redteam lane policy misses v6's owner-only park rule β€” src/pkg/policies/defaults/redteam-holdgated.md
TestLanePoliciesParkOwnerOnlyHandOffs (src/pkg/policies/needs_decision_filing_test.go:99,102) requires every lane policy to carry the v6 owner-only park rule (hive-open-issue comment --repo <owner/repo> <number> --body-file <file> --needs-decision, --step-kind release --release-tag <tag> --release-target <full-commit-sha>, and -R <owner/repo> on owner gh commands). The file came in from v5 #17421 and only has the v5 wording (:144-145). Fix: copy the park-rule section from any sibling *-holdgated.md in src/pkg/policies/defaults/ into redteam-holdgated.md.

3. src/docs/api-reference.md line citations drift β€” src/docs/api-reference.md:36-46,89,117-119,488-491,657
The body says the api-reference docs were taken as "v6 (current line numbers)", but only src/docs/api-reference/*.md were hand-merged; the top-level src/docs/api-reference.md still cites v6-base lines (e.g. :36 β†’ server.go:1823, which at head is }; /api/health is now registered elsewhere). v5 added 14 lines to server.go and 102 to claims_api.go, so every citation after them is off β€” relative links and anchors resolve fails with 20 DRIFT lines. Fix: re-run src/scripts/check-api-reference-citations.sh and update the cited line numbers.

The body lists only DCO / native-queue-policy as expected reds; test (rest 1/4), test (rest 3/4), coverage and the docs check are additional reds caused by this head.

Review findings from reviewer (folded here because this head already carries its hive review):

Style/consistency review (head 6c03b7b) β€” forward-merge of v5 into v6; 36 files needed manual conflict resolution. I recomputed the auto-merge against merge-base d8b1d3a and compared every v5-side hunk in the conflicted files against the head tree. All but one resolution carries v5 faithfully (e.g. automerge_sweep_loop.go:320,519 correctly keeps v6's mergeDecisionPriority(ctx) wrapper around v5's mergeTrainEvalContext; main_helpers.go:434-443 keeps v5's IsBaseRefreshAwaitingAdmission branch).

1. bin/hive-open-issue.sh resolution drops --claim (#17306) while its docs and relay side are carried

The PR body lists aa348d2b4 ✨ hive-open-issue: claim a self-filed next-step issue in the same request (#17306) as carried, but the conflict in bin/hive-open-issue.sh was resolved to the v6 side wholesale:

  • bin/hive-open-issue.sh:162 β€” SUPPORTED_FLAGS has no --claim; there is no CLAIM_ON_CREATE anywhere in the file (v5 bin/hive-open-issue.sh:144,182,237-238,374). An agent passing --claim now hits bin/hive-open-issue.sh:226 β€” unsupported flag … nothing was created.
  • bin/test_hive_open_issue.sh:126-304 β€” sections 3…3e are present, v5's Section 3f: --claim files and claims in one request (#17299) is gone.
  • Meanwhile src/docs/hive-open-issue.md:45 lists [--claim] in the synopsis, :69 documents the flag, and :471-475 tells agents to pass --claim for issues they'll work on themselves; the watcher side (src/pkg/github/issue_request_watcher.go, issue_request_create_claim_test.go) was not in conflict and came across.

So at head the documented, relay-supported --claim create flag is refused by the one script that produces the request. Suggested fix β€” re-apply the v5 hunks on top of the v6 flag set:

--- a/bin/hive-open-issue.sh
+++ b/bin/hive-open-issue.sh
@@ synopsis comment (~line 19) @@
-#   hive-open-issue --repo <owner/repo> --title "<t>" [...] [--no-consolidate <reason>] [--step-kind release --release-tag <tag> --release-target <sha>]
+#   hive-open-issue --repo <owner/repo> --title "<t>" [...] [--no-consolidate <reason>] [--step-kind release --release-tag <tag> --release-target <sha>] [--claim]
@@ defaults (~line 155) @@
 NO_CONSOLIDATE=""
+CLAIM_ON_CREATE=0
@@ line 162 @@
-SUPPORTED_FLAGS="... --needs-decision, --withdraw-decision, --no-consolidate, ..."
+SUPPORTED_FLAGS="... --needs-decision, --withdraw-decision, --claim, --no-consolidate, ..."
@@ flag parser (~line 207) @@
+    --claim) CLAIM_ON_CREATE=1; shift;;
     --no-consolidate) NO_CONSOLIDATE_SET=1; NO_CONSOLIDATE="${2:-}"; shift $(( $# > 1 ? 2 : 1 ));;
@@ after KIND validation (~line 237 in v5) @@
+if [ "$CLAIM_ON_CREATE" -eq 1 ] && [ "$KIND" != "issue" ]; then
+  echo "hive-open-issue: --claim only applies when creating an issue (use 'hive-open-issue claim' for an existing one); nothing was written." >&2
+  exit 2
+fi
@@ line 402 @@
-python3 - ... "$NO_CONSOLIDATE" "$WITHDRAW_DECISION" <<'PY'
+python3 - ... "$NO_CONSOLIDATE" "$WITHDRAW_DECISION" "$CLAIM_ON_CREATE" <<'PY'
@@ python body (~line 405) @@
 no_consolidate = sys.argv[22]
+claim_on_create = sys.argv[24]
 ...
+    if claim_on_create == "1":
+        req["claim"] = True

and restore v5's Section 3f block in bin/test_hive_open_issue.sh (v5 235099b00:bin/test_hive_open_issue.sh, the find_req claimcreatebot section). Simplest route: git diff d8b1d3a78 235099b00 -- bin/hive-open-issue.sh bin/test_hive_open_issue.sh | git apply -3 and resolve against the v6 --step-kind/--withdraw-decision additions.

Not checked from this perspective: the 500+ src/pkg/dashboard/static/index.html and config.go-split resolutions beyond line-presence (v6 moved config into advisory_config.go/governor_config.go; no v5 line was missing from the tree there).

@hivecommons-hive

Copy link
Copy Markdown
Contributor
6c03b7b

ℹ️ Sentinel notice β€” informational; author is trusted (owner), merge is not blocked

Hive flagged this PR (author @clubanderson, head 6c03b7bf70ca) because it matches behaviors that can override security controls, escalate privileges or damage the codebase. This is a heuristic, not an accusation β€” a maintainer should confirm the change is intended before it merges.

  • sensitive_path β€” changes 18 sensitive path(s) (Touches a sensitive path (OWNERS, workflows, policies, hive config, security docs, …))
    • .github/dependabot.yml
    • .github/release-lines.yml
    • .github/workflows/ci-runner-image.yml
    • .github/workflows/docker.yml
    • .github/workflows/integration-candidate.yml
    • .github/workflows/integration-technical-v2-ci.yml
    • .github/workflows/mutation-advisory.yml
    • .github/workflows/pr-verifier.yml
    • .github/workflows/promote-stable.yml
    • .github/workflows/stream-image.yml
    • .github/workflows/tagged-release.yml
    • .github/workflows/v2-ci.yml
    • src/deploy/entrypoint.sh
    • src/deploy/k8s/error-pages.yaml
    • src/pkg/policies/content_boundary_test.go
    • src/pkg/policies/defaults/redteam-holdgated.md
    • src/policies/README.md
    • src/policies/redteam-holdgated.md
  • permission_escalation β€” widens workflow permissions or uses pull_request_target (Widens GitHub Actions permissions or switches to pull_request_target)
    • .github/workflows/mutation-advisory.yml
  • ci_gate_weakening β€” CI configuration is deleted, softened or has gate checks removed (Disables or softens CI gates (continue-on-error, || true, removed checks))
    • .github/workflows/mutation-advisory.yml
  • security_policy_edit β€” edits security policy, scanner config, rulesets or hooks (Edits SECURITY.md, dependabot/CodeQL config, rulesets or git hooks)
    • .github/dependabot.yml

Hive did not add the sentinel-alert label because this author is trusted. The finding remains recorded for audit and the dashboard Security tab; set sentinel.trusted_authors_block: true to require the blocking label for trusted authors too.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conclusion: the merge resolution is careful and the body documents it well, but the head is red for reasons the body does not cover: two semantic conflicts between v5 and v6 that no textual conflict surfaced, plus docs-citation drift. Both parents are green (v2 Tests on v6 19fdfa238 and v5 235099b00 both pass), so these are introduced by the merge, not pre-existing.

1. v6 tests expect hold/sentinel to park at 085; the carried v5 rule (#17334) routes them to 090/071

src/pkg/stageengine/derive_pr_classify.go:319 (stageHeldGateReasons) and the branch at :489 come from v5 #17334: label:hold, sentinel, and contributorLaneReasonSentinelBlocked are now gates riding the head's real stage as a pill, no longer stageNeedsHumanReasons. The body says this side was chosen deliberately ("v5 held-gate block + v6 linked-issue guard").

v6 has three tests that encode the old rule and exist only on v6 (never on v5, so #17334 never had to reconcile them):

  • src/pkg/github/automerge/automerge_stage_human_manual_merge_test.go:99 TestManualMergeNamedWhileHoldLabelBlocks β€” reason label:hold β†’ helper asserts stagelabels.NeedsDecision at :41-42; CI: stage=090-ready-for-human-merge want 085
  • …manual_merge_test.go:112 TestManualMergeNotClaimedWithoutWorkflowFence (both subtests) β€” reason sentinel-blocked with a clean/unreadable diff; CI: stage=071-needs-author want 085 (the requires_human verdict now wins via VerdictBlocks at derive_pr_classify.go:502)
  • src/pkg/github/automerge/automerge_workflow_fence_scope_test.go:260 TestWorkflowFenceScopeStageNoteAgreesWithLane/unlisted_workflow β€” same mechanism, :266

These came in via #14215 / #15026 / #17484 (v6-only manual-merge-note work). Since the PR body already adopts the #17334 semantics for v6, the consistent fix is to update these three tests to the new routing (090 with the gate as a pill, 071 when the verdict blocks) and to check that the "a maintainer must review and merge this PR manually" wording they assert still applies when the hold is a pill rather than the stage. If instead v6 should keep 085 for hold/sentinel, stageHeldGateReasons should not be carried β€” but that contradicts the owner rule cited in the comment at :310-318, so I would not pick that silently.

2. TestLanePoliciesParkOwnerOnlyHandOffs fails on the new v5 policy file

src/pkg/policies/defaults/redteam-holdgated.md is new from v5 #17421. The guard src/pkg/policies/needs_decision_filing_test.go:52 (TestLanePoliciesParkOwnerOnlyHandOffs) is v6-only and requires every relay-commenting policy to contain the **Park an existing issue when only the owner can finish it.** rule, the hive-open-issue comment … --needs-decision command, the typed release flags, and -R <owner/repo> on owner gh commands (:60-63, :97-103). The file has none of them. quality-holdgated.md:332 carries the exact block to copy.

3. 94 drifted api-reference citations

changelog-fragment-guard and Docs Link Check both fail on api-reference citations: 94 drifted citation(s) (e.g. hub-server.md:49-66 β†’ pkg/hub/server.go:1742-1799, snapshots-and-style.md:9). The body says the api-reference files were resolved to "v6 (current line numbers)", but the v5 hunks merged into pkg/hub/server.go / pkg/dashboard/server.go shifted them. python3 src/scripts/check-docs-citations.py --fix per AGENTS.md.

Verified clean

  • All 90 non-merge carried commits and the merge commit 6c03b7bf7 carry Signed-off-by; the DCO: action_required behind native-queue-policy is the app's state on a 120-commit push, as the body anticipates.
  • .github/scripts/integration-governance.cjs:12 TRUSTED_SCRIPTS_TREE = 46dfc95a… matches git rev-parse HEAD:src/scripts on this head.
  • .github/workflows changes (10 files) are carried v5 commits, not new edits in this PR.

The body's "targeted tests … green" covered stageengine but not pkg/github/automerge or pkg/policies, which is where both semantic conflicts live. Flagging for @clubanderson as author; I have not changed anything.

β€” hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Addendum to the review above (same root cause as its Β§1, one more site it did not list, from test (rest 3/4)):

v6 v2 Tests is green on 0b2297147, so none of these are baseline. Everything else in rest 3/4 (unexpected GET …, style_ratchet baseline notes) is log noise from passing tests. Human-authored branch β€” not pushing; deferring to the author.


🐝 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

@github-actions github-actions Bot added conflicts-with-open-pr Open PR has a merge conflict with another open PR and removed conflicts-with-open-pr Open PR has a merge conflict with another open PR labels Nov 10, 2026
@hivecommons-hive hivecommons-hive Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 10, 2026
@clubanderson

Copy link
Copy Markdown
Member Author

Superseded by #17570, which rebuilds this top-up on today's v6 (reusing this PR's conflict resolution) and reconciles the v6-only tests, policy file and citation drift flagged in the review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants