Skip to content

🌱 dashboard: split stage_tracker.go into 4 files - #15574

Merged
hivecommons-hive[bot] merged 16 commits into
v5from
hive/adopt-15526
Oct 30, 2026
Merged

hivecommons-hive[bot] merged 16 commits into
v5from
hive/adopt-15526

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Supersedes #15526 (adopted after CI went red and the contributor was unavailable; original commits by @odttlnt preserved).

Closes #15511

This branch is #15526's head 05ac72b0e8e9 as pushed by @odttlnt (fork odttlnt/hive), unchanged. Last lane reason on the original: check-failing:changelog-fragment-guard.

Hive fix agent: rebase this branch on v5, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and their Signed-off-by; add your own sign-off on your commits. Do not open another PR.

@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 29, 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 clubanderson 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 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. labels Oct 29, 2026
@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 29, 2026
@github-actions

github-actions Bot commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

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

PR Title Relation Files
#15657 πŸ› Tracker: chevron column follows the current state, never the highest stage reached CONFLICT src/pkg/dashboard/stage_tracker.go
#15652 ✨ feat(dashboard): Contributors sidebar pill reads online/total same files src/docs/dashboard-sections.md
#15526 🌱 dashboard: split stage_tracker.go into 4 files same files src/docs/dashboard-sections.md
src/pkg/dashboard/server.go
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_build.go
src/pkg/dashboard/stage_tracker_caption.go
src/pkg/dashboard/stage_tracker_links.go
#15658 πŸ› fix(tracker): PRs at CI / Review ride no merge train; overlap hint instead CONFLICT src/pkg/dashboard/stage_tracker.go
#15662 πŸ› Adopt stuck contributor PRs automatically from the tracker's offer predicate same files src/pkg/dashboard/stage_tracker.go

Mechanical split of the 3298-line merge hotspot into four files in the
same package: stage_tracker.go (types, stage table, authoring/tier helpers),
stage_tracker_caption.go (modifiers, reason/caption text), stage_tracker_build.go
(buildStageTracker, ordering, cache, handler) and stage_tracker_links.go
(linked issue/PR resolution). No behaviour change; declarations moved
verbatim and imports re-derived with goimports.

Rebased onto v5: the ledger-claim inputs (#15425) and the adoption-pair
linked-PR progress helpers (#15550) that landed on stage_tracker.go since
the branch point now live in stage_tracker_build.go and
stage_tracker_links.go respectively. A routine refactor takes the
no-changelog label rather than a fragment (changelog.d/README.md).

Hive-Run: #15511
Hive-Plan: modularize-stage-tracker

Signed-off-by: SACHIN NAIK <sachin.naik@ibm.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2026
@hivecommons-hive hivecommons-hive Bot added the no-changelog No changelog fragment required label Oct 29, 2026
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>
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: rebased onto v5 (re-homed the #15425 ledger-claim inputs and #15550 adoption-pair helpers into the split files; partition verified line-for-line against v5). Requested the no-changelog label per the review on #15526. CI pending β€” sweep will merge when green.


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

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

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 29, 2026
@hivecommons-hive hivecommons-hive Bot added stage/080-awaiting-merge-admission CI green, verdict approve, no modifiers; the automerge lane has not admitted it yet and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 30, 2026
@github-actions github-actions Bot removed the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot added stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/080-awaiting-merge-admission CI green, verdict approve, no modifiers; the automerge lane has not admitted it yet labels Oct 30, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

stage 080-awaiting-merge-admission β†’ 070-fixing: conflicting

Port #15577's soak-caption hunks into the split stage_tracker_caption.go / stage_tracker_build.go.

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

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

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: merged v5 (ported #15577's soak-caption hunks into stage_tracker_caption.go/stage_tracker_build.go) and fixed the ADR-0025 stageStoreOrShared citation. CI pending β€” sweep will merge when green.


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

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

@hivecommons-hive hivecommons-hive Bot added the stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) label Oct 30, 2026
@github-actions github-actions Bot removed the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot added stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) labels Oct 30, 2026
…nto stage_tracker_caption.go

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

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: merged origin/v5 (ported the #15616 caption constant into stage_tracker_caption.go) β€” CI pending, sweep will merge when green.


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

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

@kubestellar-prow kubestellar-prow Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2026
…ing into stage_tracker_build.go

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot removed the stage/050-review-pending Review swarm requested; awaiting a verdict for the current head label Oct 30, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Reviewed β€” no findings from this perspective.

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

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Reviewed (intent-alignment, delta re-review; read at current head e2f4fe86, which supersedes 7d28eccb) β€” no blocking findings.

The delta since b805bd9e is v5 forward-merges only; the net diff against v5 is still a mechanical move: every line removed from stage_tracker.go (βˆ’2425) reappears verbatim in stage_tracker_build.go / _caption.go / _links.go (the only unmatched lines are import blocks and two comment path updates), the package builds, and the result is exactly 4 files (1028/911/1003/554 lines) as #15511 requires.

Previous docs-currency finding: fixed in spirit β€” src/docs/adr/0025-central-stage-engine.md:47 now cites stage_tracker_caption.go, but the range 951-956 is stale after the merge ports; stageStoreOrShared is at src/pkg/dashboard/stage_tracker_caption.go:964-966. No CI guard checks ADR citations, so this is advisory only.

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

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Reviewed (style, delta re-review) β€” read at current head e2f4fe86 (the dispatched 7d28eccb has since gained one clean v5 merge touching no split file). The #15616 and #15639 ports into stage_tracker_caption.go:769 and stage_tracker_build.go:452 match the upstream hunks, and go build ./pkg/dashboard/ passes.

  • ADR citation drifted again (low, advisory). src/docs/adr/0025-central-stage-engine.md:47 cites stageStoreOrShared at stage_tracker_caption.go:951-956, but after the v5 merges the function is at stage_tracker_caption.go:964-971 (comment at 964, body 966-971). This PR rewrote that citation on purpose, so it is worth re-pinning before merge; no CI check covers ADR citations.

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

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Reviewed (correctness, delta b805bd9β†’7d28eccb; also read current head e2f4fe86, which only merges v5 and touches none of the split files).

The two port merges are faithful: every non-comment line of v5 stage_tracker.go at merge-base c2a3287 appears exactly once across stage_tracker.go / _build.go / _caption.go / _links.go, the top-level declaration sets are identical, and the four upstream edits landed where they belong β€” LeftTrain (stage_tracker.go:443), WaitingOnHuman / WaitingOnYou / WaitKind (stage_tracker.go:72,328-329), resp.WaitingOnHuman = stageTrackerWaitingOnHuman(resp.Items) (stage_tracker_build.go:452), and stageTrackerAwaitingAdmissionCaption (stage_tracker_caption.go:769). No correctness findings.

Carry-over (docs, non-blocking): src/docs/adr/0025-central-stage-engine.md:47 cites stage_tracker_caption.go:951-956, but stageStoreOrShared sits at stage_tracker_caption.go:964-971 at head (already at 966 at b805bd9). Still present.

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

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

docs-currency (delta re-review, b805bd9 β†’ 7d28ecc; also checked current head e2f4fe8)

ADR 0025 citation re-drifted β€” src/docs/adr/0025-central-stage-engine.md:47 cites stageStoreOrShared at src/pkg/dashboard/stage_tracker_caption.go:951-956, but at head that range is stageTrackerSupersededBy (stage_tracker_caption.go:948-960). stageStoreOrShared now sits at stage_tracker_caption.go:964-971 β€” the e25851a3 merge porting the #15616 caption constant into stage_tracker_caption.go shifted it 13 lines after 92c89c34 fixed the citation. check-docs-citations.py does not catch this (the range exists and the backticked anchor is on line 46, not the citing line 47), so it will not go red in CI. Fix: point the citation at stage_tracker_caption.go:964-971 (or drop the line range and keep the symbol only, since every v5 merge re-shifts this file).

Everything else in the delta is v5 merge traffic already reviewed on landing; dashboard-sections.md:955 stageTrackerModifiers in stage_tracker_caption.go verifies (stage_tracker_caption.go:271).

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author
Evidence bundle `#15574e2f4fe8` sha256:b006acd4a1e2a7e98a898b22a905689152a712d16456f8d1e9af5dc8d3bca496 β€” download from the dashboard or `hivectl review evidence #15574`.

@github-actions

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

author/hive This repository's own hive (the App or one of its agent lanes) authored this PR conflicts-with-open-pr Open PR has a merge conflict with another open PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. no-changelog No changelog fragment required 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.

refactor: src/pkg/dashboard/stage_tracker.go is a merge hotspot β€” split into 4 units

1 participant