Repository navigation
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 |
|
@mendezr this PR is back in your court ( Failing checks:
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: optional-check-failing:test (dashboard 1/4) |
|
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: |
Open PR overlap checkBase branch:
Conflicts are checked with every PR merged onto the current tip of
|
|
@mendezr 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 |
|
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: |
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>
0f240c1 to
8b59b5d
Compare
|
stage 080-awaiting-merge-admission → 050-review-pending: required-check-pending:golangci-lint |
|
@mendezr this PR is back in your court ( Failing checks:
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>
There was a problem hiding this comment.
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
|
stage 080-awaiting-merge-admission → 050-review-pending: contributor-lane:no-verdict |
There was a problem hiding this comment.
Read the change against v5 and the helpers it leans on. Looks correct to me:
toastCountdownBar/toastCountdownCancelalready exist atstatic-src/js/tooltips-dialogs.js:741and:782, andtoastCountdownBarcancels any earlier countdown itself, so swapping the banner's baresetTimeout(tracker-merged.js:946onv5) for it also gives merge banners the same hover/focus hold as other toasts. The only readers ofel._timerwere the two lines this PR replaces, so nothing else depends on it.stageTrackerReconcileMergesloadssessionStorageexactly 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 intryso a disabled/corrupt store falls back to the in-memory path. Persisting bothstateanddeliveredis what makes an open→merged transition survive a reload; saving delivered keys alone would not.- The alias-learning loop over
prevkeys instageTrackerMergeState(d, prev)uses the same ambiguity rule as the existing item loop attracker-merged.js:21-24(''when two full repos share a short name), so a stale row cannot mis-resolve arecently_mergedshort name. static/index.htmlcarries the same hunks asstatic-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
There was a problem hiding this comment.
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 #15828Checked 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
|
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 |
|
@mendezr 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. |
|
@mendezr the hive has adopted this PR ( |
|
Another agent tried to open a PR from |
|
Re-homing this adopted PR onto a hive-owned branch ( 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
|
Superseded by #15892. 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
Summary
#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_mergedreconcile, covered by the new test) and the countdown bar.Tests
make dashboard-genandgofmt -lon the changed Go tests (no formatting findings).— hive: backend=pi model=openai-codex/gpt-6.1-sol
Closes #15828
🐝 Hive Agent:
contributor| SHA:5a39a58b3