Repository navigation
✨ tracker: PR in progress names who is working it, like Claimed - #15554
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 |
|
@clubanderson 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. |
PR rows at the PR-in-progress column carry the same claimant structure as Claimed: a live worker-ledger claim on the PR, else the author by kind (a hive PR names its attribution-trailer agent, else its agent/<lane> label; clanker owner login; human login), else nothing. The chevron reads "PR in progress · <holder> <icon>" with the holder's kind icon when the next mover is nobody, ellipsizes the name before the one-line sub-row wraps, and a detour word that already names the holder does not repeat them. Fixes #15541 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
58873ab to
7bbaf76
Compare
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
Conclusion: read the server and SPA halves against the tree at 7bbaf76; the change does what the body says and I found no defect.
Server
stage_tracker.go:2338passesLedger: s.stageTrackerLedgerClaim(repoName, pr.Number)— the same helper the issue path already uses at:2235(stage_tracker_claimant.go:230,Lookup(repo, number)). Issue and PR numbers share one sequence per repo, so keying the ledger by PR number cannot alias an issue's claim.stageTrackerPRClaimant(stage_tracker_claimant.go:131-133) delegates a live ledger claim tostageTrackerIssueClaimantwith onlyLedger/Since/HiveIDset, so it can only take the ledger branch (:84-99), never fall into the marker/assignee/worker branches. Good: one resolver, as the body promises.- Fallback order for a hive PR is now busy worker →
pr.HiveAgent(github.PullRequest.HiveAgent,client.go:903) →agent/<lane>label → author login; theTrimSpaceguard keeps an empty trailer from short-circuiting the label. stageTrackerClaimantStage("pr", stage)widening tostage < trackerNumberAwaitingMergeis the actual fix for #15541; the merge gate is still excluded.
SPA (tracker-row.js)
STAGE_TRACKER_CLAIMANT_ICONkeys (hive-agent/clanker/person,:202) match the Go constants (stage_tracker_claimant.go:31-33), and the icon names map onto existingSTAGE_TRACKER_ICONSentries (hive/clanker/human,:112-128), sostageTrackerIconnever returns''for a known kind.stageTrackerClaimantLineexists at:214.holderIcoonly renders when!actorIco, so a row with a serverstage_actorkeeps its actor icon and does not get two.
Minor, not a defect: detourHolder suppresses the · holder suffix via indexOf(holderShort), a substring match. A detour text that happened to contain the short form for another reason would also drop it — unlikely with current detour wordings, just noting the mechanism.
— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Read the resolver and its callers; this looks correct to me.
stageTrackerPRClaimantnow consultss.stageTrackerLedgerClaim(repoName, pr.Number)(stage_tracker.go:2338in this diff).claims.Ledger.Lookupkeys onowner/repo#N(src/pkg/claims/claims.go:748-752), and GitHub numbers are one sequence per repo, so a PR's lookup can never collide with an issue claim — no cross-match risk. One note, not a defect: today the onlyclaims.Ledgerwriters are the contributor claim API (src/pkg/dashboard/claims_api.go:125,:306), so the "ledger beats author" branch is reachable only when a client claims a PR's own number; the tree's existing ledger caller (stage_tracker.go:2235) is issue-only. The new unit test exercises the branch directly, which is fine.HiveAgentis a real field on the enumerated PR (src/pkg/github/client.go:903), and the fallback order (busy worker → trailer agent →agent/<lane>label → login) matches the body.stageTrackerClaimantStage("pr", …)widening tostage < trackerNumberAwaitingMergeis the only behaviour change on existing rows; the merge-gate rows (≥ 080) keep their own live detail as before.- SPA:
detourHoldersuppresses the duplicate name only whensg.detour.textalready containsholderShort(both unescaped, compared beforeesc), andholderIcois drawn only whenactorIcois empty, so rows that already had an actor icon are unchanged.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Fixes #15541
Problem
The tracker's PR in progress chevron was a bare label on every PR row (#15312, #15324, #15343, #15410, #15433, #15482, #15487, #15489, docs#514, crux#53, …), while Claimed already names its holder:
Claimed · scanner ⬡,Claimed · @odttlnt's clanker 🤖. Root cause:stageTrackerClaimantStage("pr", …)only populatedclaimantfrom review (050) up to the merge gate, so an unclassified or 030/040 PR — exactly the one drawn under its issue at PR in progress — carried no holder; and the SPA drew no identity icon whenstage_actor.kindwasnone, which is what such a PR reports.Change
stage_tracker_claimant.go, one resolver, no second one):stageTrackerPRClaimantnow checks a live worker-ledger claim on the PR first (reusing the issue-path ledger switch →claim-comment), then the author by kind — hive PR: busy agent (kick-history) →— hive:attribution trailer agent (newHiveAgentinput, fed fromgithub.PullRequest.HiveAgent) →agent/<lane>label → login; clanker owner login; human login — else nil.stageTrackerClaimantStage("pr", stage)is true for every stage below the 080 merge gate. TheaddPRcall site passesLedgerandHiveAgent.tracker-row.js,tracker.css): when a holder is known and the next mover is nobody, the chevron draws the holder's own kind icon (⬡ hive agent / 🤖 clanker / 👤 person,ham-ico ham-actor-ico) with the same Held by: … (source) hover as Claimed. The word carriesham-has-holderso the holder token ellipsizes (flex: 0 1 auto; overflow: hidden; text-overflow: ellipsis) before the one-line sub-row from 🐛 tracker: one-line PR sub-row header #15444 ever wraps. A detour word that already names the holder (Returned to @bob's clanker) no longer repeats them after the dot. No holder → plain PR in progress.TestStageTrackerPRClaimant(trailer agent, ledger beats author, cross-hive ledger agent, unknown kind → nil),TestStageTrackerClaimantStage(pr 0/030/040 → true),TestStageTrackerClaimantChevronJS(PR-in-progress sub-row word + distinct icon for hive/clanker/person, bare word and no icon/class for an unknown holder, Returned-to names the holder once). Notime.Sleep.dashboard-sections.md,dashboard-copy-inventory.md;changelog.d/added-tracker-pr-in-progress-actor.md; regeneratedstatic/index.html.Measured (headless Chromium 1400 px, generated
index.html, the #15444 sub-row harness)Every sub-row stays 40 px / 1 line before and after — including a holder
@a-contributor-with-a-very-long-github-login's clanker, which ellipsizes instead of wrapping. Lit words: beforePR in progress×3; afterPR in progress · @clubanderson,PR in progress · scanner,PR in progress · @a-contributor-…'s clanker.Before:
After: