From d5ca209acd8f3f7e375adf3681948f20b62ace3c Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Wed, 4 Nov 2026 14:58:27 -0500 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Activity=20Monitor:=20celebr?= =?UTF-8?q?ate=20externally=20merged=20PRs=20with=20bee=20+=20toast=20nami?= =?UTF-8?q?ng=20the=20merger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An approved PR merged by hand (gh pr merge --admin --squash) vanished from the tracker with no bee fly-off and no merge toast, while the hive's own merges celebrated. Root cause: recently_merged carried only audit pr_merged lines, which the hive writes synchronously for its own merges but which an external merge gets only after the PR poller's settle scan (minutes) โ€” the row was already gone. Worse, webhookItemHint for issue_comment/issues on a PR never read issue.pull_request.merged_at, so a bot comment seconds after the merge produced a closed-unmerged snapshot: the SPA toasted "closed" and deleted the PR's open observation, forfeiting the celebration for good. Fix: recently_merged is the union of audit lines and the merged ledger (webhook/closed-sweep merges by anyone), deduped, each carrying merged_by; issue hints read merged_at; a closed snapshot never outranks a merge in recently_closed. The SPA keeps a closed key comparable so a later merge still celebrates, and the banner head names the merger ("merged by @clubanderson" / "merged by ๐Ÿ hive"). Closed-not-merged keeps the quiet toast. Go + node tests cover both exits. Fixes #16658 Signed-off-by: Andrew Anderson --- .../fixed-merge-celebration-external.md | 1 + src/pkg/dashboard/merged_ledger.go | 35 +++++ src/pkg/dashboard/stage_tracker.go | 127 ++++++++++++------ src/pkg/dashboard/stage_tracker_cues_test.go | 4 + ...e_tracker_external_merge_celebrate_test.go | 74 ++++++++++ .../stage_tracker_external_merge_test.go | 79 +++++++++++ .../stage_tracker_recently_closed.go | 36 +++++ src/pkg/dashboard/static-src/css/tracker.css | 1 + .../dashboard/static-src/js/tracker-merged.js | 41 +++++- src/pkg/dashboard/static/index.html | 42 +++++- src/pkg/dashboard/webhook_tracker_refresh.go | 1 + src/pkg/github/webhook_cache.go | 22 ++- .../github/webhook_issue_pr_merged_test.go | 42 ++++++ 13 files changed, 458 insertions(+), 47 deletions(-) create mode 100644 changelog.d/fixed-merge-celebration-external.md create mode 100644 src/pkg/dashboard/stage_tracker_external_merge_celebrate_test.go create mode 100644 src/pkg/dashboard/stage_tracker_external_merge_test.go create mode 100644 src/pkg/github/webhook_issue_pr_merged_test.go diff --git a/changelog.d/fixed-merge-celebration-external.md b/changelog.d/fixed-merge-celebration-external.md new file mode 100644 index 0000000000..92c7d294bd --- /dev/null +++ b/changelog.d/fixed-merge-celebration-external.md @@ -0,0 +1 @@ +- Activity Monitor: a PR merged by anyone โ€” a maintainer's `gh pr merge --admin` as much as the hive's own sweep โ€” now leaves the board with the bee fly-off and a merge toast naming the merger (`#16644 merged by @clubanderson` / `merged by ๐Ÿ hive`); `recently_merged` is the union of the audit log and the merged ledger with `merged_by`, an `issue_comment` on a just-merged PR no longer reads as "closed", and a closed-not-merged exit keeps its quiet toast (hivecommons/hive#16658). diff --git a/src/pkg/dashboard/merged_ledger.go b/src/pkg/dashboard/merged_ledger.go index ba58583050..5d31e1f66a 100644 --- a/src/pkg/dashboard/merged_ledger.go +++ b/src/pkg/dashboard/merged_ledger.go @@ -397,6 +397,41 @@ func (l *MergedLedger) ClosedBy(repo string, issue, exclude int) int { return 0 } +// Since lists the entries merged at or after since and not after now +// (plus the minute of clock skew Summary allows), newest first. The stage +// tracker's recently_merged reads it so a merge GitHub reported โ€” by +// anyone โ€” is a terminal fact for the SPA as soon as the ledger has it. +func (l *MergedLedger) Since(since, now time.Time) []MergedLedgerEntry { + if l == nil { + return nil + } + l.mu.Lock() + defer l.mu.Unlock() + var out []MergedLedgerEntry + for i := len(l.entries) - 1; i >= 0; i-- { + e := l.entries[i] + if e.MergedAt.After(now.Add(time.Minute)) { + continue + } + if e.MergedAt.Before(since) { + break + } + out = append(out, e) + } + return out +} + +// Has reports whether the ledger lists repo#number as merged. +func (l *MergedLedger) Has(repo string, number int) bool { + if l == nil || number <= 0 { + return false + } + l.mu.Lock() + defer l.mu.Unlock() + _, ok := l.index[mergedLedgerKey(repo, number)] + return ok +} + // Len is the number of listed (unpruned) entries. func (l *MergedLedger) Len() int { l.mu.Lock() diff --git a/src/pkg/dashboard/stage_tracker.go b/src/pkg/dashboard/stage_tracker.go index e80b8b9a44..6e74c11f4f 100644 --- a/src/pkg/dashboard/stage_tracker.go +++ b/src/pkg/dashboard/stage_tracker.go @@ -77,13 +77,20 @@ type StageTrackerResponse struct { // Engine is the ADR-0025 central stage engine's mode and counters for // the tracker's status strip; absent when the hive has no engine. Engine *stageengine.Status `json:"engine,omitempty"` - // RecentlyMerged lists the pull requests the hive saw merge within - // stageTrackerMergedWindow, from the audit log's pr_merged entries - // (sweep, queue, relay and human merges observed by the PR poller - // alike). Items only ever lists open work, so a merged PR simply - // drops out of Items on the next build; this side list is what lets - // the SPA tell "merged" from "closed" between two polls and play its - // opt-in merge sound for the right rows. + // RecentlyMerged lists the pull requests GitHub reports merged within + // stageTrackerMergedWindow, whoever merged them: the audit log's + // pr_merged entries (the hive's own sweep, queue, relay and forge + // merges, written the instant the merge call returns, and the PR + // poller's observations of human merges) united with the merged + // ledger's entries over the same window (webhook `closed` deliveries + // and their confirming reads, the closed sweep). Items only ever lists + // open work, so a merged PR simply drops out of Items on the next + // build; this side list is the terminal snapshot that lets the SPA + // tell "merged" from "closed" between two polls and celebrate the + // right rows. Before hivecommons/hive#16658 it carried audit entries + // only, so a merge by a human (`gh pr merge`) reached it minutes + // after the row had left โ€” or never, when the PR poller's settle + // scan was behind โ€” and the row vanished in silence. RecentlyMerged []StageTrackerMerged `json:"recently_merged,omitempty"` // RecentlyClosed lists the pull requests that left Items closed but // not merged within stageTrackerMergedWindow โ€” superseded, withdrawn, @@ -127,6 +134,10 @@ type StageTrackerMerged struct { Repo string `json:"repo"` Number int `json:"number"` MergedAt time.Time `json:"merged_at"` + // MergedBy is MergedByHive when the hive performed the merge, else the + // merger's GitHub login; "" when not (yet) known. The SPA's merge + // toast reads it ("merged by ๐Ÿ hive" / "merged by @login"). + MergedBy string `json:"merged_by,omitempty"` } // StageTrackerClosed is one recently closed, unmerged pull request. @@ -177,54 +188,94 @@ func stageTrackerRepoQualifier(status *StatusPayload) func(string) string { } } -// stageTrackerRecentlyMerged reads the pr_merged audit entries newer than -// now-stageTrackerMergedWindow from the in-memory ring: newest first, one -// entry per (repo, number) after qualify has mapped short repo names onto -// the owner/name Items use. The ring holds auditRingCap entries and is the -// only source consulted โ€” a window this short never needs the on-disk log, -// and reading files on every tracker build would defeat its cache. +// stageTrackerRecentlyMerged lists the PRs merged within +// now-stageTrackerMergedWindow, by anyone: the pr_merged audit entries in +// the in-memory ring united with the merged ledger's entries over the same +// window, newest first, one entry per (repo, number) after qualify has +// mapped short repo names onto the owner/name Items use. The ring holds +// auditRingCap entries and is the only audit source consulted โ€” a window +// this short never needs the on-disk log, and reading files on every +// tracker build would defeat its cache. func (s *Server) stageTrackerRecentlyMerged(now time.Time, qualify func(string) string) []StageTrackerMerged { return s.stageTrackerMergedSince(now, stageTrackerMergedWindow, qualify) } // stageTrackerMergedSince is stageTrackerRecentlyMerged over any window. func (s *Server) stageTrackerMergedSince(now time.Time, window time.Duration, qualify func(string) string) []StageTrackerMerged { - if s == nil || s.audit == nil { + if s == nil { return nil } if qualify == nil { qualify = func(repo string) string { return repo } } - seen := map[string]bool{} + index := map[string]int{} var out []StageTrackerMerged - for _, e := range s.audit.RecentWithPrefixSince(now.Add(-window), github.AuditActionPRMerged) { - if e.Action != github.AuditActionPRMerged { - continue - } - repo, ok := collect.AuditEntryRepo(e) - if !ok { - continue - } - repo = qualify(repo) - number := e.Target - if number == 0 { - if m := stageTrackerAuditNumberRe.FindStringSubmatch(e.Detail); m != nil { - number, _ = strconv.Atoi(m[1]) + key := func(repo string, number int) string { return strings.ToLower(repo) + "#" + strconv.Itoa(number) } + // An audit entry whose short repo name no configured repo accounts for + // stays short, while the ledger qualified the same merge with the + // configured org: match the two on the short name so one merge is + // listed once. + short := func(repo string) string { return strings.ToLower(repo[strings.LastIndex(repo, "/")+1:]) } + shortIndex := map[string]int{} + // Audit entries first: the hive's own merge writes one the instant the + // merge call returns, so its merged_at is the sharpest. + if s.audit != nil { + for _, e := range s.audit.RecentWithPrefixSince(now.Add(-window), github.AuditActionPRMerged) { + if e.Action != github.AuditActionPRMerged { + continue + } + repo, ok := collect.AuditEntryRepo(e) + if !ok { + continue + } + repo = qualify(repo) + attrs := parseAuditDetailAttrs(e.Detail) + number := e.Target + if number == 0 { + if m := stageTrackerAuditNumberRe.FindStringSubmatch(e.Detail); m != nil { + number, _ = strconv.Atoi(m[1]) + } + } + if number <= 0 { + continue } + k := key(repo, number) + if i, dup := index[k]; dup { + if out[i].MergedBy == "" { + out[i].MergedBy = mergedByFromAudit(attrs) + } + continue + } + at, err := time.Parse(time.RFC3339, e.Timestamp) + if err != nil { + at = now + } + index[k] = len(out) + if !strings.Contains(repo, "/") { + shortIndex[key(short(repo), number)] = len(out) + } + out = append(out, StageTrackerMerged{Repo: repo, Number: number, MergedAt: at.UTC(), MergedBy: mergedByFromAudit(attrs)}) } - if number <= 0 { - continue + } + // Then the ledger: a merge GitHub reported through a webhook, its + // confirming read or the closed sweep, by whoever performed it, is a + // terminal fact for the SPA the moment the row leaves โ€” it must not + // wait for the PR poller's settle scan to write an audit line. + for _, e := range s.mergedLedger().Since(now.Add(-window), now) { + repo := qualify(e.Repo) + k := key(repo, e.Number) + i, dup := index[k] + if !dup { + i, dup = shortIndex[key(short(repo), e.Number)] } - key := repo + "#" + strconv.Itoa(number) - if seen[key] { + if dup { + if out[i].MergedBy == "" { + out[i].MergedBy = e.MergedBy + } continue } - seen[key] = true - at, err := time.Parse(time.RFC3339, e.Timestamp) - if err != nil { - at = now - } - out = append(out, StageTrackerMerged{Repo: repo, Number: number, MergedAt: at.UTC()}) + index[k] = len(out) + out = append(out, StageTrackerMerged{Repo: repo, Number: e.Number, MergedAt: e.MergedAt.UTC(), MergedBy: e.MergedBy}) } sort.SliceStable(out, func(i, j int) bool { if !out[i].MergedAt.Equal(out[j].MergedAt) { diff --git a/src/pkg/dashboard/stage_tracker_cues_test.go b/src/pkg/dashboard/stage_tracker_cues_test.go index d72141b601..83b3bd9511 100644 --- a/src/pkg/dashboard/stage_tracker_cues_test.go +++ b/src/pkg/dashboard/stage_tracker_cues_test.go @@ -43,6 +43,8 @@ func stageTrackerCuesJS(t *testing.T, html string) string { jsFunc(t, html, "stageTrackerPRTitles"), jsFunc(t, html, "stageTrackerMergedText"), jsFunc(t, html, "stageTrackerMergedByText"), + jsFunc(t, html, "stageTrackerMergerText"), + jsFunc(t, html, "stageTrackerMergedByOf"), jsFunc(t, html, "stageTrackerMergedPopHtml"), jsFunc(t, html, "stageTrackerPRKey"), "let _stageTrackerEvents = {}; var _stageTrackerPRTitle = {};", @@ -332,6 +334,8 @@ func stageTrackerCelebrateJS(t *testing.T, html string) string { jsFunc(t, html, "stageTrackerPRTitles"), jsFunc(t, html, "stageTrackerMergedText"), jsFunc(t, html, "stageTrackerMergedByText"), + jsFunc(t, html, "stageTrackerMergerText"), + jsFunc(t, html, "stageTrackerMergedByOf"), jsFunc(t, html, "stageTrackerMergedPopHtml"), jsFunc(t, html, "stageTrackerMergedSync"), jsFunc(t, html, "stageTrackerMergedHoldback"), diff --git a/src/pkg/dashboard/stage_tracker_external_merge_celebrate_test.go b/src/pkg/dashboard/stage_tracker_external_merge_celebrate_test.go new file mode 100644 index 0000000000..422be41221 --- /dev/null +++ b/src/pkg/dashboard/stage_tracker_external_merge_celebrate_test.go @@ -0,0 +1,74 @@ +package dashboard + +import ( + "strings" + "testing" +) + +// TestStageTrackerExternalMergeCelebrateNode (hivecommons/hive#16658): a +// row that leaves the payload is celebrated on any merged terminal fact, +// whoever merged it โ€” the hive's own sweep (bee + "merged by ๐Ÿ hive") and +// a maintainer's `gh pr merge --admin` (bee + "merged by @clubanderson") +// alike; a closed-not-merged exit draws only the quiet info toast; and a +// close the server later corrects to a merge still celebrates once. +func TestStageTrackerExternalMergeCelebrateNode(t *testing.T) { + html := indexHTML(t) + js := strings.Replace(stageTrackerCelebrateJS(t, html), stageTrackerMergingHoldOffJS, stageTrackerMergingHoldJS(t, html), 1) + runStageTrackerRowActionsScript(t, js+stageTrackerCelebrateFixture+` +const iso = ms => new Date(ms).toISOString(); +const srv = (all, today) => ({ all_time: all, today, total_7d: today, total_30d: today, recent: [], tz: 'UTC', day_start: iso(stageTrackerLocalMidnight(clock)) }); +const pr = (num, extra) => Object.assign({ repo: 'o/r', kind: 'pr', number: num, stage: 50, title: 'fix ' + num }, extra || {}); +const merged = (num, by) => ({ repo: 'o/r', number: num, merged_at: iso(clock), merged_by: by }); +const poll = d => { _stageTracker = d; stageTrackerNoteMerges(d); }; +const lastBanner = () => banners.children[banners.children.length - 1].innerHTML; +// Banners time out across the ticks below, so count the ones made, not the ones still up. +let made = 0; const _banner = stageTrackerMergeBanner; stageTrackerMergeBanner = (...a) => { made++; return _banner(...a); }; +panel.appendChild(row('o/r/pr#16644')); panel.appendChild(row('o/r/pr#16645')); panel.appendChild(row('o/r/pr#16646')); panel.appendChild(row('o/r/pr#16647')); +poll({ items: [pr(16644), pr(16645), pr(16646), pr(16647)], merged: srv(10, 1) }); +// #16645: the hive's own merge โ†’ bee + banner naming the hive. +tick(10000); +poll({ items: [pr(16644), pr(16646), pr(16647)], recently_merged: [merged(16645, 'hive')], merged: srv(11, 2) }); +tick(0); +assert.strictEqual(made, 1, 'hive merge: one banner'); +assert.ok(lastBanner().includes('#16645 merged by ๐Ÿ hive'), lastBanner()); +assert.strictEqual(flights().length, 1, 'hive merge: one bee'); +flights()[0]._ev.animationend(); +// #16644: merged by hand (gh pr merge --admin --squash), no audit line +// yet โ€” recently_merged carries it from the ledger with the merger โ†’ the +// same bee + banner, naming @clubanderson. +tick(10000); +poll({ items: [pr(16646), pr(16647)], recently_merged: [merged(16644, 'clubanderson'), merged(16645, 'hive')], merged: srv(12, 3) }); +tick(0); +assert.strictEqual(made, 2, 'external merge: one banner'); +assert.ok(lastBanner().includes('#16644 merged by @clubanderson'), lastBanner()); +assert.strictEqual(flights().length, 1, 'external merge: one bee'); +assert.deepStrictEqual(toasts, [], 'a merge is never a closed toast'); +flights()[0]._ev.animationend(); +// #16646: closed, not merged โ†’ one quiet info toast, no bee, no banner. +tick(10000); +poll({ items: [pr(16647)], recently_closed: [{ repo: 'o/r', number: 16646, closed_at: iso(clock) }], recently_merged: [merged(16644, 'clubanderson'), merged(16645, 'hive')], merged: srv(12, 3) }); +tick(0); +assert.deepStrictEqual(toasts, [['info', '#16646 closed ยท closed without merging']]); +assert.strictEqual(made, 2, 'no banner for a close'); assert.strictEqual(flights().length, 0, 'no bee for a close'); +// #16647: a bot's comment on the just-merged PR read as "closed" first; +// the next poll carries the merge โ†’ the celebration still fires, once. +tick(10000); +poll({ items: [], recently_closed: [{ repo: 'o/r', number: 16647, closed_at: iso(clock) }], recently_merged: [merged(16644, 'clubanderson'), merged(16645, 'hive')], merged: srv(12, 3) }); +tick(0); +assert.strictEqual(toasts.length, 2); assert.strictEqual(toasts[1][1], '#16647 closed ยท closed without merging'); +assert.strictEqual(made, 2); assert.strictEqual(flights().length, 0); +tick(10000); +poll({ items: [], recently_merged: [merged(16647, 'clubanderson'), merged(16644, 'clubanderson'), merged(16645, 'hive')], merged: srv(13, 4) }); +tick(0); +assert.strictEqual(made, 3, 'a close corrected to a merge celebrates'); +assert.ok(lastBanner().includes('#16647 merged by @clubanderson'), lastBanner()); +assert.strictEqual(flights().length, 1); +flights()[0]._ev.animationend(); +tick(10000); +poll({ items: [], recently_merged: [merged(16647, 'clubanderson'), merged(16644, 'clubanderson'), merged(16645, 'hive')], merged: srv(13, 4) }); +tick(0); +assert.strictEqual(made, 3, 'never twice'); assert.strictEqual(flights().length, 0); +assert.strictEqual(toasts.length, 2); +console.log('ok'); +`) +} diff --git a/src/pkg/dashboard/stage_tracker_external_merge_test.go b/src/pkg/dashboard/stage_tracker_external_merge_test.go new file mode 100644 index 0000000000..5b63afe0ab --- /dev/null +++ b/src/pkg/dashboard/stage_tracker_external_merge_test.go @@ -0,0 +1,79 @@ +package dashboard + +import ( + "testing" + "time" + + "github.com/hivecommons/hive/pkg/github" +) + +// TestStageTrackerRecentlyMergedAnyMerger (hivecommons/hive#16658): +// recently_merged is the union of the audit's pr_merged lines and the +// merged ledger, each naming the merger โ€” so a PR a maintainer merged by +// hand (`gh pr merge --admin`), which reaches the ledger through the +// webhook's closed read long before the PR poller writes an audit line, +// is a terminal fact for the SPA the moment its row leaves. One merge +// known to both sources is listed once, newest first. +func TestStageTrackerRecentlyMergedAnyMerger(t *testing.T) { + now := time.Date(2026, 10, 20, 21, 0, 0, 0, time.UTC) + s, store := stageTrackerFixture(t, now) + ts := func(d time.Duration) string { return now.Add(-d).UTC().Format(time.RFC3339) } + + s.audit.LogRecordAt(ts(3*time.Minute), "system", github.AuditActionPRMerged, "method=squash, path=sweep", "governor", "acme/console", 16645) + s.recordMergedSnapshots([]github.WebhookItemSnapshot{ + {Repo: "acme/console", Number: 16644, IsPR: true, State: "closed", Merged: true, MergedAt: now.Add(-time.Minute), MergedBy: "clubanderson"}, + {Repo: "acme/console", Number: 16645, IsPR: true, State: "closed", Merged: true, MergedAt: now.Add(-3 * time.Minute), MergedBy: "hive-bot", MergedByHive: true}, + {Repo: "acme/console", Number: 16600, IsPR: true, State: "closed", Merged: true, MergedAt: now.Add(-stageTrackerMergedWindow - time.Minute), MergedBy: "alice"}, + {Repo: "acme/console", Number: 16646, IsPR: true, State: "closed", Merged: false, UpdatedAt: now.Add(-time.Minute)}, + }) + + got := s.buildStageTracker(s.status, store, now).RecentlyMerged + want := []StageTrackerMerged{ + {Repo: "acme/console", Number: 16644, MergedAt: now.Add(-time.Minute), MergedBy: "clubanderson"}, + {Repo: "acme/console", Number: 16645, MergedAt: now.Add(-3 * time.Minute), MergedBy: MergedByHive}, + } + if len(got) != len(want) { + t.Fatalf("recently_merged = %+v, want %+v", got, want) + } + for i := range want { + if got[i].Repo != want[i].Repo || got[i].Number != want[i].Number || !got[i].MergedAt.Equal(want[i].MergedAt) || got[i].MergedBy != want[i].MergedBy { + t.Fatalf("recently_merged[%d] = %+v, want %+v", i, got[i], want[i]) + } + } +} + +// TestStageTrackerClosedSnapshotNeverOutranksMerge (hivecommons/hive#16658): +// a closed-but-not-merged snapshot for a PR the ledger holds as merged +// (an issue_comment hint cannot tell the two apart) is not listed in +// recently_closed, and a later merged snapshot for a PR already listed +// there withdraws it โ€” "closed" is never the SPA's final word on a merge. +func TestStageTrackerClosedSnapshotNeverOutranksMerge(t *testing.T) { + s := &Server{} + now := time.Now() + closed := func(n int) github.WebhookItemSnapshot { + return github.WebhookItemSnapshot{Repo: "o/r", Number: n, IsPR: true, State: "closed", UpdatedAt: now} + } + merged := func(n int, by string) github.WebhookItemSnapshot { + return github.WebhookItemSnapshot{Repo: "o/r", Number: n, IsPR: true, State: "closed", Merged: true, MergedAt: now, MergedBy: by} + } + // Merge known first: the closed read is ignored. + s.recordMergedSnapshots([]github.WebhookItemSnapshot{merged(16644, "clubanderson")}) + s.noteClosedSnapshots([]github.WebhookItemSnapshot{closed(16644), closed(16646)}) + if got := s.stageTrackerRecentlyClosed(now); len(got) != 1 || got[0].Number != 16646 { + t.Fatalf("recently closed = %+v, want [16646]", got) + } + // Closed read first, merge after: the entry is withdrawn. + s.noteClosedSnapshots([]github.WebhookItemSnapshot{closed(16647)}) + if got := s.stageTrackerRecentlyClosed(now); len(got) != 2 { + t.Fatalf("recently closed = %+v, want 16647 and 16646", got) + } + snaps := []github.WebhookItemSnapshot{merged(16647, "clubanderson")} + s.recordMergedSnapshots(snaps) + s.forgetClosedSnapshots(snaps) + if got := s.stageTrackerRecentlyClosed(now); len(got) != 1 || got[0].Number != 16646 { + t.Fatalf("recently closed after the merge = %+v, want [16646]", got) + } + if !s.mergedLedger().Has("o/r", 16647) || s.mergedLedger().Has("o/r", 16646) { + t.Fatal("ledger: want 16647 merged and 16646 not") + } +} diff --git a/src/pkg/dashboard/stage_tracker_recently_closed.go b/src/pkg/dashboard/stage_tracker_recently_closed.go index a74ba1e5ef..bc116ea952 100644 --- a/src/pkg/dashboard/stage_tracker_recently_closed.go +++ b/src/pkg/dashboard/stage_tracker_recently_closed.go @@ -29,6 +29,7 @@ func (s *Server) noteClosedSnapshots(snaps []github.WebhookItemSnapshot) { } now := time.Now() qualify := s.mergedRepoQualifier() + ledger := s.mergedLedger() s.recentlyClosedMu.Lock() defer s.recentlyClosedMu.Unlock() for _, snap := range snaps { @@ -36,6 +37,12 @@ func (s *Server) noteClosedSnapshots(snaps []github.WebhookItemSnapshot) { continue } repo := qualify(snap.Repo) + // A snapshot that cannot tell merged from closed (a hint from a + // delivery without the PR object) must not contradict a merge the + // ledger already holds: "closed" would be the SPA's final word. + if ledger.Has(repo, snap.Number) { + continue + } at := snap.UpdatedAt if at.IsZero() || at.After(now) { at = now @@ -55,6 +62,35 @@ func (s *Server) noteClosedSnapshots(snaps []github.WebhookItemSnapshot) { s.pruneRecentlyClosedLocked(now) } +// forgetClosedSnapshots drops from the list every PR snaps now report +// merged: an earlier closed-unmerged read was wrong (or arrived before the +// merge fact), and the SPA must see the merge, not the close. +func (s *Server) forgetClosedSnapshots(snaps []github.WebhookItemSnapshot) { + if s == nil || len(snaps) == 0 { + return + } + qualify := s.mergedRepoQualifier() + s.recentlyClosedMu.Lock() + defer s.recentlyClosedMu.Unlock() + if len(s.recentlyClosed) == 0 { + return + } + for _, snap := range snaps { + if !snap.IsPR || !snap.Merged || snap.Number <= 0 || snap.Repo == "" { + continue + } + repo := qualify(snap.Repo) + kept := s.recentlyClosed[:0] + for _, e := range s.recentlyClosed { + if e.Number == snap.Number && strings.EqualFold(e.Repo, repo) { + continue + } + kept = append(kept, e) + } + s.recentlyClosed = kept + } +} + // pruneRecentlyClosedLocked drops entries older than the window and, past // the cap, the oldest. Caller holds recentlyClosedMu. func (s *Server) pruneRecentlyClosedLocked(now time.Time) { diff --git a/src/pkg/dashboard/static-src/css/tracker.css b/src/pkg/dashboard/static-src/css/tracker.css index a6317f1688..014768ca26 100644 --- a/src/pkg/dashboard/static-src/css/tracker.css +++ b/src/pkg/dashboard/static-src/css/tracker.css @@ -722,6 +722,7 @@ .merge-banner-ico { color: var(--green); font-weight: var(--fw-bold); } .merge-banner-head { font-weight: var(--fw-semibold); } .merge-banner-head .merge-banner-num { color: var(--amber); font-variant-numeric: tabular-nums; } + .merge-banner-head .merge-banner-by { font-weight: 500; } .merge-banner-text { margin-top: var(--sp-1); color: var(--muted); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .merge-banner-links { margin-top: var(--sp-2); display: flex; gap: var(--sp-4); font-size: var(--fs-xs); } .merge-banner-links button, .merge-banner-links a { border: 0; padding: 0; background: transparent; color: var(--accent); cursor: pointer; font: inherit; text-decoration: none; } diff --git a/src/pkg/dashboard/static-src/js/tracker-merged.js b/src/pkg/dashboard/static-src/js/tracker-merged.js index c0343bf2a9..ad841187e6 100644 --- a/src/pkg/dashboard/static-src/js/tracker-merged.js +++ b/src/pkg/dashboard/static-src/js/tracker-merged.js @@ -116,7 +116,11 @@ // no count โ€” instead of letting the row vanish in silence. const closed = stageTrackerNewlyClosed(d, _stageTrackerMergeState, next, _stageTrackerPRItems, _stageTrackerClosedNoted); const closedItems = closed.map(k => prevItems[k] || _stageTrackerPRLast[k]); - closed.forEach(k => { _stageTrackerClosedNoted[k] = true; delete next[k]; delete _stageTrackerPRLast[k]; }); + // The closed key stays comparable (false), not deleted: a close the + // server later corrects to a merge โ€” a bot's comment on a just-merged + // PR read as "closed" before the merge fact landed โ€” still flips + // false โ†’ true and celebrates (hivecommons/hive#16658). + closed.forEach(k => { _stageTrackerClosedNoted[k] = true; delete _stageTrackerPRLast[k]; }); _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)); @@ -484,6 +488,30 @@ if (!by) return ''; return by === 'hive' ? 'by hive' : 'by @' + by; } + // Pure: the merger as the merge toast's head names them โ€” "๐Ÿ hive" + // for the hive's own merge, "@login" for anyone else, '' unknown. + function stageTrackerMergerText(by) { + by = String(by || '').trim(); + if (!by) return ''; + return by === 'hive' ? '๐Ÿ hive' : '@' + by; + } + // Pure: who merged the PR at key, from the payload's terminal facts โ€” + // recently_merged (audit + ledger, any merger) and the ledger's recent + // list โ€” then the terminal fact this tab already holds. '' unknown. + function stageTrackerMergedByOf(key, d) { + const n = Number(String(key || '').slice(String(key || '').lastIndexOf('/pr#') + 4)) || 0; + const repo = String(key || '').slice(0, String(key || '').lastIndexOf('/pr#')).toLowerCase(); + if (!n || !repo) return ''; + const short = repo.slice(repo.lastIndexOf('/') + 1); + 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)) { + if (!m || Number(m.number) !== n || !m.merged_by) continue; + const r = String(m.repo || '').toLowerCase(); + if (r === repo || (r.indexOf('/') < 0 && r === short)) return String(m.merged_by).trim(); + } + const fact = typeof _stageTrackerTerminalFacts !== 'undefined' && _stageTrackerTerminalFacts ? _stageTrackerTerminalFacts[key] : null; + return fact && fact.merged_by ? String(fact.merged_by).trim() : ''; + } // Pure: the popover's inner HTML. function stageTrackerMergedPopHtml(txt, nowMs) { const fmtAt = at => { if (!at) return ''; const d = new Date(at); const sameDay = stageTrackerLocalMidnight(at) === stageTrackerLocalMidnight(nowMs); const hm = `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`; return sameDay ? hm : `${typeof formatDashboardDate === 'function' ? formatDashboardDate(d, { month: 'short', day: 'numeric' }) : d.toISOString().slice(5, 10)} ${hm}`; }; @@ -996,7 +1024,7 @@ 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, merged_by: fact && fact.merged_by }); + if (row) celebrateRow(row, { kind: 'merged', key, number, merged_by: (fact && fact.merged_by) || stageTrackerMergedByOf(key, typeof _stageTracker !== 'undefined' ? _stageTracker : null) }); else celebrateDetached(key, banner); }, i * STAGE_TRACKER_CELEBRATE_STAGGER_MS); }); @@ -1148,13 +1176,17 @@ const url = String(b.url || (b.pr && b.pr.url) || '').match(/^https:\/\/github\.com\/([^/]+\/[^/]+)\/pull\/\d+(?:[?#].*)?$/); return url ? url[1] : repo; } + // The head names the merger whoever they are โ€” "#16644 merged by + // @clubanderson", "#16645 merged by ๐Ÿ hive" โ€” a merge by hand is + // celebrated exactly like the hive's own (hivecommons/hive#16658). function stageTrackerMergeBannerText(b, nowMs) { const d = new Date(b.at || nowMs); const hm = `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`; const who = stageTrackerMergedByText(b.merged_by); + const merger = stageTrackerMergerText(b.merged_by); const paren = [b.lane || '', who, hm].filter(Boolean).join(', '); const num = stageTrackerMergeBannerNumber(b); - return { number: num, head: `${num ? '#' + num + ' ' : ''}merged${b.preview ? ' (test)' : ''}`, text: `${b.title || b.repo || ''}${paren ? ' (' + paren + ')' : ''}`.trim() }; + return { number: num, merger, head: `${num ? '#' + num + ' ' : ''}merged${merger ? ' by ' + merger : ''}${b.preview ? ' (test)' : ''}`, text: `${b.title || b.repo || ''}${paren ? ' (' + paren + ')' : ''}`.trim() }; } // Stateful: a persistent banner, bottom right, for one merge โ€” stays // until dismissed or stageTrackerMergeBannerMs() (twice the info toast @@ -1170,6 +1202,7 @@ const repo = stageTrackerMergeBannerRepo(b); const recent = repo ? ((_stageTrackerMerged.server && _stageTrackerMerged.server.recent) || []).find(e => stageTrackerMergeBannerRepo(e).toLowerCase() === repo.toLowerCase() && stageTrackerMergeBannerNumber(e) === stageTrackerMergeBannerNumber(b)) : null; const info = Object.assign({ title: _stageTrackerPRTitle[b.key] || '', merged_by: '', lane: '', url: '' }, recent || {}, b, { repo }); + if (!info.merged_by && !b.preview) info.merged_by = stageTrackerMergedByOf(b.key, typeof _stageTracker !== 'undefined' ? _stageTracker : null); const num = stageTrackerMergeBannerNumber(info); const repoChip = stageTrackerRepoChipHtml(repo, { repoChips: { primary: stageTrackerPrimaryRepo(), active: _stageTrackerFilter.repo } }); // A live merge the ledger has not listed yet still links: the key carries owner/name. @@ -1179,7 +1212,7 @@ el.className = 'merge-banner'; el.setAttribute('role', 'status'); if (b.rowKey) el.setAttribute('data-ham-row', b.rowKey); - el.innerHTML = `
${repoChip ? repoChip + ' ' : ''}${num ? `#${esc(num)} ` : ''}merged${info.preview ? ' (test)' : ''}
${esc(t.text)}
`; + el.innerHTML = `
${repoChip ? repoChip + ' ' : ''}${num ? `#${esc(num)} ` : ''}merged${t.merger ? ` by ${esc(t.merger)}` : ''}${info.preview ? ' (test)' : ''}
${esc(t.text)}
`; box.appendChild(el); while (box.children.length > STAGE_TRACKER_MERGE_BANNER_MAX) { toastCountdownCancel(box.children[0]); box.children[0].remove(); } toastCountdownBar(el, stageTrackerMergeBannerMs(), () => stageTrackerMergeBannerDismiss(el)); diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index fc37d9d95e..f3aa9ca177 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -2062,6 +2062,7 @@ .merge-banner-ico { color: var(--green); font-weight: var(--fw-bold); } .merge-banner-head { font-weight: var(--fw-semibold); } .merge-banner-head .merge-banner-num { color: var(--amber); font-variant-numeric: tabular-nums; } + .merge-banner-head .merge-banner-by { font-weight: 500; } .merge-banner-text { margin-top: var(--sp-1); color: var(--muted); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .merge-banner-links { margin-top: var(--sp-2); display: flex; gap: var(--sp-4); font-size: var(--fs-xs); } .merge-banner-links button, .merge-banner-links a { border: 0; padding: 0; background: transparent; color: var(--accent); cursor: pointer; font: inherit; text-decoration: none; } @@ -25043,7 +25044,11 @@

All labels

// no count โ€” instead of letting the row vanish in silence. const closed = stageTrackerNewlyClosed(d, _stageTrackerMergeState, next, _stageTrackerPRItems, _stageTrackerClosedNoted); const closedItems = closed.map(k => prevItems[k] || _stageTrackerPRLast[k]); - closed.forEach(k => { _stageTrackerClosedNoted[k] = true; delete next[k]; delete _stageTrackerPRLast[k]; }); + // The closed key stays comparable (false), not deleted: a close the + // server later corrects to a merge โ€” a bot's comment on a just-merged + // PR read as "closed" before the merge fact landed โ€” still flips + // false โ†’ true and celebrates (hivecommons/hive#16658). + closed.forEach(k => { _stageTrackerClosedNoted[k] = true; delete _stageTrackerPRLast[k]; }); _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)); @@ -25411,6 +25416,30 @@

All labels

if (!by) return ''; return by === 'hive' ? 'by hive' : 'by @' + by; } + // Pure: the merger as the merge toast's head names them โ€” "๐Ÿ hive" + // for the hive's own merge, "@login" for anyone else, '' unknown. + function stageTrackerMergerText(by) { + by = String(by || '').trim(); + if (!by) return ''; + return by === 'hive' ? '๐Ÿ hive' : '@' + by; + } + // Pure: who merged the PR at key, from the payload's terminal facts โ€” + // recently_merged (audit + ledger, any merger) and the ledger's recent + // list โ€” then the terminal fact this tab already holds. '' unknown. + function stageTrackerMergedByOf(key, d) { + const n = Number(String(key || '').slice(String(key || '').lastIndexOf('/pr#') + 4)) || 0; + const repo = String(key || '').slice(0, String(key || '').lastIndexOf('/pr#')).toLowerCase(); + if (!n || !repo) return ''; + const short = repo.slice(repo.lastIndexOf('/') + 1); + 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)) { + if (!m || Number(m.number) !== n || !m.merged_by) continue; + const r = String(m.repo || '').toLowerCase(); + if (r === repo || (r.indexOf('/') < 0 && r === short)) return String(m.merged_by).trim(); + } + const fact = typeof _stageTrackerTerminalFacts !== 'undefined' && _stageTrackerTerminalFacts ? _stageTrackerTerminalFacts[key] : null; + return fact && fact.merged_by ? String(fact.merged_by).trim() : ''; + } // Pure: the popover's inner HTML. function stageTrackerMergedPopHtml(txt, nowMs) { const fmtAt = at => { if (!at) return ''; const d = new Date(at); const sameDay = stageTrackerLocalMidnight(at) === stageTrackerLocalMidnight(nowMs); const hm = `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`; return sameDay ? hm : `${typeof formatDashboardDate === 'function' ? formatDashboardDate(d, { month: 'short', day: 'numeric' }) : d.toISOString().slice(5, 10)} ${hm}`; }; @@ -25923,7 +25952,7 @@

All labels

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, merged_by: fact && fact.merged_by }); + if (row) celebrateRow(row, { kind: 'merged', key, number, merged_by: (fact && fact.merged_by) || stageTrackerMergedByOf(key, typeof _stageTracker !== 'undefined' ? _stageTracker : null) }); else celebrateDetached(key, banner); }, i * STAGE_TRACKER_CELEBRATE_STAGGER_MS); }); @@ -26075,13 +26104,17 @@

All labels

const url = String(b.url || (b.pr && b.pr.url) || '').match(/^https:\/\/github\.com\/([^/]+\/[^/]+)\/pull\/\d+(?:[?#].*)?$/); return url ? url[1] : repo; } + // The head names the merger whoever they are โ€” "#16644 merged by + // @clubanderson", "#16645 merged by ๐Ÿ hive" โ€” a merge by hand is + // celebrated exactly like the hive's own (hivecommons/hive#16658). function stageTrackerMergeBannerText(b, nowMs) { const d = new Date(b.at || nowMs); const hm = `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`; const who = stageTrackerMergedByText(b.merged_by); + const merger = stageTrackerMergerText(b.merged_by); const paren = [b.lane || '', who, hm].filter(Boolean).join(', '); const num = stageTrackerMergeBannerNumber(b); - return { number: num, head: `${num ? '#' + num + ' ' : ''}merged${b.preview ? ' (test)' : ''}`, text: `${b.title || b.repo || ''}${paren ? ' (' + paren + ')' : ''}`.trim() }; + return { number: num, merger, head: `${num ? '#' + num + ' ' : ''}merged${merger ? ' by ' + merger : ''}${b.preview ? ' (test)' : ''}`, text: `${b.title || b.repo || ''}${paren ? ' (' + paren + ')' : ''}`.trim() }; } // Stateful: a persistent banner, bottom right, for one merge โ€” stays // until dismissed or stageTrackerMergeBannerMs() (twice the info toast @@ -26097,6 +26130,7 @@

All labels

const repo = stageTrackerMergeBannerRepo(b); const recent = repo ? ((_stageTrackerMerged.server && _stageTrackerMerged.server.recent) || []).find(e => stageTrackerMergeBannerRepo(e).toLowerCase() === repo.toLowerCase() && stageTrackerMergeBannerNumber(e) === stageTrackerMergeBannerNumber(b)) : null; const info = Object.assign({ title: _stageTrackerPRTitle[b.key] || '', merged_by: '', lane: '', url: '' }, recent || {}, b, { repo }); + if (!info.merged_by && !b.preview) info.merged_by = stageTrackerMergedByOf(b.key, typeof _stageTracker !== 'undefined' ? _stageTracker : null); const num = stageTrackerMergeBannerNumber(info); const repoChip = stageTrackerRepoChipHtml(repo, { repoChips: { primary: stageTrackerPrimaryRepo(), active: _stageTrackerFilter.repo } }); // A live merge the ledger has not listed yet still links: the key carries owner/name. @@ -26106,7 +26140,7 @@

All labels

el.className = 'merge-banner'; el.setAttribute('role', 'status'); if (b.rowKey) el.setAttribute('data-ham-row', b.rowKey); - el.innerHTML = `
${repoChip ? repoChip + ' ' : ''}${num ? `#${esc(num)} ` : ''}merged${info.preview ? ' (test)' : ''}
${esc(t.text)}
`; + el.innerHTML = `
${repoChip ? repoChip + ' ' : ''}${num ? `#${esc(num)} ` : ''}merged${t.merger ? ` by ${esc(t.merger)}` : ''}${info.preview ? ' (test)' : ''}
${esc(t.text)}
`; box.appendChild(el); while (box.children.length > STAGE_TRACKER_MERGE_BANNER_MAX) { toastCountdownCancel(box.children[0]); box.children[0].remove(); } toastCountdownBar(el, stageTrackerMergeBannerMs(), () => stageTrackerMergeBannerDismiss(el)); diff --git a/src/pkg/dashboard/webhook_tracker_refresh.go b/src/pkg/dashboard/webhook_tracker_refresh.go index c7a6e4db62..45be82106a 100644 --- a/src/pkg/dashboard/webhook_tracker_refresh.go +++ b/src/pkg/dashboard/webhook_tracker_refresh.go @@ -397,6 +397,7 @@ func (s *Server) applyWebhookItemSnapshots(snaps []github.WebhookItemSnapshot) i return 0 } s.recordMergedSnapshots(snaps) + s.forgetClosedSnapshots(snaps) s.noteClosedSnapshots(snaps) s.notePushedSnapshots(snaps) if s.deps != nil && s.deps.ApplyWebhookItems != nil { diff --git a/src/pkg/github/webhook_cache.go b/src/pkg/github/webhook_cache.go index 0c8d18ae94..5835d8137d 100644 --- a/src/pkg/github/webhook_cache.go +++ b/src/pkg/github/webhook_cache.go @@ -704,6 +704,25 @@ func webhookIssueDirtyTarget(event string, p webhookEventPayload) (int, bool) { return 0, false } +// webhookIssuePullRequestMerged reads the merge instant the `issue` object +// of an `issues` / `issue_comment` delivery carries for a pull request +// (`issue.pull_request.merged_at`). A bot's comment on a PR that just +// merged used to produce a closed-but-not-merged snapshot โ€” the tracker +// then listed the merged PR in recently_closed and the SPA said "closed", +// forfeiting the merge celebration (hivecommons/hive#16658). +func webhookIssuePullRequestMerged(raw *json.RawMessage) bool { + if raw == nil || len(*raw) == 0 { + return false + } + var pr struct { + MergedAt *time.Time `json:"merged_at"` + } + if err := json.Unmarshal(*raw, &pr); err != nil { + return false + } + return pr.MergedAt != nil && !pr.MergedAt.IsZero() +} + // webhookItemHint is the payload's state for the issue or pull request an // `issues`, `issue_comment` or `pull_request*` delivery embeds; nil when the // event carries neither object. @@ -723,7 +742,8 @@ func webhookItemHint(event string, p webhookEventPayload) *WebhookItemHint { if p.Issue == nil || p.Issue.Number <= 0 { return nil } - h := &WebhookItemHint{Number: p.Issue.Number, IsPR: p.Issue.PullRequest != nil, State: p.Issue.State} + h := &WebhookItemHint{Number: p.Issue.Number, IsPR: p.Issue.PullRequest != nil, State: p.Issue.State, + Merged: webhookIssuePullRequestMerged(p.Issue.PullRequest)} if p.Issue.UpdatedAt != nil { h.UpdatedAt = *p.Issue.UpdatedAt } diff --git a/src/pkg/github/webhook_issue_pr_merged_test.go b/src/pkg/github/webhook_issue_pr_merged_test.go new file mode 100644 index 0000000000..660e4a9dfa --- /dev/null +++ b/src/pkg/github/webhook_issue_pr_merged_test.go @@ -0,0 +1,42 @@ +package github + +import ( + "encoding/json" + "testing" + "time" +) + +// TestWebhookItemHintIssueCommentOnMergedPR (hivecommons/hive#16658): +// an issues / issue_comment delivery on a pull request reads the merge +// from issue.pull_request.merged_at, so a bot's comment on a PR that just +// merged is a merged hint, not a closed-unmerged one; an open PR's null +// merged_at and a plain issue stay unmerged. +func TestWebhookItemHintIssueCommentOnMergedPR(t *testing.T) { + at := time.Date(2026, 10, 20, 19, 35, 26, 0, time.UTC) + for _, tc := range []struct { + name string + body string + isPR bool + merged bool + }{ + {"merged PR", `{"issue":{"number":16644,"state":"closed","pull_request":{"url":"u","merged_at":"2026-10-20T19:35:26Z"}}}`, true, true}, + {"open PR", `{"issue":{"number":16644,"state":"open","pull_request":{"url":"u","merged_at":null}}}`, true, false}, + {"closed unmerged PR", `{"issue":{"number":16644,"state":"closed","pull_request":{"url":"u"}}}`, true, false}, + {"issue", `{"issue":{"number":16644,"state":"closed"}}`, false, false}, + } { + var p webhookEventPayload + if err := json.Unmarshal([]byte(tc.body), &p); err != nil { + t.Fatal(err) + } + for _, event := range []string{"issue_comment", "issues"} { + h := webhookItemHint(event, p) + if h == nil || h.Number != 16644 || h.IsPR != tc.isPR || h.Merged != tc.merged { + t.Errorf("%s/%s: hint = %+v, want is_pr=%v merged=%v", tc.name, event, h, tc.isPR, tc.merged) + } + } + } + raw := json.RawMessage(`{"merged_at":"` + at.Format(time.RFC3339) + `"}`) + if !webhookIssuePullRequestMerged(&raw) || webhookIssuePullRequestMerged(nil) { + t.Fatal("webhookIssuePullRequestMerged: want true for a merge instant, false for no object") + } +} From daf78241e663eac25f68a088728676e947fc495b Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Wed, 4 Nov 2026 17:09:01 -0500 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20Activity=20Monitor:=20lift?= =?UTF-8?q?=20merger=20helpers=20into=20the=20merge-banner=20node=20harnes?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The countdown harness lifts stageTrackerMergeBanner out of index.html by regex but did not lift the new stageTrackerMergerText/stageTrackerMergedByOf it now calls, so runtime-tests failed with ReferenceError. Lift them, and add unit cases for the merger text (@login / ๐Ÿ hive) and repo-scoped merged_by resolution. Fixes #16658 Signed-off-by: Andrew Anderson --- ...age_tracker_merge_banner_countdown.test.js | 47 ++++++++++++++++++- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/src/pkg/dashboard/stage_tracker_merge_banner_countdown.test.js b/src/pkg/dashboard/stage_tracker_merge_banner_countdown.test.js index 5658259db6..1106c04d96 100644 --- a/src/pkg/dashboard/stage_tracker_merge_banner_countdown.test.js +++ b/src/pkg/dashboard/stage_tracker_merge_banner_countdown.test.js @@ -74,15 +74,17 @@ const src = [ pick(/function stageTrackerIsPrimary\(repo, primary\) \{[\s\S]*?\n \}\n/, 'stageTrackerIsPrimary'), pick(/function stageTrackerRepoChipHtml\(repo, ctx\) \{[\s\S]*?\n \}\n/, 'stageTrackerRepoChipHtml'), pick(/function stageTrackerPrimaryRepo\(\) \{[^\n]*\n/, 'stageTrackerPrimaryRepo'), + pick(/function stageTrackerMergerText\(by\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergerText'), + pick(/function stageTrackerMergedByOf\(key, d\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergedByOf'), pick(/function stageTrackerMergeBannerText\(b, nowMs\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergeBannerText'), pick(/function stageTrackerMergeBanner\(b\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergeBanner'), pick(/function stageTrackerMergeBannerDismiss\(el\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergeBannerDismiss'), pick(/function hamBannerDismiss\(btn\) \{[\s\S]*?\n \}\n/, 'hamBannerDismiss'), ].join('\n'); -function load() { +function load(tracker) { const dom = makeDom(); - const api = new Function('document', 'setTimeout', 'clearTimeout', src + '; return { banner: stageTrackerMergeBanner, dismiss: stageTrackerMergeBannerDismiss, hamBannerDismiss, merged: _stageTrackerMerged, filter: _stageTrackerFilter, chip: stageTrackerRepoChipHtml };')(dom.document, dom.setTimeout, dom.clearTimeout); + const api = new Function('document', 'setTimeout', 'clearTimeout', '_stageTracker', src + '; return { banner: stageTrackerMergeBanner, dismiss: stageTrackerMergeBannerDismiss, hamBannerDismiss, merged: _stageTrackerMerged, filter: _stageTrackerFilter, chip: stageTrackerRepoChipHtml, mergerText: stageTrackerMergerText, mergedByOf: stageTrackerMergedByOf, bannerText: stageTrackerMergeBannerText };')(dom.document, dom.setTimeout, dom.clearTimeout, tracker || null); return Object.assign(dom, api); } @@ -198,3 +200,44 @@ test('merge repo chips use the existing escaping and preview behavior', () => { assert.ok(!el.innerHTML.includes('Open on GitHub'), 'preview does not invent a GitHub URL'); assert.ok(el.innerHTML.includes('(test)')); }); + +// hivecommons/hive#16658: a PR merged by anyone celebrates, and the head +// names the merger โ€” "merged by @login" for a human, "merged by ๐Ÿ hive" +// for the hive's own merge โ€” so an external merge reads like the hive's. +test('#16658: merger text names a human by @login and the hive by ๐Ÿ', () => { + const d = load(); + assert.strictEqual(d.mergerText('clubanderson'), '@clubanderson'); + assert.strictEqual(d.mergerText('hive'), '๐Ÿ hive'); + assert.strictEqual(d.mergerText(''), ''); + assert.strictEqual(d.mergerText(undefined), ''); + assert.strictEqual(d.mergerText(' '), ''); +}); + +test('#16658: banner head reads "#N merged by " and falls back to plain "merged" when unknown', () => { + const d = load(); + const at = Date.now(); + const human = d.bannerText({ key: 'hivecommons/hive/pr#16644', repo: 'hivecommons/hive', number: 16644, merged_by: 'clubanderson', at }, at); + assert.strictEqual(human.head, '#16644 merged by @clubanderson'); + assert.strictEqual(human.merger, '@clubanderson'); + const hive = d.bannerText({ key: 'hivecommons/hive/pr#16645', repo: 'hivecommons/hive', number: 16645, merged_by: 'hive', at }, at); + assert.strictEqual(hive.head, '#16645 merged by ๐Ÿ hive'); + const unknown = d.bannerText({ key: 'hivecommons/hive/pr#1', repo: 'hivecommons/hive', number: 1, at }, at); + assert.strictEqual(unknown.head, '#1 merged'); + assert.strictEqual(unknown.merger, ''); + const preview = d.bannerText({ key: 'hivecommons/hive/pr#2', repo: 'hivecommons/hive', number: 2, merged_by: 'hive', preview: true, at }, at); + assert.strictEqual(preview.head, '#2 merged by ๐Ÿ hive (test)'); +}); + +test('#16658: mergedByOf resolves the merger from recently_merged, then the ledger, then the held terminal fact', () => { + const tracker = { + recently_merged: [{ repo: 'hivecommons/hive', number: 16644, merged_by: 'clubanderson' }], + merged: { recent: [{ repo: 'hive', number: 16645, merged_by: 'hive' }, { repo: 'acme/other', number: 16644, merged_by: 'someone-else' }] }, + }; + const d = load(tracker); + assert.strictEqual(d.mergedByOf('hivecommons/hive/pr#16644', tracker), 'clubanderson', 'audit/ledger union wins, repo-scoped'); + assert.strictEqual(d.mergedByOf('hivecommons/hive/pr#16645', tracker), 'hive', 'short repo name in the ledger matches the key'); + assert.strictEqual(d.mergedByOf('acme/other/pr#16644', tracker), 'someone-else', 'colliding numbers stay repo-scoped'); + assert.strictEqual(d.mergedByOf('hivecommons/hive/pr#9999', tracker), '', 'unknown PR is empty, never a guess'); + assert.strictEqual(d.mergedByOf('', tracker), ''); + assert.strictEqual(d.mergedByOf('hivecommons/hive/pr#16644', null), '', 'no payload, no held fact โ†’ empty'); +});