Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixed-merged-odometer-at-rest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Dashboard: the Activity Monitor's Merged counter is a mechanical odometer at rest, always (a dark inset drum cell per digit, 18 px tabular digits; only the wheels that change roll), and the pill's hexagon bee is 28 px with the pill grown to fit β€” #15409 had sized only the flying glyph and drawn the roll as a transient overlay over plain text.
6 changes: 3 additions & 3 deletions src/docs/dashboard-sections.md
Original file line number Diff line number Diff line change
Expand Up @@ -1137,19 +1137,19 @@ Payloads without `drawn_under` draw as before.

#### Merged (the chip, the ledger, the flight)

A thin bar at the top of the tracker β€” it stays pinned under the card header while the list scrolls, with the stage column header strip pinned just below it β€” carries a small hex glyph with **Merged N**: every pull request the hive tracked that reached merged, *all time*, with *N today Β· N this week* beneath. The number is the server's, not the tab's: the hive keeps a **merged ledger** at `/data/merged-ledger.json` (entries for 90 days, an all-time total that only grows, atomic writes, seeded on first boot from the audit log's `pr_merged` history with the PR throughput counter as the floor, then backfilled by the first closed sweep, which on such a boot asks GitHub for every PR closed in the last 30 days β€” merges by people and other bots the audit log never saw β€” instead of its usual one day; so the ledger counts every merged PR in a configured repository, and its all-time number is expected to run above the hive-observed PR throughput counter it was seeded from) fed by the audit log's `pr_merged` lines β€” the hive's own merges on every path and the poller's observations of merges by people or other bots β€” and by webhook / closed-sweep snapshots of a PR GitHub reports merged, which carry the title and the merger's login within seconds.
A thin bar at the top of the tracker β€” it stays pinned under the card header while the list scrolls, with the stage column header strip pinned just below it β€” carries the hexagon bee (28 px; the pill grows to fit it) with **Merged** and the all-time count drawn as a **mechanical odometer at rest, always** β€” each digit in its own dark inset drum cell with a roller gradient, inner shadows top and bottom and a hairline between cells, monospace tabular digits at 18 px, no thousands separator β€” every pull request the hive tracked that reached merged, *all time*, with *N today Β· N this week* beside it at the bar's usual size. The number is the server's, not the tab's: the hive keeps a **merged ledger** at `/data/merged-ledger.json` (entries for 90 days, an all-time total that only grows, atomic writes, seeded on first boot from the audit log's `pr_merged` history with the PR throughput counter as the floor, then backfilled by the first closed sweep, which on such a boot asks GitHub for every PR closed in the last 30 days β€” merges by people and other bots the audit log never saw β€” instead of its usual one day; so the ledger counts every merged PR in a configured repository, and its all-time number is expected to run above the hive-observed PR throughput counter it was seeded from) fed by the audit log's `pr_merged` lines β€” the hive's own merges on every path and the poller's observations of merges by people or other bots β€” and by webhook / closed-sweep snapshots of a PR GitHub reports merged, which carry the title and the merger's login within seconds.

`GET /api/stage-tracker` returns it as `merged{today, total_7d, total_30d, all_time, recent[≀20], tz, day_start}`; "today" rolls at midnight in the spoke's zone (`TZ`, else UTC) and the chip hydrates from it on the first render, so a reload, a new tab or a roll shows the same count (hivecommons/hive#15147 β€” the operator watched 4 become 0). Within a tab the number never goes down; a merge the tab just watched is added on top until the server's list carries it, and that list is also what settles a vanished row as *merged* rather than closed (alongside `recently_merged`), so a human's merge celebrates too.

**Click the chip** for a popover of the recent merges β€” number (linked), title, *by hive* / *by @login*, lane, time β€” and the 30-day total; it is also where a merged row's trace lives once the row has left. When a PR on the list merges its row does **not** simply vanish on the next refresh: it stays pinned for about 3.5 s, its βœ“ cell glows amber, the event line reads *Hive: merged #14947 Β· by hive*, and β€” in the operator's words β€” "an animation originates from the item's row where the check mark is and flies up to the top of the browser border; if the Merged pill is visible the animation stops there, if not we just see it go off the screen": a 🐝 (or **+1**, βš™ β†’ Merges β†’ *Glyph*, `hive.tracker.celebrate_glyph`) rises out of the βœ“ cell for β‰ˆ2 s on an ease-out with a slight arc, lands on the chip when the chip's box is inside the viewport (the count rolls up like a mileage odometer β€” each digit that rose slides up through the digits it passes over β‰ˆ0.9 s β€” with a soft scale-pop, and the merge zap, when sound is on, plays as it lands) or exits through the top edge otherwise (the count still rolls).

*N today Β· N this week* roll the same way; a number that falls (today β†’ 0 at midnight), the first draw after a reload, and reduced motion just set the value, and the pill's width never changes mid-roll (the plain text underneath sets it). It works at any scroll position (`position: fixed`, `pointer-events: none`). At the same moment a **banner** appears at the bottom right β€” *βœ“ #15067 merged β€” fix: enable bulk delegation… (adopted, by hive, 17:42)* β€” and stays until dismissed or 30 s, stacked (newest at the bottom, at most five) when several merge together, with **Show row** (scrolls to the row and glows it again; once the row has left, says so and opens the list), **Open on GitHub** and **All merges**.
On a change only the wheels whose digit changed roll (the rightmost always spins a full turn, carry wheels roll too); the others keep their cell. *N today Β· N this week* roll the same way, drawn plain; a number that falls (today β†’ 0 at midnight), the first draw after a reload (the tab's last values are remembered in `sessionStorage`, so a reload rolls up from them), and reduced motion swap instantly and the drum stays β€” the odometer look is the resting state, not an effect of the roll ("where is my odometer look and feel?", after #15409 had sized only the flying bee and drawn the roll as a 900 ms overlay over plain text). The pill's width never changes mid-roll (the drum's cells set it). It works at any scroll position (`position: fixed`, `pointer-events: none`). At the same moment a **banner** appears at the bottom right β€” *βœ“ #15067 merged β€” fix: enable bulk delegation… (adopted, by hive, 17:42)* β€” and stays until dismissed or 30 s, stacked (newest at the bottom, at most five) when several merge together, with **Show row** (scrolls to the row and glows it again; once the row has left, says so and opens the list), **Open on GitHub** and **All merges**.

Several merges in one refresh stagger 200 ms apart with at most three glyphs in flight (the rest bump the count without flying); a merged PR that is filtered out or on another page still counts and still gets its banner. Under reduced motion nothing flies: the glyph fades in place, the count bumps, the row glows, the banners appear without sliding. A PR drawn inline on its issue's row (the usual case β€” one covering PR, no sub-row) celebrates on that issue row: every row stamps the PR keys it draws (`data-ham-prs`) and the SPA remembers each PR's host row from the last payload, so the flight has somewhere to start from even when the merge also closes the issue.

The βš™ dialog's **Merges** section has **Celebrate merges** (default on, `hive.tracker.celebrate`); off, the row leaves as before and the zap plays at once. **Test celebration** beside it closes the dialog, picks the first row currently in the viewport (scrolling one into view if none is) and plays one flight from it with a *(test)* banner β€” pop and zap, the count itself unchanged β€” so the effect can be checked without waiting for a merge; under reduced motion it says so and only pops.

The row effect is reusable in the SPA as `celebrateRow(rowEl, {kind: 'merged' | 'closed-by-merge'})`. Class names: `ham-sticky` (the pinned bar), `ham-merged-count` / `ham-merged-pop` (chip, popover), `cue-flight` / `cue-flight-fade` (the glyph), `merge-banners` / `merge-banner`.
The row effect is reusable in the SPA as `celebrateRow(rowEl, {kind: 'merged' | 'closed-by-merge'})`. Class names: `ham-sticky` (the pinned bar), `ham-merged-count` / `ham-merged-pop` (chip, popover), `ham-merged-ico` (the bee), `ham-merged-n` / `ham-merged-sub` (the counters; each holds one `ham-odo` drum of `ham-odo-col` wheels β€” `ham-odo-roll` while one rolls β€” and `ham-odo-static` plates, with the value on `data-odo-value` and `aria-label`), `cue-flight` / `cue-flight-fade` (the glyph), `merge-banners` / `merge-banner`.

#### Multi-select

Expand Down
Loading
Loading