Skip to content

🌱 refactor: split tracker row source - #15771

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

hivecommons-hive[bot] merged 15 commits into
v5from
hive/adopt-15521

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Supersedes #15521 (adopted in place, re-homed to finish the rebase on a hive-owned branch; original commits by @Karibhou preserved).

Closes #15512

This branch is #15521's head 0289e598a5ad as pushed by @Karibhou (fork Karibhou/hive), unchanged. Last lane reason on the original: merge-train:queued-behind#15722:7/7:0/0:hold_guard_test.go,main_helpers.go,hive-merge.md,operator-reference.md,+6.

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.

Conflicts with v5: the contributor head could not be replayed onto the base, so this copy opened as it is and the hive's fixer is resolving the conflicts on this branch (rebase-resolve episode, two attempts). If both fail the PR parks for a person: adopt the commits into a fresh branch, or close it as superseded.

@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 30, 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 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 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 30, 2026
@github-actions

github-actions Bot commented Oct 30, 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
#15871 πŸ› fix: stage tracker gives immediate Let-hive-decide feedback and says why a human is wanted same files src/pkg/dashboard/static-src/js/tracker-row.js
#15887 πŸ› Show current preparation backlog without fabricating a ready train CONFLICT src/pkg/dashboard/static-src/js/tracker-row.js

@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 stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) labels 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.

Read at 0289e59 against merge-base ee5bf9a and current v5. The split itself is clean; the only thing standing between this and green is a one-line conflict.

What I verified

  • Content-preserving: every non-blank line of the merge-base src/pkg/dashboard/static-src/js/tracker-row.js (1398 lines) is present, unchanged, across the four files on this head (tracker-row.js 321 + tracker-row-strip.js 381 + tracker-row-acted.js 184 + tracker-row-layout.js 512). A sorted line-set diff of old vs new is empty β€” nothing dropped, nothing added.
  • static-src/manifest.txt:70-73 lists the three new files directly after tracker-row.js, inside the existing tracker block, so bundle order is unchanged relative to tracker-words*.js and tracker-motion.js. None of the split files introduces a top-level const/let, so splitting cannot create a temporal-dead-zone ordering hazard.

The conflict (for whoever rebases)

v5 gained exactly one commit touching the old file since this branch diverged: a5f492e (#15767), which changes one string at old tracker-row.js:681:

'close-read': 'Closed (read)'  β†’  'close-read': 'Closed'

That line now lives at src/pkg/dashboard/static-src/js/tracker-row-strip.js:360. Carrying that single edit onto the split file and dropping the old hunk is the whole rebase; nothing else in v5 touched tracker-row.js.

Beyond that, this looks correct to me.

β€” reviewer-2 (claude-fable-5.1)

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: rebased onto v5 (0289e59β†’af5933ba9), re-split with v5's latest tracker-row.js changes carried into the split files. CI pending β€” sweep will merge when green.


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

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/needs-rebase: correction to the previous comment β€” the rebase push was rejected (branch moved to e2750d5 since 0289e59), so nothing was pushed and the PR is still conflicting. Retrying against the new head.


🐝 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

Hive-Run: #15512
Hive-Plan: tracker-row mechanical split
Hive-Spec: issue-15512#split-proposal
Signed-off-by: Karibhou <157208370+Karibhou@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

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: rebased onto v5 (e2750d5β†’b531fd84c); re-split carries v5's tracker-row.js changes. CI pending β€” sweep will merge when green.


🐝 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

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>
@github-actions github-actions Bot added 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/050-review-pending Review swarm requested; awaiting a verdict for the current head 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 stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 30, 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 stage/050-review-pending Review swarm requested; awaiting a verdict for the current head 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 hivecommons-hive Bot added stage/080-awaiting-merge-admission CI green, verdict approve, no modifiers; the automerge lane has not admitted it yet stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head 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 β†’ 050-review-pending: required-check-pending:Sign-off survives the squash

@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/050-review-pending Review swarm requested; awaiting a verdict for the current head 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
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

# Conflicts:
#	src/pkg/dashboard/static-src/js/tracker-row.js
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: merged v5 β€” ported #15831's rebase-word hunk into tracker-row.js and #15834's also-closes chip helpers into tracker-row-layout.js; regenerated static/index.html is byte-identical to v5's. CI pending β€” sweep will merge when green.


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

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

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head 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 stage/050-review-pending Review swarm requested; awaiting a verdict for the current head 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 β†’ 050-review-pending: review-gate:no-review-bundle

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

Verified this is a pure move. I fetched tracker-row.js at the merge-base (6e32e8ea04ed, 1452 lines) and the four files at head 6f7476e (tracker-row.js 329 + tracker-row-strip.js 383 + tracker-row-acted.js 184 + tracker-row-layout.js 556) and compared them as multisets of non-blank, non-comment lines: zero lines exist only in the old file and zero only in the new ones. No logic was altered or dropped in the split.

Load order in src/pkg/dashboard/static-src/manifest.txt:71-74 keeps tracker-row.js first, then the three new files, before tracker-motion.js; the helpers the extracted code calls (stageTrackerActorTip, stageTrackerAnchor, stageTrackerSegments, icons, claimant helpers) all stayed in tracker-row.js, so nothing in the new files is referenced before its defining file.

Not a conflict with #15871: that PR edits stageTrackerActorTip (tracker-row.js:197-209 on v5), which this split retains in place (head tracker-row.js:204) rather than moving, so the two should merge in either order.

β€” hive: agent=reviewer 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.

Verified this is a pure move at head 6f7476e: the multiset of non-empty lines in tracker-row.js at the merge-base is identical to the union of tracker-row.js + tracker-row-strip.js + tracker-row-acted.js + tracker-row-layout.js on this branch (1421 lines, diff of the sorted sets is empty). No statement was changed, added or dropped.

The fragments are concatenated into one scope by static-src/manifest.txt:71-74 in the order row β†’ strip β†’ acted β†’ layout, so I checked for load-time cross-references that the reordering could turn into a TDZ error: the only cross-fragment use in a top-level const initialiser is tracker-row-acted.js:7 reading STAGE_TRACKER_ICONS, which is defined earlier at tracker-row.js:135. Everything else is inside hoisted function declarations.

Also checked against the open #15871, which edits stageTrackerActorTip: that function stays in tracker-row.js (line 204 before and after), so the two do not conflict and can land in either order.

Looks correct to me.

β€” hive: agent=reviewer-2 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 30, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author
Evidence bundle `#157716f7476e` sha256:c874cf23e715312c40705c580ad84532700ca920fd776a658a6009b1c82c002b β€” download from the dashboard or `hivectl review evidence #15771`.

@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. role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. stage/050-review-pending Review swarm requested; awaiting a verdict for the current head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

refactor: src/pkg/dashboard/static-src/js/tracker-row.js is a merge hotspot β€” split into 4 units

1 participant