diff --git a/changelog.d/changed-16477-code-activity-cutover.md b/changelog.d/changed-16477-code-activity-cutover.md new file mode 100644 index 0000000000..cd752c68e5 --- /dev/null +++ b/changelog.d/changed-16477-code-activity-cutover.md @@ -0,0 +1 @@ +- Code activity supersedes the Matrix code view: the Activity Monitor topbar has one **Code activity** entry (still `#oc-matrix-tab`) that opens the published-checkpoint reader at `?kiosk=1&view=reader` in a new tab. The decorative rain/cascade/ghost/terminal renderers and their `mx.*` settings are retired. Saved `?kiosk=1&view=matrix` URLs are a deprecated alias for the reader, and the internal `/api/matrix/lines` and `dashboard.matrix.*` names are deprecated but still supported. Capture and broadcasting stay off by default. diff --git a/src/deploy/stream/README.md b/src/deploy/stream/README.md index 2dd578b794..f07ccf8460 100644 --- a/src/deploy/stream/README.md +++ b/src/deploy/stream/README.md @@ -13,7 +13,7 @@ Twitch stream. Operator guide, Twitch-side setup, and troubleshooting: | `docker-compose.yaml`, `.env.example` | Run the same image from a laptop. | | `k8s/` | Kustomize base: Namespace `hive-stream`, ConfigMap, Deployment (1 replica, non-root, 512 Mi `/dev/shm`, 1–3 CPU / 3–6 Gi), NetworkPolicy (DNS, dashboard Service, public RTMP/HTTPS only). `secret.yaml` is a **template** and is not in the kustomization. | | `overlays/hive-hosted/` | hive's own hosted spoke on `hive-oke`. | -| `overlays/hive-hosted-matrix/` | Inactive, silent Matrix instance for `twitch.tv/hivecommonsmatrix`: separate namespace and identity, `twitch-stream-matrix` secret reference, zero replicas; owner-only activation. | +| `overlays/hive-hosted-matrix/` | Inactive, silent Code activity instance (formerly Matrix; `view=matrix` is a deprecated alias for the reader) for `twitch.tv/hivecommonsmatrix`: separate namespace and identity, `twitch-stream-matrix` secret reference, zero replicas; owner-only activation. | | `fleet/` | Standalone, **disabled-by-default** Kustomize base for the hub-wide monitor on `twitch.tv/hivecommonsfleet` (#15966): namespace `hive-stream-fleet`, `replicas: 0`, `STREAM_PROFILE=public-safe`, stream-key Secret `twitch-stream-hivecommonsfleet` (name only; `secret.yaml` is a template), no dashboard credential, public egress only. Shares no resource with `k8s/` or `overlays/`. | | `public-safe-gate.sh` | Run by `entrypoint.sh` before any process. No-op unless `STREAM_PROFILE=public-safe`; then it exits unless the owner enabled the stream, acknowledged the public-safe policy, set a real `https://` source, left `DASHBOARD_TOKEN` unset and installed a stream key. | diff --git a/src/docs/api-reference/dashboard-misc.md b/src/docs/api-reference/dashboard-misc.md index cf87b2ca02..f19178f89f 100644 --- a/src/docs/api-reference/dashboard-misc.md +++ b/src/docs/api-reference/dashboard-misc.md @@ -56,7 +56,7 @@ The monitor renders CI and Review concurrently on one shared PR row; see | `POST` | `/api/budget-ignore` | Owner only | Budget Ignore Set | `pkg/dashboard/api.go:177` | | `GET` | `/api/summaries` | Dashboard auth/session | Summaries | `pkg/dashboard/api.go:189` | | `GET` | `/api/stage-tracker` | Dashboard auth/session | Stage Tracker: every open issue and pull request of the watched repos for the Hive activity monitor — actionable, held, claimed, in-progress, covered-by-PR, filtered (`needs-*`), draft and exempt-labelled items alike, each with `stage`, `stage_since`, `labels`, `created_at`, `author_kind`, `modifiers`, `claimant: {kind: hive-agent|clanker|person, login, agent, hive, since, source: claim-ledger|claim-comment|assignee|kick-history|author}` naming who holds a claimed / in-progress issue or a PR under review or rework (absent when nobody is named; mirrored onto `linked_prs[]`), (PRs) `sentinel_alert` / `sentinel_findings` / `sentinel_reason` when the sentinel flagged the PR, `decision_needed` on a row parked on a person (085 / 045 / 015, the needs-human pill; mirrored onto the issue's `linked_prs[]` entry): `{question, asked_by, since, blocker, blocker_reason, options: [{action, label, enabled, reason_if_disabled}]}` — the reviewer's own decision question when the verdict record has one, the blocker in plain words, and the applicable actions under the row context menu's action ids (`decide:delegate` first), (PRs) `lineage` on the hive's copy of an adopted PR — `{kind: adopted|superseded|rebased-by-hive, from_number, from_url, from_author, from_author_kind, to_number, to_url, at, reason}`, derived from the stage store's adoption record or the `hive/adopt-` head branch, mirrored onto the issue's `linked_prs[]` entry; absent on every other row — and (issues) `linked_prs`; items with no stage yet report stage `0` "Open"; `needs_human_labels` is the "a person must act" label set behind the monitor's Needs human facet (the same list as `/api/status.labelPresets[needs-human]`); `recently_merged` lists the PRs (`repo`, `number`, `merged_at`) whose `pr_merged` audit entry is under 30 minutes old, so a client diffing two payloads can tell a merge from a close; a PR in a conflict-aware merge train carries `merge_train` `{id, state, front, position, size, attempt, max_attempts, overlap_files, ahead, length, head_number, head_state, head_reason, head_since, eta_s, eta_at, eta_basis, late, stalled, stalled_s}` — `head_state` one of `needs-human` / `ci` / `soaking` / `ready` / `merging` / `fixing` / `unknown` with `head_reason` in plain words; `eta_s` / `eta_at` the estimated wait for this member's own merge attempt (own remaining soak + each PR ahead's remaining soak or one sweep + the next sweep tick; absent while the head waits on a person or CI), `eta_at` anchored to the member's first estimate at its position so a countdown survives polls, `eta_basis` its short reading ("2 ahead · head soaking 12m · next sweep in 40s"), `late` once now has overrun the first estimate twice over, `stalled` / `stalled_s` once the head has sat longer than `governor.merge_train_stall_warn_s` ([#15395](https://github.com/hivecommons/hive/issues/15395)); a PR the queue holds because another open PR declares the same `Fixes #N` carries no `merge_train` and a `merge_gate` of `{state: "duplicate-of:", duplicate_of, duplicate_issue}` plus the `needs-decision` modifier (the queue keeps one PR per issue: green first, then the earlier-opened); a PR GitHub reports conflicting on its own, or one under repair (stage/070, 071, 072, 074, 085, or a red required check), carries no `merge_train` and is not counted in any member's `size` / `length` — a repaired member the view dropped carries `left_train: {why: fixing|needs-author|returned-to-contributor|adopted-by-hive|needs-decision|checks-failing, note}` instead (mirrored onto the issue's `linked_prs[]` entry), and a train left with one member reports no `merge_train` at all; a PR short of the merge queue (below stage/080) the planner ordered rides no train either — it carries `overlap: {behind, with, files, note}` ("overlaps #15637 (sidebar.html, index.html) — will queue behind it") and no `merge_train`, and counts in no member's `size` — the state slugs (`front`, `queued-behind`) are payload values only, the SPA renders ordinal places ("Merge queued · 1st of 2", with the train's tag when more than one train is on the page). Served from a server-side cache rebuilt at most every `dashboard.stage_tracker.cache_ttl_s` (default `governor.eval_interval_s`) from the spoke's existing snapshot — a request never calls GitHub. Carries `generated_at`, `source` (`cache` or `fresh`), `cache_ttl_s`, an `ETag` and `Cache-Control: private, max-age=`; `If-None-Match` yields 304. Each hit is recorded under REST caller `dashboard:stage-tracker` so `/api/gh-rate-limits` shows it charged nothing. | `pkg/dashboard/api.go:190` | -| `GET` | `/api/matrix/lines` | Dashboard auth/session | Matrix Lines: serve bounded backlog of pushed lines behind dashboard.matrix with repo allowlist filtering. `max` counts only lines the repo allowlist admits, so a page is never emptied by filtered-out lines. A client paging with `max` should use the last returned line's `seq` as its next `since`, not the top-level `seq`, which is the source's latest sequence number and would skip lines still past the page. `more` is true only while another line the caller may see remains past the page; stop paging when it is false. | `pkg/dashboard/api.go:191` | +| `GET` | `/api/matrix/lines` | Dashboard auth/session | Matrix Lines (deprecated name, see [Published-checkpoint regions](#published-checkpoint-regions)): serve bounded backlog of pushed lines behind dashboard.matrix with repo allowlist filtering. `max` counts only lines the repo allowlist admits, so a page is never emptied by filtered-out lines. A client paging with `max` should use the last returned line's `seq` as its next `since`, not the top-level `seq`, which is the source's latest sequence number and would skip lines still past the page. `more` is true only while another line the caller may see remains past the page; stop paging when it is false. | `pkg/dashboard/api.go:191` | | `POST` | `/api/prs/{owner}/{repo}/{number}/queue-automerge` | Merger/owner role | Queue PRAuto Merge | `pkg/dashboard/api.go:192` | | `GET` | `/api/inference/models/{backend}` | Dashboard auth/session | Inference Models | `pkg/dashboard/api.go:369` | | `GET` | `/api/hive-id` | Dashboard auth/session | Hive IDGet | `pkg/dashboard/api.go:431` | @@ -138,3 +138,11 @@ eligible region is always returned whole, even if larger than the budget. Code buffers are bounded and memory-only, so this is not an audit history. Clear retained browser code on epoch changes and failed/disabled/unauthorized pulls. An empty response says nothing about work outside the admitted source. + +The internal `/api/matrix/lines` and `dashboard.matrix.*` names are deprecated +but remain supported for compatibility. The sole code display is now **Code activity** +at `?kiosk=1&view=reader`; `?kiosk=1&view=matrix` is a deprecated alias that +opens the same reader. The Matrix renderers and their `mx.*` settings are +retired. Activation remains explicitly opt-in and default-off; +only pushed, published PR checkpoints are admitted, never workspace or pre-push +content. The cutover grants no anonymous access or broadcast authorization. diff --git a/src/docs/dashboard.md b/src/docs/dashboard.md index 0e89e3d839..489912447c 100644 --- a/src/docs/dashboard.md +++ b/src/docs/dashboard.md @@ -607,15 +607,22 @@ The endpoint returns `stages` (the stage table with `short`, `branch_from`, conf ## Code activity reader The code activity reader is a kiosk view at `?kiosk=1&view=reader` that shows -pushed changes as readable paragraphs. It is the planned successor to the -Matrix code view ([#16137](https://github.com/hivecommons/hive/issues/16137)). -Until the cutover, both views are available. The reader uses the same opt-in -setting and authorized `GET /api/matrix/lines` endpoint as Matrix, so it has -the same `dashboard.matrix` repository allowlist, author restriction and -scrub/path filters. When `dashboard.matrix.enabled` is set, the header shows a -**Reader** tab next to **Matrix**. Without that setting, the endpoint answers -404 and the view says it is not enabled. The reader adds no permission and no -anonymous access. +pushed changes as readable paragraphs. It supersedes the Matrix code view +([#16137](https://github.com/hivecommons/hive/issues/16137)). The Activity Monitor +topbar has one **Code activity** entry, opening the reader in a new tab when +`dashboard.matrix.enabled` is set. The decorative Matrix view and its rain, +cascade, ghost and terminal effects are retired; there is no side-by-side +legacy view. Saved `?kiosk=1&view=matrix` display URLs keep working as a +deprecated alias that opens the reader; prefer `?kiosk=1&view=reader`. The +`mx.*` URL options and `hive.matrix.*` browser preferences are ignored. + +The internal `dashboard.matrix.*` configuration names and `/api/matrix/lines` +endpoint are deprecated names retained for compatibility; do not rename existing +configuration. They continue to enforce the same public repository allowlist, +author restriction, dashboard read authorization and scrub/path filters. Code +activity stays **off by default**: this cutover enables no capture or broadcast. +When inactive, the content endpoint answers 404 and the reader says it is not +enabled. There is no anonymous access or workspace/pre-push capture. - **Cards.** Each card is a complete contiguous add/remove region from a validated unified-diff hunk at an actual published PR head. Indentation, blank lines diff --git a/src/docs/operator-reference/README.md b/src/docs/operator-reference/README.md index 467be2b382..23a9811ad5 100644 --- a/src/docs/operator-reference/README.md +++ b/src/docs/operator-reference/README.md @@ -284,7 +284,7 @@ Go callers keep reading `cfg.Agents`, `cfg.Governor.Gateways` and so on through | `dashboard.public_url` | Empty means OAuth redirect URIs (Linear agent install, OpenRouter funding) fall back to `hub.dashboard_url`, then the request's forwarded/`Host` origin. | Set to this dashboard's externally reachable origin (`https://hive.example.com`, no path/query) on a standalone hive whose callback is published on a different hostname or whose ingress rewrites `Host`. Must be an absolute `http(s)://` origin; a trailing slash is trimmed and anything else fails config load. See [linear-agent.md](../linear-agent.md#setup). | | `dashboard.experiment_lab` | Off by default. | Hides the Experiment Lab (formerly Strategy Lab) while that surface is being reworked. Set `dashboard.experiment_lab: true` to show the Experiment Lab section, sidebar nav entry, and Nous status controls. | | `dashboard.strategy_lab` | Off by default. **Deprecated** alias of `dashboard.experiment_lab`, kept for one release (#11695). | `true` still enables the Experiment Lab and logs a one-line deprecation at config load; the value is folded into `dashboard.experiment_lab` so the next config save writes the documented key. | -| `dashboard.matrix` | Off by default (`enabled: false`, `repos: []`, `exclude_paths: []`). **Experimental.** | Opt-in Activity Monitor Matrix display block (#15862). When active, pushed lines from allow-listed repos are served to authenticated read-role viewers via `GET /api/matrix/lines?since=&max=` (bounded backlog, `Cache-Control: no-store`; `404` when inactive) and `/api/events` emits a content-free `code-lines` nudge (`{"seq":N}`, ≤1/s) telling browsers to pull. `repos` is an explicit exact `owner/name` allowlist (no wildcards, URLs or bare names) and an empty list captures nothing, so `enabled: true` alone stays inactive. `exclude_paths` adds non-empty path globs to the built-in deny-list. There is no `authors` or `private_repos` key: authors are fixed and private repos are always excluded. | +| `dashboard.matrix` | Off by default (`enabled: false`, `repos: []`, `exclude_paths: []`). **Experimental.** | Opt-in Code activity source. The `dashboard.matrix.*` names are deprecated but retained for compatibility; the Code activity entry opens `?kiosk=1&view=reader` in a new tab. No automatic enablement or workspace capture. When active, pushed lines from allow-listed repos are served to authenticated read-role viewers via `GET /api/matrix/lines?since=&max=` (bounded backlog, `Cache-Control: no-store`; `404` when inactive) and `/api/events` emits a content-free `code-lines` nudge (`{"seq":N}`, ≤1/s) telling browsers to pull. `repos` is an explicit exact `owner/name` allowlist (no wildcards, URLs or bare names) and an empty list captures nothing, so `enabled: true` alone stays inactive. `exclude_paths` adds non-empty path globs to the built-in deny-list. There is no `authors` or `private_repos` key: authors are fixed and private repos are always excluded. | | `hub.contribute_announcement` | Empty/off by default. | Operator notice for contributors. Set from Governor → Hub or `/contribute` Management (owner/read-write): `text` is server-sanitised plain text capped at 500 characters and rendered only through text-safe sinks (empty clears), `level` is `info`/`warning`, `expires_at` is optional RFC3339, and the server rotates `id` whenever text changes so dismissed Operations/Profile banners reappear. Active notices show on `/contribute` Operations/Profile, above the Onboarding command block, and in connected relay terminals. | | `hub.contribute_repo_filters` | Empty map means repos inherit the hive-wide contributor title, author, and label filters exactly as before. | Optional full `owner/repo` keys that narrow one repository's `/contribute` queue without widening the hive. Hive-wide skip labels and hive-wide filters always run first; a repo filter can only add deny matches or require an allow-mode title/author/label match for that repo. Edit from `/contribute` → Management → Repos for Contribute → Filters or Governor → Hub. Operations lists configured overrides and withheld diagnostics name repo matches, e.g. `Repo filter label "2-discussing" denied for projectbluefin/common`. | | `hub.contribute_wall_enabled` | Off by default. | Opts the hive into the public contributor wall on `/contribute` Operations. The Management tab and Governor Hub settings mirror this switch. When off, the panel is hidden and write endpoints refuse posts. | diff --git a/src/docs/streaming-the-activity-monitor.md b/src/docs/streaming-the-activity-monitor.md index 4d4b9e2835..f7f737d2ff 100644 --- a/src/docs/streaming-the-activity-monitor.md +++ b/src/docs/streaming-the-activity-monitor.md @@ -95,7 +95,7 @@ apply the overlay — the steps below are all yours to run. ### Call-to-action overlay -Every kiosk view — this stream's Activity Monitor, the [Matrix](#matrix-mode-separate-channel) +Every kiosk view — this stream's Activity Monitor, [Code activity](#code-activity-separate-channel) and the hub's [public fleet page](#the-hivecommonsfleet-broadcast) — carries a small pill bottom-right: "🐝 Want this for your repos?", the URL `hive.hivecommons.dev/get-started` in 24px amber, and a 110px QR code of it, so @@ -107,8 +107,8 @@ spoke the destination and the copy are `dashboard.kiosk_cta_url` and are `HIVE_HUB_KIOSK_CTA_URL` and `HIVE_HUB_KIOSK_CTA_TEXT`. The QR code is rendered server-side (`src/pkg/webassets/kioskcta`) as an inline `data:` PNG, so nothing external is loaded and the pages' Content-Security-Policy is unchanged. -In Matrix mode the pill sits above the canvas at 85 % opacity so it does not -fight the effect. +In Code activity the pill sits above the reader at 85 % opacity so it does not +obscure the code. ### Channel title, category, tags @@ -291,51 +291,33 @@ with the same ↑/↓ delta cue), enlarged in kiosk, pop-out, display and full-s views so it reads at 1920×1080. Do not point the streamer at a hive tracking private repositories without reviewing what the tracker would show. -The main `twitch.tv/hivecommons` stream never shows Matrix; it remains the +The main `twitch.tv/hivecommons` stream never shows Code activity; it remains the full-screen Activity Monitor. -## Matrix mode (separate channel) - -When `dashboard.matrix.enabled` is set, the Activity Monitor header also shows a **Matrix** tab that opens `?kiosk=1&view=matrix` in the same window. It also shows a **Reader** tab that opens the [code activity reader](dashboard.md#code-activity-reader) at `?kiosk=1&view=reader`. The reader uses the same lines, shown as readable paragraphs. - -Matrix is an experimental, default-off code display for a separate channel, -[`twitch.tv/hivecommonsmatrix`](https://www.twitch.tv/hivecommonsmatrix). -It depends on the Matrix display renderer (`/?kiosk=1&view=matrix`, -[#15936](https://github.com/hivecommons/hive/issues/15936)); without that -renderer the dashboard ignores `view=matrix` and the kiosk serves the ordinary -Activity Monitor. When active it shows pushed added lines only, from positively -identified hive identities, on public repositories explicitly allowlisted in -`dashboard.matrix.repos`. -Private patches, unverified authors and excluded paths are never shown. Lines -touched by scrubbing are dropped entirely rather than displayed with redactions; -the built-in secret/path filters and `dashboard.matrix.exclude_paths` apply. -Dashboard authentication alone does not make a code stream safe for public -Twitch broadcasting: the public allowlist, author restriction and scrub/drop -rules are required. - -The display's look is chosen with `mx.*` URL parameters; each value is also -remembered in the browser (`hive.matrix.*` in local storage) for later visits. -Every effect renders only lines already delivered by `/api/matrix/lines`. - -| `mx.effect` | Display | -|---|---| -| `rain` (default) | Falling columns built from the characters of the latest lines. Unknown values fall back to `rain`. | -| `cascade` | Whole lines drift down the screen, each with its `repo#PR · path` caption. | -| `ghost` | Ghost coder: a fake editor with one tab per PR (`repo#PR`), titled with the file path; at most six tabs, the oldest closes first. Lines are typed character by character behind a blinking cursor, with light keyword/string/comment/number colouring by file extension. | -| `terminal` | An endless `git log -p`-style scroll: each line printed as a green `+ `, with a `repo#PR · path` header whenever the PR or file changes. | - -`mx.speed` (0.1–5, default 1) and `mx.fps` (1–60, default 30) set the -animation and typing speed, `mx.palette` is `green` (default), `amber` or -`gold`, and `mx.captions=off` hides the `repo#PR · path` captions and headers -on the canvas. `p` or Space pauses; a hidden tab pauses too. With the -operating system's *reduce motion* setting on, every effect is replaced by -static pages of the latest lines with their captions. +## Code activity (separate channel) + +The Activity Monitor topbar shows one **Code activity** entry when +`dashboard.matrix.enabled` is set. It opens the [reader](dashboard.md#code-activity-reader) +at `?kiosk=1&view=reader` in a new tab. Code activity supersedes the Matrix +code view: rain, cascade, ghost, terminal and all `mx.*` presentation settings +are retired. Saved `?kiosk=1&view=matrix` display URLs are a deprecated alias +that opens the same reader; new links should use `view=reader`. + +The source remains default-off and limited to pushed published PR checkpoints +from positively identified Hive/clanker authors in explicitly allowlisted public +repositories. Complete admitted add/remove regions are shown with `Pushed PR` +provenance and observed time; opening backlog is labelled a buffered snapshot. +There is no workspace or pre-push capture. The internal `dashboard.matrix.*` +configuration and `/api/matrix/lines` names are deprecated but remain supported. +Existing read authorization, path exclusions and whole-region scrub/drop filters +still apply. Dashboard authentication alone does not authorize broadcasting. [`overlays/hive-hosted-matrix/`](../deploy/stream/overlays/hive-hosted-matrix/kustomization.yaml) reuses the streamer image and base as a separate instance. It renders Deployment, ConfigMap and NetworkPolicy `matrix-hive-stream` in namespace `hive-stream-matrix`, with separate pod selectors and secret references scoped to that namespace. -It opens `/?kiosk=1&view=matrix&sound=off` and sets `STREAM_AUDIO=silent`. +It opens `/?kiosk=1&view=matrix&sound=off` (the deprecated alias, which now +shows Code activity) and sets `STREAM_AUDIO=silent`. Its independent process and deployment isolate restarts and failures from the existing stream. The `hive-hosted` overlay and `twitch.tv/hivecommons` are unaffected. @@ -344,11 +326,11 @@ unaffected. channel.** The overlay has `replicas: 0`; applying it starts no streamer. Channel availability alone does not authorize activation. The owner must: -1. Confirm the deployed dashboard build serves the Matrix display for - `view=matrix` (#15936). A build without it broadcasts the ordinary kiosk - Activity Monitor on the Matrix channel, not code lines. +1. Confirm the deployed dashboard build serves Code activity for + `view=matrix` (the alias the overlay opens) and `view=reader`. A build without it broadcasts the ordinary kiosk + Activity Monitor on the separate channel, not code changes. 2. Enable `dashboard.matrix` with an explicit, reviewed public repo allowlist - and verify the Matrix display and its author restriction and scrub/drop rules + and verify Code activity and its author restriction and scrub/drop rules before any broadcast. An empty allowlist captures nothing. 3. Provision `hivecommonsmatrix` independently, create namespace `hive-stream-matrix`, and create the out-of-band diff --git a/src/pkg/config/config.go b/src/pkg/config/config.go index 3ff585a20b..197209e3da 100644 --- a/src/pkg/config/config.go +++ b/src/pkg/config/config.go @@ -4939,8 +4939,8 @@ type DashboardConfig struct { // // Deprecated: set dashboard.experiment_lab instead. StrategyLab bool `yaml:"strategy_lab,omitempty" json:"strategy_lab,omitempty"` - // Matrix is the experimental, default-off Activity Monitor Matrix block - // (#15862). Nothing reads it yet; see dashboard_matrix.go. + // Matrix is the default-off Code activity source configuration. + // The dashboard.matrix name is deprecated but retained for compatibility. Matrix MatrixConfig `yaml:"matrix,omitempty" json:"matrix,omitempty"` // SnapshotFrameAncestors is the explicit set of HTTPS origins allowed to // embed the public, read-only /snapshot document. Empty keeps the historical diff --git a/src/pkg/config/dashboard_matrix.go b/src/pkg/config/dashboard_matrix.go index c1a3bab2fa..c5abaf950f 100644 --- a/src/pkg/config/dashboard_matrix.go +++ b/src/pkg/config/dashboard_matrix.go @@ -5,11 +5,12 @@ import ( "strings" ) -// MatrixConfig is the experimental, default-off dashboard.matrix block +// MatrixConfig is the default-off Code activity source configuration // (#15862). Repos is the single explicit public-repo allowlist gating every -// Matrix output; empty means nothing is captured. ExcludePaths adds globs to +// Code activity output; empty means nothing is captured. ExcludePaths adds globs to // the built-in deny-list. There are deliberately no authors or private_repos // keys. +// The dashboard.matrix names are deprecated but retained for configuration compatibility. type MatrixConfig struct { Enabled bool `yaml:"enabled,omitempty" json:"enabled,omitempty"` Repos []string `yaml:"repos,omitempty" json:"repos,omitempty"` diff --git a/src/pkg/dashboard/kiosk_cta.test.js b/src/pkg/dashboard/kiosk_cta.test.js index 4c5ce7cddb..71bf418627 100644 --- a/src/pkg/dashboard/kiosk_cta.test.js +++ b/src/pkg/dashboard/kiosk_cta.test.js @@ -16,7 +16,7 @@ test('hiveKioskCTAOn: kiosk=1 only, cta=off opts out', () => { new Function('window', m[0])(window); const on = window.hiveKioskCTAOn; assert.strictEqual(on('https://hive.example/?kiosk=1#section-activity-monitor-section'), true); - assert.strictEqual(on('https://hive.example/?kiosk=1&view=matrix&sound=off'), true); + assert.strictEqual(on('https://hive.example/?kiosk=1&view=reader&sound=off'), true); assert.strictEqual(on('https://hive.example/?kiosk=1&cta=off'), false); assert.strictEqual(on('https://hive.example/'), false); assert.strictEqual(on('https://hive.example/?display=1'), false); @@ -24,12 +24,12 @@ test('hiveKioskCTAOn: kiosk=1 only, cta=off opts out', () => { assert.strictEqual(on('not a url'), false); }); -test('badge wiring: placeholder outside the root, hidden without the body class, lifted and dimmed in matrix', () => { +test('badge wiring: placeholder outside the root, hidden without the body class, lifted and dimmed in Code activity', () => { assert.ok(html.includes("if(window.hiveKioskCTAOn(window.location.href)) document.body.classList.add('kiosk-cta-on');")); const root = html.indexOf(''); const ph = html.indexOf(''); assert.ok(root > 0 && ph > root, 'placeholder must follow the dashboard root'); assert.ok(html.includes('#kiosk-cta { display: none; }')); assert.ok(html.includes('body.kiosk-cta-on #kiosk-cta {')); - assert.ok(html.includes('body.matrix-mode #kiosk-cta { position: fixed; right: var(--sp-6); bottom: var(--sp-6); z-index: 100001; opacity: .85; }')); + assert.ok(html.includes('body.reader-mode #kiosk-cta { position: fixed; right: var(--sp-6); bottom: var(--sp-6); z-index: 100001; opacity: .85; }')); }); diff --git a/src/pkg/dashboard/matrix_header_tab_test.go b/src/pkg/dashboard/matrix_header_tab_test.go index 84fe806882..8c9587bd13 100644 --- a/src/pkg/dashboard/matrix_header_tab_test.go +++ b/src/pkg/dashboard/matrix_header_tab_test.go @@ -10,7 +10,7 @@ import ( "github.com/hivecommons/hive/pkg/config" ) -func TestDashboardMatrixHeaderTabHiddenByDefault(t *testing.T) { +func TestDashboardCodeActivityHeaderTabHiddenByDefault(t *testing.T) { raw, err := staticFS.ReadFile("static/index.html") if err != nil { t.Fatalf("reading embedded static/index.html: %v", err) @@ -18,17 +18,27 @@ func TestDashboardMatrixHeaderTabHiddenByDefault(t *testing.T) { html := string(raw) start := strings.Index(html, `id="oc-matrix-tab"`) if start < 0 { - t.Fatal("static/index.html missing the Matrix header tab") + t.Fatal("static/index.html missing the Code activity header tab") } open := html[strings.LastIndex(html[:start], "")] - for _, want := range []string{`href="?kiosk=1&view=matrix"`, ` hidden`, `nav-chip`} { + for _, want := range []string{`href="?kiosk=1&view=reader"`, `target="_blank"`, `rel="noopener"`, ` hidden`, `nav-chip`} { if !strings.Contains(open, want) { - t.Fatalf("Matrix header tab %q missing %q", open, want) + t.Fatalf("Code activity header tab %q missing %q", open, want) } } + if !strings.Contains(html[start:], `>Code activity`) { + t.Fatal("toolbar entry must be labelled Code activity") + } + // One entry: the legacy oc-matrix-tab id is retained, with no side-by-side tab. + if strings.Count(html, `id="oc-matrix-tab"`) != 1 || strings.Contains(html, `id="oc-reader-tab"`) { + t.Fatal("toolbar must carry exactly one Code activity entry") + } + if strings.Contains(html, "view=matrix\"") { + t.Fatal("toolbar still links the retired Matrix view") + } if !strings.Contains(html, "data.matrixEnabled") { - t.Fatal("static/index.html never toggles the Matrix tab from the status payload") + t.Fatal("static/index.html never toggles the Code activity tab from the status payload") } } diff --git a/src/pkg/dashboard/matrix_ui_test.go b/src/pkg/dashboard/matrix_ui_test.go index f41213572f..b8bc26ffe4 100644 --- a/src/pkg/dashboard/matrix_ui_test.go +++ b/src/pkg/dashboard/matrix_ui_test.go @@ -7,155 +7,46 @@ import ( "testing" ) -func TestMatrixUIWiring(t *testing.T) { +func TestMatrixPresentationRetired(t *testing.T) { html := indexHTML(t) - read := func(name string) string { - t.Helper() - b, err := os.ReadFile("static-src/" + name) - if err != nil { - t.Fatal(err) + for _, obsolete := range []string{"HIVE_MATRIX", "hiveMatrixStart", "hiveMatrixAttach", "matrix-mode", "matrix-canvas", "mx.effect", "hive.matrix.", `id="oc-reader-tab"`} { + if strings.Contains(html, obsolete) { + t.Errorf("shipped page retains retired Matrix presentation %q", obsolete) } - return string(b) } - js := read("js/matrix.js") - for _, forbidden := range []string{"innerHTML", "insertAdjacentHTML", "document.write", "new EventSource"} { - if strings.Contains(js, forbidden) { - t.Errorf("matrix.js contains forbidden sink/stream %q", forbidden) - } - } - for _, want := range []string{"visibilitychange", "prefers-reduced-motion: reduce", "cancelAnimationFrame", "text.textContent = line.line", "source.addEventListener('code-lines'", "hive.matrix.", "mx.", "'ghost'", "'terminal'", "effect === 'ghost'", "effect === 'terminal'"} { - if !strings.Contains(js, want) { - t.Errorf("matrix.js missing %q", want) - } - } - for _, want := range []string{"window.HIVE_MATRIX = kiosk && view === 'matrix';", "if(window.HIVE_MATRIX){", "hiveMatrixStart();", "if (window.HIVE_MATRIX) window.hiveMatrixAttach(source);"} { - if !strings.Contains(html, want) { - t.Errorf("generated page missing %q", want) - } - } - css := read("css/matrix.css") - // Overlays must be viewport-pinned and layered above the canvas in every effect (#16441). - for _, want := range []string{"body.matrix-mode .matrix-canvas { display: block; position: absolute; inset: 0; z-index: 0;", "body.matrix-mode .matrix-labels { position: fixed; bottom: 1rem; left: 1rem;", "body.matrix-mode #kiosk-cta { position: fixed; right: var(--sp-6); bottom: var(--sp-6); z-index: 100001;"} { - if !strings.Contains(css, want) { - t.Errorf("matrix.css missing %q", want) - } - } - for _, rule := range strings.Split(css, "}") { - selector, _, ok := strings.Cut(strings.TrimSpace(rule), "{") - if !ok { - continue - } - for _, part := range strings.Split(selector, ",") { - if !strings.HasPrefix(strings.TrimSpace(part), "body.matrix-mode ") { - t.Errorf("unscoped Matrix selector %q", part) - } - } - } - manifest := read("manifest.txt") - for _, file := range []string{"js/matrix.js", "css/matrix.css"} { - if !strings.Contains(manifest, file+"\n") { - t.Errorf("manifest missing %s", file) - } - if !strings.Contains(html, read(file)) { - t.Errorf("generated page is missing current %s", file) + for _, name := range []string{"js/matrix.js", "css/matrix.css"} { + if _, err := os.Stat("static-src/" + name); !os.IsNotExist(err) { + t.Errorf("retired asset %s still exists (err=%v)", name, err) } } } -// Exercise browser lifecycle and pull behavior with deterministic DOM/clock -// doubles. No browser dependencies, network or real animation timers required. -func TestMatrixUIBehavior(t *testing.T) { +// Exercise the status-controlled visibility of the actual toolbar element. +// The reader browser scenarios follow its shipped href and boot the reader. +func TestCodeActivityToolbarStatus(t *testing.T) { node, err := exec.LookPath("node") if err != nil { t.Skip("node unavailable") } - cmd := exec.Command(node, "-e", matrixBrowserTest) + cmd := exec.Command(node, "-e", codeActivityToolbarTest) if out, err := cmd.CombinedOutput(); err != nil { - t.Fatalf("Matrix browser behavior: %v\n%s", err, out) + t.Fatalf("Code activity toolbar: %v\n%s", err, out) } } -const matrixBrowserTest = ` +const codeActivityToolbarTest = ` const assert = require('assert'); const fs = require('fs'); const vm = require('vm'); -const matrix = fs.readFileSync('static-src/js/matrix.js', 'utf8'); -const boot = fs.readFileSync('static-src/js/boot.js', 'utf8').split('})();')[0] + '})();'; -async function scenario(query, reduced = false, status = 200) { - const events = {}, docEvents = {}, raf = new Map(), timers = new Map(), requests = [], draws = []; - let id = 0, responseStatus = status, responseSeq = 1; - const context = {clearRect(){}, fillRect(){}, fillText(...a){draws.push(a)}, drawImage(...a){draws.push(a)}}; - const elements = []; - function el(tag) { const e = {tagName: tag.toUpperCase(), children: [], style: {setProperty(){}}, - classList: {add(){}}, setAttribute(){}, append(...a){this.children.push(...a)}, - appendChild(a){this.children.push(a)}, replaceChildren(...a){this.children = a}, getContext(){return context}}; - elements.push(e); return e; } - const body = el('body'); - const doc = {body, hidden: false, createElement: el, - getElementById(id){return elements.find(e => e.id === id)}, - addEventListener(n, fn){(docEvents[n] ||= []).push(fn)}}; - const motion = {matches: reduced, addEventListener(n, fn){this.change = fn}}; - const win = {location: {href: 'https://hive.test/' + query}, innerWidth: 800, innerHeight: 600, - matchMedia(){return motion}, addEventListener(){}}; - const c = vm.createContext({window: win, document: doc, URL, location: {hash: '#activity'}, - history: {replaceState(){}}, localStorage: {getItem(){return null}, setItem(){}}, - requestAnimationFrame(fn){raf.set(++id, fn); return id}, cancelAnimationFrame(i){raf.delete(i)}, - setTimeout(fn){timers.set(++id, fn); return id}, clearTimeout(i){timers.delete(i)}, setInterval(){}, dashboardSetInterval(){}, - fetch(url){requests.push(url); return Promise.resolve({status: responseStatus, ok: responseStatus === 200, - json(){return Promise.resolve({seq: responseSeq, lines: [{line: '', repo: 'org/repo', pr: 2, path: 'main.go', at: new Date().toISOString()}]})}})}, - Date, Math}); - vm.runInContext(matrix, c); c.hiveMatrixStart = win.hiveMatrixStart; - vm.runInContext(boot, c); - for (const fn of docEvents.DOMContentLoaded || []) fn(); - const flush = async () => {for(let i=0;i<12;i++) await Promise.resolve()}; - await flush(); - if (!win.HIVE_MATRIX) {assert.equal(requests.length, 0); assert(!doc.getElementById('hive-matrix')); return;} - const byClass = n => elements.find(e => e.className === n); - assert.equal(requests[0], '/api/matrix/lines?since=0'); - assert(byClass('matrix-labels').children[0].textContent.includes('public allowlisted repos')); - if (status !== 200) { - assert.equal(raf.size, 0); assert(byClass('matrix-canvas').hidden); - assert(byClass('matrix-notice').textContent.includes(status === 404 ? 'not enabled' : 'Sign in')); - return; - } - if (reduced) { - assert.equal(raf.size, 0); - assert.equal(byClass('matrix-list').children[0].children[1].textContent, ''); - assert(timers.size > 0); - } else { - assert.equal(raf.size, 1); - for (const time of [1, 100]) {const fn = [...raf.values()][0]; raf.clear(); fn(time)} - assert(draws.length > 0); - if (/cascade|ghost|terminal/.test(query)) assert(draws.some(a => a[0] === 'org/repo#2 · main.go')); - if (query.includes('ghost')) assert(draws.some(a => a[0] === 'main.go')); - if (query.includes('terminal')) assert(draws.some(a => a[0] === '+ ')); - // The freshness HUD stays mounted, unhidden and populated in every effect, - // and the typed effects keep their baseline above the HUD band (#16441). - const hud = byClass('matrix-labels'); - assert(!hud.hidden); assert.equal(hud.children.length, 3); - assert(hud.children[0].textContent.includes('lines pushed')); assert(hud.children[1].textContent); - assert.equal(doc.getElementById('hive-matrix').children.indexOf(hud), 3); - if (/ghost|terminal/.test(query)) assert(draws.filter(a => a.length === 3).every(a => a[2] <= win.innerHeight - 100)); - } - doc.hidden = true; docEvents.visibilitychange.forEach(fn => fn()); - assert.equal(raf.size, 0); assert.equal(timers.size, 0); - assert.equal(byClass('matrix-labels').children[2].textContent, 'paused'); - doc.hidden = false; docEvents.visibilitychange.forEach(fn => fn()); await flush(); - docEvents.keydown[0]({key: 'p', target: el('body'), preventDefault(){}}); - assert.equal(raf.size, 0); assert.equal(timers.size, 0); - win.hiveMatrixAttach({addEventListener(n, fn){events[n] = fn}}); - responseSeq = 2; events['code-lines'](); await flush(); - assert.equal(requests.at(-1), '/api/matrix/lines?since=1'); - responseStatus = 403; events['code-lines'](); await flush(); - assert(byClass('matrix-canvas').hidden); assert.equal(byClass('matrix-list').children.length, 0); +const html = fs.readFileSync('static/index.html', 'utf8'); +const entry = html.match(/]*id="oc-matrix-tab"[^>]*>[\s\S]*?<\/a>/)[0]; +assert(entry.includes(' hidden')); assert(entry.includes('>Code activity')); +const tab = {hidden: true}; +const document = {getElementById(id) {assert.equal(id, 'oc-matrix-tab'); return tab;}}; +// Use the shipped status handler, including its boolean guard. +const handler = html.match(/if \(typeof data.matrixEnabled === 'boolean'\) \{[^}]*\}/)[0]; +for (const [value, expected] of [[undefined, true], [false, true], [true, false], [undefined, false], [false, true]]) { + vm.runInNewContext(handler, {document, data: {matrixEnabled: value}}); + assert.equal(tab.hidden, expected); } -(async () => { - await scenario(''); await scenario('?view=matrix'); await scenario('?kiosk=1'); - await scenario('?kiosk=1&view=matrix'); - await scenario('?kiosk=1&view=matrix&mx.effect=cascade'); - await scenario('?kiosk=1&view=matrix&mx.effect=ghost'); - await scenario('?kiosk=1&view=matrix&mx.effect=terminal'); - await scenario('?kiosk=1&view=matrix', true); - for (const status of [404, 401, 403]) await scenario('?kiosk=1&view=matrix', false, status); -})().catch(e => {console.error(e); process.exit(1)}); ` diff --git a/src/pkg/dashboard/reader_ui_test.go b/src/pkg/dashboard/reader_ui_test.go index a40db176e2..fa3c891a07 100644 --- a/src/pkg/dashboard/reader_ui_test.go +++ b/src/pkg/dashboard/reader_ui_test.go @@ -28,16 +28,12 @@ func TestReaderUIWiring(t *testing.T) { t.Errorf("reader.js missing %q", want) } } - for _, want := range []string{"window.HIVE_READER = kiosk && view === 'reader';", "document.body.classList.add('reader-mode');", "hiveReaderStart();", "if (window.HIVE_READER) window.hiveReaderAttach(source);", `id="oc-reader-tab" href="?kiosk=1&view=reader"`, "getElementById('oc-reader-tab')"} { + for _, want := range []string{"window.HIVE_READER = kiosk && (view === 'reader' || view === 'matrix');", "document.body.classList.add('reader-mode');", "hiveReaderStart();", "if (window.HIVE_READER) window.hiveReaderAttach(source);", `id="oc-matrix-tab" href="?kiosk=1&view=reader"`, "getElementById('oc-matrix-tab')"} { if !strings.Contains(html, want) { t.Errorf("generated page missing %q", want) } } - // The Matrix entry point stays until the cutover (#16477). - if !strings.Contains(html, `id="oc-matrix-tab"`) || !strings.Contains(html, "window.HIVE_MATRIX = kiosk && view === 'matrix';") { - t.Error("generated page lost the Matrix entry point") - } - start := strings.Index(html, `id="oc-reader-tab"`) + start := strings.Index(html, `id="oc-matrix-tab"`) open := html[strings.LastIndex(html[:start], "")] if !strings.Contains(open, " hidden") { @@ -95,6 +91,11 @@ const assert = require('assert'); const fs = require('fs'); const vm = require('vm'); const reader = fs.readFileSync('static-src/js/reader.js', 'utf8'); +// Follow the actual shipped toolbar link, rather than a separately hard-coded URL. +const page = fs.readFileSync('static/index.html', 'utf8'); +const toolbar = page.match(/]*id="oc-matrix-tab"[^>]*>/)[0]; +assert(toolbar.includes('target="_blank"')); assert(toolbar.includes('rel="noopener"')); +const toolbarQuery = toolbar.match(/href="([^"]+)"/)[1].replaceAll('&', '&'); const boot = fs.readFileSync('static-src/js/boot.js', 'utf8').split('})();')[0] + '})();'; const at = '2026-11-03T12:00:00Z'; const first = [ @@ -141,6 +142,7 @@ async function scenario(query, opts = {}) { for (const fn of docEvents.DOMContentLoaded || []) fn(); const flush = async () => {for (let i = 0; i < 64; i++) await Promise.resolve()}; await flush(); + assert.equal(!!win.HIVE_READER, /[?&]kiosk=1(&|$)/.test(query) && /[?&]view=(reader|matrix)(&|$)/.test(query), query); if (!win.HIVE_READER) {assert.equal(requests.length, 0); assert(!doc.getElementById('hive-reader')); return;} const byClass = n => elements.find(e => e.className === n); const feed = byClass('reader-feed'), statusEl = byClass('reader-status'), button = byClass('reader-pause'); @@ -250,8 +252,10 @@ async function scenario(query, opts = {}) { assert.equal(feed.children.length, 0); assert(statusEl.textContent.includes('Sign in')); } (async () => { - await scenario(''); await scenario('?view=reader'); await scenario('?kiosk=1'); await scenario('?kiosk=1&view=matrix'); - await scenario('?kiosk=1&view=reader'); + await scenario(''); await scenario('?view=reader'); await scenario('?view=matrix'); await scenario('?kiosk=1'); + // Saved Matrix display URLs (view=matrix) are a deprecated alias for the reader. + await scenario('?kiosk=1&view=matrix&sound=off'); + await scenario(toolbarQuery); await scenario('?kiosk=1&view=reader', {reduced: true}); const region = {repo: 'org/repo', pr: 2, path: 'main.go', at}; await scenario('?kiosk=1&view=reader', {reduced: true, boundaries: true, pages: [ diff --git a/src/pkg/dashboard/server.go b/src/pkg/dashboard/server.go index 6427763fac..cb331ae8cc 100644 --- a/src/pkg/dashboard/server.go +++ b/src/pkg/dashboard/server.go @@ -3781,7 +3781,7 @@ type statusWithWebhooks struct { *EvalLoopStatus // MatrixEnabled reports whether the Matrix block is active (enabled with // at least one repo, see config.MatrixConfig.Active) so the header shows - // the Matrix tab only on hives whose /api/matrix/lines will serve it. + // the Code activity entry only where /api/matrix/lines will serve it. MatrixEnabled bool `json:"matrixEnabled"` // UpgradeProgress is the spoke's view of the scheduled-upgrade state // machine (scheduled / draining / pulling / … / missed) with the drain diff --git a/src/pkg/dashboard/static-src/css/kiosk.css b/src/pkg/dashboard/static-src/css/kiosk.css index d0f7ec0f63..4808de68e7 100644 --- a/src/pkg/dashboard/static-src/css/kiosk.css +++ b/src/pkg/dashboard/static-src/css/kiosk.css @@ -23,8 +23,8 @@ boot.js set body.kiosk-cta-on (kiosk=1 and not cta=off), so the operator dashboard never shows it. Bottom-right, under the toast stack's corner and above the tracker; sized to read off a 720p Twitch transcode of a - 1920x1080 capture (URL >= 22px). The Matrix view (css/matrix.css) lifts - it above its fixed canvas and dims it. */ + 1920x1080 capture (URL >= 22px). The Code activity view (css/reader.css) + lifts it above its fixed overlay and dims it. */ #kiosk-cta { display: none; } body.kiosk-cta-on #kiosk-cta { display: flex; align-items: center; gap: var(--sp-4); diff --git a/src/pkg/dashboard/static-src/css/matrix.css b/src/pkg/dashboard/static-src/css/matrix.css deleted file mode 100644 index ec03d32308..0000000000 --- a/src/pkg/dashboard/static-src/css/matrix.css +++ /dev/null @@ -1,17 +0,0 @@ -body.matrix-mode #hive-dashboard-root { display: none !important; } -body.matrix-mode #hive-matrix { - --matrix-bg: #000804; - --matrix-fg: #52ed86; - --matrix-surface: #000000; - --matrix-text: #e8f5eb; - --matrix-muted: #b8ccbb; - position: fixed; inset: 0; z-index: 100000; background: var(--matrix-bg); color: var(--matrix-color, var(--matrix-fg)); font: 16px monospace; -} -body.matrix-mode .matrix-canvas { display: block; position: absolute; inset: 0; z-index: 0; width: 100%; height: 100%; } -body.matrix-mode .matrix-labels { position: fixed; bottom: 1rem; left: 1rem; max-width: min(60vw, 48rem); z-index: 2; padding: var(--sp-3); background: var(--matrix-surface); color: var(--matrix-text); font-size: var(--fs-base); overflow-wrap: anywhere; } -body.matrix-mode .matrix-notice { position: fixed; top: 2rem; left: 1rem; right: 1rem; z-index: 2; color: var(--matrix-text); } -body.matrix-mode .matrix-list { position: absolute; inset: 4rem 1rem 8rem; z-index: 1; overflow: hidden; } -body.matrix-mode .matrix-list pre { white-space: pre-wrap; overflow-wrap: anywhere; margin: .3rem 0 1rem; } -body.matrix-mode .matrix-list small { color: var(--matrix-muted); } -body.matrix-mode #hive-matrix [hidden] { display: none !important; } -body.matrix-mode #kiosk-cta { position: fixed; right: var(--sp-6); bottom: var(--sp-6); z-index: 100001; opacity: .85; } diff --git a/src/pkg/dashboard/static-src/html/topbar.html b/src/pkg/dashboard/static-src/html/topbar.html index 8cbee4a4dd..4b943b428e 100644 --- a/src/pkg/dashboard/static-src/html/topbar.html +++ b/src/pkg/dashboard/static-src/html/topbar.html @@ -25,8 +25,7 @@
- - + diff --git a/src/pkg/dashboard/static-src/js/boot.js b/src/pkg/dashboard/static-src/js/boot.js index 4a07d91459..ecb48044f2 100644 --- a/src/pkg/dashboard/static-src/js/boot.js +++ b/src/pkg/dashboard/static-src/js/boot.js @@ -36,13 +36,9 @@ (function(){ var kiosk=false, popout=false, display=false, view='', sound=true, density='', shift=false; try { var u=new URL(window.location.href); kiosk=u.searchParams.get('kiosk')==='1'; view=u.searchParams.get('view'); popout=u.searchParams.get('popout')==='1'; display=u.searchParams.get('display')==='1'; density=u.searchParams.get('density')==='tv'?'tv':''; shift=u.searchParams.get('shift')==='1'; sound=new URL(window.location.href).searchParams.get('sound')!=='off'; } catch(e) {} - window.HIVE_MATRIX = kiosk && view === 'matrix'; - if(window.HIVE_MATRIX){ - document.body.classList.add('matrix-mode'); - document.addEventListener('DOMContentLoaded', function(){ typeof hiveMatrixStart === 'function' && hiveMatrixStart(); }); - } - // Code activity reader (#16475): same opt-in data as Matrix, read as paragraphs. - window.HIVE_READER = kiosk && view === 'reader'; + // Code activity is the sole opt-in code display (#16477); view=matrix is a + // deprecated alias so saved Matrix display URLs open the reader. + window.HIVE_READER = kiosk && (view === 'reader' || view === 'matrix'); if(window.HIVE_READER){ document.body.classList.add('reader-mode'); document.addEventListener('DOMContentLoaded', function(){ typeof hiveReaderStart === 'function' && hiveReaderStart(); }); diff --git a/src/pkg/dashboard/static-src/js/matrix.js b/src/pkg/dashboard/static-src/js/matrix.js deleted file mode 100644 index 225ae94881..0000000000 --- a/src/pkg/dashboard/static-src/js/matrix.js +++ /dev/null @@ -1,347 +0,0 @@ -// Matrix is an opt-in display only. Content always comes from the authorized -// pull endpoint; the shared SSE stream carries a content-free nudge. -(function(){ - 'use strict'; - var pull = function(){}; - window.hiveMatrixAttach = function(source){ - if (!window.HIVE_MATRIX) return; - source.addEventListener('code-lines', function(){ pull(); }); - source.addEventListener('open', function(){ pull(); }); - }; - window.hiveMatrixStart = function(){ - if (!window.HIVE_MATRIX || document.getElementById('hive-matrix')) return; - var params = new URL(window.location.href).searchParams; - function option(name, fallback){ - var value = params.get('mx.' + name); - try { - if (value === null) value = localStorage.getItem('hive.matrix.' + name); - else localStorage.setItem('hive.matrix.' + name, value); - } catch(e) {} - return value === null ? fallback : value; - } - function number(name, fallback, min, max){ - var value = Number(option(name, String(fallback))); - return Number.isFinite(value) ? Math.max(min, Math.min(max, value)) : fallback; - } - var effect = option('effect', 'rain'); - if (['rain', 'cascade', 'ghost', 'terminal'].indexOf(effect) < 0) effect = 'rain'; - var captions = option('captions', 'on') !== 'off'; - var speed = number('speed', 1, 0.1, 5), fps = number('fps', 30, 1, 60); - var palette = option('palette', 'green'); - var colors = {green: '#52ed86', amber: '#ffb347', gold: '#ffd700'}; - var color = colors[palette] || colors.green; - var root = document.createElement('main'); - root.id = 'hive-matrix'; - root.style.setProperty('--matrix-color', color); - document.body.appendChild(root); - function element(tag, className, text){ - var el = document.createElement(tag); - el.className = className; - if (text) el.textContent = text; - root.appendChild(el); - return el; - } - var canvas = element('canvas', 'matrix-canvas'); - canvas.setAttribute('aria-label', 'Pushed code lines · Matrix ' + effect); - var list = element('div', 'matrix-list'); - var notice = element('p', 'matrix-notice', 'Waiting for pushed lines…'); - notice.setAttribute('role', 'status'); - var labels = element('div', 'matrix-labels'); - var source = document.createElement('div'); - source.textContent = 'Source: lines pushed by hive · public allowlisted repos'; - var freshness = document.createElement('div'); - var pausedLabel = document.createElement('div'); - labels.append(source, freshness, pausedLabel); - var ctx = canvas.getContext('2d'); - var motion = window.matchMedia('(prefers-reduced-motion: reduce)'); - var lines = [], lastSeq = 0, lastAt = 0, lastIngestAt = 0, startedAt = Date.now(); - var enabled = false, manualPause = false, loading = false, pending = false; - var frame = 0, previous = 0, page = 0, pageTimer = 0, drops = []; - var atlas = document.createElement('canvas'), glyphs = new Map(); - var width = 0, height = 0, cell = 20, rowH = 20, charW = 10; - // Ghost coder and Terminal type the delivered lines in order; once the - // queue runs dry they replay the bounded latest-line window. - var queue = [], tabs = [], typing = null, termRows = [], termHead = '', termClock = 0; - var muted = '#6f8f78', syntaxColors = {keyword: '#7fd4ff', string: '#ffd27f', comment: muted, number: '#ff9cf0'}; - var languages = { - go: {comment: '//', words: 'package import func return if else for range var const type struct interface map chan go defer select case switch default break continue nil true false'}, - js: {comment: '//', words: 'function var let const return if else for while do new class extends import export from default async await this null undefined true false typeof instanceof switch case break continue try catch finally throw of in'}, - py: {comment: '#', words: 'def class import from return if elif else for while in not and or is None True False with as lambda yield pass raise try except finally async await'}, - sh: {comment: '#', words: 'if then else elif fi for while do done case esac function local export return in'}, - rs: {comment: '//', words: 'fn let mut pub use mod struct enum impl trait match if else for while loop return self Self true false const static where async await'}, - c: {comment: '//', words: 'if else for while do return break continue switch case default new class public private protected static const struct enum typedef sizeof void int char long double float unsigned true false null this import package'} - }; - var extensions = {go: 'go', js: 'js', mjs: 'js', cjs: 'js', ts: 'js', tsx: 'js', jsx: 'js', py: 'py', sh: 'sh', bash: 'sh', - rs: 'rs', c: 'c', h: 'c', cc: 'c', cpp: 'c', hpp: 'c', java: 'c', cs: 'c'}; - Object.keys(languages).forEach(function(k){ languages[k].words = new Set(languages[k].words.split(' ')); }); - function paused(){ return manualPause || document.hidden; } - // Height of the bottom band the freshness HUD occupies, so typed rows - // never run under it in any effect (#16441). 100px is the floor used - // before the HUD was measured. - function hudBand(){ return Math.max(100, (labels.offsetHeight || 0) + 32); } - function resize(){ - width = window.innerWidth; height = window.innerHeight; - canvas.width = width; canvas.height = height; - drops = []; - ctx.font = '16px monospace'; - charW = (ctx.measureText && ctx.measureText('M').width) || 10; - } - function resetText(){ queue = []; tabs = []; typing = null; termRows = []; termHead = ''; termClock = 0; } - function clearContent(message){ - enabled = false; lines = []; drops = []; glyphs.clear(); resetText(); - lastSeq = 0; lastAt = 0; lastIngestAt = 0; - list.replaceChildren(); ctx.clearRect(0, 0, width, height); - notice.textContent = message; - sync(); - } - function updateLabels(){ - var minutes = Math.floor(Math.max(0, Date.now() - (lastAt || startedAt)) / 60000); - var text = minutes >= 10 ? 'stale · no new lines for ' + minutes + 'm' : - (lastAt ? 'last line ' + (minutes ? minutes + 'm ago' : 'just now') : 'waiting for first line'); - // When stale, say whether the hive is still looking: a recent ingest - // means nothing was pushed, an old one means the feed itself is behind. - if (minutes >= 10 && lastIngestAt) { - var ingestMinutes = Math.floor(Math.max(0, Date.now() - lastIngestAt) / 60000); - text += ' · last ingest ' + (ingestMinutes ? ingestMinutes + 'm ago' : 'just now'); - } - freshness.textContent = text; - pausedLabel.textContent = paused() ? 'paused' : 'p / Space to pause'; - } - function caption(line){ return line.repo + '#' + line.pr + ' · ' + line.path; } - function prKey(line){ return line.repo + '#' + line.pr; } - function nextLine(key){ - if (!queue.length) queue = lines.slice(); - var at = 0; - for (var i = 0; key && i < queue.length; i++) if (prKey(queue[i]) === key) { at = i; break; } - return queue.splice(at, 1)[0] || null; - } - // Minimal keyword/string/comment/number colouring keyed on the extension; - // unknown extensions render in the palette colour. - function tokens(path, text){ - var ext = (/\.([^.\/]+)$/.exec(path || '') || [])[1]; - var lang = languages[extensions[ext ? ext.toLowerCase() : '']]; - if (!lang) return [{text: text, color: color}]; - var out = [], last = 0, match; - var pattern = /("(?:[^"\\]|\\.)*"?|'(?:[^'\\]|\\.)*'?|`[^`]*`?)|(\b\d[\w.]*)|([A-Za-z_$][\w$]*)|(\/\/|#)/g; - function push(t, c){ if (t) out.push({text: t, color: c}); } - while ((match = pattern.exec(text))) { - push(text.slice(last, match.index), color); - last = pattern.lastIndex; - if (match[4] === lang.comment) { push(text.slice(match.index), syntaxColors.comment); last = text.length; break; } - push(match[0], match[1] ? syntaxColors.string : match[2] ? syntaxColors.number : - match[3] && lang.words.has(match[0]) ? syntaxColors.keyword : color); - } - push(text.slice(last), color); - return out; - } - function openTab(line){ - var key = prKey(line), tab = null; - tabs.forEach(function(t){ if (t.key === key) tab = t; }); - if (!tab) { - tab = {key: key, rows: [], count: 0}; tabs.push(tab); - if (tabs.length > 6) tabs.shift(); - } - tab.path = line.path; - return tab; - } - function startTyping(line){ - typing = line ? {tab: openTab(line), line: line, chars: Array.from(line.line), typed: 0} : null; - } - function drawGhost(dt, now){ - if (!typing) startTyping(nextLine('')); - if (!typing) return; - typing.typed += dt * 40; - // A short beat at the end of each line before the next one starts. - if (typing.typed >= typing.chars.length + 4) { - var done = typing.tab; - done.count++; - done.rows.push({n: done.count, path: typing.line.path, text: typing.line.line}); - if (done.rows.length > 200) done.rows.shift(); - startTyping(nextLine(done.key)); - if (!typing) return; - } - var tab = typing.tab, top = 34, tabW = Math.min(240, width / Math.max(1, tabs.length)); - ctx.font = '13px monospace'; - tabs.forEach(function(t, i){ - ctx.fillStyle = t === tab ? '#0b2a16' : '#02140a'; - ctx.fillRect(i * tabW, 0, tabW - 2, 28); - ctx.fillStyle = t === tab ? color : muted; - ctx.fillText(t.path, i * tabW + 10, 19, tabW - 20); - }); - if (captions) { - ctx.fillStyle = '#b8ccbb'; ctx.font = '12px monospace'; - ctx.fillText(caption(typing.line), 10, 48, width - 20); - top = 56; - } - ctx.font = '16px monospace'; - var visible = Math.max(1, Math.floor((height - top - hudBand()) / rowH)); - var current = {n: tab.count + 1, path: typing.line.path, text: typing.chars.slice(0, Math.floor(typing.typed)).join(''), current: true}; - tab.rows.slice(-(visible - 1) || tab.rows.length).concat([current]).forEach(function(row, i){ - var y = top + (i + 1) * rowH, col = 0; - ctx.fillStyle = muted; ctx.fillText(String(row.n), 10, y); - tokens(row.path, row.text).forEach(function(token){ - ctx.fillStyle = token.color; ctx.fillText(token.text, 60 + col * charW, y); - col += Array.from(token.text).length; - }); - if (row.current && Math.floor(now / 530) % 2 === 0) { ctx.fillStyle = color; ctx.fillRect(60 + col * charW, y - 14, 2, 18); } - }); - } - function emitTerminal(){ - var line = nextLine(''); - if (!line) return; - if (caption(line) !== termHead) { - termHead = caption(line); - if (captions) { - if (termRows.length) termRows.push({text: '', color: color}); - termRows.push({text: termHead, color: '#b8ccbb'}); - } - } - termRows.push({text: '+ ' + line.line, color: color}); - var keep = Math.ceil(height / rowH) + 4; - if (termRows.length > keep) termRows = termRows.slice(-keep); - } - function drawTerminal(dt){ - if (!termRows.length) emitTerminal(); - termClock += dt * 4; - while (termClock >= 1) { termClock -= 1; emitTerminal(); } - var bottom = height - hudBand(); - ctx.font = '16px monospace'; - termRows.forEach(function(row, i){ - var y = bottom - (termRows.length - 1 - i + termClock) * rowH; - if (y < -rowH || !row.text) return; - ctx.fillStyle = row.color; ctx.fillText(row.text, 10, y, width - 20); - }); - } - function staticPage(){ - list.replaceChildren(); - var latest = lines.slice(-60).reverse(); - if (page * 8 >= latest.length) page = 0; - latest.slice(page * 8, page * 8 + 8).forEach(function(line){ - var row = document.createElement('div'); - var label = document.createElement('small'); - label.textContent = caption(line); - var text = document.createElement('pre'); - text.textContent = line.line; - row.append(label, text); list.appendChild(row); - }); - } - function buildAtlas(){ - // Bounded by the same latest-line window as the renderer. No synthetic - // characters: every glyph in a column belongs to an incoming line. - glyphs.clear(); - lines.forEach(function(line){ Array.from(line.line).forEach(function(g){ - if (!glyphs.has(g)) glyphs.set(g, glyphs.size); - }); }); - atlas.width = 64 * cell; - atlas.height = Math.max(cell, Math.ceil(glyphs.size / 64) * cell); - var ac = atlas.getContext('2d'); - ac.font = '16px monospace'; ac.fillStyle = color; - glyphs.forEach(function(i, g){ ac.fillText(g, (i % 64) * cell, Math.floor(i / 64) * cell + 16); }); - } - function spawn(x){ - var line = lines[Math.floor(Math.random() * lines.length)]; - return {x: x, y: -Math.random() * height, speed: 25 + Math.random() * 65, - line: line, chars: Array.from(line.line)}; - } - function draw(now){ - frame = 0; - if (paused() || motion.matches || !enabled) return; - if (!previous) previous = now; - var elapsed = now - previous; - if (elapsed >= 1000 / fps) { - previous = now; - var dt = Math.min(elapsed, 100) / 1000 * speed; - ctx.fillStyle = effect === 'rain' ? 'rgba(0, 8, 4, 0.18)' : '#000804'; - ctx.fillRect(0, 0, width, height); - ctx.font = '16px monospace'; - if (lines.length && effect === 'ghost') drawGhost(dt, now); - else if (lines.length && effect === 'terminal') drawTerminal(dt); - else if (lines.length) { - var count = effect === 'rain' ? Math.ceil(width / cell) : 12; - while (drops.length < count) drops.push(spawn(effect === 'rain' ? drops.length * cell : Math.random() * width * 0.5)); - drops.forEach(function(drop, i){ - drop.y += drop.speed * dt; - if (drop.y > height + 40) { drops[i] = spawn(drop.x); return; } - if (effect === 'cascade') { - ctx.fillStyle = color; ctx.fillText(drop.line.line, drop.x, drop.y, width - drop.x); - if (captions) { - ctx.fillStyle = '#b8ccbb'; ctx.font = '12px monospace'; - ctx.fillText(caption(drop.line), drop.x, drop.y + 18, width - drop.x); - ctx.font = '16px monospace'; - } - } else if (drop.chars.length) { - var g = drop.chars[Math.floor(drop.y / cell + drop.chars.length * 100) % drop.chars.length]; - var index = glyphs.get(g); - if (index !== undefined) ctx.drawImage(atlas, (index % 64) * cell, Math.floor(index / 64) * cell, cell, cell, drop.x, drop.y, cell, cell); - ctx.fillStyle = '#effff2'; ctx.fillText(g, drop.x, drop.y + 16); - } - }); - } - } - frame = requestAnimationFrame(draw); - } - function sync(){ - if (frame) cancelAnimationFrame(frame); - frame = 0; previous = 0; - clearTimeout(pageTimer); pageTimer = 0; - updateLabels(); - canvas.hidden = motion.matches || !enabled; - list.hidden = !motion.matches || !enabled; - if (!enabled || paused()) return; - if (motion.matches) { - staticPage(); - pageTimer = setTimeout(function(){ page++; sync(); }, 15000); - } else frame = requestAnimationFrame(draw); - } - pull = function(){ - if (loading) { pending = true; return; } - loading = true; pending = false; - fetch('/api/matrix/lines?since=' + lastSeq, {cache: 'no-store', credentials: 'same-origin'}) - .then(function(response){ - if (response.status === 404) { clearContent('Matrix mode is not enabled on this hive'); return null; } - if (response.status === 401 || response.status === 403) { clearContent('Sign in with permission to read Matrix lines'); return null; } - if (!response.ok) throw new Error('Matrix pull failed'); - return response.json(); - }).then(function(data){ - if (!data) return; - var incoming = (Array.isArray(data.lines) ? data.lines : []).filter(function(line){ return typeof line.line === 'string'; }); - var seq = Number(data.seq) || 0; - // A restarted hive can reset its sequence; replace the old backlog. - if (seq < lastSeq) { lines = []; drops = []; resetText(); } - if (seq !== lastSeq && incoming.length) { - var at = Date.parse(incoming[incoming.length - 1].at); - lastAt = Number.isFinite(at) ? at : Date.now(); - } - lastSeq = seq; - var ingestAt = Date.parse(data.last_ingest_at); - lastIngestAt = Number.isFinite(ingestAt) ? ingestAt : 0; - lines = lines.concat(incoming).slice(-120); - queue = queue.concat(incoming).slice(-120); - enabled = true; - notice.textContent = lines.length ? '' : 'Waiting for pushed lines…'; - if (!motion.matches) buildAtlas(); - sync(); - }).catch(function(){ clearContent('Matrix lines unavailable · retrying'); }) - .finally(function(){ loading = false; if (pending) pull(); }); - }; - document.addEventListener('visibilitychange', function(){ sync(); if (!document.hidden) pull(); }); - document.addEventListener('keydown', function(event){ - if (event.ctrlKey || event.metaKey || event.altKey || event.repeat || - /INPUT|TEXTAREA|SELECT/.test(event.target.tagName) || event.target.isContentEditable) return; - if (event.key === 'p' || event.key === 'P' || event.code === 'Space') { - event.preventDefault(); manualPause = !manualPause; sync(); - } - }); - motion.addEventListener('change', function(){ - ctx.clearRect(0, 0, width, height); - if (!motion.matches) buildAtlas(); - sync(); - }); - window.addEventListener('resize', resize); - resize(); sync(); pull(); - // Recover from missed nudges, endpoint activation and transient failures. - if (typeof dashboardSetInterval === 'function') { - dashboardSetInterval('matrix-poll', function(){ updateLabels(); if (!document.hidden) pull(); }, 30000); - } - }; -})(); diff --git a/src/pkg/dashboard/static-src/js/refresh.js b/src/pkg/dashboard/static-src/js/refresh.js index 2f57184955..21511384cf 100644 --- a/src/pkg/dashboard/static-src/js/refresh.js +++ b/src/pkg/dashboard/static-src/js/refresh.js @@ -480,10 +480,8 @@ _lastStatusSeq = data.statusSeq; } if (typeof data.matrixEnabled === 'boolean') { - const matrixTab = document.getElementById('oc-matrix-tab'); - if (matrixTab) matrixTab.hidden = !data.matrixEnabled; - const readerTab = document.getElementById('oc-reader-tab'); - if (readerTab) readerTab.hidden = !data.matrixEnabled; + const codeActivityTab = document.getElementById('oc-matrix-tab'); + if (codeActivityTab) codeActivityTab.hidden = !data.matrixEnabled; } if (document.body.style.opacity === '0') document.body.style.opacity = '1'; const scrollAnchor = captureScrollAnchor(); diff --git a/src/pkg/dashboard/static-src/js/sse-bootstrap.js b/src/pkg/dashboard/static-src/js/sse-bootstrap.js index 925a9cfce8..76a4fbb6ce 100644 --- a/src/pkg/dashboard/static-src/js/sse-bootstrap.js +++ b/src/pkg/dashboard/static-src/js/sse-bootstrap.js @@ -28,7 +28,6 @@ if (_eventSource) { _eventSource.onerror = null; _eventSource.onmessage = null; _eventSource.close(); _eventSource = null; } const source = new EventSource('/api/events'); _eventSource = source; - if (window.HIVE_MATRIX) window.hiveMatrixAttach(source); if (window.HIVE_READER) window.hiveReaderAttach(source); _sseOpenedAtMs = Date.now(); _sseLastFrameAtMs = 0; diff --git a/src/pkg/dashboard/static-src/manifest.txt b/src/pkg/dashboard/static-src/manifest.txt index 29f97e4627..62820db249 100644 --- a/src/pkg/dashboard/static-src/manifest.txt +++ b/src/pkg/dashboard/static-src/manifest.txt @@ -33,11 +33,9 @@ css/welcome.css css/review-campaigns.css css/kiosk.css css/popout.css -css/matrix.css css/reader.css css/variables.css glue/style-close-body-open.html -js/matrix.js js/reader.js js/boot.js glue/boot-script-close.html diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index aa350a10b5..65f75928f7 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -6927,8 +6927,8 @@ boot.js set body.kiosk-cta-on (kiosk=1 and not cta=off), so the operator dashboard never shows it. Bottom-right, under the toast stack's corner and above the tracker; sized to read off a 720p Twitch transcode of a - 1920x1080 capture (URL >= 22px). The Matrix view (css/matrix.css) lifts - it above its fixed canvas and dims it. */ + 1920x1080 capture (URL >= 22px). The Code activity view (css/reader.css) + lifts it above its fixed overlay and dims it. */ #kiosk-cta { display: none; } body.kiosk-cta-on #kiosk-cta { display: flex; align-items: center; gap: var(--sp-4); @@ -7087,23 +7087,6 @@ body.display-shift #activity-monitor-section { animation: none; } body.display-mode #activity-monitor-panel, body.display-mode #activity-monitor-meta, body.display-mode #activity-monitor-sticky, body.display-mode #activity-monitor-native-queue { transition: none; } } -body.matrix-mode #hive-dashboard-root { display: none !important; } -body.matrix-mode #hive-matrix { - --matrix-bg: #000804; - --matrix-fg: #52ed86; - --matrix-surface: #000000; - --matrix-text: #e8f5eb; - --matrix-muted: #b8ccbb; - position: fixed; inset: 0; z-index: 100000; background: var(--matrix-bg); color: var(--matrix-color, var(--matrix-fg)); font: 16px monospace; -} -body.matrix-mode .matrix-canvas { display: block; position: absolute; inset: 0; z-index: 0; width: 100%; height: 100%; } -body.matrix-mode .matrix-labels { position: fixed; bottom: 1rem; left: 1rem; max-width: min(60vw, 48rem); z-index: 2; padding: var(--sp-3); background: var(--matrix-surface); color: var(--matrix-text); font-size: var(--fs-base); overflow-wrap: anywhere; } -body.matrix-mode .matrix-notice { position: fixed; top: 2rem; left: 1rem; right: 1rem; z-index: 2; color: var(--matrix-text); } -body.matrix-mode .matrix-list { position: absolute; inset: 4rem 1rem 8rem; z-index: 1; overflow: hidden; } -body.matrix-mode .matrix-list pre { white-space: pre-wrap; overflow-wrap: anywhere; margin: .3rem 0 1rem; } -body.matrix-mode .matrix-list small { color: var(--matrix-muted); } -body.matrix-mode #hive-matrix [hidden] { display: none !important; } -body.matrix-mode #kiosk-cta { position: fixed; right: var(--sp-6); bottom: var(--sp-6); z-index: 100001; opacity: .85; } body.reader-mode #hive-dashboard-root { display: none !important; } body.reader-mode #hive-reader { --reader-bg: #0b0f0c; @@ -7147,353 +7130,6 @@