[clubanderson]

Closes #10590

Follow-up for option A: #10734

Resolution table

File/area	Resolution
src/Dockerfile	Union: v5 GOOS/GOARCH on Go builds plus v6 hive-admin-mcp binary.
src/cmd/hive/main.go	Kept v6 resolveSpokeDashboardURL; v5 side was equivalent/commentary in the conflict.
src/docs/api-reference.md	Kept v6 citation shape and applied v5 prose renames (Projects cards, Throughput). Citation fixer not run locally because AGENTS.md forbids local citation guards unless CI requests it.
src/docs/integration-guide.md, src/docs/integrations/work-source-providers.md, src/docs/labels-and-control-signals.md	Kept v6 content and applied v5 wording updates for Throughput and filtered needs-* labels.
src/go.mod	Union of v6 oauth2/sync/time/uritemplate deps and v5 go.opentelemetry.io/otel/log.
src/hive.yaml.example / src/pkg/config/runs_config*	Union of v6 hub executor/interview/checkpoints and v5 recheck/discovery config keys and defaults.
src/pkg/config/config.go / split config files	Kept v6 split config; ported openhands into backends.go; retained v6 hub config comments.
src/pkg/dashboard/api.go	Registered both /api/feedback/nps/issue and /api/feedback/status; retained campaign recheck endpoint.
src/pkg/dashboard/api_campaigns.go / src/pkg/knowledge/inception.go	Union of v6 run/revision fields/history with v5 recheck/drift types.
src/pkg/dashboard/campaign_recheck.go	Decision C: endpoint/config/types stay, triggerCampaignRecheck returns 501 with a clear #10734 message; cadence tick is inert on v6.
src/pkg/dashboard/api_campaigns_test.go, src/pkg/dashboard/recheck_discovery_test.go	v5 recheck tests are skipped on v6 with t.Skip citing #10734.
src/pkg/dashboard/stage_leases.go	Kept v6 work-item title/URL behavior; recheck spec-title behavior is deferred with #10734.
src/pkg/dashboard/static/index.html, version_provenance_ui_test.go, api_governor_features.go	Unioned v6 background activity/checkpoints/extensions/Gitea/GitLab/External UI with v5 KPI/version/wavefront/recheck surfaces.
src/pkg/dashboard/webstatic/style_ratchet_test.go	Ratchet baselines retained/updated for the merged tree: operator page 1690/149/693/240/185; hub static pages 964/456/427/167/104.
src/internal/testutil/sleep_ratchet_test.go	Union baseline is 201 sleeps.
src/pkg/hub/stable_promotion.go	Removed the duplicate mustParseRFC3339; only v6 health_verdict.go copy remains.

Recheck disabled on v6

Per #10590 decision C, the v5 Spek continuous convergence recheck and outward discovery model is not ported in this PR. Config keys, types, UI affordances, and endpoints remain present for compatibility, but manual/cadence recheck execution returns HTTP 501 until #10734 ports the feature onto v6's in-place campaign revision model. v6 must not ship a release until #10734 lands.

Validation

AGENTS.md forbids local go build, go test, go vet, and docs citation guard runs in this repository. Local checks run:

• gofmt -l on touched Go files: clean
• node --check bin/contributor-relay.js
• node --check bin/contributor-relay.test.js
• extracted inline JS from src/pkg/dashboard/static/index.html and ran node --check: clean
• confirmed one func mustParseRFC3339 remains under src/pkg/hub
• git diff --cached --check: clean

Coverage/package ratchets were not re-measured locally because package tests are forbidden for agents here; CI is the source of truth.

[kubestellar-prow]

[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:

• OWNERS

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

[github-actions]

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]

hive/awaiting-ci: pushed a fixup (8652255) for the 8 union test failures (worksource wavefront/external validation nesting, inception title/header, hive:claim tooltip, topbar three-zone center, openhands advisor doc row, sleep ratchet 201→203). CI pending — sweep will merge when green.

---

🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: 865225524

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

[hivecommons-hive]

The two red test shards (dashboard shuffle 1/2, rest 1/5) are one deterministic failure, and it is a merge-resolution regression rather than flake:

version_provenance_ui_test.go:34: version renderer failed: exit status 1
  assert.ok(out.menu.includes('2 behind'))   // actual: false

Mechanism. In fetchGitVersion, v6 computes a local statusText that becomes "2 behind" when commitsBehind is known (src/pkg/dashboard/static/index.html:27582 on this head, same as v6 :26176) and then hands that local to the renderers via window._lastVersionContext = { …, statusText: statusText, … } (v6 :26198). This merge took v5's version of that line instead — statusText: versionStatusSummary(v, offeredUpgradeShort) (index.html:27604, from v5 :26669). versionStatusSummary returns 'upgrade available → b2c3d4e' for any behind: true payload and never reaches the N behind text, so the local at :27582 is now computed and discarded, and renderVersionDetails (which only reads ctx.statusText) no longer shows the commit count. The v6 test asserting '2 behind' (version_provenance_ui_test.go:117) was kept, so it fails. v6 tip a909f89 passes this test.

Fix. Either restore v6's resolution at index.html:27604 — statusText: statusText — which keeps v6's "N behind" menu row (v5's new renderVersionSurfaces/navbar indicator is unaffected by this one field), or, if dropping the count in favour of the v5 summary is intended under decision C, say so and update the assertion at version_provenance_ui_test.go:117. The former preserves v6 behaviour and is the one I'd expect for a forward-merge.

Scope note: I read only this failure and the version-rendering functions it touches, not the other 313 files. The probot DCO failure is the usual forward-merge false positive on others' commits and is unrelated.

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

[github-actions]

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

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