From cd30e818bec4b2f498f43ee2c1c09696dab0c95f Mon Sep 17 00:00:00 2001 From: Andy Anderson Date: Sat, 31 Oct 2026 08:40:14 -0400 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20fix:=20render=20verified=20e?= =?UTF-8?q?xternal=20merges=20as=20terminal=20tracker=20rows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andy Anderson --- .../fixed-tracker-external-terminal.md | 1 + .../dashboard-sections/activity-monitor.md | 2 + src/pkg/dashboard/stage_tracker_cues_test.go | 4 +- .../stage_tracker_external_terminal_test.go | 185 ++++++++++++++ .../stage_tracker_merge_sound_test.go | 2 +- .../static-src/js/tracker-actions.js | 13 +- .../static-src/js/tracker-filter-render.js | 6 +- .../dashboard/static-src/js/tracker-merged.js | 207 ++++++++++++++- .../dashboard/static-src/js/tracker-motion.js | 3 +- .../static-src/js/tracker-row-layout.js | 2 + .../static-src/js/tracker-row-strip.js | 3 +- .../static-src/js/tracker-words-gate.js | 1 + src/pkg/dashboard/static/index.html | 235 ++++++++++++++++-- 13 files changed, 627 insertions(+), 37 deletions(-) create mode 100644 changelog.d/fixed-tracker-external-terminal.md create mode 100644 src/pkg/dashboard/stage_tracker_external_terminal_test.go diff --git a/changelog.d/fixed-tracker-external-terminal.md b/changelog.d/fixed-tracker-external-terminal.md new file mode 100644 index 0000000000..61a18cb68e --- /dev/null +++ b/changelog.d/fixed-tracker-external-terminal.md @@ -0,0 +1 @@ +- Show verified external merges at Activity Monitor's existing terminal step on root, inline and nested PR rows, using retained models and the actual recorded merger without inventing queue membership, Hive ownership or a second merge event. diff --git a/src/docs/dashboard-sections/activity-monitor.md b/src/docs/dashboard-sections/activity-monitor.md index 5a13f8eac1..7b750538ee 100644 --- a/src/docs/dashboard-sections/activity-monitor.md +++ b/src/docs/dashboard-sections/activity-monitor.md @@ -80,6 +80,8 @@ At 090 the row explains why: `· workflow files`, `· tests removed`, `· manual ### Pairing, rows and counts +A verified merge from the canonical merge ledger is terminal whether Hive, a maintainer or another bot performed it. The last known root or linked PR model reaches **Merged** during the existing short terminal/pin window, even without an earlier queue observation. The comment names the actual recorded merger; an unknown actor stays unknown. This does not invent an earlier queue/admission state or close a merely related issue. A stale open refresh cannot undo a verified merge, and repeated delivery or later actor enrichment does not replay the merge or restart its window. Terminal visibility does not re-enable closed-PR actions. + - With no covering PR, an issue has a full strip lit at Open, Actionable or Claimed. - With exactly one covering PR, issue and PR share one continuous strip; early issue steps are passed and the PR supplies the current stage, chip, tooltip and age. - With several covering PRs, the issue's own strip stops at Claimed, with no current step lit. Indented PR sub-rows begin under *PR in progress*, each with its own stage and age, furthest along first. diff --git a/src/pkg/dashboard/stage_tracker_cues_test.go b/src/pkg/dashboard/stage_tracker_cues_test.go index d5c24f5d26..4b2060e2f1 100644 --- a/src/pkg/dashboard/stage_tracker_cues_test.go +++ b/src/pkg/dashboard/stage_tracker_cues_test.go @@ -468,7 +468,7 @@ assert.ok(rows[2].pinned); tick(0); const r1 = panel.children[0]; assert.ok(r1.classList.contains('cue-merged'), 'row glows: ' + r1.className); -assert.ok(r1.children.some(c => c.classList.contains('cue-event') && /merged #1 · by hive/.test(c.textContent)), 'the event line says what happened'); +assert.ok(r1.children.some(c => c.classList.contains('cue-event') && /merged #1/.test(c.textContent) && !/by hive/.test(c.textContent)), 'unknown merger is not attributed to hive'); assert.strictEqual(flights().length, 1, 'one glyph in flight'); assert.strictEqual(flights()[0].textContent, '🐝', 'the default glyph is the bee'); assert.strictEqual(flights()[0].style.props['--cue-dx'], (530 - 310) + 'px'); assert.strictEqual(flights()[0].style.props['--cue-dy'], (20 - 410) + 'px', 'the chip is in view: the flight ends on it'); assert.strictEqual(flights()[0].style.props['--cue-end-opacity'], '0.25'); @@ -587,7 +587,7 @@ assert.strictEqual(odoText(n), '1', 'the server already counts it: held back unt tick(0); const issueRow = panel.children[0]; assert.ok(issueRow.classList.contains('cue-merged'), 'issue row glows: ' + issueRow.className); -assert.ok(issueRow.children.some(c => c.classList.contains('cue-event') && /merged #14822 · by hive/.test(c.textContent)), 'event line names the merged PR'); +assert.ok(issueRow.children.some(c => c.classList.contains('cue-event') && /merged #14822/.test(c.textContent) && !/by hive/.test(c.textContent)), 'event line names the merged PR without inventing its merger'); assert.strictEqual(flights().length, 1, 'a glyph is in flight'); tick(STAGE_TRACKER_CELEBRATE_FLY_MS * 1.5 + 1); assert.strictEqual(flights().length, 0); assert.strictEqual(odoText(n), '2', 'count bumped on landing'); assert.deepStrictEqual(zaps, [1]); diff --git a/src/pkg/dashboard/stage_tracker_external_terminal_test.go b/src/pkg/dashboard/stage_tracker_external_terminal_test.go new file mode 100644 index 0000000000..d35c6501c3 --- /dev/null +++ b/src/pkg/dashboard/stage_tracker_external_terminal_test.go @@ -0,0 +1,185 @@ +package dashboard + +import ( + "strings" + "testing" +) + +func TestStageTrackerExternalMergeUsesVerifiedTerminalModels(t *testing.T) { + html := indexHTML(t) + for _, wire := range []string{ + "stageTrackerTerminalObserve(d, fresh, nowMs)", + "stageTrackerTerminalView(held, nowMs)", + "stageTrackerTerminalEvents(nowMs)", + "nowMs, it => stageTrackerRowHtml(it, stages, ctx)", + } { + if !strings.Contains(html, wire) { + t.Fatalf("missing production terminal-model seam: %s", wire) + } + } + functions := []string{ + "stageTrackerMergeState", "stageTrackerCarryOpen", "stageTrackerNewlyMerged", + "stageTrackerPRHosts", "stageTrackerRowPRKeys", "stageTrackerCelebrateRowKey", + "stageTrackerTerminalObserve", "stageTrackerTerminalItem", "stageTrackerTerminalView", + "stageTrackerTerminalPinnedItem", "stageTrackerTerminalEvents", "stageTrackerPinnedRows", + "stageTrackerMergedPRKnown", "stageTrackerItemsForKeys", "stageTrackerItemByKey", + "stageTrackerPRParked", "stageTrackerRowActions", "stageTrackerActionRequest", "repoParts", + } + var lifted []string + for _, name := range functions { + lifted = append(lifted, jsFunc(t, html, name)) + } + runStageTrackerRowActionsScript(t, stageTrackerRowsPreludeJS(t, html)+stageTrackerRowsFixtureJS+ + jsConstLine(t, html, "STAGE_TRACKER_CELEBRATE_PIN_MS")+"\n"+ + jsConstLine(t, html, "STAGE_TRACKER_DECISION_STAGES")+"\n"+ + jsConstLine(t, html, "STAGE_TRACKER_DELEGATE_ALL_MIN")+"\n"+strings.Join(lifted, "\n")+` +const document = {getElementById:()=>null}; +var _stageTrackerCelebrating = {}, _stageTrackerTerminalRows = {}, _stageTrackerTerminalFacts = {}; +var _stageTrackerMergeState = {}, _stageTrackerPRHost = {}, _stageTracker = null; +let releases = [], actionNow = now; +Date.now = () => actionNow; +function stageTrackerScheduleRelease(delay){ releases.push(delay); } +const advance = (data, at=now) => { + const next = stageTrackerCarryOpen(_stageTrackerMergeState, stageTrackerMergeState(data, _stageTrackerMergeState)); + const fresh = stageTrackerNewlyMerged(_stageTrackerMergeState, next); + _stageTrackerMergeState = next; + Object.assign(_stageTrackerPRHost, stageTrackerPRHosts(data)); + stageTrackerTerminalObserve(data, fresh, at); + stageTrackerTerminalEvents(at); + return {fresh, view:stageTrackerTerminalView(data, at)}; +}; +const reset = () => { _stageTrackerCelebrating={}; _stageTrackerTerminalRows={}; _stageTrackerTerminalFacts={}; + _stageTrackerMergeState={}; _stageTrackerPRHost={}; _stageTrackerEvents={}; }; +const repo = 'hivecommons/hive', number = 16008, key=repo+'/pr#'+number; +const pr = {repo, number, kind:'pr', stage:30, title:'Externally merged change', + url:'https://github.com/'+repo+'/pull/'+number, manual_merge:true, human_merge_reason:'stale manual decision', + head:'ed329668506eec69238b0badde9540f83598e3ff', author:'clubanderson', author_kind:'human'}; +const record = {repo, number, merged_by:'clubanderson', merged_at:'2026-10-31T11:11:04Z'}; +const merged = {items:[], merged:{recent:[record]}}; +advance({items:[pr]}); +let result = advance(merged); +assert.deepStrictEqual(result.fresh,[key], 'no earlier queue observation is required'); +assert.strictEqual(pr.stage,30, 'source models are immutable'); +let terminal = stageTrackerTerminalPinnedItem(key,now); +assert.strictEqual(terminal.stage,110); +assert.strictEqual(terminal.merge_gate,null); +assert.strictEqual(terminal.merge_train,null); +assert.strictEqual(terminal.preparation,null); +assert.strictEqual(terminal.manual_merge,false); +assert.strictEqual(terminal.human_merge_reason,''); +assert.strictEqual(stageTrackerPRParked(terminal),false); +assert.strictEqual(terminal.merged_by,'clubanderson'); +assert.strictEqual(terminal.stage_actor.kind,'none'); +const render = it=>stageTrackerRowHtml(it,stages,{...ctx,events:_stageTrackerEvents}); +const pinned = stageTrackerPinnedRows({querySelector:()=>null},[],now,render); +assert.strictEqual(pinned.length,1, 'last known model renders even after the old DOM node vanished'); +assert.ok(pinned[0].html.includes('active cap merged'), pinned[0].html); +assert.ok(text(pinned[0].html).includes('Merged PR #16008 by @clubanderson'), text(pinned[0].html)); +assert.ok(!text(pinned[0].html).includes('by hive')); +_stageTracker={items:[pr]}; +assert.strictEqual(stageTrackerItemsForKeys([key])[0].stage,110,'selection resolves the terminal view, not stale raw decisions'); +assert.deepStrictEqual(stageTrackerRowActions(pr,{}).map(a=>a.id),['open','copy'],'terminal menus keep navigation only'); +for (const action of ['hold','retry','needs-human','decide:approve','decide:merge-now','decide:delegate']) { + assert.strictEqual(stageTrackerActionRequest(pr,action),null,'captured stale action cannot write after canonical merge: '+action); +} +const until = _stageTrackerCelebrating[key].until, eventAt = _stageTrackerEvents[key].at; +result = advance({items:[pr]},now+100); +assert.deepStrictEqual(result.fresh,[]); +assert.strictEqual(result.view.items[0].stage,110,'stale open refresh cannot regress a verified merged fact'); +assert.strictEqual(_stageTrackerCelebrating[key].until,until,'no duplicate pin extension'); +assert.strictEqual(_stageTrackerEvents[key].at,eventAt,'no duplicate event clock'); +assert.strictEqual(stageTrackerTerminalView({items:[pr]},until+1).items.length,0,'expired stale open rows do not resurrect'); +advance({items:[]},until+STAGE_TRACKER_CELEBRATE_PIN_MS+1); +assert.strictEqual(Object.keys(_stageTrackerTerminalRows).length,0,'dropped row models are bounded'); +assert.strictEqual(Object.keys(_stageTrackerTerminalFacts).length,0,'actor metadata is bounded with row models'); + +reset(); +const host={repo:'hivecommons/console',kind:'issue',number:500,stage:40,title:'Open related issue', + linked_prs:[{...pr, repo:undefined,url:'https://github.com/'+repo+'/pull/'+number,drawn_under:500}]}; +const other={...pr,repo:'another/hive'}; +advance({items:[host,other]}); +assert.strictEqual(_stageTrackerMergeState[key],false,'a linked-only canonical identity is observed'); +assert.strictEqual(stageTrackerRowPRKeys(host),key); +result=advance({items:[{...host,linked_prs:[]},other],merged:{recent:[record]}}); +const issue=result.view.items.find(it=>it.number===500), lp=issue.linked_prs[0]; +assert.strictEqual(issue.stage,40,'a related PR merge does not claim that its issue closed'); +assert.strictEqual(lp.stage,110); +assert.strictEqual(stageTrackerLinkedPROpen(lp,issue),false,'terminal visibility never restores open-action semantics'); +assert.strictEqual(stageTrackerLinkedSupersededGone(lp,issue),false,'render-only terminal exception'); +assert.strictEqual(result.view.items.find(it=>it.repo==='another/hive').stage,30,'same number in another repo stays open'); +const inline=render(issue); +assert.ok(inline.includes('active cap merged'),inline); +assert.ok(text(inline).includes('by @clubanderson'),text(inline)); +assert.strictEqual(stageTrackerPRHosts({items:[other,host]})[key],'hivecommons/console/issue#500'); +const sibling={...pr,number:16099,stage:50,url:'https://github.com/'+repo+'/pull/16099'}; +const multi={...host,linked_prs:[host.linked_prs[0],sibling]}; +reset(); advance({items:[multi]}); +result=advance({items:[{...multi,linked_prs:[sibling]}],merged:{recent:[record]}}); +const nested=result.view.items[0]; +assert.strictEqual(nested.linked_prs.length,2,'retain the merged child without duplicating siblings'); +assert.strictEqual(nested.linked_prs.find(p=>p.number===16099).stage,50); +const nestedHtml=render(nested); +assert.ok(nestedHtml.includes('data-ham-sub-key="'+key+'"'),nestedHtml); +assert.ok(nestedHtml.includes('active cap merged'),nestedHtml); +assert.ok(text(nestedHtml).includes('by @clubanderson'),text(nestedHtml)); +_stageTracker={items:[multi]}; +assert.strictEqual(stageTrackerItemsForKeys([key])[0].state,'closed','linked selection resolves the same canonical terminal fact'); +assert.strictEqual(stageTrackerActionRequest(multi,'decide:delegate-all'),null,'stale parent bulk decisions omit merged children'); +assert.strictEqual(stageTrackerActionRequest(multi,'hold').body.type,'issue','a child merge does not disable legitimate issue actions'); +const siblingKey=repo+'/pr#16099', siblingRecord={repo,number:16099,merged_by:'another-maintainer'}; +const firstSiblingUntil=_stageTrackerTerminalFacts[key].until, firstSiblingAt=_stageTrackerEvents[key].at; +advance({items:[multi],merged:{recent:[record,siblingRecord]}},now+500); +assert.strictEqual(_stageTrackerTerminalFacts[key].until,firstSiblingUntil,'later sibling never renews the earlier pin'); +assert.strictEqual(_stageTrackerEvents[key].at,firstSiblingAt,'later sibling never rewrites the earlier event clock'); +assert.strictEqual(_stageTrackerEvents[siblingKey].at,now+500); +const siblingAfter=stageTrackerTerminalView({items:[multi]},firstSiblingUntil+1).items[0]; +assert.deepStrictEqual(siblingAfter.linked_prs.map(p=>p.number),[16099],'each sibling leaves at its own deadline'); +releases=[]; +stageTrackerTerminalEvents(firstSiblingUntil+1); +assert.ok(releases.includes(_stageTrackerTerminalFacts[siblingKey].until-firstSiblingUntil-1),'next sibling deadline is rearmed'); +releases=[]; +stageTrackerPinnedRows({querySelector:()=>null},[{key:stageTrackerItemKey(multi),html:'existing'}],firstSiblingUntil+1,render); +assert.ok(releases.length>0,'an already-rendered host still rearms its release'); + +reset(); advance({items:[pr]}); +advance({items:[],merged:{recent:[{repo,number}]}}); +assert.ok(!_stageTrackerEvents[key].text.includes('by '),'unknown actor is not hive or the PR author'); +const firstUntil=_stageTrackerCelebrating[key].until, firstAt=_stageTrackerEvents[key].at; +advance(merged,now+100); +assert.ok(_stageTrackerEvents[key].text.includes('by @clubanderson'),'verified actor enrichment updates the same terminal event'); +assert.strictEqual(_stageTrackerCelebrating[key].until,firstUntil); +assert.strictEqual(_stageTrackerEvents[key].at,firstAt); +assert.ok(releases.length>0,'uses the existing pin/release mechanism'); +reset(); advance({items:[pr]}); result=advance({items:[]}); +assert.deepStrictEqual(result.fresh,[],'vanishing is not merge proof'); +assert.strictEqual(Object.keys(_stageTrackerCelebrating).length,0); +const delayedAt=now+3*STAGE_TRACKER_CELEBRATE_PIN_MS; +advance({items:[]},delayedAt); +assert.ok(_stageTrackerTerminalRows[key],'unsettled dropped models survive the visual pin duration without being displayed'); +assert.strictEqual(stageTrackerPinnedRows({querySelector:()=>null},[],delayedAt,render).length,0); +advance(merged,delayedAt+1); +assert.strictEqual(stageTrackerTerminalPinnedItem(key,delayedAt+1).stage,110,'late canonical evidence still has a terminal row model'); +reset(); advance({items:[host]}); +advance({items:[{...host,linked_prs:[]}]},delayedAt); +assert.strictEqual(stageTrackerTerminalView({items:[{...host,linked_prs:[]}]},delayedAt).items[0].linked_prs.length,0,'unresolved missing children are not reintroduced as visible work'); +result=advance({items:[{...host,linked_prs:[]}],merged:{recent:[record]}},delayedAt+1); +assert.strictEqual(result.view.items[0].linked_prs[0].stage,110,'late linked evidence survives an intervening empty-child refresh'); +reset(); advance({items:[multi]}); +advance({items:[{...multi,linked_prs:[]}]},now+100); +advance(merged,delayedAt); +assert.deepStrictEqual(stageTrackerTerminalPinnedItem(stageTrackerItemKey(multi),delayedAt).linked_prs.map(p=>p.number),[number], + 'an absent pinned host renders the verified terminal child, never unresolved history-only siblings'); +reset(); +for(let i=0;i stageTrackerItemByKey(_stageTracker, k)).filter(Boolean); + const data = typeof stageTrackerTerminalView === 'function' ? stageTrackerTerminalView(_stageTracker, Date.now()) : _stageTracker; + return keys.map(k => stageTrackerItemByKey(data, k)).filter(Boolean); } // What the signed-in viewer may do on this repo. Hold permission is // looked up lazily (the server answers 403 either way); needs-human is @@ -409,6 +410,12 @@ } function stageTrackerRowActions(item, ctx) { ctx = ctx || {}; + if (typeof stageTrackerMergedPRKnown === 'function' && stageTrackerMergedPRKnown(item)) { + return [ + { id: 'open', label: 'Open on GitHub', enabled: !!item.url, why: item.url ? '' : 'No GitHub link' }, + { id: 'copy', label: 'Copy link', enabled: !!item.url, why: item.url ? '' : 'No GitHub link' }, + ]; + } const mods = Array.isArray(item.modifiers) ? item.modifiers : []; const has = m => mods.indexOf(m) >= 0; const write = ctx.canHold !== false; @@ -1178,6 +1185,10 @@ // Pure: which endpoint an action hits for one item. `once` marks a // hive-wide call made one time per batch. function stageTrackerActionRequest(item, id, payload) { + if (typeof stageTrackerTerminalView === 'function') { + item = stageTrackerTerminalView({ items: [item] }, Date.now()).items[0]; + if (!item || (typeof stageTrackerMergedPRKnown === 'function' && stageTrackerMergedPRKnown(item))) return null; + } payload = payload || {}; const p = repoParts(item.repo); const n = Number(item.number) || 0; 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 82691100c3..42397a752f 100644 --- a/src/pkg/dashboard/static-src/js/tracker-filter-render.js +++ b/src/pkg/dashboard/static-src/js/tracker-filter-render.js @@ -60,7 +60,8 @@ if (!el) return; const nowMs = Date.now(); // Rows under a "Merging" hold the payload already dropped ride along (#15245). - const d = typeof stageTrackerMergingHoldView === 'function' ? stageTrackerMergingHoldView(_stageTracker, _stageTrackerMergingHold, nowMs) : _stageTracker; + const held = typeof stageTrackerMergingHoldView === 'function' ? stageTrackerMergingHoldView(_stageTracker, _stageTrackerMergingHold, nowMs) : _stageTracker; + const d = typeof stageTrackerTerminalView === 'function' ? stageTrackerTerminalView(held, nowMs) : held; if (!d || d.status === 'initializing' || !Array.isArray(d.items)) { if (typeof stageTrackerPreparationVisualSync === 'function') stageTrackerPreparationVisualSync(null, [], [], [], nowMs); if (typeof stageTrackerNativeQueueSync === 'function') stageTrackerNativeQueueSync(null, [], nowMs, ''); @@ -70,6 +71,7 @@ return; } const f = _stageTrackerFilter = stageTrackerNormalizeFilter(_stageTrackerFilter); + if (typeof stageTrackerTerminalEvents === 'function') stageTrackerTerminalEvents(nowMs); const stages = d.stages || []; const repos = Array.from(new Set(d.items.map(it => it.repo).filter(Boolean))).sort(); const sel = document.getElementById('activity-monitor-repo'); @@ -170,7 +172,7 @@ : itemRow(pageItems[i], i); const trainRows = stageTrackerTrainRows(page.rows, rowOf, typeof stageTrackerTrainWhere === 'function' ? stageTrackerTrainWhere(ordered, d.items) : null); const inlineRows = typeof stageTrackerPreparationInlineRows === 'function' ? stageTrackerPreparationInlineRows(trainRows, pageItems, stages) : trainRows; - const rows = stageTrackerPinnedRows(el, [{ key: STAGE_TRACKER_HEADER_KEY, html: stageTrackerHeaderHtml(stages) }].concat(inlineRows), nowMs); + const rows = stageTrackerPinnedRows(el, [{ key: STAGE_TRACKER_HEADER_KEY, html: stageTrackerHeaderHtml(stages) }].concat(inlineRows), nowMs, it => stageTrackerRowHtml(it, stages, ctx)); const rec = stageTrackerReconcile(el, rows, { effect, hidden: document.hidden }); if (rec.deferred) stageTrackerScheduleSettle(); // Selection is keyed on the row, never baked into its HTML, so a kept diff --git a/src/pkg/dashboard/static-src/js/tracker-merged.js b/src/pkg/dashboard/static-src/js/tracker-merged.js index d2e360e82f..debc2ac510 100644 --- a/src/pkg/dashboard/static-src/js/tracker-merged.js +++ b/src/pkg/dashboard/static-src/js/tracker-merged.js @@ -22,6 +22,14 @@ const repo = String(it.repo || ''); const slash = repo.lastIndexOf('/'); if (slash > 0) { const short = repo.slice(slash + 1); byShort[short] = (short in byShort && byShort[short] !== repo) ? '' : repo; } + for (const lp of (Array.isArray(it.linked_prs) ? it.linked_prs : [])) { + if (!lp || !Number(lp.number)) continue; + const pr = typeof stageTrackerLinkedPRItem === 'function' ? stageTrackerLinkedPRItem(it, lp) : Object.assign({ repo: it.repo }, lp); + const prRepo = String(pr.repo || ''), at = prRepo.lastIndexOf('/'); + if (at > 0) { const short = prRepo.slice(at + 1); byShort[short] = (short in byShort && byShort[short] !== prRepo) ? '' : prRepo; } + if (lp.state === 'closed' && Number(lp.stage) < STAGE_TRACKER_TERMINAL) continue; + out[stageTrackerPRKey(pr.repo, pr.number)] = (Number(pr.stage) || 0) >= STAGE_TRACKER_TERMINAL; + } if (it.kind !== 'pr') continue; out[stageTrackerPRKey(it.repo, it.number)] = (Number(it.stage) || 0) >= STAGE_TRACKER_TERMINAL; } @@ -37,14 +45,17 @@ return out; } - // Pure: next plus every PR prev listed open that next no longer lists at - // all, kept as open. A PR the snapshot dropped before the audit log + // Pure: merged facts are irreversible; dropped open observations remain + // comparable. A PR the snapshot dropped before the audit log // recorded its merge stays comparable until recently_merged settles it // (or, when it was closed unmerged, for the life of the tab — a few keys). function stageTrackerCarryOpen(prev, next) { const out = Object.assign({}, next || {}); if (!prev) return out; - for (const k of Object.keys(prev)) if (prev[k] === false && !(k in out)) out[k] = false; + for (const k of Object.keys(prev)) { + if (prev[k] === true) out[k] = true; + else if (prev[k] === false && !(k in out)) out[k] = false; + } return out; } @@ -109,6 +120,7 @@ _stageTrackerMergeState = next; // A merged PR is no longer in this payload, so its last host survives. if (typeof stageTrackerPRHosts === 'function') Object.assign(_stageTrackerPRHost, stageTrackerPRHosts(d)); + if (typeof stageTrackerTerminalObserve === 'function') stageTrackerTerminalObserve(d, fresh, nowMs); // With the celebration on, each fresh merge is counted (and the zap // plays) when its token lands on the counter; off, both happen now. const celebrate = fresh.length && typeof stageTrackerCelebrateSetting === 'function' && stageTrackerCelebrateSetting(); @@ -765,6 +777,158 @@ if (!stageTrackerMergedInFlight() && stageTrackerSoundGate()) stageTrackerPlayZap(1); } var _stageTrackerCelebrating = {}; + var _stageTrackerTerminalRows = {}; + var _stageTrackerTerminalFacts = {}; + // Keep models, not stale HTML, for the existing short terminal/pin window. + // No queue/admission observation is required for a verified merged fact. + function stageTrackerTerminalObserve(d, fresh, nowMs) { + const previous = _stageTrackerTerminalRows, rows = Object.assign({}, previous); + const current = new Set(); + for (const item of (d && Array.isArray(d.items) ? d.items : [])) if (item) { + const key = stageTrackerItemKey(item); + current.add(key); + rows[key] = { item, at: nowMs, visible_prs: (item.linked_prs || []).map(lp => stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp))) }; + } + const el = document.getElementById('activity-monitor-panel'); + for (const key of fresh) { + const rowKey = stageTrackerCelebrateRowKey(key, el) || _stageTrackerPRHost[key] || key; + if (!rows[rowKey]) continue; + const prior = _stageTrackerCelebrating[rowKey] || {}; + _stageTrackerTerminalFacts[key] = Object.assign({}, _stageTrackerTerminalFacts[key], { + observed_at: nowMs, until: nowMs + STAGE_TRACKER_CELEBRATE_PIN_MS, + }); + _stageTrackerCelebrating[rowKey] = Object.assign({}, prior, { + key, keys: Array.from(new Set((prior.keys || []).concat(key))), kind: 'merged', + until: Math.max(Number(prior.until) || 0, nowMs + STAGE_TRACKER_CELEBRATE_PIN_MS), + }); + stageTrackerScheduleRelease(STAGE_TRACKER_CELEBRATE_PIN_MS); + } + const wanted = new Set(); + const detached = []; + for (const rowKey of Object.keys(rows)) { + const pin = _stageTrackerCelebrating[rowKey], active = pin && pin.until > nowMs; + const item = rows[rowKey].item, old = previous[rowKey] && previous[rowKey].item; + if (item.kind === 'issue' && old && Array.isArray(old.linked_prs)) { + const linked = (item.linked_prs || []).slice(), keys = new Set(linked.map(lp => stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp)))); + let unresolved = 0; + for (const lp of old.linked_prs) { + const key = stageTrackerItemKey(stageTrackerLinkedPRItem(old, lp)); + const fact = _stageTrackerTerminalFacts[key]; + if (keys.has(key)) continue; + if (fact && fact.until > nowMs) { linked.push(lp); keys.add(key); } + else if (_stageTrackerMergeState[key] === false && unresolved < STAGE_TRACKER_MERGED_LIST_MAX) { + linked.push(lp); keys.add(key); unresolved++; + } + } + rows[rowKey] = Object.assign({}, rows[rowKey], { item: Object.assign({}, item, { linked_prs: linked }) }); + } + const source = rows[rowKey].item; + const prs = source.kind === 'pr' ? [source] : (source.linked_prs || []).map(lp => stageTrackerLinkedPRItem(source, lp)); + if (!current.has(rowKey) && !active) { + if (!prs.some(pr => _stageTrackerMergeState[stageTrackerItemKey(pr)] === false)) { delete rows[rowKey]; continue; } + detached.push(rowKey); + } + } + // Missing-but-unsettled rows are bounded history, not visible holds. + // Keep them available when the canonical merge ledger lags eviction. + detached.sort((a, b) => rows[b].at - rows[a].at); + for (const key of detached.slice(STAGE_TRACKER_MERGED_LIST_MAX)) delete rows[key]; + for (const row of Object.values(rows)) { + if (row.item.kind === 'pr') wanted.add(stageTrackerItemKey(row.item)); + for (const lp of (row.item.linked_prs || [])) wanted.add(stageTrackerItemKey(stageTrackerLinkedPRItem(row.item, lp))); + } + _stageTrackerTerminalRows = rows; + // Reuse the canonical merge observer's alias resolution, without adding + // any item stages to this one-record observation. + const teaching = Object.values(rows).map(row => ({ repo: row.item.repo })); + const ledger = d && d.merged && Array.isArray(d.merged.recent) ? d.merged.recent : []; + for (const m of (d && Array.isArray(d.recently_merged) ? d.recently_merged : []).concat(ledger)) { + const facts = stageTrackerMergeState({ items: teaching, recently_merged: [m] }, _stageTrackerMergeState); + for (const key of Object.keys(facts)) { + if (!wanted.has(key)) continue; + const prior = _stageTrackerTerminalFacts[key] || {}; + _stageTrackerTerminalFacts[key] = Object.assign({}, prior, { + merged_by: m.merged_by || prior.merged_by || '', + }); + } + } + for (const key of Object.keys(_stageTrackerTerminalFacts)) if (!wanted.has(key)) delete _stageTrackerTerminalFacts[key]; + } + function stageTrackerTerminalItem(item, key) { + const fact = _stageTrackerTerminalFacts[key] || {}; + return Object.assign({}, item, { + stage: STAGE_TRACKER_TERMINAL, stage_slug: 'merged', state: 'closed', terminal_merge: true, + merged_by: fact.merged_by || item.merged_by || '', modifiers: [], deferred_modifiers: [], + caption: 'Merged', reason: '', preparation: null, merge_train: null, merge_gate: null, + decision_needed: null, human_attention: null, decided: null, hold: null, adoption: null, + manual_merge: false, human_merge_reason: '', human_merge_reason_text: '', human_approver: '', + superseded: null, superseded_by: 0, adopted_by: 0, + push: null, rework: null, presence: null, claimant: null, + stage_actor: { kind: 'none', why: 'merged' }, sentinel_alert: false, + }); + } + function stageTrackerTerminalView(d, nowMs) { + if (!d || !Array.isArray(d.items)) return d; + const items = d.items.map(item => { + const rowKey = stageTrackerItemKey(item), pin = _stageTrackerCelebrating[rowKey]; + const active = pin && pin.until > nowMs; + if (item.kind === 'pr' && _stageTrackerMergeState[rowKey] === true) { + const fact = _stageTrackerTerminalFacts[rowKey]; + return (fact && fact.until > nowMs) || Number(item.stage) >= STAGE_TRACKER_TERMINAL ? stageTrackerTerminalItem(item, rowKey) : null; + } + if (item.kind !== 'issue') return item; + const saved = _stageTrackerTerminalRows[rowKey]; + const source = (item.linked_prs || []).slice(); + const keys = new Set(source.map(lp => stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp)))); + if (active && saved) for (const lp of (saved.item.linked_prs || [])) { + const key = stageTrackerItemKey(stageTrackerLinkedPRItem(saved.item, lp)), fact = _stageTrackerTerminalFacts[key]; + if (fact && fact.until > nowMs && !keys.has(key)) { source.push(lp); keys.add(key); } + } + const linked = source.map(lp => { + const key = stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp)); + if (_stageTrackerMergeState[key] !== true) return lp; + const fact = _stageTrackerTerminalFacts[key]; + return (fact && fact.until > nowMs) || Number(lp.stage) >= STAGE_TRACKER_TERMINAL ? stageTrackerTerminalItem(lp, key) : null; + }).filter(Boolean); + return Object.assign({}, item, { linked_prs: linked }); + }).filter(Boolean); + return Object.assign({}, d, { items }); + } + function stageTrackerTerminalPinnedItem(rowKey, nowMs) { + const saved = _stageTrackerTerminalRows[rowKey]; + if (!saved) return null; + let item = saved.item; + if (item.kind === 'issue') { + const visible = new Set(saved.visible_prs || []); + item = Object.assign({}, item, { linked_prs: (item.linked_prs || []).filter(lp => { + const key = stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp)), fact = _stageTrackerTerminalFacts[key]; + return visible.has(key) || (fact && fact.until > nowMs); + }) }); + } + return stageTrackerTerminalView({ items: [item] }, nowMs).items[0] || null; + } + function stageTrackerTerminalEvents(nowMs) { + let nextUntil = Infinity; + for (const rowKey of Object.keys(_stageTrackerCelebrating)) { + const pin = _stageTrackerCelebrating[rowKey]; + if (pin.kind !== 'merged' || pin.until <= nowMs) continue; + for (const key of (pin.keys || [pin.key])) { + const fact = _stageTrackerTerminalFacts[key] || {}; + if (!fact.observed_at || fact.until <= nowMs) continue; + nextUntil = Math.min(nextUntil, fact.until); + const by = stageTrackerMergedByText(fact.merged_by); + const number = Number(key.slice(key.lastIndexOf('/pr#') + 4)); + const event = { who: 'merge', at: fact.observed_at, text: 'Merged PR #' + number + (by ? ' ' + by : '') }; + _stageTrackerEvents[key] = Object.assign({}, _stageTrackerEvents[key], event); + if (key === pin.key) _stageTrackerEvents[rowKey] = Object.assign({}, _stageTrackerEvents[rowKey], event); + } + } + if (Number.isFinite(nextUntil)) stageTrackerScheduleRelease(nextUntil - nowMs); + } + function stageTrackerMergedPRKnown(item) { + return !!item && item.kind === 'pr' && typeof _stageTrackerMergeState !== 'undefined' && + !!_stageTrackerMergeState && _stageTrackerMergeState[stageTrackerItemKey(item)] === true; + } var _stageTrackerFlights = 0; // Pure: the PR keys a row draws, space-separated — its own key for a // PR row, the covering PRs for an issue row (one inline, several as @@ -773,7 +937,10 @@ function stageTrackerRowPRKeys(item) { if (!item) return ''; if (item.kind === 'pr') return stageTrackerPRKey(item.repo, item.number); - return (Array.isArray(item.linked_prs) ? item.linked_prs : []).filter(lp => lp && Number(lp.number) > 0).map(lp => stageTrackerPRKey(lp.repo || item.repo, lp.number)).join(' '); + return (Array.isArray(item.linked_prs) ? item.linked_prs : []).filter(lp => lp && Number(lp.number) > 0 && (!Number(lp.drawn_under) || Number(lp.drawn_under) === Number(item.number))).map(lp => { + const pr = typeof stageTrackerLinkedPRItem === 'function' ? stageTrackerLinkedPRItem(item, lp) : { repo: lp.repo || item.repo, number: lp.number }; + return stageTrackerPRKey(pr.repo, pr.number); + }).join(' '); } // PR key → the row key it was last drawn on (from the previous payload's // nested_under / linked_prs), for a merge whose row left the DOM @@ -784,7 +951,14 @@ for (const it of (d && Array.isArray(d.items) ? d.items : [])) { if (!it) continue; if (it.kind === 'pr') out[stageTrackerPRKey(it.repo, it.number)] = Number(it.nested_under) > 0 ? stageTrackerItemKey({ repo: it.repo, kind: 'issue', number: it.nested_under }) : stageTrackerItemKey(it); - for (const lp of (Array.isArray(it.linked_prs) ? it.linked_prs : [])) if (lp && Number(lp.number) > 0) out[stageTrackerPRKey(lp.repo || it.repo, lp.number)] = stageTrackerItemKey(it); + } + for (const it of (d && Array.isArray(d.items) ? d.items : [])) { + if (!it || it.kind !== 'issue') continue; + for (const lp of (Array.isArray(it.linked_prs) ? it.linked_prs : [])) { + if (!lp || !Number(lp.number) || (Number(lp.drawn_under) && Number(lp.drawn_under) !== Number(it.number))) continue; + const pr = typeof stageTrackerLinkedPRItem === 'function' ? stageTrackerLinkedPRItem(it, lp) : { repo: lp.repo || it.repo, number: lp.number }; + out[stageTrackerPRKey(pr.repo, pr.number)] = stageTrackerItemKey(it); + } } return out; } @@ -812,12 +986,16 @@ keys.forEach((key, i) => { const rowKey = stageTrackerCelebrateRowKey(key, el); const startAt = now + i * STAGE_TRACKER_CELEBRATE_STAGGER_MS; - if (rowKey) _stageTrackerCelebrating[rowKey] = { key, kind: 'merged', until: startAt + STAGE_TRACKER_CELEBRATE_PIN_MS }; + const fact = typeof _stageTrackerTerminalFacts !== 'undefined' ? _stageTrackerTerminalFacts[key] : null; + if (fact && fact.observed_at) fact.until = Math.max(fact.until, startAt + STAGE_TRACKER_CELEBRATE_PIN_MS); + if (rowKey) _stageTrackerCelebrating[rowKey] = Object.assign({}, _stageTrackerCelebrating[rowKey], { + key, kind: 'merged', until: Math.max((_stageTrackerCelebrating[rowKey] || {}).until || 0, startAt + STAGE_TRACKER_CELEBRATE_PIN_MS), + }); const number = Number(key.slice(key.indexOf('/pr#') + 4)) || 0; const banner = stageTrackerMergeBanner({ key, rowKey, number, repo: key.slice(0, key.indexOf('/pr#')), at: now }); setTimeout(() => { const row = rowKey && el ? el.querySelector(`[data-ham-key="${CSS.escape(rowKey)}"]`) : null; - if (row) celebrateRow(row, { kind: 'merged', key, number }); + if (row) celebrateRow(row, { kind: 'merged', key, number, merged_by: fact && fact.merged_by }); else celebrateDetached(key, banner); }, i * STAGE_TRACKER_CELEBRATE_STAGGER_MS); }); @@ -849,7 +1027,7 @@ // Pure: the rows a render must keep although the payload dropped them — // every celebrating row still inside its pin window, as the node it // already has (its HTML is replayed so the reconcile keeps it). - function stageTrackerPinnedRows(el, rows, nowMs) { + function stageTrackerPinnedRows(el, rows, nowMs, renderItem) { const keys = Object.keys(_stageTrackerCelebrating); if (!keys.length || !el) return rows; const have = {}; @@ -858,7 +1036,13 @@ for (const k of keys) { const c = _stageTrackerCelebrating[k]; if (c.until <= nowMs) { delete _stageTrackerCelebrating[k]; continue; } - if (have[k]) continue; + if (have[k]) { stageTrackerScheduleRelease(c.until - nowMs); continue; } + const item = c.kind === 'merged' && typeof renderItem === 'function' && typeof stageTrackerTerminalPinnedItem === 'function' ? stageTrackerTerminalPinnedItem(k, nowMs) : null; + if (item) { + out.push({ key: k, html: renderItem(item), pinned: true }); + stageTrackerScheduleRelease(c.until - nowMs); + continue; + } const node = el.querySelector(`[data-ham-key="${CSS.escape(k)}"]`); if (!node) { delete _stageTrackerCelebrating[k]; continue; } out.push({ key: k, html: stageTrackerRowSrcOf(node) || node.outerHTML, pinned: true }); @@ -899,9 +1083,10 @@ rowEl.classList.add('cue-merged'); if (preview) setTimeout(() => rowEl.classList.remove('cue-merged'), STAGE_TRACKER_CELEBRATE_PIN_MS); else { - const text = kind === 'merged' ? `merged${opts.number ? ' #' + opts.number : ''} · by hive` : `closed by merge${opts.number ? ' of #' + opts.number : ''}`; + const by = opts.merged_by ? (opts.merged_by === 'hive' ? 'by hive' : 'by @' + opts.merged_by) : ''; + const text = kind === 'merged' ? `merged${opts.number ? ' #' + opts.number : ''}${by ? ' · ' + by : ''}` : `closed by merge${opts.number ? ' of #' + opts.number : ''}`; stageTrackerNoteOwnerEvent(rowEl.dataset.hamKey, text, Date.now()); - _stageTrackerEvents[rowEl.dataset.hamKey].who = 'hive'; + _stageTrackerEvents[rowEl.dataset.hamKey].who = kind === 'merged' ? 'merge' : 'hive'; stageTrackerEventLineInject(rowEl, rowEl.dataset.hamKey, text); } if (kind !== 'merged') return { flew: false }; diff --git a/src/pkg/dashboard/static-src/js/tracker-motion.js b/src/pkg/dashboard/static-src/js/tracker-motion.js index cced24e16e..31a9c6bc37 100644 --- a/src/pkg/dashboard/static-src/js/tracker-motion.js +++ b/src/pkg/dashboard/static-src/js/tracker-motion.js @@ -321,7 +321,7 @@ const auto = ctx && typeof ctx.noteTuck === 'boolean' ? ctx.noteTuck : (typeof stageTrackerNoteTuckSetting === 'function' && stageTrackerNoteTuckSetting()); const fading = !auto && nowMs - stageTrackerEventShownAt(ev) > STAGE_TRACKER_EVENT_MS * 2 / 3; const open = !auto || stageTrackerNoteOpen(ev, nowMs, auto); - const who = ev.who === 'you' ? 'You' : 'Hive'; + const who = ev.who === 'you' ? 'You' : ev.who === 'merge' ? 'Merge' : 'Hive'; const body = `${esc(who)}: ${esc(ev.text)} `; if (!auto) return `

${body}

`; const ico = ``; @@ -733,4 +733,3 @@ if (_stageTrackerSettleTimer) return; _stageTrackerSettleTimer = setTimeout(() => { _stageTrackerSettleTimer = 0; renderStageTracker(); }, STAGE_TRACKER_SETTLE_MS); } - diff --git a/src/pkg/dashboard/static-src/js/tracker-row-layout.js b/src/pkg/dashboard/static-src/js/tracker-row-layout.js index d13ec0dfac..407dc25d82 100644 --- a/src/pkg/dashboard/static-src/js/tracker-row-layout.js +++ b/src/pkg/dashboard/static-src/js/tracker-row-layout.js @@ -61,6 +61,7 @@ const open = Array.isArray(issue.linked_prs) ? issue.linked_prs.filter(x => x && x.number !== lp.number && stageTrackerLinkedPROpen(x, issue)) : []; const canonical = /^https?:\/\/[^/]+\/([^/]+\/[^/]+)\/pull\/\d+(?:[?#].*)?$/.exec(String(lp.url || '')); return { repo: canonical ? canonical[1] : (lp.repo || issue.repo), number: lp.number, kind: 'pr', title: lp.title || '', url: lp.url || '', author: lp.author || '', author_kind: lp.author_kind || '', + state: lp.state || '', terminal_merge: !!lp.terminal_merge, merged_by: lp.merged_by || '', stage: lp.stage || 0, stage_since: lp.stage_since || '', stage_slug: lp.stage_slug || '', modifiers: lp.modifiers || [], deferred_modifiers: lp.deferred_modifiers || [], caption: lp.caption || '', reason: lp.reason || '', preparation: lp.preparation || null, human_attention: lp.human_attention || null, human_approver: lp.human_approver || '', manual_merge: !!lp.manual_merge, human_merge_reason: lp.human_merge_reason || '', human_merge_reason_text: lp.human_merge_reason_text || '', sentinel_alert: !!lp.sentinel_alert, sentinel_reason: lp.sentinel_reason || '', head: lp.head || '', base_ref: lp.base_ref || '', decision_needed: lp.decision_needed || null, adoption: lp.adoption || null, takeover: lp.takeover || null, superseded: !!lp.superseded, supersedes: lp.supersedes || null, parent: Number(issue.number) || 0, siblings: open.map(x => Number(x.number) || 0), @@ -488,6 +489,7 @@ const lineage = (lp.lineage && typeof stageTrackerLineageChipHtml === 'function' ? stageTrackerLineageChipHtml(lp, nowMs) : '') || (typeof stageTrackerAdoptedFromChipHtml === 'function' ? stageTrackerAdoptedFromChipHtml(lp, nowMs) : ''); prRefs = [STAGE_TRACKER_LINKED_GLYPH + stageTrackerPRPillsHtml(stageTrackerPRRef(lp.number, lp.url, lp.author_kind || '', lp.author, lp.title, (lp.title ? lp.title + '\n' : '') + 'Author: ' + who + ' · ' + stageTrackerLinkedTip(item, lp.number, ctx)), typeof stageTrackerLinkedChipsHtml === 'function' ? stageTrackerLinkedChipsHtml(lp, lineage) : (lineage || null), lp.base_ref)]; shown = Object.assign({}, item, { via_pr: true, stage: stageTrackerLeadStage(lp), stage_since: lp.stage_since || item.stage_since, modifiers: lp.modifiers || item.modifiers, deferred_modifiers: lp.deferred_modifiers || item.deferred_modifiers || [], caption: lp.caption || item.caption, reason: lp.reason || item.reason, preparation: lp.preparation || null, + terminal_merge: !!lp.terminal_merge, merged_by: lp.merged_by || '', human_approver: lp.human_approver || '', manual_merge: !!lp.manual_merge, human_merge_reason: lp.human_merge_reason || '', human_merge_reason_text: lp.human_merge_reason_text || '', sentinel_alert: !!lp.sentinel_alert, sentinel_reason: lp.sentinel_reason || '', head: lp.head || '', decision_needed: lp.decision_needed || null, hold: lp.hold || null, adoption: lp.adoption || null, stage_actor: lp.stage_actor || item.stage_actor || null, claimant: lp.claimant || null, presence: lp.presence || null, rework: lp.rework || null, push: lp.push || null, merge_gate: lp.merge_gate || null, merge_train: lp.merge_train || null, left_train: lp.left_train || null, overlap: lp.overlap || null, decided: lp.decided || item.decided || null }); } else if (linked.length) { // Several covering PRs: the issue strip ends at Claimed, all passed diff --git a/src/pkg/dashboard/static-src/js/tracker-row-strip.js b/src/pkg/dashboard/static-src/js/tracker-row-strip.js index 3e207aba8d..e479b5f360 100644 --- a/src/pkg/dashboard/static-src/js/tracker-row-strip.js +++ b/src/pkg/dashboard/static-src/js/tracker-row-strip.js @@ -133,8 +133,9 @@ && (!range || range.to == null || sg.number <= range.to)); if (!active) return ''; const actor = active.cap ? '' : stageTrackerActorTip(item); + const by = active.cap && item.terminal_merge && typeof stageTrackerMergedByText === 'function' ? stageTrackerMergedByText(item.merged_by) : ''; const regressed = stageTrackerRegressionText(item, Date.now()); - const text = active.short + (active.detour && active.detour.text !== active.short ? ' · ' + active.detour.text : '') + actor + (regressed ? ' · ' + regressed : ''); + const text = active.short + (by ? ' ' + by : '') + (active.detour && active.detour.text !== active.short ? ' · ' + active.detour.text : '') + actor + (regressed ? ' · ' + regressed : ''); return `

${esc(text)}

`; } diff --git a/src/pkg/dashboard/static-src/js/tracker-words-gate.js b/src/pkg/dashboard/static-src/js/tracker-words-gate.js index 510a73d3b7..3c7690a726 100644 --- a/src/pkg/dashboard/static-src/js/tracker-words-gate.js +++ b/src/pkg/dashboard/static-src/js/tracker-words-gate.js @@ -77,6 +77,7 @@ // under the issue (merged, closed, filtered) has nothing left to say // and is not drawn. function stageTrackerLinkedSupersededGone(lp, issue) { + if (lp && lp.terminal_merge === true && Number(lp.stage) === STAGE_TRACKER_TERMINAL) return false; return !!lp && String(lp.state || '') === 'closed' && !stageTrackerLinkedSuperseder(lp, issue); } function stageTrackerCoveringPR(item) { diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index 37431e3ffb..5c6cb1d149 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -15817,6 +15817,7 @@

Where to get help

// under the issue (merged, closed, filtered) has nothing left to say // and is not drawn. function stageTrackerLinkedSupersededGone(lp, issue) { + if (lp && lp.terminal_merge === true && Number(lp.stage) === STAGE_TRACKER_TERMINAL) return false; return !!lp && String(lp.state || '') === 'closed' && !stageTrackerLinkedSuperseder(lp, issue); } function stageTrackerCoveringPR(item) { @@ -17182,8 +17183,9 @@

Where to get help

&& (!range || range.to == null || sg.number <= range.to)); if (!active) return ''; const actor = active.cap ? '' : stageTrackerActorTip(item); + const by = active.cap && item.terminal_merge && typeof stageTrackerMergedByText === 'function' ? stageTrackerMergedByText(item.merged_by) : ''; const regressed = stageTrackerRegressionText(item, Date.now()); - const text = active.short + (active.detour && active.detour.text !== active.short ? ' · ' + active.detour.text : '') + actor + (regressed ? ' · ' + regressed : ''); + const text = active.short + (by ? ' ' + by : '') + (active.detour && active.detour.text !== active.short ? ' · ' + active.detour.text : '') + actor + (regressed ? ' · ' + regressed : ''); return `

${esc(text)}

`; } @@ -17791,6 +17793,7 @@

Where to get help

const open = Array.isArray(issue.linked_prs) ? issue.linked_prs.filter(x => x && x.number !== lp.number && stageTrackerLinkedPROpen(x, issue)) : []; const canonical = /^https?:\/\/[^/]+\/([^/]+\/[^/]+)\/pull\/\d+(?:[?#].*)?$/.exec(String(lp.url || '')); return { repo: canonical ? canonical[1] : (lp.repo || issue.repo), number: lp.number, kind: 'pr', title: lp.title || '', url: lp.url || '', author: lp.author || '', author_kind: lp.author_kind || '', + state: lp.state || '', terminal_merge: !!lp.terminal_merge, merged_by: lp.merged_by || '', stage: lp.stage || 0, stage_since: lp.stage_since || '', stage_slug: lp.stage_slug || '', modifiers: lp.modifiers || [], deferred_modifiers: lp.deferred_modifiers || [], caption: lp.caption || '', reason: lp.reason || '', preparation: lp.preparation || null, human_attention: lp.human_attention || null, human_approver: lp.human_approver || '', manual_merge: !!lp.manual_merge, human_merge_reason: lp.human_merge_reason || '', human_merge_reason_text: lp.human_merge_reason_text || '', sentinel_alert: !!lp.sentinel_alert, sentinel_reason: lp.sentinel_reason || '', head: lp.head || '', base_ref: lp.base_ref || '', decision_needed: lp.decision_needed || null, adoption: lp.adoption || null, takeover: lp.takeover || null, superseded: !!lp.superseded, supersedes: lp.supersedes || null, parent: Number(issue.number) || 0, siblings: open.map(x => Number(x.number) || 0), @@ -18218,6 +18221,7 @@

Where to get help

const lineage = (lp.lineage && typeof stageTrackerLineageChipHtml === 'function' ? stageTrackerLineageChipHtml(lp, nowMs) : '') || (typeof stageTrackerAdoptedFromChipHtml === 'function' ? stageTrackerAdoptedFromChipHtml(lp, nowMs) : ''); prRefs = [STAGE_TRACKER_LINKED_GLYPH + stageTrackerPRPillsHtml(stageTrackerPRRef(lp.number, lp.url, lp.author_kind || '', lp.author, lp.title, (lp.title ? lp.title + '\n' : '') + 'Author: ' + who + ' · ' + stageTrackerLinkedTip(item, lp.number, ctx)), typeof stageTrackerLinkedChipsHtml === 'function' ? stageTrackerLinkedChipsHtml(lp, lineage) : (lineage || null), lp.base_ref)]; shown = Object.assign({}, item, { via_pr: true, stage: stageTrackerLeadStage(lp), stage_since: lp.stage_since || item.stage_since, modifiers: lp.modifiers || item.modifiers, deferred_modifiers: lp.deferred_modifiers || item.deferred_modifiers || [], caption: lp.caption || item.caption, reason: lp.reason || item.reason, preparation: lp.preparation || null, + terminal_merge: !!lp.terminal_merge, merged_by: lp.merged_by || '', human_approver: lp.human_approver || '', manual_merge: !!lp.manual_merge, human_merge_reason: lp.human_merge_reason || '', human_merge_reason_text: lp.human_merge_reason_text || '', sentinel_alert: !!lp.sentinel_alert, sentinel_reason: lp.sentinel_reason || '', head: lp.head || '', decision_needed: lp.decision_needed || null, hold: lp.hold || null, adoption: lp.adoption || null, stage_actor: lp.stage_actor || item.stage_actor || null, claimant: lp.claimant || null, presence: lp.presence || null, rework: lp.rework || null, push: lp.push || null, merge_gate: lp.merge_gate || null, merge_train: lp.merge_train || null, left_train: lp.left_train || null, overlap: lp.overlap || null, decided: lp.decided || item.decided || null }); } else if (linked.length) { // Several covering PRs: the issue strip ends at Claimed, all passed @@ -18617,7 +18621,7 @@

Where to get help

const auto = ctx && typeof ctx.noteTuck === 'boolean' ? ctx.noteTuck : (typeof stageTrackerNoteTuckSetting === 'function' && stageTrackerNoteTuckSetting()); const fading = !auto && nowMs - stageTrackerEventShownAt(ev) > STAGE_TRACKER_EVENT_MS * 2 / 3; const open = !auto || stageTrackerNoteOpen(ev, nowMs, auto); - const who = ev.who === 'you' ? 'You' : 'Hive'; + const who = ev.who === 'you' ? 'You' : ev.who === 'merge' ? 'Merge' : 'Hive'; const body = `${esc(who)}: ${esc(ev.text)} `; if (!auto) return `

${body}

`; const ico = ``; @@ -19029,7 +19033,6 @@

Where to get help

if (_stageTrackerSettleTimer) return; _stageTrackerSettleTimer = setTimeout(() => { _stageTrackerSettleTimer = 0; renderStageTracker(); }, STAGE_TRACKER_SETTLE_MS); } - // What a PR row's issue slot shows: the issue the PR closes (number, // title, url) — an open one first, else the closed one GitHub links // it to, with closed: true so the row draws it struck through under a @@ -20232,7 +20235,8 @@

All labels

if (!el) return; const nowMs = Date.now(); // Rows under a "Merging" hold the payload already dropped ride along (#15245). - const d = typeof stageTrackerMergingHoldView === 'function' ? stageTrackerMergingHoldView(_stageTracker, _stageTrackerMergingHold, nowMs) : _stageTracker; + const held = typeof stageTrackerMergingHoldView === 'function' ? stageTrackerMergingHoldView(_stageTracker, _stageTrackerMergingHold, nowMs) : _stageTracker; + const d = typeof stageTrackerTerminalView === 'function' ? stageTrackerTerminalView(held, nowMs) : held; if (!d || d.status === 'initializing' || !Array.isArray(d.items)) { if (typeof stageTrackerPreparationVisualSync === 'function') stageTrackerPreparationVisualSync(null, [], [], [], nowMs); if (typeof stageTrackerNativeQueueSync === 'function') stageTrackerNativeQueueSync(null, [], nowMs, ''); @@ -20242,6 +20246,7 @@

All labels

return; } const f = _stageTrackerFilter = stageTrackerNormalizeFilter(_stageTrackerFilter); + if (typeof stageTrackerTerminalEvents === 'function') stageTrackerTerminalEvents(nowMs); const stages = d.stages || []; const repos = Array.from(new Set(d.items.map(it => it.repo).filter(Boolean))).sort(); const sel = document.getElementById('activity-monitor-repo'); @@ -20342,7 +20347,7 @@

All labels

: itemRow(pageItems[i], i); const trainRows = stageTrackerTrainRows(page.rows, rowOf, typeof stageTrackerTrainWhere === 'function' ? stageTrackerTrainWhere(ordered, d.items) : null); const inlineRows = typeof stageTrackerPreparationInlineRows === 'function' ? stageTrackerPreparationInlineRows(trainRows, pageItems, stages) : trainRows; - const rows = stageTrackerPinnedRows(el, [{ key: STAGE_TRACKER_HEADER_KEY, html: stageTrackerHeaderHtml(stages) }].concat(inlineRows), nowMs); + const rows = stageTrackerPinnedRows(el, [{ key: STAGE_TRACKER_HEADER_KEY, html: stageTrackerHeaderHtml(stages) }].concat(inlineRows), nowMs, it => stageTrackerRowHtml(it, stages, ctx)); const rec = stageTrackerReconcile(el, rows, { effect, hidden: document.hidden }); if (rec.deferred) stageTrackerScheduleSettle(); // Selection is keyed on the row, never baked into its HTML, so a kept @@ -20749,7 +20754,8 @@

All labels

}).join(''); } function stageTrackerItemsForKeys(keys) { - return keys.map(k => stageTrackerItemByKey(_stageTracker, k)).filter(Boolean); + const data = typeof stageTrackerTerminalView === 'function' ? stageTrackerTerminalView(_stageTracker, Date.now()) : _stageTracker; + return keys.map(k => stageTrackerItemByKey(data, k)).filter(Boolean); } // What the signed-in viewer may do on this repo. Hold permission is // looked up lazily (the server answers 403 either way); needs-human is @@ -20976,6 +20982,12 @@

All labels

} function stageTrackerRowActions(item, ctx) { ctx = ctx || {}; + if (typeof stageTrackerMergedPRKnown === 'function' && stageTrackerMergedPRKnown(item)) { + return [ + { id: 'open', label: 'Open on GitHub', enabled: !!item.url, why: item.url ? '' : 'No GitHub link' }, + { id: 'copy', label: 'Copy link', enabled: !!item.url, why: item.url ? '' : 'No GitHub link' }, + ]; + } const mods = Array.isArray(item.modifiers) ? item.modifiers : []; const has = m => mods.indexOf(m) >= 0; const write = ctx.canHold !== false; @@ -21745,6 +21757,10 @@

All labels

// Pure: which endpoint an action hits for one item. `once` marks a // hive-wide call made one time per batch. function stageTrackerActionRequest(item, id, payload) { + if (typeof stageTrackerTerminalView === 'function') { + item = stageTrackerTerminalView({ items: [item] }, Date.now()).items[0]; + if (!item || (typeof stageTrackerMergedPRKnown === 'function' && stageTrackerMergedPRKnown(item))) return null; + } payload = payload || {}; const p = repoParts(item.repo); const n = Number(item.number) || 0; @@ -23154,6 +23170,14 @@

All labels

const repo = String(it.repo || ''); const slash = repo.lastIndexOf('/'); if (slash > 0) { const short = repo.slice(slash + 1); byShort[short] = (short in byShort && byShort[short] !== repo) ? '' : repo; } + for (const lp of (Array.isArray(it.linked_prs) ? it.linked_prs : [])) { + if (!lp || !Number(lp.number)) continue; + const pr = typeof stageTrackerLinkedPRItem === 'function' ? stageTrackerLinkedPRItem(it, lp) : Object.assign({ repo: it.repo }, lp); + const prRepo = String(pr.repo || ''), at = prRepo.lastIndexOf('/'); + if (at > 0) { const short = prRepo.slice(at + 1); byShort[short] = (short in byShort && byShort[short] !== prRepo) ? '' : prRepo; } + if (lp.state === 'closed' && Number(lp.stage) < STAGE_TRACKER_TERMINAL) continue; + out[stageTrackerPRKey(pr.repo, pr.number)] = (Number(pr.stage) || 0) >= STAGE_TRACKER_TERMINAL; + } if (it.kind !== 'pr') continue; out[stageTrackerPRKey(it.repo, it.number)] = (Number(it.stage) || 0) >= STAGE_TRACKER_TERMINAL; } @@ -23169,14 +23193,17 @@

All labels

return out; } - // Pure: next plus every PR prev listed open that next no longer lists at - // all, kept as open. A PR the snapshot dropped before the audit log + // Pure: merged facts are irreversible; dropped open observations remain + // comparable. A PR the snapshot dropped before the audit log // recorded its merge stays comparable until recently_merged settles it // (or, when it was closed unmerged, for the life of the tab — a few keys). function stageTrackerCarryOpen(prev, next) { const out = Object.assign({}, next || {}); if (!prev) return out; - for (const k of Object.keys(prev)) if (prev[k] === false && !(k in out)) out[k] = false; + for (const k of Object.keys(prev)) { + if (prev[k] === true) out[k] = true; + else if (prev[k] === false && !(k in out)) out[k] = false; + } return out; } @@ -23241,6 +23268,7 @@

All labels

_stageTrackerMergeState = next; // A merged PR is no longer in this payload, so its last host survives. if (typeof stageTrackerPRHosts === 'function') Object.assign(_stageTrackerPRHost, stageTrackerPRHosts(d)); + if (typeof stageTrackerTerminalObserve === 'function') stageTrackerTerminalObserve(d, fresh, nowMs); // With the celebration on, each fresh merge is counted (and the zap // plays) when its token lands on the counter; off, both happen now. const celebrate = fresh.length && typeof stageTrackerCelebrateSetting === 'function' && stageTrackerCelebrateSetting(); @@ -23897,6 +23925,158 @@

All labels

if (!stageTrackerMergedInFlight() && stageTrackerSoundGate()) stageTrackerPlayZap(1); } var _stageTrackerCelebrating = {}; + var _stageTrackerTerminalRows = {}; + var _stageTrackerTerminalFacts = {}; + // Keep models, not stale HTML, for the existing short terminal/pin window. + // No queue/admission observation is required for a verified merged fact. + function stageTrackerTerminalObserve(d, fresh, nowMs) { + const previous = _stageTrackerTerminalRows, rows = Object.assign({}, previous); + const current = new Set(); + for (const item of (d && Array.isArray(d.items) ? d.items : [])) if (item) { + const key = stageTrackerItemKey(item); + current.add(key); + rows[key] = { item, at: nowMs, visible_prs: (item.linked_prs || []).map(lp => stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp))) }; + } + const el = document.getElementById('activity-monitor-panel'); + for (const key of fresh) { + const rowKey = stageTrackerCelebrateRowKey(key, el) || _stageTrackerPRHost[key] || key; + if (!rows[rowKey]) continue; + const prior = _stageTrackerCelebrating[rowKey] || {}; + _stageTrackerTerminalFacts[key] = Object.assign({}, _stageTrackerTerminalFacts[key], { + observed_at: nowMs, until: nowMs + STAGE_TRACKER_CELEBRATE_PIN_MS, + }); + _stageTrackerCelebrating[rowKey] = Object.assign({}, prior, { + key, keys: Array.from(new Set((prior.keys || []).concat(key))), kind: 'merged', + until: Math.max(Number(prior.until) || 0, nowMs + STAGE_TRACKER_CELEBRATE_PIN_MS), + }); + stageTrackerScheduleRelease(STAGE_TRACKER_CELEBRATE_PIN_MS); + } + const wanted = new Set(); + const detached = []; + for (const rowKey of Object.keys(rows)) { + const pin = _stageTrackerCelebrating[rowKey], active = pin && pin.until > nowMs; + const item = rows[rowKey].item, old = previous[rowKey] && previous[rowKey].item; + if (item.kind === 'issue' && old && Array.isArray(old.linked_prs)) { + const linked = (item.linked_prs || []).slice(), keys = new Set(linked.map(lp => stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp)))); + let unresolved = 0; + for (const lp of old.linked_prs) { + const key = stageTrackerItemKey(stageTrackerLinkedPRItem(old, lp)); + const fact = _stageTrackerTerminalFacts[key]; + if (keys.has(key)) continue; + if (fact && fact.until > nowMs) { linked.push(lp); keys.add(key); } + else if (_stageTrackerMergeState[key] === false && unresolved < STAGE_TRACKER_MERGED_LIST_MAX) { + linked.push(lp); keys.add(key); unresolved++; + } + } + rows[rowKey] = Object.assign({}, rows[rowKey], { item: Object.assign({}, item, { linked_prs: linked }) }); + } + const source = rows[rowKey].item; + const prs = source.kind === 'pr' ? [source] : (source.linked_prs || []).map(lp => stageTrackerLinkedPRItem(source, lp)); + if (!current.has(rowKey) && !active) { + if (!prs.some(pr => _stageTrackerMergeState[stageTrackerItemKey(pr)] === false)) { delete rows[rowKey]; continue; } + detached.push(rowKey); + } + } + // Missing-but-unsettled rows are bounded history, not visible holds. + // Keep them available when the canonical merge ledger lags eviction. + detached.sort((a, b) => rows[b].at - rows[a].at); + for (const key of detached.slice(STAGE_TRACKER_MERGED_LIST_MAX)) delete rows[key]; + for (const row of Object.values(rows)) { + if (row.item.kind === 'pr') wanted.add(stageTrackerItemKey(row.item)); + for (const lp of (row.item.linked_prs || [])) wanted.add(stageTrackerItemKey(stageTrackerLinkedPRItem(row.item, lp))); + } + _stageTrackerTerminalRows = rows; + // Reuse the canonical merge observer's alias resolution, without adding + // any item stages to this one-record observation. + const teaching = Object.values(rows).map(row => ({ repo: row.item.repo })); + const ledger = d && d.merged && Array.isArray(d.merged.recent) ? d.merged.recent : []; + for (const m of (d && Array.isArray(d.recently_merged) ? d.recently_merged : []).concat(ledger)) { + const facts = stageTrackerMergeState({ items: teaching, recently_merged: [m] }, _stageTrackerMergeState); + for (const key of Object.keys(facts)) { + if (!wanted.has(key)) continue; + const prior = _stageTrackerTerminalFacts[key] || {}; + _stageTrackerTerminalFacts[key] = Object.assign({}, prior, { + merged_by: m.merged_by || prior.merged_by || '', + }); + } + } + for (const key of Object.keys(_stageTrackerTerminalFacts)) if (!wanted.has(key)) delete _stageTrackerTerminalFacts[key]; + } + function stageTrackerTerminalItem(item, key) { + const fact = _stageTrackerTerminalFacts[key] || {}; + return Object.assign({}, item, { + stage: STAGE_TRACKER_TERMINAL, stage_slug: 'merged', state: 'closed', terminal_merge: true, + merged_by: fact.merged_by || item.merged_by || '', modifiers: [], deferred_modifiers: [], + caption: 'Merged', reason: '', preparation: null, merge_train: null, merge_gate: null, + decision_needed: null, human_attention: null, decided: null, hold: null, adoption: null, + manual_merge: false, human_merge_reason: '', human_merge_reason_text: '', human_approver: '', + superseded: null, superseded_by: 0, adopted_by: 0, + push: null, rework: null, presence: null, claimant: null, + stage_actor: { kind: 'none', why: 'merged' }, sentinel_alert: false, + }); + } + function stageTrackerTerminalView(d, nowMs) { + if (!d || !Array.isArray(d.items)) return d; + const items = d.items.map(item => { + const rowKey = stageTrackerItemKey(item), pin = _stageTrackerCelebrating[rowKey]; + const active = pin && pin.until > nowMs; + if (item.kind === 'pr' && _stageTrackerMergeState[rowKey] === true) { + const fact = _stageTrackerTerminalFacts[rowKey]; + return (fact && fact.until > nowMs) || Number(item.stage) >= STAGE_TRACKER_TERMINAL ? stageTrackerTerminalItem(item, rowKey) : null; + } + if (item.kind !== 'issue') return item; + const saved = _stageTrackerTerminalRows[rowKey]; + const source = (item.linked_prs || []).slice(); + const keys = new Set(source.map(lp => stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp)))); + if (active && saved) for (const lp of (saved.item.linked_prs || [])) { + const key = stageTrackerItemKey(stageTrackerLinkedPRItem(saved.item, lp)), fact = _stageTrackerTerminalFacts[key]; + if (fact && fact.until > nowMs && !keys.has(key)) { source.push(lp); keys.add(key); } + } + const linked = source.map(lp => { + const key = stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp)); + if (_stageTrackerMergeState[key] !== true) return lp; + const fact = _stageTrackerTerminalFacts[key]; + return (fact && fact.until > nowMs) || Number(lp.stage) >= STAGE_TRACKER_TERMINAL ? stageTrackerTerminalItem(lp, key) : null; + }).filter(Boolean); + return Object.assign({}, item, { linked_prs: linked }); + }).filter(Boolean); + return Object.assign({}, d, { items }); + } + function stageTrackerTerminalPinnedItem(rowKey, nowMs) { + const saved = _stageTrackerTerminalRows[rowKey]; + if (!saved) return null; + let item = saved.item; + if (item.kind === 'issue') { + const visible = new Set(saved.visible_prs || []); + item = Object.assign({}, item, { linked_prs: (item.linked_prs || []).filter(lp => { + const key = stageTrackerItemKey(stageTrackerLinkedPRItem(item, lp)), fact = _stageTrackerTerminalFacts[key]; + return visible.has(key) || (fact && fact.until > nowMs); + }) }); + } + return stageTrackerTerminalView({ items: [item] }, nowMs).items[0] || null; + } + function stageTrackerTerminalEvents(nowMs) { + let nextUntil = Infinity; + for (const rowKey of Object.keys(_stageTrackerCelebrating)) { + const pin = _stageTrackerCelebrating[rowKey]; + if (pin.kind !== 'merged' || pin.until <= nowMs) continue; + for (const key of (pin.keys || [pin.key])) { + const fact = _stageTrackerTerminalFacts[key] || {}; + if (!fact.observed_at || fact.until <= nowMs) continue; + nextUntil = Math.min(nextUntil, fact.until); + const by = stageTrackerMergedByText(fact.merged_by); + const number = Number(key.slice(key.lastIndexOf('/pr#') + 4)); + const event = { who: 'merge', at: fact.observed_at, text: 'Merged PR #' + number + (by ? ' ' + by : '') }; + _stageTrackerEvents[key] = Object.assign({}, _stageTrackerEvents[key], event); + if (key === pin.key) _stageTrackerEvents[rowKey] = Object.assign({}, _stageTrackerEvents[rowKey], event); + } + } + if (Number.isFinite(nextUntil)) stageTrackerScheduleRelease(nextUntil - nowMs); + } + function stageTrackerMergedPRKnown(item) { + return !!item && item.kind === 'pr' && typeof _stageTrackerMergeState !== 'undefined' && + !!_stageTrackerMergeState && _stageTrackerMergeState[stageTrackerItemKey(item)] === true; + } var _stageTrackerFlights = 0; // Pure: the PR keys a row draws, space-separated — its own key for a // PR row, the covering PRs for an issue row (one inline, several as @@ -23905,7 +24085,10 @@

All labels

function stageTrackerRowPRKeys(item) { if (!item) return ''; if (item.kind === 'pr') return stageTrackerPRKey(item.repo, item.number); - return (Array.isArray(item.linked_prs) ? item.linked_prs : []).filter(lp => lp && Number(lp.number) > 0).map(lp => stageTrackerPRKey(lp.repo || item.repo, lp.number)).join(' '); + return (Array.isArray(item.linked_prs) ? item.linked_prs : []).filter(lp => lp && Number(lp.number) > 0 && (!Number(lp.drawn_under) || Number(lp.drawn_under) === Number(item.number))).map(lp => { + const pr = typeof stageTrackerLinkedPRItem === 'function' ? stageTrackerLinkedPRItem(item, lp) : { repo: lp.repo || item.repo, number: lp.number }; + return stageTrackerPRKey(pr.repo, pr.number); + }).join(' '); } // PR key → the row key it was last drawn on (from the previous payload's // nested_under / linked_prs), for a merge whose row left the DOM @@ -23916,7 +24099,14 @@

All labels

for (const it of (d && Array.isArray(d.items) ? d.items : [])) { if (!it) continue; if (it.kind === 'pr') out[stageTrackerPRKey(it.repo, it.number)] = Number(it.nested_under) > 0 ? stageTrackerItemKey({ repo: it.repo, kind: 'issue', number: it.nested_under }) : stageTrackerItemKey(it); - for (const lp of (Array.isArray(it.linked_prs) ? it.linked_prs : [])) if (lp && Number(lp.number) > 0) out[stageTrackerPRKey(lp.repo || it.repo, lp.number)] = stageTrackerItemKey(it); + } + for (const it of (d && Array.isArray(d.items) ? d.items : [])) { + if (!it || it.kind !== 'issue') continue; + for (const lp of (Array.isArray(it.linked_prs) ? it.linked_prs : [])) { + if (!lp || !Number(lp.number) || (Number(lp.drawn_under) && Number(lp.drawn_under) !== Number(it.number))) continue; + const pr = typeof stageTrackerLinkedPRItem === 'function' ? stageTrackerLinkedPRItem(it, lp) : { repo: lp.repo || it.repo, number: lp.number }; + out[stageTrackerPRKey(pr.repo, pr.number)] = stageTrackerItemKey(it); + } } return out; } @@ -23944,12 +24134,16 @@

All labels

keys.forEach((key, i) => { const rowKey = stageTrackerCelebrateRowKey(key, el); const startAt = now + i * STAGE_TRACKER_CELEBRATE_STAGGER_MS; - if (rowKey) _stageTrackerCelebrating[rowKey] = { key, kind: 'merged', until: startAt + STAGE_TRACKER_CELEBRATE_PIN_MS }; + const fact = typeof _stageTrackerTerminalFacts !== 'undefined' ? _stageTrackerTerminalFacts[key] : null; + if (fact && fact.observed_at) fact.until = Math.max(fact.until, startAt + STAGE_TRACKER_CELEBRATE_PIN_MS); + if (rowKey) _stageTrackerCelebrating[rowKey] = Object.assign({}, _stageTrackerCelebrating[rowKey], { + key, kind: 'merged', until: Math.max((_stageTrackerCelebrating[rowKey] || {}).until || 0, startAt + STAGE_TRACKER_CELEBRATE_PIN_MS), + }); const number = Number(key.slice(key.indexOf('/pr#') + 4)) || 0; const banner = stageTrackerMergeBanner({ key, rowKey, number, repo: key.slice(0, key.indexOf('/pr#')), at: now }); setTimeout(() => { const row = rowKey && el ? el.querySelector(`[data-ham-key="${CSS.escape(rowKey)}"]`) : null; - if (row) celebrateRow(row, { kind: 'merged', key, number }); + if (row) celebrateRow(row, { kind: 'merged', key, number, merged_by: fact && fact.merged_by }); else celebrateDetached(key, banner); }, i * STAGE_TRACKER_CELEBRATE_STAGGER_MS); }); @@ -23981,7 +24175,7 @@

All labels

// Pure: the rows a render must keep although the payload dropped them — // every celebrating row still inside its pin window, as the node it // already has (its HTML is replayed so the reconcile keeps it). - function stageTrackerPinnedRows(el, rows, nowMs) { + function stageTrackerPinnedRows(el, rows, nowMs, renderItem) { const keys = Object.keys(_stageTrackerCelebrating); if (!keys.length || !el) return rows; const have = {}; @@ -23990,7 +24184,13 @@

All labels

for (const k of keys) { const c = _stageTrackerCelebrating[k]; if (c.until <= nowMs) { delete _stageTrackerCelebrating[k]; continue; } - if (have[k]) continue; + if (have[k]) { stageTrackerScheduleRelease(c.until - nowMs); continue; } + const item = c.kind === 'merged' && typeof renderItem === 'function' && typeof stageTrackerTerminalPinnedItem === 'function' ? stageTrackerTerminalPinnedItem(k, nowMs) : null; + if (item) { + out.push({ key: k, html: renderItem(item), pinned: true }); + stageTrackerScheduleRelease(c.until - nowMs); + continue; + } const node = el.querySelector(`[data-ham-key="${CSS.escape(k)}"]`); if (!node) { delete _stageTrackerCelebrating[k]; continue; } out.push({ key: k, html: stageTrackerRowSrcOf(node) || node.outerHTML, pinned: true }); @@ -24031,9 +24231,10 @@

All labels

rowEl.classList.add('cue-merged'); if (preview) setTimeout(() => rowEl.classList.remove('cue-merged'), STAGE_TRACKER_CELEBRATE_PIN_MS); else { - const text = kind === 'merged' ? `merged${opts.number ? ' #' + opts.number : ''} · by hive` : `closed by merge${opts.number ? ' of #' + opts.number : ''}`; + const by = opts.merged_by ? (opts.merged_by === 'hive' ? 'by hive' : 'by @' + opts.merged_by) : ''; + const text = kind === 'merged' ? `merged${opts.number ? ' #' + opts.number : ''}${by ? ' · ' + by : ''}` : `closed by merge${opts.number ? ' of #' + opts.number : ''}`; stageTrackerNoteOwnerEvent(rowEl.dataset.hamKey, text, Date.now()); - _stageTrackerEvents[rowEl.dataset.hamKey].who = 'hive'; + _stageTrackerEvents[rowEl.dataset.hamKey].who = kind === 'merged' ? 'merge' : 'hive'; stageTrackerEventLineInject(rowEl, rowEl.dataset.hamKey, text); } if (kind !== 'merged') return { flew: false }; From f784e41beb6dec69681dc001f0fd46627d234ee8 Mon Sep 17 00:00:00 2001 From: Andy Anderson Date: Sat, 31 Oct 2026 08:46:08 -0400 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20fix:=20retain=20the=20actual?= =?UTF-8?q?=20terminal=20row=20when=20its=20issue=20is=20absent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andy Anderson --- src/pkg/dashboard/stage_tracker_external_terminal_test.go | 3 +++ src/pkg/dashboard/static-src/js/tracker-merged.js | 3 ++- src/pkg/dashboard/static/index.html | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pkg/dashboard/stage_tracker_external_terminal_test.go b/src/pkg/dashboard/stage_tracker_external_terminal_test.go index d35c6501c3..4c9a18ab5e 100644 --- a/src/pkg/dashboard/stage_tracker_external_terminal_test.go +++ b/src/pkg/dashboard/stage_tracker_external_terminal_test.go @@ -92,6 +92,9 @@ assert.strictEqual(stageTrackerTerminalView({items:[pr]},until+1).items.length,0 advance({items:[]},until+STAGE_TRACKER_CELEBRATE_PIN_MS+1); assert.strictEqual(Object.keys(_stageTrackerTerminalRows).length,0,'dropped row models are bounded'); assert.strictEqual(Object.keys(_stageTrackerTerminalFacts).length,0,'actor metadata is bounded with row models'); +reset(); advance({items:[{...pr,nested_under:500}]}); +advance(merged); +assert.strictEqual(stageTrackerTerminalPinnedItem(key,now).stage,110,'a root PR whose issue is absent uses its actual retained row, not an unavailable host'); reset(); const host={repo:'hivecommons/console',kind:'issue',number:500,stage:40,title:'Open related issue', diff --git a/src/pkg/dashboard/static-src/js/tracker-merged.js b/src/pkg/dashboard/static-src/js/tracker-merged.js index debc2ac510..18adbaab15 100644 --- a/src/pkg/dashboard/static-src/js/tracker-merged.js +++ b/src/pkg/dashboard/static-src/js/tracker-merged.js @@ -791,7 +791,8 @@ } const el = document.getElementById('activity-monitor-panel'); for (const key of fresh) { - const rowKey = stageTrackerCelebrateRowKey(key, el) || _stageTrackerPRHost[key] || key; + let rowKey = stageTrackerCelebrateRowKey(key, el) || _stageTrackerPRHost[key] || key; + if (!rows[rowKey] && rows[key]) rowKey = key; if (!rows[rowKey]) continue; const prior = _stageTrackerCelebrating[rowKey] || {}; _stageTrackerTerminalFacts[key] = Object.assign({}, _stageTrackerTerminalFacts[key], { diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index 33b2857cfe..cdf2e1feb4 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -24165,7 +24165,8 @@

All labels

} const el = document.getElementById('activity-monitor-panel'); for (const key of fresh) { - const rowKey = stageTrackerCelebrateRowKey(key, el) || _stageTrackerPRHost[key] || key; + let rowKey = stageTrackerCelebrateRowKey(key, el) || _stageTrackerPRHost[key] || key; + if (!rows[rowKey] && rows[key]) rowKey = key; if (!rows[rowKey]) continue; const prior = _stageTrackerCelebrating[rowKey] || {}; _stageTrackerTerminalFacts[key] = Object.assign({}, _stageTrackerTerminalFacts[key], {