Skip to content

🌱 sync: forward-merge v5 (through 1cdd8f1) into v6 - #10828

Merged
clubanderson merged 60 commits into
v6from
sync/v5-to-v6-20261006
Oct 6, 2026
Merged

clubanderson merged 60 commits into
v6from
sync/v5-to-v6-20261006

Conversation

@clubanderson

@clubanderson clubanderson commented Oct 6, 2026 •

Copy link
Copy Markdown
Member

Top up v6 with current v5 through 1cdd8f1.

Tracking: #10797. Prior tracker #10590 remains closed by #10738.

#10734 status

#10734 is closed as complete. v6 already has the real in-place Spek recheck implementation from #10807 and proxy-only outward discovery from #10809, so this merge keeps the v6 implementation. It does not reintroduce the 501 stub or skipped recheck tests.

Conflict resolution table

File/area Resolution
src/cmd/hive/main.go Kept v6 kick-dispatch placement after dashboard status publish; v5's dispatch seam was already present in v6 later in the function.
src/docs/adr/README.md Union: kept v6 ADR 0020/0021 planning-engine entries and added v5 ADR 0021 Codex reset entry.
src/docs/integration-guide.md Union: kept v6 planning-engine wording and added v5 vibe-kanban integration row.
src/docs/labels-and-control-signals.md Union: kept v6 split-config citations and added v5 reporter-trust/needs-human/claim-escalation behavior.
src/docs/spektacular.md Kept v6 in-place recheck/proxy-discovery documentation.
src/pkg/config/config.go Kept v6 split config file; v5 monolith hunk not reintroduced.
src/pkg/config/runs_config.go Kept v6 recheck exact-document/proxy wording and fields.
src/pkg/config/spektacular_discovery*.go Kept v6 proxy-only outward discovery implementation/tests from #10809.
src/pkg/dashboard/campaign_discovery*.go Kept v6 proxy-only discovery implementation/tests from #10809.
src/pkg/dashboard/campaign_recheck.go Kept v6 in-place recheck/rewind implementation from #10807 and v6 discovery evidence integration.
src/pkg/dashboard/static/index.html Kept v5 overnight dashboard fixes in the conflicted KPI/outside-bucket section while preserving the merged v6 surface. Inline JS syntax-check passed.
src/pkg/dashboard/webstatic/style_ratchet_test.go Kept v6 ratchet ceilings (operator 1690/149/693/240/185; hub static 964/456/427/165/104).
src/pkg/hub/* Confirmed only one mustParseRFC3339 remains (health_verdict.go).

Validation

Per AGENTS.md, local go build, go test, go vet, golangci-lint, and docs citation guard runs are forbidden for agents; CI is the verdict. Local allowed checks run:

  • gofmt -l on conflicted Go files: clean
  • node --check for bin/contributor-relay.js, bin/contributor-relay.test.js, bin/vibe-kanban-mirror.js, bin/vibe-kanban-mirror.test.js
  • extracted inline JS from src/pkg/dashboard/static/index.html and ran node --check
  • confirmed a single func mustParseRFC3339 under src/pkg/hub
  • git diff --cached --check: clean

The API citation fixer was not run locally because AGENTS.md says to run it only after CI reports drift.

ADR numbering follow-up

Resolved #10797's ADR collision in this v6 branch: v6 keeps ADR-0021: Named planning-engine boundary, Codex earned-reset redemption is renumbered to ADR-0022, and the v6-only Spek continuous convergence ADR is renumbered to ADR-0023 so src/docs/adr/README.md has exactly one entry per ADR number. Also opened the preventative v5 PR #10840 to renumber the Codex ADR on v5 before future forward-merges.

scanner and others added 30 commits October 5, 2026 16:45
Signed-off-by: scanner <scanner@hive.kubestellar.io>
…bels

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: arteeh <35239587+arteeh@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <scanner@hive.kubestellar.io>
…st the guard test

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
✨ feat: contributor quota guard HIVE_CODEX_AUTO_USE_BANKED_RESET opt-in
🐛 fix: Most effective models filters, run rates and local-registry labels
📖 docs: record opt-in Codex reset redemption ruling and allow-list the guard test
Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
* 🐛 fix: show stable next update status

Use the stable promotion status as the single source for stable-channel next-update ETAs, carry an explicit queued/none/unknown status through heartbeat and dashboard APIs, and render the status on both spoke and hub fleet views.

Fixes #10187

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* changelog: fragment for #10729

Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>

* 🐛 fix: remove unused stable ETA wrapper

Keep the stable next-update helper as the HubServer method used by heartbeat and Fleet rows so lint stays clean.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Andrew Anderson <andy@clubanderson.com>

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
* fix dashboard overview totals math

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

* changelog: fragment for #10727

Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>

---------

Signed-off-by: Andy Anderson <andy@clubanderson.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ltip (#10735)

* 🐛 dashboard: stop nesting a <button> inside the Overview KPI card tooltip

The held/blocked/outside term tooltip rendered an "open Settings → …"
<button> inside <button class="overview-kpi">. The HTML parser closes an
open button when it meets a nested one, so the KPI card ended early and the
rest of the tooltip plus the remaining equation terms rendered inline,
overflowing the card grid (seen on hosted spoke oke-11, hive 5.136.0).

Render the control as <span role="button" tabindex="0"> with the existing
data-keydown-action pattern so click and keyboard still open Settings.

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

* changelog: fragment for #10735

Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>

---------

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
The topbar is intentionally fixed (not sticky) again on this branch; the
contract test still asserted the sticky rule and failed every shard.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <scanner@hive.kubestellar.io>
Admin-merging: workflow+docs only change; all 52 code checks green, the remaining arm64 image build is unrelated to a runs-on pin and is queued behind the fleet. Unblocks stable promotion (#10042).
…-level

🐛 dashboard: ACMM Eval collapsed pill shows the current level only
Signed-off-by: Andy Anderson <andy@clubanderson.com>
… promotions (#10745)

Admin-merging: all 54 code checks green; only the arm64 image build is still queued behind the fleet and is unaffected by this change. Companion to #10744 for #10042/#10187.
…ligible builds (#10749)

Admin-merging: all code checks (incl. hub/dashboard shards and test-promote-stable.sh) green; only the arm64 image build remains queued behind the fleet. Third fix for #10042.
…t be clipped (#10739)

* 🐛 dashboard: portal version popover out of sidebar

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

* changelog: fragment for #10739

Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>

---------

Signed-off-by: Andy Anderson <andy@clubanderson.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
🐛 dashboard: restore top navbar and Overview tile layout
…ress claims (#10736)

* 🐛 fix(claims): escalate instead of re-claiming after 2 no-progress agent claims

The claim ledger now remembers each agent's claims per issue (with how
each ended), and a scheduler in-flight gate withholds a free issue whose
last escalate_after_claims claims by one agent were followed by no linked
or referencing PR, referencing commit, label/assignee change or
close/reopen. The issue is labelled needs-human and gets one comment
listing the claims (ADR-0019). Timeline read failures fail open.

NOT FOR MERGE AS-IS: agent kick claims are recorded for every issue in a
kick's list (up to governor.kick_limits.max_issues, default 100), so with
the default threshold of 2 this would label the whole untouched backlog
needs-human about four hours after deploy. See the issue comment.

Hive-Run: #10527
Hive-Plan: #10527 (Proposed fix)
Hive-Spec: #10527#acceptance
Signed-off-by: Danathar <Danathar@users.noreply.github.com>

* fix: escalate stalled claims instead of re-claiming; record claims only on start signal

Kick-listed issues get a short in-ledger listing (no GitHub comment, not a
claim attempt) that keeps relay contributors and other agents off them while
the kick is live. The agent claim, with its comment, is recorded on the
agent's first start signal on the issue: its own comment, label or claim
request through the issue relay, or a PR request naming it. The escalation
gate therefore counts real claims only.

A likely-done issue an agent already verified after the merged PR is
withheld from kicks until a person comments, labels, assigns, closes or
reopens it (verify once, #10509).

Refs #10527

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* docs: shift scale-envelope client.go citation for the 3-line Client struct addition

Signed-off-by: scanner <scanner@hive.kubestellar.io>

---------

Signed-off-by: Danathar <Danathar@users.noreply.github.com>
Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: Danathar <Danathar@users.noreply.github.com>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…es, composite-only motion) (#10741)

* 🐛 dashboard: smooth upgrade bee animation

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

* changelog: fragment for #10741

Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>

---------

Signed-off-by: Andy Anderson <andy@clubanderson.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
hivecommons-hive Bot and others added 9 commits October 6, 2026 04:54
tagged-release.yml authors and signs the release commit as
hive-release-bot <actions@github.com> and merges its PR with
merge_method=merge, so no squash rewrite happens — yet the gate read the
bot's own sign-off as foreign once the commits API resolved the address
to actions-user, and passed only when that lookup failed (#10775 vs
#10792). Exempt the exact release shape (identity + self-sign-off + a
CHANGELOG.md/changelog.d-only diff) before the lookup, and teach
is_bot_identity the GitHub Actions address so a code-carrying commit with
that sign-off is still rejected even on the degraded path.

Refs #10795 (needs-human: v5 required contexts include six path-filtered checks that never report on a release PR; admin must re-scope protection)

Signed-off-by: ci-maintainer <ci-maintainer@hive.kubestellar.io>
Co-authored-by: ci-maintainer <ci-maintainer@hive.kubestellar.io>
…anker-requested PR parking (#10793)

* feat(github): ClankeR pointer in reporter-trust wait comment and clanker-requested PR parking

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <scanner@hive.kubestellar.io>

* docs: refresh scale-envelope citation for RankActionableIssues

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <scanner@hive.kubestellar.io>

---------

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…) (#10803)

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
…change (#10798)

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: onkar717 <144542684+onkar717@users.noreply.github.com>
…aunch paths (#10779)

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: arteeh <35239587+arteeh@users.noreply.github.com>
…hold (#10819)

* 🐛 fix(github): raise needs-human and escalation on reporter-trust PR hold

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>

* changelog: fragment for #10819

Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

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

---------

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…annel on standalone Podman (#10821)

* 🐛 fix(dashboard): release-status strip false hub-stale and unknown channel on standalone Podman

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: Danathar <6772335+Danathar@users.noreply.github.com>

* changelog: fragment for #10821

Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

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

---------

Signed-off-by: scanner <scanner@hive.kubestellar.io>
Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: scanner <scanner@hive.kubestellar.io>
Co-authored-by: Danathar <6772335+Danathar@users.noreply.github.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: no Indicates the PR's author has not signed the DCO. label Oct 6, 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 Oct 6, 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.

PR Title Relation Files
#10802 🌱 sync: forward-merge v5 into v6 (top-up), renumber planning-engine ADR to 0022 same files .github/workflows/coverage-hourly.yml
.github/workflows/dco-post-merge.yml
.github/workflows/promote-stable.yml
.github/workflows/v2-ci.yml
.github/workflows/v2-tests.yml
bin/README.md
bin/contributor-relay.js
bin/contributor-relay.test.js
bin/testdata/vibe-kanban-mcp/fake-server.js
bin/vibe-kanban-mirror.js
bin/vibe-kanban-mirror.test.js
changelog.d/added-10597.md
changelog.d/added-10598.md
changelog.d/added-clanker-requested-config.md
changelog.d/added-clanker-requested-dashboard.md
changelog.d/added-outside-bucket-settings.md
changelog.d/added-spektacular-discovery.md
changelog.d/added-vibe-kanban-mirror.md
changelog.d/changed-10731.md
changelog.d/changed-10787.md
changelog.d/fixed-10527-claim-escalation.md
changelog.d/fixed-10687.md
changelog.d/fixed-10727.md
changelog.d/fixed-10729.md
changelog.d/fixed-10732.md
changelog.d/fixed-10735.md
changelog.d/fixed-10739.md
changelog.d/fixed-10741.md
changelog.d/fixed-10743.md
changelog.d/fixed-10795-squash-gate-release-commit.md
changelog.d/fixed-codex-reset-redeem-lock-race.md
changelog.d/fixed-coverage-hourly-node.md
changelog.d/fixed-dco-waiver-10746.md
changelog.d/fixed-dco-waiver-10767.md
changelog.d/fixed-navbar-zone-spacing.md
changelog.d/fixed-needs-human-issue-claims.md
changelog.d/fixed-promote-stable-runner.md
changelog.d/fixed-stable-eligible-at.md
changelog.d/fixed-stable-smoke-lineage.md
src/changelog.d/changed-codex-reset-redemption-policy.md
src/changelog.d/fixed-acmm-collapsed-level.md
src/changelog.d/fixed-navbar-missing.md
src/changelog.d/fixed-next-update-eta-10187.md
src/changelog.d/fixed-overview-tooltip-nested-button.md
src/changelog.d/fixed-overview-totals-math.md
src/changelog.d/fixed-upgrade-bee-animation.md
src/changelog.d/fixed-version-popover-portal.md
src/cmd/hive-quota-publisher/main.go
src/cmd/hive-quota-publisher/main_test.go
src/cmd/hive/claimescalation.go
src/cmd/hive/claimescalation_test.go
src/cmd/hive/claims_admission_test.go
src/cmd/hive/claimswire.go
src/cmd/hive/claimswire_test.go
src/cmd/hive/github_client_config.go
src/cmd/hive/main.go
src/cmd/hive/verifyonce.go
src/cmd/hive/verifyonce_test.go
src/docs/adr/README.md
src/docs/ci-runner-labels.md
src/docs/contributor-relay.md
src/docs/dashboard.md
src/docs/documentation-map.md
src/docs/env-vars.md
src/docs/integration-guide.md
src/docs/labels-and-control-signals.md
src/docs/operator-reference.md
src/docs/scale-envelope.md
src/docs/stable-soak-policy.md
src/docs/vibe-kanban.md
src/hive.yaml.example
src/pkg/claims/admission_test.go
src/pkg/claims/claims.go
src/pkg/claims/comments.go
src/pkg/claims/listing_test.go
src/pkg/claims/stall_test.go
src/pkg/config/claims.go
src/pkg/config/claims_config_test.go
src/pkg/config/issue_filter.go
src/pkg/config/issue_filter_test.go
src/pkg/config/reporter_trust.go
src/pkg/config/reporter_trust_test.go
src/pkg/config/validate.go
src/pkg/dashboard/advisory_acmm_collapsed_headers_test.go
src/pkg/dashboard/agent_collapsed_tiles_test.go
src/pkg/dashboard/api_campaigns.go
src/pkg/dashboard/api_governor.go
src/pkg/dashboard/api_governor_pr_models.go
src/pkg/dashboard/autoupdate_status.go
src/pkg/dashboard/autoupdate_status_test.go
src/pkg/dashboard/blocked_claims_loop_test.go
src/pkg/dashboard/contribute_claim_gate_test.go
src/pkg/dashboard/contribute_claims.go
src/pkg/dashboard/contribute_effective_models.go
src/pkg/dashboard/contribute_effective_models_test.go
src/pkg/dashboard/contribute_landing.go
src/pkg/dashboard/contribute_ws.go
src/pkg/dashboard/dashboard_navbar_overview_static_test.go
src/pkg/dashboard/dashboard_section_visual_summaries_test.go
src/pkg/dashboard/navbar_chip_consistency_test.go
src/pkg/dashboard/overview_kpi_sparklines_test.go
src/pkg/dashboard/overview_kpi_values_10139_test.go
src/pkg/dashboard/overview_status.go
src/pkg/dashboard/overview_totals_10629_test.go
src/pkg/dashboard/reporter_trust_test.go
src/pkg/dashboard/sidebar_version_panel_test.go
src/pkg/dashboard/static/index.html
src/pkg/dashboard/version_provenance_ui_test.go
src/pkg/dashboard/webstatic/style_ratchet_test.go
src/pkg/github/agent_start_hook.go
src/pkg/github/agent_start_hook_test.go
src/pkg/github/client.go
src/pkg/github/issue_admitter.go
src/pkg/github/issue_claim_gate.go
src/pkg/github/issue_claim_gate_test.go
src/pkg/github/issue_request_watcher.go
src/pkg/github/issue_request_watcher_test.go
src/pkg/github/issue_timeline.go
src/pkg/github/issue_timeline_test.go
src/pkg/github/pr_request_watcher.go
src/pkg/github/repo_pause_test.go
src/pkg/hub/assets/dashboard.html
src/pkg/hub/channel_image_target_test.go
src/pkg/hub/heartbeat.go
src/pkg/hub/heartbeat_upgrade_policy.go
src/pkg/hub/heartbeat_upgrade_policy_test.go
src/pkg/hub/notifications_admin.go
src/pkg/hub/notifications_admin_test.go
src/pkg/hub/saas_hives_api.go
src/pkg/hub/spoke/heartbeat.go
src/pkg/hub/spoke/heartbeat_upgrade_policy_eta_test.go
src/pkg/hub/stable_promotion.go
src/pkg/hub/stable_promotion_test.go
src/pkg/hub/static/my-hives.html
src/pkg/knowledge/inception.go
src/pkg/rotation/codex_reset_redeem.go
src/pkg/rotation/codex_reset_redeem_test.go
src/pkg/rotation/rotation.go
src/pkg/rotation/rotation_probe_test.go
src/scripts/check-squash-signoff-attribution.sh
src/scripts/promote-stable.sh
src/scripts/test-check-squash-signoff-attribution.sh
src/scripts/test-promote-stable.sh

@clubanderson
clubanderson force-pushed the sync/v5-to-v6-20261006 branch from 95c3584 to 9f5480f Compare October 6, 2026 12:05
Top up v6 with origin/v5 after #10738. Keep the v6 in-place Spek recheck and proxy-only discovery implementation from #10807/#10809; #10734 is closed.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Signed-off-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
@clubanderson
clubanderson force-pushed the sync/v5-to-v6-20261006 branch from 9f5480f to 0b68499 Compare October 6, 2026 12:12
Refs #10797. Renumber the Codex reset ADR to 0022 in v6 and move the Spek convergence ADR to 0023 so the v6 ADR index has one entry per number.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
@kubestellar-prow

Copy link
Copy Markdown
Contributor

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

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

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

The list of commits missing DCO signoff:

Details

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

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

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

A different merged PR closed the claimed issue. Leaving this contributor PR open for a human to review.

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

@clubanderson
clubanderson merged commit d3fe987 into v6 Oct 6, 2026
67 of 70 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the sync/v5-to-v6-20261006 branch October 6, 2026 14:06
@github-actions

github-actions Bot commented Oct 6, 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

hivecommons-hive Bot pushed a commit that referenced this pull request Oct 7, 2026
The helpers were not dropped by the merge: v6 removed v5's separate-revision
recheck design (taskHashFromTitle, taskContentHash, priorTaskHashes,
deltaTaskList, importRecheckDelta) in #10807, and #10828 kept v6's in-place
rewind. v5's #10908 then added campaign_recheck_test.go (new on v5) covering
that v5-only path; it auto-merged into v6 and no longer compiled.

Drop the v5-design tests (delta import x3, revision-minting trigger and
cadence tests, task-hash assertions) - v6 covers trigger/conflict/cadence in
api_campaigns_test.go - and adapt the decorate test to v6's
campaignRecheckInFlight predicate. Shared-helper tests are kept.

Signed-off-by: scanner <scanner@hive.kubestellar.io>
hivecommons-hive Bot added a commit that referenced this pull request Oct 18, 2026
Merges the 39 commits in origin/v6..origin/v5. The v6 Top-up workflow
could not auto-push this merge because it conflicts.

Conflicts and resolutions:
- src/cmd/hive/main.go: ProjectContext literal keeps v6's TaskMCPURL,
  TaskMCPLaunchToken and ExperimentEnv plus v5's AppBotLogin/AppBotUserID;
  kept v6's experimentAgentEnv/taskMCP*/resolveSpokeDashboardURL helpers
  and v5's appBotUserIDResolver.
- src/pkg/agent/manager.go: ProjectContext keeps v6's TaskMCPURL/
  TaskMCPLaunchToken fields and v5's AppBotLogin/AppBotUserID fields.
- src/pkg/config/config.go: Config keeps v6's Nous and v5's
  SelfExperiments. v6 split the rest of config.go into per-area files, so
  v6's layout is kept and v5's only other change
  (StageAdoptionConfig.StrictAttribution + StrictAttributionEnabled) is
  ported to src/pkg/config/governor_config.go.
- src/pkg/dashboard/contribute_ws.go: task payload keeps v5's Forge/Host
  and v6's StandbyLane/StandbyTier.
- src/pkg/github/client.go: Client keeps v6's issueOwnerSteps cache and
  v5's appBotUserMu/appBotUserID cache.
- src/docs/api-reference.md: v6's rows kept (logs/diag/hub/contribute
  routes); v5's updated /api/evidence/summary and /api/hub/evidence
  descriptions taken; citations re-pointed with
  check-api-reference-citations.sh --fix (37 rewritten, 0 unresolved).
- src/docs/labels-and-control-signals.md: v5's review.human_decision_label
  wording with v6's review_config.go citation.
- src/docs/scale-envelope.md: v6's RankActionableIssues citation, shifted
  to the merged client.go lines (4062-4072).

ADR numbering: v6 had two ADR-0024s (v5's provider credential lifecycle
and v6's renumbered spek continuous convergence). Per the #10828/#10840
precedent v5's numbering is kept and the v6-only spek ADR becomes
ADR-0025 (file, README index, spektacular.md and its changelog.d
fragment updated).

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: no Indicates the PR's author has not 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.

1 participant