Skip to content

🌱 v6 top-up: merge v5 (2026-11-04 evening) - #16683

Merged
clubanderson merged 25 commits into
v6from
topup/v6-from-v5-20261104
Nov 5, 2026
Merged

clubanderson merged 25 commits into
v6from
topup/v6-from-v5-20261104

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Forward-merge of v5 @ 8565377 into v6 (follow-up to #16524, merged at 6fa5071). Plain merge commit; merge with --merge, never squash/rebase.

v5 PRs included (24 commits)

#16589, #16632, #16636, #16621, #16640, #16641, #16648, #16644, #16646, #16633, #16656, #16651, #16657, #16663 (#16652), #16645, #16662, #16669, #16659, #16637, #16672, #16674, #16671, #16667, #16676

Conflicts and judgement calls (v5 wins unless the v6 side is intentional v6-only)

File Resolution
src/deploy/test_supply_chain_pins.sh both kept: v6 section 8 (nous-setup guards, #11700) then v5 Cline install-retry test (#16667)
src/docs/labels-and-control-signals/glossary-and-operations.md v5 "Queued for merge" wording (#16657) with the v6 split-docs link (dashboard-sections/activity-monitor.md)
src/docs/api-reference/dashboard-misc.md v6 row order (v6 has the extra /api/upgrade/announce row); v5 "Queued for merge · 1st of 2" ported into the stage-tracker row; citations re-anchored by check-api-reference-citations.sh --fix
static-src/js/tracker-row-render.js, static/index.html v5 #16621 drops the base_ref arg to stageTrackerPRPillsHtml (pill moved beside repo chip); v6 finisher fin line retained; webstatic/gen -check clean
pkg/github/automerge/automerge_contributor_adopt.go v5 adoptionNeedsDCORehome(..., hiveAuthoredPR(...)) (#16648) followed by the v6 fork-PR in-place-only guard
pkg/github/automerge/automerge_adoption_escape_test.go both sides' new tests kept (v6 #14664 stall-ask/legacy-noted; v5 #16619 hive-authored squash-unsafe)

Kept from earlier top-ups: DashboardMatrixConfig name, discord/ stays deleted, v6 7-tile grid, v6 dispatch relocation + v5 fixQueue, v6 standby/MCP doc sections. v5's dashboard-sections.md edits auto-landed in v6's dashboard-sections/activity-monitor.md via rename detection.

Local verification

  • check-docs-citations.py --fix (2006 verified), check-api-reference-citations.sh --fix (0 drifted)
  • gofmt -l on diff files clean; go build ./... && go vet ./pkg/... ./cmd/... OK
  • node --test src/pkg/dashboard/*.test.js 331/331
  • go test -cover on touched packages (cmd/crux, cmd/hive, crux/cmd/crux, dashboard, fleetreport, slogfeed, github, github/automerge, hub, review, stagelabels)
  • 23 changelog.d fragments carried from v5

Known CI artefacts to ignore: probot DCO and native-queue-policy (mirror of the upstream v5 "Andy Anderson"/"Andrew Anderson" sign-off mismatch, as in #16378/#16524).

clubanderson and others added 25 commits November 4, 2026 18:17
* ✨ hub: point owners to their spoke dashboard and the row ⋯ menu

New owners land on the hub's My Hives and look for the Guide, settings and
GitHub App install that live inside their hive (the spoke). Today an owner
read "Open your hive dashboard → Guide (top navbar)" on the hub and replied
"I do not see any guide or setting option".

- Dismissible per-hive callout above the list: "Your hive <name> is ready →
  Open your hive ↗", that the hub only lists hives, the attention item that
  must be fixed inside the hive (Open it → Guide → Install the Forge App),
  and that the row ⋯ menu manages permissions, pause, funding, delete.
  Admin viewers never see it; >2 hives collapse to one compact callout.
- Dismissal stored in localStorage per user + hive as the attention kinds
  seen; re-shown only when a new kind appears.
- Hive-name link gains an ↗ glyph, tooltip and a brief spotlight; the ⋮
  button gains a "Manage: permissions, pause, funding, delete…" hint.
- No native dialogs; ux test + changelog fragment.

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

* 🌱 hub: express spoke pointer via design tokens; keyboard-open the ⋮ menu

Keeps TestStyleRatchet at baseline: the new .spoke-* block adds no raw
colors, font-sizes, paddings or radii, and the container uses the hidden
attribute instead of an inline style. The ⋮ glyph advertised role=button
without a keyboard path; the dropdown now opens on :focus-within and
Enter/Space/ArrowDown move focus into the first item, Escape closes.

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

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Check-run motion on the head (in_progress, or queued when nothing runs)
now leads every settled word in the required-check path, and the
no-required-set path reads motion too, so the CI chevron is active with
its count beside a running Review instead of an inactive part-green ring.
Red neighbours ride in the running caption ("· 1 failing"); icon-only
green is reserved for passed == total. The JS running predicate treats a
partial ring with no settled word as running, except on rows parked on a
person's decision.

Fixes #16631

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…ull check list (#16636)

A pushed head whose checks are green and which carries no findings or
unrebased conflict owes nothing to its author: the re-review is the hive
reviewer's. The row says so (rework.owed_by = hive-reviewer / author),
the pill reads 'waiting on 🐝 hive reviewer · re-review of <sha7>', and the
Review chevron is the lit one with CI an icon-only green ring.

The stale 'CI 7/11 · test not reported' caption came from the GraphQL PR
batch: statusCheckRollup.contexts(first: 50) had no totalCount and a
truncated page was cached as the head's complete listing, so the required
aggregates past the page read as never reported. The query now asks for
100 with totalCount, and a truncated rollup is treated as no listing so
enrichPRCI falls back to the paginated REST check-runs.

Fixes #16635

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
The Activity Monitor's base pill (v5, main) moves from the PR column's
trailing cluster to the row head, right after the repo chip and before
the issue #N, styled as a muted sibling of that chip. Issue rows show
the primary linked PR's base, PR rows and sub-rows their own; rows with
no PR show nothing. The pill tooltip names the PR it describes.

Fixes #16620

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
* fix(acmm): recognize install and boot E2E workflows

Add basename glob matching against GitHub directory listings while retaining existing web and E2E directory alternatives. Cover real install/boot names, unrelated workflows, invalid globs, directory lookalikes, and directory-cache fallback behavior.

AI-assisted implementation prepared under James Reilly’s authenticated account. No independent human review or approval is claimed. References tuna-os/tromso#275; deployment of an evaluator release remains required.

Signed-off-by: James Reilly <jreilly1821@gmail.com>
Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* fix(acmm): cache missing parent directory for glob lookups

Addresses the reviewer note on #16268: when the parent directory of a
glob pattern does not exist, cache the empty listing so the remaining
glob patterns for the same parent do not each issue another 404 lookup.

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

---------

Signed-off-by: James Reilly <jreilly1821@gmail.com>
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Co-authored-by: James Reilly <jreilly1821@gmail.com>
…d' (#16641)

The muted pill for a PR whose next step the hive's GitHub App cannot take
read 'unauthorized', which blames the person. It now reads 'hive bot lacks
permission'; the tooltip, row hover line, Needs-attention chip title,
needs-human tip, human-merge gate word and decision popover say the same.
Label hive:unauthorized, comment marker and API fields are unchanged.

Fixes #16639

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

The squash-attribution rule in stageDCO counted an App-signed commit on a
PR by hive's own ai_author as squash-unsafe, so signoff-rehome closed the
approved, green PR and re-authored it as a new one. Hive-authored PRs are
now self-squash, signoff-rehome amends them in place (or leaves them) and
never rehomes an operator-approved head. The App's signed re-author
commit always carries a Signed-off-by trailer and the push relay refuses
a hive-identity commit without one.

Fixes #16647

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
… the CI verdict (#16644)

* 🐛 fix(dashboard): PR in progress chevron defers to running tracks, speaks only lifecycle

Activation resolves CI and Review first: if either runs on the head the
stage chevron (PR in progress, Merge queue …) renders settled-current and
icon only, its words in the tooltip, so CI + Review is the one pair that
can be active together and every other row has exactly one active
chevron. The unpicked-up and owner-wait captions drop the red word
("Unassigned · next: scanner", "Waiting for @author · fix owed"; the
external-PR fixing word reads "Fix owed · …"); the CI / review verdict
stays in the detail. Prelude invariant over every row fixture: active set
⊆ {CI, Review} or size 1, and no stage chevron names a track verdict.
Canonical rules documented in the Activity Monitor section.

Fixes #16643

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

* 🐛 fix(dashboard): one fill for an active CI/Review chevron

The darker amber the operator saw was .ham-activity-track.active.ham-stalled
(a 55 % amber mix with --text) — the stalled-blocker fill from #16600 on
rows where nothing moved (CI "not reported" / "no verdict yet" at 050).
An active, text-bearing track now has exactly the .ham-seg.active fill;
stalled keeps only its stillness and person glyph. Go CI Active follows
the state (running / queued) regardless of poll freshness; the
observation age rides ObservedAt for the tooltip. Invariants: every
text-bearing track is plainly active (prelude over all fixtures), and no
CSS rule restyles the active track background.

Refs #16643

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

* test: run row-stamp harness over stdin to dodge the -e arg limit

Refs #16643

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

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Hive-Run: #16638
Hive-Plan: workflow review policy sign-off
Hive-Spec: reviewer-question-auto-decide#policy-sign-off

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>
The ledger persisted via a fixed <path>.tmp name, so overlapping writers renamed each other's temp file away and hit ENOENT. Use a unique temp file in the same dir (creating the parent if missing) and clean up on failure.

Closes #16629

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

Clicking Accept triage added triage/accepted but wrote no stage label, so
an issue the reporter-trust gate had parked at 000-new (no stage label,
no engine record) kept reading "New" until the stage engine's next pass;
the tracker's 015→010 override only covered a stored 015 record.

The handler now writes stage/010-actionable with the accept label when
the issue carries no stage label or stage/015 (removes before adds, so a
single stage label; never regresses a later stage; skipped on a held
issue), and a retry on an accepted-but-unstaged issue adds the stage
label instead of no-op'ing. The tracker derives 010 for triage/accepted
with no stage label and no record rather than 000-new.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
#16651)

* 🐛 fix(hub): back off all commit-message fetches on a throttled 403/429

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

* 🐛 fix(hub): prefer Retry-After over X-RateLimit-Reset for commit-message throttle

GitHub sends X-RateLimit-Reset on every response, so a secondary-rate-limit
403 carrying Retry-After: 60 parked all commit-message fetches until the
primary window reset (up to 1h) instead of ~60s. Check Retry-After first.

Also rewrite the fleet-report row for sha_poll_commit_message_unavailable:
throttled 403/429 now dedupes to one WARN/hour per status, so only
non-throttle statuses can reach the ≥5-pair threshold.

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>

* 🐛 fix(hub): align throttle-wait test clock to whole seconds

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>
…waiting only on the merge (#16657)

Three adjacent approved rows on hive's own tracker read Ready for auto
merge …, Approved · hive will… and Approved · merge queu…. Every state
whose only remaining step is the merge itself now reads Queued for merge
with a short qualifier after the dot (· next pass in 42s, · checking
now, · soak 12m left, · 2nd of 3, · next pass, · after CI, · needs
rebase, · branch protection pending); the tooltip keeps the explanation.

Fixes #16653

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…f a gateway 503 (#16652) (#16663)

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: MikeSpreitzer <14296719+MikeSpreitzer@users.noreply.github.com>
* 🐛 fix: classify sentinel pacing skips

Avoid repeated fleet reports for sentinel skips caused by GitHub pacing while preserving warnings and other errors.

Hive-Run: #16642
Hive-Plan: sentinel pacing self-report
Hive-Spec: fleetreport#sentinel-pacing
Signed-off-by: Karibhou <Karibhou@users.noreply.github.com>

* Clarify sentinel skip reporting 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>
…, never "activity unknown" (#16662)

A Review track with no verdict and no reviewer in flight now derives a
concrete statement from the PR's lifecycle and its CI track
(stage_tracker_review_fallback.go): closed/merged, draft, waiting for CI,
not started (+ who is next), or — only when nothing was fetched for the
head — "no data for head <sha7> yet · refreshing". The UI drops the
"activity unknown · last observed …" prefix: settled verdicts stay known
as observations age (dated in the tooltip), and a settled review explains
itself — who decided, how long ago, each perspective's verdict with its
first finding (perspectives field, dissent preserved). An aggregate
approval the verified bundle does not back reads "evidence not verified"
instead of unknown. Fixture invariant: no CI/Review tooltip contains
"activity unknown" / "CI unknown" / "Review unknown".

Supersedes #16634.
Fixes #16617
Fixes #16661

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…trip (#16669)

The row tooltip and the current-stage line each carried an identical
inline relative-age arrow. One named helper keeps them in step; output
strings are unchanged.

Closes #16668

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>
…naming the merger (#16659)

* 🐛 Activity Monitor: celebrate externally merged PRs with bee + toast naming the merger

An approved PR merged by hand (gh pr merge --admin --squash) vanished
from the tracker with no bee fly-off and no merge toast, while the
hive's own merges celebrated.

Root cause: recently_merged carried only audit pr_merged lines, which
the hive writes synchronously for its own merges but which an external
merge gets only after the PR poller's settle scan (minutes) — the row
was already gone. Worse, webhookItemHint for issue_comment/issues on a
PR never read issue.pull_request.merged_at, so a bot comment seconds
after the merge produced a closed-unmerged snapshot: the SPA toasted
"closed" and deleted the PR's open observation, forfeiting the
celebration for good.

Fix: recently_merged is the union of audit lines and the merged ledger
(webhook/closed-sweep merges by anyone), deduped, each carrying
merged_by; issue hints read merged_at; a closed snapshot never outranks
a merge in recently_closed. The SPA keeps a closed key comparable so a
later merge still celebrates, and the banner head names the merger
("merged by @clubanderson" / "merged by 🐝 hive"). Closed-not-merged
keeps the quiet toast. Go + node tests cover both exits.

Fixes #16658

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

* 🐛 Activity Monitor: lift merger helpers into the merge-banner node harness

The countdown harness lifts stageTrackerMergeBanner out of index.html by
regex but did not lift the new stageTrackerMergerText/stageTrackerMergedByOf
it now calls, so runtime-tests failed with ReferenceError. Lift them, and
add unit cases for the merger text (@login / 🐝 hive) and repo-scoped
merged_by resolution.

Fixes #16658

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

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…e still pending (#16637)

* 🐛 Stage tracker: say CI running (not activity unknown) when checks are still pending

A head with 7/11 checks reported is mid-pipeline, not unknown: when
checks still run or queue, the CI state is running (or queued) and the
caption counts the unfinished checks; a required check with no run yet
is one sentence in Detail instead of the missing verdict, and head-wide
counts (required set unknown) follow the same rule. "no check results
observed" is reserved for a head with zero check runs. The chevron word
drops "no verdict yet" / bare "running" for the unfinished count or
names, and the tooltip composes distinct facts once.

Fixes #16630

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

* 🐛 Stage tracker: single-quote check names in CI captions and chevron text

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

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…ivity observations (#16672)

Closes #16670

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
* 📖 docs: align StageTrackerActivity CI provenance comment

Describe the resolved required-check set and the observed head-wide fallback consistently with the field comment and dashboard API docs.

Hive-Run: #16673
Hive-Plan: stage-tracker-activity-comment-alignment
Hive-Spec: #16673#type-comment
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>

* 📖 docs: add changelog fragment for CI provenance clarification

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>
…command (#16671)

* test(crux): pin that a bad OTEL config disables telemetry, not the command

cmd/crux and crux/cmd/crux both promise (hivecommons/crux#19) that a
rejected OTEL_EXPORTER_OTLP_* configuration prints a 'telemetry disabled'
notice and lets the verb run; neither main_test.go exercised that branch,
so cmd/crux sat at 77.8% with the fallback as one of its two uncovered
statements. Both tests now drive run() with an unsupported protocol and
assert the notice, the variable name and the verb's own exit code.

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

* ci: retrigger after runner toolchain download failure

The coverage job failed because the runner could not download
go 1.26.10 and was left with a trimmed go binary (no GOROOT).
No code change.

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

---------

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>
Implement issue option B in both images: four attempts with 60-second pauses and metadata revalidation. Preserve install errors on exhaustion and only link and smoke-test after success. Exercise the shipped RUN bodies with mocked tools through the existing supply-chain CI step.

Hive-Run: #16666
Hive-Plan: issue-16666-option-B-bounded-retry
Hive-Spec: issue-16666#option-B

Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Co-authored-by: mendezr <mendezr@users.noreply.github.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
… for a decision, not the fixer (#16676)

A hive-superseding PR whose every reviewer perspective returned
requires_human as a pure approver question (decision requested, no
finding above info) was routed to the fixer by the superseder rule.
The fixer had nothing to push, the cycle hit its cap, fixer-exhausted
re-authored the change, and the next PR repeated it
(#16398 -> #16456 -> #16607) while no operator was ever asked.

Aggregation now keeps such a head requires_human with its decision
question, RouteHuman parks it at 085 needs-decision with approve /
request-changes actions, and the tracker's review chevron says the head
is verified and waiting on sign-off.

Fixes #16675

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…04 (top-up to 8565377)

Forward-merge of v5 into v6 covering 24 v5 commits (#16589 .. #16676).

Conflicts and judgement calls (v5 wins unless the v6 side is an intentional
v6-only change, consistent with #16524):

- src/deploy/test_supply_chain_pins.sh: both kept — v6 section 8 (nous-setup
  guards, #11700) followed by v5's Cline install retry test (#16667).
- src/docs/labels-and-control-signals/glossary-and-operations.md: v5 wording
  ("Queued for merge", #16657) with the v6 split-docs link target
  (dashboard-sections/activity-monitor.md).
- src/docs/api-reference/dashboard-misc.md: v6 row order/line numbers (v6
  has the extra /api/upgrade/announce row); v5 "Queued for merge · 1st of 2"
  wording ported into the stage-tracker row; citations re-anchored by fixer.
- src/pkg/dashboard/static-src/js/tracker-row-render.js, static/index.html:
  v5 #16621 drops the base_ref arg to stageTrackerPRPillsHtml (pill moved
  beside the repo chip); v6 finisher `fin` line retained.
- src/pkg/github/automerge/automerge_contributor_adopt.go: v5
  adoptionNeedsDCORehome(..., hiveAuthoredPR(...)) signature (#16648) plus
  the v6 fork-PR in-place-only guard that follows it.
- src/pkg/github/automerge/automerge_adoption_escape_test.go: both sides'
  new tests kept (v6 #14664 stall-ask / legacy-noted tests, v5 #16619
  hive-authored squash-unsafe tests); import blank line dropped by gofmt.

Kept from earlier top-ups: DashboardMatrixConfig name, discord/ stays
deleted, v6 7-tile grid, v6 dispatch relocation + v5 fixQueue, v6
standby/MCP doc sections.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@kubestellar-prow kubestellar-prow Bot added dco-signoff: yes Indicates the PR's author has signed the DCO. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 5, 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 hanthor 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

@github-actions

github-actions Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

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.

No conflicting open PRs or same-file overlaps were found.

@hivecommons-hive

Copy link
Copy Markdown
Contributor
fccafaa

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

Hive flagged this PR (author @clubanderson, head fccafaa894fb) 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 4 sensitive path(s) (Touches a sensitive path (OWNERS, workflows, policies, hive config, security docs, …))
    • src/Dockerfile
    • src/Dockerfile.contributor
    • src/deploy/test_cline_install_retry.py
    • src/deploy/test_supply_chain_pins.sh

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 commented Nov 5, 2026 •

Copy link
Copy Markdown
Contributor

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

Hive filed review findings that do not block this PR as backlog items:

Cap: 10 backlog item(s) per PR per day.

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

Failing checks:

  • check-failure

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.

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

Read the merge commit's combined diff (git show --cc fccafaa89) and the result against both parents (6fa507166 = current v6 tip, 856537726 = v5). The hand-resolved hunks match the table in the body; looks correct to me.

What I verified at fccafaa89:

  • src/pkg/github/automerge/automerge_contributor_adopt.go — not in the combined diff, i.e. every hunk is one parent's verbatim. adoptionDCORepairMode / adoptionNeedsDCORehome / adoptedHeadNeedsDCO* carry v5's three-arg hiveAuthored signature (lines 318–367), the call site at line 872 passes hiveAuthoredPR(obs, policy, appLogin), and the v6 fork-PR in-place-only guard (MarkForkRehomeRefused, lines 873–885) follows it reading the resulting dcoRehome. No two-arg callers remain in pkg/.
  • automerge_adoption_escape_test.go — both TestAdoptedInPlaceHiveAuthoredSquashUnsafeCommitStaysInPlace (v5 🐛 fix(dashboard): preserve settled review verdicts and explain findings #16619, line 810) and the v6 TestAdoptedSignoffStallAskAgreesWithWorkflowFence / TestAdoptionStalledLegacyNotedHeadNoRepost (lines 654, 857) are present.
  • static-src/js/tracker-row-render.js:108–109 and generated static/index.html:20271–20272 agree: v5's two-arg stageTrackerPRPillsHtml(ref, lineage) call (helper defined at index.html:19979) immediately followed by v6's const fin = lp.finisher ? lp : item;. Zero base_ref callers left in either file.
  • glossary-and-operations.md:194 — v5 "Queued for merge" with the v6 ../dashboard-sections/activity-monitor.md link; tracker.html:27 v5 "hive bot lacks permission" tooltip with the v6 finisher sort option retained.
  • No conflict markers in git diff 6fa507166 fccafaa89; 23 changelog.d fragments carried.

CI at this head: hub 1–4, agent 1–5, scheduler 1–3, rest 1/4 green (so the merged Go tree compiles); the red native-queue-policy / cancelled "Sign-off survives the squash" are the sign-off-name mirror the body already calls out, as on #16524.

One operational note for whoever merges: the body requires --merge, never squash — a squash would collapse the 24 v5 commits and re-trigger exactly the sign-off check that is red here.

@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.

docs-currency (read at head fccafaa)

One in-scope drift the merge resolution left behind; everything else checked out (check-api-reference-citations.sh and check-docs-citations.py both clean at head; 23 changelog.d fragments all carry valid category prefixes; glossary-and-operations.md:194 link resolves to dashboard-sections/activity-monitor.md#hive-activity-monitor).

1. v6-only <details> block still names the retired "Ready for auto merge" word — src/docs/dashboard-sections/activity-monitor.md:12

v5 #16657 renamed the merge-gate word to Queued for merge and this merge brings that into v6 (src/pkg/dashboard/static-src/js/tracker-words-core.js:184 ready: 'Queued for merge', :257 both train states; activity-monitor.md:577-581 table rows updated). But the collapsed v6 activity-monitor controls and implementation details block (lines 9–13) exists only on v6, so v5's edit never reached it; at head line 12 still reads:

060 Reviewed, 080 Awaiting merge admission and 100 Merge queue all light Merge gate as "Ready for auto merge" …

That contradicts the same file's own table 560 lines later and the shipped UI. The line is ~27 KB so a suggestion block is impractical; a one-liner does it:

sed -i '12s/all light \*Merge gate\* as "Ready for auto merge"/all light *Merge gate* as "Queued for merge"/' src/docs/dashboard-sections/activity-monitor.md

(check-docs-citations.py is unaffected — the line carries no file:line citation.)

Not re-raised: glossary-and-operations.md:194 link text still says dashboard-sections.md while pointing at the split file — pre-existing v6 wording, not touched by this merge.

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

@clubanderson
clubanderson merged commit b43b6b9 into v6 Nov 5, 2026
92 of 98 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the topup/v6-from-v5-20261104 branch November 5, 2026 01:18
@github-actions

github-actions Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

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. 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