Skip to content

✨ stage tracker: push detail on adopted and CI/Review rows - #15851

Merged
hivecommons-hive[bot] merged 7 commits into
v5from
scanner/fix-15797
Oct 30, 2026
Merged

hivecommons-hive[bot] merged 7 commits into
v5from
scanner/fix-15797

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

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

The adopted suffix and plain-row pill landed with #15801; the
pill still showed after the head moved past the pushed commit. Drop it then.

Closes #15797

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@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 hanthor 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 the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 30, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: 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

@github-actions

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.

No conflicting open PRs or same-file overlaps were found.

@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/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 30, 2026
… 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>
@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 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 the push bookkeeping behind this, and it holds up — looks correct to me.

  • it.Head comes from pr.HeadSHA (src/pkg/dashboard/stage_tracker_build.go:370) and rec.LastPushSha / rec.ActivityHead are written from the same full-SHA sources (src/pkg/stagelabels/store.go:831,838,902), so the EqualFold comparisons in stageTrackerPushOnHead (stage_tracker_push.go:176) compare like with like.
  • The ActivityHead arm 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

@hivecommons-hive hivecommons-hive Bot added stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) 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/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) labels Oct 30, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

stage 060-reviewed → 050-review-pending: base-refresh:queued-behind#15868

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

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

@hivecommons-hive
hivecommons-hive Bot merged commit ff55629 into v5 Oct 30, 2026
73 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the scanner/fix-15797 branch October 30, 2026 21:03
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author
Evidence bundle `#15851483c323` sha256:2ea5ae465e04460aa02075c6313a839ee87adb516486cf18e6a6b672a8b0a27e — download from the dashboard or `hivectl review evidence #15851`.

@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

@hivecommons-hive hivecommons-hive Bot removed role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 30, 2026
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 copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[scanner] Stage tracker: push detail on every CI / Review PR row

0 participants