Skip to content

🌱 sync: forward-merge v5 (through 6f5f7d1cd) into v6 - #10860

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

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

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Top up v6 with current origin/v5 through 6f5f7d1cd.

Included v5 PRs since the last v6 top-up

Conflict resolution summary

Area Resolution
.github/workflows/tagged-release.yml + src/scripts/test-release-push-retry.sh Took v5's #10837 release merge wait/check-state behavior and updated guard expectations.
src/docs/adr/README.md Kept v6's full ADR index and confirmed #10840's Codex ADR is ADR-0022; v6 still has unique ADR entries 0020-0023 with no duplicate numbers.
src/docs/integration-guide.md Unioned v6 planning-engine wording with v5's vibe-kanban dispatch adapter docs.
src/pkg/config/config.go Preserved v6's split config structure; dropped the v5 monolith reinsertion of OTel/splitAuthorizedEntry because v6 already carries those in dedicated files.
src/pkg/dashboard/cost.go Unioned v6 advisor-by-agent spend with v5 hive-attributed count metadata (count_author, count_basis).
src/pkg/dashboard/static/index.html Auto-merged; kept v6 admin MCP / planning-engine dashboard structure while carrying v5 navbar, agent tile, cost tile, tooltip, and repo-card fixes.

Validation

Per AGENTS.md, local Go build/test/vet/lint and docs citation guards are not run by agents; CI is the verdict. Local checks run:

  • gofmt -l on touched Go files
  • git diff --check
  • duplicate-symbol grep confirmed a single func mustParseRFC3339
  • ADR README duplicate-number check confirmed exactly one entry per ADR number

DCO checks are expected to report noise on this forward merge.

clubanderson and others added 30 commits October 6, 2026 07:48
Signed-off-by: Andrew 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: clubanderson <407614+clubanderson@users.noreply.github.com>
Hold a persistent nonblocking flock guard across sentinel acquisition, stale takeover, and release. Renaming a stale sentinel could move a fresh winner out of the way and admit another controller before restoration.

Add deterministic live-holder exclusion and guard-inode reuse coverage, and clean up the held winner in the concurrent takeover test.

Hive-Run: #10814
Hive-Plan: stale-lock-takeover-serialization
Hive-Spec: ADR-0021#idempotent
Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Signed-off-by: Andrew 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: clubanderson <407614+clubanderson@users.noreply.github.com>
Drain accepted attempts before assertions and explicitly age the persisted failure backoff before retrying. Release the blocked seam before deferred filesystem cleanup on all assertion paths.

Hive-Run: #10813
Hive-Plan: stabilize-vanity-repair-dedupe-test
Hive-Spec: #10813#in-flight-deduplication
Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Automated pin bump (#8419). Digests recomputed from the downloaded
release artifacts by src/scripts/cli-pin-bump.sh:

  VERSION=1.3.0
  BUILD=6233328509124608
  SHA256_AMD64=54731cc8ed8fe4a1840c38626b7e3251c6dc4484387f98005dba682507f495be
  SHA512_AMD64=f6f5e16f356ae8a345fd6ab265ad2a4e4dc8d0b7f4ac345249d0e250a06edd496677b8ac0193b258971feb7ccfbba2fccc2f482db1d62cc650498e352ef85280
  SHA256_ARM64=ca09b2c9e6cd34a456dceec7af0198d53aceb15e94204f4d8cca3602c5ee5062
  SHA512_ARM64=8a880575accf28b03de00e748209dc735c11e59847de8b137cba07aaaab166c892836574cacd9a0d6fa1e24d6e19197d25f36b7e0a49fd84d64ea84ee26ab21d

Signed-off-by: hive-release[bot] <hive-release@hive.kubestellar.io>
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: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
Refs #10797. Move the Codex earned-reset redemption ADR from 0021 to 0022 so future v5-to-v6 forward merges do not collide with v6's planning-engine ADR-0021.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
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: clubanderson <407614+clubanderson@users.noreply.github.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
Treat configured rationale issue acceptance labels as maintainer sign-off, while retaining holds for unaccepted untrusted citations and clarifying that the hold concerns the issue reporter.

Hive-Run: #10771
Hive-Plan: reporter-trust-acceptance
Hive-Spec: issue-10771#expected-acceptance-sign-off

Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Co-authored-by: mendezr <mendezr@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Give both schedule rows explicit vertical insets and the same horizontal inset as adjacent navbar chips. Centre intrinsic-height rows and let the pill grow with typography rather than squeezing content into a fixed height.



Hive-Run: #10816
Hive-Plan: navbar-schedule-pill-alignment
Hive-Spec: #10816#expected

Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Co-authored-by: mendezr <mendezr@users.noreply.github.com>
)

Reconcile reporter-trust hold releases during PR enumeration, before held partitioning. Require trusted notice and paginated human release evidence, preserve independent label hand-offs and fix-loop escalations, and remove the label through the mutation boundary.

Hive-Run: #10817
Hive-Plan: reporter-trust-hold-release
Hive-Spec: #10817#hold-removal-and-independent-reasons

Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Co-authored-by: mendezr <mendezr@users.noreply.github.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
📖 docs: renumber Codex reset ADR on v5
🐛 dashboard: navbar zones still bunched left — fix grid container/cascade
…ecks-10795

🐛 release: let release PRs satisfy v5's required contexts (path filters + longer merge wait)
Signed-off-by: Andy Anderson <andy@clubanderson.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
🐛 dashboard: restore upgrade bee contrast and smooth orbit loop
🐛 dashboard: RUNNING NOW vs UP NEXT on agent tiles (navbar + collapsed Agents header)
clubanderson and others added 10 commits October 6, 2026 09:13
Signed-off-by: Andy Anderson <andy@clubanderson.com>
🐛 Shorten Dashboard KPI info tooltips
…words

🐛 github: keep closing keywords on Hive/ClankeR fix PRs
🐛 fix(rotation): serialize Codex reset stale-lock takeover
🐛 fix(hub): stabilize vanity repair dedupe regression test
⬆️ images: bump agy 1.2.13,6662628811079680 -> 1.3.0,6233328509124608
🐛 dashboard: make Cost total, sparkline and per-PR/issue tiles use one unit, window and divisor
* feat: add vibe-kanban extwork adapter

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

* changelog: fragment for #10844

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>

* test: cover vibe-kanban stdio client

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

* test: cover vibe-kanban adapter edges

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

* test: raise vibe-kanban adapter coverage

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

* fix: stabilize vibe-kanban tests under race

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

* chore: refresh PR metadata checks

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: clubanderson <407614+clubanderson@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* 🐛 dashboard: left-align repo card names

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

* changelog: fragment for #10851

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>
Top up v6 with current origin/v5 after #10828. Preserve v6 dashboard/planning-engine structure while carrying forward v5 dashboard, release, ADR, extwork, and reporter-trust fixes.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
@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 kellyaa 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 Oct 6, 2026
@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.

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

hive/awaiting-ci: all build/test checks green; the only red check is probot DCO, which cannot pass on a v5→v6 forward-merge carrying other authors' already-merged commits (repo dco check: all commits signed off). No code repair needed — sweep/maintainer merge when ready.


🐝 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

@clubanderson
clubanderson merged commit e979eab into v6 Oct 6, 2026
76 of 80 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the sync/v5-to-v6-20261006b branch October 6, 2026 15:27
@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

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.

2 participants