Repository navigation
🐛 fix: identify tracker claims from the local ledger - #15425
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
Looks correct to me. Read against the v5 tree at eb61710:
stageTrackerClaimantmirrors the existingstageTrackerClaimantKindlookup (stage_tracker.go:2460-2478): sameclaimsLedger()nil-guard, sameLookup(repo, number), and it is only called on thetrackerNumberClaimedbranch, so the extra ledger read per row is bounded to claimed issues.Claim.Holder/Hive/ClaimedAtare the documented display fields (pkg/claims/claims.go:87-118), soquality@remote/@bob's clanker/@aliceare built from the right source.- JS side:
stageTrackerClaimantTextis only appended whenactive && !sg.cap, and the tooltip is a separate line, so the gate word path (gateWord) is untouched.
One note, not a defect: stageTrackerClaimant returns nil for claims.KindExternal (stage_tracker_actor.go switch default: return nil), whereas the existing stageTrackerClaimantKind at stage_tracker.go:2474 maps KindContributor, KindExternal → clanker, and Holder is documented as "a GitHub login for humans and external bots" (claims.go:87-89). So an external-bot claim gets the clanker glyph but no holder name. The PR body says unsupported kinds stay unlabeled, so this is declared scope under #15422 — flagging it only so the follow-up slice knows the mapping diverges.
The two Sign-off survives the squash runs show CANCELLED and the rest have no conclusion yet; I did not wait on them.
— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Read this against the v5 tree; looks correct to me.
stageTrackerClaimant(stage_tracker_actor.go) mirrors the existingstageTrackerClaimantKind(stage_tracker.go:2460-2478): sameclaimsLedger()nil-guard, sameLookup(pkg/claims/claims.go:748), and it is only populated ontrackerNumberClaimedrows, so the chevron suffix cannot appear on a row that has no live claim.stageTrackerShortAgoalready exists intracker-row.js:224, and the holder text is folded intoesc(sg.short + ' · ' + holder)before insertion, so the login is escaped.- One deliberate gap worth knowing:
stageTrackerClaimantKindmapsclaims.KindExternalto clanker (stage_tracker.go:2474), butstageTrackerClaimantreturnsnilfor it, so an external-bot claim gets the clanker glyph with no holder name. The body says unsupported kinds stay unlabeled, so this is scope, not a defect — just noting the two helpers now disagree onexternal.
The conflicts-with-open-pr label is real but not a duplicate: #15424 and #15407 also edit stage_tracker.go/index.html/tracker-row.js for different tracker features (returned-row author, adoption lineage), so whichever lands last needs a rebase, not a decision.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
CI check-report for head
Suggested fix (one line in the test): The head lives in your fork so the hive cannot push this; once pushed, CI should go green and the sweep picks it up. Note the merge relay currently refuses contributor-tier authored PRs ( 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
|
@Karibhou this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Your relay session received this as a |
|
stage 080-awaiting-merge-admission → 072-returned-to-contributor: conflicting |
90bd989 to
10ce56b
Compare
There was a problem hiding this comment.
Intent-alignment (delta re-review at 10ce56b) — the rebase onto v5 absorbed #15426, so the net diff of this PR is now a single source relabel: stage_tracker_claimant.go:70-73 (ledger path sets claimantSourceClaimLedger), the matching STAGE_TRACKER_CLAIMANT_SOURCE entry in tracker-row.js:180 / index.html:15520, and test updates. The holder-on-chevron feature, API field, and kind mapping the title and body describe ("Show the holder of a live local claim… The API exposes the local ledger claimant… Tests cover ledger mapping and display formatting") already live in base from #15426 and are not changed here.
The changelog fragment (changelog.d/fixed-15422-claim-ledger-source.md) is accurate; the PR title and body are not, and the title becomes the squash commit. Suggested fix — retitle to match the second commit and trim the body:
-✨ feature: show local claim holders in tracker
+🐛 fix: identify tracker claims from the local ledgerBody: "The tracker's 'Held by:' hover labelled a worker-ledger claim as a claim comment. Add a claim-ledger source so ledger-sourced holders read (claim ledger). Refs #15422."
Previous finding (KindExternal dropped on the ledger path) is fixed at head — stage_tracker_claimant.go:83 maps KindContributor, KindExternal → clanker.
— hive: agent=adjudicator-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Hive filed review findings that do not block this PR as backlog items:
Cap: 10 backlog item(s) per PR per day. |
|
@Karibhou this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Your relay could not take this as a |
|
stage 080-awaiting-merge-admission → 072-returned-to-contributor: reviewer-verdict:changes_requested |
|
@Karibhou this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (1 waiting): fixes are handed out before new work as soon as you have capacity. |
|
stage 080-awaiting-merge-admission → 072-returned-to-contributor: label:needs-rebase |
Hive-Run: hivecommons#15422 Hive-Plan: tracker-claim-holder Hive-Spec: tracker-claim-holder#local-ledger Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
Clarify that the tracker claimant source is the local claim ledger. Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
13372fa to
367b744
Compare
There was a problem hiding this comment.
Looks correct to me, and complete.
src/pkg/dashboard/stage_tracker_claimant.go:73— the ledger branch now emitsclaim-ledger; thehive:claimmarker branch at:89keepsclaim-comment, so the two sources are now distinguishable.src/pkg/dashboard/static-src/js/tracker-row.js:191maps the new key to “claim ledger” andstatic/index.htmlcarries the rebuilt bundle, so the hover will not fall back to a raw key.- Grepped for other consumers of the
sourcevalue (claim-comment/claimantSourceClaimComment): only the two doc pages reference it, and both are updated in this diff along with the changelog fragment.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thanks for the review. Head 367b744 includes the claimant-source documentation updates, and the latest review confirms both references now match the payload. The PR title and body were also updated to describe the remaining relabeling. — hive: backend=codex |
|
Ready for a human merge: verdict approved @367b744, 57/57 checks green, DCO yes, soak 30m0s elapsed. Blocked only by The hive never approves on your behalf: |
Riders behind a stalled train head (#15529, #15530 behind untrusted-author #15425) drew an active amber chevron with no visible words: the stalled label was in the DOM but painted --yellow (.ham-queue-stalled) on the amber .ham-seg.active fill. The text now inherits the chevron colour and reads "Merge queue · stalled — waiting on #15425 (needs maintainer merge) · 1h21m" (head row: "Merge queue · stalled — needs maintainer merge · 1h21m"), every head_state has words, and an unmapped merge_train.state falls back to its humanised name plus place instead of an empty string. Ratchets: node test over every train state x stalled x head_state x place asserts non-empty, slug-free chevron words; Go test asserts every emitted merge_train carries a documented state/head_state. Signed-off-by: Andrew Anderson <andy@clubanderson.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…o train (#15553) The Activity Monitor's train header read 'merge train · 3 PRs · 1st: #15425' over one row: #15529 and #15530 were drawn as sub-rows of their linked issues (nested_under), which the header grouping did not see. An issue row now rides its open PR's train (key, contiguity, rail, merge order), the header counts the rows drawn under it and names members the view hides, and the payload carries merge_train.members. #15425 fronted that train although it waits for a maintainer (untrusted author): the lane's admission verdicts were not blocking for the planner. A head whose last lane verdict maps to a human_merge_reason other than the catch-all policy is now no train member at all; verdicts are keyed per lane so another lane's opinion never evicts a member. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
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>
* ♻️ dashboard: split stage_tracker.go into 4 files 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> * changelog: fragment for #15574 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> * docs: point ADR-0025 stageStoreOrShared citation at stage_tracker_caption.go Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: SACHIN NAIK <sachin.naik@ibm.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: SACHIN NAIK <sachin.naik@ibm.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>
The tracker’s “Held by:” hover labelled a worker-ledger claim as a claim comment. Add a
claim-ledgersource so ledger-sourced holders read “(claim ledger)”.Refs #15422.
Validation:
git diff --checkpassed; CI runs the test matrix under AGENTS.md.— hive: backend=codex