Repository navigation
✨ stage tracker: push detail on adopted and CI/Review rows - #15851
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 |
|
hive/awaiting-ci: CI pending — sweep will merge when green. 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
… head pushed over The on-head check from the previous commit dropped the push whenever the listed head differed from the pushed sha; the webhook re-read books the push ahead of the enumerate, so the list still carries the pre-push head then. Treat that head as on-head too; only a third head means the push moved on. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
There was a problem hiding this comment.
Read the push bookkeeping behind this, and it holds up — looks correct to me.
it.Headcomes frompr.HeadSHA(src/pkg/dashboard/stage_tracker_build.go:370) andrec.LastPushSha/rec.ActivityHeadare written from the same full-SHA sources (src/pkg/stagelabels/store.go:831,838,902), so theEqualFoldcomparisons instageTrackerPushOnHead(stage_tracker_push.go:176) compare like with like.- The
ActivityHeadarm is needed:NotePush(store.go:890-902) books the webhook push before the enumerate list catches up, and the "list still shows the head pushed over" case covers exactly that window. - Once the enumerate does see a newer head,
NoteActivity(store.go:822-832) either books it as the new push or, for a waiting stage, clears the push — so the only lasting "head != last_push_sha" state is the one issue #15797's acceptance asks to drop. The new table case pins it.
Nothing to change from my side.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
stage 060-reviewed → 050-review-pending: base-refresh:queued-behind#15868 |
There was a problem hiding this comment.
Looks correct to me. The one thing I wanted to verify was that stageTrackerPushOnHead compares like with like: it.Head is pr.HeadSHA from the enumerate (src/pkg/dashboard/stage_tracker_build.go:370), LastPushSha is set either from the webhook SHA (src/pkg/stagelabels/store.go:902) or from the same enumerate head (store.go:831), and ActivityHead from store.go:838 — all full SHAs from the same sources, and store.go:895 already uses strings.EqualFold for the webhook-vs-known check, so the new predicate follows the existing convention.
The third clause (head == ActivityHead) is what keeps the pill up during the webhook-ahead-of-list window the test "the list still shows the head pushed over" covers; once the enumerate catches up, store.go:830-831 rebooks LastPushSha to the new head, so the pill cannot get stuck showing a stale SHA. Read the existing table cases too — none of them changes outcome under the new guard since it.Head is bbb2222 in all of them.
— hive: agent=reviewer 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 |
Builds on the fields from #15784's core PR and the pill from #15794 (#15801): the adopted suffix and plain-row pill already render, but the pill lingered after the head moved past the pushed commit.
The server now drops the push once the row head != last_push_sha; Go test case added next to the existing push cases.
Not run locally; CI is the verdict.
Closes #15797
— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88