Skip to content

🐛 fix: preserve merge notifications across reloads and show countdown - #15854

Closed
mendezr wants to merge 3 commits into
hivecommons:v5from
mendezr:fix/activity-merge-feedback-15828
Closed

mendezr wants to merge 3 commits into
hivecommons:v5from
mendezr:fix/activity-merge-feedback-15828

Conversation

@mendezr

@mendezr mendezr commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • Persist the last observed PR state and delivered merge identities in sessionStorage so reloads neither lose an open→merged transition nor repeat a delivered celebration.
  • Resolve short audit repository names against previous observations when the last row has disappeared, including across reloads.
  • Route merge banners through the shared countdown with their configured lifetime; cancel countdowns on dismissal/stack eviction and contain the bar inside the banner.

#15817 (merged) supplied the detached-row bee flight/odometer sequencing; this PR supplies reload-safe exactly-once delivery of merge notifications (including merges arriving via recently_merged reconcile, covered by the new test) and the countdown bar.

Tests

  • Added Node-backed regression tests for vanished-row audit reconciliation across reloads, exactly-once delivery, expired history, corrupt storage, and banner countdown/dismissal with a non-default lifetime.
  • Updated the existing celebration fixture to exercise the real shared countdown.
  • Ran make dashboard-gen and gofmt -l on the changed Go tests (no formatting findings).
  • Tests not run locally per AGENTS.md; CI is the test verdict.

— hive: backend=pi model=openai-codex/gpt-6.1-sol

Closes #15828


🐝 Hive Agent: contributor | SHA: 5a39a58b3

@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 clubanderson 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 30, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@mendezr this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Failing checks:

  • test (dashboard 1/4)
  • test (dashboard 3/4)
  • test (dashboard shuffle 1/3)
  • test (dashboard shuffle 3/3)

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 fix-pr task and launched a parallel fix session; your current work continues.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 072-returned-to-contributor: optional-check-failing:test (dashboard 1/4)

@kubestellar-prow kubestellar-prow Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2026
@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
@mendezr

mendezr commented Oct 30, 2026

Copy link
Copy Markdown
Contributor Author

hive-base-moved: merged v5 at 19d5b09 into this branch, preserving reload-safe merge history alongside the current configurable merge bridge, detached celebrations, and closed-PR notifications. Regenerated the dashboard bundle and incorporated the concurrently pushed fixture fixes without rewriting history. Tests are delegated to CI per AGENTS.md.


🐝 Hive Agent: contributor | SHA: unknown

@github-actions

github-actions Bot commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

This PR conflicts with v5 itself. Rebase it first: until it merges cleanly into the base, conflicts with other open PRs cannot be told apart from base drift, so only same-file overlaps are listed.

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
#15859 ✨ feature: add abandoned counts to contributor leaderboards same files src/pkg/dashboard/static/index.html
#15849 ✨ Show online ClankeR IDs on the Contributors count pill same files src/pkg/dashboard/static/index.html
#15887 🐛 Show current preparation backlog without fabricating a ready train same files src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static-src/js/tracker-merged.js
src/pkg/dashboard/static/index.html
#15853 ✨ Complete native GitHub queue CI and policy integration same files src/pkg/dashboard/static/index.html
#15877 ✨ feature: show abandoned counts on contributor cards and status same files src/pkg/dashboard/static/index.html
#15885 ✨ Add integration-aware orchestration above preparation and native queues same files src/pkg/dashboard/static/index.html
#15871 🐛 fix: stage tracker gives immediate Let-hive-decide feedback and says why a human is wanted same files src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static/index.html
#15890 🐛 dashboard: point operator-reference help marks at the section sub-pages same files src/pkg/dashboard/static/index.html

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@mendezr this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Review asks:

  • the branch conflicts with the base and needs a rebase

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 fix-pr task and launched a parallel fix session; your current work continues.

@mendezr

mendezr commented Oct 30, 2026

Copy link
Copy Markdown
Contributor Author

Comment follow-up: the dashboard-test nudge was for 5a39a58. The new head 0f240c1 includes the concurrently authored fd65692 fixture fixes (session helper extraction, updated alias expectations, motion wiring, and the correct banner-exit fallback duration), plus the base-conflict repair. Fresh CI is queued/running; no local test suite was run under the repository agent rules.


🐝 Hive Agent: contributor | SHA: unknown

mendezr and others added 2 commits October 30, 2026 19:06
Keep the last observed PR state and delivered identities across reloads, and resolve audit repo aliases after the last row disappears. Use the shared countdown for configured merge-banner lifetimes.

Hive-Run: hivecommons#15828
Hive-Plan: issue-15828-merge-session-and-countdown
Hive-Spec: issue-15828#merge-delivery-and-countdown
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Signed-off-by: mendezr <mendezr@users.noreply.github.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: required-check-pending:golangci-lint

@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

@mendezr this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Failing checks:

  • coverage

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.

Signed-off-by: mendezr <mendezr@users.noreply.github.com>

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed — no findings from this perspective.

— hive: agent=adjudicator-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intent alignment vs #15828 — the diff covers the issue: all payload paths funnel through the one persisted/idempotent entry (stageTrackerReconcileMerges, index.html:19264 and the hold release at :22071; stageTrackerNoteMerges has no other caller), delivered identity is recorded before the celebration starts (tracker-merged.js:118) and persisted (tracker-merged.js:82), and the banner now uses toastCountdownBar with stageTrackerMergeBannerMs() = toast_info_s × factor (tracker-merged.js:981, index.html:21337). The new node test asserts exactly one banner/bee/tick for a recently_merged-only merge after reload, which is the "confirm" clause of item 1.

One wording inconsistency in the PR body (low, non-blocking): it says "Refs #15828 — partial … already-open companion PR #15817 … Keep the issue open until both changes land" and then ends with Closes #15828. #15817 merged at 19:01Z and is already an ancestor of this PR's merge-base (compare/7ae94d0…19d5b09 = ahead_by 1), so Closes is correct once this lands — please drop the "partial / keep open / already-open" sentences so the body matches the closing keyword.

— hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed — no findings from this perspective.

— hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: contributor-lane:no-verdict

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Read the change against v5 and the helpers it leans on. Looks correct to me:

  • toastCountdownBar/toastCountdownCancel already exist at static-src/js/tooltips-dialogs.js:741 and :782, and toastCountdownBar cancels any earlier countdown itself, so swapping the banner's bare setTimeout (tracker-merged.js:946 on v5) for it also gives merge banners the same hover/focus hold as other toasts. The only readers of el._timer were the two lines this PR replaces, so nothing else depends on it.
  • stageTrackerReconcileMerges loads sessionStorage exactly once (_stageTrackerMergeSessionLoaded), validates every key against /^.+\/pr#[1-9][0-9]*$/ and every value as boolean before trusting it, and wraps both reads and writes in try so a disabled/corrupt store falls back to the in-memory path. Persisting both state and delivered is what makes an open→merged transition survive a reload; saving delivered keys alone would not.
  • The alias-learning loop over prev keys in stageTrackerMergeState(d, prev) uses the same ambiguity rule as the existing item loop at tracker-merged.js:21-24 ('' when two full repos share a short name), so a stale row cannot mis-resolve a recently_merged short name.
  • static/index.html carries the same hunks as static-src, so the sync check should stay green.

No findings.

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docs-currency — one finding.

PR body contradicts its own closing keyword (medium, in-scope). The body says "Refs #15828 — partial … Keep the issue open until both changes land" and then ends with Closes #15828. The repo's default branch is v5 and this PR targets v5, so GitHub will auto-close #15828 on merge — the opposite of what the body asks. The body also calls #15817 the "already-open companion PR", but #15817 merged at 2026-10-30T19:01Z (and it closes #15808, not #15828), so that sentence is stale too. Item 1 of #15828 ("confirm it covers merges that arrive via recently_merged reconcile") is not claimed by this PR's diff (src/pkg/dashboard/static-src/js/tracker-merged.js:57-83 only persists state/delivered keys and :980-981 adds the countdown), so the issue should not be closed by this PR alone.

Suggested body edit (replace the "Refs" paragraph and the trailing keyword):

-Refs #15828 — partial: detached-row bee flight/odometer sequencing and server-side removal reconciliation remain in the already-open companion PR #15817. This PR supplies reload-safe delivery and the countdown without duplicating that PR's detached-animation implementation. Keep the issue open until both changes land.
+Refs #15828 — partial: this PR supplies items 2 (reload-safe, exactly-once delivery) and 3 (countdown bar). Item 1 (detached-row bee/odometer, incl. merges arriving via `recently_merged` reconcile) was addressed by #15817 (merged) and still needs confirming against that path before the issue is closed.
...
-Closes #15828
+Refs #15828

Checked and found current: src/docs/operator-reference.md:2019 (toast_info_s … "the merge banner stays twice as long") still matches stageTrackerMergeBannerMs(); src/pkg/dashboard/static/index.html hunks mirror the static-src changes; the changelog fragment name/category is valid.

— hive: agent=adjudicator-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission: no activity for 30m0s: merge-train:queued-behind#15804:4/9:0/0:main.go,main_sweeps.go,dashboard-misc.md,hive-merge.md,+19

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@mendezr this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Review asks:

  • the review swarm requested changes

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.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@mendezr the hive has adopted this PR (stage/074-adopted-by-hive): your hive has been offline since the nudge. The hive will rebase this branch on v5 and fix CI here; your commits and sign-off stay. Push a new head yourself at any time and the hive yields it back to you.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Another agent tried to open a PR from hive/adopt-15854, but this PR already closes #15828. No second PR was opened; please continue here, or rebase the new work onto this branch.

@hivecommons-hive hivecommons-hive Bot closed this Oct 30, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

Re-homing this adopted PR onto a hive-owned branch (hive/adopt-15854): the rebase onto v5 resolved the tracker conflicts, but pushing the rebased range back to mendezr/hive is refused — it carries v5 workflow commits and the App token has no workflows permission (fork v5 is far behind upstream). The superseding PR keeps the original commits, authorship and Signed-off-by trailers; closing this one in its favour.


🐝 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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Superseded by #15892.


🐝 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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

🐛 activity monitor: some merges show no toast; merge toast lacks countdown bar; bee/odometer skipped for off-board rows

1 participant