From 4836f5c5a59fac1d3aae1eaeb18ee3068d9da613 Mon Sep 17 00:00:00 2001 From: mendezr Date: Fri, 30 Oct 2026 18:50:47 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20fix:=20persist=20activity=20?= =?UTF-8?q?merge=20delivery=20and=20show=20banner=20countdown?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/hive#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 --- .../fixed-15828-merge-session-countdown.md | 1 + src/pkg/dashboard/stage_tracker_cues_test.go | 4 + .../stage_tracker_merge_session_test.go | 88 +++++++++++++++++++ .../stage_tracker_merge_sound_test.go | 4 +- src/pkg/dashboard/static-src/css/tracker.css | 2 +- .../static-src/js/tracker-filter-render.js | 2 +- .../dashboard/static-src/js/tracker-merged.js | 47 ++++++++-- src/pkg/dashboard/static/index.html | 51 +++++++++-- 8 files changed, 181 insertions(+), 18 deletions(-) create mode 100644 changelog.d/fixed-15828-merge-session-countdown.md create mode 100644 src/pkg/dashboard/stage_tracker_merge_session_test.go diff --git a/changelog.d/fixed-15828-merge-session-countdown.md b/changelog.d/fixed-15828-merge-session-countdown.md new file mode 100644 index 0000000000..9a219bb4d2 --- /dev/null +++ b/changelog.d/fixed-15828-merge-session-countdown.md @@ -0,0 +1 @@ +- Activity monitor merge notifications survive reloads without replaying delivered merges, resolve audit events for vanished rows, and show a countdown bar using the configured banner lifetime. diff --git a/src/pkg/dashboard/stage_tracker_cues_test.go b/src/pkg/dashboard/stage_tracker_cues_test.go index b1a1a37a4d..ba832b8e72 100644 --- a/src/pkg/dashboard/stage_tracker_cues_test.go +++ b/src/pkg/dashboard/stage_tracker_cues_test.go @@ -360,6 +360,8 @@ func stageTrackerCelebrateJS(t *testing.T, html string) string { jsFunc(t, html, "stageTrackerMergeBannerNumber"), jsFunc(t, html, "stageTrackerMergeBannerText"), jsFunc(t, html, "stageTrackerMergeBanner"), + jsFunc(t, html, "toastCountdownBar"), + jsFunc(t, html, "toastCountdownCancel"), jsFunc(t, html, "stageTrackerMergeBannerDismiss"), jsFunc(t, html, "hamBannerDismiss"), jsFunc(t, html, "hamBannerShowRow"), @@ -416,6 +418,8 @@ function el(tag, attrs) { get outerHTML() { return '
'; }, querySelector(sel) { return e.querySelectorAll(sel)[0] || null; }, querySelectorAll(sel) { const out = []; const unesc = v => v.replace(/\\(.)/g, '$1'); const m = sel.match(/^\[([\w-]+)="(.*)"\]$/); const word = sel.match(/^\[([\w-]+)~="(.*)"\]\[data-ham-key\]$/); const cls = sel.match(/^\.([\w-]+)/); const capOfRow = sel === '.ham-row[data-ham-key] .ham-seg.cap'; const walk = n => { for (const c of n.children) { if (capOfRow) { if (c.classList.contains('cap') && c.closest('.ham-row') && c.closest('.ham-row').classList.contains('ham-row')) out.push(c); } else if (m && c.attrs[m[1]] === unesc(m[2])) out.push(c); else if (word && c.attrs['data-ham-key'] != null && String(c.attrs[word[1]] || '').split(' ').includes(unesc(word[2]))) out.push(c); else if (!m && !word && cls && c.classList.contains(cls[1]) && (!sel.includes('[data-at]') || c.attrs['data-at'] != null)) out.push(c); walk(c); } }; walk(e); return out; }, + matches() { return false; }, + contains(node) { return node === e || e.children.some(c => c.contains(node)); }, closest(sel) { let n = e; while (n) { if (n.attrs && n.attrs['data-ham-key'] != null) return n; n = n.parentNode; } return null; }, }; return e; diff --git a/src/pkg/dashboard/stage_tracker_merge_session_test.go b/src/pkg/dashboard/stage_tracker_merge_session_test.go new file mode 100644 index 0000000000..33bdafe555 --- /dev/null +++ b/src/pkg/dashboard/stage_tracker_merge_session_test.go @@ -0,0 +1,88 @@ +package dashboard + +import ( + "strings" + "testing" +) + +// Exercise the real reconcile entry point with a shared sessionStorage but +// reset SPA memory, as a reload would. Detached glyph flight itself belongs +// to the companion #15817 change; this pins delivery to that pipeline. +func TestStageTrackerMergeSessionNode(t *testing.T) { + html := indexHTML(t) + script := stageTrackerCelebrateJS(t, html) + "\n" + strings.Join([]string{ + jsConstLine(t, html, "STAGE_TRACKER_MERGE_SESSION_KEY"), + "var _stageTrackerMergeSessionLoaded = false;", + jsFunc(t, html, "stageTrackerReconcileMerges"), + }, "\n") + stageTrackerCelebrateFixture + ` +function reload() { + _stageTrackerMergeSessionLoaded = false; + _stageTrackerMergeState = null; + _stageTrackerZapped = {}; +} +stageTrackerReconcileMerges(items(42)); +// Webhook eviction can precede the audit fact, including across a reload. +stageTrackerReconcileMerges({ items: [] }); +assert.strictEqual(banners.children.length, 0, 'absence alone is not a merge'); +reload(); +const merged = { items: [], recently_merged: [{ repo: 'r', number: 42 }] }; +stageTrackerReconcileMerges(merged); +tick(0); +assert.strictEqual(banners.children.length, 1, 'last row absent, short audit repo still resolves after reload'); +assert.strictEqual(_stageTrackerMergeState['o/r/pr#42'], true); +assert.strictEqual(_stageTrackerZapped['o/r/pr#42'], true); +assert.strictEqual(zaps.length, 1, 'exactly one delivery to the celebration/count pipeline'); +stageTrackerReconcileMerges({ items: [], merged: { recent: [{ repo: 'o/r', number: 42 }] } }); +reload(); +stageTrackerReconcileMerges(merged); +tick(0); +assert.strictEqual(banners.children.length, 1, 'reload after delivery does not repeat the banner'); +assert.strictEqual(zaps.length, 1, 'ledger + audit + reload do not repeat the counter tick'); +// Delivered identity outlives the server's recent-history window, even +// if a stale open snapshot resurfaces after another reload. +stageTrackerReconcileMerges({ items: [] }); +reload(); +stageTrackerReconcileMerges(items(42)); +stageTrackerReconcileMerges(payloadMerged(42)); +tick(0); +assert.strictEqual(banners.children.length, 1, 'expired recent history cannot erase delivered identity'); +// A tab's first snapshot is a baseline, not a replay of old merges. +delete session[STAGE_TRACKER_MERGE_SESSION_KEY]; +reload(); +stageTrackerReconcileMerges(payloadMerged(99)); +tick(0); +assert.strictEqual(banners.children.length, 1); +// A corrupt/unavailable browser store must not break normal live delivery. +session[STAGE_TRACKER_MERGE_SESSION_KEY] = '{broken'; +reload(); +stageTrackerReconcileMerges(items(43)); +stageTrackerReconcileMerges(payloadMerged(43)); +tick(0); +assert.strictEqual(banners.children.length, 2); +` + runStageTrackerRowActionsScript(t, script) +} + +func TestStageTrackerMergeBannerCountdownNode(t *testing.T) { + html := indexHTML(t) + runStageTrackerRowActionsScript(t, stageTrackerCelebrateJS(t, html)+stageTrackerCelebrateFixture+` +const ttl = 2468; +stageTrackerMergeBannerMs = () => ttl; +const b = stageTrackerMergeBanner({ key: 'o/r/pr#7', repo: 'o/r', number: 7, at: clock }); +assert.ok(b.querySelector('.toast-bar'), 'merge banner draws the shared countdown'); +assert.strictEqual(b.style.props['--toast-ttl'], ttl + 'ms'); +tick(ttl - 1); +assert.ok(b.parentNode, 'banner remains for its configured lifetime'); +tick(1); +assert.ok(b.classList.contains('merge-banner-out'), 'shared timer dismisses at the bar deadline'); +tick(200); +assert.strictEqual(b.parentNode, null); +const manual = stageTrackerMergeBanner({ key: 'o/r/pr#8', repo: 'o/r', number: 8 }); +assert.ok(manual._countdown.timer); +stageTrackerMergeBannerDismiss(manual); +assert.strictEqual(manual._countdown, null, 'manual dismissal cancels countdown'); +`) + if !strings.Contains(cssRule(t, html, ".merge-banner"), "position: relative;") { + t.Fatal("merge countdown must be positioned within its own banner") + } +} diff --git a/src/pkg/dashboard/stage_tracker_merge_sound_test.go b/src/pkg/dashboard/stage_tracker_merge_sound_test.go index b62bfbcc53..ffde1ef32f 100644 --- a/src/pkg/dashboard/stage_tracker_merge_sound_test.go +++ b/src/pkg/dashboard/stage_tracker_merge_sound_test.go @@ -97,7 +97,7 @@ func TestStageTrackerMergeSoundWiring(t *testing.T) { `localStorage.getItem(STAGE_TRACKER_SOUND_KEY) === '1'`, `localStorage.setItem(STAGE_TRACKER_SOUND_KEY, _stageTrackerSoundOn ? '1' : '0')`, `const STAGE_TRACKER_BUZZ_MASTER_GAIN = 0.2;`, - `function stageTrackerMergeState(d)`, + `function stageTrackerMergeState(d, prev)`, `function stageTrackerCarryOpen(prev, next)`, `function stageTrackerNewlyMerged(prev, next)`, `function stageTrackerNoteMerges(d)`, @@ -105,7 +105,7 @@ func TestStageTrackerMergeSoundWiring(t *testing.T) { `function stageTrackerNewlyOpened(prev, next)`, `function stageTrackerNoteOpened(d)`, `function hamSoundToggle()`, - `if (data && typeof data === 'object') { _stageTracker = data; stageTrackerNoteMerges(data); stageTrackerNoteOpened(data); stageTrackerNoteMoves(data); }`, + `if (data && typeof data === 'object') { _stageTracker = data; stageTrackerReconcileMerges(data); stageTrackerNoteOpened(data); stageTrackerNoteMoves(data); }`, `if (stageTrackerSoundGate()) stageTrackerPlayZap(`, `if (stageTrackerSoundGate()) stageTrackerPlayBuzz(`, `function stageTrackerSoundGate() { return !!_stageTrackerSoundOn && !document.hidden; }`, diff --git a/src/pkg/dashboard/static-src/css/tracker.css b/src/pkg/dashboard/static-src/css/tracker.css index e84ef59082..81200b35b1 100644 --- a/src/pkg/dashboard/static-src/css/tracker.css +++ b/src/pkg/dashboard/static-src/css/tracker.css @@ -568,7 +568,7 @@ (just the ⟳ and the actor glyph). */ .ham-seg.active .ham-seg-t.ham-queue-stalled { color: inherit; } .merge-banners { position: fixed; right: var(--sp-6); bottom: var(--sp-6); z-index: var(--z-merge-banner); display: flex; flex-direction: column; gap: var(--sp-3); max-width: min(26rem, calc(100vw - 2 * var(--sp-6))); pointer-events: none; } - .merge-banner { display: grid; grid-template-columns: auto minmax(0, 1fr) auto; gap: var(--sp-4); align-items: start; padding: var(--sp-4) var(--sp-5); border: var(--line-width) solid var(--line); border-left: 3px solid var(--green); border-radius: var(--r); background: var(--panel-strong); color: var(--text); box-shadow: var(--shadow-raised); font-size: var(--fs-sm); pointer-events: auto; animation: merge-banner-in 220ms ease-out both; } + .merge-banner { position: relative; overflow: hidden; display: grid; grid-template-columns: auto minmax(0, 1fr) auto; gap: var(--sp-4); align-items: start; padding: var(--sp-4) var(--sp-5); border: var(--line-width) solid var(--line); border-left: 3px solid var(--green); border-radius: var(--r); background: var(--panel-strong); color: var(--text); box-shadow: var(--shadow-raised); font-size: var(--fs-sm); pointer-events: auto; animation: merge-banner-in 220ms ease-out both; } .merge-banner.merge-banner-out { animation: merge-banner-out 180ms ease-in both; } .merge-banner-ico { color: var(--green); font-weight: var(--fw-bold); } .merge-banner-head { font-weight: var(--fw-semibold); } diff --git a/src/pkg/dashboard/static-src/js/tracker-filter-render.js b/src/pkg/dashboard/static-src/js/tracker-filter-render.js index 71a9d7dc71..573c4053dd 100644 --- a/src/pkg/dashboard/static-src/js/tracker-filter-render.js +++ b/src/pkg/dashboard/static-src/js/tracker-filter-render.js @@ -52,7 +52,7 @@ } function renderStageTracker(data) { - if (data && typeof data === 'object') { _stageTracker = data; stageTrackerNoteMerges(data); stageTrackerNoteOpened(data); stageTrackerNoteMoves(data); } + if (data && typeof data === 'object') { _stageTracker = data; stageTrackerReconcileMerges(data); stageTrackerNoteOpened(data); stageTrackerNoteMoves(data); } // Row-action feedback rides the payload: a result toast leaves and a // row stops "acting" once the item it targets reads a new state. if (data && typeof data === 'object' && typeof stageTrackerResultToastsSync === 'function') { stageTrackerNoteEvents(data); stageTrackerResultToastsSync(data); stageTrackerPendingExpire(data); } diff --git a/src/pkg/dashboard/static-src/js/tracker-merged.js b/src/pkg/dashboard/static-src/js/tracker-merged.js index d100c047b4..847fe38aa0 100644 --- a/src/pkg/dashboard/static-src/js/tracker-merged.js +++ b/src/pkg/dashboard/static-src/js/tracker-merged.js @@ -4,10 +4,17 @@ // Pure: PR key → merged? for one payload. Issues are not tracked. A // recently_merged repo given by its short name is resolved against the // owner/name of the items (any kind, any repo) when exactly one matches. - function stageTrackerMergeState(d) { + function stageTrackerMergeState(d, prev) { const out = {}; if (!d || typeof d !== 'object') return out; const byShort = {}; + // A dropped row (including one from before a reload) still teaches + // the short repo alias used by the audit side list. + for (const key of Object.keys(prev || {})) { + const repo = key.slice(0, key.lastIndexOf('/pr#')); + const slash = repo.lastIndexOf('/'); + if (slash > 0) { const short = repo.slice(slash + 1); byShort[short] = (short in byShort && byShort[short] !== repo) ? '' : repo; } + } for (const it of (Array.isArray(d.items) ? d.items : [])) { if (!it) continue; // Every item of every repo (issues too) teaches the short → full @@ -47,10 +54,38 @@ return Object.keys(next).filter(k => next[k] === true && prev[k] === false).sort(); } + const STAGE_TRACKER_MERGE_SESSION_KEY = 'hive.tracker.merge-session.v1'; + var _stageTrackerMergeSessionLoaded = false; + // Persist both the last observation and the delivered keys: saving only + // delivered keys loses an open→merged transition across a reload. The + // first visit still seeds history silently rather than replaying it. + function stageTrackerReconcileMerges(d) { + if (!_stageTrackerMergeSessionLoaded) { + _stageTrackerMergeSessionLoaded = true; + try { + const saved = JSON.parse(sessionStorage.getItem(STAGE_TRACKER_MERGE_SESSION_KEY)); + if (saved && saved.state && typeof saved.state === 'object' && !Array.isArray(saved.state)) { + const state = {}, delivered = {}; + for (const key of Object.keys(saved.state)) { + if (!/^.+\/pr#[1-9][0-9]*$/.test(key) || typeof saved.state[key] !== 'boolean') continue; + state[key] = saved.state[key]; + } + for (const key of Object.keys(saved.delivered || {})) { + if (/^.+\/pr#[1-9][0-9]*$/.test(key) && saved.delivered[key] === true) delivered[key] = true; + } + _stageTrackerMergeState = state; + _stageTrackerZapped = delivered; + } + } catch {} // Storage disabled/corrupt: keep the in-memory path. + } + stageTrackerNoteMerges(d); + try { sessionStorage.setItem(STAGE_TRACKER_MERGE_SESSION_KEY, JSON.stringify({ state: _stageTrackerMergeState, delivered: _stageTrackerZapped })); } catch {} + } + function stageTrackerNoteMerges(d) { const nowMs = Date.now(); _stageTrackerMergingHoldMs = stageTrackerMergingHoldMsOf(d, _stageTrackerMergingHoldMs); - const raw = stageTrackerCarryOpen(_stageTrackerMergeState, stageTrackerMergeState(d)); + const raw = stageTrackerCarryOpen(_stageTrackerMergeState, stageTrackerMergeState(d, _stageTrackerMergeState)); // The merge gate's hold (hivecommons/hive#15245, #15808) keeps a // row the payload dropped mid-merge on the board at "Merging" until // the merged fact arrives (then the merge is fresh at once) or the @@ -204,7 +239,7 @@ function stageTrackerMergingHoldRelease() { _stageTrackerMergingHoldTimer = 0; if (!_stageTracker || typeof _stageTracker !== 'object') return; - stageTrackerNoteMerges(_stageTracker); + stageTrackerReconcileMerges(_stageTracker); renderStageTracker(); } @@ -942,13 +977,13 @@ if (b.rowKey) el.setAttribute('data-ham-row', b.rowKey); el.innerHTML = `
${num ? `#${esc(num)} ` : ''}merged${info.preview ? ' (test)' : ''}
${esc(t.text)}
`; box.appendChild(el); - while (box.children.length > STAGE_TRACKER_MERGE_BANNER_MAX) box.children[0].remove(); - el._timer = setTimeout(() => stageTrackerMergeBannerDismiss(el), stageTrackerMergeBannerMs()); + while (box.children.length > STAGE_TRACKER_MERGE_BANNER_MAX) { toastCountdownCancel(box.children[0]); box.children[0].remove(); } + toastCountdownBar(el, stageTrackerMergeBannerMs(), () => stageTrackerMergeBannerDismiss(el)); return el; } function stageTrackerMergeBannerDismiss(el) { if (!el || !el.parentNode) return; - if (el._timer) { clearTimeout(el._timer); el._timer = 0; } + toastCountdownCancel(el); if (stageTrackerReducedMotion()) { el.remove(); return; } el.classList.add('merge-banner-out'); stageTrackerAfter(el, 'animationend', 180, () => el.remove()); diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index 1e69e749ab..c93c789a9f 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -1897,7 +1897,7 @@ (just the ⟳ and the actor glyph). */ .ham-seg.active .ham-seg-t.ham-queue-stalled { color: inherit; } .merge-banners { position: fixed; right: var(--sp-6); bottom: var(--sp-6); z-index: var(--z-merge-banner); display: flex; flex-direction: column; gap: var(--sp-3); max-width: min(26rem, calc(100vw - 2 * var(--sp-6))); pointer-events: none; } - .merge-banner { display: grid; grid-template-columns: auto minmax(0, 1fr) auto; gap: var(--sp-4); align-items: start; padding: var(--sp-4) var(--sp-5); border: var(--line-width) solid var(--line); border-left: 3px solid var(--green); border-radius: var(--r); background: var(--panel-strong); color: var(--text); box-shadow: var(--shadow-raised); font-size: var(--fs-sm); pointer-events: auto; animation: merge-banner-in 220ms ease-out both; } + .merge-banner { position: relative; overflow: hidden; display: grid; grid-template-columns: auto minmax(0, 1fr) auto; gap: var(--sp-4); align-items: start; padding: var(--sp-4) var(--sp-5); border: var(--line-width) solid var(--line); border-left: 3px solid var(--green); border-radius: var(--r); background: var(--panel-strong); color: var(--text); box-shadow: var(--shadow-raised); font-size: var(--fs-sm); pointer-events: auto; animation: merge-banner-in 220ms ease-out both; } .merge-banner.merge-banner-out { animation: merge-banner-out 180ms ease-in both; } .merge-banner-ico { color: var(--green); font-weight: var(--fw-bold); } .merge-banner-head { font-weight: var(--fw-semibold); } @@ -19261,7 +19261,7 @@

All labels

} function renderStageTracker(data) { - if (data && typeof data === 'object') { _stageTracker = data; stageTrackerNoteMerges(data); stageTrackerNoteOpened(data); stageTrackerNoteMoves(data); } + if (data && typeof data === 'object') { _stageTracker = data; stageTrackerReconcileMerges(data); stageTrackerNoteOpened(data); stageTrackerNoteMoves(data); } // Row-action feedback rides the payload: a result toast leaves and a // row stops "acting" once the item it targets reads a new state. if (data && typeof data === 'object' && typeof stageTrackerResultToastsSync === 'function') { stageTrackerNoteEvents(data); stageTrackerResultToastsSync(data); stageTrackerPendingExpire(data); } @@ -21833,10 +21833,17 @@

All labels

// Pure: PR key → merged? for one payload. Issues are not tracked. A // recently_merged repo given by its short name is resolved against the // owner/name of the items (any kind, any repo) when exactly one matches. - function stageTrackerMergeState(d) { + function stageTrackerMergeState(d, prev) { const out = {}; if (!d || typeof d !== 'object') return out; const byShort = {}; + // A dropped row (including one from before a reload) still teaches + // the short repo alias used by the audit side list. + for (const key of Object.keys(prev || {})) { + const repo = key.slice(0, key.lastIndexOf('/pr#')); + const slash = repo.lastIndexOf('/'); + if (slash > 0) { const short = repo.slice(slash + 1); byShort[short] = (short in byShort && byShort[short] !== repo) ? '' : repo; } + } for (const it of (Array.isArray(d.items) ? d.items : [])) { if (!it) continue; // Every item of every repo (issues too) teaches the short → full @@ -21876,10 +21883,38 @@

All labels

return Object.keys(next).filter(k => next[k] === true && prev[k] === false).sort(); } + const STAGE_TRACKER_MERGE_SESSION_KEY = 'hive.tracker.merge-session.v1'; + var _stageTrackerMergeSessionLoaded = false; + // Persist both the last observation and the delivered keys: saving only + // delivered keys loses an open→merged transition across a reload. The + // first visit still seeds history silently rather than replaying it. + function stageTrackerReconcileMerges(d) { + if (!_stageTrackerMergeSessionLoaded) { + _stageTrackerMergeSessionLoaded = true; + try { + const saved = JSON.parse(sessionStorage.getItem(STAGE_TRACKER_MERGE_SESSION_KEY)); + if (saved && saved.state && typeof saved.state === 'object' && !Array.isArray(saved.state)) { + const state = {}, delivered = {}; + for (const key of Object.keys(saved.state)) { + if (!/^.+\/pr#[1-9][0-9]*$/.test(key) || typeof saved.state[key] !== 'boolean') continue; + state[key] = saved.state[key]; + } + for (const key of Object.keys(saved.delivered || {})) { + if (/^.+\/pr#[1-9][0-9]*$/.test(key) && saved.delivered[key] === true) delivered[key] = true; + } + _stageTrackerMergeState = state; + _stageTrackerZapped = delivered; + } + } catch {} // Storage disabled/corrupt: keep the in-memory path. + } + stageTrackerNoteMerges(d); + try { sessionStorage.setItem(STAGE_TRACKER_MERGE_SESSION_KEY, JSON.stringify({ state: _stageTrackerMergeState, delivered: _stageTrackerZapped })); } catch {} + } + function stageTrackerNoteMerges(d) { const nowMs = Date.now(); _stageTrackerMergingHoldMs = stageTrackerMergingHoldMsOf(d, _stageTrackerMergingHoldMs); - const raw = stageTrackerCarryOpen(_stageTrackerMergeState, stageTrackerMergeState(d)); + const raw = stageTrackerCarryOpen(_stageTrackerMergeState, stageTrackerMergeState(d, _stageTrackerMergeState)); // The merge gate's hold (hivecommons/hive#15245, #15808) keeps a // row the payload dropped mid-merge on the board at "Merging" until // the merged fact arrives (then the merge is fresh at once) or the @@ -22033,7 +22068,7 @@

All labels

function stageTrackerMergingHoldRelease() { _stageTrackerMergingHoldTimer = 0; if (!_stageTracker || typeof _stageTracker !== 'object') return; - stageTrackerNoteMerges(_stageTracker); + stageTrackerReconcileMerges(_stageTracker); renderStageTracker(); } @@ -22771,13 +22806,13 @@

All labels

if (b.rowKey) el.setAttribute('data-ham-row', b.rowKey); el.innerHTML = `
${num ? `#${esc(num)} ` : ''}merged${info.preview ? ' (test)' : ''}
${esc(t.text)}
`; box.appendChild(el); - while (box.children.length > STAGE_TRACKER_MERGE_BANNER_MAX) box.children[0].remove(); - el._timer = setTimeout(() => stageTrackerMergeBannerDismiss(el), stageTrackerMergeBannerMs()); + while (box.children.length > STAGE_TRACKER_MERGE_BANNER_MAX) { toastCountdownCancel(box.children[0]); box.children[0].remove(); } + toastCountdownBar(el, stageTrackerMergeBannerMs(), () => stageTrackerMergeBannerDismiss(el)); return el; } function stageTrackerMergeBannerDismiss(el) { if (!el || !el.parentNode) return; - if (el._timer) { clearTimeout(el._timer); el._timer = 0; } + toastCountdownCancel(el); if (stageTrackerReducedMotion()) { el.remove(); return; } el.classList.add('merge-banner-out'); stageTrackerAfter(el, 'animationend', 180, () => el.remove()); From 8b59b5d8efeb16f6f988c45939d8135112b57502 Mon Sep 17 00:00:00 2001 From: mendezr Date: Fri, 30 Oct 2026 19:04:11 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20fix:=20align=20merge=20feedb?= =?UTF-8?q?ack=20fixtures=20with=20session=20reconciliation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: mendezr --- src/pkg/dashboard/stage_tracker_cues_test.go | 3 +++ src/pkg/dashboard/stage_tracker_merge_session_test.go | 10 ++++------ src/pkg/dashboard/stage_tracker_merge_sound_test.go | 10 +++++----- src/pkg/dashboard/stage_tracker_motion_test.go | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/pkg/dashboard/stage_tracker_cues_test.go b/src/pkg/dashboard/stage_tracker_cues_test.go index ba832b8e72..409aa4eb2c 100644 --- a/src/pkg/dashboard/stage_tracker_cues_test.go +++ b/src/pkg/dashboard/stage_tracker_cues_test.go @@ -373,6 +373,9 @@ func stageTrackerCelebrateJS(t *testing.T, html string) string { jsFunc(t, html, "stageTrackerAgoText"), jsFunc(t, html, "stageTrackerAfter"), jsFunc(t, html, "stageTrackerTransient"), + jsConstLine(t, html, "STAGE_TRACKER_MERGE_SESSION_KEY"), + "var _stageTrackerMergeSessionLoaded = false;", + jsFunc(t, html, "stageTrackerReconcileMerges"), jsFunc(t, html, "stageTrackerNoteMerges"), stageTrackerMergingHoldOffJS, jsFunc(t, html, "stageTrackerPRKey"), diff --git a/src/pkg/dashboard/stage_tracker_merge_session_test.go b/src/pkg/dashboard/stage_tracker_merge_session_test.go index 33bdafe555..f2c994d951 100644 --- a/src/pkg/dashboard/stage_tracker_merge_session_test.go +++ b/src/pkg/dashboard/stage_tracker_merge_session_test.go @@ -10,11 +10,7 @@ import ( // to the companion #15817 change; this pins delivery to that pipeline. func TestStageTrackerMergeSessionNode(t *testing.T) { html := indexHTML(t) - script := stageTrackerCelebrateJS(t, html) + "\n" + strings.Join([]string{ - jsConstLine(t, html, "STAGE_TRACKER_MERGE_SESSION_KEY"), - "var _stageTrackerMergeSessionLoaded = false;", - jsFunc(t, html, "stageTrackerReconcileMerges"), - }, "\n") + stageTrackerCelebrateFixture + ` + script := stageTrackerCelebrateJS(t, html) + stageTrackerCelebrateFixture + ` function reload() { _stageTrackerMergeSessionLoaded = false; _stageTrackerMergeState = null; @@ -75,7 +71,9 @@ tick(ttl - 1); assert.ok(b.parentNode, 'banner remains for its configured lifetime'); tick(1); assert.ok(b.classList.contains('merge-banner-out'), 'shared timer dismisses at the bar deadline'); -tick(200); +// No animationend is emitted by the fake DOM: allow the shared +// stageTrackerAfter fallback (1.5 times the 180ms exit animation) to fire. +tick(270); assert.strictEqual(b.parentNode, null); const manual = stageTrackerMergeBanner({ key: 'o/r/pr#8', repo: 'o/r', number: 8 }); assert.ok(manual._countdown.timer); diff --git a/src/pkg/dashboard/stage_tracker_merge_sound_test.go b/src/pkg/dashboard/stage_tracker_merge_sound_test.go index ffde1ef32f..9b7f004a59 100644 --- a/src/pkg/dashboard/stage_tracker_merge_sound_test.go +++ b/src/pkg/dashboard/stage_tracker_merge_sound_test.go @@ -228,23 +228,23 @@ assert.deepStrictEqual(stageTrackerMergeState({ items: [P(20, 50), { kind: 'pr', { 'a/b/pr#20': false, 'c/b/pr#1': false, 'b/pr#20': true }, 'an ambiguous short name is left alone'); stageTrackerNoteMerges({ items: [P(21, 50)] }); stageTrackerNoteMerges({ items: [], recently_merged: [{ repo: 'b', number: 21 }] }); -assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1], 'short-name entry with no item left to resolve it cannot match…'); +assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1], 'short-name entry resolves against the last observed row after eviction'); stageTrackerNoteMerges({ items: [P(22, 50)] }); stageTrackerNoteMerges({ items: [P(22, 50)], recently_merged: [{ repo: 'b', number: 22 }] }); -assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1], '…but one that arrives while the item is still listed does'); +assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1, 1], 'an entry that arrives while the item is still listed also zaps'); // Regression: the PR drops out of items one payload before the audit log // lists its merge (webhook-patched snapshot vs poller). Carried as open, // it still zaps when recently_merged catches up — once. stageTrackerNoteMerges({ items: [P(30, 50), P(31, 60)] }); stageTrackerNoteMerges({ items: [P(31, 60)] }); -assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1], 'vanished without a merge entry: nothing yet'); +assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1, 1], 'vanished without a merge entry: nothing yet'); assert.strictEqual(_stageTrackerMergeState['a/b/pr#30'], false, 'carried as still open'); stageTrackerNoteMerges({ items: [P(31, 60)], recently_merged: [{ repo: 'a/b', number: 30 }] }); -assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1, 1], 'late recently_merged entry zaps'); +assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1, 1, 1], 'late recently_merged entry zaps'); stageTrackerNoteMerges({ items: [P(31, 60)], recently_merged: [{ repo: 'a/b', number: 30 }] }); stageTrackerNoteMerges({ items: [P(31, 60)] }); -assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1, 1], 'no replay once the entry ages out'); +assert.deepStrictEqual(plays, [STAGE_TRACKER_SOUND_MAX_PLAYS, 1, 1, 1, 1], 'no replay once the entry ages out'); assert.deepStrictEqual(stageTrackerCarryOpen(null, { x: true }), { x: true }); assert.deepStrictEqual(stageTrackerCarryOpen({ a: false, b: true, c: false }, { c: true }), { a: false, c: true }, 'merged keys are not carried, open ones are'); ` diff --git a/src/pkg/dashboard/stage_tracker_motion_test.go b/src/pkg/dashboard/stage_tracker_motion_test.go index 5319d9c6cb..a20c91e16e 100644 --- a/src/pkg/dashboard/stage_tracker_motion_test.go +++ b/src/pkg/dashboard/stage_tracker_motion_test.go @@ -38,7 +38,7 @@ func TestStageTrackerMotionWiring(t *testing.T) { `function stageTrackerNoteMoves(d)`, `function stageTrackerAnimateMoves(root)`, `function stageTrackerMotionEffect(setting, reduced)`, - `stageTrackerNoteMerges(data); stageTrackerNoteOpened(data); stageTrackerNoteMoves(data); }`, + `stageTrackerReconcileMerges(data); stageTrackerNoteOpened(data); stageTrackerNoteMoves(data); }`, `const ctx = { nowMs, stages, moves: _stageTrackerMoves };`, `if (Object.keys(_stageTrackerMoves).length) { stageTrackerAnimateMoves(el); _stageTrackerMoves = {}; }`, `window.matchMedia('(prefers-reduced-motion: reduce)').matches`, From 53b7252c2f60adf58802ad08eddfaf0742f4b425 Mon Sep 17 00:00:00 2001 From: mendezr Date: Fri, 30 Oct 2026 19:16:16 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20fix:=20wait=20for=20detached?= =?UTF-8?q?=20merge=20celebration=20landing=20in=20session=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: mendezr --- src/pkg/dashboard/stage_tracker_merge_session_test.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pkg/dashboard/stage_tracker_merge_session_test.go b/src/pkg/dashboard/stage_tracker_merge_session_test.go index f2c994d951..6c7624c659 100644 --- a/src/pkg/dashboard/stage_tracker_merge_session_test.go +++ b/src/pkg/dashboard/stage_tracker_merge_session_test.go @@ -6,8 +6,8 @@ import ( ) // Exercise the real reconcile entry point with a shared sessionStorage but -// reset SPA memory, as a reload would. Detached glyph flight itself belongs -// to the companion #15817 change; this pins delivery to that pipeline. +// reset SPA memory, as a reload would. Delivery enters the detached glyph +// pipeline, which counts and plays the merge sound only after landing. func TestStageTrackerMergeSessionNode(t *testing.T) { html := indexHTML(t) script := stageTrackerCelebrateJS(t, html) + stageTrackerCelebrateFixture + ` @@ -27,12 +27,18 @@ tick(0); assert.strictEqual(banners.children.length, 1, 'last row absent, short audit repo still resolves after reload'); assert.strictEqual(_stageTrackerMergeState['o/r/pr#42'], true); assert.strictEqual(_stageTrackerZapped['o/r/pr#42'], true); +assert.strictEqual(flights().length, 1, 'exactly one delivery to the detached celebration pipeline'); +assert.strictEqual(zaps.length, 0, 'sound waits for the bee to land'); +tick(STAGE_TRACKER_CELEBRATE_FLY_MS * 1.5 + 10); +assert.strictEqual(flights().length, 0, 'bee landed'); assert.strictEqual(zaps.length, 1, 'exactly one delivery to the celebration/count pipeline'); stageTrackerReconcileMerges({ items: [], merged: { recent: [{ repo: 'o/r', number: 42 }] } }); reload(); stageTrackerReconcileMerges(merged); tick(0); assert.strictEqual(banners.children.length, 1, 'reload after delivery does not repeat the banner'); +assert.strictEqual(flights().length, 0, 'reload after delivery does not repeat the bee'); +tick(STAGE_TRACKER_CELEBRATE_FLY_MS * 1.5 + 10); assert.strictEqual(zaps.length, 1, 'ledger + audit + reload do not repeat the counter tick'); // Delivered identity outlives the server's recent-history window, even // if a stale open snapshot resurfaces after another reload.