diff --git a/README.md b/README.md
index 2fad6ec9..fdb41349 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ the constructorfabric/* namespace flip (2026-06-09). -->
 | Language | TypeScript 6 (strict) |
 | Styling | Tailwind CSS 4 + shadcn/ui (`base-vega` style, CSS variables) |
 | Charts | Recharts 3 |
-| Auth | OIDC via `oidc-client-ts` (Authorization Code + PKCE) |
+| Auth | Server-side session (cookie/BFF through the gateway) |
 | i18n | `i18next` + `react-i18next` (English only today) |
 | Mocks | MSW (Mock Service Worker) |
 | Linting | ESLint (flat config) |
@@ -53,7 +53,6 @@ To enable synthetic data for an offline / demo session, copy `.env.example` to `
 
 ```
 VITE_ENABLE_MOCKS=true
-VITE_DEV_USER_EMAIL=bob.park@example.com
 ```
 
 A yellow warning strip renders at the top of the page whenever mocks are active so synthetic values cannot be mistaken for real ones. Set `VITE_HIDE_MOCK_BANNER=true` to hide the strip during screenshots — mocks remain active. Prod builds (`pnpm build`) drop the mock subtree entirely.
@@ -75,15 +74,15 @@ Seeded mock people: `bob.park@example.com`, `carol.chen@example.com`, `alice.kim
 
 ```
 src/
-  auth/                  # OIDC manager singleton, useAuth hook, start-url capture
-  api/                   # Fetch clients (analytics, identity, accounts) + fetchWithAuth wrapper
-  queries/               # React Query hooks per screen (ic-dashboard, team-view, executive-view)
+  auth/                  # Session probe + refresh driver, useAuth / useViewer hooks
+  api/                   # Fetch clients (analytics, identity) + fetchWithAuth wrapper
+  queries/               # React Query hooks (metric-results, member-grid, metric-definitions)
   routes/                # TanStack Router file-based routes (auto-discovered)
   routeTree.gen.ts       #   ← auto-generated, do not edit
   screens/               # Page components composed by routes
   components/
     ui/                  #   shadcn/ui primitives (button, card, dialog, alert, …)
-    widgets/             #   Feature widgets (metric-card, bullet-chart, drill-modal, …)
+    widgets/             #   Feature widgets (dashboard/, metric-views/, …)
     app-sidebar.tsx      #   Org-tree sidebar (recursive nav)
     theme-provider.tsx   #   Light/dark/system theme (localStorage-backed)
     mock-banner.tsx      #   Warning strip when mocks are on
@@ -96,35 +95,19 @@ src/
   i18n/                  # i18next setup
   types/                 # Shared TypeScript types
   index.css              # Tailwind v4 inline config + theme tokens (light + dark)
-  main.tsx               # Entry: storeStartUrl → enableMocking → OidcManager.init → render
+  main.tsx               # Entry: consumeOverrideParam → enableMocking → loadSession → render
   router.ts              # createRouter(routeTree)
 ```
 
-## Authentication (OIDC)
+## Authentication
 
-Authorization Code + PKCE via [`oidc-client-ts`](https://github.com/authts/oidc-client-ts). The OIDC issuer/client are not baked into the build — they're injected at container start.
+Server-side cookie/BFF flow — the SPA holds no tokens.
 
-### Flow
-
-1. [src/main.tsx](src/main.tsx) calls `storeStartUrl()` (captures the full URL with any `?code=…&state=…` before the router strips it), then `OidcManager.init()` reads `window.__OIDC_CONFIG__` and restores a session from `sessionStorage` if one exists.
-2. Root route's `beforeLoad` ([src/routes/__root.tsx](src/routes/__root.tsx)) inspects `authStore`. `authenticated` → render; `idle` / `expired` → `OidcManager.signIn()` (redirects to the IdP). `/callback` is whitelisted.
-3. [src/routes/callback.tsx](src/routes/callback.tsx) calls `OidcManager.handleCallback(startUrl)` to exchange the code for tokens, then `window.location.replace(state.returnUrl)`.
-4. [src/api/fetch-with-auth.ts](src/api/fetch-with-auth.ts) injects `Authorization: Bearer <token>` on every request. `X-Tenant-ID` is reserved for future use (current backend doesn't require it); when `authStore.tenantId` is populated by something downstream, the header fires automatically. On 401, it calls `OidcManager.refresh()` once and retries — concurrent in-flight refreshes are deduplicated inside `OidcManager.refresh()`.
-5. Viewer identity is sourced directly from JWT claims via `oidc-client-ts` (`user.profile.email` / `user.profile.sub`) — no extra `/api/accounts/user/current` round-trip. The auth module's `useViewer()` hook is the single source of truth: it prefers the OIDC-authenticated user's email and falls back to `VITE_DEV_USER_EMAIL` in dev.
-
-### Dev bypass
-
-When `window.__OIDC_CONFIG__` is absent (typical for local dev) **and** `import.meta.env.DEV` is true, `OidcManager.init()` sets status to `authenticated` and resolves with no user. Combine with `VITE_DEV_USER_EMAIL` to impersonate a person from the identity service.
-
-### Runtime config (Docker)
-
-The container's `docker-entrypoint.sh` writes `/oidc-config.js` from env vars and injects a `<script src="/oidc-config.js">` tag into `index.html`. The script sets `window.__OIDC_CONFIG__ = { issuer_url, client_id, scopes }`.
-
-| Variable | Description | Example |
-|---|---|---|
-| `OIDC_ISSUER` | OIDC issuer URL | `https://auth.example.com/application/o/insight/` |
-| `OIDC_CLIENT_ID` | OAuth2 public client ID | `C6YjC67CCDBUMygEeoBIlSX3mhRkNpCPxQxa2zaT` |
-| `OIDC_SCOPES` | Space-separated scopes | `openid profile email api://insight/Access.Default` |
+1. The browser hits `/auth/login`; the gateway and authenticator run the provider handshake and set a `__Host-sid` session cookie.
+2. [src/main.tsx](src/main.tsx) probes `/auth/me` via `loadSession()` before the router mounts, so the root route reads a resolved auth store.
+3. [src/api/fetch-with-auth.ts](src/api/fetch-with-auth.ts) sends `credentials: "include"` on every request — no `Authorization` header, no tenant header. The gateway injects the downstream JWT.
+4. A 401 bounces the whole page into `/auth/login?return_to=…` ([src/auth/use-auth.ts](src/auth/use-auth.ts)); there is no client-side token to refresh.
+5. The session is non-sliding: [src/auth/refresh.ts](src/auth/refresh.ts) drives `POST /auth/refresh` on the server-supplied `refresh_at`.
 
 ## Environment Variables
 
@@ -134,24 +117,20 @@ Build-time (Vite, `.env.local`):
 |---|---|
 | `VITE_ENABLE_MOCKS` | `"true"` to enable MSW (dev only; stripped from prod). |
 | `VITE_HIDE_MOCK_BANNER` | `"true"` to hide the warning strip while mocks are on (for screenshots). |
-| `VITE_DEV_USER_EMAIL` | Impersonate a person by email when no OIDC session is present. |
 | `VITE_API_PROXY_TARGET` | Dev-only `/api` proxy target (e.g. `http://localhost:8080`). |
 | `VITE_API_BASE` | Override analytics API base URL (default `/api/analytics/v1`). |
 | `VITE_IDENTITY_BASE` | Override identity API base URL (default `/api/identity/v1`). |
-| `VITE_ACCOUNTS_BASE` | Override accounts API base URL (default `/api/accounts`). |
-
-Runtime (container only, **no** `VITE_` prefix): `OIDC_ISSUER`, `OIDC_CLIENT_ID`, `OIDC_SCOPES`.
 
 ## Routes
 
 | Path | Screen | Notes |
 |---|---|---|
-| `/` | IC dashboard (or impersonation prompt) | Resolves viewer via OIDC user or `VITE_DEV_USER_EMAIL`. |
+| `/` | Dashboard for the signed-in viewer | Resolves the viewer from the session. |
 | `/ic/$person` | (redirects to `/ic/$person/personal`) | |
-| `/ic/$person/personal` | IC dashboard | Branches on viewer department (engineering vs sales). |
-| `/ic/$person/team` | Team view | Members table, bullet sections, drill modals. |
-| `/ic/$person/exec` | Executive view | Org KPIs, health radar, teams table. |
-| `/callback` | OIDC callback handler | Exchanges code for tokens, redirects to original URL. |
+| `/ic/$person/personal` | Dashboard | KPI row, attention list, metric group cards + drilldowns. |
+| `/ic/$person/team` | Team view | Members heatmap, attention list, metric group drilldowns. |
+| `/metrics` | Metric catalog | Metric definitions browser. |
+| `/whats-new` | Release notes | |
 
 ## Theming
 
@@ -169,16 +148,6 @@ Runtime (container only, **no** `VITE_` prefix): `OIDC_ISSUER`, `OIDC_CLIENT_ID`
 docker build -t insight-frontend:local .
 ```
 
-### Run with OIDC
-
-```bash
-docker run -d -p 8080:80 \
-  -e OIDC_ISSUER=https://auth.example.com/application/o/insight/ \
-  -e OIDC_CLIENT_ID=your-client-id \
-  -e OIDC_SCOPES="openid profile email" \
-  insight-frontend:local
-```
-
 ### Run without a backend (mock mode)
 
 ```bash
@@ -192,8 +161,6 @@ All screens render synthetic data and the warning strip stays visible.
 
 ```bash
 cp docker-compose.yml docker-compose.override.yml
-# Edit OIDC_ISSUER / OIDC_CLIENT_ID / OIDC_SCOPES in the override
-
 docker compose up -d --build
 ```
 
@@ -207,8 +174,6 @@ From the [insight monorepo](https://github.com/constructorfabric/insight):
 ./up.sh             # full stack (ingestion + backend + frontend)
 ```
 
-Helm chart supports OIDC config via `--set oidc.issuer=… --set oidc.clientId=… --set oidc.scopes=…`.
-
 ## License
 
 See [LICENSE](LICENSE) and [NOTICE](NOTICE).
diff --git a/SECURITY.md b/SECURITY.md
index 3e389afc..35ceafb0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -5,23 +5,26 @@ checklist for exposing Insight to the public internet (without VPN).
 
 ## Threat model
 
-The frontend is a public-facing SPA that authenticates users via OIDC
-(Authorization Code + PKCE) against a customer-provided issuer and calls a
-single backend through `/api/*`. Trust boundary: the FE itself is untrusted —
-all authorization decisions live on the backend; the FE only attaches the
-bearer token and the tenant id.
-
-## Token storage
-
-Access tokens are stored in `sessionStorage` via `oidc-client-ts`'s
-`WebStorageStateStore`. This is the standard SPA tradeoff:
-
-- `sessionStorage` is per-tab and cleared when the tab closes — better than
-  `localStorage` for blast radius.
-- Tokens are accessible from JavaScript, so any XSS = token exfiltration. The
-  CSP below is the primary mitigation; keep it tight.
-- HttpOnly cookies would be stronger, but require a backend session bridge —
-  out of scope for the current architecture.
+The frontend is a public-facing SPA. Authentication is a server-side
+cookie/BFF flow: the gateway and authenticator own the provider handshake and
+set a `__Host-sid` session cookie; the SPA calls `/api/*` and `/auth/*`
+same-origin. Trust boundary: the FE itself is untrusted — all authorization
+decisions live on the backend, and the FE supplies no credentials of its own
+beyond the cookie the browser sends automatically.
+
+## Session handling
+
+The SPA stores no tokens. The session is an HttpOnly, `Secure`, `__Host-`
+prefixed cookie set by the authenticator; the gateway exchanges it for a
+downstream JWT server-side.
+
+- Not readable from JavaScript, so XSS cannot exfiltrate a long-lived
+  credential. The CSP below remains the primary XSS mitigation.
+- State-changing `/auth/*` calls carry the session's CSRF token, which arrives
+  with `/auth/me` at boot.
+- The session is non-sliding: `src/auth/refresh.ts` drives `POST /auth/refresh`
+  on the server-supplied `refresh_at`, so an idle tab's session dies on the
+  server's schedule rather than the client's.
 
 ## Headers shipped by nginx
 
@@ -42,45 +45,35 @@ Defined in `Dockerfile`:
 
 - `style-src 'unsafe-inline'` is required for React inline styles and recharts.
   Tightening this requires a nonce-based pipeline — tracked as a follow-up.
-- `connect-src` and `frame-src` are templated at container start by
-  `docker-entrypoint.sh`: when `OIDC_ISSUER` is set, the issuer's origin is
-  substituted in (tight). When not set, falls back to broad `https:` (still
-  better than `*`). The substitution covers silent-renew iframe and token
-  endpoint requests.
-- After deployment, verify silent renew works (token auto-refreshes after 5 min)
-  — if the OIDC issuer sets `X-Frame-Options: DENY` on its authorize endpoint,
-  silent renew will fail and you'll need a different refresh strategy.
+- `connect-src` and `frame-src` stay at `'self'`: the SPA is same-origin only,
+  reaching `/api/*` and `/auth/*` through the gateway that fronts it. The nginx
+  config ships with no runtime placeholders.
 
 ## Build hygiene
 
 - `build.sourcemap: false` — production bundles never ship source maps.
 - `esbuild.drop: ['debugger']` — `debugger` statements are stripped.
 - `console.*` calls are gated behind `import.meta.env.DEV` and tree-shaken in
-  production. After `npm run build`, verify with:
+  production. After `pnpm build`, verify with:
   ```sh
-  grep -c "AuthPlugin\|Auto-discovered\|OIDC skipped" dist/assets/*.js
-  # Expect: 0
   ls dist/assets/*.map 2>/dev/null
   # Expect: nothing
   ```
 
 ## Pre-deployment checklist (no-VPN exposure)
 
-- [ ] `.env` on the build host does NOT contain `VITE_DEV_USER_EMAIL` or
-      `VITE_ENABLE_MOCKS=true`. These are dev-only and tree-shaken in prod, but
-      double-check there's no DEV build going to production.
+- [ ] `.env` on the build host does NOT contain `VITE_ENABLE_MOCKS=true`. It is
+      dev-only and tree-shaken in prod, but double-check there's no DEV build
+      going to production.
 - [ ] Container is served behind HTTPS-terminating reverse proxy. HSTS only
       makes sense over TLS.
-- [ ] `window.__OIDC_CONFIG__` is injected at container startup with the real
-      issuer URL, client id, and redirect URI. No fallback to mock auth in prod.
-- [ ] Backend (`api-gateway`, `analytics-api`, `identity-resolution`) validates
-      the `X-Tenant-ID` header against the JWT's tenant claim. When the FE sends
-      this header (currently reserved — wired through `authStore.tenantId` in
-      `src/api/fetch-with-auth.ts`), without server-side validation a
-      logged-in user can read other tenants by editing the header in DevTools.
+- [ ] Backend (`api-gateway`, `analytics-api`, `identity-resolution`) derives
+      tenant scoping from the session/gateway JWT only, never from a
+      client-supplied header. The FE sends no tenant header.
 - [ ] Backend rate-limits unauthenticated and authenticated endpoints
       separately. The FE has no rate-limiting and shouldn't.
-- [ ] Verify silent renew works in staging for ≥10 minutes of idle session.
+- [ ] Verify session refresh works in staging for ≥10 minutes of idle session
+      (`POST /auth/refresh` fires before the server-supplied `refresh_at`).
 - [ ] Confirm CSP doesn't break recharts / shadcn / @base-ui styling on every screen.
 - [ ] Run `npm audit --omit=dev` — no high-severity findings.
 
diff --git a/cypilot/config/artifacts.toml b/cypilot/config/artifacts.toml
index 2c164046..dab8b405 100644
--- a/cypilot/config/artifacts.toml
+++ b/cypilot/config/artifacts.toml
@@ -1,102 +1 @@
 # Cypilot artifacts registry
-
-[[systems]]
-name = "Auth"
-slug = "auth"
-kit = "sdlc"
-codebase = ["src/app/auth", "src/app/plugins"]
-
-[[systems.artifacts]]
-kind = "PRD"
-path = "docs/components/auth/specs/PRD.md"
-name = "Auth PRD"
-
-[[systems.artifacts]]
-kind = "DESIGN"
-path = "docs/components/auth/specs/DESIGN.md"
-name = "Auth Design"
-
-[[systems.artifacts]]
-kind = "DECOMPOSITION"
-path = "docs/components/auth/specs/DECOMPOSITION.md"
-name = "Auth Decomposition"
-
-[[systems]]
-name = "Layout"
-slug = "layout"
-kit = "sdlc"
-codebase = ["src/app/layout"]
-
-[[systems.artifacts]]
-kind = "PRD"
-path = "docs/components/layout/specs/PRD.md"
-name = "Layout PRD"
-
-[[systems.artifacts]]
-kind = "DESIGN"
-path = "docs/components/layout/specs/DESIGN.md"
-name = "Layout Design"
-
-[[systems]]
-name = "UIKit"
-slug = "uikit"
-kit = "sdlc"
-codebase = ["src/screensets/insight/uikit", "src/screensets/insight/screens/uikit"]
-
-[[systems.artifacts]]
-kind = "PRD"
-path = "docs/components/uikit/specs/PRD.md"
-name = "UIKit PRD"
-
-[[systems.artifacts]]
-kind = "DESIGN"
-path = "docs/components/uikit/specs/DESIGN.md"
-name = "UIKit Design"
-
-[[systems]]
-name = "Executive View"
-slug = "executive-view"
-kit = "sdlc"
-codebase = ["src/screensets/insight/screens/executive-view"]
-
-[[systems.artifacts]]
-kind = "PRD"
-path = "docs/domain/executive-view/specs/PRD.md"
-name = "Executive View PRD"
-
-[[systems.artifacts]]
-kind = "DESIGN"
-path = "docs/domain/executive-view/specs/DESIGN.md"
-name = "Executive View Design"
-
-[[systems]]
-name = "Team View"
-slug = "team-view"
-kit = "sdlc"
-codebase = ["src/screensets/insight/screens/team-view"]
-
-[[systems.artifacts]]
-kind = "PRD"
-path = "docs/domain/team-view/specs/PRD.md"
-name = "Team View PRD"
-
-[[systems.artifacts]]
-kind = "DESIGN"
-path = "docs/domain/team-view/specs/DESIGN.md"
-name = "Team View Design"
-
-[[systems]]
-name = "IC Dashboard"
-slug = "ic-dashboard"
-kit = "sdlc"
-codebase = ["src/screensets/insight/screens/ic-dashboard"]
-
-[[systems.artifacts]]
-kind = "PRD"
-path = "docs/domain/ic-dashboard/specs/PRD.md"
-name = "IC Dashboard PRD"
-
-[[systems.artifacts]]
-kind = "DESIGN"
-path = "docs/domain/ic-dashboard/specs/DESIGN.md"
-name = "IC Dashboard Design"
diff --git a/docker-compose.yml b/docker-compose.yml
index 0479f050..905a7621 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,7 @@
 services:
   insight-front:
     # Serves the static SPA only. Auth (/auth/*) and the API (/api/*) are
-    # fronted by the nginx `gateway` in front of this container, so no OIDC
-    # env is needed here anymore.
+    # fronted by the nginx `gateway` in front of this container.
     build: .
     ports:
       - "8080:80"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index fd4f09a4..854e7d68 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -5,13 +5,10 @@ set -e
 # fronts `/api/*`, `/auth/*`, and `/` (this container). Authentication is a
 # server-side cookie/BFF flow: the browser hits `/auth/login` (gateway ->
 # authenticator -> IdP), gets a `__Host-sid` session cookie, and the SPA calls
-# `/api/*` and `/auth/me` same-origin with `credentials: 'include'`. There is
-# no client-side OIDC and no runtime config injection anymore, so this
-# entrypoint only renders the nginx config template and execs the CMD.
+# `/api/*` and `/auth/me` same-origin with `credentials: 'include'`.
 
-# Place the nginx config. It has no runtime placeholders anymore (the SPA is
-# same-origin only, so the CSP needs no injected OIDC issuer origin), but the
-# build ships it under /etc/nginx/templates, so copy it into conf.d here.
+# Place the nginx config. The build ships it under /etc/nginx/templates, so
+# copy it into conf.d here.
 cp /etc/nginx/templates/default.conf.template /etc/nginx/conf.d/default.conf
 
 exec "$@"
diff --git a/docs/components/auth/specs/DESIGN.md b/docs/components/auth/specs/DESIGN.md
deleted file mode 100644
index 42ee7c76..00000000
--- a/docs/components/auth/specs/DESIGN.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Auth Design
-
-## Shape
-
-- One module owns the full OIDC lifecycle. Nothing else touches the OIDC client directly.
-- A small reactive store holds the snapshot the rest of the app reads: status, token, user, tenant id, error. UI subscribes via one hook.
-- A fetch wrapper injects the bearer token and tenant header on every request. On 401 it triggers a single silent renew and retries once; further failure flips status to unauthenticated.
-- The router guard runs before any screen mounts. Statuses map to: authenticated → render, idle/expired/unauthenticated → start the OIDC flow, dev bypass → render. The callback route is whitelisted.
-- One callback screen exchanges the code, validates the return URL is same-origin, navigates. Errors surface a retry path.
-
-## Why this shape
-
-- **One source of truth.** Viewer, token, status, tenant id all in one store. No scattered env reads, no per-component auth logic.
-- **Library does the protocol, app does the policy.** OIDC client handles redirects, PKCE, silent renew. Wrappers above it encode app behavior: header injection, retry policy, return-URL safety.
-- **Guard at the boundary.** Single check at the router root. Screens trust they're rendered only when the viewer is resolved.
-
-## Boundaries
-
-- Auth module never reaches into screens. Screens never reach into the OIDC client.
-- The store is the only shared surface — updates flow through it, reads through one hook.
-- Dev impersonation is a fallback path inside the store resolution, not a separate flow.
diff --git a/docs/components/auth/specs/PRD.md b/docs/components/auth/specs/PRD.md
deleted file mode 100644
index a785cba8..00000000
--- a/docs/components/auth/specs/PRD.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Auth
-
-## Purpose
-
-Authenticate every user against an external OIDC provider before any dashboard renders. Maintain session, refresh tokens silently, sign out cleanly.
-
-## Users
-
-- **End user** — any employee. Sees the provider's login page, never a custom one.
-- **OIDC provider** (external) — issues + refreshes tokens.
-
-## Requirements
-
-1. **Runtime config**. Issuer URL, client id, scopes injected per deployment, not baked into the build. Different environments point at different providers without rebuild.
-2. **Login**. Unauthenticated visit redirects to the provider via Authorization Code + PKCE. Original URL preserved across the round trip.
-3. **Callback**. Dedicated route exchanges the code for tokens, then redirects to the preserved original URL. The return URL is validated as same-origin only — never a cross-origin or `javascript:` payload.
-4. **Token storage**. Tab-scoped only (cleared on tab close). Never in cookies or persistent storage.
-5. **Silent renew**. Tokens refreshed before expiry, off-screen. Concurrent refresh requests dedupe to a single in-flight call.
-6. **Header injection**. Every API request carries the access token. A tenant header slot is reserved for future multi-tenant flows.
-7. **401 recovery**. One retry after silent renew; repeated failure flips status to unauthenticated and surfaces a re-sign-in path.
-8. **Sign out**. Clears local state, ends the provider session, redirects to a configured post-logout URL.
-9. **Dev impersonation**. In dev builds only, an env var can supply a viewer email when no provider config is present. Prod builds cannot enter this branch.
-
-## Non-goals
-
-- Custom login UI.
-- Role-based access control (derived per-screen from identity, not gated here).
-- Self-service account / password flows.
-- Multi-tenant switching within a single session.
-
-## Acceptance
-
-- Unauthenticated visit redirects to the provider within a second.
-- Returning to an active session never re-prompts for credentials.
-- Refresh happens off-screen; user activity is uninterrupted.
-- No token value ever lands in persistent storage.
-- Sign out ends both the local and provider sessions.
-- A tampered return URL never navigates off-origin.
-
-## Risks
-
-- Tab close drops the session — by design.
-- Same-tab XSS could read tab-scoped tokens. Mitigated by strict CSP + dependency hygiene, not by storage choice alone.
diff --git a/docs/components/layout/specs/PRD.md b/docs/components/layout/specs/PRD.md
deleted file mode 100644
index ecbc92dd..00000000
--- a/docs/components/layout/specs/PRD.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Layout
-
-## Purpose
-
-App shell. Mounts navigation on every page, owns responsive desktop / mobile composition, surfaces the active route in the navigation tree.
-
-## Users
-
-- **App user** — any signed-in viewer. Navigates between dashboards via the sidebar.
-
-## Requirements
-
-1. **Two-column desktop, sheet on mobile.** Below a fixed breakpoint the sidebar collapses into an off-canvas sheet. Same navigation content in both — no forked component.
-2. **Org-tree navigation.** Recursive person tree, arbitrary depth. Root and active branches default open; manual expand/collapse persists per session.
-3. **Active highlight.** Current route's person/team highlights; ancestor branches in the tree render with a softened active style so the viewer stays oriented at depth.
-4. **One viewer, resolved at the root.** Viewer identity comes from auth state, not from per-screen env reads. Screens trust the viewer is available.
-5. **Theme + i18n controls** live in the shell, not per screen.
-
-## Non-goals
-
-- Per-tenant shell customization.
-- Right-to-left text testing beyond what UI primitives ship.
-- Standalone shell preview surfaces.
-
-## Acceptance
-
-- Desktop and mobile render the same navigation; toggling between breakpoints never duplicates or drops state.
-- Active highlight on a deep route lights every ancestor in the tree.
-- Expand/collapse state survives navigation within the session.
-- If the viewer can't be resolved in dev (no auth, no impersonation env), the shell shows an explicit diagnostic, not an empty tree. Prod never reaches this state — the router guard redirects first.
-
-## Risks
-
-- Org-tree depth keeps growing. Indent classes are enumerated, not template-built; new depth tiers need an explicit extension.
-- Expand/collapse state is in-memory only; full reload resets it.
diff --git a/docs/components/uikit/specs/PRD.md b/docs/components/uikit/specs/PRD.md
deleted file mode 100644
index 531e52e1..00000000
--- a/docs/components/uikit/specs/PRD.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# UI Composites
-
-## Purpose
-
-Insight-owned visual building blocks (KPI strips, bullet sections, metric cards, trend charts, drill modals, period controls, placeholders) that every dashboard composes from. Encode metric semantics, threshold coloring, and null-handling once.
-
-## Users
-
-- **Consuming screen.** Every dashboard. Owns data + period; passes derived props down; receives intent through callbacks.
-- **Indirect end user.** Never touches a composite directly. Experiences consistent accessibility, keyboard navigation, and threshold semantics across every screen.
-
-## Requirements
-
-1. **Stateless.** Composites receive data via props, raise intent via callbacks. No store reads, no event emissions, no API calls. Internal state only for ephemeral UI (popover open, calendar draft).
-2. **Honest null.** Numeric values that arrive null render as em-dash or a placeholder, never coerced to zero. Applies to KPIs, bullets, trend series, tables.
-3. **Universal placeholder.** One component covers all absent-data surfaces. Two states: *empty* (backend OK, no rows) and *error* (load rejected, retry CTA). The screen decides which; the composite never guesses.
-4. **Threshold coloring via props.** Good / warn / bad colors flow in. Composites never look thresholds up themselves. Same coloring rules everywhere.
-5. **Two render modes for bullets.** Compact card grid vs. full track + footer. Caller picks; both supported.
-6. **Theme tokens only.** All styling via semantic theme tokens (background, foreground, primary, destructive, warning, success, etc.). No raw color utilities. No inline styles for static values.
-7. **Per-card error isolation.** One card flipping to error never blanks its siblings.
-
-## Non-goals
-
-- Replacing or shadowing UI library primitives.
-- Per-tenant theming.
-- Visual regression / storybook infrastructure.
-
-## Acceptance
-
-- No composite imports application state, dispatches actions, or fires events.
-- Every composite consuming numeric props renders the placeholder for null, never zero.
-- One sibling card erroring leaves the others rendering normally.
-- Period and view-mode controls are fully controlled — props in, callbacks out, no internal state for app data.
-
-## Risks
-
-- Drift between threshold definitions in the FE and the backend metric catalog post-migration. Treat FE thresholds as transitional.
-- Boundary discipline (no state imports inside composites) is enforced by review, not code.
diff --git a/docs/domain/executive-view/specs/PRD.md b/docs/domain/executive-view/specs/PRD.md
deleted file mode 100644
index cc380fa5..00000000
--- a/docs/domain/executive-view/specs/PRD.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Executive View
-
-## Purpose
-
-Org-wide engineering health on one page. VPs and senior leaders see aggregate KPIs, every team in one table, outliers visible at a glance.
-
-## Users
-
-- **Executive viewer** — VP, CTO, head of department. Reads, never edits.
-
-## Requirements
-
-1. **Org KPI cards.** Averages across teams for build success, AI adoption, focus time. Null inputs filtered before the mean; all-null KPI renders honest null.
-2. **Org health radar.** Multi-axis chart of org KPIs. While loading, render an empty placeholder of equivalent height — no layout shift.
-3. **Per-team bar.** Comparison across teams along executive-scope metrics. Teams with all-null metrics still appear so their existence is visible.
-4. **Teams table.** Sortable, threshold-colored cells. Null cells render as em-dash. Teams with no data are still listed.
-5. **Period control.** Predefined ranges + custom date range. Period change refires the load; previous data stays visible until new data arrives (no flicker).
-6. **Connector availability** (optional, recommended). When a metric is all-null org-wide, surface why — connector not wired vs. genuinely zero.
-7. **Error surface.** Failed load shows a non-blocking error with retry. Period selection is preserved across retries.
-
-## Non-goals
-
-- Drill into team internals (lives in Team View).
-- Drill into per-person detail (lives in IC Dashboard).
-- Per-viewer customization of which metrics appear.
-- Export.
-- Real-time updates.
-
-## Acceptance
-
-- All-null KPIs render as em-dash, never zero.
-- Period change keeps previous data on screen until new data arrives.
-- Failed load preserves the selected period; retry recovers without page reload.
-- Layout holds for orgs up to ~200 teams.
-
-## Risks
-
-- Org grows past the unvirtualized table limit. Pagination or virtualization needed when a real tenant trips it.
-- Threshold drift between local config and backend metric catalog post-migration.
diff --git a/docs/domain/ic-dashboard/specs/PRD.md b/docs/domain/ic-dashboard/specs/PRD.md
deleted file mode 100644
index 20dd4a37..00000000
--- a/docs/domain/ic-dashboard/specs/PRD.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# IC Dashboard
-
-## Purpose
-
-Per-person engineering view. The same view a person sees of themself and a team lead sees of them. Task delivery, git output, code quality, AI adoption, collaboration, trends, time-off context, drill on every bullet.
-
-For sales personas the view branches into a sales-flavored layout (deal flow, win rate, year-over-year pacing). Engineering remains the default.
-
-## Users
-
-- **Self-viewing IC** — their own dashboard ("My Dashboard").
-- **Team lead drilling down** — inspecting a direct report.
-- **Executive drilling down** — continued drill chain from Team View.
-
-## Requirements
-
-1. **Person header.** Name, role, avatar, supervisor. Skeleton while loading. After load completes with no person, render a "not found" surface — never during loading.
-2. **KPI strip.** Period-filtered KPIs. Null KPIs render honest null.
-3. **Time-off banner.** Appears only when an absence overlaps the selected period. Informational; never adjusts metric values.
-4. **Bullet sections.** Task delivery, git output, code quality, AI adoption, collaboration. Sections with all-null bullets render a placeholder instead of vanishing.
-5. **Trend charts.** LOC composition over time, delivery activity over time. Empty series renders the placeholder; never silently zero-bars.
-6. **Drill modal.** Opens from any bullet click. Closes cleanly; never persists across person or period changes.
-7. **Period + view-mode controls.** Period change refires the load. View mode toggles compact tile layout vs. full chart layout.
-8. **Per-section error recovery.** A single failed section shows an inline retry. Siblings continue rendering. One connector failure never blanks the whole screen.
-9. **Sales variant.** When the viewer's department is sales, render the sales layout (hero KPIs in currency + win rate, year-over-year pacing band, velocity/quality bullets, outreach activity bullets, deal flow chart). Same route, branched at the dispatcher.
-10. **Privacy footer.** Persistent privacy notice on the most person-identifying surface.
-
-## Non-goals
-
-- Personal customization that diverges from what a team lead sees of the same person. Side-by-side comparability across people in the same role is load-bearing — **explicitly rejected, not deferred**.
-- Editing thresholds.
-- Cross-person comparison (use Team View).
-- Export, real-time updates.
-
-## Acceptance
-
-- The dashboard for a person is identical regardless of viewer (self / team lead / executive).
-- Null KPIs, bullets, and trend series render honest null, never zero.
-- A per-section failure surfaces an inline retry without affecting siblings.
-- "Not found" renders only after a complete load with no person — never mid-load.
-- Sales department triggers the sales layout deterministically; non-sales gets the engineering layout.
-- Drill modal closes cleanly; no leaked state across person or period changes.
-
-## Risks
-
-- Personal customization layered over the role-default would break comparability across people. Rejected, not deferred.
-- Snapshot bullets (e.g., "stale in progress") don't fit period-filtered semantics. Long-term: separate operational-health section.
-- Threshold drift between local config and backend metric catalog post-migration.
diff --git a/docs/domain/team-view/specs/PRD.md b/docs/domain/team-view/specs/PRD.md
deleted file mode 100644
index bdf049bd..00000000
--- a/docs/domain/team-view/specs/PRD.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Team View
-
-## Purpose
-
-Per-team picture. Team leads see who needs attention; executives drill in from the org view. Member-by-member metrics with section-level aggregates and per-member drill-downs.
-
-## Users
-
-- **Team lead** — supervisor of the team being viewed. Their email anchors the direct-reports filter.
-- **Executive drilling down** — VP / department head inspecting a subordinate's team.
-
-## Requirements
-
-1. **Team hero strip.** KPI chips (at-risk count, below-focus count, no-AI count, dev-time median) computed client-side over the *visible* member set. Toggling the direct-reports filter refreshes them.
-2. **Attention needed.** List of members tripping configured alert thresholds. Null metric values never trigger alerts — missing data is not a red flag.
-3. **Members table.** Sortable, threshold-colored cells. Row click navigates to the person's IC Dashboard. Cell click opens a per-cell drill.
-4. **Bullet sections.** Task delivery, code quality, estimation, AI adoption, collaboration. All-null section renders a placeholder instead of disappearing.
-5. **Direct reports filter.** Toggle, default on, anchored on the team lead's email. Hidden when no anchor resolvable. Counter shows `(visible/total)`.
-6. **Period control.** Predefined ranges + custom. Period change refires the load; previous data stays visible until the new load completes.
-7. **Drill modal.** Opened from cell or section interaction; closes cleanly; never leaks across team or period changes.
-8. **Navigation to IC Dashboard.** Row click sets the selected person and routes there. Current period is preserved.
-
-## Non-goals
-
-- Editing team membership or supervisor relationships.
-- Defining alert thresholds.
-- Cross-team comparison (lives in Executive View).
-- Per-viewer column composition.
-- Export.
-- Real-time updates.
-
-## Acceptance
-
-- Hero strip recomputes when the direct-reports filter changes — never stale to the unfiltered set.
-- Attention-needed never lists members whose triggering metric is null.
-- Null cells in the table render as em-dash, never zero.
-- Direct-reports toggle is hidden when no anchor email resolves.
-- Drill modal closes cleanly; underlying screen state unchanged.
-
-## Known limitation
-
-- Bullet sections come from server-side per-team aggregates. The direct-reports toggle narrows the table + hero only; bullets remain whole-team in v1. The toggle's tooltip clarifies this.
-
-## Risks
-
-- Race when period changes mid-load — older response can overwrite newer state. Abort-on-change needed.
-- Team identifier ambiguity (email when drilling from above, org-unit string when default). Anchor resolution branches on shape; canonicalization is a longer-term data-model task.
diff --git a/docs/testing/storybook-component-tests.md b/docs/testing/storybook-component-tests.md
index 60af5db4..f6c118cb 100644
--- a/docs/testing/storybook-component-tests.md
+++ b/docs/testing/storybook-component-tests.md
@@ -53,7 +53,7 @@ cyber-insight-front/
 │   └─ theme-decorators.ts     # addon-themes adapted to light/dark
 ├─ vitest.config.ts            # test.projects = [unit (jsdom), storybook (browser)]
 ├─ public/mockServiceWorker.js # already present (msw workerDirectory: public)
-└─ src/components/widgets/v2/kpi-tile.stories.tsx  # PoC story + play tests
+└─ src/components/widgets/dashboard/kpi-tile.stories.tsx  # PoC story + play tests
 ```
 
 > Existing `*.test.tsx` (RTL/jsdom) are untouched and run in the `unit` project.
@@ -330,7 +330,7 @@ import { expect, waitFor } from "storybook/test";
 import { KpiTile } from "./kpi-tile";
 
 const meta: Meta<typeof KpiTile> = {
-  title: "Widgets/v2/KpiTile",
+  title: "Widgets/Dashboard/KpiTile",
   component: KpiTile,
   beforeEach: () => { authStore.setTenantId("t-1"); }, // global beforeEach handles cleanup
 };
diff --git a/nginx/default.conf.template b/nginx/default.conf.template
index 8224c5b9..f325fca3 100644
--- a/nginx/default.conf.template
+++ b/nginx/default.conf.template
@@ -17,7 +17,7 @@ server {
     # required for React inline styles + recharts; tighten via nonce in a
     # later iteration. The SPA is same-origin only (it calls /api/* and
     # /auth/* through the gateway that fronts this container), so connect-src
-    # and frame-src stay at 'self' — there is no client-side OIDC / IdP origin.
+    # and frame-src stay at 'self'.
     include /etc/nginx/snippets/security-headers.conf;
 
     # MSW service worker ships in dist/ from public/ but is inert without
diff --git a/package.json b/package.json
index 5afba9b4..bcae509c 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
   "dependencies": {
     "@base-ui/react": "1.4.1",
     "@fontsource-variable/inter": "5.2.8",
-    "@tailwindcss/vite": "4.2.4",
     "@tanstack/react-query": "5.100.9",
     "@tanstack/react-router": "1.169.2",
     "class-variance-authority": "0.7.1",
@@ -34,7 +33,6 @@
     "i18next": "26.1.0",
     "i18next-browser-languagedetector": "8.2.1",
     "lucide-react": "1.14.0",
-    "oidc-client-ts": "3.5.0",
     "react": "19.2.6",
     "react-day-picker": "10.0.0",
     "react-dom": "19.2.6",
@@ -55,6 +53,7 @@
     "@storybook/addon-themes": "10.4.6",
     "@storybook/addon-vitest": "10.4.6",
     "@storybook/react-vite": "10.4.6",
+    "@tailwindcss/vite": "4.2.4",
     "@tanstack/router-plugin": "1.167.35",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4a8a1f16..11442adc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,9 +18,6 @@ importers:
       '@fontsource-variable/inter':
         specifier: 5.2.8
         version: 5.2.8
-      '@tailwindcss/vite':
-        specifier: 4.2.4
-        version: 4.2.4(vite@8.0.11(@types/node@25.6.2)(esbuild@0.27.7)(jiti@2.7.0))
       '@tanstack/react-query':
         specifier: 5.100.9
         version: 5.100.9(react@19.2.6)
@@ -48,9 +45,6 @@ importers:
       lucide-react:
         specifier: 1.14.0
         version: 1.14.0(react@19.2.6)
-      oidc-client-ts:
-        specifier: 3.5.0
-        version: 3.5.0
       react:
         specifier: 19.2.6
         version: 19.2.6
@@ -106,6 +100,9 @@ importers:
       '@storybook/react-vite':
         specifier: 10.4.6
         version: 10.4.6(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.3)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(typescript@6.0.3)(vite@8.0.11(@types/node@25.6.2)(esbuild@0.27.7)(jiti@2.7.0))
+      '@tailwindcss/vite':
+        specifier: 4.2.4
+        version: 4.2.4(vite@8.0.11(@types/node@25.6.2)(esbuild@0.27.7)(jiti@2.7.0))
       '@tanstack/router-plugin':
         specifier: 1.167.35
         version: 1.167.35(@tanstack/react-router@1.169.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@8.0.11(@types/node@25.6.2)(esbuild@0.27.7)(jiti@2.7.0))
@@ -2894,10 +2891,6 @@ packages:
   jszip@3.10.1:
     resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
 
-  jwt-decode@4.0.0:
-    resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==}
-    engines: {node: '>=18'}
-
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
@@ -3222,10 +3215,6 @@ packages:
   obug@2.1.1:
     resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==}
 
-  oidc-client-ts@3.5.0:
-    resolution: {integrity: sha512-l2q8l9CTCTOlbX+AnK4p3M+4CEpKpyQhle6blQkdFhm0IsBqsxm15bYaSa11G7pWdsYr6epdsRZxJpCyCRbT8A==}
-    engines: {node: '>=18'}
-
   on-finished@2.4.1:
     resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
     engines: {node: '>= 0.8'}
@@ -6869,8 +6858,6 @@ snapshots:
       readable-stream: 2.3.8
       setimmediate: 1.0.5
 
-  jwt-decode@4.0.0: {}
-
   keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
@@ -7128,10 +7115,6 @@ snapshots:
 
   obug@2.1.1: {}
 
-  oidc-client-ts@3.5.0:
-    dependencies:
-      jwt-decode: 4.0.0
-
   on-finished@2.4.1:
     dependencies:
       ee-first: 1.1.1
diff --git a/src/api/analytics-client.test.ts b/src/api/analytics-client.test.ts
deleted file mode 100644
index 9b59c884..00000000
--- a/src/api/analytics-client.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import {
-  AnalyticsApiError,
-  queryBatch,
-  queryBatchWithRange,
-  queryMetric,
-  queryMetricRaw,
-} from "./analytics-client";
-
-const RANGE = { from: "2026-06-01", to: "2026-06-07" };
-const DATE_FILTER =
-  "metric_date ge '2026-06-01' and metric_date le '2026-06-07'";
-
-const fetchMock = () => globalThis.fetch as ReturnType<typeof vi.fn>;
-
-function lastCall(): { url: string; init: RequestInit } {
-  const calls = fetchMock().mock.calls;
-  const [url, init] = calls[calls.length - 1]!;
-  return { url: String(url), init: (init ?? {}) as RequestInit };
-}
-
-function lastBody(): Record<string, unknown> {
-  return JSON.parse(String(lastCall().init.body)) as Record<string, unknown>;
-}
-
-function jsonResponse(body: unknown, status = 200): Response {
-  return new Response(JSON.stringify(body), {
-    status,
-    headers: { "Content-Type": "application/json" },
-  });
-}
-
-describe("analytics-client", () => {
-  beforeEach(() => {
-    vi.stubGlobal("fetch", vi.fn());
-  });
-
-  afterEach(() => {
-    vi.unstubAllGlobals();
-    vi.restoreAllMocks();
-  });
-
-  describe("queryMetric", () => {
-    it("POSTs to the metric query endpoint with JSON headers", async () => {
-      fetchMock().mockResolvedValue(jsonResponse({ items: [] }));
-      const out = await queryMetric("m1", RANGE);
-      expect(out).toEqual({ items: [] });
-      const { url, init } = lastCall();
-      expect(url).toContain("/metrics/m1/query");
-      expect(init.method).toBe("POST");
-      expect(new Headers(init.headers).get("Content-Type")).toBe(
-        "application/json",
-      );
-    });
-
-    it("always injects the period filter", async () => {
-      fetchMock().mockResolvedValue(jsonResponse({ items: [] }));
-      await queryMetric("m1", RANGE);
-      expect(lastBody().$filter).toBe(DATE_FILTER);
-    });
-
-    it("ANDs a caller-supplied $filter with the period filter", async () => {
-      fetchMock().mockResolvedValue(jsonResponse({ items: [] }));
-      await queryMetric("m1", RANGE, {
-        $filter: "person_id eq 'p'",
-        $top: 5,
-      });
-      const body = lastBody();
-      expect(body.$filter).toBe(`${DATE_FILTER} and person_id eq 'p'`);
-      expect(body.$top).toBe(5);
-    });
-
-    it("throws AnalyticsApiError with the parsed problem body on non-2xx", async () => {
-      fetchMock().mockResolvedValue(
-        jsonResponse({ title: "boom", status: 500 }, 500),
-      );
-      const err = await queryMetric("m1", RANGE).catch((e: unknown) => e);
-      expect(err).toBeInstanceOf(AnalyticsApiError);
-      expect((err as AnalyticsApiError).status).toBe(500);
-      expect((err as AnalyticsApiError).body).toEqual({
-        title: "boom",
-        status: 500,
-      });
-      expect((err as AnalyticsApiError).message).toBe("Analytics API 500");
-    });
-
-    it("tolerates a non-JSON error body (body becomes null)", async () => {
-      fetchMock().mockResolvedValue(new Response("oops", { status: 502 }));
-      const err = await queryMetric("m1", RANGE).catch((e: unknown) => e);
-      expect(err).toBeInstanceOf(AnalyticsApiError);
-      expect((err as AnalyticsApiError).status).toBe(502);
-      expect((err as AnalyticsApiError).body).toBeNull();
-    });
-
-    it("throws invalid_json when a 2xx body fails to parse", async () => {
-      fetchMock().mockResolvedValue(new Response("not-json", { status: 200 }));
-      const err = await queryMetric("m1", RANGE).catch((e: unknown) => e);
-      expect(err).toBeInstanceOf(AnalyticsApiError);
-      expect((err as AnalyticsApiError).status).toBe(200);
-      expect((err as AnalyticsApiError).body).toEqual({
-        error: "invalid_json",
-      });
-    });
-  });
-
-  describe("queryMetricRaw", () => {
-    it("passes params through without a date filter", async () => {
-      fetchMock().mockResolvedValue(jsonResponse({ items: [] }));
-      await queryMetricRaw("m2", { $filter: "person_id eq 'p'" });
-      const { url } = lastCall();
-      expect(url).toContain("/metrics/m2/query");
-      expect(lastBody()).toEqual({ $filter: "person_id eq 'p'" });
-    });
-  });
-
-  describe("queryBatch", () => {
-    it("POSTs the items under a queries envelope", async () => {
-      fetchMock().mockResolvedValue(jsonResponse({ results: [] }));
-      const out = await queryBatch([{ metric_id: "m1", id: "q1" }]);
-      expect(out).toEqual({ results: [] });
-      const { url } = lastCall();
-      expect(url).toContain("/metrics/queries");
-      expect(lastBody()).toEqual({
-        queries: [{ metric_id: "m1", id: "q1" }],
-      });
-    });
-  });
-
-  describe("queryBatchWithRange", () => {
-    it("ANDs the period filter into every item", async () => {
-      fetchMock().mockResolvedValue(jsonResponse({ results: [] }));
-      await queryBatchWithRange(RANGE, [
-        { metric_id: "m1", id: "q1", $filter: "person_id eq 'p'" },
-        { metric_id: "m2", id: "q2" },
-      ]);
-      const body = lastBody() as {
-        queries: Array<{ id: string; $filter: string }>;
-      };
-      expect(body.queries[0]!.$filter).toBe(
-        `${DATE_FILTER} and person_id eq 'p'`,
-      );
-      expect(body.queries[1]!.$filter).toBe(DATE_FILTER);
-    });
-  });
-});
diff --git a/src/api/analytics-client.ts b/src/api/analytics-client.ts
index e13949a0..e70903bd 100644
--- a/src/api/analytics-client.ts
+++ b/src/api/analytics-client.ts
@@ -1,11 +1,8 @@
-import { fetchWithAuth } from "@/api/fetch-with-auth";
-import { andFilters, odataDateFilter } from "@/api/odata";
-import type { DateRange } from "@/api/period-to-date-range";
-import type { ODataParams, ODataResponse, ProblemDetails } from "@/types/insight";
-
-const BASE = (import.meta.env.VITE_API_BASE as string | undefined) ??
-  "/api/analytics/v1";
-
+/**
+ * Shared error type for the Analytics API clients (`metric-results-client`,
+ * `metric-definitions-client`). Each client owns its own request/parse path;
+ * this carries the HTTP status and the parsed problem body across them.
+ */
 export class AnalyticsApiError extends Error {
   status: number;
   body: unknown;
@@ -17,106 +14,3 @@ export class AnalyticsApiError extends Error {
     this.body = body;
   }
 }
-
-async function request<T>(path: string, init?: RequestInit): Promise<T> {
-  const res = await fetchWithAuth(`${BASE}${path}`, {
-    ...init,
-    headers: {
-      "Content-Type": "application/json",
-      ...(init?.headers ?? {}),
-    },
-  });
-  if (!res.ok) {
-    const body = await res.json().catch(() => null);
-    throw new AnalyticsApiError(res.status, body);
-  }
-  try {
-    return (await res.json()) as T;
-  } catch {
-    throw new AnalyticsApiError(res.status, { error: "invalid_json" });
-  }
-}
-
-/**
- * Execute a metric query bound to a period. Every dashboard-facing metric is
- * period-aware: the gold bullet/aggregate views aggregate over a time window,
- * so a query without a `metric_date` filter implicitly returns "all-time" —
- * almost never what a screen wants. This method makes the period mandatory
- * and ANDs it with any caller-supplied `$filter`.
- */
-export async function queryMetric<T>(
-  metricId: string,
-  range: DateRange,
-  params?: ODataParams,
-): Promise<ODataResponse<T>> {
-  const filter = andFilters(odataDateFilter(range), params?.$filter);
-  return request<ODataResponse<T>>(`/metrics/${metricId}/query`, {
-    method: "POST",
-    body: JSON.stringify({ ...params, $filter: filter }),
-  });
-}
-
-/**
- * Escape hatch for period-independent metric queries. Prefer `queryMetric`
- * for every dashboard call — forgetting the period silently returns all-time
- * data and breaks any "this week / month" expectation on the UI.
- */
-export async function queryMetricRaw<T>(
-  metricId: string,
-  params: ODataParams,
-): Promise<ODataResponse<T>> {
-  return request<ODataResponse<T>>(`/metrics/${metricId}/query`, {
-    method: "POST",
-    body: JSON.stringify(params),
-  });
-}
-
-export interface BatchQueryItem extends ODataParams {
-  id?: string;
-  metric_id: string;
-}
-
-export type BatchQueryResult<T> =
-  | {
-      status: "ok";
-      id?: string;
-      metric_id: string;
-      items: T[];
-      page_info: { has_next: boolean; cursor: string | null };
-    }
-  | {
-      status: "error";
-      id?: string;
-      metric_id: string;
-      error: ProblemDetails;
-    };
-
-export interface BatchQueryResponse<T> {
-  results: BatchQueryResult<T>[];
-}
-
-export async function queryBatch<T>(
-  items: BatchQueryItem[],
-): Promise<BatchQueryResponse<T>> {
-  return request<BatchQueryResponse<T>>("/metrics/queries", {
-    method: "POST",
-    body: JSON.stringify({ queries: items }),
-  });
-}
-
-/**
- * Period-aware batch query. ANDs `odataDateFilter(range)` into every item's
- * `$filter`, matching `queryMetric`'s contract — prefer this over `queryBatch`
- * for dashboard calls so the period boundary cannot be silently dropped.
- */
-export async function queryBatchWithRange<T>(
-  range: DateRange,
-  items: BatchQueryItem[],
-): Promise<BatchQueryResponse<T>> {
-  const dateFilter = odataDateFilter(range);
-  const scoped = items.map((it) => ({
-    ...it,
-    $filter: andFilters(dateFilter, it.$filter),
-  }));
-  return queryBatch<T>(scoped);
-}
diff --git a/src/api/catalog-client.test.ts b/src/api/catalog-client.test.ts
deleted file mode 100644
index 5db90fed..00000000
--- a/src/api/catalog-client.test.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Wire-shape unit tests for the catalog client.
- *
- * The backend response is `metric_key`-required (ADR-002) and `links`-required
- * (ADR-003), but the FE parses both as optional so a deployed env that
- * predates the amendments still hydrates cleanly. These tests pin both
- * directions: present and absent.
- */
-
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
-
-import { CatalogApiError, fetchCatalog } from "./catalog-client";
-
-const ENDPOINT = "/api/analytics/v1/catalog/get_metrics";
-
-function jsonResponse(body: unknown, init: ResponseInit = {}): Response {
-  return new Response(JSON.stringify(body), {
-    status: 200,
-    headers: { "Content-Type": "application/json" },
-    ...init,
-  });
-}
-
-describe("fetchCatalog", () => {
-  beforeEach(() => {
-    vi.stubGlobal("fetch", vi.fn());
-  });
-  afterEach(() => {
-    vi.unstubAllGlobals();
-    vi.restoreAllMocks();
-  });
-
-  it("issues POST application/json against /catalog/get_metrics with the body", async () => {
-    (globalThis.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
-      jsonResponse({
-        tenant_id: "t",
-        generated_at: "2026-06-01T00:00:00Z",
-        metrics: [],
-        links: [],
-      }),
-    );
-    await fetchCatalog({ role_slug: "eng", team_id: "alpha" });
-    expect(globalThis.fetch).toHaveBeenCalledTimes(1);
-    const call = (globalThis.fetch as ReturnType<typeof vi.fn>).mock.calls[0];
-    const [url, init] = call as [string, RequestInit];
-    expect(url).toBe(ENDPOINT);
-    expect(init.method).toBe("POST");
-    const headers = new Headers(init.headers);
-    expect(headers.get("Content-Type")).toBe("application/json");
-    expect(JSON.parse(init.body as string)).toEqual({
-      role_slug: "eng",
-      team_id: "alpha",
-    });
-  });
-
-  it("parses a wire response that carries metric_key + links (post-ADR-002/003)", async () => {
-    (globalThis.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
-      jsonResponse({
-        tenant_id: "t",
-        generated_at: "2026-06-01T00:00:00Z",
-        metrics: [
-          {
-            id: "id-1",
-            metric_key: "ic_kpis.tasks_closed",
-            label: "Tasks Closed",
-            higher_is_better: true,
-            is_member_scale: false,
-            source_tags: ["jira"],
-            schema_status: "ok",
-            thresholds: {
-              good: 5,
-              warn: 3,
-              resolved_from: "product-default",
-              bounded_by_lock: false,
-            },
-          },
-        ],
-        links: [{ query_id: "q-1", catalog_metric_ids: ["id-1"] }],
-      }),
-    );
-    const res = await fetchCatalog();
-    expect(res.metrics[0]?.metric_key).toBe("ic_kpis.tasks_closed");
-    expect(res.links).toEqual([
-      { query_id: "q-1", catalog_metric_ids: ["id-1"] },
-    ]);
-  });
-
-  it("tolerates a pre-ADR-002 response that omits metric_key (defensive parse)", async () => {
-    // A deployed env that hasn't shipped ADR-002 yet returns metric_key
-    // omitted. The FE MUST hydrate cleanly — no parse error, no thrown
-    // exception. Consumers fall back to `byId` (which is the contract).
-    (globalThis.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
-      jsonResponse({
-        tenant_id: "t",
-        generated_at: "2026-06-01T00:00:00Z",
-        metrics: [
-          {
-            id: "id-1",
-            label: "Tasks Closed",
-            higher_is_better: true,
-            is_member_scale: false,
-            source_tags: [],
-            schema_status: "ok",
-            thresholds: {
-              good: 5,
-              warn: 3,
-              resolved_from: "product-default",
-              bounded_by_lock: false,
-            },
-          },
-        ],
-      }),
-    );
-    const res = await fetchCatalog();
-    expect(res.metrics[0]?.metric_key).toBeUndefined();
-    // links can be absent on pre-ADR-003 backends; the type is optional.
-    expect(res.links).toBeUndefined();
-  });
-
-  it("throws CatalogApiError on non-2xx", async () => {
-    (globalThis.fetch as ReturnType<typeof vi.fn>).mockResolvedValue(
-      jsonResponse(
-        { type: "gts://gts.cf.core.errors.err.v1~cf.core.err.internal.v1~" },
-        { status: 500 },
-      ),
-    );
-    await expect(fetchCatalog()).rejects.toBeInstanceOf(CatalogApiError);
-  });
-});
diff --git a/src/api/catalog-client.ts b/src/api/catalog-client.ts
deleted file mode 100644
index c81759d6..00000000
--- a/src/api/catalog-client.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * Wire types + fetch wrapper for `POST /catalog/get_metrics` (Refs #66).
- *
- * The backend response shape (DESIGN §3.3, ADR-002, ADR-003) is:
- *
- *   {
- *     tenant_id, generated_at,
- *     metrics: [{ id, metric_key, label, sublabel?, description?, unit?,
- *                 format?, higher_is_better, is_member_scale,
- *                 source_tags: string[],
- *                 schema_status, schema_error_code?,
- *                 thresholds: { good, warn, alert_trigger?, alert_bad?,
- *                               resolved_from, bounded_by_lock } }],
- *     links: [{ query_id, catalog_metric_ids: Uuid[] }]
- *   }
- *
- * `id` (UUIDv7) is the stable lookup contract — consumers MUST key off `id`.
- * `metric_key` is the FE-bridge identifier (ADR-002) used while consumers
- * still refer to metrics by their bare wire name; it is parsed as optional
- * here so a deployed environment that predates ADR-002 still hydrates
- * cleanly.
- */
-
-import { fetchWithAuth } from '@/api/fetch-with-auth';
-
-const BASE =
-  (import.meta.env.VITE_API_BASE as string | undefined) ?? '/api/analytics/v1';
-
-export type SchemaStatus = 'ok' | 'error' | 'unchecked';
-
-export type SchemaErrorCode =
-  | 'table_not_found'
-  | 'column_not_found'
-  | 'clickhouse_unreachable'
-  | 'unknown';
-
-export type ResolvedFrom =
-  | 'team+role'
-  | 'team'
-  | 'role'
-  | 'tenant'
-  | 'product-default';
-
-export type ResolvedThresholds = {
-  good: number;
-  warn: number;
-  alert_trigger?: number;
-  alert_bad?: number;
-  /**
-   * Human-readable reason surfaced in AttentionNeeded callouts (Team View).
-   * Optional on the wire — older backends will omit it; FE consumers MUST
-   * tolerate `undefined` and fall through to a generic message.
-   */
-  alert_reason?: string;
-  resolved_from: ResolvedFrom;
-  bounded_by_lock: boolean;
-};
-
-export type CatalogMetric = {
-  /** Stable wire lookup identifier (UUIDv7). Consumers MUST key off this. */
-  id: string;
-  /**
-   * Backend `<table>.<column>` identifier (ADR-002). Optional on the type so
-   * a deployed env that predates the amendment still parses; runtime code
-   * MUST tolerate `undefined` here.
-   */
-  metric_key?: string;
-  label: string;
-  sublabel?: string;
-  description?: string;
-  unit?: string;
-  format?: string;
-  higher_is_better: boolean;
-  is_member_scale: boolean;
-  source_tags: string[];
-  schema_status: SchemaStatus;
-  schema_error_code?: SchemaErrorCode;
-  thresholds: ResolvedThresholds;
-};
-
-/**
- * One entry in the top-level `links` array (ADR-003). Tells a consumer which
- * `metric_catalog.id` UUIDs a `metrics.query_ref` emits. The mapping is
- * time/filter-invariant, so consumers cache it for the same TTL as the
- * catalog itself rather than recomputing it per value request.
- *
- * `links` is parsed as optional on the response type so older backends
- * (pre-ADR-003) still hydrate cleanly; consumers degrade gracefully on
- * absence (empty Layer-2 map).
- */
-export type MetricQueryLink = {
-  query_id: string;
-  catalog_metric_ids: string[];
-};
-
-export type CatalogResponse = {
-  tenant_id: string;
-  generated_at: string;
-  metrics: CatalogMetric[];
-  links?: MetricQueryLink[];
-};
-
-export type CatalogRequest = {
-  role_slug?: string;
-  team_id?: string;
-};
-
-/**
- * Storage-table prefix for each bullet section so consumers can derive the
- * wire-shape `metric_key` (e.g. `task_delivery_bullet_rows.tasks_completed`)
- * from the FE-level section id. Mirrors the prefixes the backend seed
- * migration writes; if the seed list ever changes, this map MUST stay in
- * sync — the byte-for-byte parity gate (PRD §12) is the regression
- * detector.
- *
- * Sections that aren't covered (defensive) default to
- * `task_delivery_bullet_rows`, matching the backend's most-common bucket.
- */
-export function prefixForBulletSection(section: string): string {
-  if (section === 'git_output') return 'git_bullet_rows';
-  if (section === 'code_quality') return 'code_quality_bullet_rows';
-  if (section === 'ai_adoption') return 'ai_bullet_rows';
-  if (section === 'collaboration') return 'collab_bullet_rows';
-  return 'task_delivery_bullet_rows';
-}
-
-export class CatalogApiError extends Error {
-  status: number;
-  body: unknown;
-
-  constructor(status: number, body: unknown) {
-    super(`Catalog API ${status}`);
-    this.name = 'CatalogApiError';
-    this.status = status;
-    this.body = body;
-  }
-}
-
-/**
- * Fetch the catalog for the current tenant + (role, team) context.
- *
- * Sends `POST /catalog/get_metrics` with `Content-Type: application/json` —
- * the backend rejects other content types with 415 per DESIGN §3.3's CSRF
- * model. Empty body `{}` resolves at the tenant / product-default chain
- * only, which is the default for top-level hydration.
- */
-export async function fetchCatalog(
-  req: CatalogRequest = {},
-): Promise<CatalogResponse> {
-  const res = await fetchWithAuth(`${BASE}/catalog/get_metrics`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(req),
-  });
-  if (!res.ok) {
-    const body = await res.json().catch(() => null);
-    throw new CatalogApiError(res.status, body);
-  }
-  try {
-    return (await res.json()) as CatalogResponse;
-  } catch {
-    throw new CatalogApiError(res.status, { error: 'invalid_json' });
-  }
-}
diff --git a/src/api/catalog-provider.test.tsx b/src/api/catalog-provider.test.tsx
deleted file mode 100644
index 0839848c..00000000
--- a/src/api/catalog-provider.test.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { render } from "@testing-library/react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const useCatalog = vi.fn(() => ({ data: undefined }));
-vi.mock("@/api/use-catalog", () => ({
-  useCatalog: () => useCatalog(),
-}));
-
-let tenantId: string | null = null;
-vi.mock("@/auth/use-auth", () => ({
-  useAuth: () => ({
-    session: tenantId ? { tenantId } : null,
-  }),
-}));
-
-import { CatalogProvider } from "@/api/catalog-provider";
-
-function renderProvider(client: QueryClient) {
-  return render(
-    <QueryClientProvider client={client}>
-      <CatalogProvider>
-        <span>child</span>
-      </CatalogProvider>
-    </QueryClientProvider>,
-  );
-}
-
-describe("CatalogProvider", () => {
-  beforeEach(() => {
-    useCatalog.mockClear();
-    tenantId = null;
-  });
-
-  it("does not prefetch without a tenant", () => {
-    const { getByText } = renderProvider(new QueryClient());
-    expect(getByText("child")).toBeInTheDocument();
-    expect(useCatalog).not.toHaveBeenCalled();
-  });
-
-  it("prefetches the catalog when a tenant is present", () => {
-    tenantId = "t1";
-    renderProvider(new QueryClient());
-    expect(useCatalog).toHaveBeenCalled();
-  });
-
-  it("evicts catalog queries only on a real tenant transition", () => {
-    const client = new QueryClient();
-    const removeQueries = vi.spyOn(client, "removeQueries");
-
-    tenantId = "t1";
-    const view = render(
-      <QueryClientProvider client={client}>
-        <CatalogProvider>
-          <span>child</span>
-        </CatalogProvider>
-      </QueryClientProvider>,
-    );
-    expect(removeQueries).not.toHaveBeenCalled();
-
-    tenantId = "t2";
-    view.rerender(
-      <QueryClientProvider client={client}>
-        <CatalogProvider>
-          <span>child</span>
-        </CatalogProvider>
-      </QueryClientProvider>,
-    );
-    expect(removeQueries).toHaveBeenCalledWith({ queryKey: ["catalog"] });
-
-    removeQueries.mockClear();
-    tenantId = null;
-    view.rerender(
-      <QueryClientProvider client={client}>
-        <CatalogProvider>
-          <span>child</span>
-        </CatalogProvider>
-      </QueryClientProvider>,
-    );
-    expect(removeQueries).not.toHaveBeenCalled();
-  });
-});
diff --git a/src/api/catalog-provider.tsx b/src/api/catalog-provider.tsx
deleted file mode 100644
index 1fb6dbe1..00000000
--- a/src/api/catalog-provider.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * `<CatalogProvider>` — root-level hydrator for the Metric Catalog (Refs #66).
- *
- * Why a provider exists when `useCatalog()` already works standalone:
- *
- * 1. **Prefetch.** Calling `useCatalog()` here populates the TanStack Query
- *    cache early so downstream consumers don't see a loading flash on the
- *    first dashboard render.
- * 2. **Tenant-switch invalidation.** Layer-1 + Layer-2 caches are tenant-
- *    keyed via the query key, so a tenant change naturally produces a
- *    miss. But the prior tenant's payload lingers in the QueryClient gc
- *    window — a few minutes of stale, wrong-tenant data sitting in memory.
- *    This provider proactively evicts on tenant change so cross-tenant
- *    bleed cannot happen, even in pathological "user clears cache and
- *    immediately switches" timing windows.
- * 3. **Anonymous routes.** When there's no tenant, the hook is a no-op
- *    (`fetchCatalog` would 401); the provider also no-ops by simply not
- *    calling the hook.
- */
-
-import { useEffect, useRef } from 'react';
-import { useQueryClient } from '@tanstack/react-query';
-
-import { useCatalog } from '@/api/use-catalog';
-import { useAuth } from '@/auth/use-auth';
-
-/**
- * Prefetches and keeps the catalog warm for the current tenant. Does not
- * render any UI; consumers continue to call `useCatalog()` directly from
- * their components (TanStack Query dedupes against the same key).
- */
-function CatalogPrefetch(): null {
-  // Drive the hook for its cache-population side effect. Result is
-  // discarded — children call `useCatalog()` themselves.
-  useCatalog();
-  return null;
-}
-
-export function CatalogProvider({
-  children,
-}: {
-  children: React.ReactNode;
-}): React.ReactElement {
-  const { session } = useAuth();
-  const tenantId = session?.tenantId || null;
-  const queryClient = useQueryClient();
-  const prevTenantRef = useRef<string | null>(tenantId);
-
-  // Evict every catalog-keyed query on tenant TRANSITION. The previous
-  // implementation evicted in the effect cleanup, which fires AFTER the
-  // new render commits — so children rendered for one paint cycle with
-  // the prior tenant's payload before the cleanup ran. Cross-tenant data
-  // MUST NOT be observable to the new tenant's session (DESIGN §3.3
-  // cache-layer contract + security-review #10).
-  //
-  // Effect body runs after commit too, but we also guard `useCatalog`
-  // with a `data.tenant_id === tenantId` check so the worst-case stale
-  // observation is converted into the fallback codepath rather than a
-  // wrong-tenant render. The `prevTenantRef` keeps unmount and first-
-  // mount from purging gratuitously: only an actual transition between
-  // two distinct non-null tenants evicts.
-  useEffect(() => {
-    const prev = prevTenantRef.current;
-    if (prev !== tenantId && prev !== null && tenantId !== null) {
-      queryClient.removeQueries({ queryKey: ['catalog'] });
-    }
-    prevTenantRef.current = tenantId;
-  }, [tenantId, queryClient]);
-
-  return (
-    <>
-      {tenantId ? <CatalogPrefetch /> : null}
-      {children}
-    </>
-  );
-}
diff --git a/src/api/index.ts b/src/api/index.ts
deleted file mode 100644
index 3f9550f4..00000000
--- a/src/api/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export {
-  AnalyticsApiError,
-  queryMetric,
-  queryMetricRaw,
-} from "@/api/analytics-client";
-export { METRIC_REGISTRY, type MetricRegistryKey, type MetricUuid } from "@/api/metric-registry";
-export {
-  andFilters,
-  odataDateFilter,
-  odataEscapeValue,
-  personScopeFilter,
-} from "@/api/odata";
-export {
-  periodToDateRange,
-  previousPeriodRange,
-  periodScale,
-  resolveDateRange,
-  toISODate,
-  type DateRange,
-} from "@/api/period-to-date-range";
-export type {
-  ODataParams,
-  ODataResponse,
-  ThresholdLevel,
-  Thresholds,
-} from "@/api/types";
diff --git a/src/api/metric-definitions-client.ts b/src/api/metric-definitions-client.ts
index 582a2485..e04f4677 100644
--- a/src/api/metric-definitions-client.ts
+++ b/src/api/metric-definitions-client.ts
@@ -18,7 +18,7 @@ import type {
 const BASE =
   (import.meta.env.VITE_API_BASE as string | undefined) ?? "/api/analytics/v1";
 
-export type MetricDefinitionSchemaStatus = "ok" | "error" | "unchecked";
+type MetricDefinitionSchemaStatus = "ok" | "error" | "unchecked";
 
 export interface MetricDefinition {
   metric_key: string;
@@ -38,7 +38,7 @@ export interface MetricDefinition {
   last_observed_date: string | null;
 }
 
-export type MetricSchemaErrorCode =
+type MetricSchemaErrorCode =
   | "table_not_found"
   | "column_not_found"
   | "dimension_not_covered"
diff --git a/src/api/metric-registry.ts b/src/api/metric-registry.ts
deleted file mode 100644
index 9bdc8fad..00000000
--- a/src/api/metric-registry.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/** Stable UUIDs seeded in the Analytics API catalog (MariaDB `metrics` table). */
-export const METRIC_REGISTRY = {
-  TEAM_MEMBER: "00000000-0000-0000-0001-000000000002",
-  TEAM_BULLET_DELIVERY: "00000000-0000-0000-0001-000000000003",
-  TEAM_BULLET_QUALITY: "00000000-0000-0000-0001-000000000004",
-  TEAM_BULLET_COLLAB: "00000000-0000-0000-0001-000000000005",
-  TEAM_BULLET_AI: "00000000-0000-0000-0001-000000000006",
-  TEAM_BULLET_GIT: "00000000-0000-0000-0001-000000000007",
-
-  IC_KPIS: "00000000-0000-0000-0001-000000000010",
-  IC_BULLET_DELIVERY: "00000000-0000-0000-0001-000000000011",
-  IC_BULLET_COLLAB: "00000000-0000-0000-0001-000000000012",
-  IC_BULLET_AI: "00000000-0000-0000-0001-000000000013",
-  IC_CHART_LOC: "00000000-0000-0000-0001-000000000014",
-  IC_CHART_DELIVERY: "00000000-0000-0000-0001-000000000015",
-  IC_DRILL: "00000000-0000-0000-0001-000000000016",
-  IC_TIMEOFF: "00000000-0000-0000-0001-000000000017",
-  IC_BULLET_GIT: "00000000-0000-0000-0001-000000000018",
-
-  CRM_KPIS: "00000000-0000-0000-0001-000000000020",
-  CRM_CHART_FLOW: "00000000-0000-0000-0001-000000000021",
-  CRM_BULLET_QUALITY: "00000000-0000-0000-0001-000000000022",
-  CRM_BULLET_ACTIVITY: "00000000-0000-0000-0001-000000000023",
-  CRM_PIPELINE_NOW: "00000000-0000-0000-0001-000000000028",
-
-  V2_IC_HISTOGRAM: "00000000-0000-0000-0001-000000000030",
-  V2_IC_SECTION_TREND: "00000000-0000-0000-0001-000000000036",
-
-  // Per-person PRs merged for a roster (period-bounded, from the weekly git
-  // silver). Merged into the team_member rows for the roster's PRs column.
-  V2_MEMBER_PRS: "00000000-0000-0000-0001-000000000043",
-} as const satisfies Record<string, string>;
-
-export type MetricRegistryKey = keyof typeof METRIC_REGISTRY;
-export type MetricUuid = (typeof METRIC_REGISTRY)[MetricRegistryKey];
diff --git a/src/api/metric-results-client.ts b/src/api/metric-results-client.ts
index b9c09b75..bc9a5e7a 100644
--- a/src/api/metric-results-client.ts
+++ b/src/api/metric-results-client.ts
@@ -95,7 +95,7 @@ export interface MedianMetricResult extends MetricResultBase {
   computation: "median";
 }
 
-export interface DistinctCountMetricResult extends MetricResultBase {
+interface DistinctCountMetricResult extends MetricResultBase {
   computation: "distinct_count";
 }
 
@@ -149,7 +149,7 @@ export interface BreakdownView {
   }>;
 }
 
-export interface HistogramBin {
+interface HistogramBin {
   lo: number;
   hi: number;
   count: number;
diff --git a/src/api/metric-semantics.test.ts b/src/api/metric-semantics.test.ts
deleted file mode 100644
index c814eaee..00000000
--- a/src/api/metric-semantics.test.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Pure-function tests for `evaluateStatus` and `teamHealthStatus`
- * (Refs #79).
- *
- * `evaluateStatus` lost its `METRIC_SEMANTICS`-lookup behavior in #79 and
- * is now a pure `(value, thresholds, higher_is_better)` function — tests
- * exercise both polarity directions across the good/warn/bad bands.
- *
- * `teamHealthStatus` keeps its member-scale fraction rule: a count of
- * affected members against team size, with 0 always reading as 'good'.
- */
-
-import { describe, expect, it } from "vitest";
-
-import { evaluateStatus, teamHealthStatus } from "./metric-semantics";
-
-describe("evaluateStatus", () => {
-  describe("higher_is_better=true", () => {
-    const thresholds = { good: 90, warn: 80 };
-
-    it("returns 'good' when value >= good", () => {
-      expect(evaluateStatus(95, thresholds, true)).toBe("good");
-      // Boundary: equal to `good` still counts as good (inclusive band).
-      expect(evaluateStatus(90, thresholds, true)).toBe("good");
-    });
-
-    it("returns 'warn' when good > value >= warn", () => {
-      expect(evaluateStatus(85, thresholds, true)).toBe("warn");
-      // Boundary: equal to `warn` is the lower edge of the warn band.
-      expect(evaluateStatus(80, thresholds, true)).toBe("warn");
-    });
-
-    it("returns 'bad' when value < warn", () => {
-      expect(evaluateStatus(79, thresholds, true)).toBe("bad");
-      expect(evaluateStatus(0, thresholds, true)).toBe("bad");
-    });
-  });
-
-  describe("higher_is_better=false", () => {
-    const thresholds = { good: 14, warn: 20 };
-
-    it("returns 'good' when value <= good", () => {
-      expect(evaluateStatus(10, thresholds, false)).toBe("good");
-      expect(evaluateStatus(14, thresholds, false)).toBe("good");
-    });
-
-    it("returns 'warn' when good < value <= warn", () => {
-      expect(evaluateStatus(15, thresholds, false)).toBe("warn");
-      expect(evaluateStatus(20, thresholds, false)).toBe("warn");
-    });
-
-    it("returns 'bad' when value > warn", () => {
-      expect(evaluateStatus(21, thresholds, false)).toBe("bad");
-      expect(evaluateStatus(100, thresholds, false)).toBe("bad");
-    });
-  });
-
-  it("is pure — ignores extra catalog fields when given a wider thresholds object", () => {
-    // Confirms the signature accepts any `{ good, warn }` plus extras —
-    // the catalog row from `useCatalog` carries `resolved_from`,
-    // `bounded_by_lock`, etc., and feeding it directly MUST work.
-    const catalogShape = {
-      good: 90,
-      warn: 80,
-      alert_trigger: 90,
-      alert_bad: 80,
-      resolved_from: "tenant" as const,
-      bounded_by_lock: false,
-    };
-    expect(evaluateStatus(95, catalogShape, true)).toBe("good");
-  });
-});
-
-describe("teamHealthStatus", () => {
-  it("returns 'good' for count=0 regardless of team size", () => {
-    expect(teamHealthStatus(0, 1)).toBe("good");
-    expect(teamHealthStatus(0, 1000)).toBe("good");
-  });
-
-  it("returns 'good' for an empty team (teamSize=0) — no scale to compute against", () => {
-    expect(teamHealthStatus(5, 0)).toBe("good");
-  });
-
-  it("returns 'bad' at and above the 25% fraction", () => {
-    // 25% — exact match to badPct: 0.25.
-    expect(teamHealthStatus(3, 12)).toBe("bad");
-    // 50% — well above.
-    expect(teamHealthStatus(5, 10)).toBe("bad");
-  });
-
-  it("returns 'warn' in the 10%–25% range", () => {
-    // 10% — exact match to warnPct: 0.10.
-    expect(teamHealthStatus(1, 10)).toBe("warn");
-    // 20% — clearly warn.
-    expect(teamHealthStatus(4, 20)).toBe("warn");
-  });
-
-  it("returns 'good' below the warn fraction", () => {
-    // 5% — below warnPct.
-    expect(teamHealthStatus(1, 20)).toBe("good");
-  });
-});
diff --git a/src/api/metric-semantics.ts b/src/api/metric-semantics.ts
deleted file mode 100644
index b10d00d1..00000000
--- a/src/api/metric-semantics.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Pure status / health helpers (Refs #79).
- *
- * Per-metric threshold values flow through `useCatalog()` (see
- * `view-configs.ts`); this module owns the rendering rule only. Compile-in
- * defaults were removed in #82 — when the catalog is unavailable the
- * surfaces render skeletons / error states instead of falling back to a
- * synthesized threshold.
- */
-
-// Fractions of headcount — chip status scales with team size instead of
-// using a fixed absolute rule that collapses for teams larger than a few
-// people.
-export const TEAM_HEALTH_THRESHOLDS = {
-  /** From this fraction onward, and below `badPct` → status is 'warn'. */
-  warnPct: 0.10,
-  /** From this fraction onward → status is 'bad'. */
-  badPct: 0.25,
-} as const;
-
-/**
- * Translate a count of affected members into a status chip, scaled against
- * team size. `count===0` is always 'good' so an all-healthy team still reads
- * 'good' regardless of how small the team is.
- */
-export function teamHealthStatus(
-  count: number,
-  teamSize: number,
-): 'good' | 'warn' | 'bad' {
-  if (count <= 0 || teamSize <= 0) return 'good';
-  const pct = count / teamSize;
-  if (pct >= TEAM_HEALTH_THRESHOLDS.badPct) return 'bad';
-  if (pct >= TEAM_HEALTH_THRESHOLDS.warnPct) return 'warn';
-  return 'good';
-}
-
-/**
- * Shared status evaluator — same rule on every screen. `thresholds.good`
- * and `thresholds.warn` come from the catalog (`ResolvedThresholds`) or
- * from a synthesized object built by FE callers; the function is pure and
- * has no knowledge of the catalog.
- */
-export function evaluateStatus(
-  value: number,
-  thresholds: { good: number; warn: number },
-  higher_is_better: boolean,
-): 'good' | 'warn' | 'bad' {
-  if (higher_is_better) {
-    if (value >= thresholds.good) return 'good';
-    if (value >= thresholds.warn) return 'warn';
-    return 'bad';
-  }
-  if (value <= thresholds.good) return 'good';
-  if (value <= thresholds.warn) return 'warn';
-  return 'bad';
-}
diff --git a/src/api/odata.ts b/src/api/odata.ts
deleted file mode 100644
index 3f4526a8..00000000
--- a/src/api/odata.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { DateRange } from "@/api/types";
-
-export function odataEscapeValue(value: string): string {
-  return value.replace(/'/g, "''");
-}
-
-export function odataDateFilter(range: DateRange): string {
-  return `metric_date ge '${range.from}' and metric_date le '${range.to}'`;
-}
-
-export function personScopeFilter(personId: string): string {
-  return `person_id eq '${odataEscapeValue(personId.toLowerCase())}'`;
-}
-
-export function andFilters(...parts: Array<string | undefined>): string {
-  return parts.filter((p): p is string => Boolean(p)).join(" and ");
-}
diff --git a/src/api/period-to-date-range.test.ts b/src/api/period-to-date-range.test.ts
index 2f91b44e..19c46cf6 100644
--- a/src/api/period-to-date-range.test.ts
+++ b/src/api/period-to-date-range.test.ts
@@ -1,9 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import {
-  odataDateFilter,
-  odataEscapeValue,
-  periodScale,
   periodToDateRange,
   previousPeriodRange,
   resolveDateRange,
@@ -126,24 +123,3 @@ describe("previousPeriodRange", () => {
   });
 });
 
-describe("periodScale", () => {
-  it("maps each period to its day count", () => {
-    expect(periodScale("week")).toBe(7);
-    expect(periodScale("month")).toBe(30);
-    expect(periodScale("quarter")).toBe(90);
-    expect(periodScale("year")).toBe(365);
-  });
-});
-
-describe("odata helpers", () => {
-  it("builds the inclusive metric_date filter", () => {
-    expect(odataDateFilter({ from: "2026-01-01", to: "2026-01-07" })).toBe(
-      "metric_date ge '2026-01-01' and metric_date le '2026-01-07'",
-    );
-  });
-
-  it("doubles single quotes in filter values", () => {
-    expect(odataEscapeValue("O'Brien's")).toBe("O''Brien''s");
-    expect(odataEscapeValue("plain")).toBe("plain");
-  });
-});
diff --git a/src/api/period-to-date-range.ts b/src/api/period-to-date-range.ts
index fb0c91a3..952bfd2a 100644
--- a/src/api/period-to-date-range.ts
+++ b/src/api/period-to-date-range.ts
@@ -175,23 +175,3 @@ export function previousPeriodRange(
   return { from: shift(range.from), to: shift(range.to) };
 }
 
-export function periodScale(period: PeriodValue): number {
-  switch (period) {
-    case "week":
-      return 7;
-    case "month":
-      return 30;
-    case "quarter":
-      return 90;
-    case "year":
-      return 365;
-  }
-}
-
-export function odataDateFilter(range: DateRange): string {
-  return `metric_date ge '${range.from}' and metric_date le '${range.to}'`;
-}
-
-export function odataEscapeValue(value: string): string {
-  return value.replace(/'/g, "''");
-}
diff --git a/src/api/raw-types.ts b/src/api/raw-types.ts
deleted file mode 100644
index 303da2db..00000000
--- a/src/api/raw-types.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/** POST /metrics/{IC_KPIS}/query */
-export type RawIcAggregateRow = {
-  person_id: string;
-  // loc/prs_merged/pr_cycle_time_h: Bitbucket diffstat + PR ingestion not
-  // wired; insight.ic_kpis emits NULL (see CH migration 20260422100000).
-  loc: number | null;
-  ai_loc_share_pct: number;
-  prs_merged: number | null;
-  pr_cycle_time_h: number | null;
-  focus_time_pct: number;
-  tasks_closed: number;
-  bugs_fixed: number;
-  build_success_pct: number | null;
-  ai_sessions: number;
-  // Department peer medians (one per KPI column) + cohort size, folded into
-  // the IC_KPIS query_ref (analytics-api m20260604_000006). NULL when the
-  // person has no department cohort. Replaces the standalone
-  // ic_kpi_peer_median query. Optional so mock/legacy rows still parse.
-  loc_median?: number | null;
-  ai_loc_share_pct_median?: number | null;
-  prs_merged_median?: number | null;
-  pr_cycle_time_h_median?: number | null;
-  focus_time_pct_median?: number | null;
-  tasks_closed_median?: number | null;
-  bugs_fixed_median?: number | null;
-  build_success_pct_median?: number | null;
-  ai_sessions_median?: number | null;
-  peer_n?: number | null;
-};
-
-/** POST /metrics/{TEAM_MEMBER}/query */
-export type RawTeamMemberRow = {
-  person_id: string;
-  display_name: string;
-  seniority: string;
-  supervisor_email: string | null;
-  // Department the member belongs to (`org_unit_id`), scoping their peer
-  // distribution. NULL when identity has no department for the person.
-  org_unit_id: string | null;
-  tasks_closed: number;
-  bugs_fixed: number;
-  // dev_time_h/focus_time_pct/ai_loc_share_pct: upstream source may be
-  // missing; insight.team_member emits NULL (CH migration 20260422150000).
-  // prs_merged: Bitbucket PR ingestion not wired (CH migration 20260423120000).
-  dev_time_h: number | null;
-  prs_merged: number | null;
-  build_success_pct: number | null;
-  focus_time_pct: number | null;
-  ai_tools: string[];
-  ai_loc_share_pct: number | null;
-};
-
-/** POST /metrics/{IC_CHART_LOC}/query */
-export type RawLocTrendRow = {
-  date_bucket: string;
-  code_loc: number;
-  spec_lines: number;
-  config_loc: number;
-};
-
-/** POST /metrics/{IC_CHART_DELIVERY}/query */
-export type RawDeliveryTrendRow = {
-  date_bucket: string;
-  commits: number;
-  // Bitbucket PR ingestion not wired — insight.ic_chart_delivery emits NULL.
-  prs_merged: number | null;
-  tasks_done: number;
-};
-
-/** POST /metrics/{*_BULLET_*}/query */
-export type RawBulletAggregateRow = {
-  metric_key: string;
-  value: number;
-  median: number | null;
-  range_min: number | null;
-  range_max: number | null;
-  // Cohort distribution carried on each bullet row (analytics-api
-  // *_bullet_distribution query_refs): p25/p75 quartiles + cohort size.
-  // median=p50, range_min=min, range_max=max. NULL when no cohort.
-  // Optional on the type so mock/legacy rows without them still parse.
-  p25?: number | null;
-  p75?: number | null;
-  n?: number | null;
-};
-
-/** POST /metrics/{IC_TIMEOFF}/query */
-export type RawTimeOffRow = {
-  days: number;
-  date_range: string;
-  bamboo_hr_url: string;
-};
-
-/** POST /metrics/{IC_DRILL}/query */
-export type RawDrillRow = {
-  title: string;
-  source: string;
-  src_class: string;
-  value: string;
-  filter: string;
-  columns: string[];
-  rows: Array<Record<string, string | number>>;
-};
-
-/**
- * POST /metrics/{CRM_KPIS}/query — sales-rep hero strip + pacing band source.
- * CH JSON encodes UInt aggregates as strings, Float64 as numbers; coerce in transforms.
- */
-export type RawCrmKpisRow = {
-  person_id: string;
-  deals_opened: number | string | null;
-  deals_closed: number | string | null;
-  deals_won: number | string | null;
-  deals_value_closed: number | string | null;
-  comms_count: number | string | null;
-};
-
-/**
- * POST /metrics/{CRM_PIPELINE_NOW}/query — date-less stock snapshot of open
- * deals per rep. A distinct metric from `CRM_KPIS` (a period flow sum): the
- * gold view `insight.crm_pipeline_now` exposes no `metric_date` column, so
- * the FE queries it without a period (`queryMetricRaw`).
- */
-export type RawCrmPipelineRow = {
-  person_id: string;
-  pipeline_count: number | string | null;
-  pipeline_value: number | string | null;
-};
-
-/** POST /metrics/{CRM_CHART_FLOW}/query — weekly deal-flow series. */
-export type RawCrmFlowRow = {
-  date_bucket: string;
-  metric_date: string;
-  opened: number | string;
-  closed: number | string;
-  won: number | string;
-};
diff --git a/src/api/transforms.test.ts b/src/api/transforms.test.ts
deleted file mode 100644
index efe1d1b2..00000000
--- a/src/api/transforms.test.ts
+++ /dev/null
@@ -1,1029 +0,0 @@
-/**
- * Catalog-driven transform tests (Refs #78, #82).
- *
- * Pins the contract: `transformBulletMetrics` / `transformIcKpis` consume
- * the hydrated Metric Catalog and have no compile-in fallback. See
- * DESIGN §3.3 "Catalog Consumer Contract":
- *  - `schema_status='error'` → suppress threshold-based coloring
- *    (`status='unavailable'`) and flag the row with `schema_error: true`.
- *  - `schema_status='unchecked'` → render identically to `ok`.
- *  - Missing-id (catalog row absent) → silently omit.
- *  - Honest-zero rows use the catalog's label.
- *  - Catalog === undefined → empty array (consumers render skeletons).
- */
-
-import { describe, expect, it } from "vitest";
-
-import type { CatalogMetric, CatalogResponse } from "./catalog-client";
-import type {
-  RawBulletAggregateRow,
-  RawCrmFlowRow,
-  RawCrmKpisRow,
-  RawCrmPipelineRow,
-  RawDeliveryTrendRow,
-  RawDrillRow,
-  RawIcAggregateRow,
-  RawLocTrendRow,
-  RawTeamMemberRow,
-  RawTimeOffRow,
-} from "./raw-types";
-import {
-  formatKpiValue,
-  transformBulletMetrics,
-  transformCrmBullets,
-  transformCrmFlow,
-  transformCrmKpis,
-  transformCrmPipeline,
-  transformDeliveryTrend,
-  transformDrill,
-  transformIcKpis,
-  transformLocTrend,
-  transformTeamMembers,
-  transformTimeOff,
-} from "./transforms";
-
-const TENANT = "t-test";
-
-function bulletCatalogRow(
-  bareKey: string,
-  overrides: Partial<CatalogMetric> = {},
-): CatalogMetric {
-  // Default to a task_delivery_bullet_rows wire-prefix; tests that need
-  // other prefixes override `metric_key` explicitly.
-  return {
-    id: `id-${bareKey}`,
-    metric_key: `task_delivery_bullet_rows.${bareKey}`,
-    label: `Label ${bareKey}`,
-    sublabel: `Sublabel ${bareKey}`,
-    higher_is_better: true,
-    is_member_scale: false,
-    source_tags: [],
-    schema_status: "ok",
-    thresholds: {
-      good: 5,
-      warn: 3,
-      resolved_from: "product-default",
-      bounded_by_lock: false,
-    },
-    ...overrides,
-  };
-}
-
-function catalogWith(metrics: CatalogMetric[]): CatalogResponse {
-  return {
-    tenant_id: TENANT,
-    generated_at: "2026-06-01T00:00:00Z",
-    metrics,
-    links: [],
-  };
-}
-
-function rawBullet(
-  bareKey: string,
-  overrides: Partial<RawBulletAggregateRow> = {},
-): RawBulletAggregateRow {
-  return {
-    metric_key: bareKey,
-    value: 7,
-    median: 5,
-    range_min: 0,
-    range_max: 10,
-    ...overrides,
-  };
-}
-
-describe("transformBulletMetrics", () => {
-  it("renders schema_status='ok' rows with threshold-based status (parity)", () => {
-    const catalog = catalogWith([bulletCatalogRow("tasks_completed")]);
-    const out = transformBulletMetrics(
-      [rawBullet("tasks_completed", { value: 7 })],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(out).toHaveLength(1);
-    expect(out[0]!.status).toBe("good");
-    expect(out[0]!.schema_error).toBeUndefined();
-    expect(out[0]!.label).toBe("Label tasks_completed");
-  });
-
-  it("renders schema_status='unchecked' identically to 'ok' (no schema_error flag)", () => {
-    const catalog = catalogWith([
-      bulletCatalogRow("tasks_completed", { schema_status: "unchecked" }),
-    ]);
-    const out = transformBulletMetrics(
-      [rawBullet("tasks_completed", { value: 7 })],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(out).toHaveLength(1);
-    // Threshold-based status still computed (same as 'ok' path).
-    expect(out[0]!.status).toBe("good");
-    expect(out[0]!.schema_error).toBeUndefined();
-  });
-
-  it("flags schema_status='error' rows with schema_error:true and suppresses threshold coloring", () => {
-    const catalog = catalogWith([
-      bulletCatalogRow("tasks_completed", { schema_status: "error" }),
-    ]);
-    const out = transformBulletMetrics(
-      [rawBullet("tasks_completed", { value: 7 })],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(out).toHaveLength(1);
-    expect(out[0]!.schema_error).toBe(true);
-    // Threshold coloring suppressed → status falls back to 'unavailable'.
-    expect(out[0]!.status).toBe("unavailable");
-    // Label still visible — consumers render it next to the broken indicator.
-    expect(out[0]!.label).toBe("Label tasks_completed");
-  });
-
-  it("silently omits raw rows whose metric_key isn't in the catalog (missing-id)", () => {
-    // Catalog knows only tasks_completed; backend returns an extra
-    // `ghost_metric` row (e.g. catalog row was deleted between hydration
-    // and this fetch).
-    const catalog = catalogWith([bulletCatalogRow("tasks_completed")]);
-    const out = transformBulletMetrics(
-      [
-        rawBullet("tasks_completed", { value: 7 }),
-        rawBullet("ghost_metric", { value: 99 }),
-      ],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(out).toHaveLength(1);
-    expect(out[0]!.metric_key).toBe("tasks_completed");
-  });
-
-  it("backfills honest-zero rows for catalog gaps when the section responded", () => {
-    // Override the label so we can confirm the transform sources from the
-    // catalog row (no compile-in fallback exists post-#82).
-    const catalog = catalogWith([
-      bulletCatalogRow("tasks_completed", { label: "Tasks Closed" }),
-      bulletCatalogRow("task_dev_time", { label: "Catalog Override Label" }),
-    ]);
-    // Backend answered the section with one metric; the catalog-known gap is
-    // backfilled as an honest zero.
-    const out = transformBulletMetrics(
-      [rawBullet("tasks_completed", { value: 7 })],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(out).toHaveLength(2);
-    const synth = out.find((r) => r.metric_key === "task_dev_time")!;
-    expect(synth.label).toBe("Catalog Override Label");
-    // Honest-zero rows have no distribution → 'unavailable'.
-    expect(synth.status).toBe("unavailable");
-  });
-
-  it("returns no rows when the backend answered the section with nothing", () => {
-    // An entirely absent section is "no data for this period" — the transform
-    // must not fabricate a grid of zeros that masks the empty state.
-    const catalog = catalogWith([bulletCatalogRow("tasks_completed")]);
-    const out = transformBulletMetrics(
-      [],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(out).toHaveLength(0);
-  });
-
-  it("filters catalog rows by section prefix (mismatched prefix is omitted)", () => {
-    // git_output → wire prefix `git_bullet_rows`. A catalog row with a
-    // task_delivery_bullet_rows prefix must NOT be picked up.
-    const catalog = catalogWith([
-      bulletCatalogRow("tasks_completed"), // task_delivery prefix
-      bulletCatalogRow("commits", {
-        metric_key: "git_bullet_rows.commits",
-        label: "Commits Authored",
-      }),
-    ]);
-    const out = transformBulletMetrics(
-      [rawBullet("commits", { value: 30 })],
-      "git_output",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(out).toHaveLength(1);
-    expect(out[0]!.metric_key).toBe("commits");
-    expect(out[0]!.label).toBe("Commits Authored");
-  });
-
-  it("keeps hour-unit bullets in hours even when the cohort range exceeds 48h (#1475)", () => {
-    // Regression: the FE used to rescale any 'h' bullet to days (÷24) once the
-    // cohort's range_max crossed 48h, diverging the displayed unit from the
-    // backend catalog (whose thresholds stay in hours). The displayed unit must
-    // always equal the catalog unit, regardless of cohort spread.
-    const catalog = catalogWith([bulletCatalogRow("task_dev_time", { unit: "h" })]);
-    const out = transformBulletMetrics(
-      [
-        rawBullet("task_dev_time", {
-          value: 60,
-          median: 50,
-          range_min: 0,
-          range_max: 96,
-        }),
-      ],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(out).toHaveLength(1);
-    expect(out[0]!.unit).toBe("h");
-    expect(out[0]!.value).toBe("60");
-    expect(out[0]!.range_max).toBe("96h");
-  });
-});
-
-function icKpiRow(
-  bareKey: string,
-  overrides: Partial<CatalogMetric> = {},
-): CatalogMetric {
-  return {
-    id: `id-kpi-${bareKey}`,
-    metric_key: `ic_kpis.${bareKey}`,
-    label: `KPI ${bareKey}`,
-    sublabel: "src",
-    description: "desc",
-    higher_is_better: true,
-    is_member_scale: false,
-    source_tags: [],
-    schema_status: "ok",
-    format: "integer",
-    thresholds: {
-      good: 0,
-      warn: 0,
-      resolved_from: "product-default",
-      bounded_by_lock: false,
-    },
-    ...overrides,
-  };
-}
-
-function rawIcAggregate(
-  overrides: Partial<RawIcAggregateRow> = {},
-): RawIcAggregateRow {
-  return {
-    person_id: "p",
-    loc: null,
-    ai_loc_share_pct: 0,
-    prs_merged: null,
-    pr_cycle_time_h: null,
-    focus_time_pct: 0,
-    tasks_closed: 0,
-    bugs_fixed: 0,
-    build_success_pct: null,
-    ai_sessions: 0,
-    ...overrides,
-  };
-}
-
-describe("transformIcKpis", () => {
-  it("emits one IcKpi per catalog ic_kpis row using catalog label / sublabel", () => {
-    const catalog = catalogWith([
-      icKpiRow("tasks_closed", { label: "Catalog Tasks Closed" }),
-      icKpiRow("bugs_fixed", { label: "Catalog Bugs Fixed" }),
-    ]);
-    const out = transformIcKpis(
-      rawIcAggregate({ tasks_closed: 8, bugs_fixed: 2 }),
-      null,
-      "week",
-      catalog,
-    );
-    const byKey = new Map(out.map((r) => [r.metric_key, r]));
-    expect(byKey.get("tasks_closed")?.label).toBe("Catalog Tasks Closed");
-    expect(byKey.get("tasks_closed")?.raw_value).toBe(8);
-    expect(byKey.get("bugs_fixed")?.label).toBe("Catalog Bugs Fixed");
-    expect(byKey.get("bugs_fixed")?.raw_value).toBe(2);
-  });
-
-  it("omits catalog ic_kpis rows whose bare key has no raw aggregate column", () => {
-    // `unknown_metric` is not a column on RawIcAggregateRow → transform
-    // can't source its raw value and silently omits.
-    const catalog = catalogWith([
-      icKpiRow("tasks_closed"),
-      icKpiRow("unknown_metric"),
-    ]);
-    const out = transformIcKpis(
-      rawIcAggregate({ tasks_closed: 8 }),
-      null,
-      "week",
-      catalog,
-    );
-    expect(out.map((r) => r.metric_key)).toEqual(["tasks_closed"]);
-  });
-
-  it("returns [] when the current raw aggregate row is null", () => {
-    const catalog = catalogWith([icKpiRow("tasks_closed")]);
-    expect(transformIcKpis(null, null, "week", catalog)).toEqual([]);
-  });
-
-  it("returns [] when catalog is undefined (no labels → skeletons)", () => {
-    expect(
-      transformIcKpis(rawIcAggregate({ tasks_closed: 8 }), null, "week", undefined),
-    ).toEqual([]);
-  });
-});
-
-describe("transformBulletMetrics undefined-catalog handling", () => {
-  it("returns [] when catalog is undefined", () => {
-    expect(
-      transformBulletMetrics(
-        [rawBullet("tasks_completed", { value: 7 })],
-        "task_delivery",
-        "week",
-        undefined,
-        "ic",
-        undefined,
-      ),
-    ).toEqual([]);
-  });
-});
-
-describe("transformTeamMembers", () => {
-  function rawMember(
-    overrides: Partial<RawTeamMemberRow> = {},
-  ): RawTeamMemberRow {
-    return {
-      person_id: "alice@example.com",
-      display_name: "Alice Kim",
-      seniority: "Senior",
-      supervisor_email: "bob@example.com",
-      org_unit_id: "Engineering",
-      tasks_closed: 8,
-      bugs_fixed: 2,
-      dev_time_h: 14,
-      prs_merged: 3,
-      build_success_pct: 96,
-      focus_time_pct: 72,
-      ai_tools: ["Cursor"],
-      ai_loc_share_pct: 27,
-      ...overrides,
-    };
-  }
-
-  it("extracts org_unit_id onto the member", () => {
-    const [member] = transformTeamMembers(
-      [rawMember({ org_unit_id: "Engineering" })],
-      "month",
-    );
-    expect(member.org_unit_id).toBe("Engineering");
-  });
-
-  it("maps a missing org_unit_id to null", () => {
-    const [member] = transformTeamMembers(
-      [rawMember({ org_unit_id: null })],
-      "month",
-    );
-    expect(member.org_unit_id).toBeNull();
-  });
-});
-
-describe("formatKpiValue", () => {
-  it("rounds by catalog format", () => {
-    expect(formatKpiValue(3.44, "decimal1")).toBe("3.4");
-    expect(formatKpiValue(78.6, "percent")).toBe("79");
-    expect(formatKpiValue(7.6, "hours")).toBe("8h");
-    expect(formatKpiValue(7.4, "integer")).toBe("7");
-  });
-
-  it("falls back to whole-number display for unknown / missing formats", () => {
-    expect(formatKpiValue(7.4, undefined)).toBe("7");
-    expect(formatKpiValue(7.6, "weird-wire-format")).toBe("8");
-  });
-});
-
-describe("transformIcKpis deltas and peer medians", () => {
-  it("computes a good delta when higher is better and the value rose", () => {
-    const catalog = catalogWith([icKpiRow("tasks_closed")]);
-    const [kpi] = transformIcKpis(
-      rawIcAggregate({ tasks_closed: 8 }),
-      rawIcAggregate({ tasks_closed: 5 }),
-      "week",
-      catalog,
-    );
-    expect(kpi.delta).toBe("+3");
-    expect(kpi.delta_type).toBe("good");
-  });
-
-  it("computes a bad delta when lower is better and the value rose", () => {
-    const catalog = catalogWith([
-      icKpiRow("pr_cycle_time_h", { higher_is_better: false, format: "hours" }),
-    ]);
-    const [kpi] = transformIcKpis(
-      rawIcAggregate({ pr_cycle_time_h: 12.4 }),
-      rawIcAggregate({ pr_cycle_time_h: 10 }),
-      "week",
-      catalog,
-    );
-    expect(kpi.value).toBe("12h");
-    expect(kpi.delta).toBe("+2h");
-    expect(kpi.delta_type).toBe("bad");
-  });
-
-  it("treats a lower-is-better drop as good", () => {
-    const catalog = catalogWith([
-      icKpiRow("pr_cycle_time_h", { higher_is_better: false, format: "hours" }),
-    ]);
-    const [kpi] = transformIcKpis(
-      rawIcAggregate({ pr_cycle_time_h: 8 }),
-      rawIcAggregate({ pr_cycle_time_h: 10 }),
-      "week",
-      catalog,
-    );
-    expect(kpi.delta).toBe("-2h");
-    expect(kpi.delta_type).toBe("good");
-  });
-
-  it("formats percent and decimal1 deltas per catalog format", () => {
-    const catalog = catalogWith([
-      icKpiRow("focus_time_pct", { format: "percent" }),
-      icKpiRow("ai_loc_share_pct", { format: "decimal1" }),
-    ]);
-    const out = transformIcKpis(
-      rawIcAggregate({ focus_time_pct: 72, ai_loc_share_pct: 3.46 }),
-      rawIcAggregate({ focus_time_pct: 70, ai_loc_share_pct: 1.2 }),
-      "week",
-      catalog,
-    );
-    const byKey = new Map(out.map((r) => [r.metric_key, r]));
-    expect(byKey.get("focus_time_pct")?.value).toBe("72");
-    expect(byKey.get("focus_time_pct")?.delta).toBe("+2%");
-    expect(byKey.get("ai_loc_share_pct")?.value).toBe("3.5");
-    expect(byKey.get("ai_loc_share_pct")?.delta).toBe("+2");
-  });
-
-  it("marks a near-zero delta neutral", () => {
-    const catalog = catalogWith([icKpiRow("tasks_closed")]);
-    const [kpi] = transformIcKpis(
-      rawIcAggregate({ tasks_closed: 5 }),
-      rawIcAggregate({ tasks_closed: 5 }),
-      "week",
-      catalog,
-    );
-    expect(kpi.delta).toBe("0");
-    expect(kpi.delta_type).toBe("neutral");
-  });
-
-  it("emits null value and empty delta when the raw column is NULL", () => {
-    const catalog = catalogWith([icKpiRow("prs_merged")]);
-    const [kpi] = transformIcKpis(
-      rawIcAggregate({ prs_merged: null }),
-      rawIcAggregate({ prs_merged: 3 }),
-      "week",
-      catalog,
-    );
-    expect(kpi.value).toBeNull();
-    expect(kpi.raw_value).toBeNull();
-    expect(kpi.delta).toBe("");
-    expect(kpi.delta_type).toBe("neutral");
-  });
-
-  it("skips the delta when the previous row is missing", () => {
-    const catalog = catalogWith([icKpiRow("tasks_closed")]);
-    const [kpi] = transformIcKpis(
-      rawIcAggregate({ tasks_closed: 8 }),
-      null,
-      "week",
-      catalog,
-    );
-    expect(kpi.delta).toBe("");
-    expect(kpi.delta_type).toBe("neutral");
-  });
-
-  it("folds the department peer median and cohort size onto the row", () => {
-    const catalog = catalogWith([icKpiRow("tasks_closed")]);
-    const [kpi] = transformIcKpis(
-      rawIcAggregate({ tasks_closed: 8, tasks_closed_median: 6, peer_n: 9 }),
-      null,
-      "week",
-      catalog,
-    );
-    expect(kpi.peer_median).toBe(6);
-    expect(kpi.peer_n).toBe(9);
-  });
-
-  it("maps a NULL peer median / cohort to null", () => {
-    const catalog = catalogWith([icKpiRow("tasks_closed")]);
-    const [kpi] = transformIcKpis(
-      rawIcAggregate({ tasks_closed: 8, tasks_closed_median: null, peer_n: null }),
-      null,
-      "week",
-      catalog,
-    );
-    expect(kpi.peer_median).toBeNull();
-    expect(kpi.peer_n).toBeNull();
-  });
-});
-
-describe("transformBulletMetrics member-scale and peer cohorts", () => {
-  it("rewrites unit and range for member-scale metrics when team size is known", () => {
-    const catalog = catalogWith([
-      bulletCatalogRow("active_ai_members", {
-        metric_key: "ai_bullet_rows.active_ai_members",
-        is_member_scale: true,
-        unit: "count",
-      }),
-    ]);
-    const [row] = transformBulletMetrics(
-      [
-        rawBullet("active_ai_members", {
-          value: 5,
-          median: 4,
-          range_min: 2,
-          range_max: 8,
-          p25: 3,
-          p75: 6,
-          n: 5,
-        }),
-      ],
-      "ai_adoption",
-      "week",
-      12,
-      "team",
-      catalog,
-    );
-    expect(row.unit).toBe("/ 12");
-    expect(row.range_min).toBe("0");
-    expect(row.range_max).toBe("12");
-    // Peer cohort carries the rewritten scale bounds.
-    expect(row.peer).toEqual({ p25: 3, p50: 4, p75: 6, min: 0, max: 12, n: 5 });
-    expect(row.bar_width_pct).toBe(42); // 5 of [0,12]
-  });
-
-  it("renders member-scale metrics unavailable when team size is unknown", () => {
-    const catalog = catalogWith([
-      bulletCatalogRow("active_ai_members", {
-        metric_key: "ai_bullet_rows.active_ai_members",
-        is_member_scale: true,
-        unit: "count",
-      }),
-    ]);
-    const [row] = transformBulletMetrics(
-      [rawBullet("active_ai_members", { value: 5 })],
-      "ai_adoption",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(row.status).toBe("unavailable");
-    expect(row.unit).toBe("");
-    expect(row.range_min).toBe("—");
-  });
-
-  it("renders a NULL value as an em-dash unavailable row", () => {
-    const catalog = catalogWith([bulletCatalogRow("tasks_completed")]);
-    const [row] = transformBulletMetrics(
-      [rawBullet("tasks_completed", { value: null as unknown as number })],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(row.status).toBe("unavailable");
-    expect(row.value).toBe("—");
-  });
-
-  it("renders unavailable when the cohort range is missing", () => {
-    const catalog = catalogWith([bulletCatalogRow("tasks_completed")]);
-    const [row] = transformBulletMetrics(
-      [rawBullet("tasks_completed", { range_min: null, range_max: null })],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(row.status).toBe("unavailable");
-    expect(row.range_min).toBe("—");
-    expect(row.median).toBe("—");
-  });
-
-  it("omits the peer cohort when quartiles or n are missing", () => {
-    const catalog = catalogWith([bulletCatalogRow("tasks_completed")]);
-    const [row] = transformBulletMetrics(
-      [rawBullet("tasks_completed", { p25: null, p75: null, n: null })],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(row.peer).toBeUndefined();
-    expect(row.status).toBe("good");
-  });
-
-  it("keeps one decimal for day-unit values and range edges", () => {
-    const catalog = catalogWith([bulletCatalogRow("cycle_days", { unit: "d" })]);
-    const [row] = transformBulletMetrics(
-      [
-        rawBullet("cycle_days", {
-          value: 1.64,
-          median: 2.25,
-          range_min: 0.5,
-          range_max: 4.26,
-        }),
-      ],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    expect(row.value).toBe("1.6");
-    expect(row.median).toBe("2.3");
-    expect(row.range_max).toBe("4.3d");
-    expect(row.median_label).toBe("Median: 2.3d");
-  });
-
-  it("formats %, h/mo and multiplier range units", () => {
-    const catalog = catalogWith([
-      bulletCatalogRow("focus_pct", { unit: "%" }),
-      bulletCatalogRow("meeting_load", { unit: "h/mo" }),
-      bulletCatalogRow("ai_speedup", { unit: "×" }),
-    ]);
-    const out = transformBulletMetrics(
-      [
-        rawBullet("focus_pct", { value: 61.2, median: 55.6, range_min: 0, range_max: 100 }),
-        rawBullet("meeting_load", { value: 20, median: 18.4, range_min: 0, range_max: 40.6 }),
-        rawBullet("ai_speedup", { value: 2, median: 1.6, range_min: 1, range_max: 3.4 }),
-      ],
-      "task_delivery",
-      "week",
-      undefined,
-      "ic",
-      catalog,
-    );
-    const byKey = new Map(out.map((r) => [r.metric_key, r]));
-    expect(byKey.get("focus_pct")?.range_max).toBe("100%");
-    expect(byKey.get("focus_pct")?.median_label).toBe("Median: 56%");
-    expect(byKey.get("meeting_load")?.range_max).toBe("41h");
-    expect(byKey.get("ai_speedup")?.range_max).toBe("3×");
-  });
-});
-
-describe("trend transforms", () => {
-  const locRow = (date_bucket: string): RawLocTrendRow => ({
-    date_bucket,
-    code_loc: 100,
-    spec_lines: 20,
-    config_loc: 5,
-  });
-
-  it("labels week buckets with the locale short weekday", () => {
-    const expected = new Intl.DateTimeFormat(undefined, { weekday: "short" })
-      .format(new Date(2026, 0, 5));
-    const out = transformLocTrend([locRow("2026-01-05")], "week");
-    expect(out).toEqual([
-      { label: expected, codeLoc: 100, specLines: 20, configLoc: 5 },
-    ]);
-  });
-
-  it("labels month buckets with the week-of-month index", () => {
-    const out = transformLocTrend(
-      [locRow("2026-01-03"), locRow("2026-01-15"), locRow("2026-01-29")],
-      "month",
-    );
-    expect(out.map((p) => p.label)).toEqual(["W1", "W3", "W5"]);
-  });
-
-  it("labels quarter buckets with the locale short month", () => {
-    const expected = new Intl.DateTimeFormat(undefined, { month: "short" })
-      .format(new Date(2026, 3, 1));
-    const out = transformLocTrend([locRow("2026-04-01")], "quarter");
-    expect(out[0]!.label).toBe(expected);
-  });
-
-  it("labels year buckets with the quarter", () => {
-    const out = transformLocTrend(
-      [locRow("2026-01-15"), locRow("2026-04-15"), locRow("2026-07-15"), locRow("2026-12-31")],
-      "year",
-    );
-    expect(out.map((p) => p.label)).toEqual(["Q1", "Q2", "Q3", "Q4"]);
-  });
-
-  it("maps delivery trend rows preserving nullable prs_merged", () => {
-    const row: RawDeliveryTrendRow = {
-      date_bucket: "2026-07-01",
-      commits: 12,
-      prs_merged: null,
-      tasks_done: 4,
-    };
-    const out = transformDeliveryTrend([row], "year");
-    expect(out).toEqual([
-      { label: "Q3", commits: 12, prsMerged: null, tasksDone: 4 },
-    ]);
-  });
-});
-
-describe("transformTeamMembers rounding", () => {
-  it("rounds counts and preserves null prs_merged", () => {
-    const row: RawTeamMemberRow = {
-      person_id: "a@x.com",
-      display_name: "A",
-      seniority: "mid",
-      supervisor_email: "b@x.com",
-      org_unit_id: null,
-      tasks_closed: 7.4,
-      bugs_fixed: 1.6,
-      dev_time_h: 12.5,
-      prs_merged: null,
-      build_success_pct: null,
-      focus_time_pct: 50,
-      ai_tools: [],
-      ai_loc_share_pct: 0,
-    };
-    const [m] = transformTeamMembers([row], "week");
-    expect(m.tasks_closed).toBe(7);
-    expect(m.bugs_fixed).toBe(2);
-    expect(m.prs_merged).toBeNull();
-    expect(m.org_unit_id).toBeNull();
-  });
-
-  it("rounds a numeric prs_merged", () => {
-    const row: RawTeamMemberRow = {
-      person_id: "a@x.com",
-      display_name: "A",
-      seniority: "mid",
-      supervisor_email: "b@x.com",
-      org_unit_id: "eng",
-      tasks_closed: 1,
-      bugs_fixed: 0,
-      dev_time_h: 1,
-      prs_merged: 2.6,
-      build_success_pct: 90,
-      focus_time_pct: 50,
-      ai_tools: [],
-      ai_loc_share_pct: 0,
-    };
-    expect(transformTeamMembers([row], "week")[0]!.prs_merged).toBe(3);
-  });
-});
-
-describe("transformTimeOff / transformDrill", () => {
-  it("maps the time-off notice fields", () => {
-    const row: RawTimeOffRow = {
-      days: 3,
-      date_range: "Jul 1 – Jul 3",
-      bamboo_hr_url: "https://bamboo.example/x",
-    };
-    expect(transformTimeOff(row)).toEqual({
-      days: 3,
-      dateRange: "Jul 1 – Jul 3",
-      bambooHrUrl: "https://bamboo.example/x",
-    });
-  });
-
-  it("maps the drill payload fields", () => {
-    const row: RawDrillRow = {
-      title: "PRs",
-      source: "Bitbucket",
-      src_class: "git",
-      value: "12",
-      filter: "state eq 'merged'",
-      columns: ["id", "title"],
-      rows: [{ id: 1, title: "Fix" }],
-    };
-    expect(transformDrill(row)).toEqual({
-      title: "PRs",
-      source: "Bitbucket",
-      srcClass: "git",
-      value: "12",
-      filter: "state eq 'merged'",
-      columns: ["id", "title"],
-      rows: [{ id: 1, title: "Fix" }],
-    });
-  });
-});
-
-describe("CRM transforms", () => {
-  it("transformCrmKpis coerces CH string aggregates and nulls to numbers", () => {
-    const row: RawCrmKpisRow = {
-      person_id: "p",
-      deals_opened: "5",
-      deals_closed: 3,
-      deals_won: null,
-      deals_value_closed: "125000.5",
-      comms_count: "not-a-number",
-    };
-    expect(transformCrmKpis(row)).toEqual({
-      dealsOpened: 5,
-      dealsClosed: 3,
-      dealsWon: 0,
-      dealsValueClosed: 125000.5,
-      commsCount: 0,
-    });
-  });
-
-  it("transformCrmKpis passes null through", () => {
-    expect(transformCrmKpis(null)).toBeNull();
-  });
-
-  it("transformCrmPipeline coerces and passes null through", () => {
-    const row: RawCrmPipelineRow = {
-      person_id: "p",
-      pipeline_count: "7",
-      pipeline_value: undefined as unknown as null,
-    };
-    expect(transformCrmPipeline(row)).toEqual({
-      pipelineCount: 7,
-      pipelineValue: 0,
-    });
-    expect(transformCrmPipeline(null)).toBeNull();
-  });
-
-  it("transformCrmFlow sorts by metric_date and coerces values", () => {
-    const rows: RawCrmFlowRow[] = [
-      { date_bucket: "W2", metric_date: "2026-01-12", opened: "2", closed: 1, won: "1" },
-      { date_bucket: "W1", metric_date: "2026-01-05", opened: 4, closed: "3", won: 0 },
-    ];
-    expect(transformCrmFlow(rows)).toEqual([
-      { label: "W1", opened: 4, closed: 3, won: 0 },
-      { label: "W2", opened: 2, closed: 1, won: 1 },
-    ]);
-  });
-});
-
-function crmCatalogRow(
-  bareKey: string,
-  overrides: Partial<CatalogMetric> = {},
-): CatalogMetric {
-  return bulletCatalogRow(bareKey, {
-    metric_key: `crm_bullet_rows.${bareKey}`,
-    ...overrides,
-  });
-}
-
-describe("transformCrmBullets", () => {
-  it("returns [] when catalog is undefined", () => {
-    expect(
-      transformCrmBullets([rawBullet("win_rate")], "week", "quality", ["win_rate"], undefined),
-    ).toEqual([]);
-  });
-
-  it("silently omits bare keys with no catalog row", () => {
-    const catalog = catalogWith([crmCatalogRow("win_rate")]);
-    const out = transformCrmBullets(
-      [rawBullet("win_rate"), rawBullet("ghost")],
-      "week",
-      "quality",
-      ["win_rate", "ghost"],
-      catalog,
-    );
-    expect(out.map((r) => r.metric_key)).toEqual(["win_rate"]);
-  });
-
-  it("replays the canonical bareKeys ordering regardless of row order", () => {
-    const catalog = catalogWith([crmCatalogRow("a"), crmCatalogRow("b")]);
-    const out = transformCrmBullets(
-      [rawBullet("b"), rawBullet("a")],
-      "week",
-      "activity",
-      ["a", "b"],
-      catalog,
-    );
-    expect(out.map((r) => r.metric_key)).toEqual(["a", "b"]);
-  });
-
-  it("renders an unavailable row when the backend returned no data for the key", () => {
-    const catalog = catalogWith([crmCatalogRow("win_rate", { unit: "%" })]);
-    const [row] = transformCrmBullets([], "week", "quality", ["win_rate"], catalog);
-    expect(row.status).toBe("unavailable");
-    expect(row.value).toBe("—");
-    expect(row.range_min).toBe("—");
-  });
-
-  it("renders unavailable when the distribution is degenerate (min == max)", () => {
-    const catalog = catalogWith([crmCatalogRow("win_rate", { unit: "%" })]);
-    const [row] = transformCrmBullets(
-      [rawBullet("win_rate", { value: 50, range_min: 50, range_max: 50 })],
-      "week",
-      "quality",
-      ["win_rate"],
-      catalog,
-    );
-    expect(row.status).toBe("unavailable");
-  });
-
-  it("marks a value within 10% of the median as warn", () => {
-    const catalog = catalogWith([crmCatalogRow("win_rate", { unit: "%" })]);
-    const [row] = transformCrmBullets(
-      [rawBullet("win_rate", { value: 42, median: 40, range_min: 0, range_max: 100 })],
-      "week",
-      "quality",
-      ["win_rate"],
-      catalog,
-    );
-    expect(row.status).toBe("warn");
-    expect(row.value).toBe("42.0%");
-    expect(row.median_label).toBe("Median: 40.0%");
-  });
-
-  it("marks above-median good when higher is better and below-median good otherwise", () => {
-    const catalog = catalogWith([
-      crmCatalogRow("win_rate", { unit: "%" }),
-      crmCatalogRow("cycle_days", { unit: "d", higher_is_better: false }),
-    ]);
-    const out = transformCrmBullets(
-      [
-        rawBullet("win_rate", { value: 60, median: 40, range_min: 0, range_max: 100 }),
-        rawBullet("cycle_days", { value: 3, median: 5, range_min: 0, range_max: 10 }),
-      ],
-      "week",
-      "quality",
-      ["win_rate", "cycle_days"],
-      catalog,
-    );
-    expect(out[0]!.status).toBe("good");
-    expect(out[1]!.status).toBe("good");
-    expect(out[1]!.value).toBe("3.0d");
-  });
-
-  it("marks the wrong side of the median bad", () => {
-    const catalog = catalogWith([
-      crmCatalogRow("cycle_days", { unit: "d", higher_is_better: false }),
-    ]);
-    const [row] = transformCrmBullets(
-      [rawBullet("cycle_days", { value: 9, median: 5, range_min: 0, range_max: 10 })],
-      "week",
-      "quality",
-      ["cycle_days"],
-      catalog,
-    );
-    expect(row.status).toBe("bad");
-    expect(row.bar_width_pct).toBe(90);
-    expect(row.median_left_pct).toBe(50);
-  });
-
-  it("defaults to warn with an em-dash median when the median is missing", () => {
-    const catalog = catalogWith([crmCatalogRow("win_rate", { unit: "%" })]);
-    const [row] = transformCrmBullets(
-      [rawBullet("win_rate", { value: 60, median: null, range_min: 0, range_max: 100 })],
-      "week",
-      "quality",
-      ["win_rate"],
-      catalog,
-    );
-    expect(row.status).toBe("warn");
-    expect(row.median).toBe("—");
-    expect(row.median_label).toBe("");
-    expect(row.median_left_pct).toBe(0);
-  });
-
-  it("formats currency values compactly ($M / $k / $)", () => {
-    const catalog = catalogWith([crmCatalogRow("deal_value", { unit: "$" })]);
-    const [row] = transformCrmBullets(
-      [
-        rawBullet("deal_value", {
-          value: 2_500_000,
-          median: 12_000,
-          range_min: 500,
-          range_max: 3_000_000,
-        }),
-      ],
-      "week",
-      "quality",
-      ["deal_value"],
-      catalog,
-    );
-    expect(row.value).toBe("$2.50M");
-    expect(row.median).toBe("$12k");
-    expect(row.range_min).toBe("$500");
-  });
-
-  it("formats unitless values with en-US thousands grouping", () => {
-    const catalog = catalogWith([crmCatalogRow("comms", { unit: "" })]);
-    const [row] = transformCrmBullets(
-      [rawBullet("comms", { value: 1234.6, median: 1000, range_min: 0, range_max: 2000 })],
-      "week",
-      "activity",
-      ["comms"],
-      catalog,
-    );
-    expect(row.value).toBe("1,235");
-  });
-});
diff --git a/src/api/transforms.ts b/src/api/transforms.ts
deleted file mode 100644
index 50ab8fd5..00000000
--- a/src/api/transforms.ts
+++ /dev/null
@@ -1,667 +0,0 @@
-/**
- * Design rules:
- * - Explicit field mapping only (no generic snake->camel converter).
- * - Every function is stateless and side-effect free.
- * - All metric metadata (labels / sublabels / thresholds) comes from the
- *   wire catalog (`useCatalog()`). No compile-in metric defaults — when
- *   the catalog is unavailable the transforms emit empty arrays and
- *   consumers render skeletons or empty states (Refs #82).
- */
-
-import type {
-  PeriodValue,
-  IcKpi,
-  BulletMetric,
-  CrmFlowPoint,
-  CrmKpis,
-  CrmPipeline,
-  LocDataPoint,
-  DeliveryDataPoint,
-  TeamMember,
-  TimeOffNotice,
-  DrillData,
-} from '@/types/insight';
-import type {
-  RawIcAggregateRow,
-  RawBulletAggregateRow,
-  RawCrmFlowRow,
-  RawCrmKpisRow,
-  RawCrmPipelineRow,
-  RawLocTrendRow,
-  RawDeliveryTrendRow,
-  RawTeamMemberRow,
-  RawTimeOffRow,
-  RawDrillRow,
-} from './raw-types';
-import {
-  type CatalogMetric,
-  type CatalogResponse,
-  prefixForBulletSection,
-} from './catalog-client';
-import { evaluateStatus } from './metric-semantics';
-import type { PeerStats } from '@/lib/peers';
-
-/** Format strings the IC KPI catalog rows surface. */
-type IcKpiFormat = 'integer' | 'decimal1' | 'percent' | 'hours';
-
-function asIcKpiFormat(v: string | undefined): IcKpiFormat {
-  if (v === 'integer' || v === 'decimal1' || v === 'percent' || v === 'hours') {
-    return v;
-  }
-  // Wire row predates the `format` field — keep IC KPI rendering safe by
-  // defaulting to whole-number display.
-  return 'integer';
-}
-
-function keyBy<T, K extends keyof T>(items: T[], key: K): Record<string, T> {
-  const out: Record<string, T> = {};
-  for (const item of items) {
-    out[String(item[key])] = item;
-  }
-  return out;
-}
-
-function clamp(v: number, min: number, max: number): number {
-  return Math.max(min, Math.min(max, v));
-}
-
-function pctInRange(value: number, rangeMin: number, rangeMax: number): number {
-  const span = rangeMax - rangeMin;
-  if (span <= 0) return 0;
-  return Math.round(clamp(((value - rangeMin) / span) * 100, 0, 100));
-}
-
-function formatValue(raw: number, fmt: IcKpiFormat): string {
-  // Whole-number display across the board. Fractional precision was noisy on
-  // a dashboard that re-aggregates per period — "78.4%" jitters to "78.6%"
-  // when the period nudges by a day. Integers stay readable and stable.
-  switch (fmt) {
-    case 'integer': return String(Math.round(raw));
-    case 'decimal1': return String(Math.round(raw * 10) / 10);
-    case 'percent': return String(Math.round(raw));
-    case 'hours': return `${Math.round(raw)}h`;
-  }
-}
-
-/**
- * Format a raw metric value with the catalog's display format — used for peer
- * medians so they round exactly like the tile value does.
- */
-export function formatKpiValue(raw: number, fmt: string | undefined): string {
-  return formatValue(raw, asIcKpiFormat(fmt));
-}
-
-function formatDelta(delta: number, fmt: IcKpiFormat): string {
-  const sign = delta > 0 ? '+' : '';
-  switch (fmt) {
-    case 'integer': return `${sign}${Math.round(delta)}`;
-    case 'decimal1': return `${sign}${Math.round(delta)}`;
-    case 'percent': return `${sign}${Math.round(delta)}%`;
-    case 'hours': return `${sign}${Math.round(delta)}h`;
-  }
-}
-
-function deltaType(
-  delta: number,
-  higherIsBetter: boolean,
-): 'good' | 'bad' | 'neutral' {
-  const threshold = 0.001;
-  if (Math.abs(delta) < threshold) return 'neutral';
-  if (higherIsBetter) return delta > 0 ? 'good' : 'bad';
-  return delta < 0 ? 'good' : 'bad';
-}
-
-// Cache Intl formatters — constructing them per-call is surprisingly
-// expensive, and the labels only change when the locale changes (never
-// during a normal session).
-const WEEKDAY_FMT = new Intl.DateTimeFormat(undefined, { weekday: 'short' });
-const MONTH_FMT   = new Intl.DateTimeFormat(undefined, { month: 'short' });
-
-function formatDateLabel(isoDate: string, period: PeriodValue): string {
-  // Parse as local-midnight so label reflects the user's timezone, not UTC.
-  const [y, m, day] = isoDate.split('-').map(Number);
-  const d = new Date(y, (m ?? 1) - 1, day ?? 1);
-  switch (period) {
-    case 'week':
-      // Short weekday label in the user's locale (e.g. "Mon", "Пн", "月").
-      return WEEKDAY_FMT.format(d);
-    case 'month': {
-      // Week number within the month: W1, W2, ...
-      const weekNum = Math.ceil(d.getDate() / 7);
-      return `W${weekNum}`;
-    }
-    case 'quarter':
-      // Short month label in the user's locale.
-      return MONTH_FMT.format(d);
-    case 'year': {
-      const q = Math.floor(d.getMonth() / 3) + 1;
-      return `Q${q}`;
-    }
-  }
-}
-
-function formatRangeStr(value: number, unit: string): string {
-  // Range edges (min/max for the bullet scale) come from CH as raw floats \u2014
-  // round here so '783637.2667' doesn't leak to the screen. Matches the
-  // whole-number policy applied to the value/median in formatBulletValue.
-  const v = unit === 'd' ? Math.round(value * 10) / 10 : Math.round(value);
-  if (unit === '%') return `${v}%`;
-  if (unit === 'h' || unit === 'h/mo') return `${v}h`;
-  if (unit === 'd') return `${v}d`;
-  if (unit === '\u00d7') return `${v}\u00d7`;
-  return String(v);
-}
-
-function formatBulletValue(raw: number | null | undefined, unit: string): string {
-  if (raw === null || raw === undefined || !Number.isFinite(raw)) return '—';
-  // Day metrics keep one decimal — rounding 1.6d → 2d hides a meaningful gap.
-  // Other units stay whole (see formatValue() rationale).
-  if (unit === 'd') return String(Math.round(raw * 10) / 10);
-  return String(Math.round(raw));
-}
-
-const IC_KPI_PREFIX = 'ic_kpis.';
-
-export function transformIcKpis(
-  current: RawIcAggregateRow | null,
-  previous: RawIcAggregateRow | null,
-  period: PeriodValue,
-  catalog: CatalogResponse | undefined,
-): IcKpi[] {
-  // No catalog → no labels → consumers render skeletons / empty states.
-  if (!catalog) return [];
-  // No current row → backend has nothing for this person in the period.
-  if (current === null) return [];
-
-  // The bare `metric_key` (post-`ic_kpis.` prefix) is the column name on
-  // `RawIcAggregateRow` — wire seed migration `m20260527_000001` keeps
-  // the catalog key in sync with the gold table column. Catalog rows
-  // whose bare key isn't an own property of the raw aggregate are
-  // silently omitted (the FE doesn't know how to source their value).
-  // `hasOwnProperty` (not `in`) so a malformed wire key like `__proto__`
-  // or `toString` can't reach `Object.prototype` members.
-  type IcRow = RawIcAggregateRow;
-
-  const out: IcKpi[] = [];
-  for (const m of catalog.metrics) {
-    if (!m.metric_key || !m.metric_key.startsWith(IC_KPI_PREFIX)) continue;
-    const bareKey = m.metric_key.slice(IC_KPI_PREFIX.length);
-    if (!Object.prototype.hasOwnProperty.call(current, bareKey)) continue;
-    const rawField = bareKey as keyof IcRow;
-
-    // Distinguish "raw value missing" (NULL from backend → source not
-    // ingested) from "raw value is zero" (real measurement).
-    const rawCur = current[rawField];
-    const rawPrev = previous?.[rawField];
-    const curVal =
-      rawCur == null || typeof rawCur !== 'number' ? null : rawCur;
-    const prevVal =
-      rawPrev == null || typeof rawPrev !== 'number' ? null : rawPrev;
-
-    const format = asIcKpiFormat(m.format);
-    const value = curVal === null ? null : formatValue(curVal, format);
-    let delta = '';
-    let dt: 'good' | 'warn' | 'bad' | 'neutral' = 'neutral';
-
-    if (curVal !== null && prevVal !== null) {
-      const diff = curVal - prevVal;
-      delta = formatDelta(diff, format);
-      dt = deltaType(diff, m.higher_is_better);
-    }
-
-    // Department peer median for this KPI, folded onto the same row by the
-    // IC_KPIS query_ref (`<bareKey>_median` + shared `peer_n`). Raw numeric
-    // — the tile formats it. NULL when the person has no department cohort.
-    const medianField = `${bareKey}_median` as keyof IcRow;
-    const rawMedian = Object.prototype.hasOwnProperty.call(current, medianField)
-      ? current[medianField]
-      : null;
-    const peerMedian =
-      rawMedian == null || typeof rawMedian !== 'number' ? null : rawMedian;
-    const rawPeerN = current.peer_n;
-    const peerN =
-      rawPeerN == null || typeof rawPeerN !== 'number' ? null : rawPeerN;
-
-    out.push({
-      period,
-      metric_key: bareKey,
-      label: m.label,
-      value,
-      raw_value: curVal,
-      unit: m.unit ?? '',
-      sublabel: m.sublabel ?? '',
-      description: m.description,
-      delta,
-      delta_type: dt,
-      peer_median: peerMedian,
-      peer_n: peerN,
-    });
-  }
-  return out;
-}
-
-/**
- * @param teamSize  Headcount of the team that context applies to. Used to
- *                  rewrite unit/range_max for member-scale metrics
- *                  (`active_ai_members` etc.) so bullets show "N / 113"
- *                  instead of the old hardcoded "N / 12". When unknown
- *                  (e.g. IC Dashboard context), member-scale metrics render
- *                  as 'unavailable' — we don't invent a denominator.
- */
-export function transformBulletMetrics(
-  rows: RawBulletAggregateRow[],
-  section: string,
-  period: PeriodValue,
-  teamSize: number | undefined,
-  _viewKind: 'ic' | 'team',
-  catalog: CatalogResponse | undefined,
-): BulletMetric[] {
-  // No catalog → no labels → consumers render skeletons. The screen
-  // surfaces `isError` / `isLoading` directly from `useCatalog()` so
-  // returning empty here is the right "no data" shape.
-  if (!catalog) return [];
-
-  const wirePrefixDot = prefixForBulletSection(section) + '.';
-
-  // Section catalog rows, keyed by bare metric_key (the form raw aggregate
-  // rows carry, e.g. `tasks_completed`). Catalog metric_keys are
-  // wire-prefixed (e.g. `task_delivery_bullet_rows.tasks_completed`).
-  const catalogByBareKey = new Map<string, CatalogMetric>();
-  for (const m of catalog.metrics) {
-    if (!m.metric_key || !m.metric_key.startsWith(wirePrefixDot)) continue;
-    const bare = m.metric_key.slice(wirePrefixDot.length);
-    if (!catalogByBareKey.has(bare)) catalogByBareKey.set(bare, m);
-  }
-
-  // Backfill honest-zero rows for catalog metrics the backend omitted, but
-  // only when the section actually responded with at least one row. A section
-  // the backend returned nothing for means "no data for this period" — never
-  // fabricate a full grid of zeros that masks the empty state.
-  const seenKeys = new Set(rows.map((r) => r.metric_key));
-  const synthetic: RawBulletAggregateRow[] = [];
-  if (rows.length > 0) {
-    for (const bareKey of catalogByBareKey.keys()) {
-      if (!seenKeys.has(bareKey)) {
-        synthetic.push({
-          metric_key: bareKey,
-          value: 0,
-          median: null,
-          range_min: null,
-          range_max: null,
-          p25: null,
-          p75: null,
-          n: null,
-        });
-      }
-    }
-  }
-  const allRows = [...rows, ...synthetic];
-
-  const out: BulletMetric[] = [];
-  for (const r of allRows) {
-    const catalogRow = catalogByBareKey.get(r.metric_key);
-    // Missing-id (catalog row absent for this section) → silently omit per
-    // DESIGN §3.3 Catalog Consumer Contract.
-    if (!catalogRow) continue;
-
-    const label = catalogRow.label;
-    const sublabel = catalogRow.sublabel ?? '';
-    const baseUnit = catalogRow.unit ?? '';
-    const isMemberScale = catalogRow.is_member_scale;
-    const higherIsBetter = catalogRow.higher_is_better;
-    const isSchemaError = catalogRow.schema_status === 'error';
-    const thresholds = catalogRow.thresholds;
-    const hasThresholds = thresholds != null;
-    const goodThr = thresholds?.good ?? 0;
-    const warnThr = thresholds?.warn ?? 0;
-
-    // Member-scale metrics use team headcount as the denominator. Unit
-    // becomes "/ N" at the team view; IC view keeps them unavailable.
-    const effectiveUnit = isMemberScale
-      ? teamSize != null
-        ? `/ ${teamSize}`
-        : ''
-      : baseUnit;
-
-    const valueUnavailable =
-      r.value === null || r.value === undefined || !Number.isFinite(r.value);
-    const rangeAvailable = r.range_min != null && r.range_max != null;
-    const rangeMax =
-      isMemberScale && teamSize != null ? teamSize : r.range_max;
-    const rangeMin = isMemberScale && teamSize != null ? 0 : r.range_min;
-    const memberScaleMissingSize = isMemberScale && teamSize == null;
-
-    if (
-      valueUnavailable ||
-      !rangeAvailable ||
-      rangeMin == null ||
-      rangeMax == null ||
-      memberScaleMissingSize
-    ) {
-      out.push({
-        period,
-        section,
-        metric_key: r.metric_key,
-        label,
-        sublabel,
-        value: formatBulletValue(r.value, effectiveUnit),
-        unit: effectiveUnit,
-        range_min: '—',
-        range_max: '—',
-        median: '—',
-        median_label: '',
-        bar_left_pct: 0,
-        bar_width_pct: 0,
-        median_left_pct: 0,
-        status: 'unavailable',
-        drill_id: '',
-        source_tags: catalogRow.source_tags,
-        ...(isSchemaError ? { schema_error: true } : {}),
-      });
-      continue;
-    }
-
-    const median = r.median;
-    const medianFormatted =
-      median != null ? formatRangeStr(median, effectiveUnit) : '—';
-
-    // Peer cohort for this row, in the catalog unit the bar is drawn in — the
-    // display unit always equals the catalog unit (the FE never rescales the
-    // metric's unit from its cohort spread; see #1475). Set only when the
-    // backend returned a real cohort (n > 0 and quartiles present), so coloring
-    // + the drilldown strip read the same cohort that drew the bar. p50 = the
-    // median; min/max = the bar's range.
-    const peerP25 = r.p25 != null && Number.isFinite(r.p25) ? r.p25 : null;
-    const peerP75 = r.p75 != null && Number.isFinite(r.p75) ? r.p75 : null;
-    const peer: PeerStats | undefined =
-      r.n != null &&
-      r.n > 0 &&
-      median != null &&
-      Number.isFinite(median) &&
-      peerP25 != null &&
-      peerP75 != null
-        ? {
-            p25: peerP25,
-            p50: median,
-            p75: peerP75,
-            min: rangeMin,
-            max: rangeMax,
-            n: r.n,
-          }
-        : undefined;
-
-    out.push({
-      period,
-      section,
-      metric_key: r.metric_key,
-      label,
-      sublabel,
-      value: formatBulletValue(r.value, effectiveUnit),
-      unit: effectiveUnit,
-      range_min: formatRangeStr(rangeMin, effectiveUnit),
-      range_max: formatRangeStr(rangeMax, effectiveUnit),
-      median: median != null ? formatBulletValue(median, effectiveUnit) : '—',
-      median_label: median != null ? `Median: ${medianFormatted}` : '',
-      bar_left_pct: 0,
-      bar_width_pct: pctInRange(r.value, rangeMin, rangeMax),
-      median_left_pct:
-        median != null ? pctInRange(median, rangeMin, rangeMax) : 0,
-      ...(peer ? { peer } : {}),
-      // schema_status='error' suppresses threshold-based coloring per DESIGN
-      // §3.3: bar dimensions render normally but the row is flagged so
-      // consumers can show the "Metric source unavailable" indicator.
-      status: isSchemaError || !hasThresholds
-        ? 'unavailable'
-        : evaluateStatus(
-            r.value,
-            { good: goodThr, warn: warnThr },
-            higherIsBetter,
-          ),
-      drill_id: '',
-      source_tags: catalogRow.source_tags,
-      ...(isSchemaError ? { schema_error: true } : {}),
-    });
-  }
-  return out;
-}
-
-
-export function transformLocTrend(
-  rows: RawLocTrendRow[],
-  period: PeriodValue,
-): LocDataPoint[] {
-  return rows.map((r) => ({
-    label: formatDateLabel(r.date_bucket, period),
-    codeLoc: r.code_loc,
-    specLines: r.spec_lines,
-    configLoc: r.config_loc,
-  }));
-}
-
-export function transformDeliveryTrend(
-  rows: RawDeliveryTrendRow[],
-  period: PeriodValue,
-): DeliveryDataPoint[] {
-  return rows.map((r) => ({
-    label: formatDateLabel(r.date_bucket, period),
-    commits: r.commits,
-    prsMerged: r.prs_merged,
-    tasksDone: r.tasks_done,
-  }));
-}
-
-export function transformTeamMembers(
-  rows: RawTeamMemberRow[],
-  period: PeriodValue,
-): TeamMember[] {
-  // tasks_closed / bugs_fixed are non-nullable from the seed (sum over
-  // jira_closed_tasks with ifNull(x, 0)), so rounding is fine. prs_merged is
-  // nullable — preserve null so MembersTable renders em-dash instead of "0".
-  const roundOrNull = (v: number | null | undefined): number | null =>
-    v == null || !Number.isFinite(v) ? null : Math.round(v);
-
-  return rows.map((r) => ({
-    person_id: r.person_id,
-    period,
-    name: r.display_name,
-    seniority: r.seniority,
-    supervisor_email: r.supervisor_email,
-    org_unit_id: r.org_unit_id ?? null,
-    tasks_closed: Math.round(r.tasks_closed),
-    bugs_fixed: Math.round(r.bugs_fixed),
-    dev_time_h: r.dev_time_h,
-    prs_merged: roundOrNull(r.prs_merged),
-    build_success_pct: r.build_success_pct,
-    focus_time_pct: r.focus_time_pct,
-    ai_tools: r.ai_tools,
-    ai_loc_share_pct: r.ai_loc_share_pct,
-  }));
-}
-
-export function transformTimeOff(row: RawTimeOffRow): TimeOffNotice {
-  return {
-    days: row.days,
-    dateRange: row.date_range,
-    bambooHrUrl: row.bamboo_hr_url,
-  };
-}
-
-export function transformDrill(row: RawDrillRow): DrillData {
-  return {
-    title: row.title,
-    source: row.source,
-    srcClass: row.src_class,
-    value: row.value,
-    filter: row.filter,
-    columns: row.columns,
-    rows: row.rows,
-  };
-}
-
-// ---------------------------------------------------------------------------
-// CRM (sales-rep dashboard)
-// ---------------------------------------------------------------------------
-
-function numCoerce(v: number | string | null | undefined): number {
-  if (v === null || v === undefined) return 0;
-  if (typeof v === 'number') return v;
-  const n = Number(v);
-  return Number.isFinite(n) ? n : 0;
-}
-
-export function transformCrmKpis(row: RawCrmKpisRow | null): CrmKpis | null {
-  if (row === null) return null;
-  return {
-    dealsOpened: numCoerce(row.deals_opened),
-    dealsClosed: numCoerce(row.deals_closed),
-    dealsWon: numCoerce(row.deals_won),
-    dealsValueClosed: numCoerce(row.deals_value_closed),
-    commsCount: numCoerce(row.comms_count),
-  };
-}
-
-export function transformCrmPipeline(
-  row: RawCrmPipelineRow | null,
-): CrmPipeline | null {
-  if (row === null) return null;
-  return {
-    pipelineCount: numCoerce(row.pipeline_count),
-    pipelineValue: numCoerce(row.pipeline_value),
-  };
-}
-
-export function transformCrmFlow(rows: RawCrmFlowRow[]): CrmFlowPoint[] {
-  return [...rows]
-    .sort((a, b) => a.metric_date.localeCompare(b.metric_date))
-    .map((r) => ({
-      label: r.date_bucket,
-      opened: numCoerce(r.opened),
-      closed: numCoerce(r.closed),
-      won: numCoerce(r.won),
-    }));
-}
-
-function fmtCrm(v: number | null, unit: string): string {
-  if (v === null || !Number.isFinite(v)) return '—';
-  if (unit === '%') return `${v.toFixed(1)}%`;
-  if (unit === 'd') return `${v.toFixed(1)}d`;
-  if (unit === '$') {
-    const a = Math.abs(v);
-    if (a >= 1_000_000) return `$${(v / 1_000_000).toFixed(2)}M`;
-    if (a >= 1_000) return `$${(v / 1_000).toFixed(0)}k`;
-    return `$${v.toFixed(0)}`;
-  }
-  return new Intl.NumberFormat('en-US').format(Math.round(v));
-}
-
-/** Wire prefix for all CRM bullet rows — matches the BE seed migration. */
-const CRM_BULLET_PREFIX = 'crm_bullet_rows.';
-
-/**
- * `bareKeys` is the per-section emission order — Quality and Activity
- * share the `crm_bullet_rows.*` storage table but each query emits a
- * disjoint subset, and UI layout pins the column order. The CH query
- * order is unconstrained, so the FE replays the canonical ordering
- * here.
- */
-export function transformCrmBullets(
-  rows: RawBulletAggregateRow[],
-  period: PeriodValue,
-  section: string,
-  bareKeys: readonly string[],
-  catalog: CatalogResponse | undefined,
-): BulletMetric[] {
-  // No catalog → no labels → consumers render skeletons. Mirrors
-  // `transformBulletMetrics`'s contract (post-#82).
-  if (!catalog) return [];
-
-  const catalogByBareKey = new Map<string, CatalogMetric>();
-  for (const m of catalog.metrics) {
-    if (!m.metric_key || !m.metric_key.startsWith(CRM_BULLET_PREFIX)) continue;
-    const bare = m.metric_key.slice(CRM_BULLET_PREFIX.length);
-    if (!catalogByBareKey.has(bare)) catalogByBareKey.set(bare, m);
-  }
-
-  const byKey = keyBy(rows, 'metric_key');
-  const out: BulletMetric[] = [];
-  for (const bareKey of bareKeys) {
-    const catalogRow = catalogByBareKey.get(bareKey);
-    // Missing-id (catalog row absent for this bare key) → silently
-    // omit per DESIGN §3.3. Shouldn't happen once the seed migration
-    // is in production; defensive against pre-deploy / stale catalog.
-    if (!catalogRow) continue;
-
-    const label = catalogRow.label;
-    const sublabel = catalogRow.sublabel ?? '';
-    const unit = catalogRow.unit ?? '';
-    const higherIsBetter = catalogRow.higher_is_better;
-
-    const r = byKey[bareKey] as RawBulletAggregateRow | undefined;
-    const value = r?.value ?? null;
-    const median = r?.median ?? null;
-    const rMin = r?.range_min ?? null;
-    const rMax = r?.range_max ?? null;
-
-    const distAvailable =
-      value !== null && rMin !== null && rMax !== null && rMin !== rMax;
-    if (!distAvailable) {
-      out.push({
-        period,
-        section,
-        metric_key: bareKey,
-        label,
-        sublabel,
-        value: fmtCrm(value, unit),
-        unit,
-        range_min: '—',
-        range_max: '—',
-        median: '—',
-        median_label: '',
-        bar_left_pct: 0,
-        bar_width_pct: 0,
-        median_left_pct: 0,
-        status: 'unavailable',
-        drill_id: '',
-      });
-      continue;
-    }
-
-    const safeValue = value as number;
-    const safeMedian = median as number | null;
-    const safeMin = rMin as number;
-    const safeMax = rMax as number;
-    const barWidthPct = pctInRange(safeValue, safeMin, safeMax);
-    const medianLeftPct =
-      safeMedian !== null ? pctInRange(safeMedian, safeMin, safeMax) : 0;
-
-    let status: 'good' | 'warn' | 'bad' = 'warn';
-    if (safeMedian !== null) {
-      const diff = safeValue - safeMedian;
-      const tolerance = Math.abs(safeMedian) * 0.1;
-      if (Math.abs(diff) <= tolerance) status = 'warn';
-      else if ((diff > 0) === higherIsBetter) status = 'good';
-      else status = 'bad';
-    }
-
-    out.push({
-      period,
-      section,
-      metric_key: bareKey,
-      label,
-      sublabel,
-      value: fmtCrm(safeValue, unit),
-      unit,
-      range_min: fmtCrm(safeMin, unit),
-      range_max: fmtCrm(safeMax, unit),
-      median: fmtCrm(safeMedian, unit),
-      median_label:
-        safeMedian !== null ? `Median: ${fmtCrm(safeMedian, unit)}` : '',
-      bar_left_pct: 0,
-      bar_width_pct: barWidthPct,
-      median_left_pct: medianLeftPct,
-      status,
-      drill_id: '',
-    });
-  }
-  return out;
-}
diff --git a/src/api/types.ts b/src/api/types.ts
deleted file mode 100644
index 1769bf1c..00000000
--- a/src/api/types.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export type { ODataParams, ODataResponse, Thresholds, ThresholdLevel } from "@/types/insight";
-export type DateRange = { from: string; to: string };
diff --git a/src/api/use-catalog-link-map.ts b/src/api/use-catalog-link-map.ts
deleted file mode 100644
index 41391569..00000000
--- a/src/api/use-catalog-link-map.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * `useCatalogLinkMap()` — Layer-2 cache for the `metric_query_catalog`
- * mapping (Refs #66, ADR-003).
- *
- * The map answers "given a `metrics.query_ref` UUID, which catalog ids does
- * it emit?" Used by dashboards that issue value requests against a query
- * id and need to render each emitted value into the catalog row it belongs
- * to. The mapping is time- and filter-invariant — the same query emits the
- * same set of catalog ids regardless of `(period, person, org)` — so
- * caching it once per session/TTL avoids recomputing it per value request
- * (the failure mode the issue explicitly called out).
- *
- * Implementation: pure selector over the same `useCatalog()` query data.
- * Memoized on the catalog response identity, so N value requests sharing
- * the same catalog snapshot share one map computation. No additional
- * fetch, no second cache key — the Layer-2 contract piggybacks on the
- * Layer-1 catalog TTL.
- *
- * Fallback: when the response predates ADR-003 and omits `links`, the map
- * is empty. Consumers MUST degrade gracefully — render the value into
- * whatever catalog row their existing FE knowledge tells them to,
- * typically by `metric_key` (i.e. via `useCatalog().byMetricKey`).
- */
-
-import { useMemo } from 'react';
-
-import { useCatalog } from '@/api/use-catalog';
-
-export type CatalogLinkMap = ReadonlyMap<string, readonly string[]>;
-
-export type UseCatalogLinkMapResult = {
-  /** `query_id → catalog_metric_ids`. Empty when wire response predates ADR-003. */
-  linksByQuery: CatalogLinkMap;
-  /** `catalog_metric_id → query_ids`. Useful for "which queries back this catalog row" debugging. */
-  queriesByCatalogId: CatalogLinkMap;
-};
-
-export function useCatalogLinkMap(): UseCatalogLinkMapResult {
-  const { data } = useCatalog();
-  return useMemo(() => {
-    const linksByQuery = new Map<string, readonly string[]>();
-    const queriesByCatalogId = new Map<string, string[]>();
-    const links = data?.links ?? [];
-    for (const link of links) {
-      linksByQuery.set(link.query_id, link.catalog_metric_ids);
-      for (const catalogId of link.catalog_metric_ids) {
-        const existing = queriesByCatalogId.get(catalogId);
-        if (existing) {
-          existing.push(link.query_id);
-        } else {
-          queriesByCatalogId.set(catalogId, [link.query_id]);
-        }
-      }
-    }
-    return {
-      linksByQuery,
-      queriesByCatalogId: queriesByCatalogId as ReadonlyMap<
-        string,
-        readonly string[]
-      >,
-    };
-  }, [data]);
-}
diff --git a/src/api/use-catalog.test.tsx b/src/api/use-catalog.test.tsx
deleted file mode 100644
index 071e9fce..00000000
--- a/src/api/use-catalog.test.tsx
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- * Hook-level tests for `useCatalog()` and the Layer-2 selector.
- *
- * These tests stub `fetchCatalog` directly (vi.mock) rather than hitting
- * MSW so the assertions are independent of the dev mock-handler. Each test
- * mounts a fresh QueryClient so cache state doesn't leak across tests.
- *
- * Coverage map vs cyber-insight-front#66 acceptance criteria:
- * - AC #2 — lookups key by `id` (UUIDv7) → `byId` returns the right row.
- * - AC #3 — `schema_status='error'` is observable on the wire response → tests confirm presence + indicator hook.
- * - AC #4 — missing-id degrades to undefined (not an error).
- * - AC #5 — API failure surfaces as `isError=true` with `data=undefined`
- *   (post-#82: no compile-in fallback — consumers render skeletons / error states).
- * - AC #8 cache-layer tests — TTL refresh + tenant-switch invalidation + Layer-2 invariance.
- */
-
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { renderHook, waitFor, act } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type React from "react";
-
-import { authStore } from "@/auth/auth-store";
-
-vi.mock("./catalog-client", async () => {
-  const actual = await vi.importActual<typeof import("./catalog-client")>(
-    "./catalog-client",
-  );
-  return {
-    ...actual,
-    fetchCatalog: vi.fn(),
-  };
-});
-
-import * as catalogClient from "./catalog-client";
-import { useCatalog } from "./use-catalog";
-import { useCatalogLinkMap } from "./use-catalog-link-map";
-import { makeSession } from "@/test/session";
-
-const fetchCatalog = catalogClient.fetchCatalog as ReturnType<typeof vi.fn>;
-
-/** Seed an authenticated session scoped to a single tenant. */
-function signInTenant(tenantId: string): void {
-  authStore.setAuthenticated(makeSession({ tenantId }));
-}
-
-function makeOkResponse(
-  metrics: Array<Partial<catalogClient.CatalogMetric>> = [],
-  links: catalogClient.MetricQueryLink[] = [],
-): catalogClient.CatalogResponse {
-  return {
-    tenant_id: authStore.getSnapshot().session?.tenantId || "t-fallback",
-    generated_at: "2026-06-01T00:00:00Z",
-    metrics: metrics.map((m, i) => ({
-      id: m.id ?? `id-${i}`,
-      metric_key: m.metric_key ?? `mock.metric_${i}`,
-      label: m.label ?? `Metric ${i}`,
-      higher_is_better: m.higher_is_better ?? true,
-      is_member_scale: m.is_member_scale ?? false,
-      source_tags: m.source_tags ?? [],
-      schema_status: m.schema_status ?? "ok",
-      schema_error_code: m.schema_error_code,
-      thresholds: m.thresholds ?? {
-        good: 1,
-        warn: 0.5,
-        resolved_from: "product-default",
-        bounded_by_lock: false,
-      },
-      sublabel: m.sublabel,
-      description: m.description,
-      unit: m.unit,
-      format: m.format,
-    })),
-    links,
-  };
-}
-
-function withClient(): {
-  wrapper: ({ children }: { children: React.ReactNode }) => React.ReactElement;
-  client: QueryClient;
-} {
-  const client = new QueryClient({
-    defaultOptions: { queries: { retry: false, gcTime: 0 } },
-  });
-  const wrapper = ({ children }: { children: React.ReactNode }) => (
-    <QueryClientProvider client={client}>{children}</QueryClientProvider>
-  );
-  return { wrapper, client };
-}
-
-describe("useCatalog", () => {
-  beforeEach(() => {
-    authStore.reset();
-    signInTenant("t-1");
-    fetchCatalog.mockReset();
-  });
-  afterEach(() => {
-    authStore.reset();
-  });
-
-  it("hydrates and indexes metrics by id; byId returns the right row (AC #2)", async () => {
-    fetchCatalog.mockResolvedValue(
-      makeOkResponse([
-        { id: "id-A", metric_key: "ic_kpis.tasks_closed", label: "Tasks Closed" },
-        { id: "id-B", metric_key: "ic_kpis.bugs_fixed", label: "Bugs Fixed" },
-      ]),
-    );
-    const { wrapper } = withClient();
-    const { result } = renderHook(() => useCatalog(), { wrapper });
-
-    await waitFor(() => expect(result.current.isLoading).toBe(false));
-    expect(result.current.byId("id-A")?.label).toBe("Tasks Closed");
-    expect(result.current.byId("id-B")?.label).toBe("Bugs Fixed");
-  });
-
-  it("degrades gracefully when a previously-seen id is absent (AC #4)", async () => {
-    fetchCatalog.mockResolvedValue(makeOkResponse([{ id: "id-A" }]));
-    const { wrapper } = withClient();
-    const { result } = renderHook(() => useCatalog(), { wrapper });
-    await waitFor(() => expect(result.current.isLoading).toBe(false));
-    // A consumer that previously rendered id-B has gone away — lookup
-    // returns undefined, no throw. Consumers MUST treat undefined as
-    // "hide the tile" per DESIGN §3.3.
-    expect(result.current.byId("id-B")).toBeUndefined();
-  });
-
-  it("surfaces isError on API failure with data=undefined (AC #5, post-#82)", async () => {
-    fetchCatalog.mockRejectedValue(
-      new catalogClient.CatalogApiError(500, { type: "internal" }),
-    );
-    const { wrapper } = withClient();
-    const { result } = renderHook(() => useCatalog(), { wrapper });
-
-    await waitFor(() => expect(result.current.isError).toBe(true));
-    // No compile-in fallback — `data` is undefined and consumers render
-    // skeletons / error states. Any lookup misses.
-    expect(result.current.data).toBeUndefined();
-    expect(
-      result.current.byMetricKey("task_delivery_bullet_rows.tasks_completed"),
-    ).toBeUndefined();
-  });
-
-  it("treats a tenant-id mismatch in the cached payload as no data (cross-tenant defense)", async () => {
-    // Simulate a stale cached payload from a previous tenant — the wire
-    // response carries `tenant_id = 't-OTHER'` but the signed-in tenant
-    // is `t-1`. `useCatalog` MUST treat the mismatch as no data rather
-    // than paint the other tenant's catalog, even for one render.
-    fetchCatalog.mockResolvedValue({
-      tenant_id: "t-OTHER",
-      generated_at: "2026-06-01T00:00:00Z",
-      metrics: [
-        {
-          id: "id-OTHER",
-          metric_key: "ic_kpis.tasks_closed",
-          label: "Tasks Closed",
-          higher_is_better: true,
-          is_member_scale: false,
-          source_tags: [],
-          schema_status: "ok",
-          thresholds: {
-            good: 5,
-            warn: 3,
-            resolved_from: "product-default",
-            bounded_by_lock: false,
-          },
-        },
-      ],
-      links: [],
-    });
-    const { wrapper } = withClient();
-    const { result } = renderHook(() => useCatalog(), { wrapper });
-    await waitFor(() => expect(result.current.isLoading).toBe(false));
-
-    expect(result.current.data).toBeUndefined();
-    // The cross-tenant payload's `id-OTHER` MUST NOT be reachable.
-    expect(result.current.byId("id-OTHER")).toBeUndefined();
-  });
-
-  it("surfaces schema_status='error' so consumers render the broken-metric indicator (AC #3)", async () => {
-    fetchCatalog.mockResolvedValue(
-      makeOkResponse([
-        {
-          id: "id-broken",
-          schema_status: "error",
-          schema_error_code: "table_not_found",
-        },
-      ]),
-    );
-    const { wrapper } = withClient();
-    const { result } = renderHook(() => useCatalog(), { wrapper });
-    await waitFor(() => expect(result.current.isLoading).toBe(false));
-    const m = result.current.byId("id-broken");
-    expect(m?.schema_status).toBe("error");
-    expect(m?.schema_error_code).toBe("table_not_found");
-  });
-
-  it("renders schema_status='unchecked' the same as 'ok' (AC #3)", async () => {
-    fetchCatalog.mockResolvedValue(
-      makeOkResponse([{ id: "id-unchecked", schema_status: "unchecked" }]),
-    );
-    const { wrapper } = withClient();
-    const { result } = renderHook(() => useCatalog(), { wrapper });
-    await waitFor(() => expect(result.current.isLoading).toBe(false));
-    const m = result.current.byId("id-unchecked");
-    // The hook itself doesn't transform — the rendering rule lives in
-    // consumers — but the data IS surfaced so consumers can apply the
-    // "render as ok" rule deterministically.
-    expect(m?.schema_status).toBe("unchecked");
-  });
-
-  it("queries once per (tenant, role, team) — TanStack dedup", async () => {
-    fetchCatalog.mockResolvedValue(makeOkResponse());
-    const { wrapper } = withClient();
-
-    const a = renderHook(() => useCatalog(), { wrapper });
-    const b = renderHook(() => useCatalog(), { wrapper });
-
-    await waitFor(() => expect(a.result.current.isLoading).toBe(false));
-    await waitFor(() => expect(b.result.current.isLoading).toBe(false));
-
-    // Both hooks reference the same query key — the network layer is
-    // hit exactly once.
-    expect(fetchCatalog).toHaveBeenCalledTimes(1);
-  });
-
-  it("tenant switch invalidates the cache (AC #8a cross-tenant bleed)", async () => {
-    fetchCatalog.mockResolvedValue(makeOkResponse());
-    const { wrapper, client } = withClient();
-    const { result } = renderHook(() => useCatalog(), { wrapper });
-    await waitFor(() => expect(result.current.isLoading).toBe(false));
-    expect(fetchCatalog).toHaveBeenCalledTimes(1);
-
-    // Simulate the CatalogProvider's behavior: a tenant switch removes
-    // every catalog-keyed query.
-    act(() => {
-      signInTenant("t-2");
-      client.removeQueries({ queryKey: ["catalog"] });
-    });
-
-    // Force the hook to re-run with the new tenant. waitFor catches the
-    // refetch.
-    await waitFor(() => expect(fetchCatalog).toHaveBeenCalledTimes(2));
-  });
-});
-
-describe("useCatalogLinkMap", () => {
-  beforeEach(() => {
-    authStore.reset();
-    signInTenant("t-1");
-    fetchCatalog.mockReset();
-  });
-  afterEach(() => {
-    authStore.reset();
-  });
-
-  it("derives linksByQuery / queriesByCatalogId from the wire payload", async () => {
-    fetchCatalog.mockResolvedValue(
-      makeOkResponse(
-        [
-          { id: "cat-A", metric_key: "task_delivery_bullet_rows.a" },
-          { id: "cat-B", metric_key: "ai_bullet_rows.b" },
-        ],
-        [
-          { query_id: "q-team", catalog_metric_ids: ["cat-A", "cat-B"] },
-          { query_id: "q-ic", catalog_metric_ids: ["cat-A"] },
-        ],
-      ),
-    );
-    const { wrapper } = withClient();
-    const { result } = renderHook(
-      () => ({ catalog: useCatalog(), links: useCatalogLinkMap() }),
-      { wrapper },
-    );
-    await waitFor(() => expect(result.current.catalog.isLoading).toBe(false));
-
-    expect(Array.from(result.current.links.linksByQuery.entries())).toEqual([
-      ["q-team", ["cat-A", "cat-B"]],
-      ["q-ic", ["cat-A"]],
-    ]);
-    expect(Array.from(result.current.links.queriesByCatalogId.entries())).toEqual([
-      ["cat-A", ["q-team", "q-ic"]],
-      ["cat-B", ["q-team"]],
-    ]);
-  });
-
-  it("memoizes — N consumer reads share one computation per catalog identity (AC #8 Layer-2 invariance)", async () => {
-    fetchCatalog.mockResolvedValue(
-      makeOkResponse(
-        [{ id: "cat-A", metric_key: "ic_kpis.x" }],
-        [{ query_id: "q-1", catalog_metric_ids: ["cat-A"] }],
-      ),
-    );
-    const { wrapper } = withClient();
-    const { result, rerender } = renderHook(() => useCatalogLinkMap(), {
-      wrapper,
-    });
-    await waitFor(() => expect(result.current.linksByQuery.size).toBe(1));
-    const firstMap = result.current.linksByQuery;
-
-    // Force a re-render WITHOUT changing the underlying query data.
-    // `useMemo` keys off the catalog response identity, so the map MUST
-    // be the same reference — proving downstream consumers reading the
-    // map across N renders pay one computation, not N.
-    rerender();
-    rerender();
-    rerender();
-    expect(result.current.linksByQuery).toBe(firstMap);
-  });
-
-  it("returns empty maps when the wire response predates ADR-003 (no links)", async () => {
-    fetchCatalog.mockResolvedValue(makeOkResponse([{ id: "cat-A" }]));
-    const { wrapper } = withClient();
-    const { result } = renderHook(() => useCatalogLinkMap(), { wrapper });
-    await waitFor(() => expect(result.current.linksByQuery).toBeDefined());
-    expect(result.current.linksByQuery.size).toBe(0);
-    expect(result.current.queriesByCatalogId.size).toBe(0);
-  });
-});
diff --git a/src/api/use-catalog.ts b/src/api/use-catalog.ts
deleted file mode 100644
index fc75ab65..00000000
--- a/src/api/use-catalog.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * `useCatalog()` — TanStack-Query-backed hydrator for the Metric Catalog
- * (Refs #66 / #82).
- *
- * Calls `POST /catalog/get_metrics` once per tenant per cache-TTL window
- * (5 min per DESIGN §3.3 Catalog Consumer Contract). The TanStack Query
- * cache dedupes parallel renders automatically — every component that calls
- * `useCatalog()` with the same args shares one in-flight request.
- *
- * ## Two-layer caching
- *
- * - **Layer 1 — catalog cache**: the response itself, governed by this hook's
- *   `staleTime` (5 min) and `queryKey` (tenant-scoped).
- * - **Layer 2 — query→catalog link map**: derived via
- *   `useCatalogLinkMap()`, which is a pure selector over the same query
- *   data; recomputed only when the catalog identity changes. See
- *   `use-catalog-link-map.ts`.
- *
- * ## Tenant isolation
- *
- * The query key includes `tenantId`. A tenant switch produces a different
- * key — the old tenant's payload stays in the cache but is no longer
- * surfaced. A defensive `removeQueries({ queryKey: ['catalog'] })` fires
- * on tenant transition in `catalog-provider.tsx`, and an in-hook
- * `data.tenant_id === tenantId` guard covers the one-render window
- * before that effect commits — a cross-tenant mismatch is treated as
- * "no data" (`data === undefined`).
- *
- * ## No fallback (post-#82)
- *
- * On API failure (network, 4xx, 5xx) `data` is `undefined` and
- * `isError` is `true`. Consumers MUST handle this: render skeletons
- * while `isLoading`, render error/empty while `isError`, and treat
- * lookups against an undefined catalog as misses (no-op render). The
- * compile-in fallback that previously synthesized a catalog from FE
- * constants was removed once the wire was confirmed parity-clean (#81).
- */
-
-import { useCallback, useMemo } from 'react';
-import { useQuery } from '@tanstack/react-query';
-
-import {
-  type CatalogMetric,
-  type CatalogRequest,
-  type CatalogResponse,
-  fetchCatalog,
-} from '@/api/catalog-client';
-import { useAuth } from '@/auth/use-auth';
-
-/** 5-minute TTL per DESIGN §3.3 Catalog Consumer Contract. */
-export const CATALOG_TTL_MS = 5 * 60_000;
-
-export type CatalogQueryKey = readonly [
-  'catalog',
-  string | null,
-  string | undefined,
-  string | undefined,
-];
-
-export type UseCatalogResult = {
-  /**
-   * The wire response, or `undefined` when the catalog isn't yet
-   * available (initial load, fetch error, or cross-tenant mismatch).
-   * Consumers MUST tolerate `undefined`.
-   */
-  data: CatalogResponse | undefined;
-  isLoading: boolean;
-  isError: boolean;
-  /** Lookup by stable `id` (UUIDv7) — the wire contract. */
-  byId: (id: string) => CatalogMetric | undefined;
-  /**
-   * Lookup by `metric_key` — convenience for the catalog-hydration
-   * transitional release. Returns `undefined` when the wire response
-   * predates ADR-002 and omits `metric_key`. Refactored consumers MUST
-   * prefer `byId`.
-   */
-  byMetricKey: (metricKey: string) => CatalogMetric | undefined;
-  refetch: () => void;
-};
-
-/**
- * Hydrate the catalog for the current tenant. `args` participate in
- * threshold resolution per DESIGN §3.3 (role / team / team+role variants);
- * omit them for the dashboard-default chain that resolves at tenant /
- * product-default only.
- */
-export function useCatalog(args: CatalogRequest = {}): UseCatalogResult {
-  const { session } = useAuth();
-  const tenantId = session?.tenantId || null;
-  const roleSlug = args.role_slug;
-  const teamId = args.team_id;
-
-  const queryKey: CatalogQueryKey = ['catalog', tenantId, roleSlug, teamId];
-
-  const query = useQuery<CatalogResponse>({
-    queryKey,
-    queryFn: () => fetchCatalog(args),
-    staleTime: CATALOG_TTL_MS,
-    // 30-min gc — the cached payload survives a brief away-from-app
-    // gap so re-entry doesn't pay the round-trip when the data is still
-    // fresh under the 5-min staleTime.
-    gcTime: 30 * 60_000,
-    // Inherit TanStack's default retry (one attempt with backoff). A
-    // transient 5xx during hydration is plausible enough that the
-    // single retry pays for itself; the prior `retry: 0` rule existed
-    // only while the compile-in fallback could mask a backend outage
-    // and is no longer load-bearing post-#82.
-  });
-
-  // Cross-tenant defense in depth: if the cached payload's
-  // `tenant_id` doesn't match the currently signed-in tenant, treat the
-  // response as absent. This covers a one-render window between a
-  // tenant switch and `<CatalogProvider>`'s eviction effect committing.
-  const tenantMismatch =
-    query.data != null && tenantId != null && query.data.tenant_id !== tenantId;
-
-  const data = useMemo<CatalogResponse | undefined>(
-    () => (query.data && !tenantMismatch ? query.data : undefined),
-    [query.data, tenantMismatch],
-  );
-
-  const indexes = useMemo(() => {
-    const byId = new Map<string, CatalogMetric>();
-    const byKey = new Map<string, CatalogMetric>();
-    if (data) {
-      for (const m of data.metrics) {
-        byId.set(m.id, m);
-        if (m.metric_key && !byKey.has(m.metric_key)) byKey.set(m.metric_key, m);
-      }
-    }
-    return { byId, byKey };
-  }, [data]);
-
-  // Keep the lookup closures reference-stable across renders so consumers
-  // can include them in useMemo / useEffect dep arrays without
-  // re-running every render. The closures key off `indexes`, which is
-  // itself memoized on the response identity.
-  const byId = useCallback((id: string) => indexes.byId.get(id), [indexes]);
-  const byMetricKey = useCallback(
-    (key: string) => indexes.byKey.get(key),
-    [indexes],
-  );
-
-  return {
-    data,
-    isLoading: query.isLoading,
-    isError: query.isError,
-    byId,
-    byMetricKey,
-    refetch: () => {
-      void query.refetch();
-    },
-  };
-}
diff --git a/src/api/view-configs.test.tsx b/src/api/view-configs.test.tsx
deleted file mode 100644
index b138f9dc..00000000
--- a/src/api/view-configs.test.tsx
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * Hook tests for `useTeamViewConfig` and `useTeamKpisByPeriod` (Refs #79).
- *
- * Stubs `fetchCatalog` directly (vi.mock) — the same pattern
- * `use-catalog.test.tsx` uses — so the assertions exercise the catalog →
- * view-config wiring without leaning on MSW. Each test mounts a fresh
- * QueryClient.
- *
- * Coverage:
- *  - parity with the pre-#79 shape of
- *    `TEAM_VIEW_CONFIG.{alert_thresholds, column_thresholds}` when the
- *    catalog returns matching `view_configs.*` rows.
- *  - `schema_status='error'` rows are omitted — downstream renderers
- *    (`MembersTable`, `AttentionNeeded`) then fall through to their
- *    neutral-coloring path.
- *  - alert_thresholds are skipped when the catalog doesn't carry
- *    `alert_trigger` / `alert_bad`.
- */
-
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { renderHook, waitFor } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type React from "react";
-
-import { authStore } from "@/auth/auth-store";
-
-vi.mock("./catalog-client", async () => {
-  const actual = await vi.importActual<typeof import("./catalog-client")>(
-    "./catalog-client",
-  );
-  return { ...actual, fetchCatalog: vi.fn() };
-});
-
-import * as catalogClient from "./catalog-client";
-import { useCatalog } from "./use-catalog";
-import {
-  useTeamKpisByPeriod,
-  useTeamViewConfig,
-} from "./view-configs";
-import { makeSession } from "@/test/session";
-
-const fetchCatalog = catalogClient.fetchCatalog as ReturnType<typeof vi.fn>;
-
-type Row = Partial<catalogClient.CatalogMetric> & { metric_key: string };
-
-function buildResponse(rows: Row[]): catalogClient.CatalogResponse {
-  return {
-    tenant_id: authStore.getSnapshot().session?.tenantId || "t-1",
-    generated_at: "2026-06-01T00:00:00Z",
-    metrics: rows.map((r, i) => ({
-      id: r.id ?? `id-${i}`,
-      metric_key: r.metric_key,
-      label: r.label ?? r.metric_key,
-      higher_is_better: r.higher_is_better ?? true,
-      is_member_scale: r.is_member_scale ?? false,
-      source_tags: r.source_tags ?? [],
-      schema_status: r.schema_status ?? "ok",
-      schema_error_code: r.schema_error_code,
-      thresholds: r.thresholds ?? {
-        good: 1,
-        warn: 0,
-        resolved_from: "product-default",
-        bounded_by_lock: false,
-      },
-      unit: r.unit,
-      sublabel: r.sublabel,
-      description: r.description,
-      format: r.format,
-    })),
-    links: [],
-  };
-}
-
-function withClient(): ({ children }: { children: React.ReactNode }) => React.ReactElement {
-  const client = new QueryClient({
-    defaultOptions: { queries: { retry: false, gcTime: 0 } },
-  });
-  return ({ children }) => (
-    <QueryClientProvider client={client}>{children}</QueryClientProvider>
-  );
-}
-
-/**
- * Render a view-config hook AND observe the underlying catalog query so the
- * test can wait for the mocked `fetchCatalog` response to land before
- * asserting. Without this, the first synchronous render sees the
- * compile-in fallback rows (whose values intentionally mirror the catalog
- * defaults) — `waitFor(() => expect(value).toBeDefined())` passes
- * immediately against the fallback and tests that rely on schema_status
- * variations silently read pre-fetch state.
- */
-async function renderWithFetched<T>(
-  factory: () => T,
-): Promise<{ current: T }> {
-  const wrapper = withClient();
-  const { result } = renderHook(
-    () => ({ view: factory(), catalog: useCatalog() }),
-    { wrapper },
-  );
-  await waitFor(() => expect(result.current.catalog.isLoading).toBe(false));
-  return { get current() { return result.current.view; } };
-}
-
-describe("useTeamViewConfig", () => {
-  beforeEach(() => {
-    authStore.reset();
-    authStore.setAuthenticated(makeSession());
-    fetchCatalog.mockReset();
-  });
-  afterEach(() => {
-    authStore.reset();
-  });
-
-  it("threads alert_trigger / alert_bad / alert_reason through from the catalog", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildResponse([
-        {
-          metric_key: "view_configs.build_success_pct",
-          higher_is_better: true,
-          thresholds: {
-            good: 90,
-            warn: 80,
-            alert_trigger: 90,
-            alert_bad: 80,
-            alert_reason: "Build success rate below 90% target",
-            resolved_from: "product-default",
-            bounded_by_lock: false,
-          },
-        },
-        {
-          metric_key: "view_configs.focus_time_pct",
-          higher_is_better: true,
-          thresholds: {
-            good: 60,
-            warn: 50,
-            alert_trigger: 60,
-            alert_bad: 48,
-            alert_reason: "Focus time below 60% target",
-            resolved_from: "product-default",
-            bounded_by_lock: false,
-          },
-        },
-        {
-          metric_key: "view_configs.ai_loc_share_pct",
-          higher_is_better: true,
-          thresholds: {
-            good: 20,
-            warn: 10,
-            alert_trigger: 10,
-            alert_bad: 8,
-            alert_reason: "Low AI tool adoption",
-            resolved_from: "product-default",
-            bounded_by_lock: false,
-          },
-        },
-      ]),
-    );
-    const result = await renderWithFetched(() => useTeamViewConfig());
-    expect(result.current.alert_thresholds).toEqual([
-      {
-        metric_key: "build_success_pct",
-        trigger: 90,
-        bad: 80,
-        reason: "Build success rate below 90% target",
-      },
-      {
-        metric_key: "focus_time_pct",
-        trigger: 60,
-        bad: 48,
-        reason: "Focus time below 60% target",
-      },
-      {
-        metric_key: "ai_loc_share_pct",
-        trigger: 10,
-        bad: 8,
-        reason: "Low AI tool adoption",
-      },
-    ]);
-  });
-
-  it("skips alert rows when the catalog omits alert_trigger / alert_bad", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildResponse([
-        {
-          metric_key: "view_configs.build_success_pct",
-          higher_is_better: true,
-          thresholds: {
-            good: 90,
-            warn: 80,
-            resolved_from: "product-default",
-            bounded_by_lock: false,
-          },
-        },
-      ]),
-    );
-    const result = await renderWithFetched(() => useTeamViewConfig());
-    // No `alert_trigger` on the wire → no alert rule emitted, even though
-    // the metric IS in the alert-key list.
-    expect(result.current.alert_thresholds).toEqual([]);
-  });
-
-  it("builds column_thresholds from higher_is_better + good + warn", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildResponse([
-        {
-          metric_key: "view_configs.bugs_fixed",
-          higher_is_better: true,
-          thresholds: {
-            good: 15,
-            warn: 8,
-            resolved_from: "product-default",
-            bounded_by_lock: false,
-          },
-        },
-        {
-          metric_key: "view_configs.dev_time_h",
-          higher_is_better: false,
-          thresholds: {
-            good: 14,
-            warn: 20,
-            resolved_from: "product-default",
-            bounded_by_lock: false,
-          },
-        },
-      ]),
-    );
-    const result = await renderWithFetched(() => useTeamViewConfig());
-    expect(
-      result.current.column_thresholds.find((t) => t.metric_key === "bugs_fixed"),
-    ).toEqual({
-      metric_key: "bugs_fixed",
-      good: 15,
-      warn: 8,
-      higher_is_better: true,
-    });
-    expect(
-      result.current.column_thresholds.find((t) => t.metric_key === "dev_time_h"),
-    ).toEqual({
-      metric_key: "dev_time_h",
-      good: 14,
-      warn: 20,
-      higher_is_better: false,
-    });
-  });
-
-  it("omits schema_status='error' columns AND alert rules", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildResponse([
-        {
-          metric_key: "view_configs.build_success_pct",
-          schema_status: "error",
-          higher_is_better: true,
-          thresholds: {
-            good: 90,
-            warn: 80,
-            alert_trigger: 90,
-            alert_bad: 80,
-            alert_reason: "Build success rate below 90% target",
-            resolved_from: "product-default",
-            bounded_by_lock: false,
-          },
-        },
-      ]),
-    );
-    const result = await renderWithFetched(() => useTeamViewConfig());
-    expect(
-      result.current.column_thresholds.find(
-        (t) => t.metric_key === "build_success_pct",
-      ),
-    ).toBeUndefined();
-    expect(
-      result.current.alert_thresholds.find(
-        (t) => t.metric_key === "build_success_pct",
-      ),
-    ).toBeUndefined();
-  });
-});
-
-describe("useTeamKpisByPeriod", () => {
-  it("returns the structural KPI templates for each period", () => {
-    const wrapper = withClient();
-    const { result } = renderHook(() => useTeamKpisByPeriod("month"), {
-      wrapper,
-    });
-    // Templates don't depend on the catalog — synchronous read is fine.
-    const keys = result.current.map((t) => t.metric_key);
-    // Templates are static metadata — value/status/sublabel are filled in
-    // by useTeamKpis from real members. Keys MUST stay stable; downstream
-    // TeamHeroStrip switches by key.
-    expect(keys).toEqual([
-      "at_risk_count",
-      "team_dev_time",
-      "focus_gte_60",
-      "not_using_ai",
-    ]);
-  });
-});
diff --git a/src/api/view-configs.ts b/src/api/view-configs.ts
deleted file mode 100644
index d11085f8..00000000
--- a/src/api/view-configs.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Catalog-driven view-config hooks (Refs #79, follow-up to #66/#78).
- *
- * Replaces the previous module-level `EXEC_VIEW_CONFIG` / `TEAM_VIEW_CONFIG`
- * consts. Threshold values are sourced from `useCatalog()` under the
- * `view_configs.<bare_key>` wire prefix; compile-in defaults survive only
- * as the fallback rows surfaced by `useCatalog` when the API is unreachable
- * (per DESIGN §3.3 transitional-fallback policy).
- *
- * Catalog rows with `schema_status='error'` are omitted from the returned
- * threshold lists so the rule never fires for a broken column — the
- * downstream consumers (`MembersTable`, `AttentionNeeded`) read the policy
- * lookup as "no threshold => neutral coloring, no alert", which is the
- * intended render per the wave-1 contract.
- */
-
-import { useMemo } from 'react';
-
-import { useCatalog } from '@/api/use-catalog';
-import type {
-  TeamViewConfig,
-  TeamKpi,
-  PeriodValue,
-} from '@/types/insight';
-
-const VIEW_CONFIG_PREFIX = 'view_configs.';
-
-const TEAM_ALERT_KEYS = ['build_success_pct', 'focus_time_pct', 'ai_loc_share_pct'] as const;
-const TEAM_COLUMN_KEYS = [
-  'bugs_fixed',
-  'dev_time_h',
-  'build_success_pct',
-  'focus_time_pct',
-  'ai_loc_share_pct',
-] as const;
-
-export function useTeamViewConfig(): TeamViewConfig {
-  const { data } = useCatalog();
-  return useMemo(() => {
-    const byKey = indexByMetricKey(data?.metrics ?? []);
-    return {
-      alert_thresholds: TEAM_ALERT_KEYS.flatMap((key) => {
-        const m = byKey.get(`${VIEW_CONFIG_PREFIX}${key}`);
-        if (!m || m.schema_status === 'error') return [];
-        const t = m.thresholds;
-        if (!t) return [];
-        if (t.alert_trigger === undefined || t.alert_bad === undefined) return [];
-        return [
-          {
-            metric_key: key,
-            trigger: t.alert_trigger,
-            bad: t.alert_bad,
-            // alert_reason is optional on the wire; fall through to a
-            // generic message when the backend omits it.
-            reason: t.alert_reason ?? `${key} below target`,
-          },
-        ];
-      }),
-      column_thresholds: TEAM_COLUMN_KEYS.flatMap((key) => {
-        const m = byKey.get(`${VIEW_CONFIG_PREFIX}${key}`);
-        if (!m || m.schema_status === 'error') return [];
-        if (!m.thresholds) return [];
-        return [
-          {
-            metric_key: key,
-            good: m.thresholds.good,
-            warn: m.thresholds.warn,
-            higher_is_better: m.higher_is_better,
-          },
-        ];
-      }),
-    };
-  }, [data]);
-}
-
-function indexByMetricKey<T extends { metric_key?: string }>(
-  metrics: T[],
-): Map<string, T> {
-  const out = new Map<string, T>();
-  for (const m of metrics) {
-    if (m.metric_key && !out.has(m.metric_key)) out.set(m.metric_key, m);
-  }
-  return out;
-}
-
-// Structural metadata only. value / sublabel / chipLabel / status are
-// computed by `useTeamKpis` from the actual members for the period — when
-// no members come back, useTeamKpis returns [] and TeamHeroStrip renders
-// <ComingSoon>. We never substitute hardcoded numbers.
-const TEAM_KPI_TEMPLATES: TeamKpi[] = [
-  {
-    metric_key: 'at_risk_count',
-    label: 'At Risk',
-    value: '',
-    unit: '',
-    description:
-      'Members whose key metrics (tasks, focus, build, AI adoption) are declining across two or more dimensions.',
-    chipLabel: 'Needs attention',
-    status: 'warn',
-    section: 'overview',
-  },
-  {
-    metric_key: 'team_dev_time',
-    label: 'Task Dev Time',
-    value: '',
-    unit: '',
-    description:
-      'Team median time a task spends in In Progress state. Lower means tasks flow through development faster.',
-    chipLabel: '',
-    status: 'good',
-    section: 'overview',
-  },
-  {
-    metric_key: 'focus_gte_60',
-    label: 'Focus ≥60%',
-    value: '',
-    unit: '',
-    description:
-      "Members with 60%+ of their work time in uninterrupted 60-minute+ blocks. Fewer interruptions enables deeper, more effective work.",
-    chipLabel: 'On track',
-    status: 'good',
-    section: 'overview',
-  },
-  {
-    metric_key: 'not_using_ai',
-    label: 'Not Using AI Tools',
-    value: '',
-    unit: '',
-    description:
-      'Members with no AI tool activity (Cursor, Claude Code, Codex) logged in the selected period.',
-    chipLabel: 'Action needed',
-    status: 'bad',
-    section: 'overview',
-  },
-];
-
-const TEAM_KPIS_BY_PERIOD: Record<PeriodValue, TeamKpi[]> = {
-  week: TEAM_KPI_TEMPLATES,
-  month: TEAM_KPI_TEMPLATES,
-  quarter: TEAM_KPI_TEMPLATES,
-  year: TEAM_KPI_TEMPLATES,
-};
-
-/**
- * Period-keyed team-KPI templates. Currently identical across periods, but
- * exposed as a hook so a future catalog-driven override (label / sublabel /
- * description) has an obvious entry point without rewriting consumers.
- */
-export function useTeamKpisByPeriod(period: PeriodValue): TeamKpi[] {
-  return useMemo(
-    () => TEAM_KPIS_BY_PERIOD[period] ?? TEAM_KPIS_BY_PERIOD.month,
-    [period],
-  );
-}
diff --git a/src/auth/use-auth.ts b/src/auth/use-auth.ts
index 22808691..b43ec210 100644
--- a/src/auth/use-auth.ts
+++ b/src/auth/use-auth.ts
@@ -26,8 +26,8 @@ function safeReturnTo(path: string): string {
 
 /**
  * Redirect the whole page into the login flow. The gateway + authenticator own
- * the OIDC dance; we only hand them a `return_to`. Guarded so multiple 401s in
- * flight don't stack redirects.
+ * the provider handshake; we only hand them a `return_to`. Guarded so multiple
+ * 401s in flight don't stack redirects.
  */
 export function signIn(returnTo?: string): void {
   if (redirecting) return;
diff --git a/src/components/app-sidebar.test.tsx b/src/components/app-sidebar.test.tsx
index 5b5ceb9e..2d8a3aab 100644
--- a/src/components/app-sidebar.test.tsx
+++ b/src/components/app-sidebar.test.tsx
@@ -8,7 +8,6 @@ import type { IdentityPerson } from "@/types/insight";
 let currentPath = "/";
 let viewerEmail: string | null = "alice@x.io";
 let viewerData: IdentityPerson | undefined;
-let metricsV2Enabled = false;
 
 vi.mock("@tanstack/react-router", () => ({
   Link: ({
@@ -39,12 +38,8 @@ vi.mock("@/queries/ic-dashboard", () => ({
   useIcPerson: () => ({ data: viewerData }),
 }));
 
-vi.mock("@/lib/feature-flags", () => ({
-  useMetricsV2Enabled: () => metricsV2Enabled,
-}));
-
-vi.mock("@/components/sidebar-v2-settings", () => ({
-  SidebarV2Settings: () => null,
+vi.mock("@/components/sidebar-settings", () => ({
+  SidebarSettings: () => null,
 }));
 
 vi.mock("@/components/theme-switcher", () => ({
@@ -124,7 +119,6 @@ beforeEach(() => {
   currentPath = "/";
   viewerEmail = "alice@x.io";
   viewerData = tree;
-  metricsV2Enabled = false;
 });
 
 describe("AppSidebar", () => {
@@ -220,14 +214,7 @@ describe("AppSidebar", () => {
     expect(buttonFor("alice@x.io")).toBeInTheDocument();
   });
 
-  it("hides the metric catalog entry when metrics-v2 is off", () => {
-    render(<AppSidebar />);
-
-    expect(screen.queryByText("Metric catalog")).not.toBeInTheDocument();
-  });
-
-  it("shows the metric catalog entry, active on its route, when metrics-v2 is on", () => {
-    metricsV2Enabled = true;
+  it("shows the metric catalog entry, active on its route", () => {
     currentPath = "/metrics";
     render(<AppSidebar />);
 
diff --git a/src/components/app-sidebar.tsx b/src/components/app-sidebar.tsx
index bdd49f35..006f0a10 100644
--- a/src/components/app-sidebar.tsx
+++ b/src/components/app-sidebar.tsx
@@ -11,7 +11,7 @@ import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 
 import { useViewer } from "@/auth";
-import { SidebarV2Settings } from "@/components/sidebar-v2-settings";
+import { SidebarSettings } from "@/components/sidebar-settings";
 import { ThemeSwitcher } from "@/components/theme-switcher";
 import { Avatar, AvatarFallback } from "@/components/ui/avatar";
 import {
@@ -25,7 +25,6 @@ import {
   SidebarMenuButton,
   SidebarMenuItem,
 } from "@/components/ui/sidebar";
-import { useMetricsV2Enabled } from "@/lib/feature-flags";
 import { getInitials } from "@/lib/insight/get-initials";
 import { useIcPerson } from "@/queries/ic-dashboard";
 import type { IdentityPerson } from "@/types/insight";
@@ -98,7 +97,6 @@ export function AppSidebar() {
   const viewerQ = useIcPerson(viewerEmail ?? "");
   const viewer = viewerQ.data ?? null;
   const pathname = useRouterState({ select: (s) => s.location.pathname });
-  const metricsV2 = useMetricsV2Enabled();
   const activeEmail = useMemo(() => {
     const m = /^\/ic\/([^/]+)/.exec(pathname);
     if (m) return decodeURIComponent(m[1]!);
@@ -131,17 +129,15 @@ export function AppSidebar() {
       </SidebarContent>
       <SidebarFooter>
         <SidebarMenu>
-          {metricsV2 ? (
-            <SidebarMenuItem>
-              <SidebarMenuButton
-                isActive={pathname === "/metrics"}
-                render={<Link to="/metrics" />}
-              >
-                <BookOpenText />
-                <span>{t("metric_definitions.nav_label")}</span>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-          ) : null}
+          <SidebarMenuItem>
+            <SidebarMenuButton
+              isActive={pathname === "/metrics"}
+              render={<Link to="/metrics" />}
+            >
+              <BookOpenText />
+              <span>{t("metric_definitions.nav_label")}</span>
+            </SidebarMenuButton>
+          </SidebarMenuItem>
           <SidebarMenuItem>
             <SidebarMenuButton
               isActive={pathname === "/whats-new"}
@@ -152,7 +148,7 @@ export function AppSidebar() {
             </SidebarMenuButton>
           </SidebarMenuItem>
         </SidebarMenu>
-        <SidebarV2Settings />
+        <SidebarSettings />
         <ThemeSwitcher />
         {viewerEmail
           ? (() => {
diff --git a/src/components/auth-error.tsx b/src/components/auth-error.tsx
deleted file mode 100644
index d51eac07..00000000
--- a/src/components/auth-error.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
-
-type AuthErrorProps = {
-  title: string;
-  message: string;
-  onRetry: () => void;
-};
-
-export function AuthError({
-  title,
-  message,
-  onRetry,
-}: AuthErrorProps): React.ReactElement {
-  const { t } = useTranslation();
-  return (
-    <div className="flex min-h-svh items-center justify-center p-6">
-      <Card className="w-full max-w-md">
-        <CardContent className="flex flex-col gap-4 text-center">
-          <h1 className="text-base font-semibold text-foreground">{title}</h1>
-          <p className="text-sm text-muted-foreground">{message}</p>
-          <Button onClick={onRetry}>{t("common.actions.try_again")}</Button>
-        </CardContent>
-      </Card>
-    </div>
-  );
-}
diff --git a/src/components/sidebar-v2-settings.test.tsx b/src/components/sidebar-settings.test.tsx
similarity index 65%
rename from src/components/sidebar-v2-settings.test.tsx
rename to src/components/sidebar-settings.test.tsx
index 40ae7883..95783319 100644
--- a/src/components/sidebar-v2-settings.test.tsx
+++ b/src/components/sidebar-settings.test.tsx
@@ -4,8 +4,6 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import "@/i18n";
 
-import { setMetricsV2Enabled } from "@/lib/feature-flags";
-
 vi.mock("@/components/ui/sidebar", () => ({
   SidebarMenu: ({ children }: { children?: React.ReactNode }) => (
     <div>{children}</div>
@@ -34,39 +32,18 @@ vi.mock("@/components/ui/sidebar", () => ({
   ),
 }));
 
-import { SidebarV2Settings } from "./sidebar-v2-settings";
+import { SidebarSettings } from "./sidebar-settings";
 
 beforeEach(() => {
   localStorage.clear();
-  setMetricsV2Enabled(false);
 });
 
-describe("SidebarV2Settings", () => {
-  it("hides the v2-only controls while the flag is off", () => {
-    render(<SidebarV2Settings />);
-
-    expect(screen.getByText("New metrics UI")).toBeInTheDocument();
-    expect(screen.queryByText("Focus")).not.toBeInTheDocument();
-    expect(screen.queryByText("Explanations")).not.toBeInTheDocument();
-  });
-
-  it("toggles the metrics-v2 flag and reveals focus + explanations controls", async () => {
-    const user = userEvent.setup();
-    render(<SidebarV2Settings />);
-
-    const v2Row = screen
-      .getByText("New metrics UI")
-      .closest('[data-testid="menu-button"]') as HTMLElement;
-    expect(v2Row).toHaveAttribute("aria-pressed", "false");
-
-    await user.click(v2Row);
+describe("SidebarSettings", () => {
+  it("shows the focus mode and explanations controls", () => {
+    render(<SidebarSettings />);
 
-    expect(v2Row).toHaveAttribute("aria-pressed", "true");
-    // The flag is in-memory only — nothing is persisted across reloads.
-    expect(localStorage.getItem("insight.metrics-v2")).toBeNull();
     expect(screen.getByText("Focus")).toBeInTheDocument();
     expect(screen.getByText("Explanations")).toBeInTheDocument();
-    // All four focus modes are offered.
     for (const label of ["All", "Critical", "Rewards", "Calm"]) {
       expect(screen.getByRole("button", { name: label })).toBeInTheDocument();
     }
@@ -74,8 +51,7 @@ describe("SidebarV2Settings", () => {
 
   it("changes the focus mode through the toggle group", async () => {
     const user = userEvent.setup();
-    setMetricsV2Enabled(true);
-    render(<SidebarV2Settings />);
+    render(<SidebarSettings />);
 
     await user.click(screen.getByRole("button", { name: "Critical" }));
     expect(localStorage.getItem("insight.focus-mode")).toBe("critical");
@@ -91,8 +67,7 @@ describe("SidebarV2Settings", () => {
 
   it("toggles explanations from its row", async () => {
     const user = userEvent.setup();
-    setMetricsV2Enabled(true);
-    render(<SidebarV2Settings />);
+    render(<SidebarSettings />);
 
     const row = screen
       .getByText("Explanations")
diff --git a/src/components/sidebar-settings.tsx b/src/components/sidebar-settings.tsx
new file mode 100644
index 00000000..f5df0026
--- /dev/null
+++ b/src/components/sidebar-settings.tsx
@@ -0,0 +1,70 @@
+import { HelpCircle } from "lucide-react";
+import { useTranslation } from "react-i18next";
+
+import {
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+} from "@/components/ui/sidebar";
+import { Switch } from "@/components/ui/switch";
+import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
+import { useSettings } from "@/hooks/use-settings";
+import type { FocusMode } from "@/lib/peers";
+
+const FOCUS_MODES: ReadonlyArray<FocusMode> = [
+  "critical",
+  "rewards",
+  "neutral",
+  "all",
+];
+
+export function SidebarSettings() {
+  const { t } = useTranslation();
+  const { focusMode, showExplanations, setFocusMode, setShowExplanations } =
+    useSettings();
+
+  return (
+    <SidebarMenu>
+      <SidebarMenuItem className="flex flex-col items-stretch gap-1.5 p-1">
+        <span className="px-1 text-[10px] font-medium uppercase tracking-wider text-sidebar-foreground/60">
+          {t("settings.focus_mode.label")}
+        </span>
+        <ToggleGroup
+          aria-label={t("settings.focus_mode.label")}
+          value={[focusMode]}
+          onValueChange={(values) => {
+            const next = Array.isArray(values) ? values[0] : values;
+            if (next) setFocusMode(next as FocusMode);
+          }}
+          variant="outline"
+          size="sm"
+          className="w-full"
+        >
+          {FOCUS_MODES.map((mode) => (
+            <ToggleGroupItem key={mode} value={mode} className="flex-1 text-xs">
+              {t(`settings.focus_mode.${mode}`)}
+            </ToggleGroupItem>
+          ))}
+        </ToggleGroup>
+      </SidebarMenuItem>
+      <SidebarMenuItem>
+        <SidebarMenuButton
+          onClick={() => setShowExplanations(!showExplanations)}
+          aria-pressed={showExplanations}
+          className="justify-between"
+        >
+          <span className="flex items-center gap-2">
+            <HelpCircle className="size-4" />
+            <span>{t("settings.explanations.label")}</span>
+          </span>
+          <Switch
+            checked={showExplanations}
+            onCheckedChange={setShowExplanations}
+            size="sm"
+            tabIndex={-1}
+          />
+        </SidebarMenuButton>
+      </SidebarMenuItem>
+    </SidebarMenu>
+  );
+}
diff --git a/src/components/sidebar-v2-settings.tsx b/src/components/sidebar-v2-settings.tsx
deleted file mode 100644
index 4ced43f1..00000000
--- a/src/components/sidebar-v2-settings.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { HelpCircle, Sparkles } from "lucide-react";
-import { useTranslation } from "react-i18next";
-
-import {
-  SidebarMenu,
-  SidebarMenuButton,
-  SidebarMenuItem,
-} from "@/components/ui/sidebar";
-import { Switch } from "@/components/ui/switch";
-import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
-import { useSettings } from "@/hooks/use-settings";
-import {
-  setMetricsV2Enabled,
-  useMetricsV2Enabled,
-} from "@/lib/feature-flags";
-import type { FocusMode } from "@/lib/peers";
-
-const FOCUS_MODES: ReadonlyArray<FocusMode> = [
-  "critical",
-  "rewards",
-  "neutral",
-  "all",
-];
-
-export function SidebarV2Settings() {
-  const { t } = useTranslation();
-  const v2 = useMetricsV2Enabled();
-  const { focusMode, showExplanations, setFocusMode, setShowExplanations } =
-    useSettings();
-
-  return (
-    <SidebarMenu>
-      {v2 ? (
-        <>
-          <SidebarMenuItem className="flex flex-col items-stretch gap-1.5 p-1">
-            <span className="px-1 text-[10px] font-medium uppercase tracking-wider text-sidebar-foreground/60">
-              {t("settings.focus_mode.label")}
-            </span>
-            <ToggleGroup
-              aria-label={t("settings.focus_mode.label")}
-              value={[focusMode]}
-              onValueChange={(values) => {
-                const next = Array.isArray(values) ? values[0] : values;
-                if (next) setFocusMode(next as FocusMode);
-              }}
-              variant="outline"
-              size="sm"
-              className="w-full"
-            >
-              {FOCUS_MODES.map((mode) => (
-                <ToggleGroupItem
-                  key={mode}
-                  value={mode}
-                  className="flex-1 text-xs"
-                >
-                  {t(`settings.focus_mode.${mode}`)}
-                </ToggleGroupItem>
-              ))}
-            </ToggleGroup>
-          </SidebarMenuItem>
-          <SidebarMenuItem>
-            <SidebarMenuButton
-              onClick={() => setShowExplanations(!showExplanations)}
-              aria-pressed={showExplanations}
-              className="justify-between"
-            >
-              <span className="flex items-center gap-2">
-                <HelpCircle className="size-4" />
-                <span>{t("settings.explanations.label")}</span>
-              </span>
-              <Switch
-                checked={showExplanations}
-                onCheckedChange={setShowExplanations}
-                size="sm"
-                tabIndex={-1}
-              />
-            </SidebarMenuButton>
-          </SidebarMenuItem>
-        </>
-      ) : null}
-      <SidebarMenuItem>
-        <SidebarMenuButton
-          onClick={() => setMetricsV2Enabled(!v2)}
-          aria-pressed={v2}
-          className="justify-between"
-        >
-          <span className="flex items-center gap-2">
-            <Sparkles className="size-4" />
-            <span>{t("settings.metrics_v2.label")}</span>
-          </span>
-          <Switch
-            checked={v2}
-            onCheckedChange={setMetricsV2Enabled}
-            size="sm"
-            tabIndex={-1}
-          />
-        </SidebarMenuButton>
-      </SidebarMenuItem>
-    </SidebarMenu>
-  );
-}
diff --git a/src/components/widgets/attention-needed.tsx b/src/components/widgets/attention-needed.tsx
deleted file mode 100644
index cc783b4b..00000000
--- a/src/components/widgets/attention-needed.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import { Link } from "@tanstack/react-router";
-import { AlertTriangle, ArrowRight, CircleAlert } from "lucide-react";
-import type { ComponentType, SVGProps } from "react";
-
-import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
-import { cn } from "@/lib/utils";
-import type { AlertThreshold, TeamMember } from "@/types/insight";
-
-type Severity = "bad" | "warn";
-
-type AlertItem = {
-  member: TeamMember;
-  title: string;
-  description: string;
-  severity: Severity;
-};
-
-const SEVERITY_ICON: Record<Severity, ComponentType<SVGProps<SVGSVGElement>>> = {
-  bad: CircleAlert,
-  warn: AlertTriangle,
-};
-const SEVERITY_ICON_CLASS: Record<Severity, string> = {
-  bad: "bg-destructive/15 text-destructive",
-  warn: "bg-warning/15 text-warning",
-};
-
-const METRIC_LABEL: Record<string, { label: string; unit: string }> = {
-  build_success_pct: { label: "Build Success Rate", unit: "%" },
-  focus_time_pct: { label: "Focus Time", unit: "%" },
-  ai_loc_share_pct: { label: "AI Code Acceptance", unit: "%" },
-};
-
-function buildDescription(
-  metricKey: string,
-  m: TeamMember,
-  trigger: number,
-): string {
-  const meta = METRIC_LABEL[metricKey] ?? { label: metricKey, unit: "" };
-  const val = m[metricKey as keyof TeamMember] as number;
-  const base = `${meta.label} is ${val}${meta.unit} vs ${trigger}${meta.unit} target.`;
-  if (metricKey === "focus_time_pct")
-    return `${base} ${m.tasks_closed} tasks completed this period.`;
-  if (metricKey === "build_success_pct")
-    return m.prs_merged !== null
-      ? `${base} ${m.prs_merged} PRs merged this period.`
-      : base;
-  if (metricKey === "ai_loc_share_pct")
-    return `${base} ${
-      m.ai_tools.length === 0
-        ? "No AI tools active."
-        : `Active tools: ${m.ai_tools.join(", ")}.`
-    }`;
-  return base;
-}
-
-function computeAlerts(
-  members: TeamMember[],
-  alertThresholds: AlertThreshold[],
-): AlertItem[] {
-  const alerts: AlertItem[] = [];
-  for (const m of members) {
-    for (const rule of alertThresholds) {
-      const value = m[rule.metric_key as keyof TeamMember];
-      if (typeof value !== "number" || !Number.isFinite(value)) continue;
-      if (value < rule.trigger) {
-        const severity: Severity = value < rule.bad ? "bad" : "warn";
-        alerts.push({
-          member: m,
-          title: `${m.name} — ${rule.reason}`,
-          description: buildDescription(rule.metric_key, m, rule.trigger),
-          severity,
-        });
-      }
-    }
-  }
-  return alerts;
-}
-
-export interface AttentionNeededProps {
-  members: TeamMember[];
-  alertThresholds: AlertThreshold[];
-}
-
-export function AttentionNeeded({
-  members,
-  alertThresholds,
-}: AttentionNeededProps) {
-  const alerts = computeAlerts(members, alertThresholds);
-  if (alerts.length === 0) return null;
-
-  return (
-    <Card>
-      <div className="px-4 pt-3.5 pb-0">
-        <span className="text-foreground text-sm font-bold">
-          Attention Needed
-        </span>
-      </div>
-      <CardContent className="px-4 py-3">
-        {alerts.map((alert, i) => (
-          <div
-            key={`${alert.member.person_id}-${i}`}
-            className={cn(
-              "flex items-start gap-3 py-3",
-              i < alerts.length - 1 ? "border-border border-b" : "",
-            )}
-          >
-            <div
-              className={cn(
-                "flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-lg",
-                SEVERITY_ICON_CLASS[alert.severity],
-              )}
-            >
-              {(() => {
-                const Icon = SEVERITY_ICON[alert.severity];
-                return <Icon className="size-4" />;
-              })()}
-            </div>
-            <div className="min-w-0 flex-1">
-              <div className="text-foreground mb-0.5 text-sm font-bold">
-                {alert.title}
-              </div>
-              <div className="text-muted-foreground text-xs">
-                {alert.description}
-              </div>
-              <Button
-                variant="link"
-                size="sm"
-                className="text-primary mt-1 h-auto gap-1 p-0 text-xs font-semibold"
-                render={
-                  <Link
-                    to="/ic/$person/personal"
-                    params={{ person: alert.member.person_id }}
-                  />
-                }
-              >
-                <ArrowRight className="size-3" />
-                Open IC dashboard
-              </Button>
-            </div>
-          </div>
-        ))}
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/src/components/widgets/bullet-chart.test.tsx b/src/components/widgets/bullet-chart.test.tsx
deleted file mode 100644
index b1435e98..00000000
--- a/src/components/widgets/bullet-chart.test.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Component coverage for `<BulletChart>`: chart and tile modes, period
- * suffixing, drill interactions (click + keyboard), the unavailable-status
- * meter suppression, and the schema-error escape hatch that keeps the meter.
- */
-
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { describe, expect, it, vi } from "vitest";
-
-import type { BulletMetric, PeriodValue } from "@/types/insight";
-
-import { BulletChart } from "./bullet-chart";
-
-function makeMetric(
-  overrides: Partial<BulletMetric & { period?: string }> = {},
-): BulletMetric & { period?: string } {
-  return {
-    period: "month" as PeriodValue,
-    section: "task_delivery",
-    metric_key: "tasks_completed",
-    label: "Tasks Closed",
-    value: "12",
-    unit: "tasks",
-    range_min: "0",
-    range_max: "20",
-    median: "5",
-    median_label: "Median: 5 tasks",
-    bar_left_pct: 0,
-    bar_width_pct: 60,
-    median_left_pct: 25,
-    status: "good",
-    drill_id: "",
-    ...overrides,
-  };
-}
-
-describe("<BulletChart> chart mode", () => {
-  it("renders label, value, unit, period suffix, and meter labels", () => {
-    render(<BulletChart metric={makeMetric()} />);
-    expect(screen.getByText("Tasks Closed")).toBeInTheDocument();
-    expect(screen.getByText("12")).toBeInTheDocument();
-    expect(screen.getByText("tasks")).toBeInTheDocument();
-    expect(screen.getByText("/ mo")).toBeInTheDocument();
-    expect(screen.getByText("Median: 5 tasks")).toBeInTheDocument();
-    expect(screen.getByText("0")).toBeInTheDocument();
-    expect(screen.getByText("20")).toBeInTheDocument();
-  });
-
-  it("appends the person name to the sublabel", () => {
-    render(
-      <BulletChart
-        metric={makeMetric({ sublabel: "last 30 days" })}
-        personName="Jane"
-      />,
-    );
-    expect(screen.getByText("last 30 days · Jane")).toBeInTheDocument();
-  });
-
-  it("renders the sublabel alone without a person name", () => {
-    render(<BulletChart metric={makeMetric({ sublabel: "last 30 days" })} />);
-    expect(screen.getByText("last 30 days")).toBeInTheDocument();
-  });
-
-  it("drills through click, Enter, and Space when drill_id is set", async () => {
-    const onDrillClick = vi.fn();
-    render(
-      <BulletChart
-        metric={makeMetric({ drill_id: "d-1" })}
-        onDrillClick={onDrillClick}
-      />,
-    );
-    const value = screen.getByRole("button", {
-      name: "Drill into Tasks Closed",
-    });
-    await userEvent.click(value);
-    expect(onDrillClick).toHaveBeenCalledWith("d-1");
-
-    value.focus();
-    await userEvent.keyboard("{Enter}");
-    await userEvent.keyboard(" ");
-    expect(onDrillClick).toHaveBeenCalledTimes(3);
-
-    // Unrelated keys do not drill.
-    await userEvent.keyboard("x");
-    expect(onDrillClick).toHaveBeenCalledTimes(3);
-  });
-
-  it("is not interactive without a drill_id", () => {
-    render(<BulletChart metric={makeMetric()} onDrillClick={vi.fn()} />);
-    expect(screen.queryByRole("button")).not.toBeInTheDocument();
-  });
-
-  it("suppresses the meter for unavailable rows", () => {
-    render(
-      <BulletChart
-        metric={makeMetric({ status: "unavailable", median_label: "" })}
-      />,
-    );
-    expect(
-      screen.getByRole("status", { name: "No data for this period" }),
-    ).toBeInTheDocument();
-  });
-
-  it("keeps the meter for unavailable schema-error rows with meter data", () => {
-    render(
-      <BulletChart
-        metric={makeMetric({ status: "unavailable", schema_error: true })}
-      />,
-    );
-    expect(screen.queryByRole("status")).not.toBeInTheDocument();
-    expect(screen.getByText("Median: 5 tasks")).toBeInTheDocument();
-  });
-});
-
-describe("<BulletChart> tile mode", () => {
-  it("renders value, unit, suffix, and the median badge", () => {
-    render(<BulletChart metric={makeMetric()} mode="tile" />);
-    expect(screen.getByText("Tasks Closed")).toBeInTheDocument();
-    expect(screen.getByText("12")).toBeInTheDocument();
-    expect(screen.getByText("tasks")).toBeInTheDocument();
-    expect(screen.getByText("/ mo")).toBeInTheDocument();
-    expect(screen.getByText("Median: 5 tasks")).toBeInTheDocument();
-  });
-
-  it("drills from the tile container when drill_id is set", async () => {
-    const onDrillClick = vi.fn();
-    render(
-      <BulletChart
-        metric={makeMetric({ drill_id: "d-2" })}
-        onDrillClick={onDrillClick}
-        mode="tile"
-      />,
-    );
-    const tile = screen.getByRole("button", { name: "Tasks Closed: 12 tasks" });
-    await userEvent.click(tile);
-    expect(onDrillClick).toHaveBeenCalledWith("d-2");
-
-    tile.focus();
-    await userEvent.keyboard("{Enter}");
-    expect(onDrillClick).toHaveBeenCalledTimes(2);
-  });
-
-  it("shows the coming-soon chip for unavailable tiles", () => {
-    render(
-      <BulletChart
-        metric={makeMetric({ status: "unavailable", median_label: "" })}
-        mode="tile"
-      />,
-    );
-    expect(
-      screen.getByRole("status", { name: "No data for this period" }),
-    ).toBeInTheDocument();
-  });
-});
diff --git a/src/components/widgets/bullet-chart.tsx b/src/components/widgets/bullet-chart.tsx
deleted file mode 100644
index 89087c14..00000000
--- a/src/components/widgets/bullet-chart.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import { Minus, TrendingDown, TrendingUp } from "lucide-react";
-import { memo, type KeyboardEvent } from "react";
-
-import { Badge } from "@/components/ui/badge";
-import { cn } from "@/lib/utils";
-import { getPeriodSuffix } from "@/lib/insight/period-suffix";
-import type { BulletMetric } from "@/types/insight";
-
-import { ComingSoon } from "./coming-soon";
-import { ProgressTrack } from "./progress-track";
-
-type KnownStatus = "good" | "warn" | "bad";
-
-const STATUS_BAR_CLASS: Record<KnownStatus, string> = {
-  good: "bg-success",
-  warn: "bg-warning",
-  bad: "bg-destructive",
-};
-
-const STATUS_BADGE_CLASS: Record<KnownStatus, string> = {
-  good: "bg-success/10 text-success",
-  warn: "bg-warning/10 text-warning",
-  bad: "bg-destructive/10 text-destructive",
-};
-
-const STATUS_ARROW: Record<KnownStatus, typeof TrendingUp> = {
-  good: TrendingUp,
-  warn: Minus,
-  bad: TrendingDown,
-};
-
-export interface BulletChartProps {
-  metric: BulletMetric & { period?: string };
-  onDrillClick?: (drillId: string) => void;
-  mode?: "chart" | "tile";
-  personName?: string;
-}
-
-function BulletChartImpl({
-  metric,
-  onDrillClick,
-  mode = "chart",
-  personName,
-}: BulletChartProps) {
-  const {
-    label,
-    sublabel,
-    value,
-    unit,
-    bar_left_pct,
-    bar_width_pct,
-    median_left_pct,
-    median_label,
-    range_min,
-    range_max,
-    status,
-    drill_id,
-    period,
-  } = metric;
-
-  const suffix = getPeriodSuffix(unit, period);
-  const isDrillable = Boolean(drill_id);
-
-  const handleDrillClick = (): void => {
-    if (isDrillable && onDrillClick) onDrillClick(drill_id);
-  };
-
-  const handleKeyDown = (e: KeyboardEvent): void => {
-    if ((e.key === "Enter" || e.key === " ") && isDrillable) {
-      e.preventDefault();
-      handleDrillClick();
-    }
-  };
-
-  const fullSublabel = sublabel
-    ? personName
-      ? `${sublabel} · ${personName}`
-      : sublabel
-    : undefined;
-
-  const hasMeterData =
-    median_label !== "" && range_min !== "—" && range_max !== "—";
-  const suppressMeter =
-    status === "unavailable" && (!metric.schema_error || !hasMeterData);
-  const knownStatus: KnownStatus = status === "unavailable" ? "warn" : status;
-
-  if (mode === "tile") {
-    return (
-      <div
-        className={cn(
-          "bg-muted/50 rounded-lg px-3.5 py-3",
-          isDrillable
-            ? "focus-visible:ring-ring cursor-pointer focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none"
-            : "cursor-default",
-        )}
-        role={isDrillable ? "button" : undefined}
-        tabIndex={isDrillable ? 0 : undefined}
-        onClick={isDrillable ? handleDrillClick : undefined}
-        onKeyDown={isDrillable ? handleKeyDown : undefined}
-        aria-label={isDrillable ? `${label}: ${value} ${unit}` : undefined}
-      >
-        <div className="text-muted-foreground mb-0.5 text-sm font-medium">
-          {label}
-        </div>
-        <div className="mb-1 flex items-baseline gap-0.5">
-          <span className="text-foreground text-2xl font-extrabold tracking-tight">
-            {value}
-          </span>
-          {unit ? (
-            <span className="text-muted-foreground text-sm">{unit}</span>
-          ) : null}
-          {suffix ? (
-            <span className="text-muted-foreground text-xs">{suffix}</span>
-          ) : null}
-        </div>
-        {suppressMeter ? (
-          <ComingSoon variant="chip" />
-        ) : (
-          <Badge
-            variant="secondary"
-            className={cn("gap-1 text-sm font-semibold", STATUS_BADGE_CLASS[knownStatus])}
-          >
-            {(() => {
-              const Icon = STATUS_ARROW[knownStatus];
-              return <Icon className="size-3.5" />;
-            })()}
-            {median_label}
-          </Badge>
-        )}
-      </div>
-    );
-  }
-
-  return (
-    <div>
-      <div className="flex items-start justify-between">
-        <div>
-          <span className="text-foreground text-base leading-snug font-semibold">
-            {label}
-          </span>
-          {fullSublabel ? (
-            <div className="text-muted-foreground text-xs leading-tight font-normal">
-              {fullSublabel}
-            </div>
-          ) : null}
-        </div>
-        <div className="text-right">
-          <span
-            className={cn(
-              "text-foreground text-xl leading-none font-extrabold",
-              isDrillable
-                ? "hover:decoration-primary focus-visible:ring-ring cursor-pointer rounded-sm hover:underline hover:decoration-dotted hover:underline-offset-4 focus-visible:ring-2 focus-visible:ring-offset-1 focus-visible:outline-none"
-                : "cursor-default",
-            )}
-            role={isDrillable ? "button" : undefined}
-            tabIndex={isDrillable ? 0 : undefined}
-            onClick={isDrillable ? handleDrillClick : undefined}
-            onKeyDown={isDrillable ? handleKeyDown : undefined}
-            aria-label={isDrillable ? `Drill into ${label}` : undefined}
-          >
-            {value}
-          </span>
-          {unit ? (
-            <span className="text-muted-foreground ml-1 text-sm">{unit}</span>
-          ) : null}
-          {suffix ? (
-            <span className="text-muted-foreground ml-0.5 text-xs">
-              {suffix}
-            </span>
-          ) : null}
-        </div>
-      </div>
-
-      {suppressMeter ? (
-        <div className="mt-1">
-          <ComingSoon variant="row" />
-        </div>
-      ) : (
-        <>
-          <ProgressTrack
-            barLeftPct={bar_left_pct}
-            barWidthPct={bar_width_pct}
-            medianLeftPct={median_left_pct}
-            barColorClass={STATUS_BAR_CLASS[knownStatus]}
-          />
-          <div className="text-muted-foreground mt-0.5 flex justify-between text-xs">
-            <span>{range_min}</span>
-            <span className="text-foreground font-medium">{median_label}</span>
-            <span>{range_max}</span>
-          </div>
-        </>
-      )}
-    </div>
-  );
-}
-
-export const BulletChart = memo(BulletChartImpl);
diff --git a/src/components/widgets/chart-colors.ts b/src/components/widgets/chart-colors.ts
deleted file mode 100644
index 830f568a..00000000
--- a/src/components/widgets/chart-colors.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Chart color constants. Recharts SVG can't read CSS custom properties
- * (drawn at SVG-render time, not via DOM CSS), so we keep hex values here.
- */
-
-export const CHART_BLUE = "#2563EB";
-export const CHART_PURPLE = "#7C3AED";
-export const CHART_GREEN = "#16A34A";
-export const CHART_LIGHT_BLUE = "#93C5FD";
-export const CHART_GRAY = "#9CA3AF";
-export const CHART_TRACK_BG = "#F0F2F7";
-export const CHART_AI_LOC = "#BFDBFE";
-export const CHART_SPEC_LINES = "#A78BFA";
-
-export const CHART_FONT_TICK = 12;
-export const CHART_FONT_LABEL = 12;
-export const CHART_FONT_VALUE = 14;
-export const CHART_FONT_HERO = 36;
diff --git a/src/components/widgets/collapsible-section.test.tsx b/src/components/widgets/collapsible-section.test.tsx
deleted file mode 100644
index add249da..00000000
--- a/src/components/widgets/collapsible-section.test.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { beforeEach, describe, expect, it } from "vitest";
-
-import { CollapsibleSection } from "@/components/widgets/collapsible-section";
-
-describe("CollapsibleSection", () => {
-  beforeEach(() => {
-    localStorage.clear();
-  });
-
-  it("starts collapsed by default and shows title + subtitle", () => {
-    render(
-      <CollapsibleSection title="Details" subtitle="per member">
-        <p>Body</p>
-      </CollapsibleSection>,
-    );
-
-    expect(screen.getByText("Details")).toBeInTheDocument();
-    expect(screen.getByText("per member")).toBeInTheDocument();
-    expect(screen.getByText("Collapsed")).toBeInTheDocument();
-    expect(screen.queryByText("Body")).not.toBeInTheDocument();
-  });
-
-  it("expands on click and collapses back", async () => {
-    const user = userEvent.setup();
-    render(
-      <CollapsibleSection title="Details" defaultOpen>
-        <p>Body</p>
-      </CollapsibleSection>,
-    );
-
-    expect(screen.getByText("Expanded")).toBeInTheDocument();
-    expect(screen.getByText("Body")).toBeInTheDocument();
-
-    await user.click(screen.getByRole("button"));
-    expect(screen.getByText("Collapsed")).toBeInTheDocument();
-  });
-
-  it("persists the open state under the storage key", async () => {
-    const user = userEvent.setup();
-    const { unmount } = render(
-      <CollapsibleSection title="Details" storageKey="section.details">
-        <p>Body</p>
-      </CollapsibleSection>,
-    );
-
-    await user.click(screen.getByRole("button"));
-    expect(localStorage.getItem("section.details")).toBe("1");
-    unmount();
-
-    render(
-      <CollapsibleSection title="Details" storageKey="section.details">
-        <p>Body</p>
-      </CollapsibleSection>,
-    );
-    expect(screen.getByText("Expanded")).toBeInTheDocument();
-  });
-});
diff --git a/src/components/widgets/collapsible-section.tsx b/src/components/widgets/collapsible-section.tsx
deleted file mode 100644
index b92c1bf4..00000000
--- a/src/components/widgets/collapsible-section.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import type { ReactNode } from "react";
-
-import {
-  Collapsible,
-  CollapsibleContent,
-  CollapsibleTrigger,
-} from "@/components/ui/collapsible";
-import { useLocalStorageState } from "@/hooks/use-local-storage-state";
-
-export interface CollapsibleSectionProps {
-  title: string;
-  subtitle?: string;
-  defaultOpen?: boolean;
-  storageKey?: string;
-  children: ReactNode;
-}
-
-function parseOpen(raw: string): boolean | undefined {
-  if (raw === "1") return true;
-  if (raw === "0") return false;
-  return undefined;
-}
-
-function serializeOpen(value: boolean): string {
-  return value ? "1" : "0";
-}
-
-export function CollapsibleSection({
-  title,
-  subtitle,
-  defaultOpen = false,
-  storageKey,
-  children,
-}: CollapsibleSectionProps) {
-  const [open, setOpen] = useLocalStorageState({
-    key: storageKey,
-    defaultValue: defaultOpen,
-    parse: parseOpen,
-    serialize: serializeOpen,
-  });
-
-  return (
-    <Collapsible
-      open={open}
-      onOpenChange={setOpen}
-      className="overflow-hidden rounded-lg border border-border"
-    >
-      <CollapsibleTrigger
-        render={
-          <button
-            type="button"
-            className="flex w-full cursor-pointer items-start justify-between border-none bg-card px-4 py-3 text-left transition-colors hover:bg-accent/40"
-          >
-            <span className="flex flex-col">
-              <span className="text-sm font-semibold text-foreground">
-                {title}
-              </span>
-              {subtitle ? (
-                <span className="mt-0.5 text-xs text-muted-foreground">
-                  {subtitle}
-                </span>
-              ) : null}
-            </span>
-            <span className="flex shrink-0 items-center gap-1.5">
-              <span className="rounded bg-muted px-1.5 py-px text-xs text-muted-foreground">
-                {open ? "Expanded" : "Collapsed"}
-              </span>
-              <span className="text-xs text-muted-foreground">
-                {open ? "▴" : "▾"}
-              </span>
-            </span>
-          </button>
-        }
-      />
-      <CollapsibleContent className="border-t border-border bg-card">
-        {children}
-      </CollapsibleContent>
-    </Collapsible>
-  );
-}
diff --git a/src/components/widgets/coming-soon.tsx b/src/components/widgets/coming-soon.tsx
index 7d9b92e8..c09b7808 100644
--- a/src/components/widgets/coming-soon.tsx
+++ b/src/components/widgets/coming-soon.tsx
@@ -3,8 +3,8 @@ import { memo } from "react";
 
 import { cn } from "@/lib/utils";
 
-export type ComingSoonVariant = "card" | "chip" | "row";
-export type ComingSoonState = "empty" | "error" | "loading";
+type ComingSoonVariant = "card" | "chip" | "row";
+type ComingSoonState = "empty" | "error" | "loading";
 
 export interface ComingSoonProps {
   variant?: ComingSoonVariant;
diff --git a/src/components/widgets/v2/dashboard-empty-state.test.tsx b/src/components/widgets/dashboard/dashboard-empty-state.test.tsx
similarity index 94%
rename from src/components/widgets/v2/dashboard-empty-state.test.tsx
rename to src/components/widgets/dashboard/dashboard-empty-state.test.tsx
index 3cb20d0d..2e719c74 100644
--- a/src/components/widgets/v2/dashboard-empty-state.test.tsx
+++ b/src/components/widgets/dashboard/dashboard-empty-state.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 
-import { DashboardEmptyState } from "@/components/widgets/v2/dashboard-empty-state";
+import { DashboardEmptyState } from "@/components/widgets/dashboard/dashboard-empty-state";
 
 describe("DashboardEmptyState", () => {
   it("offers every wider period and reports the current one", () => {
diff --git a/src/components/widgets/v2/dashboard-empty-state.tsx b/src/components/widgets/dashboard/dashboard-empty-state.tsx
similarity index 100%
rename from src/components/widgets/v2/dashboard-empty-state.tsx
rename to src/components/widgets/dashboard/dashboard-empty-state.tsx
diff --git a/src/components/widgets/v2/dashboard-header.tsx b/src/components/widgets/dashboard/dashboard-header.tsx
similarity index 100%
rename from src/components/widgets/v2/dashboard-header.tsx
rename to src/components/widgets/dashboard/dashboard-header.tsx
diff --git a/src/components/widgets/v2/group-drilldown-sheet.test.tsx b/src/components/widgets/dashboard/group-drilldown-sheet.test.tsx
similarity index 72%
rename from src/components/widgets/v2/group-drilldown-sheet.test.tsx
rename to src/components/widgets/dashboard/group-drilldown-sheet.test.tsx
index 60c0b782..f1153669 100644
--- a/src/components/widgets/v2/group-drilldown-sheet.test.tsx
+++ b/src/components/widgets/dashboard/group-drilldown-sheet.test.tsx
@@ -4,8 +4,8 @@ import { describe, expect, it, vi } from "vitest";
 import {
   GroupDrilldownSheet,
   type MetricDrilldownTarget,
-} from "@/components/widgets/v2/group-drilldown-sheet";
-import type { GroupDef } from "@/lib/insight/groups";
+} from "@/components/widgets/dashboard/group-drilldown-sheet";
+import type { MetricGroup } from "@/lib/insight/groups";
 import type { MetricCollectionResult } from "@/queries/metric-results";
 
 vi.mock("@/components/widgets/metric-views/collection-drilldown", () => ({
@@ -14,29 +14,13 @@ vi.mock("@/components/widgets/metric-views/collection-drilldown", () => ({
 vi.mock("@/components/widgets/metric-views/team-collection-drilldown", () => ({
   TeamCollectionDrilldown: () => <div>team-drilldown</div>,
 }));
-vi.mock("@/queries/v2/ic-extras", () => ({
-  useIcDrilldownBatch: () => ({
-    data: undefined,
-    isPending: false,
-    isFetching: false,
-    fetchStatus: "idle",
-  }),
-}));
-
-const METRIC_DEF: GroupDef = {
-  kind: "metrics",
+const METRIC_DEF: MetricGroup = {
   id: "ai_adoption",
   title: "AI adoption",
   collection: { metrics: [] },
   card: { preview: [] },
   drilldown: [],
 };
-const LEGACY_DEF: GroupDef = {
-  kind: "legacy",
-  id: "wiki",
-  title: "Legacy section",
-};
-
 const EMPTY_RESULT: MetricCollectionResult = {
   byKey: new Map(),
   previousByKey: null,
@@ -47,7 +31,7 @@ const EMPTY_RESULT: MetricCollectionResult = {
 };
 
 function renderSheet(
-  def: GroupDef,
+  def: MetricGroup,
   metricTarget?: MetricDrilldownTarget,
 ) {
   return render(
@@ -55,7 +39,6 @@ function renderSheet(
       open
       onOpenChange={vi.fn()}
       def={def}
-      rows={[]}
       metricTarget={metricTarget}
       range={{ from: "2026-07-01", to: "2026-07-07" }}
       period="week"
@@ -86,12 +69,4 @@ describe("GroupDrilldownSheet", () => {
     renderSheet(METRIC_DEF, undefined);
     expect(screen.getByText("Missing drilldown data")).toBeInTheDocument();
   });
-
-  it("routes a legacy group to the legacy body", () => {
-    renderSheet(LEGACY_DEF);
-    expect(screen.getByText("Legacy section")).toBeInTheDocument();
-    expect(
-      screen.getByText(/No data for this section/i),
-    ).toBeInTheDocument();
-  });
 });
diff --git a/src/components/widgets/dashboard/group-drilldown-sheet.tsx b/src/components/widgets/dashboard/group-drilldown-sheet.tsx
new file mode 100644
index 00000000..2935b362
--- /dev/null
+++ b/src/components/widgets/dashboard/group-drilldown-sheet.tsx
@@ -0,0 +1,147 @@
+import { Maximize2, Minimize2, XIcon } from "lucide-react";
+
+import { ComingSoon } from "@/components/widgets/coming-soon";
+import { CollectionDrilldown } from "@/components/widgets/metric-views/collection-drilldown";
+import {
+  TeamCollectionDrilldown,
+  type TeamMemberRef,
+} from "@/components/widgets/metric-views/team-collection-drilldown";
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import type { DateRange } from "@/api/period-to-date-range";
+import type { MetricGroup } from "@/lib/insight/groups";
+import type { PeerCohortLabel } from "@/lib/peers";
+import type { MetricCollectionResult } from "@/queries/metric-results";
+import { cn } from "@/lib/utils";
+import {
+  parseLocalStorageBoolean,
+  serializeLocalStorageBoolean,
+  useLocalStorageState,
+} from "@/hooks/use-local-storage-state";
+import type { PeriodValue } from "@/types/insight";
+
+/** Data target for a metrics-backed group's drilldown body. */
+export type MetricDrilldownTarget =
+  | {
+      kind: "person";
+      entityId: string;
+      data: MetricCollectionResult;
+    }
+  | { kind: "team"; members: TeamMemberRef[] };
+
+export interface GroupDrilldownSheetProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  def: MetricGroup;
+  metricTarget?: MetricDrilldownTarget;
+  range?: DateRange;
+  period?: PeriodValue;
+  cohortLabel?: PeerCohortLabel;
+}
+
+export function GroupDrilldownSheet({
+  open,
+  onOpenChange,
+  def,
+  metricTarget,
+  range,
+  period,
+  cohortLabel = "department",
+}: GroupDrilldownSheetProps) {
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent
+        showCloseButton={false}
+        className="flex w-fit max-w-none! flex-col gap-0 overflow-hidden p-0"
+      >
+        <DrilldownPanel
+          def={def}
+          metricTarget={metricTarget}
+          range={range}
+          period={period}
+          cohortLabel={cohortLabel}
+        />
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+function DrilldownPanel({
+  def,
+  metricTarget,
+  range,
+  period,
+  cohortLabel,
+}: {
+  def: MetricGroup;
+  metricTarget?: MetricDrilldownTarget;
+  range?: DateRange;
+  period?: PeriodValue;
+  cohortLabel: PeerCohortLabel;
+}) {
+  const [expanded, setExpanded] = useLocalStorageState<boolean>({
+    key: "insight.drilldown.expanded",
+    defaultValue: false,
+    parse: parseLocalStorageBoolean,
+    serialize: serializeLocalStorageBoolean,
+  });
+
+  return (
+    <div
+      className={cn(
+        "flex min-h-0 flex-col overflow-hidden",
+        expanded ? "h-[95vh] w-[95vw]" : "h-[70vh] w-[80vw]"
+      )}
+    >
+      <DialogHeader className="flex shrink-0 flex-row items-center justify-between gap-2 border-b p-4">
+        <DialogTitle>{def.title}</DialogTitle>
+        <div className="flex items-center gap-0.5">
+          <Button
+            variant="ghost"
+            size="icon-sm"
+            onClick={() => setExpanded((v) => !v)}
+            aria-label={expanded ? "Shrink" : "Expand"}
+          >
+            {expanded ? <Minimize2 /> : <Maximize2 />}
+          </Button>
+          <DialogClose
+            render={
+              <Button variant="ghost" size="icon-sm" aria-label="Close" />
+            }
+          >
+            <XIcon />
+          </DialogClose>
+        </div>
+      </DialogHeader>
+      <div className="no-scrollbar min-h-0 flex-1 overflow-y-auto">
+        {metricTarget?.kind === "person" ? (
+          <CollectionDrilldown
+            def={def}
+            data={metricTarget.data}
+            entityId={metricTarget.entityId}
+            range={range}
+            cohortLabel={cohortLabel}
+          />
+        ) : metricTarget?.kind === "team" && range && period ? (
+          <TeamCollectionDrilldown
+            def={def}
+            members={metricTarget.members}
+            range={range}
+            period={period}
+            cohortLabel={cohortLabel}
+          />
+        ) : (
+          <div className="flex h-full w-full items-center justify-center p-10">
+            <ComingSoon state="error" label="Missing drilldown data" />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/widgets/v2/ic-needs-attention.test.tsx b/src/components/widgets/dashboard/ic-needs-attention.test.tsx
similarity index 96%
rename from src/components/widgets/v2/ic-needs-attention.test.tsx
rename to src/components/widgets/dashboard/ic-needs-attention.test.tsx
index 3dc3930a..88e3b77d 100644
--- a/src/components/widgets/v2/ic-needs-attention.test.tsx
+++ b/src/components/widgets/dashboard/ic-needs-attention.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 
-import { IcNeedsAttention } from "@/components/widgets/v2/ic-needs-attention";
+import { IcNeedsAttention } from "@/components/widgets/dashboard/ic-needs-attention";
 import type { AttentionItem } from "@/lib/insight/attention";
 
 vi.mock("@/hooks/use-settings", () => ({
diff --git a/src/components/widgets/v2/ic-needs-attention.tsx b/src/components/widgets/dashboard/ic-needs-attention.tsx
similarity index 100%
rename from src/components/widgets/v2/ic-needs-attention.tsx
rename to src/components/widgets/dashboard/ic-needs-attention.tsx
diff --git a/src/components/widgets/v2/kpi-tile.stories.tsx b/src/components/widgets/dashboard/kpi-tile.stories.tsx
similarity index 97%
rename from src/components/widgets/v2/kpi-tile.stories.tsx
rename to src/components/widgets/dashboard/kpi-tile.stories.tsx
index 7f4fde96..8ed56f4a 100644
--- a/src/components/widgets/v2/kpi-tile.stories.tsx
+++ b/src/components/widgets/dashboard/kpi-tile.stories.tsx
@@ -15,7 +15,7 @@
  *
  * KpiTile is presentational: selectors in `lib/insight/kpi-row.ts` own all
  * formatting and scoring, so these stories feed the tile intermediate
- * directly — no catalog or wire mocking involved.
+ * directly — no wire mocking involved.
  *
  * See docs/testing/storybook-component-tests.md.
  */
@@ -44,7 +44,7 @@ function makeTile(overrides: Partial<KpiTileData> = {}): KpiTileData {
 }
 
 const meta: Meta<typeof KpiTile> = {
-  title: "Widgets/v2/KpiTile",
+  title: "Widgets/Dashboard/KpiTile",
   component: KpiTile,
   // In the app KpiTile is a grid cell sized by its parent; the card itself has
   // no intrinsic width (its labels use `truncate`, i.e. `white-space: nowrap`),
diff --git a/src/components/widgets/v2/kpi-tile.test.tsx b/src/components/widgets/dashboard/kpi-tile.test.tsx
similarity index 98%
rename from src/components/widgets/v2/kpi-tile.test.tsx
rename to src/components/widgets/dashboard/kpi-tile.test.tsx
index 86a04bfa..1556ffda 100644
--- a/src/components/widgets/v2/kpi-tile.test.tsx
+++ b/src/components/widgets/dashboard/kpi-tile.test.tsx
@@ -5,7 +5,7 @@ import { describe, expect, it, vi } from "vitest";
 import {
   KpiTile,
   KpiTilePlaceholder,
-} from "@/components/widgets/v2/kpi-tile";
+} from "@/components/widgets/dashboard/kpi-tile";
 import type { KpiTileData } from "@/lib/insight/kpi-row";
 
 vi.mock("@/hooks/use-settings", () => ({
diff --git a/src/components/widgets/v2/kpi-tile.tsx b/src/components/widgets/dashboard/kpi-tile.tsx
similarity index 98%
rename from src/components/widgets/v2/kpi-tile.tsx
rename to src/components/widgets/dashboard/kpi-tile.tsx
index 4033016f..d27f4ac9 100644
--- a/src/components/widgets/v2/kpi-tile.tsx
+++ b/src/components/widgets/dashboard/kpi-tile.tsx
@@ -24,8 +24,7 @@ const CARD_SURFACE = "@container/card";
 
 /**
  * Presentational KPI tile: everything display-ready arrives on `tile`
- * (selectors in `lib/insight/kpi-row.ts` own formatting and scoring for both
- * the legacy batch and metric-collection sources).
+ * (selectors in `lib/insight/kpi-row.ts` own formatting and scoring).
  */
 export function KpiTile({ tile, onOpenGroup }: KpiTileProps) {
   const { showExplanations } = useSettings();
diff --git a/src/components/widgets/v2/members-grid.test.tsx b/src/components/widgets/dashboard/members-grid.test.tsx
similarity index 99%
rename from src/components/widgets/v2/members-grid.test.tsx
rename to src/components/widgets/dashboard/members-grid.test.tsx
index 5b24e0a9..7a8efea1 100644
--- a/src/components/widgets/v2/members-grid.test.tsx
+++ b/src/components/widgets/dashboard/members-grid.test.tsx
@@ -37,7 +37,7 @@ vi.mock("@/hooks/use-settings", () => ({
 }));
 
 import type { MetricResult } from "@/api/metric-results-client";
-import { MembersGrid } from "@/components/widgets/v2/members-grid";
+import { MembersGrid } from "@/components/widgets/dashboard/members-grid";
 import { normalizeMetricResults } from "@/lib/metrics/collection";
 
 const MEMBERS = [
diff --git a/src/components/widgets/v2/members-grid.tsx b/src/components/widgets/dashboard/members-grid.tsx
similarity index 100%
rename from src/components/widgets/v2/members-grid.tsx
rename to src/components/widgets/dashboard/members-grid.tsx
diff --git a/src/components/widgets/v2/members-overview.test.tsx b/src/components/widgets/dashboard/members-overview.test.tsx
similarity index 94%
rename from src/components/widgets/v2/members-overview.test.tsx
rename to src/components/widgets/dashboard/members-overview.test.tsx
index 42af57c6..642f165d 100644
--- a/src/components/widgets/v2/members-overview.test.tsx
+++ b/src/components/widgets/dashboard/members-overview.test.tsx
@@ -10,20 +10,20 @@ vi.mock("@/hooks/use-settings", () => ({
 // triage rows) by capturing the props it computes.
 const gridProps = vi.fn();
 const triageProps = vi.fn();
-vi.mock("@/components/widgets/v2/members-grid", () => ({
+vi.mock("@/components/widgets/dashboard/members-grid", () => ({
   MembersGrid: (props: unknown) => {
     gridProps(props);
     return <div data-testid="grid" />;
   },
 }));
-vi.mock("@/components/widgets/v2/triage-list", () => ({
+vi.mock("@/components/widgets/dashboard/triage-list", () => ({
   TriageList: (props: unknown) => {
     triageProps(props);
     return <div data-testid="triage" />;
   },
 }));
 
-import { MembersOverview } from "@/components/widgets/v2/members-overview";
+import { MembersOverview } from "@/components/widgets/dashboard/members-overview";
 import { HEATMAP_METRIC_KEYS } from "@/lib/insight/groups";
 import type { PeerStoryEntry } from "@/lib/metrics/peer-story";
 import type { TeamMember } from "@/types/insight";
diff --git a/src/components/widgets/v2/members-overview.tsx b/src/components/widgets/dashboard/members-overview.tsx
similarity index 98%
rename from src/components/widgets/v2/members-overview.tsx
rename to src/components/widgets/dashboard/members-overview.tsx
index cf456931..2a5ab1e8 100644
--- a/src/components/widgets/v2/members-overview.tsx
+++ b/src/components/widgets/dashboard/members-overview.tsx
@@ -4,8 +4,8 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import {
   MembersGrid,
   type MembersGridMember,
-} from "@/components/widgets/v2/members-grid";
-import { TriageList, type TriageRow } from "@/components/widgets/v2/triage-list";
+} from "@/components/widgets/dashboard/members-grid";
+import { TriageList, type TriageRow } from "@/components/widgets/dashboard/triage-list";
 import { HEATMAP_METRIC_KEYS } from "@/lib/insight/groups";
 import type { NormalizedMetricResult } from "@/lib/metrics/collection";
 import { normalizePersonId } from "@/lib/metrics/entity";
diff --git a/src/components/widgets/v2/metric-sublabel.tsx b/src/components/widgets/dashboard/metric-sublabel.tsx
similarity index 100%
rename from src/components/widgets/v2/metric-sublabel.tsx
rename to src/components/widgets/dashboard/metric-sublabel.tsx
diff --git a/src/components/widgets/v2/team-members-attention.test.tsx b/src/components/widgets/dashboard/team-members-attention.test.tsx
similarity index 91%
rename from src/components/widgets/v2/team-members-attention.test.tsx
rename to src/components/widgets/dashboard/team-members-attention.test.tsx
index d349bc95..b02d039d 100644
--- a/src/components/widgets/v2/team-members-attention.test.tsx
+++ b/src/components/widgets/dashboard/team-members-attention.test.tsx
@@ -27,24 +27,12 @@ vi.mock("@tanstack/react-router", async (importOriginal) => {
 import type { PeerStoryEntry } from "@/lib/metrics/peer-story";
 import type { PeerStatusWithNeutral } from "@/lib/peers";
 import { TeamMembersAttention } from "./team-members-attention";
-import type { PeriodValue, TeamMember } from "@/types/insight";
+import type { TeamMember } from "@/types/insight";
 
 function makeMember(overrides: Partial<TeamMember> = {}): TeamMember {
   return {
     person_id: "alice@example.com",
-    period: "month" as PeriodValue,
     name: "Alice",
-    seniority: "Senior",
-    supervisor_email: null,
-    org_unit_id: "Engineering",
-    tasks_closed: 0,
-    bugs_fixed: 0,
-    dev_time_h: null,
-    prs_merged: null,
-    build_success_pct: null,
-    focus_time_pct: null,
-    ai_tools: [],
-    ai_loc_share_pct: null,
     ...overrides,
   };
 }
diff --git a/src/components/widgets/v2/team-members-attention.tsx b/src/components/widgets/dashboard/team-members-attention.tsx
similarity index 100%
rename from src/components/widgets/v2/team-members-attention.tsx
rename to src/components/widgets/dashboard/team-members-attention.tsx
diff --git a/src/components/widgets/v2/triage-list.test.tsx b/src/components/widgets/dashboard/triage-list.test.tsx
similarity index 96%
rename from src/components/widgets/v2/triage-list.test.tsx
rename to src/components/widgets/dashboard/triage-list.test.tsx
index c716f8b9..c4a74484 100644
--- a/src/components/widgets/v2/triage-list.test.tsx
+++ b/src/components/widgets/dashboard/triage-list.test.tsx
@@ -26,7 +26,7 @@ vi.mock("@/hooks/use-settings", () => ({
   useSettings: () => ({ focusMode: "all" }),
 }));
 
-import { TriageList } from "@/components/widgets/v2/triage-list";
+import { TriageList } from "@/components/widgets/dashboard/triage-list";
 import type { TeamMember } from "@/types/insight";
 
 function member(person_id: string, name: string): TeamMember {
diff --git a/src/components/widgets/v2/triage-list.tsx b/src/components/widgets/dashboard/triage-list.tsx
similarity index 98%
rename from src/components/widgets/v2/triage-list.tsx
rename to src/components/widgets/dashboard/triage-list.tsx
index f34b254f..9869f8c2 100644
--- a/src/components/widgets/v2/triage-list.tsx
+++ b/src/components/widgets/dashboard/triage-list.tsx
@@ -3,7 +3,7 @@ import { ChevronRight } from "lucide-react";
 
 import { Card, CardContent } from "@/components/ui/card";
 import { useSettings } from "@/hooks/use-settings";
-import { peerStatusToStatus } from "@/lib/insight/v2/peer-status";
+import { peerStatusToStatus } from "@/lib/insight/peer-status";
 import {
   applyFocus,
   PEER_TEXT,
diff --git a/src/components/widgets/deal-flow-chart.test.tsx b/src/components/widgets/deal-flow-chart.test.tsx
deleted file mode 100644
index 30ec961b..00000000
--- a/src/components/widgets/deal-flow-chart.test.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Component coverage for `<DealFlowChart>`: the empty-data placeholder and
- * the populated chart path (row mapping + recharts composition).
- *
- * jsdom has no ResizeObserver or layout, so recharts' ResponsiveContainer
- * gets a stub observer; assertions target the container rather than
- * rendered SVG geometry.
- */
-
-import { render, screen } from "@testing-library/react";
-import { beforeAll, describe, expect, it, vi } from "vitest";
-
-import type { CrmFlowPoint } from "@/types/insight";
-
-import { DealFlowChart } from "./deal-flow-chart";
-
-class ResizeObserverStub {
-  observe() {}
-  unobserve() {}
-  disconnect() {}
-}
-
-beforeAll(() => {
-  vi.stubGlobal("ResizeObserver", ResizeObserverStub);
-});
-
-const DATA: CrmFlowPoint[] = [
-  { label: "W1", opened: 5, closed: 3, won: 2 },
-  { label: "W2", opened: 7, closed: 4, won: 3 },
-];
-
-describe("<DealFlowChart>", () => {
-  it("renders the coming-soon card when there is no data", () => {
-    render(<DealFlowChart data={[]} />);
-    expect(
-      screen.getByRole("status", { name: "No data for this period" }),
-    ).toBeInTheDocument();
-  });
-
-  it("renders the responsive chart container when data is present", () => {
-    const { container } = render(<DealFlowChart data={DATA} />);
-    expect(screen.queryByRole("status")).not.toBeInTheDocument();
-    expect(
-      container.querySelector(".recharts-responsive-container"),
-    ).not.toBeNull();
-  });
-});
diff --git a/src/components/widgets/deal-flow-chart.tsx b/src/components/widgets/deal-flow-chart.tsx
deleted file mode 100644
index 655f8b86..00000000
--- a/src/components/widgets/deal-flow-chart.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { memo } from "react";
-import {
-  CartesianGrid,
-  ChartLegend,
-  ChartLine,
-  ChartTooltip,
-  LineChart,
-  ResponsiveContainer,
-  XAxis,
-  YAxis,
-} from "@/components/ui/chart";
-
-import type { CrmFlowPoint } from "@/types/insight";
-
-import {
-  CHART_BLUE,
-  CHART_FONT_TICK,
-  CHART_GRAY,
-  CHART_GREEN,
-  CHART_PURPLE,
-  CHART_TRACK_BG,
-} from "./chart-colors";
-import { ComingSoon } from "./coming-soon";
-
-export interface DealFlowChartProps {
-  data: CrmFlowPoint[];
-}
-
-type ChartRow = {
-  label: string;
-  Opened: number;
-  Closed: number;
-  Won: number;
-};
-
-function DealFlowChartImpl({ data }: DealFlowChartProps) {
-  if (data.length === 0) return <ComingSoon variant="card" />;
-
-  const chartData: ChartRow[] = data.map((r) => ({
-    label: r.label,
-    Opened: r.opened,
-    Closed: r.closed,
-    Won: r.won,
-  }));
-
-  return (
-    <ResponsiveContainer width="100%" height={180}>
-      <LineChart data={chartData} margin={{ top: 4, right: 4, left: 0, bottom: 0 }}>
-        <CartesianGrid strokeDasharray="3 3" vertical={false} stroke={CHART_TRACK_BG} />
-        <XAxis
-          dataKey="label"
-          tick={{ fontSize: CHART_FONT_TICK, fill: CHART_GRAY }}
-          axisLine={false}
-          tickLine={false}
-        />
-        <YAxis
-          width={28}
-          tick={{ fontSize: CHART_FONT_TICK, fill: CHART_GRAY }}
-          axisLine={false}
-          tickLine={false}
-          allowDecimals={false}
-        />
-        <ChartTooltip />
-        <ChartLegend wrapperStyle={{ fontSize: CHART_FONT_TICK, paddingTop: 8 }} />
-        <ChartLine type="monotone" dataKey="Opened" stroke={CHART_BLUE} strokeWidth={2} dot={{ r: 3 }} activeDot={{ r: 5 }} />
-        <ChartLine type="monotone" dataKey="Closed" stroke={CHART_PURPLE} strokeWidth={2} dot={{ r: 3 }} activeDot={{ r: 5 }} />
-        <ChartLine type="monotone" dataKey="Won" stroke={CHART_GREEN} strokeWidth={2} dot={{ r: 3 }} activeDot={{ r: 5 }} />
-      </LineChart>
-    </ResponsiveContainer>
-  );
-}
-
-export const DealFlowChart = memo(DealFlowChartImpl);
diff --git a/src/components/widgets/delivery-trends.tsx b/src/components/widgets/delivery-trends.tsx
deleted file mode 100644
index 03e9e815..00000000
--- a/src/components/widgets/delivery-trends.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { memo } from "react";
-import {
-  CartesianGrid,
-  ChartLegend,
-  ChartLine,
-  ChartTooltip,
-  LineChart,
-  ResponsiveContainer,
-  XAxis,
-  YAxis,
-} from "@/components/ui/chart";
-
-import {
-  CHART_BLUE,
-  CHART_FONT_TICK,
-  CHART_GRAY,
-  CHART_GREEN,
-  CHART_PURPLE,
-  CHART_TRACK_BG,
-} from "./chart-colors";
-import { ComingSoon } from "./coming-soon";
-
-export interface DeliveryTrendsProps {
-  data: Array<{
-    label: string;
-    commits: number;
-    prsMerged: number | null;
-    tasksDone: number;
-  }>;
-}
-
-type ChartRow = {
-  label: string;
-  Commits: number;
-  "PRs Merged": number | null;
-  "Tasks Done": number;
-};
-
-function DeliveryTrendsImpl({ data }: DeliveryTrendsProps) {
-  if (data.length === 0) return <ComingSoon variant="card" />;
-
-  const hasPrs = data.some((r) => r.prsMerged !== null);
-
-  const chartData: ChartRow[] = data.map((r) => ({
-    label: r.label,
-    Commits: r.commits,
-    "PRs Merged": r.prsMerged,
-    "Tasks Done": r.tasksDone,
-  }));
-
-  return (
-    <ResponsiveContainer width="100%" height={180}>
-      <LineChart data={chartData} margin={{ top: 4, right: 4, left: 0, bottom: 0 }}>
-        <CartesianGrid strokeDasharray="3 3" vertical={false} stroke={CHART_TRACK_BG} />
-        <XAxis
-          dataKey="label"
-          tick={{ fontSize: CHART_FONT_TICK, fill: CHART_GRAY }}
-          axisLine={false}
-          tickLine={false}
-        />
-        <YAxis
-          width={28}
-          tick={{ fontSize: CHART_FONT_TICK, fill: CHART_GRAY }}
-          axisLine={false}
-          tickLine={false}
-          allowDecimals={false}
-        />
-        <ChartTooltip />
-        <ChartLegend wrapperStyle={{ fontSize: CHART_FONT_TICK, paddingTop: 8 }} />
-        <ChartLine
-          type="monotone"
-          dataKey="Commits"
-          stroke={CHART_BLUE}
-          strokeWidth={2}
-          dot={{ r: 3 }}
-          activeDot={{ r: 5 }}
-        />
-        {hasPrs ? (
-          <ChartLine
-            type="monotone"
-            dataKey="PRs Merged"
-            stroke={CHART_PURPLE}
-            strokeWidth={2}
-            dot={{ r: 3 }}
-            activeDot={{ r: 5 }}
-            connectNulls={false}
-          />
-        ) : null}
-        <ChartLine
-          type="monotone"
-          dataKey="Tasks Done"
-          stroke={CHART_GREEN}
-          strokeWidth={2}
-          dot={{ r: 3 }}
-          activeDot={{ r: 5 }}
-        />
-      </LineChart>
-    </ResponsiveContainer>
-  );
-}
-
-export const DeliveryTrends = memo(DeliveryTrendsImpl);
diff --git a/src/components/widgets/drill-modal.tsx b/src/components/widgets/drill-modal.tsx
deleted file mode 100644
index 416bc641..00000000
--- a/src/components/widgets/drill-modal.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import { ExternalLink } from "lucide-react";
-
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table";
-import { cn } from "@/lib/utils";
-import type { DrillData } from "@/types/insight";
-
-import { ComingSoon } from "./coming-soon";
-
-export interface DrillModalProps {
-  drill: DrillData | null;
-  open: boolean;
-  loading?: boolean;
-  errored?: boolean;
-  onClose: () => void;
-  onRetry?: () => void;
-}
-
-export function DrillModal({
-  drill,
-  open,
-  loading = false,
-  errored = false,
-  onClose,
-  onRetry,
-}: DrillModalProps) {
-  const placeholderState = loading ? "loading" : errored ? "error" : "empty";
-
-  return (
-    <Dialog
-      open={open}
-      onOpenChange={(next) => {
-        if (!next) onClose();
-      }}
-    >
-      <DialogContent className="flex max-h-[80vh] w-full max-w-2xl flex-col gap-0 p-0">
-        {drill ? (
-          <>
-            <DialogHeader className="border-border flex-row items-center gap-2.5 space-y-0 border-b px-4 py-3.5 pr-12">
-              <DialogTitle className="text-foreground flex-1 text-base font-bold">
-                {drill.title}
-              </DialogTitle>
-              <span
-                className={cn(
-                  "rounded px-2 py-0.5 text-xs font-semibold text-white",
-                  drill.srcClass,
-                )}
-              >
-                {drill.source}
-              </span>
-              <span className="text-foreground text-sm font-bold">
-                {drill.value}
-              </span>
-            </DialogHeader>
-
-            <div className="bg-muted text-muted-foreground shrink-0 px-4 py-2 text-xs">
-              {drill.filter}
-            </div>
-
-            <div className="flex-1 overflow-auto">
-              {drill.rows.length === 0 ? (
-                <div className="p-4">
-                  <ComingSoon variant="card" />
-                </div>
-              ) : (
-                <Table>
-                  <TableHeader>
-                    <TableRow className="bg-muted/50">
-                      {drill.columns.map((col) => (
-                        <TableHead
-                          key={col}
-                          className="text-muted-foreground text-xs font-semibold whitespace-nowrap"
-                        >
-                          {col}
-                        </TableHead>
-                      ))}
-                    </TableRow>
-                  </TableHeader>
-                  <TableBody>
-                    {drill.rows.map((row, rowIdx) => (
-                      <TableRow key={rowIdx}>
-                        {drill.columns.map((col) => (
-                          <TableCell
-                            key={col}
-                            className="text-foreground text-xs"
-                          >
-                            {row[col] ?? "—"}
-                          </TableCell>
-                        ))}
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              )}
-            </div>
-
-            {drill.rows.length > 0 ? (
-              <div className="border-border flex shrink-0 items-center justify-between border-t px-4 py-2.5 text-xs">
-                <a
-                  href="#"
-                  className="text-primary inline-flex items-center gap-1 font-medium no-underline"
-                  onClick={(e) => e.preventDefault()}
-                >
-                  Open all in {drill.source}
-                  <ExternalLink className="size-3" />
-                </a>
-                <span className="text-muted-foreground">
-                  {drill.rows.length} records
-                </span>
-              </div>
-            ) : null}
-          </>
-        ) : (
-          <>
-            <DialogHeader className="border-border space-y-0 border-b px-4 py-3.5 pr-12">
-              <DialogTitle className="text-foreground text-base font-bold">
-                Drill-down
-              </DialogTitle>
-            </DialogHeader>
-            <div className="p-4">
-              <ComingSoon
-                variant="card"
-                state={placeholderState}
-                onRetry={onRetry}
-              />
-            </div>
-          </>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/src/components/widgets/dynamic-width-bar.tsx b/src/components/widgets/dynamic-width-bar.tsx
deleted file mode 100644
index d72a79d5..00000000
--- a/src/components/widgets/dynamic-width-bar.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface DynamicWidthBarProps {
-  pct: number;
-  colorClass: string;
-}
-
-export function DynamicWidthBar({ pct, colorClass }: DynamicWidthBarProps) {
-  return (
-    <div
-      style={{ width: `${Math.min(pct, 100)}%` }}
-      className={`h-full rounded-full transition-[width] duration-300 ease-in-out ${colorClass}`}
-    />
-  );
-}
diff --git a/src/components/widgets/kpi-strip.test.tsx b/src/components/widgets/kpi-strip.test.tsx
deleted file mode 100644
index 00076f7d..00000000
--- a/src/components/widgets/kpi-strip.test.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Component coverage for `<KpiStrip>`: value/unit/suffix rendering, delta
- * badges per delta_type, the missing-value chip, sublabels, the empty
- * placeholder, and plain (card-less) mode.
- */
-
-import { render, screen } from "@testing-library/react";
-import { describe, expect, it } from "vitest";
-
-import { KpiStrip, type KpiStripKpi } from "./kpi-strip";
-
-function makeKpi(overrides: Partial<KpiStripKpi> = {}): KpiStripKpi {
-  return {
-    metric_key: "tasks_done",
-    label: "Tasks done",
-    value: "42",
-    unit: "tasks",
-    period: "month",
-    ...overrides,
-  };
-}
-
-describe("<KpiStrip>", () => {
-  it("renders value, unit, period suffix, and label", () => {
-    render(<KpiStrip kpis={[makeKpi()]} />);
-    expect(screen.getByText("42")).toBeInTheDocument();
-    expect(screen.getByText("tasks")).toBeInTheDocument();
-    expect(screen.getByText("/ mo")).toBeInTheDocument();
-    expect(screen.getByText("Tasks done")).toBeInTheDocument();
-  });
-
-  it("renders the delta badge when delta and delta_type are set", () => {
-    render(
-      <KpiStrip
-        kpis={[makeKpi({ delta: "+17%", delta_type: "good" })]}
-      />,
-    );
-    expect(screen.getByText("+17%")).toBeInTheDocument();
-  });
-
-  it("omits the delta badge without a delta_type", () => {
-    render(<KpiStrip kpis={[makeKpi({ delta: "+17%" })]} />);
-    expect(screen.queryByText("+17%")).not.toBeInTheDocument();
-  });
-
-  it("shows the coming-soon chip and no delta for a missing value", () => {
-    render(
-      <KpiStrip
-        kpis={[
-          makeKpi({ value: null, delta: "+17%", delta_type: "good" }),
-        ]}
-      />,
-    );
-    expect(
-      screen.getByRole("status", { name: "No data for this period" }),
-    ).toBeInTheDocument();
-    expect(screen.queryByText("+17%")).not.toBeInTheDocument();
-  });
-
-  it("renders the sublabel and the info affordance for a description", () => {
-    render(
-      <KpiStrip
-        kpis={[
-          makeKpi({ sublabel: "last 30 days", description: "What this is" }),
-        ]}
-      />,
-    );
-    expect(screen.getByText("last 30 days")).toBeInTheDocument();
-    expect(screen.getByRole("button")).toBeInTheDocument();
-  });
-
-  it("renders separators for cells after the first", () => {
-    const { container } = render(
-      <KpiStrip
-        kpis={[
-          makeKpi({ metric_key: "a", label: "A" }),
-          makeKpi({ metric_key: "b", label: "B" }),
-          makeKpi({ metric_key: "c", label: "C" }),
-        ]}
-      />,
-    );
-    expect(screen.getByText("A")).toBeInTheDocument();
-    expect(screen.getByText("C")).toBeInTheDocument();
-    // Two desktop dividers for three cells.
-    expect(container.querySelectorAll(".bg-border.absolute")).toHaveLength(2);
-  });
-
-  it("renders the empty placeholder when there are no KPIs", () => {
-    render(<KpiStrip kpis={[]} />);
-    expect(screen.getByText("No data for this period")).toBeInTheDocument();
-  });
-
-  it("skips the card wrapper in plain mode", () => {
-    const { container } = render(<KpiStrip kpis={[makeKpi()]} plain />);
-    expect(container.querySelector('[data-slot="card"]')).toBeNull();
-  });
-
-  it("wraps in a card by default", () => {
-    const { container } = render(<KpiStrip kpis={[makeKpi()]} />);
-    expect(container.querySelector('[data-slot="card"]')).not.toBeNull();
-  });
-});
diff --git a/src/components/widgets/kpi-strip.tsx b/src/components/widgets/kpi-strip.tsx
deleted file mode 100644
index 27b8680a..00000000
--- a/src/components/widgets/kpi-strip.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { memo } from "react";
-
-import { Badge } from "@/components/ui/badge";
-import { Card, CardContent } from "@/components/ui/card";
-import { cn } from "@/lib/utils";
-import { MetricInfo } from "@/components/widgets/metric-info";
-import { getPeriodSuffix } from "@/lib/insight/period-suffix";
-
-import { ComingSoon } from "./coming-soon";
-
-const DELTA_CLASS: Record<string, string> = {
-  good: "bg-success/15 text-success",
-  warn: "bg-warning/15 text-warning",
-  neutral: "bg-muted text-muted-foreground",
-  bad: "bg-destructive/15 text-destructive",
-};
-
-export interface KpiStripKpi {
-  metric_key: string;
-  label: string;
-  value: string | null;
-  unit?: string;
-  sublabel?: string;
-  description?: string;
-  delta?: string;
-  delta_type?: "good" | "warn" | "bad" | "neutral";
-  period?: string;
-}
-
-export interface KpiStripProps {
-  kpis: KpiStripKpi[];
-  plain?: boolean;
-}
-
-function KpiCell({ kpi, index }: { kpi: KpiStripKpi; index: number }) {
-  const suffix = getPeriodSuffix(kpi.unit, kpi.period);
-  const deltaClass = kpi.delta_type ? DELTA_CLASS[kpi.delta_type] : null;
-
-  const mobileBorder = [
-    index % 2 !== 0 ? "border-border border-l sm:border-l-0" : "",
-    index >= 2 ? "border-border/60 border-t sm:border-t-0" : "",
-  ]
-    .filter(Boolean)
-    .join(" ");
-
-  const isMissing = kpi.value === null;
-
-  return (
-    <div className={cn("relative flex-1 px-3 py-2", mobileBorder)}>
-      {index > 0 ? (
-        <div className="bg-border absolute top-[15%] left-0 hidden h-[70%] w-px sm:block" />
-      ) : null}
-
-      {isMissing ? (
-        <ComingSoon variant="chip" />
-      ) : (
-        <div className="flex items-baseline gap-px">
-          <span className="text-foreground text-xl leading-tight font-extrabold">
-            {kpi.value}
-          </span>
-          {kpi.unit ? (
-            <sup className="text-muted-foreground text-xs font-semibold">
-              {kpi.unit}
-            </sup>
-          ) : null}
-          {suffix ? (
-            <span className="text-muted-foreground ml-0.5 text-xs">
-              {suffix}
-            </span>
-          ) : null}
-        </div>
-      )}
-
-      <div className="mt-0.5 flex items-center">
-        <span className="text-foreground text-sm font-semibold">{kpi.label}</span>
-        {kpi.description ? <MetricInfo description={kpi.description} /> : null}
-      </div>
-
-      {kpi.sublabel ? (
-        <div className="text-muted-foreground text-xs">{kpi.sublabel}</div>
-      ) : null}
-
-      {!isMissing && kpi.delta && deltaClass ? (
-        <Badge variant="secondary" className={cn("mt-1 text-xs font-bold", deltaClass)}>
-          {kpi.delta}
-        </Badge>
-      ) : null}
-    </div>
-  );
-}
-
-function KpiStripImpl({ kpis, plain = false }: KpiStripProps) {
-  const body =
-    kpis.length === 0 ? (
-      <div className="p-3">
-        <ComingSoon variant="card" />
-      </div>
-    ) : (
-      <div className="grid grid-cols-2 sm:flex">
-        {kpis.map((kpi, i) => (
-          <KpiCell key={kpi.metric_key} kpi={kpi} index={i} />
-        ))}
-      </div>
-    );
-
-  if (plain) return body;
-  return (
-    <Card className="shadow-sm">
-      <CardContent className="p-0">{body}</CardContent>
-    </Card>
-  );
-}
-
-export const KpiStrip = memo(KpiStripImpl);
diff --git a/src/components/widgets/loc-stacked-bar.tsx b/src/components/widgets/loc-stacked-bar.tsx
deleted file mode 100644
index 47a764b9..00000000
--- a/src/components/widgets/loc-stacked-bar.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { memo } from "react";
-import {
-  BarChart,
-  CartesianGrid,
-  ChartBar,
-  ChartLegend,
-  ChartTooltip,
-  ResponsiveContainer,
-  XAxis,
-  YAxis,
-} from "@/components/ui/chart";
-
-import {
-  CHART_BLUE,
-  CHART_FONT_TICK,
-  CHART_GRAY,
-  CHART_SPEC_LINES,
-  CHART_TRACK_BG,
-} from "./chart-colors";
-import { ComingSoon } from "./coming-soon";
-import type { LocDataPoint } from "@/types/insight";
-
-export interface LocStackedBarProps {
-  data: LocDataPoint[];
-}
-
-type ChartRow = {
-  label: string;
-  "Code LOC": number;
-  "Spec Lines": number;
-  Config: number;
-};
-
-function LocStackedBarImpl({ data }: LocStackedBarProps) {
-  if (data.length === 0) return <ComingSoon variant="card" />;
-
-  const chartData: ChartRow[] = data.map((r) => ({
-    label: r.label,
-    "Code LOC": r.codeLoc,
-    "Spec Lines": r.specLines,
-    Config: r.configLoc,
-  }));
-
-  return (
-    <ResponsiveContainer width="100%" height={200}>
-      <BarChart
-        data={chartData}
-        margin={{ top: 4, right: 4, left: -20, bottom: 0 }}
-        barSize={chartData.length <= 3 ? 40 : undefined}
-        maxBarSize={60}
-      >
-        <CartesianGrid strokeDasharray="3 3" vertical={false} stroke={CHART_TRACK_BG} />
-        <XAxis
-          dataKey="label"
-          tick={{ fontSize: CHART_FONT_TICK, fill: CHART_GRAY }}
-          axisLine={false}
-          tickLine={false}
-        />
-        <YAxis
-          tick={{ fontSize: CHART_FONT_TICK, fill: CHART_GRAY }}
-          axisLine={false}
-          tickLine={false}
-        />
-        <ChartTooltip />
-        <ChartLegend wrapperStyle={{ fontSize: CHART_FONT_TICK, paddingTop: 8 }} />
-        <ChartBar dataKey="Code LOC" stackId="loc" fill={CHART_BLUE} />
-        <ChartBar dataKey="Spec Lines" stackId="loc" fill={CHART_SPEC_LINES} />
-        <ChartBar dataKey="Config" stackId="loc" fill={CHART_GRAY} radius={[3, 3, 0, 0]} />
-      </BarChart>
-    </ResponsiveContainer>
-  );
-}
-
-export const LocStackedBar = memo(LocStackedBarImpl);
diff --git a/src/components/widgets/members-table.tsx b/src/components/widgets/members-table.tsx
deleted file mode 100644
index 21f32af0..00000000
--- a/src/components/widgets/members-table.tsx
+++ /dev/null
@@ -1,401 +0,0 @@
-import { Link } from "@tanstack/react-router";
-import type { MouseEvent, ReactNode } from "react";
-import { useTranslation } from "react-i18next";
-
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
-import { Skeleton } from "@/components/ui/skeleton";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table";
-import { cn } from "@/lib/utils";
-import type { ColumnThreshold, TeamMember } from "@/types/insight";
-
-import { DynamicWidthBar } from "./dynamic-width-bar";
-import { MetricInfo } from "./metric-info";
-
-export interface MembersTableProps {
-  members: TeamMember[];
-  columnThresholds: ColumnThreshold[];
-  loading: boolean;
-  onCellDrill?: (personId: string, drillId: string) => void;
-  onViewAllStats?: () => void;
-}
-
-function colClass(
-  v: number | null,
-  t: ColumnThreshold | null,
-  type: "text" | "bg",
-): string {
-  if (v === null || t === null)
-    return type === "text" ? "text-muted-foreground" : "";
-  const good = t.higher_is_better ? v >= t.good : v <= t.good;
-  const warn = t.higher_is_better ? v >= t.warn : v <= t.warn;
-  if (good) return type === "text" ? "text-success" : "bg-success";
-  if (warn) return type === "text" ? "text-warning" : "bg-warning";
-  return type === "text" ? "text-destructive" : "bg-destructive";
-}
-
-function getThreshold(
-  thresholds: ColumnThreshold[],
-  key: string,
-): ColumnThreshold | null {
-  return thresholds.find((t) => t.metric_key === key) ?? null;
-}
-
-function DrillCell({
-  children,
-  className,
-  onClick,
-}: {
-  children: ReactNode;
-  className?: string;
-  onClick: (e: MouseEvent) => void;
-}) {
-  return (
-    <button
-      type="button"
-      onClick={onClick}
-      className={cn(
-        "hover:text-primary cursor-pointer border-none bg-transparent p-0 text-left underline decoration-dotted underline-offset-2 transition-colors",
-        className,
-      )}
-    >
-      {children}
-    </button>
-  );
-}
-
-function FocusBar({
-  pct,
-  threshold,
-}: {
-  pct: number | null;
-  threshold: ColumnThreshold | null;
-}) {
-  if (pct === null)
-    return <span className="text-muted-foreground text-sm">—</span>;
-  return (
-    <div className="flex items-center gap-1.5">
-      <div className="bg-muted h-1.5 w-20 flex-shrink-0 overflow-hidden rounded-full">
-        <DynamicWidthBar pct={pct} colorClass={colClass(pct, threshold, "bg")} />
-      </div>
-      <span className={cn("text-sm font-bold", colClass(pct, threshold, "text"))}>
-        {pct}%
-      </span>
-    </div>
-  );
-}
-
-type ColHeader = { label: string; sub: string; info?: string };
-
-type ColumnVisibility = {
-  devTime: boolean;
-  prs: boolean;
-  build: boolean;
-  focus: boolean;
-  aiTools: boolean;
-  aiLoc: boolean;
-};
-
-function deriveColumnVisibility(members: TeamMember[]): ColumnVisibility {
-  if (members.length === 0) {
-    return {
-      devTime: true,
-      prs: true,
-      build: true,
-      focus: true,
-      aiTools: true,
-      aiLoc: true,
-    };
-  }
-  return {
-    devTime: members.some((m) => m.dev_time_h !== null),
-    prs: members.some((m) => m.prs_merged !== null),
-    build: members.some((m) => m.build_success_pct !== null),
-    focus: members.some((m) => m.focus_time_pct !== null),
-    aiTools: members.some((m) => m.ai_tools.length > 0),
-    aiLoc: members.some((m) => m.ai_loc_share_pct !== null),
-  };
-}
-
-function buildColHeaders(
-  columnThresholds: ColumnThreshold[],
-  cols: ColumnVisibility,
-): ColHeader[] {
-  const buildT = getThreshold(columnThresholds, "build_success_pct");
-  const focusT = getThreshold(columnThresholds, "focus_time_pct");
-  const all: (ColHeader | null)[] = [
-    { label: "Name", sub: "" },
-    { label: "Tasks", sub: "closed · Jira" },
-    { label: "Bugs Fixed", sub: "bug-type tasks · Jira" },
-    cols.devTime
-      ? {
-          label: "Dev Time",
-          sub: "time in dev per task · lower = better",
-          info: 'Average time a task spends in "In Progress" state. Lower means faster execution.',
-        }
-      : null,
-    cols.prs ? { label: "Pull Requests", sub: "merged to main · Bitbucket" } : null,
-    cols.build
-      ? {
-          label: "Build Success",
-          sub: buildT
-            ? `CI builds passing · target ≥${buildT.good}%`
-            : "CI builds passing",
-        }
-      : null,
-    cols.focus
-      ? {
-          label: "Focus Time",
-          sub: focusT
-            ? `uninterrupted work · target ≥${focusT.good}%`
-            : "uninterrupted work",
-        }
-      : null,
-    cols.aiTools ? { label: "AI Tools", sub: "active this month" } : null,
-    cols.aiLoc
-      ? {
-          label: "AI Code Acceptance",
-          sub: "Cursor + Claude Code",
-          info: "Share of authored code lines accepted from AI suggestions out of total lines written in active Cursor sessions.",
-        }
-      : null,
-  ];
-  return all.filter((c): c is ColHeader => c !== null);
-}
-
-function SkeletonRow({ count }: { count: number }) {
-  return (
-    <TableRow>
-      {Array.from({ length: count }).map((_, i) => (
-        <TableCell key={i}>
-          <Skeleton className="h-3.5 w-full" />
-        </TableCell>
-      ))}
-    </TableRow>
-  );
-}
-
-export function MembersTable({
-  members,
-  columnThresholds,
-  loading,
-  onCellDrill,
-  onViewAllStats,
-}: MembersTableProps) {
-  const { t } = useTranslation();
-  const drill =
-    (personId: string, drillId: string) => (e: MouseEvent) => {
-      e.stopPropagation();
-      onCellDrill?.(personId, drillId);
-    };
-  const cols = deriveColumnVisibility(members);
-  const colHeaders = buildColHeaders(columnThresholds, cols);
-  const tBugs = getThreshold(columnThresholds, "bugs_fixed");
-  const tDev = getThreshold(columnThresholds, "dev_time_h");
-  const tBuild = getThreshold(columnThresholds, "build_success_pct");
-  const tFocus = getThreshold(columnThresholds, "focus_time_pct");
-  const tAiLoc = getThreshold(columnThresholds, "ai_loc_share_pct");
-
-  return (
-    <Card>
-      <div className="border-border flex items-center justify-between border-b px-4 pt-3.5 pb-3">
-        <span className="text-foreground text-sm font-bold">Team Members</span>
-        <div className="flex items-center gap-3">
-          {onViewAllStats ? (
-            <Button variant="ghost" size="sm" onClick={onViewAllStats}>
-              {t("members_table.view_team_stats")}
-            </Button>
-          ) : null}
-          <span className="text-muted-foreground hidden text-xs sm:inline">
-            {t("members_table.click_hint")}
-          </span>
-        </div>
-      </div>
-      <CardContent className="overflow-x-auto p-0">
-        <Table className="min-w-max">
-          <TableHeader>
-            <TableRow className="bg-muted/30 border-border border-b">
-              {colHeaders.map((col) => (
-                <TableHead
-                  key={col.label}
-                  className="text-muted-foreground bg-muted/30 h-9 px-3 text-xs font-bold tracking-wide uppercase"
-                >
-                  <span>{col.label}</span>
-                  {col.info ? <MetricInfo description={col.info} side="bottom" /> : null}
-                  {col.sub ? (
-                    <>
-                      <br />
-                      <span className="text-muted-foreground text-xs font-normal tracking-normal normal-case opacity-70">
-                        {col.sub}
-                      </span>
-                    </>
-                  ) : null}
-                </TableHead>
-              ))}
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {loading ? (
-              <>
-                <SkeletonRow count={colHeaders.length} />
-                <SkeletonRow count={colHeaders.length} />
-                <SkeletonRow count={colHeaders.length} />
-              </>
-            ) : (
-              members.map((m) => (
-                <TableRow
-                  key={m.person_id}
-                  className="border-border border-b hover:bg-transparent"
-                >
-                  <TableCell className="px-3 py-2.5">
-                    <Link
-                      to="/ic/$person/personal"
-                      params={{ person: m.person_id }}
-                      className="block"
-                    >
-                      <div className="text-foreground text-sm font-bold">
-                        {m.name}
-                      </div>
-                      <div className="text-muted-foreground text-xs">
-                        {m.seniority}
-                      </div>
-                    </Link>
-                  </TableCell>
-                  <TableCell className="px-3 py-2.5 text-sm">
-                    {onCellDrill ? (
-                      <DrillCell onClick={drill(m.person_id, "tasks-completed")}>
-                        {m.tasks_closed}
-                      </DrillCell>
-                    ) : (
-                      m.tasks_closed
-                    )}
-                  </TableCell>
-                  <TableCell
-                    className={cn(
-                      "px-3 py-2.5 text-sm font-bold",
-                      colClass(m.bugs_fixed, tBugs, "text"),
-                    )}
-                  >
-                    {onCellDrill ? (
-                      <DrillCell
-                        onClick={drill(m.person_id, "bugs-fixed")}
-                        className={colClass(m.bugs_fixed, tBugs, "text")}
-                      >
-                        {m.bugs_fixed ?? "—"}
-                      </DrillCell>
-                    ) : (
-                      m.bugs_fixed ?? "—"
-                    )}
-                  </TableCell>
-                  {cols.devTime ? (
-                    <TableCell
-                      className={cn(
-                        "px-3 py-2.5 text-sm font-bold",
-                        colClass(m.dev_time_h, tDev, "text"),
-                      )}
-                    >
-                      {onCellDrill ? (
-                        <DrillCell
-                          onClick={drill(m.person_id, "cycle-time")}
-                          className={colClass(m.dev_time_h, tDev, "text")}
-                        >
-                          {m.dev_time_h !== null ? `${m.dev_time_h}h` : "—"}
-                        </DrillCell>
-                      ) : m.dev_time_h !== null ? (
-                        `${m.dev_time_h}h`
-                      ) : (
-                        "—"
-                      )}
-                    </TableCell>
-                  ) : null}
-                  {cols.prs ? (
-                    <TableCell className="px-3 py-2.5 text-sm">
-                      {onCellDrill ? (
-                        <DrillCell onClick={drill(m.person_id, "pull-requests")}>
-                          {m.prs_merged ?? "—"}
-                        </DrillCell>
-                      ) : (
-                        m.prs_merged ?? "—"
-                      )}
-                    </TableCell>
-                  ) : null}
-                  {cols.build ? (
-                    <TableCell
-                      className={cn(
-                        "px-3 py-2.5 text-sm font-bold",
-                        colClass(m.build_success_pct, tBuild, "text"),
-                      )}
-                    >
-                      {onCellDrill ? (
-                        <DrillCell
-                          onClick={drill(m.person_id, "builds")}
-                          className={colClass(m.build_success_pct, tBuild, "text")}
-                        >
-                          {m.build_success_pct !== null
-                            ? `${m.build_success_pct}%`
-                            : "—"}
-                        </DrillCell>
-                      ) : m.build_success_pct !== null ? (
-                        `${m.build_success_pct}%`
-                      ) : (
-                        "—"
-                      )}
-                    </TableCell>
-                  ) : null}
-                  {cols.focus ? (
-                    <TableCell className="px-3 py-2.5">
-                      <FocusBar pct={m.focus_time_pct} threshold={tFocus} />
-                    </TableCell>
-                  ) : null}
-                  {cols.aiTools ? (
-                    <TableCell className="px-3 py-2.5">
-                      {m.ai_tools.length === 0 ? (
-                        <span className="text-muted-foreground">—</span>
-                      ) : (
-                        <div className="flex flex-wrap gap-1">
-                          {m.ai_tools.map((tool) => (
-                            <Badge
-                              key={tool}
-                              variant="outline"
-                              className="text-muted-foreground bg-muted/50 h-auto rounded px-1.5 py-0 text-xs font-bold"
-                            >
-                              {tool}
-                            </Badge>
-                          ))}
-                        </div>
-                      )}
-                    </TableCell>
-                  ) : null}
-                  {cols.aiLoc ? (
-                    <TableCell
-                      className={cn(
-                        "px-3 py-2.5 text-sm font-bold",
-                        colClass(m.ai_loc_share_pct, tAiLoc, "text"),
-                      )}
-                    >
-                      {m.ai_loc_share_pct === null ? (
-                        <span className="text-muted-foreground">—</span>
-                      ) : m.ai_loc_share_pct > 0 ? (
-                        `${m.ai_loc_share_pct}%`
-                      ) : (
-                        <span className="text-muted-foreground">0%</span>
-                      )}
-                    </TableCell>
-                  ) : null}
-                </TableRow>
-              ))
-            )}
-          </TableBody>
-        </Table>
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/src/components/widgets/metric-card.test.tsx b/src/components/widgets/metric-card.test.tsx
deleted file mode 100644
index 80afc47e..00000000
--- a/src/components/widgets/metric-card.test.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * Component coverage for `<MetricCard>`: tile vs chart modes, the
- * loading/error/empty placeholder ladder, the round-robin column split,
- * pre-headed column groups, and the revalidating opacity treatment.
- */
-
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { describe, expect, it, vi } from "vitest";
-
-import type { BulletMetric, PeriodValue } from "@/types/insight";
-
-import { MetricCard } from "./metric-card";
-
-function makeMetric(
-  overrides: Partial<BulletMetric> = {},
-): BulletMetric & { period?: string } {
-  return {
-    period: "month" as PeriodValue,
-    section: "task_delivery",
-    metric_key: `m-${Math.random().toString(36).slice(2, 8)}`,
-    label: "Tasks Closed",
-    value: "12",
-    unit: "tasks",
-    range_min: "0",
-    range_max: "20",
-    median: "5",
-    median_label: "Median: 5 tasks",
-    bar_left_pct: 0,
-    bar_width_pct: 60,
-    median_left_pct: 25,
-    status: "good",
-    drill_id: "",
-    ...overrides,
-  };
-}
-
-describe("<MetricCard> chart mode", () => {
-  it("renders title, legend, and metrics split across columns", () => {
-    render(
-      <MetricCard
-        title="Delivery"
-        columns={2}
-        metrics={[
-          makeMetric({ metric_key: "a", label: "Metric A" }),
-          makeMetric({ metric_key: "b", label: "Metric B" }),
-          makeMetric({ metric_key: "c", label: "Metric C" }),
-        ]}
-      />,
-    );
-    expect(screen.getByText("Delivery")).toBeInTheDocument();
-    expect(screen.getByText("Team range")).toBeInTheDocument();
-    expect(screen.getByText("Team median")).toBeInTheDocument();
-    expect(screen.getByText("Metric A")).toBeInTheDocument();
-    expect(screen.getByText("Metric B")).toBeInTheDocument();
-    expect(screen.getByText("Metric C")).toBeInTheDocument();
-  });
-
-  it("renders headed column groups when provided", () => {
-    render(
-      <MetricCard
-        title="Collaboration"
-        metrics={[makeMetric()]}
-        groups={[
-          {
-            heading: "Chat",
-            metrics: [makeMetric({ metric_key: "chat", label: "Messages" })],
-          },
-          {
-            heading: "Email",
-            metrics: [makeMetric({ metric_key: "email", label: "Threads" })],
-          },
-        ]}
-      />,
-    );
-    expect(screen.getByText("Chat")).toBeInTheDocument();
-    expect(screen.getByText("Email")).toBeInTheDocument();
-    expect(screen.getByText("Messages")).toBeInTheDocument();
-    expect(screen.getByText("Threads")).toBeInTheDocument();
-  });
-
-  it("shows the empty placeholder without a legend when metrics are empty", () => {
-    render(<MetricCard title="Delivery" metrics={[]} />);
-    expect(screen.getByText("No data for this period")).toBeInTheDocument();
-    expect(screen.queryByText("Team median")).not.toBeInTheDocument();
-  });
-
-  it("shows the loading placeholder when loading", () => {
-    render(<MetricCard title="Delivery" metrics={[]} loading />);
-    expect(screen.getByText("Loading…")).toBeInTheDocument();
-  });
-
-  it("shows the error placeholder with a working retry", async () => {
-    const onRetry = vi.fn();
-    render(
-      <MetricCard title="Delivery" metrics={[]} errored onRetry={onRetry} />,
-    );
-    expect(screen.getByText("Unable to load")).toBeInTheDocument();
-    await userEvent.click(screen.getByRole("button", { name: "Retry" }));
-    expect(onRetry).toHaveBeenCalledTimes(1);
-  });
-
-  it("dims the content while revalidating", () => {
-    const { container } = render(
-      <MetricCard title="Delivery" metrics={[makeMetric()]} revalidating />,
-    );
-    expect(container.querySelector(".opacity-70")).not.toBeNull();
-  });
-});
-
-describe("<MetricCard> tile mode", () => {
-  it("renders metrics as tiles", () => {
-    render(
-      <MetricCard
-        title="Delivery"
-        mode="tile"
-        metrics={[makeMetric({ metric_key: "a", label: "Metric A" })]}
-      />,
-    );
-    expect(screen.getByText("Delivery")).toBeInTheDocument();
-    expect(screen.getByText("Metric A")).toBeInTheDocument();
-    // Tile mode carries no chart legend.
-    expect(screen.queryByText("Team median")).not.toBeInTheDocument();
-    expect(screen.queryByText("Team range")).not.toBeInTheDocument();
-  });
-
-  it("shows the placeholder when empty", () => {
-    render(<MetricCard title="Delivery" mode="tile" metrics={[]} />);
-    expect(screen.getByText("No data for this period")).toBeInTheDocument();
-  });
-});
diff --git a/src/components/widgets/metric-card.tsx b/src/components/widgets/metric-card.tsx
deleted file mode 100644
index 63926f20..00000000
--- a/src/components/widgets/metric-card.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import { memo } from "react";
-
-import { Card, CardContent } from "@/components/ui/card";
-import { cn } from "@/lib/utils";
-import type { BulletMetric } from "@/types/insight";
-
-import { BulletChart } from "./bullet-chart";
-import { ComingSoon } from "./coming-soon";
-
-export interface MetricColumnGroup {
-  heading: string;
-  metrics: Array<BulletMetric & { period?: string }>;
-}
-
-export interface MetricCardProps {
-  title: string;
-  metrics: Array<BulletMetric & { period?: string }>;
-  columns?: 1 | 2 | 3;
-  /**
-   * Pre-filtered, headed column groups for chart mode (e.g. collaboration's
-   * Chat / Email / Meetings / Files). When set, overrides the round-robin
-   * `columns` split. Ignored in tile mode.
-   */
-  groups?: MetricColumnGroup[];
-  onDrillClick?: (drillId: string) => void;
-  mode?: "chart" | "tile";
-  personName?: string;
-  errored?: boolean;
-  loading?: boolean;
-  revalidating?: boolean;
-  onRetry?: () => void;
-}
-
-const GRID_COLS_CLASS = {
-  1: "grid-cols-1",
-  2: "grid-cols-1 sm:grid-cols-2",
-  3: "grid-cols-1 sm:grid-cols-2 md:grid-cols-3",
-  4: "grid-cols-1 sm:grid-cols-2 md:grid-cols-4",
-} as const;
-
-function ChartLegend() {
-  return (
-    <div className="mt-2 flex items-center gap-4">
-      <div className="flex items-center gap-1">
-        <div className="bg-foreground/60 h-3 w-[2px] rounded" />
-        <span className="text-muted-foreground text-xs">Team median</span>
-      </div>
-      <div className="flex items-center gap-1">
-        <div className="from-success via-warning to-destructive h-1.5 w-4 rounded bg-gradient-to-r" />
-        <span className="text-muted-foreground text-xs">
-          Result · color = vs target
-        </span>
-      </div>
-    </div>
-  );
-}
-
-function MetricCardImpl({
-  title,
-  metrics,
-  columns = 1,
-  groups,
-  onDrillClick,
-  mode = "chart",
-  personName,
-  errored = false,
-  loading = false,
-  revalidating = false,
-  onRetry,
-}: MetricCardProps) {
-  const revalidateClass = revalidating
-    ? "opacity-70 transition-opacity duration-300"
-    : "opacity-100 transition-opacity duration-300";
-  const placeholderState = loading ? "loading" : errored ? "error" : "empty";
-  const isEmpty = metrics.length === 0;
-
-  if (mode === "tile") {
-    return (
-      <Card>
-        <CardContent className={cn("px-3.5 py-3", revalidateClass)}>
-          <div className="text-muted-foreground mb-2 text-xs font-bold tracking-wide uppercase">
-            {title}
-          </div>
-          {isEmpty ? (
-            <ComingSoon
-              variant="card"
-              state={placeholderState}
-              onRetry={onRetry}
-            />
-          ) : (
-            <div className="grid grid-cols-2 gap-2 sm:grid-cols-3">
-              {metrics.map((metric) => (
-                <BulletChart
-                  key={metric.metric_key}
-                  metric={metric}
-                  onDrillClick={onDrillClick}
-                  mode="tile"
-                  personName={personName}
-                />
-              ))}
-            </div>
-          )}
-        </CardContent>
-      </Card>
-    );
-  }
-
-  const cols = columns ?? 1;
-  const columnGroups: Array<Array<BulletMetric & { period?: string }>> =
-    Array.from({ length: cols }, () => []);
-  metrics.forEach((m, i) => {
-    columnGroups[i % cols]!.push(m);
-  });
-
-  return (
-    <Card>
-      <CardContent className={cn("px-3.5 py-3", revalidateClass)}>
-        <div className="flex items-start justify-between">
-          <span className="text-muted-foreground text-xs font-bold tracking-wide uppercase">
-            {title}
-          </span>
-          <span className="text-muted-foreground text-xs">Team range</span>
-        </div>
-
-        {!isEmpty ? <ChartLegend /> : null}
-
-        {isEmpty ? (
-          <div className="mt-3">
-            <ComingSoon
-              variant="card"
-              state={placeholderState}
-              onRetry={onRetry}
-            />
-          </div>
-        ) : groups ? (
-          <div
-            className={cn(
-              "mt-3 grid gap-x-3.5 gap-y-4",
-              GRID_COLS_CLASS[
-                Math.min(groups.length, 4) as 1 | 2 | 3 | 4
-              ],
-            )}
-          >
-            {groups.map((group) => (
-              <div key={group.heading} className="flex flex-col gap-4">
-                <div className="text-muted-foreground text-xs font-bold tracking-wide uppercase">
-                  {group.heading}
-                </div>
-                {group.metrics.map((metric) => (
-                  <BulletChart
-                    key={metric.metric_key}
-                    metric={metric}
-                    onDrillClick={onDrillClick}
-                    mode="chart"
-                    personName={personName}
-                  />
-                ))}
-              </div>
-            ))}
-          </div>
-        ) : (
-          <div className={cn("mt-3 grid gap-3.5", GRID_COLS_CLASS[cols])}>
-            {columnGroups.map((colMetrics, colIdx) => (
-              <div key={colIdx} className="flex flex-col gap-4">
-                {colMetrics.map((metric) => (
-                  <BulletChart
-                    key={metric.metric_key}
-                    metric={metric}
-                    onDrillClick={onDrillClick}
-                    mode="chart"
-                    personName={personName}
-                  />
-                ))}
-              </div>
-            ))}
-          </div>
-        )}
-      </CardContent>
-    </Card>
-  );
-}
-
-export const MetricCard = memo(MetricCardImpl);
diff --git a/src/components/widgets/metric-info.tsx b/src/components/widgets/metric-info.tsx
deleted file mode 100644
index 2549d654..00000000
--- a/src/components/widgets/metric-info.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Info } from "lucide-react";
-
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-
-interface MetricInfoProps {
-  description: string;
-  side?: "top" | "bottom" | "left" | "right";
-}
-
-export function MetricInfo({ description, side = "top" }: MetricInfoProps) {
-  return (
-    <Tooltip>
-      <TooltipTrigger
-        render={
-          <span
-            tabIndex={0}
-            role="button"
-            className="ml-1 inline-flex cursor-help items-center rounded-sm leading-none text-muted-foreground select-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:outline-none"
-          >
-            <Info className="size-3" />
-          </span>
-        }
-      />
-      <TooltipContent side={side} className="max-w-56 text-xs leading-snug">
-        {description}
-      </TooltipContent>
-    </Tooltip>
-  );
-}
diff --git a/src/components/widgets/metric-views/collection-drilldown.test.tsx b/src/components/widgets/metric-views/collection-drilldown.test.tsx
index 6351ba44..fcf08fe3 100644
--- a/src/components/widgets/metric-views/collection-drilldown.test.tsx
+++ b/src/components/widgets/metric-views/collection-drilldown.test.tsx
@@ -16,7 +16,6 @@ vi.mock("@/hooks/use-settings", () => ({
 }));
 
 const DEF: MetricGroup = {
-  kind: "metrics",
   id: "ai_adoption",
   title: "AI adoption",
   collection: {
@@ -82,7 +81,6 @@ describe("CollectionDrilldown", () => {
 
   it("dispatches a histogram block to the histogram renderer", () => {
     const histogramDef: MetricGroup = {
-      kind: "metrics",
       id: "git_output",
       title: "Git output",
       collection: {
@@ -123,7 +121,6 @@ describe("CollectionDrilldown", () => {
 
   it("renders a summary-card block as headline cards", () => {
     const summaryDef: MetricGroup = {
-      kind: "metrics",
       id: "collaboration",
       title: "Collaboration",
       collection: {
diff --git a/src/components/widgets/metric-views/metric-group-card.test.tsx b/src/components/widgets/metric-views/metric-group-card.test.tsx
index 6ff1f171..55a5e1d8 100644
--- a/src/components/widgets/metric-views/metric-group-card.test.tsx
+++ b/src/components/widgets/metric-views/metric-group-card.test.tsx
@@ -46,7 +46,6 @@ function aiMetric(
 }
 
 const DEF: MetricGroup = {
-  kind: "metrics",
   id: "ai_adoption",
   title: "AI adoption",
   collection: {
diff --git a/src/components/widgets/metric-views/metric-group-card.tsx b/src/components/widgets/metric-views/metric-group-card.tsx
index 2bc9630e..00e57b74 100644
--- a/src/components/widgets/metric-views/metric-group-card.tsx
+++ b/src/components/widgets/metric-views/metric-group-card.tsx
@@ -11,7 +11,7 @@ import { GroupCardEmpty } from "@/components/widgets/group-card-empty";
 import { useSettings } from "@/hooks/use-settings";
 import { formatMetricValue } from "@/lib/format";
 import type { MetricGroup } from "@/lib/insight/groups";
-import { peerStatusToStatus } from "@/lib/insight/v2/peer-status";
+import { peerStatusToStatus } from "@/lib/insight/peer-status";
 import { forEntity, type NormalizedMetricResult } from "@/lib/metrics/collection";
 import { formatGapMagnitude } from "@/lib/metrics/gap";
 import {
diff --git a/src/components/widgets/metric-views/metric-summary-card.tsx b/src/components/widgets/metric-views/metric-summary-card.tsx
index 5ae5af74..6a3eb915 100644
--- a/src/components/widgets/metric-views/metric-summary-card.tsx
+++ b/src/components/widgets/metric-views/metric-summary-card.tsx
@@ -7,14 +7,14 @@ import {
   dimensionLabel,
   dimensionSeriesKey,
 } from "@/components/widgets/metric-views/dimension-series";
-import { MetricSublabel } from "@/components/widgets/v2/metric-sublabel";
+import { MetricSublabel } from "@/components/widgets/dashboard/metric-sublabel";
 import { useSettings } from "@/hooks/use-settings";
 import {
   formatMetricNumber,
   formatMetricValue,
   metricDisplayUnit,
 } from "@/lib/format";
-import { peerStatusToStatus } from "@/lib/insight/v2/peer-status";
+import { peerStatusToStatus } from "@/lib/insight/peer-status";
 import { forEntity, type NormalizedMetricResult } from "@/lib/metrics/collection";
 import { derivePeerStanding } from "@/lib/metrics/peer-standing";
 import { seriesColors } from "@/lib/series-colors";
diff --git a/src/components/widgets/metric-views/metric-timeseries-chart-model.ts b/src/components/widgets/metric-views/metric-timeseries-chart-model.ts
index 188a0f19..2a65fcfe 100644
--- a/src/components/widgets/metric-views/metric-timeseries-chart-model.ts
+++ b/src/components/widgets/metric-views/metric-timeseries-chart-model.ts
@@ -3,7 +3,7 @@ import type { MetricTimeseriesModel } from "@/components/widgets/metric-views/me
 import type { NormalizedMetricResult } from "@/lib/metrics/collection";
 import type { MetricTimeseriesChartConfig } from "@/lib/metrics/timeseries-chart";
 
-export interface MetricTimeseriesChartSeries {
+interface MetricTimeseriesChartSeries {
   key: string;
   colorSeed: string;
   label: string;
diff --git a/src/components/widgets/metric-views/metric-timeseries-model.ts b/src/components/widgets/metric-views/metric-timeseries-model.ts
index 4e7c094b..24278e28 100644
--- a/src/components/widgets/metric-views/metric-timeseries-model.ts
+++ b/src/components/widgets/metric-views/metric-timeseries-model.ts
@@ -22,7 +22,7 @@ import {
   type NormalizedMetricResult,
 } from "@/lib/metrics/collection";
 
-export interface MetricTimeseriesColumn {
+interface MetricTimeseriesColumn {
   key: string;
   colorSeed: string;
   label: string;
@@ -54,7 +54,7 @@ function parseDate(value: string): Date | null {
     : null;
 }
 
-export function bucketStarts(
+function bucketStarts(
   range: DateRange,
   bucket: MetricBucket
 ): string[] {
diff --git a/src/components/widgets/metric-views/metric-timeseries-table-model.ts b/src/components/widgets/metric-views/metric-timeseries-table-model.ts
index a5e6e4bc..41cf4b49 100644
--- a/src/components/widgets/metric-views/metric-timeseries-table-model.ts
+++ b/src/components/widgets/metric-views/metric-timeseries-table-model.ts
@@ -5,7 +5,7 @@ import type {
 } from "@/lib/metrics/timeseries-table";
 import type { MetricTimeseriesModel } from "@/components/widgets/metric-views/metric-timeseries-model";
 
-export type MetricTimeseriesTablePart =
+type MetricTimeseriesTablePart =
   | {
       kind: "metric";
       metricKey: string;
diff --git a/src/components/widgets/metric-views/metric-timeseries-view.tsx b/src/components/widgets/metric-views/metric-timeseries-view.tsx
index 30de1aef..0d09626b 100644
--- a/src/components/widgets/metric-views/metric-timeseries-view.tsx
+++ b/src/components/widgets/metric-views/metric-timeseries-view.tsx
@@ -47,7 +47,7 @@ import {
   useMetricCollectionSet,
 } from "@/queries/metric-results";
 
-export interface MetricTimeseriesGroupBy {
+interface MetricTimeseriesGroupBy {
   default: string;
   options?: string[];
   limits?: Record<string, MetricTimeseriesGroupLimitConfig>;
diff --git a/src/components/widgets/metric-views/team-collection-drilldown.test.tsx b/src/components/widgets/metric-views/team-collection-drilldown.test.tsx
index bb38f761..a0ef77ad 100644
--- a/src/components/widgets/metric-views/team-collection-drilldown.test.tsx
+++ b/src/components/widgets/metric-views/team-collection-drilldown.test.tsx
@@ -6,17 +6,17 @@ import {
   type TeamMemberRef,
 } from "@/components/widgets/metric-views/team-collection-drilldown";
 import type { MetricGroup } from "@/lib/insight/groups";
-import type { MemberGridData } from "@/queries/v2/member-grid";
+import type { MemberGridData } from "@/queries/member-grid";
 
 const mocks = vi.hoisted(() => ({
   gridData: vi.fn(),
 }));
 
-vi.mock("@/queries/v2/member-grid", () => ({
+vi.mock("@/queries/member-grid", () => ({
   useMemberGridData: mocks.gridData,
 }));
 
-vi.mock("@/components/widgets/v2/members-grid", () => ({
+vi.mock("@/components/widgets/dashboard/members-grid", () => ({
   MembersGrid: ({
     metricKeys,
     members,
@@ -33,7 +33,6 @@ vi.mock("@/components/widgets/v2/members-grid", () => ({
 const RANGE = { from: "2026-04-20", to: "2026-05-04" };
 
 const DEF: MetricGroup = {
-  kind: "metrics",
   id: "ai_adoption",
   title: "AI adoption",
   collection: {
diff --git a/src/components/widgets/metric-views/team-collection-drilldown.tsx b/src/components/widgets/metric-views/team-collection-drilldown.tsx
index c4a99433..40a5f6ca 100644
--- a/src/components/widgets/metric-views/team-collection-drilldown.tsx
+++ b/src/components/widgets/metric-views/team-collection-drilldown.tsx
@@ -7,10 +7,10 @@ import { ComingSoon } from "@/components/widgets/coming-soon";
 import {
   MembersGrid,
   type MembersGridMember,
-} from "@/components/widgets/v2/members-grid";
+} from "@/components/widgets/dashboard/members-grid";
 import type { MetricGroup } from "@/lib/insight/groups";
 import type { PeerCohortLabel } from "@/lib/peers";
-import { useMemberGridData } from "@/queries/v2/member-grid";
+import { useMemberGridData } from "@/queries/member-grid";
 import type { PeriodValue } from "@/types/insight";
 import { cn } from "@/lib/utils";
 
diff --git a/src/components/widgets/metric-views/team-metric-group-card.test.tsx b/src/components/widgets/metric-views/team-metric-group-card.test.tsx
index 1d5bb915..61a1005e 100644
--- a/src/components/widgets/metric-views/team-metric-group-card.test.tsx
+++ b/src/components/widgets/metric-views/team-metric-group-card.test.tsx
@@ -12,7 +12,6 @@ vi.mock("@/hooks/use-settings", () => ({
 }));
 
 const DEF: MetricGroup = {
-  kind: "metrics",
   id: "ai_adoption",
   title: "AI adoption",
   collection: {
diff --git a/src/components/widgets/person-header.test.tsx b/src/components/widgets/person-header.test.tsx
deleted file mode 100644
index 35982741..00000000
--- a/src/components/widgets/person-header.test.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Component coverage for `<PersonHeader>`: PersonData vs IdentityPerson
- * name/subtitle resolution, the fallback-email slot, the null render, and
- * inline (card-less) mode.
- */
-
-import { render, screen } from "@testing-library/react";
-import { describe, expect, it } from "vitest";
-
-import type { IdentityPerson, PersonData } from "@/types/insight";
-
-import { PersonHeader } from "./person-header";
-
-const PERSON: PersonData = {
-  person_id: "p-1",
-  name: "Jane Doe",
-  role: "Engineer",
-  seniority: "Senior",
-};
-
-function identity(overrides: Partial<IdentityPerson> = {}): IdentityPerson {
-  return {
-    person_id: "p-2",
-    email: "bob@example.com",
-    display_name: "Bob Park",
-    subordinates: [],
-    ...overrides,
-  };
-}
-
-describe("<PersonHeader>", () => {
-  it("renders nothing without a person or fallback email", () => {
-    const { container } = render(<PersonHeader person={null} />);
-    expect(container).toBeEmptyDOMElement();
-  });
-
-  it("renders PersonData with role · seniority subtitle and initials", () => {
-    render(<PersonHeader person={PERSON} />);
-    expect(screen.getByText("Jane Doe")).toBeInTheDocument();
-    expect(screen.getByText("Engineer · Senior")).toBeInTheDocument();
-    expect(screen.getByText("JD")).toBeInTheDocument();
-  });
-
-  it("renders role alone when seniority is empty", () => {
-    render(<PersonHeader person={{ ...PERSON, seniority: "" }} />);
-    expect(screen.getByText("Engineer")).toBeInTheDocument();
-  });
-
-  it("renders IdentityPerson with job title · department subtitle", () => {
-    render(
-      <PersonHeader
-        person={identity({ job_title: "Developer", department: "Platform" })}
-      />,
-    );
-    expect(screen.getByText("Bob Park")).toBeInTheDocument();
-    expect(screen.getByText("Developer · Platform")).toBeInTheDocument();
-    expect(screen.getByText("BP")).toBeInTheDocument();
-  });
-
-  it("renders IdentityPerson with department only", () => {
-    render(<PersonHeader person={identity({ department: "Platform" })} />);
-    expect(screen.getByText("Platform")).toBeInTheDocument();
-  });
-
-  it("omits the subtitle row when IdentityPerson has neither title nor department", () => {
-    const { container } = render(<PersonHeader person={identity()} />);
-    expect(screen.getByText("Bob Park")).toBeInTheDocument();
-    expect(
-      container.querySelectorAll(".text-muted-foreground.truncate"),
-    ).toHaveLength(0);
-  });
-
-  it("falls back to the email when person is null", () => {
-    render(<PersonHeader person={null} fallbackEmail="jane@example.com" />);
-    expect(screen.getByText("jane@example.com")).toBeInTheDocument();
-  });
-
-  it("wraps in a card by default and skips it in inline mode", () => {
-    const { container: card } = render(<PersonHeader person={PERSON} />);
-    expect(card.querySelector('[data-slot="card"]')).not.toBeNull();
-
-    const { container: inline } = render(
-      <PersonHeader person={PERSON} inline />,
-    );
-    expect(inline.querySelector('[data-slot="card"]')).toBeNull();
-  });
-});
diff --git a/src/components/widgets/person-header.tsx b/src/components/widgets/person-header.tsx
deleted file mode 100644
index d0d1bc83..00000000
--- a/src/components/widgets/person-header.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Avatar, AvatarFallback } from "@/components/ui/avatar";
-import { Card, CardContent } from "@/components/ui/card";
-import { getInitials } from "@/lib/insight/get-initials";
-import type { IdentityPerson, PersonData } from "@/types/insight";
-
-export interface PersonHeaderProps {
-  person: PersonData | IdentityPerson | null;
-  /** Rendered when `person` is null — keeps the avatar/name slot from collapsing. */
-  fallbackEmail?: string;
-  /** When true, renders without outer card wrapper (for embedding in a header row). */
-  inline?: boolean;
-}
-
-function personDisplayName(p: PersonData | IdentityPerson): string {
-  if ("display_name" in p && p.display_name) return p.display_name;
-  if ("name" in p && p.name) return p.name;
-  return "";
-}
-
-function personSubtitle(p: PersonData | IdentityPerson): string {
-  if ("role" in p) {
-    const seniority = "seniority" in p && p.seniority ? p.seniority : "";
-    return seniority ? `${p.role} · ${seniority}` : p.role;
-  }
-  const jobTitle = "job_title" in p && p.job_title ? p.job_title : "";
-  const department = "department" in p && p.department ? p.department : "";
-  return [jobTitle, department].filter(Boolean).join(" · ");
-}
-
-export function PersonHeader({
-  person,
-  fallbackEmail,
-  inline = false,
-}: PersonHeaderProps) {
-  if (!person && !fallbackEmail) return null;
-  const name = person ? personDisplayName(person) : (fallbackEmail ?? "");
-  const subtitle = person ? personSubtitle(person) : "";
-
-  const content = (
-    <div className="flex min-w-0 items-center gap-3">
-      <Avatar className="size-10 shrink-0">
-        <AvatarFallback className="bg-primary/10 text-primary text-base font-extrabold">
-          {getInitials(name)}
-        </AvatarFallback>
-      </Avatar>
-      <div className="min-w-0">
-        <div className="text-foreground truncate text-lg leading-tight font-bold">
-          {name}
-        </div>
-        {subtitle ? (
-          <div className="text-muted-foreground truncate text-sm">
-            {subtitle}
-          </div>
-        ) : null}
-      </div>
-    </div>
-  );
-
-  if (inline) return content;
-
-  return (
-    <Card>
-      <CardContent className="p-3">{content}</CardContent>
-    </Card>
-  );
-}
diff --git a/src/components/widgets/progress-track.tsx b/src/components/widgets/progress-track.tsx
deleted file mode 100644
index 0b479a2c..00000000
--- a/src/components/widgets/progress-track.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-export interface ProgressTrackProps {
-  barLeftPct: number;
-  barWidthPct: number;
-  medianLeftPct: number;
-  barColorClass: string;
-}
-
-const clampPct = (v: number): number => Math.max(0, Math.min(100, v));
-
-export function ProgressTrack({
-  barLeftPct,
-  barWidthPct,
-  medianLeftPct,
-  barColorClass,
-}: ProgressTrackProps) {
-  const safeLeft = clampPct(barLeftPct);
-  const safeWidth = Math.min(clampPct(barWidthPct), 100 - safeLeft);
-  const safeMedian = clampPct(medianLeftPct);
-
-  return (
-    <div className="bg-muted relative mt-1.5 h-5 rounded">
-      <div
-        style={{ left: `${safeLeft}%`, width: `${safeWidth}%` }}
-        className={`absolute top-[3px] bottom-[3px] rounded-sm transition-[width] duration-500 ease-in-out ${barColorClass}`}
-      />
-      <div
-        style={{ left: `${safeMedian}%` }}
-        className="bg-foreground/60 absolute -top-0.5 -bottom-0.5 w-[2px] -translate-x-1/2 rounded"
-      />
-    </div>
-  );
-}
diff --git a/src/components/widgets/sales-pacing-band.test.tsx b/src/components/widgets/sales-pacing-band.test.tsx
deleted file mode 100644
index b4d5a6e1..00000000
--- a/src/components/widgets/sales-pacing-band.test.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Component coverage for `<SalesPacingBand>`: closed-value formatting,
- * prior-period comparison with positive/negative delta styling, the
- * delta-less prev<=0 branch, and the period-progress label.
- *
- * Uses the real i18n instance (same pattern as auth-gate.test.tsx).
- */
-
-import { render, screen } from "@testing-library/react";
-import { describe, expect, it } from "vitest";
-
-import "@/i18n";
-import type { CrmKpis } from "@/types/insight";
-
-import { SalesPacingBand } from "./sales-pacing-band";
-
-function makeKpis(overrides: Partial<CrmKpis> = {}): CrmKpis {
-  return {
-    dealsOpened: 10,
-    dealsClosed: 6,
-    dealsWon: 4,
-    dealsValueClosed: 1_200_000,
-    commsCount: 100,
-    ...overrides,
-  };
-}
-
-const RANGE = { from: "2026-07-01", to: "2026-07-31" };
-
-describe("<SalesPacingBand>", () => {
-  it("renders the closed value and period progress without prior KPIs", () => {
-    render(<SalesPacingBand kpis={makeKpis()} prevKpis={null} range={RANGE} />);
-    expect(screen.getByText("Closed this period")).toBeInTheDocument();
-    expect(screen.getByText("$1.20M")).toBeInTheDocument();
-    expect(
-      screen.queryByText("vs prior-year same period"),
-    ).not.toBeInTheDocument();
-    expect(screen.getByText(/^Day \d+ of \d+$/)).toBeInTheDocument();
-  });
-
-  it("renders the prior value with a positive delta badge", () => {
-    render(
-      <SalesPacingBand
-        kpis={makeKpis()}
-        prevKpis={makeKpis({ dealsValueClosed: 1_000_000 })}
-        range={RANGE}
-      />,
-    );
-    expect(screen.getByText("vs prior-year same period")).toBeInTheDocument();
-    expect(screen.getByText("$1.00M")).toBeInTheDocument();
-    const delta = screen.getByText("+20%");
-    expect(delta.className).toContain("text-success");
-  });
-
-  it("renders a negative delta with destructive styling", () => {
-    render(
-      <SalesPacingBand
-        kpis={makeKpis({ dealsValueClosed: 800_000 })}
-        prevKpis={makeKpis({ dealsValueClosed: 1_000_000 })}
-        range={RANGE}
-      />,
-    );
-    const delta = screen.getByText("-20%");
-    expect(delta.className).toContain("text-destructive");
-  });
-
-  it("omits the delta badge when the prior value is zero", () => {
-    render(
-      <SalesPacingBand
-        kpis={makeKpis()}
-        prevKpis={makeKpis({ dealsValueClosed: 0 })}
-        range={RANGE}
-      />,
-    );
-    expect(screen.getByText("vs prior-year same period")).toBeInTheDocument();
-    expect(screen.queryByText(/%$/)).not.toBeInTheDocument();
-  });
-});
diff --git a/src/components/widgets/sales-pacing-band.tsx b/src/components/widgets/sales-pacing-band.tsx
deleted file mode 100644
index a649d44b..00000000
--- a/src/components/widgets/sales-pacing-band.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import { Card } from "@/components/ui/card";
-import {
-  formatCurrencyCompact,
-  formatDeltaPct,
-  formatPeriodProgress,
-} from "@/lib/format";
-import { cn } from "@/lib/utils";
-import type { CrmKpis } from "@/types/insight";
-
-export interface SalesPacingBandProps {
-  kpis: CrmKpis;
-  prevKpis: CrmKpis | null;
-  range: { from: string; to: string };
-}
-
-export function SalesPacingBand({
-  kpis,
-  prevKpis,
-  range,
-}: SalesPacingBandProps) {
-  const { t } = useTranslation();
-  const delta = prevKpis
-    ? formatDeltaPct(kpis.dealsValueClosed, prevKpis.dealsValueClosed)
-    : null;
-  const deltaPositive = delta !== null && delta.startsWith("+");
-  return (
-    <Card size="sm" className="px-4 py-3">
-      <div className="flex flex-wrap items-center gap-x-6 gap-y-2 text-sm">
-        <div className="flex items-center gap-2">
-          <span className="text-muted-foreground">
-            {t("sales_dashboard.pacing.closed_this_period")}
-          </span>
-          <span className="text-foreground font-semibold">
-            {formatCurrencyCompact(kpis.dealsValueClosed)}
-          </span>
-        </div>
-        {prevKpis ? (
-          <div className="flex items-center gap-2">
-            <span className="text-muted-foreground">
-              {t("sales_dashboard.pacing.vs_prior_year")}
-            </span>
-            <span className="text-foreground font-semibold">
-              {formatCurrencyCompact(prevKpis.dealsValueClosed)}
-            </span>
-            {delta !== null ? (
-              <span
-                className={cn(
-                  "rounded px-1.5 py-0.5 text-xs font-semibold",
-                  deltaPositive
-                    ? "bg-success/15 text-success"
-                    : "bg-destructive/15 text-destructive",
-                )}
-              >
-                {delta}
-              </span>
-            ) : null}
-          </div>
-        ) : null}
-        <div className="ml-auto flex items-center gap-2">
-          <span className="text-muted-foreground">
-            {formatPeriodProgress(range.from, range.to)}
-          </span>
-        </div>
-      </div>
-    </Card>
-  );
-}
diff --git a/src/components/widgets/team-bullet-sections.tsx b/src/components/widgets/team-bullet-sections.tsx
deleted file mode 100644
index 9e0d12ba..00000000
--- a/src/components/widgets/team-bullet-sections.tsx
+++ /dev/null
@@ -1,336 +0,0 @@
-import type { ReactElement } from "react";
-
-import { filterBulletsByLayoutGroup } from "@/lib/insight/bullet-layout-groups";
-import { Card, CardContent } from "@/components/ui/card";
-import type { BulletMetric } from "@/types/insight";
-
-import { BulletChart } from "./bullet-chart";
-import { CollapsibleSection } from "./collapsible-section";
-import { ComingSoon } from "./coming-soon";
-
-type SectionId =
-  | "task_delivery"
-  | "code_quality"
-  | "estimation"
-  | "ai_adoption"
-  | "collaboration";
-
-export interface TeamBulletSectionsProps {
-  sections: Record<SectionId, BulletMetric[] | undefined>;
-  status: Record<SectionId, "loading" | "loaded" | "errored">;
-  errors?: Partial<Record<SectionId, string>>;
-  viewMode: "chart" | "tile";
-  onDrillClick?: (drillId: string) => void;
-  onRetry?: (sectionId: SectionId) => void;
-}
-
-function Legend() {
-  return (
-    <div className="text-muted-foreground mb-2.5 flex items-center gap-3 text-xs">
-      <span className="flex items-center gap-1">
-        <span className="bg-foreground/60 inline-block h-3 w-[2px] rounded" />
-        Company median
-      </span>
-      <span className="flex items-center gap-1">
-        <span className="from-success via-warning to-destructive inline-block h-1.5 w-4 rounded bg-gradient-to-r" />
-        Team result · color = vs target
-      </span>
-    </div>
-  );
-}
-
-function TwoColCard({
-  title,
-  subtitle,
-  metrics,
-  onDrillClick,
-}: {
-  title: string;
-  subtitle: string;
-  metrics: BulletMetric[];
-  onDrillClick?: (id: string) => void;
-}) {
-  const left = metrics.filter((_, i) => i % 2 === 0);
-  const right = metrics.filter((_, i) => i % 2 !== 0);
-  return (
-    <Card>
-      <CardContent className="px-4 py-3.5">
-        <div className="mb-1 flex items-center justify-between">
-          <span className="text-foreground text-sm font-bold">{title}</span>
-          <span className="text-muted-foreground text-xs">{subtitle}</span>
-        </div>
-        <Legend />
-        <div className="grid grid-cols-1 gap-3.5 sm:grid-cols-2">
-          <div className="flex flex-col gap-4">
-            {left.map((m) => (
-              <BulletChart
-                key={m.metric_key}
-                metric={m}
-                onDrillClick={onDrillClick}
-                mode="chart"
-              />
-            ))}
-          </div>
-          <div className="flex flex-col gap-4">
-            {right.map((m) => (
-              <BulletChart
-                key={m.metric_key}
-                metric={m}
-                onDrillClick={onDrillClick}
-                mode="chart"
-              />
-            ))}
-          </div>
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
-
-const ESTIMATION_GROUPS: Array<{ label: string; group: string }> = [
-  { label: "1 · Time estimate accuracy", group: "estimate_accuracy" },
-  { label: "2 · Sprint scope", group: "sprint_scope" },
-  { label: "3 · Deadline (date-driven)", group: "deadline" },
-];
-
-function EstimationCard({
-  metrics,
-  onDrillClick,
-}: {
-  metrics: BulletMetric[];
-  onDrillClick?: (id: string) => void;
-}) {
-  return (
-    <Card>
-      <CardContent className="px-4 py-3.5">
-        <div className="mb-1 flex items-center justify-between">
-          <span className="text-foreground text-sm font-bold">Estimation</span>
-          <span className="text-muted-foreground text-xs">
-            Team median vs company median · Source: Jira
-          </span>
-        </div>
-        <Legend />
-        <div className="grid grid-cols-1 gap-3.5 sm:grid-cols-2 md:grid-cols-3">
-          {ESTIMATION_GROUPS.map(({ label, group }) => {
-            const groupMetrics = filterBulletsByLayoutGroup(metrics, group);
-            return (
-              <div key={label}>
-                <div className="text-muted-foreground mb-1.5 text-xs font-semibold">
-                  {label}
-                </div>
-                <div className="flex flex-col gap-4">
-                  {groupMetrics.map((m) => (
-                    <BulletChart
-                      key={m.metric_key}
-                      metric={m}
-                      onDrillClick={onDrillClick}
-                      mode="chart"
-                    />
-                  ))}
-                </div>
-              </div>
-            );
-          })}
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
-
-const AI_RIGHT_GROUPS = ["ai_team_output", "ai_acceptance"] as const;
-
-function AiAdoptionSection({
-  metrics,
-  onDrillClick,
-}: {
-  metrics: BulletMetric[];
-  onDrillClick?: (id: string) => void;
-}) {
-  const leftMetrics = filterBulletsByLayoutGroup(metrics, "ai_members");
-  const rightMetrics = AI_RIGHT_GROUPS.flatMap((g) =>
-    filterBulletsByLayoutGroup(metrics, g),
-  );
-  return (
-    <CollapsibleSection
-      title="AI Adoption"
-      storageKey="insight:team-view:ai-adoption"
-    >
-      <div className="px-4 py-3">
-        <div className="text-muted-foreground mb-2.5 text-xs font-bold tracking-wide uppercase">
-          Cursor · Claude Code · Codex
-        </div>
-        <Legend />
-        <div className="grid grid-cols-1 gap-3.5 sm:grid-cols-2">
-          <div className="flex flex-col gap-4">
-            {leftMetrics.map((m) => (
-              <BulletChart
-                key={m.metric_key}
-                metric={m}
-                onDrillClick={onDrillClick}
-                mode="chart"
-              />
-            ))}
-          </div>
-          <div className="flex flex-col gap-4">
-            {rightMetrics.map((m) => (
-              <BulletChart
-                key={m.metric_key}
-                metric={m}
-                onDrillClick={onDrillClick}
-                mode="chart"
-              />
-            ))}
-          </div>
-        </div>
-      </div>
-    </CollapsibleSection>
-  );
-}
-
-function CollaborationSection({
-  metrics,
-  onDrillClick,
-}: {
-  metrics: BulletMetric[];
-  onDrillClick?: (id: string) => void;
-}) {
-  const chatMetrics = filterBulletsByLayoutGroup(metrics, "chat");
-  const emailMetrics = filterBulletsByLayoutGroup(metrics, "email");
-  const meetingsMetrics = filterBulletsByLayoutGroup(metrics, "meetings");
-  const filesMetrics = filterBulletsByLayoutGroup(metrics, "files");
-
-  function renderColumn(heading: string, items: BulletMetric[]): ReactElement {
-    return (
-      <div className="flex flex-col gap-4">
-        <div className="text-muted-foreground text-xs font-bold tracking-wide uppercase">
-          {heading}
-        </div>
-        {items.map((m) => (
-          <BulletChart
-            key={m.metric_key}
-            metric={m}
-            onDrillClick={onDrillClick}
-            mode="chart"
-          />
-        ))}
-      </div>
-    );
-  }
-
-  return (
-    <CollapsibleSection
-      title="Collaboration"
-      storageKey="insight:team-view:collaboration"
-    >
-      <div className="px-4 py-3">
-        <Legend />
-        <div className="mt-2 grid grid-cols-1 gap-x-3.5 gap-y-2 sm:grid-cols-2 md:grid-cols-4">
-          {renderColumn("Chat", chatMetrics)}
-          {renderColumn("Email", emailMetrics)}
-          {renderColumn("Meetings", meetingsMetrics)}
-          {renderColumn("Files", filesMetrics)}
-        </div>
-      </div>
-    </CollapsibleSection>
-  );
-}
-
-function SectionPlaceholder({
-  title,
-  kind,
-  onRetry,
-}: {
-  title: string;
-  kind: "loading" | "errored";
-  onRetry?: () => void;
-}) {
-  return (
-    <Card>
-      <CardContent className="px-4 py-3.5">
-        <div className="text-foreground mb-2 text-sm font-bold">{title}</div>
-        <ComingSoon
-          variant="card"
-          state={kind === "loading" ? "loading" : "error"}
-          onRetry={onRetry}
-        />
-      </CardContent>
-    </Card>
-  );
-}
-
-export function TeamBulletSections({
-  sections,
-  status,
-  viewMode: _viewMode,
-  onDrillClick,
-  onRetry,
-}: TeamBulletSectionsProps) {
-  const taskDelivery = sections.task_delivery;
-  const codeQuality = sections.code_quality;
-  const estimation = sections.estimation;
-  const aiAdoption = sections.ai_adoption;
-  const collab = sections.collaboration;
-
-  function renderSection(
-    sid: SectionId,
-    title: string,
-    body: () => ReactElement,
-  ): ReactElement {
-    const st = status[sid];
-    if (st === "loading")
-      return <SectionPlaceholder title={title} kind="loading" />;
-    if (st === "errored")
-      return (
-        <SectionPlaceholder
-          title={title}
-          kind="errored"
-          onRetry={onRetry ? () => onRetry(sid) : undefined}
-        />
-      );
-    return body();
-  }
-
-  return (
-    <div className="flex flex-col gap-3.5">
-      <div className="grid grid-cols-1 gap-3.5 lg:grid-cols-2">
-        {renderSection("task_delivery", "Task Delivery", () => (
-          <TwoColCard
-            title="Task Delivery"
-            subtitle="Team median vs company median"
-            metrics={taskDelivery ?? []}
-            onDrillClick={onDrillClick}
-          />
-        ))}
-        {renderSection("code_quality", "Code & Quality", () => (
-          <TwoColCard
-            title="Code & Quality"
-            subtitle="Team median vs company median"
-            metrics={codeQuality ?? []}
-            onDrillClick={onDrillClick}
-          />
-        ))}
-      </div>
-
-      {renderSection("estimation", "Estimation", () => (
-        <EstimationCard
-          metrics={estimation ?? []}
-          onDrillClick={onDrillClick}
-        />
-      ))}
-
-      {renderSection("ai_adoption", "AI Adoption", () => (
-        <AiAdoptionSection
-          metrics={aiAdoption ?? []}
-          onDrillClick={onDrillClick}
-        />
-      ))}
-
-      {renderSection("collaboration", "Collaboration", () => (
-        <CollaborationSection
-          metrics={collab ?? []}
-          onDrillClick={onDrillClick}
-        />
-      ))}
-    </div>
-  );
-}
diff --git a/src/components/widgets/team-hero-strip.tsx b/src/components/widgets/team-hero-strip.tsx
deleted file mode 100644
index f528978b..00000000
--- a/src/components/widgets/team-hero-strip.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Badge } from "@/components/ui/badge";
-import { Card } from "@/components/ui/card";
-import { cn } from "@/lib/utils";
-import type { TeamKpi } from "@/types/insight";
-
-import { ComingSoon } from "./coming-soon";
-import { MetricInfo } from "./metric-info";
-
-export interface TeamHeroStripProps {
-  teamKpis: TeamKpi[];
-}
-
-const CHIP_CLASS: Record<"good" | "warn" | "bad", string> = {
-  good: "bg-success/15 text-success",
-  warn: "bg-warning/15 text-warning",
-  bad: "bg-destructive/15 text-destructive",
-};
-
-const CARD_BORDER: Record<number, string> = {
-  0: "",
-  1: "border-l border-border",
-  2: "border-t sm:border-t-0 sm:border-l border-border",
-  3: "border-t sm:border-t-0 border-l border-border",
-  4: "border-t sm:border-t-0 sm:border-l border-border",
-  5: "border-t sm:border-t-0 border-l border-border",
-};
-
-const DEFAULT_GRID_COLS = "grid-cols-2 sm:grid-cols-4";
-const GRID_COLS: Record<number, string> = {
-  1: "grid-cols-1 sm:grid-cols-1",
-  2: "grid-cols-2 sm:grid-cols-2",
-  3: "grid-cols-2 sm:grid-cols-3",
-  4: "grid-cols-2 sm:grid-cols-4",
-  5: "grid-cols-2 sm:grid-cols-5",
-  6: "grid-cols-2 sm:grid-cols-6",
-};
-
-function KpiCard({ kpi, idx }: { kpi: TeamKpi; idx: number }) {
-  return (
-    <div
-      className={cn(
-        "bg-card flex flex-col gap-0.5 p-3",
-        CARD_BORDER[idx] ?? "border-l border-border",
-      )}
-    >
-      <div className="text-foreground text-xl font-extrabold leading-tight tracking-tight">
-        {kpi.value}
-        {kpi.unit ? (
-          <span className="text-muted-foreground ml-0.5 text-xs font-semibold">
-            {kpi.unit}
-          </span>
-        ) : null}
-      </div>
-      <div className="flex items-center gap-0.5">
-        <span className="text-foreground text-sm font-semibold">
-          {kpi.label}
-        </span>
-        {kpi.description ? <MetricInfo description={kpi.description} /> : null}
-      </div>
-      {kpi.sublabel ? (
-        <div className="text-muted-foreground text-xs">{kpi.sublabel}</div>
-      ) : null}
-      <Badge
-        variant="secondary"
-        className={cn("mt-1 text-xs font-bold", CHIP_CLASS[kpi.status])}
-      >
-        {kpi.chipLabel
-          ? kpi.chipLabel
-          : kpi.status.charAt(0).toUpperCase() + kpi.status.slice(1)}
-      </Badge>
-    </div>
-  );
-}
-
-export function TeamHeroStrip({ teamKpis }: TeamHeroStripProps) {
-  const cols = teamKpis.length;
-  const gridClass = GRID_COLS[cols] ?? DEFAULT_GRID_COLS;
-
-  return (
-    <Card className="overflow-hidden">
-      {cols === 0 ? (
-        <div className="p-3">
-          <ComingSoon variant="card" />
-        </div>
-      ) : (
-        <div className={cn("grid", gridClass)}>
-          {teamKpis.map((kpi, i) => (
-            <KpiCard key={kpi.metric_key} kpi={kpi} idx={i} />
-          ))}
-        </div>
-      )}
-    </Card>
-  );
-}
diff --git a/src/components/widgets/team-metrics-modal.tsx b/src/components/widgets/team-metrics-modal.tsx
deleted file mode 100644
index 5f77145d..00000000
--- a/src/components/widgets/team-metrics-modal.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { TeamMetricsTable } from "@/components/widgets/team-metrics-table";
-import type { DateRange } from "@/api/period-to-date-range";
-import { useTeamMetrics } from "@/queries/team-metrics";
-import type { TeamMember } from "@/types/insight";
-
-export interface TeamMetricsModalProps {
-  open: boolean;
-  onClose: () => void;
-  members: TeamMember[];
-  range: DateRange;
-}
-
-export function TeamMetricsModal({
-  open,
-  onClose,
-  members,
-  range,
-}: TeamMetricsModalProps) {
-  const { t } = useTranslation();
-  const { entries, isPending } = useTeamMetrics(members, range, {
-    enabled: open,
-  });
-
-  return (
-    <Dialog
-      open={open}
-      onOpenChange={(next) => {
-        if (!next) onClose();
-      }}
-    >
-      <DialogContent className="flex h-[85vh] max-h-[85vh] w-[95vw] max-w-[95vw] flex-col gap-0 p-0 sm:max-w-[95vw]">
-        <DialogHeader className="border-b border-border px-6 py-4">
-          <DialogTitle>{t("team_metrics_modal.title")}</DialogTitle>
-        </DialogHeader>
-        <TeamMetricsTable
-          members={members}
-          entries={entries}
-          isPending={isPending}
-          containerClassName="min-h-0 flex-1 overflow-auto"
-        />
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/src/components/widgets/team-metrics-table.tsx b/src/components/widgets/team-metrics-table.tsx
deleted file mode 100644
index 038eacef..00000000
--- a/src/components/widgets/team-metrics-table.tsx
+++ /dev/null
@@ -1,289 +0,0 @@
-import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-
-import { prefixForBulletSection } from "@/api/catalog-client";
-import { useCatalog } from "@/api/use-catalog";
-import { Skeleton } from "@/components/ui/skeleton";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table";
-import { ComingSoon } from "@/components/widgets/coming-soon";
-import { cn } from "@/lib/utils";
-import type {
-  TeamMetricsEntry,
-  TeamMetricsSectionId,
-} from "@/queries/team-metrics";
-import type { TeamMember } from "@/types/insight";
-
-interface MetricMeta {
-  label: string;
-  unit: string;
-}
-
-const META_FALLBACK = (metricKey: string): MetricMeta => ({
-  label: metricKey,
-  unit: "",
-});
-
-const SECTION_ORDER: ReadonlyArray<TeamMetricsSectionId> = [
-  "task_delivery",
-  "collaboration",
-  "ai_adoption",
-  "git_output",
-];
-
-const SECTION_LABEL_KEY: Record<TeamMetricsSectionId, string> = {
-  task_delivery: "team_metrics_modal.sections.task_delivery",
-  collaboration: "team_metrics_modal.sections.collaboration",
-  ai_adoption: "team_metrics_modal.sections.ai_adoption",
-  git_output: "team_metrics_modal.sections.git_output",
-};
-
-interface Column {
-  sectionId: TeamMetricsSectionId;
-  metricKey: string;
-}
-
-interface Pivot {
-  columns: Column[];
-  bySection: Map<TeamMetricsSectionId, Column[]>;
-  cells: Map<string, Map<string, number>>;
-}
-
-type MetaLookup = (sectionId: TeamMetricsSectionId, bareKey: string) => MetricMeta;
-
-function buildPivot(
-  entries: TeamMetricsEntry[],
-  lookupMeta: MetaLookup,
-): Pivot {
-  const cells = new Map<string, Map<string, number>>();
-  const seen = new Map<TeamMetricsSectionId, Set<string>>();
-
-  for (const entry of entries) {
-    if (!entry.rows) continue;
-    const personCells = cells.get(entry.personId) ?? new Map<string, number>();
-    for (const row of entry.rows) {
-      if (
-        row.value === null ||
-        row.value === undefined ||
-        !Number.isFinite(row.value)
-      ) {
-        continue;
-      }
-      personCells.set(row.metric_key, row.value);
-      const sectionKeys = seen.get(entry.sectionId) ?? new Set<string>();
-      sectionKeys.add(row.metric_key);
-      seen.set(entry.sectionId, sectionKeys);
-    }
-    cells.set(entry.personId, personCells);
-  }
-
-  const bySection = new Map<TeamMetricsSectionId, Column[]>();
-  const columns: Column[] = [];
-
-  for (const sectionId of SECTION_ORDER) {
-    const keys = seen.get(sectionId);
-    if (!keys || keys.size === 0) continue;
-    const sectionCols = Array.from(keys)
-      .sort((a, b) =>
-        lookupMeta(sectionId, a).label.localeCompare(
-          lookupMeta(sectionId, b).label,
-        ),
-      )
-      .map((metricKey) => ({ sectionId, metricKey }));
-    bySection.set(sectionId, sectionCols);
-    columns.push(...sectionCols);
-  }
-
-  return { columns, bySection, cells };
-}
-
-function formatValue(v: number | undefined): string {
-  if (v === undefined || !Number.isFinite(v)) return "—";
-  const rounded = Math.round(v);
-  return Math.abs(rounded) >= 1000 ? rounded.toLocaleString() : String(rounded);
-}
-
-function formatColumnHeader(meta: MetricMeta): string {
-  if (!meta.unit) return meta.label;
-  return `${meta.label} (${meta.unit})`;
-}
-
-export interface TeamMetricsTableProps {
-  members: TeamMember[];
-  entries: TeamMetricsEntry[];
-  isPending: boolean;
-  containerClassName?: string;
-}
-
-export function TeamMetricsTable({
-  members,
-  entries,
-  containerClassName,
-  isPending,
-}: TeamMetricsTableProps) {
-  const { t } = useTranslation();
-  const { byMetricKey } = useCatalog();
-  const lookupMeta = useMemo<MetaLookup>(
-    () => (sectionId, bareKey) => {
-      const m = byMetricKey(`${prefixForBulletSection(sectionId)}.${bareKey}`);
-      if (!m) return META_FALLBACK(bareKey);
-      return { label: m.label, unit: m.unit ?? "" };
-    },
-    [byMetricKey],
-  );
-  const pivot = useMemo(
-    () => buildPivot(entries, lookupMeta),
-    [entries, lookupMeta],
-  );
-
-  if (isPending && pivot.columns.length === 0) {
-    const skeletonRows = Math.min(6, Math.max(1, members.length));
-    return (
-      <Table
-        className="h-full min-w-max"
-        containerClassName={containerClassName}
-      >
-        <TableHeader>
-          <TableRow>
-            <TableHead className="sticky left-0 z-10 min-w-48 bg-card">
-              {t("team_metrics_modal.member_column")}
-            </TableHead>
-            <TableHead>
-              <Skeleton className="h-3 w-24" />
-            </TableHead>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {Array.from({ length: skeletonRows }).map((_, i) => (
-            <TableRow key={i} className="hover:bg-transparent">
-              <TableCell className="sticky left-0 z-10 bg-card">
-                <Skeleton className="h-4 w-32" />
-              </TableCell>
-              <TableCell>
-                <Skeleton className="h-4 w-16" />
-              </TableCell>
-            </TableRow>
-          ))}
-          <TableRow aria-hidden="true" className="h-full hover:bg-transparent">
-            <TableCell className="sticky left-0 z-10 bg-card" />
-            <TableCell />
-          </TableRow>
-        </TableBody>
-      </Table>
-    );
-  }
-
-  if (pivot.columns.length === 0) {
-    return (
-      <div className={cn("p-6", containerClassName)}>
-        <ComingSoon
-          variant="card"
-          state="empty"
-          label={t("team_metrics_modal.empty")}
-        />
-      </div>
-    );
-  }
-
-  return (
-    <Table className="h-full min-w-max" containerClassName={containerClassName}>
-      <TableHeader>
-        <TableRow className="hover:bg-transparent">
-          <TableHead
-            rowSpan={2}
-            className="sticky left-0 z-20 min-w-48 bg-card align-bottom"
-          >
-            {t("team_metrics_modal.member_column")}
-          </TableHead>
-          {SECTION_ORDER.map((sectionId) => {
-            const cols = pivot.bySection.get(sectionId);
-            if (!cols || cols.length === 0) return null;
-            return (
-              <TableHead
-                key={sectionId}
-                colSpan={cols.length}
-                className="border-l border-border text-center text-xs font-semibold whitespace-nowrap"
-              >
-                {t(SECTION_LABEL_KEY[sectionId])}
-              </TableHead>
-            );
-          })}
-        </TableRow>
-        <TableRow className="hover:bg-transparent">
-          {pivot.columns.map((col, idx) => {
-            const prevSection =
-              idx > 0 ? pivot.columns[idx - 1]?.sectionId : null;
-            const isSectionStart = prevSection !== col.sectionId;
-            return (
-              <TableHead
-                key={col.metricKey}
-                className={cn(
-                  "text-end text-xs font-medium whitespace-nowrap text-muted-foreground",
-                  isSectionStart && "border-l border-border"
-                )}
-              >
-                {formatColumnHeader(lookupMeta(col.sectionId, col.metricKey))}
-              </TableHead>
-            );
-          })}
-        </TableRow>
-      </TableHeader>
-      <TableBody>
-        {members.map((m) => {
-          const personCells = pivot.cells.get(m.person_id);
-          return (
-            <TableRow
-              key={m.person_id}
-              className="border-b border-border hover:bg-transparent"
-            >
-              <TableCell className="sticky left-0 z-10 bg-card">
-                <div className="text-sm font-bold text-foreground">
-                  {m.name}
-                </div>
-                <div className="text-xs text-muted-foreground">
-                  {m.seniority}
-                </div>
-              </TableCell>
-              {pivot.columns.map((col, idx) => {
-                const prevSection =
-                  idx > 0 ? pivot.columns[idx - 1]?.sectionId : null;
-                const isSectionStart = prevSection !== col.sectionId;
-                return (
-                  <TableCell
-                    key={col.metricKey}
-                    className={cn(
-                      "text-end text-sm tabular-nums",
-                      isSectionStart && "border-l border-border"
-                    )}
-                  >
-                    {formatValue(personCells?.get(col.metricKey))}
-                  </TableCell>
-                );
-              })}
-            </TableRow>
-          );
-        })}
-        <TableRow aria-hidden="true" className="h-full hover:bg-transparent">
-          <TableCell className="sticky left-0 z-10 bg-card" />
-          {pivot.columns.map((col, idx) => {
-            const prevSection =
-              idx > 0 ? pivot.columns[idx - 1]?.sectionId : null;
-            const isSectionStart = prevSection !== col.sectionId;
-            return (
-              <TableCell
-                key={col.metricKey}
-                className={cn(isSectionStart && "border-l border-border")}
-              />
-            );
-          })}
-        </TableRow>
-      </TableBody>
-    </Table>
-  );
-}
diff --git a/src/components/widgets/time-off-banner.tsx b/src/components/widgets/time-off-banner.tsx
deleted file mode 100644
index 9a01a8e8..00000000
--- a/src/components/widgets/time-off-banner.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { CalendarIcon, ExternalLink } from "lucide-react";
-
-import type { TimeOffNotice } from "@/types/insight";
-
-export interface TimeOffBannerProps {
-  notice: TimeOffNotice | null;
-}
-
-export function TimeOffBanner({ notice }: TimeOffBannerProps) {
-  if (!notice) return null;
-
-  return (
-    <div className="bg-warning/10 border-warning/30 text-warning flex flex-wrap items-center gap-2 border-b px-4 py-1.5 text-xs">
-      <CalendarIcon className="size-3.5" />
-      <span>
-        <strong>{notice.days} days off</strong> this month ({notice.dateRange})
-      </span>
-      <span className="opacity-60">·</span>
-      <span className="opacity-80">metrics reflect working days</span>
-      <span className="opacity-60">·</span>
-      <a
-        href={notice.bambooHrUrl}
-        className="inline-flex items-center gap-0.5 underline underline-offset-2 hover:opacity-80"
-        target="_blank"
-        rel="noopener noreferrer"
-      >
-        BambooHR
-        <ExternalLink className="size-3" />
-      </a>
-    </div>
-  );
-}
diff --git a/src/components/widgets/v2/counters-block.test.tsx b/src/components/widgets/v2/counters-block.test.tsx
deleted file mode 100644
index c667dfe2..00000000
--- a/src/components/widgets/v2/counters-block.test.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- * Component-render coverage for `<CountersBlock>` (Refs #80, wave 3).
- *
- * Verifies the wave-1 DESIGN §3.3 rendering rules through the catalog
- * hook:
- *   - `ok` rows render with peer coloring driven by `higher_is_better`
- *     (top-quartile value surfaces as the "Top win" hero).
- *   - `schema_status='error'` rows (surfaced as `row.schema_error: true`
- *     by transforms.ts) collapse to neutral — never the hero callout.
- *   - Missing-id rows (no catalog entry for the row's metric_key)
- *     collapse to neutral.
- */
-
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { render, screen, waitFor } from "@testing-library/react";
-import type React from "react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import { authStore } from "@/auth/auth-store";
-
-vi.mock("@/api/catalog-client", async () => {
-  const actual = await vi.importActual<typeof import("@/api/catalog-client")>(
-    "@/api/catalog-client",
-  );
-  return { ...actual, fetchCatalog: vi.fn() };
-});
-
-import * as catalogClient from "@/api/catalog-client";
-import {
-  buildCatalogResponse,
-  renderWithCatalogClient,
-} from "@/test/catalog-test-utils";
-import { CountersBlock } from "./counters-block";
-import type { PeerStats } from "@/lib/peers";
-import type { BulletMetric, PeriodValue } from "@/types/insight";
-import { makeSession } from "@/test/session";
-
-const fetchCatalog = catalogClient.fetchCatalog as ReturnType<typeof vi.fn>;
-
-function makeBullet(overrides: Partial<BulletMetric> = {}): BulletMetric {
-  return {
-    period: "month" as PeriodValue,
-    section: "task_delivery",
-    metric_key: "tasks_completed",
-    label: "Tasks Closed",
-    value: "12",
-    unit: "tasks",
-    range_min: "0",
-    range_max: "20",
-    median: "5",
-    median_label: "Median: 5 tasks",
-    bar_left_pct: 0,
-    bar_width_pct: 60,
-    median_left_pct: 25,
-    status: "good",
-    drill_id: "",
-    ...overrides,
-  };
-}
-
-const STATS: PeerStats = { p25: 3, p50: 5, p75: 10, min: 1, max: 15, n: 12 };
-
-describe("<CountersBlock>", () => {
-  beforeEach(() => {
-    authStore.reset();
-    authStore.setAuthenticated(makeSession());
-    fetchCatalog.mockReset();
-  });
-  afterEach(() => {
-    authStore.reset();
-  });
-
-  it("renders the 'Top win' hero for an ok-row with value above p75", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildCatalogResponse([
-        {
-          metric_key: "task_delivery_bullet_rows.tasks_completed",
-          higher_is_better: true,
-          schema_status: "ok",
-        },
-      ]),
-    );
-    renderWithCatalogClient(
-      <CountersBlock rows={[makeBullet({ value: "12", peer: STATS })]} />,
-    );
-    await waitFor(() => {
-      expect(screen.getByText("Top win")).toBeInTheDocument();
-    });
-    expect(screen.getByText("Tasks Closed")).toBeInTheDocument();
-  });
-
-  it("collapses a schema_error row to neutral — no hero callout", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildCatalogResponse([
-        {
-          metric_key: "task_delivery_bullet_rows.tasks_completed",
-          higher_is_better: true,
-          schema_status: "error",
-          schema_error_code: "table_not_found",
-        },
-      ]),
-    );
-    renderWithCatalogClient(
-      <CountersBlock
-        rows={[makeBullet({ value: "12", schema_error: true, peer: STATS })]}
-      />,
-    );
-    // `waitFor` retries until the post-fetch render commits — without
-    // it, the assertion can run against the initial loading-state
-    // render (sourced from the compile-in fallback, which DOES contain
-    // the metric_key).
-    await waitFor(() => {
-      expect(screen.queryByText("Top win")).not.toBeInTheDocument();
-      expect(screen.queryByText("Top issue")).not.toBeInTheDocument();
-    });
-  });
-
-  it("missing-id row collapses to neutral (no peer coloring)", async () => {
-    fetchCatalog.mockResolvedValue(buildCatalogResponse([]));
-    renderWithCatalogClient(
-      <CountersBlock rows={[makeBullet({ value: "12", peer: STATS })]} />,
-    );
-    await waitFor(() => {
-      expect(screen.queryByText("Top win")).not.toBeInTheDocument();
-      expect(screen.queryByText("Top issue")).not.toBeInTheDocument();
-    });
-  });
-
-  describe("list layout", () => {
-    it("renders a flat value-vs-cohort row per metric", async () => {
-      fetchCatalog.mockResolvedValue(
-        buildCatalogResponse([
-          {
-            metric_key: "task_delivery_bullet_rows.tasks_completed",
-            higher_is_better: true,
-            schema_status: "ok",
-          },
-        ]),
-      );
-      renderWithCatalogClient(
-        <CountersBlock
-          rows={[makeBullet({ value: "12", peer: STATS })]}
-          layout="list"
-        />,
-      );
-      await waitFor(() => {
-        // value 12 > p75 (10) → top quartile.
-        expect(screen.getAllByText("top 25%").length).toBeGreaterThan(0);
-      });
-      // Mobile + desktop layouts both render the row.
-      expect(screen.getAllByText("Tasks Closed").length).toBeGreaterThan(0);
-      expect(screen.getAllByText("12").length).toBeGreaterThan(0);
-      expect(
-        screen.getAllByText(/department median: 5 tasks/).length,
-      ).toBeGreaterThan(0);
-    });
-
-    it("labels an in-pack value 'on par' with the cohort median", async () => {
-      fetchCatalog.mockResolvedValue(
-        buildCatalogResponse([
-          {
-            metric_key: "task_delivery_bullet_rows.tasks_completed",
-            higher_is_better: true,
-            schema_status: "ok",
-          },
-        ]),
-      );
-      renderWithCatalogClient(
-        <CountersBlock
-          rows={[makeBullet({ value: "5", peer: STATS })]}
-          layout="list"
-          cohortLabel="team"
-        />,
-      );
-      await waitFor(() => {
-        expect(screen.getAllByText("on par").length).toBeGreaterThan(0);
-      });
-      expect(
-        screen.getAllByText(/team median: 5 tasks/).length,
-      ).toBeGreaterThan(0);
-    });
-
-    it("shows an em-dash position and 'no peer data' without stats", async () => {
-      fetchCatalog.mockResolvedValue(buildCatalogResponse([]));
-      renderWithCatalogClient(
-        <CountersBlock rows={[makeBullet({ value: "12" })]} layout="list" />,
-      );
-      await waitFor(() => {
-        expect(screen.getAllByText("no peer data").length).toBeGreaterThan(0);
-      });
-      expect(screen.getAllByText("—").length).toBeGreaterThan(0);
-    });
-
-    it("renders nothing when every row is valueless", async () => {
-      fetchCatalog.mockResolvedValue(buildCatalogResponse([]));
-      const { container } = renderList(
-        <CountersBlock
-          rows={[
-            makeBullet({ metric_key: "a", value: "—" }),
-            makeBullet({ metric_key: "b", value: "" }),
-          ]}
-          layout="list"
-        />,
-      );
-      await waitFor(() => {
-        expect(fetchCatalog).toHaveBeenCalled();
-      });
-      expect(container.textContent).toBe("");
-    });
-  });
-});
-
-// Local render helper that also exposes the container for empty-render
-// assertions (renderWithCatalogClient only returns the query client).
-function renderList(ui: React.ReactElement) {
-  const client = new QueryClient({
-    defaultOptions: { queries: { retry: false, gcTime: 0 } },
-  });
-  return render(<QueryClientProvider client={client}>{ui}</QueryClientProvider>);
-}
diff --git a/src/components/widgets/v2/counters-block.tsx b/src/components/widgets/v2/counters-block.tsx
deleted file mode 100644
index 9f57daab..00000000
--- a/src/components/widgets/v2/counters-block.tsx
+++ /dev/null
@@ -1,249 +0,0 @@
-import { Fragment } from "react";
-
-import { useCatalog } from "@/api/use-catalog";
-import { MetricSublabel } from "@/components/widgets/v2/metric-sublabel";
-import {
-  PeerStorySection,
-  type PeerStoryInput,
-} from "@/components/widgets/v2/peer-story-section";
-import { useSettings } from "@/hooks/use-settings";
-import { BULLET_DESCRIPTION_BY_KEY } from "@/lib/insight/v2/bullet-defs";
-import { bulletCatalogKey, type CatalogByKey } from "@/lib/insight/v2/peer-status";
-import {
-  applyFocus,
-  PEER_TEXT,
-  peerStatusVsQuartiles,
-  type PeerStats,
-  type PeerStatusWithNeutral,
-} from "@/lib/peers";
-import { cn } from "@/lib/utils";
-import type { BulletMetric } from "@/types/insight";
-
-import type { PeerCohortLabel } from "@/lib/peers";
-
-interface StoryEntry {
-  row: BulletMetric;
-  status: PeerStatusWithNeutral;
-  stats: PeerStats | null;
-  higherIsBetter: boolean;
-  gap: number;
-  value: number;
-}
-
-function buildEntries(
-  rows: BulletMetric[],
-  byMetricKey: CatalogByKey,
-): StoryEntry[] {
-  return rows.map((row) => {
-    const stats = row.peer ?? null;
-    const catalogRow = byMetricKey(bulletCatalogKey(row));
-    // Match the wave-1 contract: schema_status='error' rows and rows the
-    // catalog has no entry for collapse to 'neutral' (no peer coloring).
-    const isSchemaError = row.schema_error === true;
-    const higherIsBetter = catalogRow?.higher_is_better ?? true;
-    const numericValue = Number(row.value);
-    const hasValue = Number.isFinite(numericValue);
-    const status: PeerStatusWithNeutral =
-      !isSchemaError && catalogRow && stats && hasValue
-        ? peerStatusVsQuartiles(numericValue, stats, higherIsBetter)
-        : "neutral";
-    let gap = 0;
-    if (
-      !isSchemaError &&
-      catalogRow &&
-      stats &&
-      hasValue &&
-      Math.abs(stats.p50) > 1e-9
-    ) {
-      const raw = (numericValue - stats.p50) / Math.abs(stats.p50);
-      gap = higherIsBetter ? raw : -raw;
-    }
-    return { row, status, stats, higherIsBetter, gap, value: numericValue };
-  });
-}
-
-function buildPeerStoryInputs(
-  rows: BulletMetric[],
-  byMetricKey: CatalogByKey,
-): PeerStoryInput[] {
-  return rows.flatMap((row) => {
-    if (row.value === "—" || row.value === "") return [];
-    const value = Number(row.value);
-    if (!Number.isFinite(value)) return [];
-    const catalogRow = byMetricKey(bulletCatalogKey(row));
-    return [
-      {
-        key: row.metric_key,
-        label: row.label,
-        sublabel: catalogRow?.sublabel,
-        value,
-        unit: row.unit,
-        format: catalogRow?.format,
-        higherIsBetter: catalogRow?.higher_is_better ?? true,
-        stats: row.peer ?? null,
-        neutral: row.schema_error === true || !catalogRow,
-      },
-    ];
-  });
-}
-
-function fmtStat(v: number, unit: string): string {
-  const rounded = unit === "d" ? Math.round(v * 10) / 10 : Math.round(v);
-  if (!unit) return String(rounded);
-  return unit === "%" ? `${rounded}%` : `${rounded} ${unit}`;
-}
-
-export interface CountersBlockProps {
-  rows: BulletMetric[];
-  cohortLabel?: PeerCohortLabel;
-  layout?: "story" | "list";
-}
-
-export function CountersBlock({
-  rows,
-  cohortLabel = "department",
-  layout = "story",
-}: CountersBlockProps) {
-  const { focusMode } = useSettings();
-  const { byMetricKey } = useCatalog();
-  const entries = buildEntries(rows, byMetricKey);
-
-  // List layout: a flat value-vs-cohort row per metric (no hero/outlier
-  // partitioning). Used for team-aggregate distributions, which have no
-  // per-person histogram to chart.
-  if (layout === "list") {
-    const visible = entries.filter(
-      (e) => e.row.value !== "—" && e.row.value !== "",
-    );
-    if (visible.length === 0) return null;
-    return (
-      <InPackRows
-        entries={visible}
-        focusMode={focusMode}
-        cohortLabel={cohortLabel}
-        colorValue
-      />
-    );
-  }
-
-  return (
-    <PeerStorySection
-      entries={buildPeerStoryInputs(rows, byMetricKey)}
-      cohortLabel={cohortLabel}
-    />
-  );
-}
-
-function InPackRows({
-  entries,
-  focusMode,
-  cohortLabel,
-  colorValue = false,
-}: {
-  entries: StoryEntry[];
-  focusMode: ReturnType<typeof useSettings>["focusMode"];
-  cohortLabel: PeerCohortLabel;
-  colorValue?: boolean;
-}) {
-  const items = entries.map((e) => {
-    const status = applyFocus(e.status, focusMode);
-    const unit = e.row.unit ?? "";
-    const positionText =
-      e.status === "top"
-        ? "top 25%"
-        : e.status === "bottom"
-          ? "bottom 25%"
-          : e.status === "in_pack"
-            ? "on par"
-            : "—";
-    const medianText =
-      e.stats != null
-        ? `${cohortLabel} median: ${fmtStat(e.stats.p50, unit)}`
-        : "no peer data";
-    return { e, status, positionText, medianText };
-  });
-
-  const ValueCell = ({
-    e,
-    status,
-  }: {
-    e: StoryEntry;
-    status: PeerStatusWithNeutral;
-  }) => (
-    <span className="flex items-baseline gap-1 tabular-nums">
-      <span
-        className={cn(
-          "font-mono text-lg font-semibold",
-          colorValue && PEER_TEXT[status],
-        )}
-      >
-        {e.row.value}
-      </span>
-      {e.row.unit ? (
-        <span className="text-sm text-muted-foreground">{e.row.unit}</span>
-      ) : null}
-    </span>
-  );
-  const PeerCell = ({
-    status,
-    positionText,
-    medianText,
-  }: {
-    status: PeerStatusWithNeutral;
-    positionText: string;
-    medianText: string;
-  }) => (
-    <span className="whitespace-nowrap text-xs text-muted-foreground">
-      <span className={PEER_TEXT[status]}>{positionText}</span>
-      <span className="mx-1.5 opacity-50">·</span>
-      {medianText}
-    </span>
-  );
-  const Heading = ({ e }: { e: StoryEntry }) => (
-    <div className="min-w-0">
-      <span className="block truncate text-sm font-medium" title={e.row.label}>
-        {e.row.label}
-      </span>
-      <MetricSublabel
-        description={BULLET_DESCRIPTION_BY_KEY.get(e.row.metric_key)}
-      />
-    </div>
-  );
-
-  return (
-    <>
-      {/* Mobile: stacked block per metric. */}
-      <div className="flex flex-col gap-3 sm:hidden">
-        {items.map(({ e, status, positionText, medianText }) => (
-          <div key={e.row.metric_key}>
-            <div className="flex items-baseline justify-between gap-3">
-              <Heading e={e} />
-              <ValueCell e={e} status={status} />
-            </div>
-            <div className="mt-0.5">
-              <PeerCell
-                status={status}
-                positionText={positionText}
-                medianText={medianText}
-              />
-            </div>
-          </div>
-        ))}
-      </div>
-      {/* Desktop: aligned 3-column grid. */}
-      <div className="hidden items-baseline gap-x-4 gap-y-2 [grid-template-columns:max-content_max-content_1fr] sm:grid">
-        {items.map(({ e, status, positionText, medianText }) => (
-          <Fragment key={e.row.metric_key}>
-            <Heading e={e} />
-            <ValueCell e={e} status={status} />
-            <PeerCell
-              status={status}
-              positionText={positionText}
-              medianText={medianText}
-            />
-          </Fragment>
-        ))}
-      </div>
-    </>
-  );
-}
diff --git a/src/components/widgets/v2/distribution-strip.test.tsx b/src/components/widgets/v2/distribution-strip.test.tsx
deleted file mode 100644
index 18874bad..00000000
--- a/src/components/widgets/v2/distribution-strip.test.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * Component-render coverage for `<DistributionStrip>` (Refs #80, wave 3).
- *
- * Catalog-driven; covers the wave-1 DESIGN §3.3 rendering rules:
- *   - `ok` row renders with peer coloring driven by the catalog's
- *     `higher_is_better`.
- *   - `schema_status='error'` rows collapse peer coloring to neutral —
- *     the strip shows "no peer data" / suppresses the positioned chip.
- *   - Missing-id (no catalog entry) collapses to neutral with the same
- *     UX as schema_error.
- */
-
-import { screen, waitFor } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import { authStore } from "@/auth/auth-store";
-
-vi.mock("@/api/catalog-client", async () => {
-  const actual = await vi.importActual<typeof import("@/api/catalog-client")>(
-    "@/api/catalog-client",
-  );
-  return { ...actual, fetchCatalog: vi.fn() };
-});
-
-import * as catalogClient from "@/api/catalog-client";
-import {
-  buildCatalogResponse,
-  renderWithCatalogClient,
-} from "@/test/catalog-test-utils";
-import { DistributionStrip } from "./distribution-strip";
-import type { PeerStats } from "@/lib/peers";
-import type { BulletMetric, PeriodValue } from "@/types/insight";
-import { makeSession } from "@/test/session";
-
-const fetchCatalog = catalogClient.fetchCatalog as ReturnType<typeof vi.fn>;
-
-function makeBullet(overrides: Partial<BulletMetric> = {}): BulletMetric {
-  return {
-    period: "month" as PeriodValue,
-    section: "task_delivery",
-    metric_key: "tasks_completed",
-    label: "Tasks Closed",
-    value: "12",
-    unit: "tasks",
-    range_min: "0",
-    range_max: "20",
-    median: "5",
-    median_label: "Median: 5 tasks",
-    bar_left_pct: 0,
-    bar_width_pct: 60,
-    median_left_pct: 25,
-    status: "good",
-    drill_id: "",
-    ...overrides,
-  };
-}
-
-const STATS: PeerStats = { p25: 3, p50: 5, p75: 10, min: 1, max: 15, n: 12 };
-
-describe("<DistributionStrip>", () => {
-  beforeEach(() => {
-    authStore.reset();
-    authStore.setAuthenticated(makeSession());
-    fetchCatalog.mockReset();
-  });
-  afterEach(() => {
-    authStore.reset();
-  });
-
-  it("renders peer-position text for an ok row above p75", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildCatalogResponse([
-        {
-          metric_key: "task_delivery_bullet_rows.tasks_completed",
-          higher_is_better: true,
-          schema_status: "ok",
-        },
-      ]),
-    );
-    renderWithCatalogClient(
-      <DistributionStrip
-        row={makeBullet({ value: "12", peer: STATS })}
-        cohortLabel="team"
-      />,
-    );
-    await waitFor(() => {
-      expect(screen.getByText(/top 25% in team/i)).toBeInTheDocument();
-    });
-  });
-
-  it("collapses peer coloring to 'no peer data' for schema_error rows", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildCatalogResponse([
-        {
-          metric_key: "task_delivery_bullet_rows.tasks_completed",
-          higher_is_better: true,
-          schema_status: "error",
-        },
-      ]),
-    );
-    renderWithCatalogClient(
-      <DistributionStrip
-        row={makeBullet({ value: "12", schema_error: true, peer: STATS })}
-        cohortLabel="team"
-      />,
-    );
-    // schema_error rows: peer chip is 'neutral' which renders as "no
-    // peer data" per `positionText` in distribution-strip.
-    await waitFor(() => {
-      expect(screen.getByText(/no peer data/i)).toBeInTheDocument();
-      expect(screen.queryByText(/top 25% in team/i)).not.toBeInTheDocument();
-    });
-  });
-
-  it("collapses to 'no peer data' when the catalog has no row for this metric", async () => {
-    fetchCatalog.mockResolvedValue(buildCatalogResponse([]));
-    renderWithCatalogClient(
-      <DistributionStrip
-        row={makeBullet({ value: "12", peer: STATS })}
-        cohortLabel="team"
-      />,
-    );
-    await waitFor(() => {
-      expect(screen.getByText(/no peer data/i)).toBeInTheDocument();
-      expect(screen.queryByText(/top 25% in team/i)).not.toBeInTheDocument();
-    });
-  });
-});
diff --git a/src/components/widgets/v2/distribution-strip.tsx b/src/components/widgets/v2/distribution-strip.tsx
deleted file mode 100644
index 385156b8..00000000
--- a/src/components/widgets/v2/distribution-strip.tsx
+++ /dev/null
@@ -1,260 +0,0 @@
-import { useCatalog } from "@/api/use-catalog";
-import type { CatalogMetric } from "@/api/catalog-client";
-import { MetricSublabel } from "@/components/widgets/v2/metric-sublabel";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import {
-  BarChart,
-  CartesianGrid,
-  ChartBar,
-  ChartContainer,
-  ChartTooltip,
-  ChartTooltipContent,
-  ReferenceLine,
-  type ChartConfig,
-  XAxis,
-  YAxis,
-} from "@/components/ui/chart";
-import { useSettings } from "@/hooks/use-settings";
-import {
-  BULLET_DESCRIPTION_BY_KEY,
-} from "@/lib/insight/v2/bullet-defs";
-import { bulletCatalogKey } from "@/lib/insight/v2/peer-status";
-import {
-  applyFocus,
-  PEER_FILL,
-  PEER_TEXT,
-  peerStatusVsQuartiles,
-  type PeerCohortLabel,
-  type PeerStats,
-  type PeerStatusWithNeutral,
-} from "@/lib/peers";
-import { STATUS_SURFACE_CLASS } from "@/lib/status";
-import { cn } from "@/lib/utils";
-import type { HistogramBin } from "@/queries/v2/ic-extras";
-import type { BulletMetric } from "@/types/insight";
-
-const CHART_CONFIG: ChartConfig = {
-  count: { label: "Count", color: "var(--chart-1)" },
-};
-
-function positionText(
-  status: PeerStatusWithNeutral,
-  cohortLabel: PeerCohortLabel,
-): string {
-  if (status === "top") return `Top 25% in ${cohortLabel}`;
-  if (status === "bottom") return `Bottom 25% in ${cohortLabel}`;
-  if (status === "in_pack") return `Middle 50% in ${cohortLabel}`;
-  return "No peer data";
-}
-
-export interface DistributionStripProps {
-  row: BulletMetric;
-  bins?: HistogramBin[] | null;
-  cohortLabel?: PeerCohortLabel;
-}
-
-export function DistributionStrip({
-  row,
-  bins,
-  cohortLabel = "department",
-}: DistributionStripProps) {
-  const { focusMode } = useSettings();
-  const { byMetricKey } = useCatalog();
-  const catalogRow = byMetricKey(bulletCatalogKey(row));
-  // Title prefers the transformed row's label (already catalog-sourced by
-  // wave-1 transforms). Fall back to the catalog row directly for parity
-  // when the row label was empty.
-  const title = row.label || catalogRow?.label || row.metric_key;
-  const unit = row.unit || catalogRow?.unit || "";
-  const description = BULLET_DESCRIPTION_BY_KEY.get(row.metric_key);
-  const medianRaw = Number(row.median);
-  const median = Number.isFinite(medianRaw) ? medianRaw : undefined;
-
-  return (
-    <Card>
-      <CardHeader className="pb-2">
-        <CardTitle className="text-sm font-semibold">{title}</CardTitle>
-        {median != null ? (
-          <CardDescription className="text-xs">
-            Median {median}
-            {unit}
-          </CardDescription>
-        ) : null}
-        <MetricSublabel description={description} className="text-xs" />
-      </CardHeader>
-      <CardContent>
-        {bins && bins.length > 0 ? (
-          <HistogramBody bins={bins} unit={unit} median={median} />
-        ) : (
-          <PeerBody
-            row={row}
-            unit={unit}
-            cohortLabel={cohortLabel}
-            focusMode={focusMode}
-            catalogRow={catalogRow}
-          />
-        )}
-      </CardContent>
-    </Card>
-  );
-}
-
-function HistogramBody({
-  bins,
-  unit,
-  median,
-}: {
-  bins: HistogramBin[];
-  unit: string;
-  median?: number;
-}) {
-  const data = bins.map((b) => ({
-    bucket: `${b.bin}${unit}`,
-    bin: b.bin,
-    count: b.count,
-  }));
-  return (
-    <ChartContainer config={CHART_CONFIG} className="h-32 w-full">
-      <BarChart data={data} margin={{ top: 4, right: 4, left: 0, bottom: 0 }}>
-        <CartesianGrid vertical={false} stroke="var(--border)" />
-        <XAxis
-          dataKey="bucket"
-          tickLine={false}
-          axisLine={false}
-          tick={{ fontSize: 10, fill: "var(--muted-foreground)" }}
-        />
-        <YAxis hide />
-        <ChartTooltip content={<ChartTooltipContent hideIndicator />} />
-        <ChartBar
-          dataKey="count"
-          fill="var(--color-count)"
-          radius={3}
-        />
-        {median != null ? (
-          <ReferenceLine
-            x={`${median}${unit}`}
-            stroke="var(--foreground)"
-            strokeDasharray="3 3"
-          />
-        ) : null}
-      </BarChart>
-    </ChartContainer>
-  );
-}
-
-function PeerBody({
-  row,
-  unit,
-  cohortLabel,
-  focusMode,
-  catalogRow,
-}: {
-  row: BulletMetric;
-  unit: string;
-  cohortLabel: PeerCohortLabel;
-  focusMode: ReturnType<typeof useSettings>["focusMode"];
-  catalogRow: CatalogMetric | undefined;
-}) {
-  const cohortStats = row.peer ?? null;
-  const isSchemaError = row.schema_error === true;
-  const higherIsBetter = catalogRow?.higher_is_better ?? true;
-  const numericValue = Number(row.value);
-  const hasNumericValue = Number.isFinite(numericValue);
-  // schema_status='error' and missing-id rows collapse peer coloring to
-  // 'neutral' per the wave-1 DESIGN §3.3 contract.
-  const rawStatus: PeerStatusWithNeutral =
-    !isSchemaError && catalogRow && cohortStats && hasNumericValue
-      ? peerStatusVsQuartiles(numericValue, cohortStats, higherIsBetter)
-      : "neutral";
-  const status = applyFocus(rawStatus, focusMode);
-
-  return (
-    <div className="flex h-32 flex-col justify-center gap-3">
-      <div className="flex items-baseline gap-1">
-        <span className="text-2xl font-semibold tabular-nums">{row.value}</span>
-        {unit ? (
-          <span className="text-sm text-muted-foreground">{unit}</span>
-        ) : null}
-      </div>
-      {cohortStats && hasNumericValue ? (
-        <div className="flex flex-col gap-1">
-          <PeerStrip
-            value={numericValue}
-            stats={cohortStats}
-            higherIsBetter={higherIsBetter}
-            status={status}
-          />
-          <p className={cn("text-[11px] tabular-nums", PEER_TEXT[status])}>
-            {positionText(status, cohortLabel)}
-          </p>
-        </div>
-      ) : (
-        <p className="text-[11px] text-muted-foreground">No peer data</p>
-      )}
-    </div>
-  );
-}
-
-function PeerStrip({
-  value,
-  stats,
-  higherIsBetter,
-  status,
-}: {
-  value: number;
-  stats: PeerStats;
-  higherIsBetter: boolean;
-  status: PeerStatusWithNeutral;
-}) {
-  const span = Math.max(1e-9, stats.max - stats.min);
-  const pct = (v: number) =>
-    ((Math.max(stats.min, Math.min(stats.max, v)) - stats.min) / span) * 100;
-  const valueLeft = pct(value);
-  const p50Left = pct(stats.p50);
-  const p25Left = pct(stats.p25);
-  const p75Left = pct(stats.p75);
-
-  const bottomZoneClass = higherIsBetter
-    ? STATUS_SURFACE_CLASS.bad
-    : STATUS_SURFACE_CLASS.good;
-  const topZoneClass = higherIsBetter
-    ? STATUS_SURFACE_CLASS.good
-    : STATUS_SURFACE_CLASS.bad;
-
-  return (
-    <div
-      role="img"
-      aria-label={`P25 ${stats.p25.toFixed(1)}, P50 ${stats.p50.toFixed(1)}, P75 ${stats.p75.toFixed(1)}, n=${stats.n}`}
-      className="relative h-3.5 w-full select-none"
-    >
-      <div className="absolute inset-x-0 top-1/2 h-3 -translate-y-1/2 overflow-hidden rounded-sm bg-muted">
-        <span
-          className={cn("absolute inset-y-0 left-0", bottomZoneClass)}
-          style={{ width: `${p25Left}%` }}
-        />
-        <span
-          className={cn("absolute inset-y-0", topZoneClass)}
-          style={{ left: `${p75Left}%`, right: 0 }}
-        />
-      </div>
-      <span
-        className={cn(
-          "absolute top-1/2 h-1.5 -translate-y-1/2 rounded-sm",
-          PEER_FILL[status],
-        )}
-        style={{ left: 0, width: `${valueLeft}%` }}
-      />
-      <span
-        className="absolute top-1/2 h-3.5 w-0.5 -translate-x-1/2 -translate-y-1/2 bg-foreground/80"
-        style={{ left: `${p50Left}%` }}
-        aria-hidden
-      />
-    </div>
-  );
-}
diff --git a/src/components/widgets/v2/group-drilldown-sheet.tsx b/src/components/widgets/v2/group-drilldown-sheet.tsx
deleted file mode 100644
index f85ba46f..00000000
--- a/src/components/widgets/v2/group-drilldown-sheet.tsx
+++ /dev/null
@@ -1,259 +0,0 @@
-import { Maximize2, Minimize2, XIcon } from "lucide-react";
-
-import { ComingSoon } from "@/components/widgets/coming-soon";
-import { CountersBlock } from "@/components/widgets/v2/counters-block";
-import { DistributionStrip } from "@/components/widgets/v2/distribution-strip";
-import { CollectionDrilldown } from "@/components/widgets/metric-views/collection-drilldown";
-import {
-  TeamCollectionDrilldown,
-  type TeamMemberRef,
-} from "@/components/widgets/metric-views/team-collection-drilldown";
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Button } from "@/components/ui/button";
-import { Spinner } from "@/components/ui/spinner";
-import type { DateRange } from "@/api/period-to-date-range";
-import type { GroupDef } from "@/lib/insight/groups";
-import { partitionBullets } from "@/lib/insight/v2/partition";
-import { useIcDrilldownBatch } from "@/queries/v2/ic-extras";
-import type { PeerCohortLabel } from "@/lib/peers";
-import type { MetricCollectionResult } from "@/queries/metric-results";
-import { cn } from "@/lib/utils";
-import {
-  parseLocalStorageBoolean,
-  serializeLocalStorageBoolean,
-  useLocalStorageState,
-} from "@/hooks/use-local-storage-state";
-import type { BulletMetric, PeriodValue } from "@/types/insight";
-
-/** Data target for a metrics-backed group's drilldown body. */
-export type MetricDrilldownTarget =
-  | {
-      kind: "person";
-      entityId: string;
-      data: MetricCollectionResult;
-    }
-  | { kind: "team"; members: TeamMemberRef[] };
-
-export interface GroupDrilldownSheetProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  def: GroupDef;
-  /** Legacy group rows; unused for `def.kind === "metrics"`. */
-  rows: BulletMetric[];
-  /** Required when `def.kind === "metrics"`. */
-  metricTarget?: MetricDrilldownTarget;
-  personId?: string | null;
-  range?: DateRange;
-  period?: PeriodValue;
-  cohortLabel?: PeerCohortLabel;
-}
-
-export function GroupDrilldownSheet({
-  open,
-  onOpenChange,
-  def,
-  rows,
-  metricTarget,
-  personId,
-  range,
-  period,
-  cohortLabel = "department",
-}: GroupDrilldownSheetProps) {
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent
-        showCloseButton={false}
-        className="flex w-fit max-w-none! flex-col gap-0 overflow-hidden p-0"
-      >
-        <DrilldownPanel
-          def={def}
-          rows={rows}
-          metricTarget={metricTarget}
-          personId={personId}
-          range={range}
-          period={period}
-          cohortLabel={cohortLabel}
-        />
-      </DialogContent>
-    </Dialog>
-  );
-}
-
-function DrilldownPanel({
-  def,
-  rows,
-  metricTarget,
-  personId,
-  range,
-  period,
-  cohortLabel,
-}: {
-  def: GroupDef;
-  rows: BulletMetric[];
-  metricTarget?: MetricDrilldownTarget;
-  personId?: string | null;
-  range?: DateRange;
-  period?: PeriodValue;
-  cohortLabel: PeerCohortLabel;
-}) {
-  const [expanded, setExpanded] = useLocalStorageState<boolean>({
-    key: "insight.drilldown.expanded",
-    defaultValue: false,
-    parse: parseLocalStorageBoolean,
-    serialize: serializeLocalStorageBoolean,
-  });
-
-  return (
-    <div
-      className={cn(
-        "flex min-h-0 flex-col overflow-hidden",
-        expanded ? "h-[95vh] w-[95vw]" : "h-[70vh] w-[80vw]"
-      )}
-    >
-      <DialogHeader className="flex shrink-0 flex-row items-center justify-between gap-2 border-b p-4">
-        <DialogTitle>{def.title}</DialogTitle>
-        <div className="flex items-center gap-0.5">
-          <Button
-            variant="ghost"
-            size="icon-sm"
-            onClick={() => setExpanded((v) => !v)}
-            aria-label={expanded ? "Shrink" : "Expand"}
-          >
-            {expanded ? <Minimize2 /> : <Maximize2 />}
-          </Button>
-          <DialogClose
-            render={
-              <Button variant="ghost" size="icon-sm" aria-label="Close" />
-            }
-          >
-            <XIcon />
-          </DialogClose>
-        </div>
-      </DialogHeader>
-      <div className="no-scrollbar min-h-0 flex-1 overflow-y-auto">
-        {def.kind === "metrics" ? (
-          metricTarget?.kind === "person" ? (
-            <CollectionDrilldown
-              def={def}
-              data={metricTarget.data}
-              entityId={metricTarget.entityId}
-              range={range}
-              cohortLabel={cohortLabel}
-            />
-          ) : metricTarget?.kind === "team" && range && period ? (
-            <TeamCollectionDrilldown
-              def={def}
-              members={metricTarget.members}
-              range={range}
-              period={period}
-              cohortLabel={cohortLabel}
-            />
-          ) : (
-            <div className="flex h-full w-full items-center justify-center p-10">
-              <ComingSoon state="error" label="Missing drilldown data" />
-            </div>
-          )
-        ) : (
-          <LegacyDrilldownBody
-            rows={rows}
-            sectionId={def.id}
-            personId={personId}
-            range={range}
-            period={period}
-            cohortLabel={cohortLabel}
-          />
-        )}
-      </div>
-    </div>
-  );
-}
-
-function LegacyDrilldownBody({
-  rows,
-  sectionId,
-  personId,
-  range,
-  period,
-  cohortLabel,
-}: {
-  rows: BulletMetric[];
-  sectionId: string;
-  personId?: string | null;
-  range?: DateRange;
-  period?: PeriodValue;
-  cohortLabel: PeerCohortLabel;
-}) {
-  const { counters, distributions } = partitionBullets(rows);
-
-  const batchQ = useIcDrilldownBatch({
-    sectionId,
-    personId: personId ?? null,
-    range: range ?? null,
-    period: period ?? null,
-  });
-
-  const batch = batchQ.data;
-  const isFirstLoad = batchQ.isPending && batchQ.fetchStatus !== "idle";
-  const isBodyEmpty =
-    Boolean(batch) &&
-    counters.length === 0 &&
-    distributions.length === 0 &&
-    batch?.histograms.size === 0 &&
-    !batch?.sectionTrend?.length;
-  const showFullSpinner = isFirstLoad || (isBodyEmpty && batchQ.isFetching);
-
-  if (showFullSpinner) {
-    return (
-      <div className="flex h-full w-full items-center justify-center p-10">
-        <Spinner className="size-12 text-muted-foreground" />
-      </div>
-    );
-  }
-
-  return (
-    <div
-      className={cn(
-        "flex flex-col gap-6 p-4 transition-opacity sm:p-6",
-        batchQ.isFetching && "opacity-60"
-      )}
-    >
-      {counters.length > 0 ? (
-        <CountersBlock rows={counters} cohortLabel={cohortLabel} />
-      ) : null}
-      {/* Histograms (ic_histogram) are per-person; a team aggregate has no
-          single person, so the team renders distributions as a compact
-          value-vs-expectation list (matches the sandbox's list layout). */}
-      {distributions.length > 0 ? (
-        personId != null ? (
-          <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-            {distributions.map((r) => (
-              <DistributionStrip
-                key={r.metric_key}
-                row={r}
-                bins={batch?.histograms.get(r.metric_key) ?? null}
-                cohortLabel={cohortLabel}
-              />
-            ))}
-          </div>
-        ) : (
-          <CountersBlock
-            rows={distributions}
-            cohortLabel={cohortLabel}
-            layout="list"
-          />
-        )
-      ) : null}
-      {rows.length === 0 ? (
-        <p className="py-6 text-center text-sm text-muted-foreground">
-          No data for this section in the selected period.
-        </p>
-      ) : null}
-    </div>
-  );
-}
diff --git a/src/components/widgets/v2/peer-story-section.test.tsx b/src/components/widgets/v2/peer-story-section.test.tsx
deleted file mode 100644
index 123a10ec..00000000
--- a/src/components/widgets/v2/peer-story-section.test.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import { render, screen, within } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import {
-  PeerStorySection,
-  type PeerStoryInput,
-} from "@/components/widgets/v2/peer-story-section";
-import type { PeerStats } from "@/lib/peers";
-
-const settingsState = vi.hoisted(() => ({
-  focusMode: "all" as "all" | "critical" | "rewards" | "neutral",
-}));
-
-vi.mock("@/hooks/use-settings", () => ({
-  useSettings: () => ({ focusMode: settingsState.focusMode }),
-}));
-
-const STATS: PeerStats = {
-  p25: 25,
-  p50: 50,
-  p75: 75,
-  min: 0,
-  max: 100,
-  n: 9,
-};
-
-function metric(
-  key: string,
-  label: string,
-  value: number,
-  overrides: Partial<PeerStoryInput> = {},
-): PeerStoryInput {
-  return {
-    key,
-    label,
-    sublabel: "Peer comparable",
-    value,
-    unit: "units",
-    higherIsBetter: true,
-    stats: STATS,
-    ...overrides,
-  };
-}
-
-function appearsBefore(a: HTMLElement, b: HTMLElement): boolean {
-  return Boolean(a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING);
-}
-
-describe("<PeerStorySection>", () => {
-  beforeEach(() => {
-    settingsState.focusMode = "all";
-  });
-
-  it("uses the worst bottom outlier as the all-mode hero and keeps remaining outliers red before green", () => {
-    render(
-      <PeerStorySection
-        entries={[
-          metric("hotel", "Hotel fog", 5),
-          metric("alpha", "Alpha wobble", 10),
-          metric("delta", "Delta static", 15),
-          metric("echo", "Echo loops", 20),
-          metric("bravo", "Bravo lift", 98),
-          metric("charlie", "Charlie rise", 90),
-        ]}
-      />,
-    );
-
-    expect(screen.getByText("Top issue")).toBeInTheDocument();
-    expect(screen.getByText("Hotel fog")).toBeInTheDocument();
-    expect(screen.queryByText("Top win")).not.toBeInTheDocument();
-
-    expect(appearsBefore(screen.getByText("Alpha wobble"), screen.getByText("Bravo lift"))).toBe(true);
-    expect(appearsBefore(screen.getByText("Echo loops"), screen.getByText("Bravo lift"))).toBe(true);
-
-    const chipButtons = screen.getAllByRole("button").filter((button) =>
-      ["Bravo lift", "Charlie rise"].some((label) => button.textContent?.includes(label)),
-    );
-    expect(chipButtons).toHaveLength(2);
-    expect(appearsBefore(chipButtons[0], chipButtons[1])).toBe(true);
-  });
-
-  it("filters critical and rewards focus modes and shows their empty states", () => {
-    const entries = [metric("top", "Bravo lift", 98)];
-
-    settingsState.focusMode = "critical";
-    const { rerender } = render(<PeerStorySection entries={entries} />);
-
-    expect(screen.getByText("No critical issues this period")).toBeInTheDocument();
-    expect(screen.queryByText("Bravo lift")).not.toBeInTheDocument();
-
-    settingsState.focusMode = "rewards";
-    rerender(<PeerStorySection entries={entries} />);
-
-    expect(screen.getByText("Top win")).toBeInTheDocument();
-    expect(screen.getByText("Bravo lift")).toBeInTheDocument();
-
-    settingsState.focusMode = "critical";
-    rerender(<PeerStorySection entries={[metric("bottom", "Hotel fog", 5)]} />);
-
-    expect(screen.getByText("Top issue")).toBeInTheDocument();
-    expect(screen.getByText("Hotel fog")).toBeInTheDocument();
-
-    settingsState.focusMode = "rewards";
-    rerender(<PeerStorySection entries={[metric("bottom", "Hotel fog", 5)]} />);
-
-    expect(screen.getByText("No standout wins this period")).toBeInTheDocument();
-  });
-
-  it("renders calm mode as a flat grid without hero or chips", () => {
-    settingsState.focusMode = "neutral";
-
-    render(
-      <PeerStorySection
-        entries={[
-          metric("hotel", "Hotel fog", 5),
-          metric("bravo", "Bravo lift", 98),
-        ]}
-      />,
-    );
-
-    expect(screen.queryByText("Top issue")).not.toBeInTheDocument();
-    expect(screen.queryByText("Top win")).not.toBeInTheDocument();
-    expect(screen.getByText("Hotel fog")).toBeInTheDocument();
-    expect(screen.getByText("Bravo lift")).toBeInTheDocument();
-    expect(screen.queryByRole("button", { name: /Hotel fog/ })).not.toBeInTheDocument();
-  });
-
-  it("renders percent values as whole inline percentages", () => {
-    render(
-      <PeerStorySection
-        entries={[
-          metric("acceptance", "Tool acceptance", 94.6, {
-            unit: "%",
-            format: "percent",
-            stats: { p25: 12.2, p50: 31.8, p75: 60.4, min: 0, max: 100, n: 8 },
-          }),
-        ]}
-      />,
-    );
-
-    expect(screen.getByText("95%")).toBeInTheDocument();
-    expect(screen.getByText("32%")).toBeInTheDocument();
-    expect(screen.queryByText("94.6")).not.toBeInTheDocument();
-    expect(screen.queryByText("%")).not.toBeInTheDocument();
-  });
-
-  it("renders currency values inline without a separate unit", () => {
-    render(
-      <PeerStorySection
-        entries={[
-          metric("cost", "Reported AI cost", 1234, {
-            unit: "$",
-            format: "currency",
-            higherIsBetter: false,
-            stats: { p25: 100, p50: 879, p75: 1000, min: 0, max: 5000, n: 8 },
-          }),
-        ]}
-      />,
-    );
-
-    expect(screen.getByText("$1,234")).toBeInTheDocument();
-    expect(screen.getByText("$879")).toBeInTheDocument();
-    expect(screen.queryByText("1,234")).not.toBeInTheDocument();
-    expect(screen.queryByText("$")).not.toBeInTheDocument();
-  });
-
-  it("keeps in-pack folded rows above no-peer rows and labels missing peer context", async () => {
-    const user = userEvent.setup();
-
-    render(
-      <PeerStorySection
-        entries={[
-          metric("bravo", "Bravo lift", 98),
-          metric("kilo", "Kilo sample", 44, { stats: null }),
-          metric("juliet", "Juliet balance", 54),
-          metric("lima", "Lima baseline", 48),
-        ]}
-      />,
-    );
-
-    await user.click(
-      screen.getByRole("button", {
-        name: /Show 3 supporting and on-par metrics/,
-      }),
-    );
-
-    const fold = screen.getByText("Juliet balance").closest(".contents")?.parentElement;
-    expect(fold).toBeTruthy();
-    const rows = within(fold as HTMLElement);
-    expect(appearsBefore(rows.getByText("Juliet balance"), rows.getByText("Kilo sample"))).toBe(true);
-    expect(appearsBefore(rows.getByText("Lima baseline"), rows.getByText("Kilo sample"))).toBe(true);
-    expect(rows.getByText("no peer data")).toBeInTheDocument();
-  });
-});
diff --git a/src/components/widgets/v2/peer-story-section.tsx b/src/components/widgets/v2/peer-story-section.tsx
deleted file mode 100644
index 6d181e18..00000000
--- a/src/components/widgets/v2/peer-story-section.tsx
+++ /dev/null
@@ -1,657 +0,0 @@
-import { useState } from "react";
-import { ArrowUp, ChevronDown, ChevronRight } from "lucide-react";
-
-import {
-  Card,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { useSettings } from "@/hooks/use-settings";
-import {
-  PEER_FILL,
-  PEER_TEXT,
-  peerStatusVsQuartiles,
-  type PeerCohortLabel,
-  type PeerStats,
-  type PeerStatusWithNeutral,
-} from "@/lib/peers";
-import { STATUS_SURFACE_CLASS } from "@/lib/status";
-import { cn } from "@/lib/utils";
-import { LOCALE } from "@/config/constants";
-
-const CURRENCY_FORMAT = new Intl.NumberFormat(LOCALE, {
-  style: "currency",
-  currency: "USD",
-  maximumFractionDigits: 0,
-});
-
-export type PeerStoryInput = {
-  key: string;
-  label: string;
-  sublabel?: string;
-  value: number;
-  unit?: string;
-  format?: string;
-  higherIsBetter: boolean;
-  stats: PeerStats | null;
-  neutral?: boolean;
-};
-
-type PeerStoryEntry = PeerStoryInput & {
-  status: PeerStatusWithNeutral;
-  gapPct: number | null;
-  gapDelta: number;
-  severity: number;
-};
-
-interface PeerStorySectionProps {
-  entries: PeerStoryInput[];
-  cohortLabel?: PeerCohortLabel;
-  emptyLabel?: string;
-  className?: string;
-}
-
-function peerSpread(stats: PeerStats): number {
-  const iqr = Math.abs(stats.p75 - stats.p25);
-  if (iqr > 1e-9) return iqr;
-  const range = Math.abs(stats.max - stats.min);
-  if (range > 1e-9) return range;
-  return 1;
-}
-
-function storyEntries(entries: PeerStoryInput[]): PeerStoryEntry[] {
-  return entries.map((entry) => {
-    const stats = entry.stats;
-    const usePeerRanking =
-      entry.neutral !== true && stats != null && Number.isFinite(entry.value);
-    const status = usePeerRanking
-      ? peerStatusVsQuartiles(entry.value, stats, entry.higherIsBetter)
-      : "neutral";
-    const gapDelta = stats ? entry.value - stats.p50 : 0;
-    const gapPct =
-      stats && Math.abs(stats.p50) > 1e-9
-        ? gapDelta / Math.abs(stats.p50)
-        : null;
-    return {
-      ...entry,
-      status,
-      gapPct,
-      gapDelta,
-      severity:
-        usePeerRanking && stats
-          ? Math.abs(gapPct ?? gapDelta / peerSpread(stats))
-          : 0,
-    };
-  });
-}
-
-function formatValue(
-  value: number,
-  unit: string | undefined,
-  format: string | undefined,
-): string {
-  if (format === "currency") {
-    return CURRENCY_FORMAT.format(value);
-  }
-  if (unit === "%" || format === "percent") {
-    return Math.round(value).toLocaleString();
-  }
-  const rounded =
-    unit === "days" && format !== "integer"
-      ? Math.round(value * 10) / 10
-      : Math.round(value);
-  return rounded.toLocaleString();
-}
-
-function formatStat(
-  value: number,
-  unit: string | undefined,
-  format: string | undefined,
-): string {
-  const formatted = formatValue(value, unit, format);
-  if (format === "currency") return formatted;
-  if (unit === "%" || format === "percent") return `${formatted}%`;
-  if (!unit) return formatted;
-  return `${formatted} ${unit}`;
-}
-
-function formatDisplayValue(
-  value: number,
-  unit: string | undefined,
-  format: string | undefined,
-): string {
-  if (format === "currency") return formatStat(value, unit, format);
-  if (unit === "%" || format === "percent") return formatStat(value, unit, format);
-  return formatValue(value, unit, format);
-}
-
-function displayUnit(
-  unit: string | undefined,
-  format: string | undefined,
-): string | undefined {
-  if (format === "currency") return undefined;
-  if (unit === "%" || format === "percent") return undefined;
-  return unit;
-}
-
-function formatGapPct(gap: number): string {
-  const sign = gap >= 0 ? "+" : "-";
-  return `${sign}${Math.round(Math.abs(gap) * 100)}%`;
-}
-
-function formatGap(entry: PeerStoryEntry): string {
-  if (entry.gapPct != null) return formatGapPct(entry.gapPct);
-  const sign = entry.gapDelta >= 0 ? "+" : "-";
-  return `${sign}${formatStat(Math.abs(entry.gapDelta), entry.unit, entry.format)}`;
-}
-
-function outlierText(status: PeerStatusWithNeutral): string {
-  return status === "bottom" ? "Bottom 25%" : "Top 25%";
-}
-
-function sortedOutliers(entries: PeerStoryEntry[]) {
-  const bottom = entries
-    .filter((entry) => entry.status === "bottom")
-    .sort((a, b) => b.severity - a.severity);
-  const top = entries
-    .filter((entry) => entry.status === "top")
-    .sort((a, b) => b.severity - a.severity);
-  return { bottom, top };
-}
-
-function supportEntries(entries: PeerStoryEntry[]) {
-  return entries
-    .filter((entry) => entry.status === "in_pack" || entry.status === "neutral")
-    .sort((a, b) => {
-      if (a.status === b.status) return 0;
-      return a.status === "neutral" ? 1 : -1;
-    });
-}
-
-function PeerZoneBar({ entry }: { entry: PeerStoryEntry }) {
-  const stats = entry.stats!;
-  const span = Math.max(1e-9, stats.max - stats.min);
-  const pct = (value: number) =>
-    ((Math.max(stats.min, Math.min(stats.max, value)) - stats.min) / span) * 100;
-  const p25Left = pct(stats.p25);
-  const p50Left = pct(stats.p50);
-  const p75Left = pct(stats.p75);
-  const valueLeft = pct(entry.value);
-  const bottomZone = entry.higherIsBetter
-    ? STATUS_SURFACE_CLASS.bad
-    : STATUS_SURFACE_CLASS.good;
-  const topZone = entry.higherIsBetter
-    ? STATUS_SURFACE_CLASS.good
-    : STATUS_SURFACE_CLASS.bad;
-
-  return (
-    <div className="mt-4">
-      <div className="relative h-3.5 w-full select-none">
-        <div className="absolute inset-x-0 top-1/2 h-2 -translate-y-1/2 overflow-hidden rounded-sm">
-          <div
-            className={cn("absolute inset-y-0 left-0", bottomZone)}
-            style={{ width: `${p25Left}%` }}
-          />
-          <div
-            className="absolute inset-y-0 bg-muted"
-            style={{ left: `${p25Left}%`, width: `${p75Left - p25Left}%` }}
-          />
-          <div
-            className={cn("absolute inset-y-0", topZone)}
-            style={{ left: `${p75Left}%`, right: 0 }}
-          />
-        </div>
-        <div
-          className="absolute inset-y-0 w-px bg-foreground/60"
-          style={{ left: `${p50Left}%` }}
-          aria-hidden
-        />
-        <div
-          className={cn(
-            "absolute inset-y-0 w-[3px] -translate-x-1/2 rounded-sm ring-2 ring-background",
-            PEER_FILL[entry.status],
-          )}
-          style={{ left: `${valueLeft}%` }}
-        />
-      </div>
-      <div className="relative h-5">
-        <ArrowUp
-          className={cn("absolute top-1 size-4 -translate-x-1/2", PEER_TEXT[entry.status])}
-          style={{ left: `${valueLeft}%` }}
-          strokeWidth={3}
-        />
-      </div>
-      <div className="mt-1 grid grid-cols-2 gap-3 text-[10px] tabular-nums">
-        <span className="text-left text-muted-foreground">
-          {formatStat(stats.min, entry.unit, entry.format)}
-        </span>
-        <span className="text-right text-muted-foreground">
-          {formatStat(stats.max, entry.unit, entry.format)}
-        </span>
-      </div>
-    </div>
-  );
-}
-
-function HeroCard({
-  entry,
-  cohortLabel,
-}: {
-  entry: PeerStoryEntry;
-  cohortLabel: PeerCohortLabel;
-}) {
-  const isBad = entry.status === "bottom";
-  const color = isBad ? "bottom" : "top";
-  const unit = displayUnit(entry.unit, entry.format);
-  return (
-    <Card
-      className={cn(
-        "flex h-full min-h-72 flex-col gap-0 p-0",
-        isBad
-          ? "shadow-[inset_0_3px_0_0_var(--destructive)]"
-          : "shadow-[inset_0_3px_0_0_var(--success)]",
-      )}
-    >
-      <div className="flex flex-1 flex-col gap-3 p-5 sm:p-6">
-        <div className="flex items-center gap-1.5">
-          <span className={cn("size-1.5 rounded-full", PEER_FILL[color])} />
-          <span
-            className={cn(
-              "text-[10px] font-semibold uppercase tracking-widest",
-              PEER_TEXT[color],
-            )}
-          >
-            {isBad ? "Top issue" : "Top win"}
-          </span>
-        </div>
-        <div>
-          <h3 className="text-xl font-semibold tracking-tight sm:text-2xl">
-            {entry.label}
-          </h3>
-          {entry.sublabel ? (
-            <p className="mt-1 text-sm text-muted-foreground">{entry.sublabel}</p>
-          ) : null}
-        </div>
-        <div className="flex flex-wrap items-baseline gap-x-5 gap-y-1.5">
-          <span className="flex items-baseline gap-1">
-            <span
-              className={cn(
-                "text-4xl font-semibold tabular-nums tracking-tight sm:text-[2.75rem]",
-                PEER_TEXT[color],
-              )}
-            >
-              {formatDisplayValue(entry.value, entry.unit, entry.format)}
-            </span>
-            {unit ? (
-              <span className="text-base text-muted-foreground">{unit}</span>
-            ) : null}
-          </span>
-          {entry.stats ? (
-            <span className="text-sm tabular-nums text-muted-foreground">
-              gap{" "}
-              <span className={cn("font-normal", PEER_TEXT[color])}>
-                {formatGap(entry)}
-              </span>{" "}
-              from {cohortLabel} median{" "}
-              <span className="text-foreground">
-                {formatStat(entry.stats.p50, entry.unit, entry.format)}
-              </span>
-            </span>
-          ) : null}
-        </div>
-        {entry.stats && entry.stats.max > entry.stats.min ? (
-          <PeerZoneBar entry={entry} />
-        ) : null}
-        <span className={cn("mt-auto text-xs font-medium", PEER_TEXT[color])}>
-          {isBad ? `Bottom 25% in ${cohortLabel}` : `Top 25% in ${cohortLabel}`}
-        </span>
-      </div>
-    </Card>
-  );
-}
-
-function SideCards({ entries }: { entries: PeerStoryEntry[] }) {
-  if (entries.length === 0) return null;
-  const stretchCards = entries.length > 1;
-  return (
-    <div
-      className={cn(
-        "grid gap-3",
-        stretchCards ? "h-full" : "content-start",
-        entries.length === 2 && "grid-rows-2",
-        entries.length === 3 && "grid-rows-3",
-      )}
-    >
-      {entries.map((entry) => (
-        <SideCard key={entry.key} entry={entry} stretch={stretchCards} />
-      ))}
-    </div>
-  );
-}
-
-function SideCard({
-  entry,
-  stretch,
-}: {
-  entry: PeerStoryEntry;
-  stretch: boolean;
-}) {
-  const unit = displayUnit(entry.unit, entry.format);
-  return (
-    <Card
-      className={cn(
-        "min-h-28 p-0",
-        stretch && "h-full",
-        "border-current/20",
-        PEER_TEXT[entry.status],
-        entry.status === "top" && "bg-success/5",
-        entry.status === "bottom" && "bg-destructive/5",
-        entry.status === "top" && "shadow-[inset_4px_0_0_0_var(--success)]",
-        entry.status === "bottom" && "shadow-[inset_4px_0_0_0_var(--destructive)]",
-      )}
-    >
-      <div className="flex h-full">
-        <div className="flex min-w-0 flex-1 flex-col justify-between gap-3 p-4">
-          <div className="min-w-0">
-            <div className="truncate text-sm font-semibold text-muted-foreground">
-              {entry.label}
-            </div>
-            {entry.sublabel ? (
-              <div className="mt-0.5 truncate text-xs text-muted-foreground">
-                {entry.sublabel}
-              </div>
-            ) : null}
-          </div>
-          <div>
-            <div className="text-2xl font-semibold tabular-nums">
-              {formatDisplayValue(entry.value, entry.unit, entry.format)}
-              {unit ? (
-                <span className="ml-1 text-xs font-normal text-muted-foreground">
-                  {unit}
-                </span>
-              ) : null}
-            </div>
-            <div className="mt-1 truncate text-[11px] text-muted-foreground">
-              {outlierText(entry.status)}
-            </div>
-          </div>
-        </div>
-      </div>
-    </Card>
-  );
-}
-
-function ChipTooltip({
-  entry,
-  cohortLabel,
-}: {
-  entry: PeerStoryEntry;
-  cohortLabel: PeerCohortLabel;
-}) {
-  return (
-    <span className="flex flex-col gap-1 leading-snug">
-      <span className="font-medium">{entry.label}</span>
-      {entry.sublabel ? (
-        <span className="text-background/70">{entry.sublabel}</span>
-      ) : null}
-      <span>
-        {formatStat(entry.value, entry.unit, entry.format)} ·{" "}
-        {outlierText(entry.status)}
-      </span>
-      {entry.stats ? (
-        <span className="text-background/70">
-          gap {formatGap(entry)} · {cohortLabel} median{" "}
-          {formatStat(entry.stats.p50, entry.unit, entry.format)}
-        </span>
-      ) : null}
-    </span>
-  );
-}
-
-function OutlierChips({
-  entries,
-  cohortLabel,
-}: {
-  entries: PeerStoryEntry[];
-  cohortLabel: PeerCohortLabel;
-}) {
-  if (entries.length === 0) return null;
-  return (
-    <div className="flex flex-wrap gap-1.5">
-      {entries.map((entry) => (
-        <Tooltip key={entry.key}>
-          <TooltipTrigger
-            render={
-              <button
-                type="button"
-                className={cn(
-                  "inline-flex cursor-help items-center gap-1 rounded-full border bg-transparent px-2.5 py-1 text-xs focus-visible:ring-1 focus-visible:ring-ring focus-visible:outline-none",
-                  PEER_TEXT[entry.status],
-                )}
-              >
-                <span className={cn("size-1.5 rounded-full", PEER_FILL[entry.status])} />
-                {entry.label}
-                <span className="font-mono tabular-nums">
-                  {formatStat(entry.value, entry.unit, entry.format)}
-                </span>
-              </button>
-            }
-          />
-          <TooltipContent side="top" className="max-w-64">
-            <ChipTooltip entry={entry} cohortLabel={cohortLabel} />
-          </TooltipContent>
-        </Tooltip>
-      ))}
-    </div>
-  );
-}
-
-function FlatGridCard({ entry }: { entry: PeerStoryEntry }) {
-  const unit = displayUnit(entry.unit, entry.format);
-  return (
-    <Card className="p-4">
-      <div className="min-w-0">
-        <div className="truncate text-sm font-semibold text-muted-foreground">
-          {entry.label}
-        </div>
-        {entry.sublabel ? (
-          <div className="mt-0.5 truncate text-xs text-muted-foreground">
-            {entry.sublabel}
-          </div>
-        ) : null}
-      </div>
-      <div className="mt-5 text-2xl font-semibold tabular-nums">
-        {formatDisplayValue(entry.value, entry.unit, entry.format)}
-        {unit ? (
-          <span className="ml-1 text-xs font-normal text-muted-foreground">
-            {unit}
-          </span>
-        ) : null}
-      </div>
-    </Card>
-  );
-}
-
-function FlatGrid({
-  entries,
-  className,
-}: {
-  entries: PeerStoryEntry[];
-  className?: string;
-}) {
-  if (entries.length === 0) return null;
-  return (
-    <div
-      className={cn(
-        "grid gap-3 [grid-template-columns:repeat(auto-fit,minmax(260px,1fr))]",
-        className,
-      )}
-    >
-      {entries.map((entry) => (
-        <FlatGridCard key={entry.key} entry={entry} />
-      ))}
-    </div>
-  );
-}
-
-function EmptyState({ label }: { label: string }) {
-  return <Card className="p-6 text-sm text-muted-foreground">{label}</Card>;
-}
-
-function SupportingFold({
-  entries,
-  cohortLabel,
-}: {
-  entries: PeerStoryEntry[];
-  cohortLabel: PeerCohortLabel;
-}) {
-  const [open, setOpen] = useState(false);
-  if (entries.length === 0) return null;
-  const neutralCount = entries.filter((entry) => entry.status === "neutral").length;
-  const trueOnParCount = entries.length - neutralCount;
-  const summaryLabel =
-    neutralCount === 0
-      ? `${entries.length} on-par metric${entries.length === 1 ? "" : "s"}`
-      : trueOnParCount === 0
-        ? `${entries.length} supporting metric${entries.length === 1 ? "" : "s"}`
-        : `${entries.length} supporting and on-par metric${
-            entries.length === 1 ? "" : "s"
-          }`;
-  const summaryDescription =
-    neutralCount === 0
-      ? `Metrics within the ${cohortLabel}'s normal range - no peer outlier`
-      : "Additional metrics without a visible peer outlier";
-  return (
-    <div className="rounded-md border">
-      <button
-        type="button"
-        onClick={() => setOpen((value) => !value)}
-        className="flex w-full items-start justify-between gap-3 px-3 py-2 text-left transition-colors hover:bg-accent"
-        aria-expanded={open}
-      >
-        <div className="min-w-0 flex-1">
-          <div className="text-sm font-medium">
-            {open ? "Hide" : "Show"} {summaryLabel}
-          </div>
-          <div className="text-[11px] text-muted-foreground">
-            {summaryDescription}
-          </div>
-        </div>
-        {open ? (
-          <ChevronDown className="mt-0.5 size-4 shrink-0 text-muted-foreground" />
-        ) : (
-          <ChevronRight className="mt-0.5 size-4 shrink-0 text-muted-foreground" />
-        )}
-      </button>
-      {open ? (
-        <div className="border-t p-3">
-          <div className="grid gap-x-8 gap-y-2 text-sm md:grid-cols-[minmax(180px,280px)_auto_1fr]">
-            {entries.map((entry) => (
-              <SupportingRow key={entry.key} entry={entry} cohortLabel={cohortLabel} />
-            ))}
-          </div>
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-function SupportingRow({
-  entry,
-  cohortLabel,
-}: {
-  entry: PeerStoryEntry;
-  cohortLabel: PeerCohortLabel;
-}) {
-  const unit = displayUnit(entry.unit, entry.format);
-  return (
-    <div className="contents">
-      <div className="font-medium">{entry.label}</div>
-      <div className="font-mono font-semibold tabular-nums">
-        {formatDisplayValue(entry.value, entry.unit, entry.format)}
-        {unit ? (
-          <span className="ml-1 font-sans text-xs font-normal text-muted-foreground">
-            {unit}
-          </span>
-        ) : null}
-      </div>
-      <div className="text-muted-foreground">
-        {entry.status !== "neutral" && entry.stats ? (
-          <span>
-            on par · {cohortLabel} median:{" "}
-            {formatStat(entry.stats.p50, entry.unit, entry.format)}
-          </span>
-        ) : (
-          <span>no peer data</span>
-        )}
-      </div>
-    </div>
-  );
-}
-
-export function PeerStorySection({
-  entries,
-  cohortLabel = "department",
-  emptyLabel = "No counter data yet.",
-  className,
-}: PeerStorySectionProps) {
-  const { focusMode } = useSettings();
-  const allEntries = storyEntries(entries);
-  const { bottom, top } = sortedOutliers(allEntries);
-  const foldedEntries = supportEntries(allEntries);
-  const focusedOutliers =
-    focusMode === "critical"
-      ? bottom
-      : focusMode === "rewards"
-        ? top
-        : focusMode === "all"
-          ? bottom.length > 0
-            ? [...bottom, ...top]
-            : top
-          : [];
-  const hero = focusedOutliers[0] ?? null;
-  const sideCards = hero ? focusedOutliers.slice(1, 4) : [];
-  const chips = hero ? focusedOutliers.slice(4) : [];
-
-  if (allEntries.length === 0) {
-    return (
-      <Card className={className}>
-        <CardHeader>
-          <CardTitle className="text-sm font-semibold">Counters</CardTitle>
-          <CardDescription>{emptyLabel}</CardDescription>
-        </CardHeader>
-      </Card>
-    );
-  }
-
-  if (focusMode === "neutral") {
-    return <FlatGrid entries={allEntries} className={className} />;
-  }
-
-  if (focusMode === "all" && !hero) {
-    return <FlatGrid entries={allEntries} className={className} />;
-  }
-
-  return (
-    <div className={cn("flex flex-col gap-4", className)}>
-      {hero ? (
-        <div className="grid grid-cols-1 items-stretch gap-4 lg:grid-cols-2">
-          <HeroCard entry={hero} cohortLabel={cohortLabel} />
-          <SideCards entries={sideCards} />
-        </div>
-      ) : focusMode === "critical" ? (
-        <EmptyState label="No critical issues this period" />
-      ) : focusMode === "rewards" ? (
-        <EmptyState label="No standout wins this period" />
-      ) : null}
-      <OutlierChips entries={chips} cohortLabel={cohortLabel} />
-      <SupportingFold entries={foldedEntries} cohortLabel={cohortLabel} />
-    </div>
-  );
-}
diff --git a/src/components/widgets/v2/section-card.test.tsx b/src/components/widgets/v2/section-card.test.tsx
deleted file mode 100644
index d5d6c798..00000000
--- a/src/components/widgets/v2/section-card.test.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Component-render coverage for `<SectionCard>` status coloring.
- *
- * Two rank sources:
- *   - IC view (no override): each row ranks off its own `peer`
- *     (p25/p50/p75) + the catalog's `higher_is_better` — no FE math.
- *   - Team view: a `rankByMetricKey` override replaces that per-row scoring,
- *     so the card rolls up per-member-vs-own-department standings instead of
- *     comparing a team aggregate against an individual band.
- * The headline always reflects the row's own label/value (the aggregate),
- * independent of which source drove the color.
- */
-
-import { screen, waitFor } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import { authStore } from "@/auth/auth-store";
-
-vi.mock("@/api/catalog-client", async () => {
-  const actual = await vi.importActual<typeof import("@/api/catalog-client")>(
-    "@/api/catalog-client",
-  );
-  return { ...actual, fetchCatalog: vi.fn() };
-});
-
-import * as catalogClient from "@/api/catalog-client";
-import {
-  buildCatalogResponse,
-  renderWithCatalogClient,
-} from "@/test/catalog-test-utils";
-import { SectionCard } from "./section-card";
-import type { BulletMetric, PeriodValue } from "@/types/insight";
-import { makeSession } from "@/test/session";
-
-const fetchCatalog = catalogClient.fetchCatalog as ReturnType<typeof vi.fn>;
-
-function makeBullet(overrides: Partial<BulletMetric> = {}): BulletMetric {
-  return {
-    period: "month" as PeriodValue,
-    section: "task_delivery",
-    metric_key: "tasks_completed",
-    label: "Tasks Closed",
-    value: "12",
-    unit: "tasks",
-    range_min: "0",
-    range_max: "20",
-    median: "5",
-    median_label: "",
-    bar_left_pct: 0,
-    bar_width_pct: 60,
-    median_left_pct: 25,
-    status: "good",
-    drill_id: "",
-    ...overrides,
-  };
-}
-
-describe("<SectionCard> peer-driven coloring", () => {
-  beforeEach(() => {
-    authStore.reset();
-    authStore.setAuthenticated(makeSession());
-    fetchCatalog.mockReset();
-  });
-  afterEach(() => {
-    authStore.reset();
-  });
-
-  it("colors the badge off the row's blended-department peer, headline stays the aggregate", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildCatalogResponse([
-        {
-          metric_key: "task_delivery_bullet_rows.tasks_completed",
-          higher_is_better: true,
-          schema_status: "ok",
-        },
-      ]),
-    );
-    // value 12 ≥ peer.p75 (8), higher_is_better ⇒ 'top' ⇒ good ⇒ "1 ahead of peers".
-    const row = makeBullet({
-      value: "12",
-      peer: { p25: 4, p50: 6, p75: 8, min: 2, max: 15, n: 12 },
-    });
-    renderWithCatalogClient(
-      <SectionCard
-        title="Task delivery"
-        sectionId="task_delivery"
-        rows={[row]}
-        onOpen={() => {}}
-        subtitle="vs department expectation"
-      />,
-    );
-    await waitFor(() => {
-      expect(screen.getByText("1 ahead of peers")).toBeInTheDocument();
-    });
-    // Headline reflects the team aggregate row, not the cohort.
-    expect(screen.getByText("Tasks Closed: 12 tasks")).toBeInTheDocument();
-    expect(
-      screen.getByText("vs department expectation"),
-    ).toBeInTheDocument();
-  });
-
-  it("rankByMetricKey override drives the badge, overriding the row's own peer", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildCatalogResponse([
-        {
-          metric_key: "task_delivery_bullet_rows.tasks_completed",
-          higher_is_better: true,
-          schema_status: "ok",
-        },
-      ]),
-    );
-    // No peer on the row ⇒ its own rank would be neutral ("no peer data").
-    // The team override says 'top' ⇒ badge becomes "1 ahead of peers".
-    const row = makeBullet({ value: "12", peer: undefined });
-    renderWithCatalogClient(
-      <SectionCard
-        title="Task delivery"
-        sectionId="task_delivery"
-        rows={[row]}
-        onOpen={() => {}}
-        subtitle="vs department peers"
-        rankByMetricKey={new Map([["tasks_completed", "top"]])}
-      />,
-    );
-    await waitFor(() => {
-      expect(screen.getByText("1 ahead of peers")).toBeInTheDocument();
-    });
-    expect(screen.queryByText("no peer data")).not.toBeInTheDocument();
-    // Headline still the aggregate row.
-    expect(screen.getByText("Tasks Closed: 12 tasks")).toBeInTheDocument();
-  });
-
-  it("a row with no peer scores neutral — 'no peer data' badge", async () => {
-    fetchCatalog.mockResolvedValue(
-      buildCatalogResponse([
-        {
-          metric_key: "task_delivery_bullet_rows.tasks_completed",
-          higher_is_better: true,
-          schema_status: "ok",
-        },
-      ]),
-    );
-    const row = makeBullet({ value: "12", peer: undefined });
-    renderWithCatalogClient(
-      <SectionCard
-        title="Task delivery"
-        sectionId="task_delivery"
-        rows={[row]}
-        onOpen={() => {}}
-      />,
-    );
-    await waitFor(() => {
-      expect(screen.getByText("no peer data")).toBeInTheDocument();
-    });
-  });
-});
diff --git a/src/components/widgets/v2/section-card.tsx b/src/components/widgets/v2/section-card.tsx
deleted file mode 100644
index ca1d4f96..00000000
--- a/src/components/widgets/v2/section-card.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-import { Sparkles } from "lucide-react";
-
-import { useCatalog } from "@/api/use-catalog";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import { GroupCardEmpty } from "@/components/widgets/group-card-empty";
-import { useSettings } from "@/hooks/use-settings";
-import {
-  hasBulletValue,
-  peerStatusForRow,
-  peerStatusToStatus,
-} from "@/lib/insight/v2/peer-status";
-import type { PeerStatusWithNeutral } from "@/lib/peers";
-import {
-  gradeSectionStanding,
-  pickSectionHeadline,
-  rankCounts,
-  rankableCount,
-  sectionStandingPhrase,
-  type RankedMetric,
-} from "@/lib/scoring";
-import {
-  STATUS_BG_CLASS,
-  STATUS_STRIPE_LEFT,
-  STATUS_TEXT_CLASS,
-  applyFocusStatus,
-} from "@/lib/status";
-import { cn } from "@/lib/utils";
-import type { BulletMetric } from "@/types/insight";
-
-function pickPreviewRows(
-  _sectionId: string | undefined,
-  rows: BulletMetric[],
-): BulletMetric[] {
-  return rows.filter(hasBulletValue).slice(0, 3);
-}
-
-export interface SectionCardProps {
-  title: string;
-  rows: BulletMetric[];
-  onOpen: () => void;
-  onHover?: () => void;
-  sectionId?: string;
-  subtitle?: string;
-  unavailable?: boolean;
-  /**
-   * Per-metric rank override. When supplied (team view), it replaces the
-   * single-row quartile scoring — the team card rolls up each metric from
-   * per-member-vs-own-department standings instead of comparing a team
-   * aggregate against an individual band. Absent (IC view) → the row's own
-   * cohort rank.
-   */
-  rankByMetricKey?: Map<string, PeerStatusWithNeutral>;
-}
-
-export function SectionCard({
-  title,
-  rows,
-  onOpen,
-  onHover,
-  sectionId,
-  subtitle,
-  unavailable,
-  rankByMetricKey,
-}: SectionCardProps) {
-  const { focusMode } = useSettings();
-  const { byMetricKey } = useCatalog();
-  const metricRank = (r: BulletMetric): PeerStatusWithNeutral =>
-    rankByMetricKey?.get(r.metric_key) ?? peerStatusForRow(r, byMetricKey);
-
-  if (unavailable) {
-    return (
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base font-semibold">{title}</CardTitle>
-          <CardDescription className="flex items-center gap-1.5 text-xs">
-            <Sparkles className="size-3.5 shrink-0" aria-hidden />
-            Coming soon
-          </CardDescription>
-        </CardHeader>
-        <CardContent className="pt-0">
-          <p className="text-sm text-muted-foreground">Not tracked yet.</p>
-        </CardContent>
-      </Card>
-    );
-  }
-
-  const ranked: RankedMetric<BulletMetric>[] = rows.map((r) => ({
-    row: r,
-    rank: metricRank(r),
-  }));
-  const counts = rankCounts(ranked);
-  const evaluated = rankableCount(counts);
-  const status = applyFocusStatus(gradeSectionStanding(counts), focusMode);
-  const badgeText = sectionStandingPhrase(counts);
-
-  const headline = pickSectionHeadline(ranked);
-  const unit = headline?.row.unit ?? "";
-  const summary = headline
-    ? `${headline.row.label}: ${headline.row.value}${unit ? ` ${unit}` : ""}`
-    : "No data for this period.";
-
-  const preview = pickPreviewRows(sectionId, rows);
-  const isEmpty = evaluated === 0 && preview.length === 0;
-  const stripeClass = STATUS_STRIPE_LEFT[status];
-
-  return (
-    <Card
-      // An empty card has nothing to drill into: render a plain, unfocusable
-      // div instead of a button, and drop the interactive affordances.
-      render={
-        isEmpty ? undefined : (
-          <button
-            type="button"
-            onClick={onOpen}
-            onMouseEnter={onHover}
-            onFocus={onHover}
-            aria-label={`Open ${title} details`}
-          />
-        )
-      }
-      className={cn(
-        // Header→content on the card's own 12px rhythm (the preview stack's
-        // gap-3), not the default 24px section gap.
-        "gap-3",
-        !isEmpty && "text-left transition-colors hover:bg-accent/50",
-        stripeClass,
-      )}
-    >
-      <CardHeader>
-        <CardTitle className="text-base font-semibold">{title}</CardTitle>
-        {subtitle || !isEmpty ? (
-          <CardDescription className="flex flex-col gap-1 text-xs">
-            {subtitle ? (
-              <span className="text-muted-foreground">{subtitle}</span>
-            ) : null}
-            {/* An empty card carries no standing — the badge would only
-                restate the empty state below. */}
-            {!isEmpty ? (
-              <span className="flex items-center gap-1.5">
-                <span
-                  className={cn(
-                    "size-1.5 shrink-0 rounded-full",
-                    STATUS_BG_CLASS[status],
-                  )}
-                  aria-hidden
-                />
-                <span className="tabular-nums">{badgeText}</span>
-              </span>
-            ) : null}
-          </CardDescription>
-        ) : null}
-      </CardHeader>
-      <CardContent className="flex flex-1 flex-col gap-3">
-        {isEmpty ? (
-          <GroupCardEmpty />
-        ) : (
-          <>
-            <p className="text-sm text-foreground/80">{summary}</p>
-            {preview.length > 0 ? (
-              <ul className="flex flex-col gap-1.5">
-                {preview.map((r) => {
-                  const previewStatus = applyFocusStatus(
-                    peerStatusToStatus(metricRank(r)),
-                    focusMode,
-                  );
-                  return (
-                    <li
-                      key={r.metric_key}
-                      className="flex items-center gap-2 text-sm"
-                    >
-                      <span
-                        className={cn(
-                          "size-2 shrink-0 rounded-full",
-                          STATUS_BG_CLASS[previewStatus],
-                        )}
-                        aria-hidden
-                      />
-                      <span className="min-w-0 flex-1 truncate text-muted-foreground">
-                        {r.label}
-                      </span>
-                      <span
-                        className={cn(
-                          "shrink-0 font-medium tabular-nums",
-                          STATUS_TEXT_CLASS[previewStatus],
-                        )}
-                      >
-                        {r.value}
-                        {r.unit ? (
-                          <span className="ml-0.5 text-xs text-muted-foreground">
-                            {r.unit}
-                          </span>
-                        ) : null}
-                      </span>
-                    </li>
-                  );
-                })}
-              </ul>
-            ) : null}
-          </>
-        )}
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/src/components/widgets/v2/section-trend.tsx b/src/components/widgets/v2/section-trend.tsx
deleted file mode 100644
index 2ddf8530..00000000
--- a/src/components/widgets/v2/section-trend.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import { ComingSoon } from "@/components/widgets/coming-soon";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import {
-  CartesianGrid,
-  ChartArea,
-  ChartContainer,
-  ChartLegend,
-  ChartLegendContent,
-  ChartLine,
-  ChartTooltip,
-  ChartTooltipContent,
-  ComposedChart,
-  ReferenceLine,
-  type ChartConfig,
-  XAxis,
-  YAxis,
-} from "@/components/ui/chart";
-import { Skeleton } from "@/components/ui/skeleton";
-
-export type SectionTrendSeries = {
-  key: string;
-  label: string;
-  type?: "line" | "area" | "stacked-area";
-  yAxisId?: "left" | "right";
-};
-
-export type SectionTrendPoint = {
-  date: string;
-  [seriesKey: string]: number | string;
-};
-
-export interface SectionTrendProps {
-  title: string;
-  description?: string;
-  series: SectionTrendSeries[];
-  data: SectionTrendPoint[];
-  targetLine?: { value: number; label: string };
-  rightAxis?: boolean;
-  height?: number;
-  isPending?: boolean;
-  isError?: boolean;
-  onRetry?: () => void;
-}
-
-const DEFAULT_CHART_KEYS = ["chart-1", "chart-2", "chart-3", "chart-4", "chart-5"];
-
-export function SectionTrend({
-  title,
-  description,
-  series,
-  data,
-  targetLine,
-  rightAxis,
-  height = 180,
-  isPending,
-  isError,
-  onRetry,
-}: SectionTrendProps) {
-  if (isPending) {
-    return <Skeleton className="h-48 w-full rounded-lg" />;
-  }
-  if (isError) {
-    return (
-      <ComingSoon
-        state="error"
-        label={`${title} — unable to load`}
-        onRetry={onRetry}
-      />
-    );
-  }
-  if (data.length === 0) {
-    return (
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-sm font-semibold">{title}</CardTitle>
-          <CardDescription>No trend data yet.</CardDescription>
-        </CardHeader>
-      </Card>
-    );
-  }
-
-  const config: ChartConfig = Object.fromEntries(
-    series.map((s, i) => [
-      s.key,
-      { label: s.label, color: `var(--${DEFAULT_CHART_KEYS[i % DEFAULT_CHART_KEYS.length]})` },
-    ]),
-  );
-
-  return (
-    <Card>
-      <CardHeader className="pb-2">
-        <CardTitle className="text-sm font-semibold">{title}</CardTitle>
-        {description ? (
-          <CardDescription className="text-xs">{description}</CardDescription>
-        ) : null}
-      </CardHeader>
-      <CardContent>
-        <ChartContainer
-          config={config}
-          className="w-full"
-          style={{ height }}
-        >
-          <ComposedChart data={data} margin={{ top: 8, right: 8, left: 0, bottom: 0 }}>
-            <CartesianGrid strokeDasharray="3 3" stroke="var(--border)" />
-            <XAxis
-              dataKey="date"
-              tick={{ fontSize: 10, fill: "var(--muted-foreground)" }}
-              tickLine={false}
-              axisLine={false}
-              interval="preserveStartEnd"
-            />
-            <YAxis
-              yAxisId="left"
-              tick={{ fontSize: 10, fill: "var(--muted-foreground)" }}
-              tickLine={false}
-              axisLine={false}
-            />
-            {rightAxis ? (
-              <YAxis
-                yAxisId="right"
-                orientation="right"
-                tick={{ fontSize: 10, fill: "var(--muted-foreground)" }}
-                tickLine={false}
-                axisLine={false}
-                width={28}
-              />
-            ) : null}
-            <ChartTooltip content={<ChartTooltipContent />} />
-            <ChartLegend content={<ChartLegendContent />} />
-            {targetLine ? (
-              <ReferenceLine
-                yAxisId="left"
-                y={targetLine.value}
-                stroke="var(--success)"
-                strokeDasharray="4 4"
-                label={{
-                  value: targetLine.label,
-                  position: "right",
-                  fontSize: 10,
-                  fill: "var(--success)",
-                }}
-              />
-            ) : null}
-            {series.map((s) => {
-              const yAxisId = s.yAxisId ?? "left";
-              const color = `var(--color-${s.key})`;
-              if (s.type === "area" || s.type === "stacked-area") {
-                return (
-                  <ChartArea
-                    key={s.key}
-                    yAxisId={yAxisId}
-                    type="monotone"
-                    dataKey={s.key}
-                    name={s.label}
-                    stackId={s.type === "stacked-area" ? "stack" : undefined}
-                    stroke={color}
-                    fill={color}
-                    fillOpacity={0.25}
-                    strokeWidth={2}
-                  />
-                );
-              }
-              return (
-                <ChartLine
-                  key={s.key}
-                  yAxisId={yAxisId}
-                  type="monotone"
-                  dataKey={s.key}
-                  name={s.label}
-                  stroke={color}
-                  strokeWidth={2}
-                  dot={false}
-                />
-              );
-            })}
-          </ComposedChart>
-        </ChartContainer>
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/src/components/widgets/v2/treemap-composition.tsx b/src/components/widgets/v2/treemap-composition.tsx
deleted file mode 100644
index 15888552..00000000
--- a/src/components/widgets/v2/treemap-composition.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import { ComingSoon } from "@/components/widgets/coming-soon";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import {
-  ChartContainer,
-  ChartTreemap,
-  ChartTooltip,
-  ChartTooltipContent,
-  type ChartConfig,
-} from "@/components/ui/chart";
-import { Skeleton } from "@/components/ui/skeleton";
-import type { CompositionRow } from "@/queries/v2/ic-extras";
-
-const CHART_CONFIG: ChartConfig = {
-  value: { label: "Value", color: "var(--chart-1)" },
-};
-
-const PALETTE = [
-  "var(--chart-1)",
-  "var(--chart-2)",
-  "var(--chart-3)",
-  "var(--chart-4)",
-  "var(--chart-5)",
-];
-
-interface TreemapNodeProps {
-  x?: number;
-  y?: number;
-  width?: number;
-  height?: number;
-  index?: number;
-  name?: string;
-  value?: number;
-}
-
-function TreemapCell({
-  x = 0,
-  y = 0,
-  width = 0,
-  height = 0,
-  index = 0,
-  name,
-  value,
-}: TreemapNodeProps) {
-  const showLabel = width > 60 && height > 28;
-  return (
-    <g>
-      <rect
-        x={x}
-        y={y}
-        width={width}
-        height={height}
-        fill={PALETTE[index % PALETTE.length]}
-        stroke="var(--background)"
-        strokeWidth={2}
-        rx={4}
-      />
-      {showLabel && name ? (
-        <text
-          x={x + 8}
-          y={y + 18}
-          fontSize={11}
-          fontWeight={600}
-          fill="var(--background)"
-        >
-          {name}
-        </text>
-      ) : null}
-      {showLabel && value != null && height > 44 ? (
-        <text
-          x={x + 8}
-          y={y + 34}
-          fontSize={11}
-          fill="var(--background)"
-          opacity={0.85}
-        >
-          {value}
-        </text>
-      ) : null}
-    </g>
-  );
-}
-
-export interface TreemapCompositionProps {
-  title: string;
-  description?: string;
-  rows: CompositionRow[];
-  isPending?: boolean;
-  isError?: boolean;
-  onRetry?: () => void;
-}
-
-export function TreemapComposition({
-  title,
-  description,
-  rows,
-  isPending,
-  isError,
-  onRetry,
-}: TreemapCompositionProps) {
-  if (isPending) {
-    return <Skeleton className="h-48 w-full rounded-lg" />;
-  }
-  if (isError) {
-    return (
-      <ComingSoon
-        state="error"
-        label={`${title} — unable to load`}
-        onRetry={onRetry}
-      />
-    );
-  }
-  if (rows.length === 0) {
-    return (
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-sm font-semibold">{title}</CardTitle>
-          <CardDescription>No composition data yet.</CardDescription>
-        </CardHeader>
-      </Card>
-    );
-  }
-  return (
-    <Card>
-      <CardHeader className="pb-2">
-        <CardTitle className="text-sm font-semibold">{title}</CardTitle>
-        {description ? (
-          <CardDescription className="text-xs">{description}</CardDescription>
-        ) : null}
-      </CardHeader>
-      <CardContent>
-        <ChartContainer config={CHART_CONFIG} className="h-48 w-full">
-          <ChartTreemap
-            data={rows as unknown as Record<string, unknown>[]}
-            dataKey="value"
-            nameKey="name"
-            stroke="var(--background)"
-            content={<TreemapCell />}
-          >
-            <ChartTooltip
-              content={<ChartTooltipContent hideIndicator />}
-            />
-          </ChartTreemap>
-        </ChartContainer>
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/src/components/widgets/view-mode-toggle.tsx b/src/components/widgets/view-mode-toggle.tsx
deleted file mode 100644
index 65eb33b1..00000000
--- a/src/components/widgets/view-mode-toggle.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { LayoutGrid, Rows3 } from "lucide-react";
-
-import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
-import type { ViewMode } from "@/types/insight";
-
-export interface ViewModeToggleProps {
-  mode: ViewMode;
-  onChange: (mode: ViewMode) => void;
-}
-
-export function ViewModeToggle({ mode, onChange }: ViewModeToggleProps) {
-  return (
-    <ToggleGroup
-      value={[mode]}
-      onValueChange={(values) => {
-        const next = Array.isArray(values) ? values[0] : values;
-        if (next === "chart" || next === "tile") onChange(next);
-      }}
-      variant="outline"
-      size="default"
-      className="hidden sm:flex"
-    >
-      <ToggleGroupItem value="chart" className="gap-1.5">
-        <Rows3 className="size-4" />
-        Charts
-      </ToggleGroupItem>
-      <ToggleGroupItem value="tile" className="gap-1.5">
-        <LayoutGrid className="size-4" />
-        Tiles
-      </ToggleGroupItem>
-    </ToggleGroup>
-  );
-}
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 09f37159..823a6eab 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -1,6 +1,3 @@
-export const MS_PER_DAY = 86_400_000;
 
 export const LOCALE = "en-US";
 
-export const HERO_COLLAPSED_ITEMS = 3;
-export const HERO_EXPANDED_ITEMS = 6;
diff --git a/src/hooks/use-period.test.ts b/src/hooks/use-period.test.ts
index 442f4c43..bfe3e649 100644
--- a/src/hooks/use-period.test.ts
+++ b/src/hooks/use-period.test.ts
@@ -1,8 +1,8 @@
 /**
- * Unit coverage for the period/view-mode store (`src/hooks/use-period.ts`):
- * module-init validation of persisted localStorage values, the
- * usePeriod/useViewMode hooks, current* snapshot accessors, persistence
- * on set, and the best-effort catch when localStorage writes throw.
+ * Unit coverage for the period store (`src/hooks/use-period.ts`):
+ * module-init validation of persisted localStorage values, the usePeriod
+ * hook, persistence on set, and the best-effort catch when localStorage
+ * writes throw.
  *
  * The store keeps module-level state, so each test re-imports a fresh
  * copy via `vi.resetModules()` + dynamic import.
@@ -13,7 +13,6 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 const PERIOD_KEY = "insight.period";
 const CUSTOM_KEY = "insight.period.custom";
-const VIEW_MODE_KEY = "insight.view-mode";
 const ISO = /^\d{4}-\d{2}-\d{2}$/;
 
 async function freshModule() {
@@ -21,47 +20,47 @@ async function freshModule() {
   return import("@/hooks/use-period");
 }
 
+/** Module-init state as the only consumer sees it — through the hook. */
+async function freshState() {
+  const mod = await freshModule();
+  const { result } = renderHook(() => mod.usePeriod());
+  return result.current;
+}
+
 describe("use-period store init", () => {
   beforeEach(() => {
     window.localStorage.clear();
     vi.restoreAllMocks();
   });
 
-  it("defaults to month / chart / no custom range with empty storage", async () => {
-    const mod = await freshModule();
-    expect(mod.currentPeriod()).toBe("month");
-    expect(mod.currentCustomRange()).toBeNull();
-    expect(mod.currentViewMode()).toBe("chart");
+  it("defaults to month / no custom range with empty storage", async () => {
+    const state = await freshState();
+    expect(state.period).toBe("month");
+    expect(state.customRange).toBeNull();
   });
 
-  it("restores valid persisted period, custom range, and view mode", async () => {
+  it("restores valid persisted period and custom range", async () => {
     window.localStorage.setItem(PERIOD_KEY, "quarter");
     window.localStorage.setItem(
       CUSTOM_KEY,
       JSON.stringify({ from: "2026-01-01", to: "2026-01-31" }),
     );
-    window.localStorage.setItem(VIEW_MODE_KEY, "tile");
-    const mod = await freshModule();
-    expect(mod.currentPeriod()).toBe("quarter");
-    expect(mod.currentCustomRange()).toEqual({
+    const state = await freshState();
+    expect(state.period).toBe("quarter");
+    expect(state.customRange).toEqual({
       from: "2026-01-01",
       to: "2026-01-31",
     });
-    expect(mod.currentViewMode()).toBe("tile");
   });
 
-  it("ignores invalid persisted period and view mode", async () => {
+  it("ignores an invalid persisted period", async () => {
     window.localStorage.setItem(PERIOD_KEY, "decade");
-    window.localStorage.setItem(VIEW_MODE_KEY, "hologram");
-    const mod = await freshModule();
-    expect(mod.currentPeriod()).toBe("month");
-    expect(mod.currentViewMode()).toBe("chart");
+    expect((await freshState()).period).toBe("month");
   });
 
   it("rejects a custom range that is not valid JSON", async () => {
     window.localStorage.setItem(CUSTOM_KEY, "{nope");
-    const mod = await freshModule();
-    expect(mod.currentCustomRange()).toBeNull();
+    expect((await freshState()).customRange).toBeNull();
   });
 
   it("rejects a custom range with malformed dates", async () => {
@@ -69,8 +68,7 @@ describe("use-period store init", () => {
       CUSTOM_KEY,
       JSON.stringify({ from: "01/02/2026", to: "2026-02-01" }),
     );
-    const mod = await freshModule();
-    expect(mod.currentCustomRange()).toBeNull();
+    expect((await freshState()).customRange).toBeNull();
   });
 
   it("rejects a custom range where from is after to", async () => {
@@ -78,8 +76,7 @@ describe("use-period store init", () => {
       CUSTOM_KEY,
       JSON.stringify({ from: "2026-03-01", to: "2026-02-01" }),
     );
-    const mod = await freshModule();
-    expect(mod.currentCustomRange()).toBeNull();
+    expect((await freshState()).customRange).toBeNull();
   });
 });
 
@@ -115,7 +112,6 @@ describe("usePeriod", () => {
     });
     expect(result.current.period).toBe("week");
     expect(result.current.customRange).toBeNull();
-    expect(mod.currentPeriod()).toBe("week");
     expect(window.localStorage.getItem(PERIOD_KEY)).toBe("week");
     // Clearing the range removes the persisted custom key.
     expect(window.localStorage.getItem(CUSTOM_KEY)).toBeNull();
@@ -131,8 +127,6 @@ describe("usePeriod", () => {
     });
     expect(result.current.customRange).toEqual(range);
     expect(result.current.dateRange).toEqual(range);
-    expect(mod.currentCustomRange()).toEqual(range);
-    expect(mod.currentDateRange()).toEqual(range);
     expect(JSON.parse(window.localStorage.getItem(CUSTOM_KEY) ?? "")).toEqual(
       range,
     );
@@ -154,26 +148,6 @@ describe("usePeriod", () => {
       result.current.setPeriod("year");
     });
     expect(result.current.period).toBe("year");
-    expect(mod.currentPeriod()).toBe("year");
   });
 });
 
-describe("useViewMode", () => {
-  beforeEach(() => {
-    window.localStorage.clear();
-    vi.restoreAllMocks();
-  });
-
-  it("toggles the view mode and persists it", async () => {
-    const mod = await freshModule();
-    const { result } = renderHook(() => mod.useViewMode());
-    expect(result.current.viewMode).toBe("chart");
-
-    act(() => {
-      result.current.setViewMode("tile");
-    });
-    expect(result.current.viewMode).toBe("tile");
-    expect(mod.currentViewMode()).toBe("tile");
-    expect(window.localStorage.getItem(VIEW_MODE_KEY)).toBe("tile");
-  });
-});
diff --git a/src/hooks/use-period.ts b/src/hooks/use-period.ts
index c5c87847..d9cdf372 100644
--- a/src/hooks/use-period.ts
+++ b/src/hooks/use-period.ts
@@ -5,10 +5,9 @@ import {
   type DateRange,
   validateDateRange,
 } from "@/api/period-to-date-range";
-import type { CustomRange, PeriodValue, ViewMode } from "@/types/insight";
+import type { CustomRange, PeriodValue } from "@/types/insight";
 
 const PERIOD_KEY = "insight.period";
-const VIEW_MODE_KEY = "insight.view-mode";
 
 const VALID_PERIODS: ReadonlySet<PeriodValue> = new Set([
   "week",
@@ -16,18 +15,14 @@ const VALID_PERIODS: ReadonlySet<PeriodValue> = new Set([
   "quarter",
   "year",
 ]);
-const VALID_VIEW_MODES: ReadonlySet<ViewMode> = new Set(["chart", "tile"]);
-
 type PersistedState = {
   period: PeriodValue;
   customRange: CustomRange | null;
-  viewMode: ViewMode;
 };
 
 const DEFAULT_STATE: PersistedState = {
   period: "month",
   customRange: null,
-  viewMode: "chart",
 };
 
 function readPeriod(): PeriodValue {
@@ -62,19 +57,9 @@ function readCustomRange(): CustomRange | null {
   return null;
 }
 
-function readViewMode(): ViewMode {
-  if (typeof window === "undefined") return DEFAULT_STATE.viewMode;
-  const raw = window.localStorage.getItem(VIEW_MODE_KEY);
-  if (raw && VALID_VIEW_MODES.has(raw as ViewMode)) {
-    return raw as ViewMode;
-  }
-  return DEFAULT_STATE.viewMode;
-}
-
 let state: PersistedState = {
   period: readPeriod(),
   customRange: readCustomRange(),
-  viewMode: readViewMode(),
 };
 
 const listeners = new Set<() => void>();
@@ -103,7 +88,6 @@ function setState(next: Partial<PersistedState>): void {
       } else {
         window.localStorage.removeItem(`${PERIOD_KEY}.custom`);
       }
-      window.localStorage.setItem(VIEW_MODE_KEY, state.viewMode);
     } catch {
       // localStorage may be unavailable (private mode, quota exceeded).
       // The in-memory state already mutated, so persistence is best-effort.
@@ -116,22 +100,6 @@ function getSnapshot(): PersistedState {
   return state;
 }
 
-export function currentPeriod(): PeriodValue {
-  return state.period;
-}
-
-export function currentCustomRange(): CustomRange | null {
-  return state.customRange;
-}
-
-export function currentDateRange(): DateRange {
-  return resolveDateRange(state.period, state.customRange);
-}
-
-export function currentViewMode(): ViewMode {
-  return state.viewMode;
-}
-
 export function usePeriod(): {
   period: PeriodValue;
   customRange: CustomRange | null;
@@ -155,14 +123,3 @@ export function usePeriod(): {
     },
   };
 }
-
-export function useViewMode(): {
-  viewMode: ViewMode;
-  setViewMode: (mode: ViewMode) => void;
-} {
-  const snap = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-  return {
-    viewMode: snap.viewMode,
-    setViewMode: (viewMode) => setState({ viewMode }),
-  };
-}
diff --git a/src/lib/chart-tooltip.ts b/src/lib/chart-tooltip.ts
deleted file mode 100644
index fa92721e..00000000
--- a/src/lib/chart-tooltip.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { CSSProperties } from "react";
-
-export const tooltipContentStyle: CSSProperties = {
-  fontSize: 12,
-  background: "var(--popover)",
-  color: "var(--popover-foreground)",
-  border: "1px solid var(--border)",
-  borderRadius: 6,
-};
-
-export const tooltipLabelStyle: CSSProperties = {
-  color: "var(--popover-foreground)",
-  fontWeight: 600,
-};
-
-export const tooltipItemStyle: CSSProperties = {
-  color: "var(--popover-foreground)",
-};
diff --git a/src/lib/feature-flags.test.ts b/src/lib/feature-flags.test.ts
deleted file mode 100644
index 8327027d..00000000
--- a/src/lib/feature-flags.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Unit coverage for the metrics-v2 feature-flag store
- * (`src/lib/feature-flags.ts`): default-on state, get/set, subscriber
- * notification through the hook, and the deliberate absence of
- * persistence across reloads (localStorage is never touched).
- *
- * The store keeps module-level state, so each test re-imports a fresh
- * copy via `vi.resetModules()` + dynamic import.
- */
-
-import { act, renderHook } from "@testing-library/react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const STORAGE_KEY = "insight.metrics-v2";
-
-async function freshModule() {
-  vi.resetModules();
-  return import("@/lib/feature-flags");
-}
-
-describe("feature-flags", () => {
-  beforeEach(() => {
-    window.localStorage.clear();
-    vi.restoreAllMocks();
-  });
-
-  it("defaults to enabled", async () => {
-    const mod = await freshModule();
-    expect(mod.isMetricsV2Enabled()).toBe(true);
-  });
-
-  it("ignores any persisted localStorage value at module init", async () => {
-    window.localStorage.setItem(STORAGE_KEY, "false");
-    const mod = await freshModule();
-    expect(mod.isMetricsV2Enabled()).toBe(true);
-  });
-
-  it("setMetricsV2Enabled updates state without persisting to localStorage", async () => {
-    const mod = await freshModule();
-    mod.setMetricsV2Enabled(false);
-    expect(mod.isMetricsV2Enabled()).toBe(false);
-    expect(window.localStorage.getItem(STORAGE_KEY)).toBeNull();
-
-    mod.setMetricsV2Enabled(true);
-    expect(mod.isMetricsV2Enabled()).toBe(true);
-    expect(window.localStorage.getItem(STORAGE_KEY)).toBeNull();
-  });
-
-  it("a fresh module load resets the flag to enabled (no persistence)", async () => {
-    const mod = await freshModule();
-    mod.setMetricsV2Enabled(false);
-    expect(mod.isMetricsV2Enabled()).toBe(false);
-
-    const reloaded = await freshModule();
-    expect(reloaded.isMetricsV2Enabled()).toBe(true);
-  });
-
-  it("useMetricsV2Enabled re-renders subscribers on change", async () => {
-    const mod = await freshModule();
-    const { result, unmount } = renderHook(() => mod.useMetricsV2Enabled());
-    expect(result.current).toBe(true);
-
-    act(() => {
-      mod.setMetricsV2Enabled(false);
-    });
-    expect(result.current).toBe(false);
-
-    // Unsubscribe path: further sets after unmount must not throw.
-    unmount();
-    act(() => {
-      mod.setMetricsV2Enabled(true);
-    });
-    expect(mod.isMetricsV2Enabled()).toBe(true);
-  });
-});
diff --git a/src/lib/feature-flags.ts b/src/lib/feature-flags.ts
deleted file mode 100644
index 80f7fc4e..00000000
--- a/src/lib/feature-flags.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useSyncExternalStore } from "react";
-
-// In-memory only by design: the toggle defaults to the new design on
-// every page load and must not persist across reloads.
-let state = true;
-const listeners = new Set<() => void>();
-
-function subscribe(fn: () => void): () => void {
-  listeners.add(fn);
-  return () => {
-    listeners.delete(fn);
-  };
-}
-
-function getSnapshot(): boolean {
-  return state;
-}
-
-export function isMetricsV2Enabled(): boolean {
-  return state;
-}
-
-export function setMetricsV2Enabled(enabled: boolean): void {
-  state = enabled;
-  for (const fn of listeners) fn();
-}
-
-export function useMetricsV2Enabled(): boolean {
-  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-}
diff --git a/src/lib/format.test.ts b/src/lib/format.test.ts
index 581a0b20..d28ec2c6 100644
--- a/src/lib/format.test.ts
+++ b/src/lib/format.test.ts
@@ -1,76 +1,12 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 
 import {
-  diffDaysInclusive,
-  formatCurrencyCompact,
-  formatDate,
-  formatDeltaPct,
-  formatHours,
   formatMetricNumber,
   formatMetricValue,
-  formatNumber,
-  formatNumberWithUnit,
-  formatPercent,
-  formatPeriodProgress,
   formatPp,
-  formatRange,
-  formatWinRate,
-  isFillerUnit,
   metricDisplayUnit,
-  parseISODate,
-  toLocalISODate,
 } from "@/lib/format";
 
-describe("isFillerUnit", () => {
-  it("recognizes filler units and rejects everything else", () => {
-    expect(isFillerUnit("tasks")).toBe(true);
-    expect(isFillerUnit("LOC")).toBe(true);
-    expect(isFillerUnit("%")).toBe(false);
-    expect(isFillerUnit(undefined)).toBe(false);
-  });
-});
-
-describe("formatNumber", () => {
-  it("renders an em-dash for null / undefined / NaN", () => {
-    expect(formatNumber(null)).toBe("—");
-    expect(formatNumber(undefined)).toBe("—");
-    expect(formatNumber(Number.NaN)).toBe("—");
-  });
-
-  it("compacts values at or above 10k with a trimmed k suffix", () => {
-    expect(formatNumber(12_345)).toBe("12.3k");
-    expect(formatNumber(10_000)).toBe("10k");
-  });
-
-  it("rounds integer-unit values with thousands grouping", () => {
-    expect(formatNumber(1234.6, "tasks")).toBe("1,235");
-    expect(formatNumber(3.4, "count")).toBe("3");
-  });
-
-  it("groups thousands for unitless values at or above 1000", () => {
-    expect(formatNumber(1234.4, "h")).toBe("1,234");
-  });
-
-  it("drops decimals from 100 upward and keeps one below", () => {
-    expect(formatNumber(123.45, "h")).toBe("123");
-    expect(formatNumber(12.34, "h")).toBe("12.3");
-    expect(formatNumber(5, "h")).toBe("5");
-  });
-});
-
-describe("formatNumberWithUnit", () => {
-  it("passes through when there is no unit or no value", () => {
-    expect(formatNumberWithUnit(5)).toBe("5");
-    expect(formatNumberWithUnit(null, "%")).toBe("—");
-  });
-
-  it("suppresses filler units, glues %, and spaces the rest", () => {
-    expect(formatNumberWithUnit(5, "tasks")).toBe("5");
-    expect(formatNumberWithUnit(5, "%")).toBe("5%");
-    expect(formatNumberWithUnit(5, "h")).toBe("5 h");
-  });
-});
-
 describe("formatMetricNumber / formatMetricValue / metricDisplayUnit", () => {
   it("formats currency without fraction digits", () => {
     expect(formatMetricNumber(1234, "currency")).toBe("$1,234");
@@ -97,92 +33,11 @@ describe("formatMetricNumber / formatMetricValue / metricDisplayUnit", () => {
 });
 
 describe("small formatters", () => {
-  it("formatPercent respects the decimals argument", () => {
-    expect(formatPercent(12.345)).toBe("12%");
-    expect(formatPercent(12.345, 1)).toBe("12.3%");
-  });
-
-  it("formatHours suffixes h", () => {
-    expect(formatHours(7)).toBe("7h");
-    expect(formatHours(7.25, 1)).toBe("7.3h");
-  });
-
   it("formatPp signs the difference and always shows points", () => {
     expect(formatPp(2.5)).toBe("+2.5 pp");
     expect(formatPp(-2.5)).toBe("-2.5 pp");
     expect(formatPp(0)).toBe("0.0 pp");
   });
 
-  it("formatCurrencyCompact picks $M / $k / $ bands", () => {
-    expect(formatCurrencyCompact(2_500_000)).toBe("$2.50M");
-    expect(formatCurrencyCompact(12_000)).toBe("$12k");
-    expect(formatCurrencyCompact(500)).toBe("$500");
-  });
-
-  it("formatWinRate renders pct with the fraction, em-dash on empty", () => {
-    expect(formatWinRate(5, 10)).toBe("50% (5/10)");
-    expect(formatWinRate(0, 0)).toBe("—");
-  });
-
-  it("formatDeltaPct signs the relative change and refuses a non-positive base", () => {
-    expect(formatDeltaPct(110, 100)).toBe("+10%");
-    expect(formatDeltaPct(90, 100)).toBe("-10%");
-    expect(formatDeltaPct(5, 0)).toBeNull();
-  });
-});
-
-describe("date helpers", () => {
-  it("toLocalISODate zero-pads the local date", () => {
-    expect(toLocalISODate(new Date(2026, 0, 5))).toBe("2026-01-05");
-  });
-
-  it("parseISODate parses into local time", () => {
-    const d = parseISODate("2026-01-05");
-    expect(d.getFullYear()).toBe(2026);
-    expect(d.getMonth()).toBe(0);
-    expect(d.getDate()).toBe(5);
-  });
-
-  it("formatDate renders the default and custom patterns", () => {
-    expect(formatDate("2026-01-05")).toBe("5 Jan");
-    expect(formatDate("2026-01-05", "yyyy-MM")).toBe("2026-01");
-  });
-
-  it("formatRange renders both edges with the inclusive day count", () => {
-    expect(formatRange("2026-01-01", "2026-01-07")).toBe("1 Jan – 7 Jan (7d)");
-  });
-
-  it("diffDaysInclusive counts both endpoints", () => {
-    expect(diffDaysInclusive("2026-01-01", "2026-01-07")).toBe(7);
-    expect(diffDaysInclusive("2026-01-01", "2026-01-01")).toBe(1);
-  });
 });
 
-describe("formatPeriodProgress", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    vi.setSystemTime(new Date(2026, 5, 10, 12, 0, 0)); // local 2026-06-10
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
-  it("reports elapsed days within the period", () => {
-    expect(formatPeriodProgress("2026-06-01", "2026-06-30")).toBe(
-      "Day 10 of 30",
-    );
-  });
-
-  it("clamps to zero before the period starts", () => {
-    expect(formatPeriodProgress("2026-07-01", "2026-07-31")).toBe(
-      "Day 0 of 31",
-    );
-  });
-
-  it("clamps to the total after the period ends", () => {
-    expect(formatPeriodProgress("2026-05-01", "2026-05-31")).toBe(
-      "Day 31 of 31",
-    );
-  });
-});
diff --git a/src/lib/format.ts b/src/lib/format.ts
index 78114c0e..c37a4cf3 100644
--- a/src/lib/format.ts
+++ b/src/lib/format.ts
@@ -1,4 +1,4 @@
-import { differenceInDays, format, parse, parseISO } from "date-fns";
+import { format, parseISO } from "date-fns";
 import { enUS } from "date-fns/locale";
 
 import type { MetricFormat } from "@/api/metric-results-client";
@@ -6,69 +6,6 @@ import { LOCALE } from "@/config/constants";
 
 const NF_THOUSANDS = new Intl.NumberFormat(LOCALE);
 
-const INTEGER_UNITS = new Set<string>([
-  "",
-  "%",
-  "count",
-  "tasks",
-  "meetings",
-  "messages",
-  "messages/day",
-  "emails",
-  "files",
-  "days",
-  "lines",
-]);
-
-export const FILLER_UNITS = new Set([
-  "count",
-  "tasks",
-  "messages",
-  "meetings",
-  "emails",
-  "files",
-  "lines",
-  "LOC",
-]);
-
-const EM_DASH = "—";
-
-function isIntegerUnit(unit?: string): boolean {
-  return unit != null && INTEGER_UNITS.has(unit);
-}
-
-function trimTrailingZero(s: string): string {
-  return s.endsWith(".0") ? s.slice(0, -2) : s;
-}
-
-export function isFillerUnit(unit?: string): boolean {
-  return unit != null && FILLER_UNITS.has(unit);
-}
-
-export function formatNumber(
-  v: number | null | undefined,
-  unit?: string,
-): string {
-  if (v == null || Number.isNaN(v)) return EM_DASH;
-  const abs = Math.abs(v);
-  const integer = isIntegerUnit(unit);
-  if (abs >= 10_000) return `${trimTrailingZero((v / 1000).toFixed(1))}k`;
-  if (integer) return NF_THOUSANDS.format(Math.round(v));
-  if (abs >= 1000) return NF_THOUSANDS.format(Math.round(v));
-  if (abs >= 100) return v.toFixed(0);
-  return trimTrailingZero(v.toFixed(1));
-}
-
-export function formatNumberWithUnit(
-  v: number | null | undefined,
-  unit?: string,
-): string {
-  const s = formatNumber(v, unit);
-  if (!unit || s === EM_DASH) return s;
-  if (FILLER_UNITS.has(unit)) return s;
-  return unit === "%" ? `${s}%` : `${s} ${unit}`;
-}
-
 const METRIC_CURRENCY_FORMAT = new Intl.NumberFormat(LOCALE, {
   style: "currency",
   currency: "USD",
@@ -110,14 +47,6 @@ export function metricDisplayUnit(
   return unit ?? undefined;
 }
 
-export function formatPercent(v: number, decimals = 0): string {
-  return `${v.toFixed(decimals)}%`;
-}
-
-export function formatHours(v: number, decimals = 0): string {
-  return `${v.toFixed(decimals)}h`;
-}
-
 /**
  * Ratio at/above which a runaway signed percent ("+300%", "+5460%") renders
  * as a multiple instead — shared by the vs-median gap and the
@@ -136,61 +65,7 @@ export function formatPp(diff: number, decimals = 1): string {
   return `${sign}${Math.abs(diff).toFixed(decimals)} pp`;
 }
 
-export function formatCurrencyCompact(v: number): string {
-  const abs = Math.abs(v);
-  if (abs >= 1_000_000) return `$${(v / 1_000_000).toFixed(2)}M`;
-  if (abs >= 1_000) return `$${(v / 1_000).toFixed(0)}k`;
-  return `$${v.toFixed(0)}`;
-}
-
-export function formatWinRate(won: number, closed: number): string {
-  if (closed <= 0) return "—";
-  const pct = (won / closed) * 100;
-  const fmt = NF_THOUSANDS.format(Math.round(won));
-  const tot = NF_THOUSANDS.format(Math.round(closed));
-  return `${pct.toFixed(0)}% (${fmt}/${tot})`;
-}
-
-export function formatPeriodProgress(from: string, to: string): string {
-  // `new Date("YYYY-MM-DD")` parses as UTC midnight, but `new Date()` is the
-  // local clock — subtracting them produces off-by-one results for users
-  // outside UTC near the day boundary. Route everything through the existing
-  // local-aware helpers (`parseISODate` + `toLocalISODate`) so all three
-  // dates share the same reference frame.
-  const totalDays = Math.max(1, diffDaysInclusive(from, to));
-  const todayIso = toLocalISODate(new Date());
-  const elapsedRaw = diffDaysInclusive(from, todayIso);
-  const elapsedDays = Math.max(0, Math.min(totalDays, elapsedRaw));
-  return `Day ${elapsedDays} of ${totalDays}`;
-}
-
-export function formatDeltaPct(cur: number, prev: number): string | null {
-  if (prev <= 0) return null;
-  const diff = ((cur - prev) / prev) * 100;
-  const sign = diff >= 0 ? "+" : "";
-  return `${sign}${diff.toFixed(0)}%`;
-}
-
-export function toLocalISODate(d: Date): string {
-  const y = d.getFullYear();
-  const m = String(d.getMonth() + 1).padStart(2, "0");
-  const day = String(d.getDate()).padStart(2, "0");
-  return `${y}-${m}-${day}`;
-}
-
-export function parseISODate(iso: string): Date {
-  return parse(iso, "yyyy-MM-dd", new Date());
-}
-
 export function formatDate(iso: string, pattern = "d MMM"): string {
   return format(parseISO(iso), pattern, { locale: enUS });
 }
 
-export function formatRange(from: string, to: string): string {
-  const days = diffDaysInclusive(from, to);
-  return `${formatDate(from)} – ${formatDate(to)} (${days}d)`;
-}
-
-export function diffDaysInclusive(from: string, to: string): number {
-  return differenceInDays(parseISODate(to), parseISODate(from)) + 1;
-}
diff --git a/src/lib/insight/attention.test.ts b/src/lib/insight/attention.test.ts
index 0afdffe1..43962d26 100644
--- a/src/lib/insight/attention.test.ts
+++ b/src/lib/insight/attention.test.ts
@@ -35,7 +35,6 @@ function aiMetric(value: number | null): MetricResult {
 }
 
 const AI_DEF: MetricGroup = {
-  kind: "metrics",
   id: "ai_adoption",
   title: "AI adoption",
   collection: {
diff --git a/src/lib/insight/bullet-layout-groups.ts b/src/lib/insight/bullet-layout-groups.ts
deleted file mode 100644
index 010d0423..00000000
--- a/src/lib/insight/bullet-layout-groups.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Sub-grouping for legacy v1 bullet layouts (Refs #82 — extracted from
- * the deleted `threshold-config.ts`).
- *
- * UI composition picks metrics by group name instead of hand-maintained
- * `metric_key` arrays sprinkled through screen components. Group names
- * are scoped by section — they only need to be unique within one
- * section. This is FE-only layout metadata (not metric metadata): the
- * wire response carries metric labels / sublabels / thresholds; how a
- * v1 screen arranges those bullets into columns lives here.
- *
- * Only sections that use sub-grouping have entries: `estimation`
- * (3 groups), `ai_adoption` (7 groups), `collaboration` (4 groups by
- * activity type: chat / email / meetings / files). `task_delivery`,
- * `git_output`, `code_quality` don't sub-group.
- *
- * Used by `engineering-dashboard.tsx` (v1 IC) and
- * `team-bullet-sections.tsx` (v1 team). The v2 surfaces in
- * `src/lib/insight/v2/` use a different composition model and don't
- * read this map.
- */
-
-import type { BulletMetric } from '@/types/insight';
-
-export const BULLET_LAYOUT_GROUPS: Record<string, string> = {
-  estimation_accuracy: 'estimate_accuracy',
-  overrun_ratio:       'estimate_accuracy',
-  scope_completion:    'sprint_scope',
-  scope_creep:         'sprint_scope',
-  on_time_delivery:    'deadline',
-  avg_slip:            'deadline',
-
-  active_ai_members:  'ai_members',
-  cursor_active:      'ai_members',
-  cc_active:          'ai_members',
-  codex_active:       'ai_members',
-  team_ai_loc:        'ai_team_output',
-  cursor_acceptance:  'ai_acceptance',
-  cc_tool_acceptance: 'ai_acceptance',
-  cc_tool_accept:     'ai_acceptance',
-  cursor_lines:       'ai_cursor_detail',
-  cursor_agents:      'ai_cursor_detail',
-  cursor_completions: 'ai_cursor_detail',
-  cc_lines:           'ai_cc_detail',
-  cc_sessions:        'ai_cc_detail',
-  chatgpt:            'ai_web',
-  claude_web:         'ai_web',
-  ai_loc_share2:      'ai_loc_share',
-
-  // Grouped by activity type (chat / email / meetings / files), not by
-  // vendor — Slack-chat and Teams-chat answer the same question so they
-  // belong in one column. Source (Slack / Microsoft 365 / Zoom) stays
-  // visible per-row via each metric's own sublabel.
-  slack_messages_sent:        'chat',
-  slack_channel_posts:        'chat',
-  slack_active_days:          'chat',
-  slack_msgs_per_active_day:  'chat',
-  slack_dm_ratio:             'chat',
-  m365_teams_chats:           'chat',
-  m365_active_days:           'chat',
-  m365_emails_sent:           'email',
-  m365_emails_received:       'email',
-  m365_emails_read:           'email',
-  m365_files_engaged:         'files',
-  m365_files_shared_internal: 'files',
-  m365_files_shared_external: 'files',
-  meeting_hours:              'meetings',
-  meetings_count:             'meetings',
-  teams_meeting_hours:        'meetings',
-  zoom_meeting_hours:         'meetings',
-  teams_meetings:             'meetings',
-  zoom_meetings:              'meetings',
-  meeting_free:               'meetings',
-};
-
-/**
- * Canonical ordering for bullet metrics across v1 layouts. Keys earlier
- * in this array render first when a section is filtered down to a
- * sub-group. Backend response order is unconstrained (CH `GROUP BY` is
- * unordered), so the FE re-sorts using this list before paint.
- *
- * Keys absent from the array sort to the end in stable order.
- */
-const BULLET_DISPLAY_ORDER: readonly string[] = [
-  // task_delivery
-  'tasks_completed',
-  'task_dev_time',
-  'task_reopen_rate',
-  'due_date_compliance',
-  'estimation_accuracy',
-  'worklog_logging_accuracy',
-  'bugs_to_task_ratio',
-  'mean_time_to_resolution',
-  'stale_in_progress',
-  'flow_efficiency',
-  'pickup_time',
-
-  // git_output
-  'commits',
-  'prs_created',
-  'prs_merged',
-  'clean_loc',
-  'pr_cycle_time_h',
-  'pr_size',
-  'merge_rate',
-  'lines_per_commit',
-  'commits_per_active_day',
-
-  // code_quality
-  'prs_per_dev',
-  'build_success',
-  'pr_cycle_time',
-  'bugs_fixed',
-
-  // estimation
-  'overrun_ratio',
-  'scope_completion',
-  'scope_creep',
-  'on_time_delivery',
-  'avg_slip',
-
-  // ai_adoption
-  'active_ai_members',
-  'cursor_active',
-  'cc_active',
-  'codex_active',
-  'team_ai_loc',
-  'cursor_acceptance',
-  'cc_tool_acceptance',
-  'cc_tool_accept',
-  'cursor_lines',
-  'cursor_agents',
-  'cursor_completions',
-  'cc_lines',
-  'cc_sessions',
-  'chatgpt',
-  'claude_web',
-  'ai_loc_share2',
-  'cc_cost',
-  'cc_overage',
-  'prs_with_cc',
-  'prs_total',
-
-  // collaboration
-  'slack_messages_sent',
-  'slack_channel_posts',
-  'slack_active_days',
-  'slack_msgs_per_active_day',
-  'slack_dm_ratio',
-  'm365_active_days',
-  'm365_emails_sent',
-  'm365_emails_received',
-  'm365_emails_read',
-  'm365_teams_chats',
-  'm365_files_engaged',
-  'm365_files_shared_internal',
-  'm365_files_shared_external',
-  'meeting_hours',
-  'meetings_count',
-  'teams_meeting_hours',
-  'zoom_meeting_hours',
-  'teams_meetings',
-  'zoom_meetings',
-  'meeting_free',
-];
-
-const ORDER_INDEX = new Map(BULLET_DISPLAY_ORDER.map((k, i) => [k, i]));
-
-export function filterBulletsByLayoutGroup(
-  metrics: BulletMetric[],
-  group: string,
-): BulletMetric[] {
-  const filtered = metrics.filter((m) => BULLET_LAYOUT_GROUPS[m.metric_key] === group);
-  return filtered.sort(
-    (a, b) =>
-      (ORDER_INDEX.get(a.metric_key) ?? Number.MAX_SAFE_INTEGER) -
-      (ORDER_INDEX.get(b.metric_key) ?? Number.MAX_SAFE_INTEGER),
-  );
-}
diff --git a/src/lib/insight/groups.test.ts b/src/lib/insight/groups.test.ts
index 6157e299..b8e120fd 100644
--- a/src/lib/insight/groups.test.ts
+++ b/src/lib/insight/groups.test.ts
@@ -2,25 +2,18 @@ import { describe, expect, it } from "vitest";
 
 import {
   GROUPS,
-  groupById,
   groupIdForMetricKey,
-  legacyGroups,
-  metricGroups,
+  type GroupId,
+  type MetricGroup,
 } from "@/lib/insight/groups";
 
-describe("groups registry", () => {
-  it("groupById returns the def and throws on an unknown id", () => {
-    expect(groupById("ai_adoption").id).toBe("ai_adoption");
-    // @ts-expect-error — exercising the runtime guard with an invalid id.
-    expect(() => groupById("does_not_exist")).toThrow(/Unknown group/);
-  });
-
-  it("partitions GROUPS by kind", () => {
-    expect(legacyGroups().every((g) => g.kind === "legacy")).toBe(true);
-    expect(metricGroups().every((g) => g.kind === "metrics")).toBe(true);
-    expect(legacyGroups().length + metricGroups().length).toBe(GROUPS.length);
-  });
+function groupById(id: GroupId): MetricGroup {
+  const def = GROUPS.find((g) => g.id === id);
+  if (!def) throw new Error(`Unknown group: ${id}`);
+  return def;
+}
 
+describe("groups registry", () => {
   it("groupIdForMetricKey resolves a metric to its owning group, null otherwise", () => {
     expect(groupIdForMetricKey("ai.active_days")).toBe("ai_adoption");
     expect(groupIdForMetricKey("git.prs_merged")).toBe("git_output");
@@ -29,20 +22,14 @@ describe("groups registry", () => {
     expect(groupIdForMetricKey("nope.unknown")).toBeNull();
   });
 
-  it("exposes git_output as a metrics group with a histogram drilldown block", () => {
+  it("exposes git_output with a histogram drilldown block", () => {
     const git = groupById("git_output");
-    expect(git.kind).toBe("metrics");
-    if (git.kind === "metrics") {
-      expect(git.collection.metrics.length).toBeGreaterThan(0);
-      expect(git.drilldown.some((b) => b.view === "histogram")).toBe(true);
-    }
+    expect(git.collection.metrics.length).toBeGreaterThan(0);
+    expect(git.drilldown.some((b) => b.view === "histogram")).toBe(true);
   });
 
   it("combines compatible task throughput metrics in one chart", () => {
     const taskDelivery = groupById("task_delivery");
-    if (taskDelivery.kind !== "metrics") {
-      throw new Error("task_delivery must be metrics");
-    }
     const throughput = taskDelivery.drilldown.find(
       (block) => block.view === "timeseries" && block.id === "task-throughput"
     );
@@ -51,7 +38,6 @@ describe("groups registry", () => {
 
   it("caps repository activity and keeps line composition grouped by category", () => {
     const git = groupById("git_output");
-    if (git.kind !== "metrics") throw new Error("git_output must be metrics");
     const timeseries = git.drilldown.filter(
       (block) => block.view === "timeseries"
     );
diff --git a/src/lib/insight/groups.ts b/src/lib/insight/groups.ts
index e3b98413..b8026756 100644
--- a/src/lib/insight/groups.ts
+++ b/src/lib/insight/groups.ts
@@ -23,8 +23,8 @@ import type { MetricTimeseriesChartConfig } from "@/lib/metrics/timeseries-chart
  * dashboard composition, so they live here.
  */
 
-export type BreakdownChartKind = "bars" | "summary-card";
-export type HistogramChartKind = "histogram";
+type BreakdownChartKind = "bars" | "summary-card";
+type HistogramChartKind = "histogram";
 
 /**
  * One chart in a group's drilldown. Blocks compose: a multi-metric chart
@@ -52,7 +52,6 @@ export type DrilldownBlock =
   | { view: "histogram"; chart: HistogramChartKind; metrics: string[] };
 
 export interface MetricGroup {
-  kind: "metrics";
   id: GroupId;
   title: string;
   collection: MetricCollectionConfig;
@@ -60,15 +59,6 @@ export interface MetricGroup {
   drilldown: DrilldownBlock[];
 }
 
-/** A group still rendered by the legacy data path; dies with it. */
-export interface LegacyGroup {
-  kind: "legacy";
-  id: GroupId;
-  title: string;
-}
-
-export type GroupDef = MetricGroup | LegacyGroup;
-
 export type GroupId =
   | "task_delivery"
   | "git_output"
@@ -325,9 +315,8 @@ const WIKI_COLLECTION: MetricCollectionConfig = {
   ],
 };
 
-export const GROUPS: readonly GroupDef[] = [
+export const GROUPS: readonly MetricGroup[] = [
   {
-    kind: "metrics",
     id: "task_delivery",
     title: "Task delivery",
     collection: TASK_DELIVERY_COLLECTION,
@@ -355,7 +344,6 @@ export const GROUPS: readonly GroupDef[] = [
     ],
   },
   {
-    kind: "metrics",
     id: "git_output",
     title: "Git output",
     collection: GIT_OUTPUT_COLLECTION,
@@ -412,7 +400,6 @@ export const GROUPS: readonly GroupDef[] = [
     ],
   },
   {
-    kind: "metrics",
     id: "collaboration",
     title: "Collaboration",
     collection: COLLABORATION_COLLECTION,
@@ -441,7 +428,6 @@ export const GROUPS: readonly GroupDef[] = [
     ],
   },
   {
-    kind: "metrics",
     id: "ai_adoption",
     title: "AI adoption",
     collection: AI_ADOPTION_COLLECTION,
@@ -458,7 +444,6 @@ export const GROUPS: readonly GroupDef[] = [
     ],
   },
   {
-    kind: "metrics",
     id: "wiki",
     title: "Wiki",
     collection: WIKI_COLLECTION,
@@ -506,51 +491,29 @@ export const HEATMAP_COLLECTION: MetricCollectionConfig = {
   })),
 };
 
-export function groupById(id: GroupId): GroupDef {
-  const def = GROUPS.find((g) => g.id === id);
-  if (!def) throw new Error(`Unknown group: ${id}`);
-  return def;
-}
-
-export function metricGroups(): MetricGroup[] {
-  return GROUPS.filter((g): g is MetricGroup => g.kind === "metrics");
-}
-
-export function legacyGroups(): LegacyGroup[] {
-  return GROUPS.filter((g): g is LegacyGroup => g.kind === "legacy");
-}
-
 /**
- * The "At a glance" KPI row: array order is display order. `legacy` tiles
- * come from the legacy KPI batch; `metric` tiles come from the derived
- * KPI collection below. Both render through the same display-ready tile
- * intermediate — selectors own formatting and scoring.
+ * The "At a glance" KPI row: array order is display order. Tiles are metric
+ * keys resolved against the KPI collection below and render through the
+ * display-ready tile intermediate — selectors own formatting and scoring.
  */
-export type KpiTileSource =
-  | { kind: "legacy"; key: string; groupId: GroupId }
-  | { kind: "metric"; metricKey: string };
-
-export const KPI_ROW: readonly KpiTileSource[] = [
-  { kind: "metric", metricKey: "tasks.closed" },
-  { kind: "metric", metricKey: "collab.focus_time_pct" },
-  { kind: "metric", metricKey: "git.prs_merged" },
-  { kind: "metric", metricKey: "ai.active_days" },
-  { kind: "metric", metricKey: "ai.accepted_lines" },
+export const KPI_ROW: readonly string[] = [
+  "tasks.closed",
+  "collab.focus_time_pct",
+  "git.prs_merged",
+  "ai.active_days",
+  "ai.accepted_lines",
 ];
 
 export const KPI_ROW_COLLECTION: MetricCollectionConfig = {
-  metrics: KPI_ROW.filter(
-    (t): t is Extract<KpiTileSource, { kind: "metric" }> => t.kind === "metric"
-  ).map((t) => ({
-    key: t.metricKey,
+  metrics: KPI_ROW.map((key) => ({
+    key,
     views: [{ view: "period" }, { view: "peer" }],
   })),
 };
 
-/** Metrics-backed KPI tiles navigate to the group that owns their metric. */
+/** KPI tiles navigate to the group that owns their metric. */
 export function groupIdForMetricKey(metricKey: string): GroupId | null {
   for (const def of GROUPS) {
-    if (def.kind !== "metrics") continue;
     if (def.collection.metrics.some((m) => m.key === metricKey)) return def.id;
   }
   return null;
diff --git a/src/lib/insight/is-sales-department.test.ts b/src/lib/insight/is-sales-department.test.ts
deleted file mode 100644
index 608f5389..00000000
--- a/src/lib/insight/is-sales-department.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { isSalesDepartment } from "./is-sales-department";
-
-describe("isSalesDepartment", () => {
-  it("matches sales departments (prod org)", () => {
-    expect(isSalesDepartment("Sales")).toBe(true);
-    expect(isSalesDepartment("Inside Sales")).toBe(true);
-    expect(isSalesDepartment("sales")).toBe(true);
-  });
-
-  it("matches Global Services variants (dev org)", () => {
-    // Real values observed in identity / bronze on insight-dev-vhc.
-    expect(isSalesDepartment("Global Services")).toBe(true);
-    expect(isSalesDepartment("Global Services Team")).toBe(true);
-    expect(isSalesDepartment("Global services")).toBe(true);
-    expect(isSalesDepartment("Global  Services Team")).toBe(true); // double space
-    expect(isSalesDepartment("Global-Services")).toBe(true);
-  });
-
-  it("does not match unrelated departments", () => {
-    expect(isSalesDepartment("R&D")).toBe(false);
-    expect(isSalesDepartment("Marketing")).toBe(false);
-    expect(isSalesDepartment("Professional Services")).toBe(false);
-    expect(isSalesDepartment("Wholesaler")).toBe(false); // no word-boundary "sales"
-  });
-
-  it("handles null / undefined / empty", () => {
-    expect(isSalesDepartment(null)).toBe(false);
-    expect(isSalesDepartment(undefined)).toBe(false);
-    expect(isSalesDepartment("")).toBe(false);
-  });
-});
diff --git a/src/lib/insight/is-sales-department.ts b/src/lib/insight/is-sales-department.ts
deleted file mode 100644
index 6dce2874..00000000
--- a/src/lib/insight/is-sales-department.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Whether a person's department should render the sales / CRM dashboard
- * (`<SalesDashboard>`) instead of the engineering one.
- *
- * The frontend build is shared across tenants, and the population that owns
- * CRM metrics differs per org:
- *   - the prod org tags these reps with a "Sales" department
- *     (also "Inside Sales", etc.);
- *   - the dev org (`insight-dev-vhc`) keeps them under a "Global Services"
- *     department — surfaced from the HR source via `person.department`
- *     (there is no separate "Functional Team" field in the ingest/identity
- *     pipeline; department is the only attribute carrying this value).
- *
- * Source data is messy — "Global Services", "Global Services Team",
- * "Global  Services" (double space), "Global-Services" all occur — so the
- * match is case-insensitive and tolerant of whitespace / hyphen separators.
- */
-export function isSalesDepartment(dept?: string | null): boolean {
-  const value = dept ?? "";
-  return /\bsales\b/i.test(value) || /\bglobal[\s-]+services\b/i.test(value);
-}
diff --git a/src/lib/insight/kpi-row.ts b/src/lib/insight/kpi-row.ts
index e3a59419..bcbf6669 100644
--- a/src/lib/insight/kpi-row.ts
+++ b/src/lib/insight/kpi-row.ts
@@ -8,7 +8,7 @@ import {
   forEntity,
   type NormalizedMetricResult,
 } from "@/lib/metrics/collection";
-import { peerStatusToStatus } from "@/lib/insight/v2/peer-status";
+import { peerStatusToStatus } from "@/lib/insight/peer-status";
 import { formatGapMagnitude } from "@/lib/metrics/gap";
 import { derivePeerStanding } from "@/lib/metrics/peer-standing";
 import { computeDelta, deltaStatus, formatTileDelta } from "@/lib/metrics/delta";
@@ -46,9 +46,8 @@ export function metricKpiTiles(
   entityId: string,
   focusMode: FocusMode
 ): KpiTileData[] {
-  return KPI_ROW.flatMap((source) => {
-    if (source.kind !== "metric") return [];
-    const metric = byKey.get(source.metricKey);
+  return KPI_ROW.flatMap((metricKey) => {
+    const metric = byKey.get(metricKey);
     if (!metric) return [];
 
     const data = forEntity(metric, entityId);
@@ -64,7 +63,7 @@ export function metricKpiTiles(
       focusMode
     );
 
-    const previousMetric = previousByKey?.get(source.metricKey) ?? null;
+    const previousMetric = previousByKey?.get(metricKey) ?? null;
     const previousValue = previousMetric
       ? forEntity(previousMetric, entityId).value
       : null;
diff --git a/src/lib/insight/menu-item-id.ts b/src/lib/insight/menu-item-id.ts
deleted file mode 100644
index 06b2fd8a..00000000
--- a/src/lib/insight/menu-item-id.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * MenuItem.id codec — the insight screenset encodes per-item context as
- * `${screenId}::${param}` so the framework's menu tree (which accepts only
- * string ids) can still carry a disambiguator (an email, an org_unit name).
- *
- * Keep every split/join of this format in one place so callers never parse
- * the id inline.
- */
-
-const SEPARATOR = '::';
-
-export function encodeMenuItemId(screenId: string, param?: string): string {
-  return param && param.length > 0 ? `${screenId}${SEPARATOR}${param}` : screenId;
-}
-
-export function decodeMenuItemId(id: string): { screenId: string; param?: string } {
-  const idx = id.indexOf(SEPARATOR);
-  if (idx < 0) return { screenId: id };
-  return {
-    screenId: id.slice(0, idx),
-    param: id.slice(idx + SEPARATOR.length),
-  };
-}
diff --git a/src/lib/insight/peer-status.test.ts b/src/lib/insight/peer-status.test.ts
new file mode 100644
index 00000000..12999ab9
--- /dev/null
+++ b/src/lib/insight/peer-status.test.ts
@@ -0,0 +1,12 @@
+import { describe, expect, it } from "vitest";
+
+import { peerStatusToStatus } from "./peer-status";
+
+describe("peerStatusToStatus — maps rank to display status", () => {
+  it("top → good, bottom → bad, in_pack and neutral stay calm", () => {
+    expect(peerStatusToStatus("top")).toBe("good");
+    expect(peerStatusToStatus("bottom")).toBe("bad");
+    expect(peerStatusToStatus("in_pack")).toBe("neutral");
+    expect(peerStatusToStatus("neutral")).toBe("neutral");
+  });
+});
diff --git a/src/lib/insight/peer-status.ts b/src/lib/insight/peer-status.ts
new file mode 100644
index 00000000..f4889f22
--- /dev/null
+++ b/src/lib/insight/peer-status.ts
@@ -0,0 +1,22 @@
+/**
+ * Peer-status helpers (Refs #80).
+ *
+ * Render rule: a rank of top/bottom quartile colors; being with the pack is
+ * the normal state and renders calm (neutral), never amber.
+ */
+
+import type { PeerStatusWithNeutral } from "@/lib/peers";
+import type { Status } from "@/lib/status";
+
+/**
+ * THE rank → display-status mapping, shared by every surface that paints a
+ * peer standing. Red means bottom quartile, green means top quartile, and
+ * being with the pack is the normal state — it renders calm (neutral), never
+ * amber. Amber is reserved for aggregate judgments that earn it (section
+ * grading).
+ */
+export function peerStatusToStatus(p: PeerStatusWithNeutral): Status {
+  if (p === "top") return "good";
+  if (p === "bottom") return "bad";
+  return "neutral";
+}
diff --git a/src/lib/insight/period-suffix.ts b/src/lib/insight/period-suffix.ts
deleted file mode 100644
index c6dca194..00000000
--- a/src/lib/insight/period-suffix.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Units that are already rates (%, hours, ratios, average replies) read weird
-// with a period suffix — "% / mo" — so they're suppressed.
-const SUPPRESS_SUFFIX_UNITS = [
-  "%",
-  "\u00d7",
-  "h",
-  "avg replies",
-  "avg",
-  "/mo",
-  "/day",
-];
-
-// `Map` avoids both prototype lookups and dynamic-indexing: `.get(arbitrary)`
-// returns `string | undefined` without reading inherited properties like
-// `toString`, so we don't need a `hasOwn` guard on a plain object.
-const PERIOD_SUFFIX = new Map<string, string>([
-  ['week',    '/ wk'],
-  ['month',   '/ mo'],
-  ['quarter', '/ qtr'],
-  ['year',    '/ yr'],
-]);
-
-export function getPeriodSuffix(unit: string | undefined, period?: string): string {
-  if (!period || !unit) return "";
-  const u = unit.toLowerCase();
-  if (SUPPRESS_SUFFIX_UNITS.some((s) => u.includes(s))) return "";
-  return PERIOD_SUFFIX.get(period) ?? "";
-}
diff --git a/src/lib/insight/settled-result.ts b/src/lib/insight/settled-result.ts
deleted file mode 100644
index 1fd45a32..00000000
--- a/src/lib/insight/settled-result.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ODataResponse } from "@/types/insight";
-
-export function settled<T>(
-  result: PromiseSettledResult<T>,
-  fallback: T,
-  label: string,
-): T {
-  if (result.status === 'fulfilled') return result.value;
-  if (import.meta.env.DEV) {
-    console.warn(`[Insight] ${label} unavailable:`, result.reason);
-  }
-  return fallback;
-}
-
-export function emptyOdata<T>(): ODataResponse<T> {
-  return { items: [], page_info: { has_next: false, cursor: null } };
-}
diff --git a/src/lib/insight/team-kpis.ts b/src/lib/insight/team-kpis.ts
deleted file mode 100644
index e98297cb..00000000
--- a/src/lib/insight/team-kpis.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { useMemo } from "react";
-
-import { teamHealthStatus } from "@/api/metric-semantics";
-import { useTeamKpisByPeriod, useTeamViewConfig } from "@/api/view-configs";
-import type { AlertThreshold, PeriodValue, TeamKpi, TeamMember } from "@/types/insight";
-
-function median(values: number[]): number | null {
-  const nums = values.filter((v) => Number.isFinite(v));
-  if (nums.length === 0) return null;
-  const sorted = [...nums].sort((a, b) => a - b);
-  const mid = Math.floor(sorted.length / 2);
-  return sorted.length % 2 === 0
-    ? (sorted[mid - 1]! + sorted[mid]!) / 2
-    : sorted[mid]!;
-}
-
-/**
- * Build the period-scoped overview KPIs ("At Risk", "Focus ≥60%", etc.)
- * from the loaded team members. Pure on inputs — exported so call sites
- * that already hold the resolved alert thresholds (tests, future
- * imperative call sites) can derive KPIs without spinning up a hook.
- */
-export function deriveTeamKpis(
-  members: TeamMember[],
-  templates: TeamKpi[],
-  alertThresholds: AlertThreshold[],
-): TeamKpi[] {
-  if (members.length === 0) return [];
-
-  const total = members.length;
-  const focusTrigger =
-    alertThresholds.find((t) => t.metric_key === "focus_time_pct")?.trigger ??
-    60;
-
-  const atRisk = members.filter((m) =>
-    alertThresholds.some((t) => {
-      const v = m[t.metric_key as keyof TeamMember];
-      return typeof v === "number" && Number.isFinite(v) && v < t.trigger;
-    }),
-  ).length;
-
-  const membersWithFocus = members.filter(
-    (m): m is TeamMember & { focus_time_pct: number } =>
-      m.focus_time_pct !== null,
-  );
-  const focusCount = membersWithFocus.filter(
-    (m) => m.focus_time_pct >= focusTrigger,
-  ).length;
-  const belowFocus = membersWithFocus.length - focusCount;
-  const noAiCount = members.filter((m) => m.ai_tools.length === 0).length;
-
-  const devTimeMedian = median(
-    members
-      .map((m) => m.dev_time_h)
-      .filter((v): v is number => v !== null),
-  );
-
-  const atRiskStatus = teamHealthStatus(atRisk, total);
-  const focusStatus = teamHealthStatus(belowFocus, total);
-  const noAiStatus = teamHealthStatus(noAiCount, total);
-
-  return templates.map((k) => {
-    if (k.metric_key === "at_risk_count")
-      return { ...k, value: String(atRisk), status: atRiskStatus };
-    if (k.metric_key === "focus_gte_60")
-      return {
-        ...k,
-        value: `${focusCount} / ${total}`,
-        sublabel: `${belowFocus} member${belowFocus !== 1 ? "s" : ""} below target`,
-        status: focusStatus,
-      };
-    if (k.metric_key === "not_using_ai")
-      return { ...k, value: String(noAiCount), status: noAiStatus };
-    if (k.metric_key === "team_dev_time") {
-      const value =
-        devTimeMedian === null ? "—" : `${Math.round(devTimeMedian)}h`;
-      return {
-        ...k,
-        value,
-        sublabel: `Team median · ${total} member${total !== 1 ? "s" : ""}`,
-        chipLabel: undefined,
-      };
-    }
-    return k;
-  });
-}
-
-/**
- * React hook variant — wires the catalog-resolved team view config and
- * the period-scoped templates into `deriveTeamKpis`. This is the entry
- * point screens should call; the pure `deriveTeamKpis` stays exported
- * for unit tests and direct callers.
- */
-export function useTeamKpis(
-  members: TeamMember[],
-  period: PeriodValue,
-): TeamKpi[] {
-  const { alert_thresholds } = useTeamViewConfig();
-  const templates = useTeamKpisByPeriod(period);
-  return useMemo(
-    () => deriveTeamKpis(members, templates, alert_thresholds),
-    [members, templates, alert_thresholds],
-  );
-}
diff --git a/src/lib/insight/team-metrics.test.ts b/src/lib/insight/team-metrics.test.ts
index 3d37f6a1..012df565 100644
--- a/src/lib/insight/team-metrics.test.ts
+++ b/src/lib/insight/team-metrics.test.ts
@@ -7,7 +7,7 @@ import {
   teamMetricStandings,
 } from "@/lib/insight/team-metrics";
 import {
-  metricGroups,
+  GROUPS,
   type MetricGroup,
 } from "@/lib/insight/groups";
 import {
@@ -60,7 +60,6 @@ function metricWithPeers(
 
 function defWith(metric: NormalizedMetricResult): MetricGroup {
   return {
-    kind: "metrics",
     id: "ai_adoption",
     title: "AI adoption",
     collection: {
@@ -174,7 +173,7 @@ describe("team request row-limit projection", () => {
     // is split across requests rather than rejected.
     const ROW_LIMIT = 5000;
     const roster = 200;
-    for (const def of metricGroups()) {
+    for (const def of GROUPS) {
       const projected = projectViews(def.collection, ["period", "peer"]);
       // Roster surfaces carry no per-bucket / per-dimension views.
       expect(
diff --git a/src/lib/insight/team-metrics.ts b/src/lib/insight/team-metrics.ts
index dd614dff..adcf2d62 100644
--- a/src/lib/insight/team-metrics.ts
+++ b/src/lib/insight/team-metrics.ts
@@ -76,13 +76,13 @@ export function teamMetricStandings(
 }
 
 /**
- * Per-person entries across every unified-metrics group, keyed by member id —
- * the heatmap's member details sheet source for groups the legacy per-member
- * bullet fetch no longer covers. `byGroup` resolves a group id to its fetched
- * result map; groups still loading resolve undefined and contribute nothing.
+ * Per-person entries across every metrics group, keyed by member id — the
+ * source for the heatmap's member details sheet. `byGroup` resolves a group id
+ * to its fetched result map; groups still loading resolve undefined and
+ * contribute nothing.
  */
 export function memberMetricEntries(
-  defs: MetricGroup[],
+  defs: readonly MetricGroup[],
   byGroup: (groupId: string) => Map<string, NormalizedMetricResult> | undefined,
   memberIds: string[],
 ): Map<string, PeerStoryEntry[]> {
@@ -100,8 +100,8 @@ export function memberMetricEntries(
 }
 
 /**
- * Per-member bottom-quartile counts across the collection — merged into the
- * "members needing attention" tally alongside the legacy bullet counts.
+ * Per-member bottom-quartile counts across the collection — feeds the
+ * "members needing attention" tally.
  */
 export function metricBelowCounts(
   def: MetricGroup,
diff --git a/src/lib/insight/v2/bullet-defs.ts b/src/lib/insight/v2/bullet-defs.ts
deleted file mode 100644
index 85516d1c..00000000
--- a/src/lib/insight/v2/bullet-defs.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * FE-only `description` strings for bullet metrics (Refs #80).
- *
- * Wave-3 of the catalog hydration (#66) moved every other piece of bullet
- * metadata — `label`, `sublabel`, `unit`, `higher_is_better`, `thresholds`,
- * `schema_status` — into the wire response surfaced by `useCatalog()`. The
- * one field the catalog doesn't yet carry for bullets is `description`:
- * the long-form explainer text shown under the metric label when the
- * Explanations toggle is on. IC KPIs already source `description` from
- * the catalog (see `mocks/catalog-factory.ts::buildKpiMetric`); bullets
- * have no equivalent. When the backend grows a `description` field for
- * bullet catalog rows, this map can fold into the wire.
- *
- * Lookup is by bare `metric_key` (e.g. `tasks_completed`) — the same
- * shape `BulletMetric.metric_key` carries. Missing entries return
- * `undefined`; consumers MUST tolerate that (`<MetricSublabel>` renders
- * `null` when description is absent).
- *
- * Exposed as a `Map` (not a `Record`) so an attacker-controlled or
- * malformed `metric_key` like `"__proto__"` / `"constructor"` /
- * `"hasOwnProperty"` returns `undefined` instead of leaking
- * `Object.prototype` members through bracket access — keeps render
- * paths in `<MetricSublabel>` immune to "function rendered as React
- * child" crashes if the backend ever ships an unsanitized key.
- */
-export const BULLET_DESCRIPTION_BY_KEY: ReadonlyMap<string, string> = new Map<
-  string,
-  string
->(Object.entries({
-  prs_per_dev: "Merged PRs per developer",
-  build_success: "CI runs passed vs total",
-  pr_cycle_time: "Hours from PR open to merge",
-  bugs_fixed: "Bug-type issues closed",
-}));
diff --git a/src/lib/insight/v2/derivations.test.ts b/src/lib/insight/v2/derivations.test.ts
deleted file mode 100644
index 84efd37c..00000000
--- a/src/lib/insight/v2/derivations.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { deriveAiToolComposition } from "@/lib/insight/v2/derivations";
-import type { BulletMetric } from "@/types/insight";
-
-function aiRow(metric_key: string, value: string): BulletMetric {
-  return {
-    period: "week",
-    section: "ai_adoption",
-    metric_key,
-    label: metric_key,
-    value,
-    unit: "lines",
-    range_min: "0",
-    range_max: "100",
-    median: "—",
-    median_label: "",
-    bar_left_pct: 0,
-    bar_width_pct: 0,
-    median_left_pct: 0,
-    status: "good",
-    drill_id: "",
-  };
-}
-
-describe("deriveAiToolComposition", () => {
-  it("returns an empty composition for no rows", () => {
-    expect(deriveAiToolComposition([])).toEqual([]);
-  });
-
-  it("names each known tool with a positive line count", () => {
-    expect(
-      deriveAiToolComposition([
-        aiRow("cursor_lines", "100"),
-        aiRow("cc_lines", "50"),
-        aiRow("codex_lines", "0"),
-        aiRow("copilot_lines", "25"),
-      ]),
-    ).toEqual([
-      { name: "Cursor", value: 100 },
-      { name: "Claude Code", value: 50 },
-      { name: "Copilot", value: 25 },
-    ]);
-  });
-
-  it("attributes the remainder of team_ai_loc to Other", () => {
-    expect(
-      deriveAiToolComposition([
-        aiRow("cursor_lines", "100"),
-        aiRow("team_ai_loc", "160"),
-      ]),
-    ).toEqual([
-      { name: "Cursor", value: 100 },
-      { name: "Other", value: 60 },
-    ]);
-  });
-
-  it("omits Other when the named tools cover the total", () => {
-    expect(
-      deriveAiToolComposition([
-        aiRow("cursor_lines", "100"),
-        aiRow("team_ai_loc", "80"),
-      ]),
-    ).toEqual([{ name: "Cursor", value: 100 }]);
-  });
-
-  it("treats non-numeric values (em-dash) as zero", () => {
-    expect(
-      deriveAiToolComposition([
-        aiRow("cursor_lines", "—"),
-        aiRow("cc_lines", "40"),
-        aiRow("team_ai_loc", "—"),
-      ]),
-    ).toEqual([{ name: "Claude Code", value: 40 }]);
-  });
-});
diff --git a/src/lib/insight/v2/derivations.ts b/src/lib/insight/v2/derivations.ts
deleted file mode 100644
index 689f64e2..00000000
--- a/src/lib/insight/v2/derivations.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { BulletMetric } from "@/types/insight";
-
-export interface CompositionRow {
-  name: string;
-  value: number;
-}
-
-const AI_TOOL_KEYS: ReadonlyArray<readonly [string, string]> = [
-  ["cursor_lines", "Cursor"],
-  ["cc_lines", "Claude Code"],
-  ["codex_lines", "Codex"],
-  ["copilot_lines", "Copilot"],
-];
-
-function rawValue(row: BulletMetric | undefined): number {
-  if (!row) return 0;
-  const n = Number(row.value);
-  return Number.isFinite(n) ? n : 0;
-}
-
-export function deriveAiToolComposition(
-  aiRows: BulletMetric[],
-): CompositionRow[] {
-  const byKey = new Map(aiRows.map((r) => [r.metric_key, r]));
-  const named: CompositionRow[] = [];
-  let knownTotal = 0;
-  for (const [key, name] of AI_TOOL_KEYS) {
-    const v = rawValue(byKey.get(key));
-    if (v > 0) named.push({ name, value: v });
-    knownTotal += v;
-  }
-  const totalRow = byKey.get("team_ai_loc");
-  const total = rawValue(totalRow);
-  const other = Math.max(0, total - knownTotal);
-  if (other > 0) named.push({ name: "Other", value: other });
-  return named;
-}
diff --git a/src/lib/insight/v2/metric-order.test.ts b/src/lib/insight/v2/metric-order.test.ts
deleted file mode 100644
index fa42a44d..00000000
--- a/src/lib/insight/v2/metric-order.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  metricOrderIndex,
-  orderRowsForSection,
-} from "@/lib/insight/v2/metric-order";
-
-const row = (metric_key: string) => ({ metric_key });
-
-describe("orderRowsForSection", () => {
-  it("returns rows untouched for a section without a pinned order", () => {
-    const rows = [row("b"), row("a")];
-    expect(orderRowsForSection("unknown_section", rows)).toBe(rows);
-  });
-
-  it("replays the pinned code_quality order", () => {
-    const rows = [
-      row("prs_per_dev"),
-      row("build_success"),
-      row("pr_cycle_time"),
-      row("bugs_fixed"),
-    ];
-    expect(
-      orderRowsForSection("code_quality", rows).map((r) => r.metric_key),
-    ).toEqual(["build_success", "bugs_fixed", "pr_cycle_time", "prs_per_dev"]);
-  });
-
-  it("pushes unknown keys after pinned ones, alphabetically among themselves", () => {
-    const rows = [
-      row("zeta_metric"),
-      row("alpha_metric"),
-      row("build_success"),
-    ];
-    expect(
-      orderRowsForSection("code_quality", rows).map((r) => r.metric_key),
-    ).toEqual(["build_success", "alpha_metric", "zeta_metric"]);
-  });
-
-  it("does not mutate the input array", () => {
-    const rows = [row("prs_per_dev"), row("build_success")];
-    orderRowsForSection("code_quality", rows);
-    expect(rows.map((r) => r.metric_key)).toEqual([
-      "prs_per_dev",
-      "build_success",
-    ]);
-  });
-});
-
-describe("metricOrderIndex", () => {
-  it("returns the pinned index for a known section metric", () => {
-    expect(metricOrderIndex("code_quality", "build_success")).toBe(0);
-    expect(metricOrderIndex("code_quality", "prs_per_dev")).toBe(3);
-  });
-
-  it("returns MAX_SAFE_INTEGER for unknown sections or keys", () => {
-    expect(metricOrderIndex("unknown_section", "build_success")).toBe(
-      Number.MAX_SAFE_INTEGER,
-    );
-    expect(metricOrderIndex("code_quality", "ghost_metric")).toBe(
-      Number.MAX_SAFE_INTEGER,
-    );
-  });
-});
diff --git a/src/lib/insight/v2/metric-order.ts b/src/lib/insight/v2/metric-order.ts
deleted file mode 100644
index d525d83e..00000000
--- a/src/lib/insight/v2/metric-order.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-export const METRIC_ORDER_BY_SECTION: Record<string, string[]> = {
-  code_quality: [
-    "build_success",
-    "bugs_fixed",
-    "pr_cycle_time",
-    "prs_per_dev",
-  ],
-};
-
-export function orderRowsForSection<T extends { metric_key: string }>(
-  sectionKey: string,
-  rows: T[],
-): T[] {
-  const order = METRIC_ORDER_BY_SECTION[sectionKey];
-  if (!order) return rows;
-  const index = new Map<string, number>();
-  order.forEach((k, i) => index.set(k, i));
-  return [...rows].sort((a, b) => {
-    const ia = index.get(a.metric_key);
-    const ib = index.get(b.metric_key);
-    if (ia == null && ib == null) return a.metric_key.localeCompare(b.metric_key);
-    if (ia == null) return 1;
-    if (ib == null) return -1;
-    return ia - ib;
-  });
-}
-
-export function metricOrderIndex(sectionKey: string, metricKey: string): number {
-  const order = METRIC_ORDER_BY_SECTION[sectionKey];
-  if (!order) return Number.MAX_SAFE_INTEGER;
-  const idx = order.indexOf(metricKey);
-  return idx === -1 ? Number.MAX_SAFE_INTEGER : idx;
-}
diff --git a/src/lib/insight/v2/partition.ts b/src/lib/insight/v2/partition.ts
deleted file mode 100644
index b9f81ce9..00000000
--- a/src/lib/insight/v2/partition.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { BulletMetric } from "@/types/insight";
-
-export interface PartitionedBullets {
-  counters: BulletMetric[];
-  distributions: BulletMetric[];
-}
-
-const DISTRIBUTION_KEYS = new Set([
-  "task_dev_time",
-  "mean_time_to_resolution",
-  "pickup_time",
-]);
-
-export function partitionBullets(rows: BulletMetric[]): PartitionedBullets {
-  const counters: BulletMetric[] = [];
-  const distributions: BulletMetric[] = [];
-  for (const r of rows) {
-    if (DISTRIBUTION_KEYS.has(r.metric_key)) distributions.push(r);
-    else counters.push(r);
-  }
-  return { counters, distributions };
-}
diff --git a/src/lib/insight/v2/peer-status.test.ts b/src/lib/insight/v2/peer-status.test.ts
deleted file mode 100644
index b7af230c..00000000
--- a/src/lib/insight/v2/peer-status.test.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Pure-function tests for `peerStatusForRow` (Refs #80).
- *
- * Covers the wave-3 catalog-driven peer status helper across both
- * `higher_is_better=true` and `higher_is_better=false` axes, plus the
- * three rendering rules the wave-1 DESIGN §3.3 contract introduced:
- *   - `schema_status='error'` (surfaced as `row.schema_error: true` by
- *     transforms.ts) collapses to 'neutral'.
- *   - Missing-id (catalog row absent for the row's metric_key)
- *     collapses to 'neutral'.
- *   - `unchecked` schema_status renders the same as 'ok' (only 'error'
- *     is special-cased).
- */
-
-import { describe, expect, it } from "vitest";
-
-import type { CatalogMetric } from "@/api/catalog-client";
-import type { PeerStats } from "@/lib/peers";
-import type { BulletMetric, PeriodValue } from "@/types/insight";
-
-import {
-  bulletCatalogKey,
-  hasBulletValue,
-  peerStatusForRow,
-  peerStatusToStatus,
-  type CatalogByKey,
-} from "./peer-status";
-
-function makeRow(overrides: Partial<BulletMetric> = {}): BulletMetric {
-  return {
-    period: "month" as PeriodValue,
-    section: "task_delivery",
-    metric_key: "tasks_completed",
-    label: "Tasks Closed",
-    value: "8",
-    unit: "tasks",
-    range_min: "0",
-    range_max: "20",
-    median: "5",
-    median_label: "Median: 5 tasks",
-    bar_left_pct: 0,
-    bar_width_pct: 40,
-    median_left_pct: 25,
-    status: "good",
-    drill_id: "",
-    ...overrides,
-  };
-}
-
-function makeCatalogMetric(
-  overrides: Partial<CatalogMetric> = {},
-): CatalogMetric {
-  return {
-    id: overrides.id ?? "id-1",
-    metric_key:
-      overrides.metric_key ?? "task_delivery_bullet_rows.tasks_completed",
-    label: overrides.label ?? "Tasks Closed",
-    higher_is_better: overrides.higher_is_better ?? true,
-    is_member_scale: overrides.is_member_scale ?? false,
-    source_tags: overrides.source_tags ?? [],
-    schema_status: overrides.schema_status ?? "ok",
-    schema_error_code: overrides.schema_error_code,
-    thresholds: overrides.thresholds ?? {
-      good: 5,
-      warn: 3,
-      resolved_from: "product-default",
-      bounded_by_lock: false,
-    },
-    unit: overrides.unit,
-    sublabel: overrides.sublabel,
-    description: overrides.description,
-    format: overrides.format,
-  };
-}
-
-function makeByMetricKey(
-  metrics: ReadonlyArray<CatalogMetric>,
-): CatalogByKey {
-  const map = new Map<string, CatalogMetric>();
-  for (const m of metrics) if (m.metric_key) map.set(m.metric_key, m);
-  return (key) => map.get(key);
-}
-
-const STATS: PeerStats = { p25: 3, p50: 5, p75: 10, min: 1, max: 15, n: 12 };
-
-describe("bulletCatalogKey", () => {
-  it("composes <wire-prefix>.<bare> from section + metric_key", () => {
-    expect(
-      bulletCatalogKey(makeRow({ section: "task_delivery", metric_key: "x" })),
-    ).toBe("task_delivery_bullet_rows.x");
-    expect(
-      bulletCatalogKey(makeRow({ section: "git_output", metric_key: "y" })),
-    ).toBe("git_bullet_rows.y");
-    expect(
-      bulletCatalogKey(makeRow({ section: "ai_adoption", metric_key: "z" })),
-    ).toBe("ai_bullet_rows.z");
-  });
-});
-
-describe("hasBulletValue", () => {
-  it("returns false for em-dash and empty placeholder strings", () => {
-    expect(hasBulletValue(makeRow({ value: "—" }))).toBe(false);
-    expect(hasBulletValue(makeRow({ value: "" }))).toBe(false);
-  });
-
-  it("returns true for finite numeric strings, false for non-numeric", () => {
-    expect(hasBulletValue(makeRow({ value: "0" }))).toBe(true);
-    expect(hasBulletValue(makeRow({ value: "12" }))).toBe(true);
-    expect(hasBulletValue(makeRow({ value: "n/a" }))).toBe(false);
-  });
-});
-
-describe("peerStatusForRow — higher_is_better=true", () => {
-  const byKey = makeByMetricKey([
-    makeCatalogMetric({ higher_is_better: true }),
-  ]);
-
-  it("top when value >= p75", () => {
-    expect(peerStatusForRow(makeRow({ value: "12", peer: STATS }), byKey)).toBe(
-      "top",
-    );
-  });
-  it("bottom when value <= p25", () => {
-    expect(peerStatusForRow(makeRow({ value: "2", peer: STATS }), byKey)).toBe(
-      "bottom",
-    );
-  });
-  it("in_pack between p25 and p75", () => {
-    expect(peerStatusForRow(makeRow({ value: "6", peer: STATS }), byKey)).toBe(
-      "in_pack",
-    );
-  });
-});
-
-describe("peerStatusForRow — higher_is_better=false", () => {
-  const byKey = makeByMetricKey([
-    makeCatalogMetric({ higher_is_better: false }),
-  ]);
-
-  it("flips: low value is 'top', high value is 'bottom'", () => {
-    expect(peerStatusForRow(makeRow({ value: "2", peer: STATS }), byKey)).toBe(
-      "top",
-    );
-    expect(peerStatusForRow(makeRow({ value: "12", peer: STATS }), byKey)).toBe(
-      "bottom",
-    );
-    expect(peerStatusForRow(makeRow({ value: "6", peer: STATS }), byKey)).toBe(
-      "in_pack",
-    );
-  });
-});
-
-describe("peerStatusForRow — rendering rules", () => {
-  const okMetric = makeCatalogMetric({ higher_is_better: true });
-  const byKey = makeByMetricKey([okMetric]);
-
-  it("schema_error rows collapse to neutral even when value is clearly 'top'", () => {
-    expect(
-      peerStatusForRow(
-        makeRow({ value: "12", schema_error: true, peer: STATS }),
-        byKey,
-      ),
-    ).toBe("neutral");
-  });
-
-  it("missing-id (catalog row absent) collapses to neutral", () => {
-    const emptyByKey: CatalogByKey = () => undefined;
-    expect(
-      peerStatusForRow(makeRow({ value: "12", peer: STATS }), emptyByKey),
-    ).toBe("neutral");
-  });
-
-  it("unchecked catalog rows render the same as ok (schema_error gates the rule, not schema_status directly)", () => {
-    // Per DESIGN §3.3 only `schema_status='error'` is special-cased.
-    // For `'unchecked'` rows transforms.ts leaves `row.schema_error`
-    // unset, so peer coloring proceeds as normal — this test pins
-    // that behavior. `peerStatusForRow` itself never reads
-    // `m.schema_status`; the gate lives upstream in transforms.
-    const uncheckedByKey = makeByMetricKey([
-      makeCatalogMetric({ schema_status: "unchecked", higher_is_better: true }),
-    ]);
-    expect(
-      peerStatusForRow(makeRow({ value: "12", peer: STATS }), uncheckedByKey),
-    ).toBe("top");
-  });
-
-  it("missing cohort stats degrade to neutral", () => {
-    // No `row.peer` → neutral (no cohort to compare against).
-    expect(peerStatusForRow(makeRow({ value: "12" }), byKey)).toBe("neutral");
-  });
-
-  it("non-numeric value degrades to neutral", () => {
-    expect(peerStatusForRow(makeRow({ value: "—", peer: STATS }), byKey)).toBe(
-      "neutral",
-    );
-  });
-});
-
-describe("peerStatusToStatus — maps rank to display status", () => {
-  it("top → good, bottom → bad, in_pack and neutral stay calm", () => {
-    expect(peerStatusToStatus("top")).toBe("good");
-    expect(peerStatusToStatus("bottom")).toBe("bad");
-    expect(peerStatusToStatus("in_pack")).toBe("neutral");
-    expect(peerStatusToStatus("neutral")).toBe("neutral");
-  });
-});
diff --git a/src/lib/insight/v2/peer-status.ts b/src/lib/insight/v2/peer-status.ts
deleted file mode 100644
index 48e7b4c3..00000000
--- a/src/lib/insight/v2/peer-status.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Peer-status helpers, catalog-driven (Refs #80).
- *
- * Wave-3 swap: `higher_is_better` for peer comparisons comes from the
- * catalog row, not a compile-in lookup table. Helpers
- * take `byMetricKey` (the `useCatalog().byMetricKey` index function) so
- * downstream callers pay one shared lookup per render instead of
- * rebuilding an index. The wire key is built from `row.section +
- * row.metric_key` via `prefixForBulletSection` to match the wire
- * `<table>.<column>` shape.
- *
- * Render rules (match wave 1's DESIGN §3.3 contract):
- *  - `row.schema_error === true` (set by `transforms.ts` when the catalog
- *    row's `schema_status='error'`) → peer status collapses to
- *    `'neutral'`. Coloring is suppressed; the label stays visible.
- *  - Catalog row absent for `row` (missing-id) → `'neutral'`. Widgets
- *    that want to hide entirely should test for the missing row directly.
- *  - `schema_status='unchecked'` is treated as `'ok'` for peer rendering;
- *    no special branch needed — only `'error'` is special-cased.
- */
-
-import { prefixForBulletSection } from "@/api/catalog-client";
-import type { CatalogMetric } from "@/api/catalog-client";
-import {
-  peerStatusVsQuartiles,
-  type PeerStatusWithNeutral,
-} from "@/lib/peers";
-import type { Status } from "@/lib/status";
-import type { BulletMetric } from "@/types/insight";
-
-/** Index function shape returned by `useCatalog().byMetricKey`. */
-export type CatalogByKey = (key: string) => CatalogMetric | undefined;
-
-/**
- * Wire `metric_key` (e.g. `task_delivery_bullet_rows.tasks_completed`)
- * for a transformed bullet row whose own `metric_key` is the bare form.
- */
-export function bulletCatalogKey(row: BulletMetric): string {
-  return `${prefixForBulletSection(row.section)}.${row.metric_key}`;
-}
-
-export function hasBulletValue(row: BulletMetric): boolean {
-  if (row.value === "" || row.value === "—") return false;
-  return Number.isFinite(Number(row.value));
-}
-
-export function peerStatusForRow(
-  row: BulletMetric,
-  byMetricKey: CatalogByKey,
-): PeerStatusWithNeutral {
-  if (row.schema_error) return "neutral";
-  const value = Number(row.value);
-  if (!Number.isFinite(value)) return "neutral";
-  if (!row.peer) return "neutral";
-  const m = byMetricKey(bulletCatalogKey(row));
-  if (!m) return "neutral";
-  return peerStatusVsQuartiles(value, row.peer, m.higher_is_better);
-}
-
-/**
- * THE rank → display-status mapping, shared by every surface that paints a
- * peer standing. Red means bottom quartile, green means top quartile, and
- * being with the pack is the normal state — it renders calm (neutral), never
- * amber. Amber is reserved for aggregate judgments that earn it (section
- * grading).
- */
-export function peerStatusToStatus(p: PeerStatusWithNeutral): Status {
-  if (p === "top") return "good";
-  if (p === "bottom") return "bad";
-  return "neutral";
-}
diff --git a/src/lib/metrics/collection.test.ts b/src/lib/metrics/collection.test.ts
index 79488321..253d2a36 100644
--- a/src/lib/metrics/collection.test.ts
+++ b/src/lib/metrics/collection.test.ts
@@ -9,7 +9,6 @@ import {
   buildMetricCollectionRequest,
   chunkEntityIds,
   entityChunkSize,
-  entityObserved,
   forEntity,
   mergeNormalizedResults,
   normalizeMetricResult,
@@ -119,20 +118,6 @@ describe("normalizeMetricResult forward-compat", () => {
   });
 });
 
-describe("entityObserved", () => {
-  it("distinguishes observed from zero-filled entities", () => {
-    const metric = normalizeMetricResults([SUM_METRIC_FIXTURE]).get(
-      "ai.accepted_lines"
-    )!;
-    // alice: peer row with a target_value → observed.
-    expect(entityObserved(metric, "alice@example.com")).toBe(true);
-    // bob: zero-filled period value, no peer row → unobserved.
-    expect(entityObserved(metric, "bob@example.com")).toBe(false);
-    // nobody: absent everywhere → unobserved.
-    expect(entityObserved(metric, "nobody@example.com")).toBe(false);
-  });
-});
-
 describe("row-limit chunking", () => {
   const PERIOD_PEER: MetricCollectionConfig = {
     metrics: Array.from({ length: 10 }, (_, i) => ({
diff --git a/src/lib/metrics/collection.ts b/src/lib/metrics/collection.ts
index 0973757f..c0b10933 100644
--- a/src/lib/metrics/collection.ts
+++ b/src/lib/metrics/collection.ts
@@ -18,7 +18,7 @@ import type {
   TimeseriesView,
 } from "@/api/metric-results-client";
 
-export type MetricCollectionBucket = MetricBucket | "auto";
+type MetricCollectionBucket = MetricBucket | "auto";
 
 export interface MetricTimeseriesGroupLimitConfig {
   count: number;
@@ -26,7 +26,7 @@ export interface MetricTimeseriesGroupLimitConfig {
   includeRemainder: boolean;
 }
 
-export type MetricCollectionViewConfig =
+type MetricCollectionViewConfig =
   | { view: "period" }
   | { view: "peer" }
   | {
@@ -41,7 +41,7 @@ export type MetricCollectionViewConfig =
     }
   | { view: "histogram" };
 
-export interface MetricCollectionMetricConfig {
+interface MetricCollectionMetricConfig {
   key: string;
   filters?: MetricDimensionFilter[];
   views: MetricCollectionViewConfig[];
@@ -218,7 +218,7 @@ export function forEntity(
  * all-or-nothing limit (5000). Headroom below that so period+peer chunking
  * never sits exactly on the cliff.
  */
-export const MAX_PROJECTED_ROWS = 4500;
+const MAX_PROJECTED_ROWS = 4500;
 
 /**
  * How many entities fit in one request for this collection, or null when the
@@ -300,23 +300,6 @@ export function mergeNormalizedResults(
   return out;
 }
 
-/**
- * Whether the entity has any observations for this metric. Period views
- * zero-fill sums for requested entities, so a zero alone cannot distinguish
- * "measured zero" from "unmeasured" — the peer view's `target_value` can
- * (null exactly when unobserved). Without a peer row (no peer view, or no
- * cohort membership), a non-null non-zero period value still proves
- * observation; a zero-filled one does not.
- */
-export function entityObserved(
-  result: NormalizedMetricResult,
-  entityId: string
-): boolean {
-  const data = forEntity(result, entityId);
-  if (data.peer) return data.peer.target_value != null;
-  return data.value != null && data.value !== 0;
-}
-
 function toRequestView(
   view: MetricCollectionViewConfig,
   period: DateRange
diff --git a/src/lib/metrics/peer-standing.ts b/src/lib/metrics/peer-standing.ts
index 69269f76..65600ca5 100644
--- a/src/lib/metrics/peer-standing.ts
+++ b/src/lib/metrics/peer-standing.ts
@@ -17,7 +17,7 @@ import {
  */
 
 /** Why a standing is (in)eligible, most specific reason wins. */
-export type StandingReason =
+type StandingReason =
   /** Rankable — `rank` is meaningful. */
   | "ok"
   /** No period value for the entity. */
diff --git a/src/lib/metrics/timeseries-table.ts b/src/lib/metrics/timeseries-table.ts
index 779139aa..10592790 100644
--- a/src/lib/metrics/timeseries-table.ts
+++ b/src/lib/metrics/timeseries-table.ts
@@ -4,7 +4,7 @@ export type MetricTimeseriesTableTone =
   | "success"
   | "destructive";
 
-export type MetricTimeseriesTableTemplatePart =
+type MetricTimeseriesTableTemplatePart =
   | {
       metric: string;
       prefix?: string;
diff --git a/src/lib/peers.test.ts b/src/lib/peers.test.ts
index 9e171fea..24c8fc7e 100644
--- a/src/lib/peers.test.ts
+++ b/src/lib/peers.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { applyFocus, peerStatsFor, peerStatusVsQuartiles } from "@/lib/peers";
+import { applyFocus, peerStatusVsQuartiles } from "@/lib/peers";
 
 describe("peerStatusVsQuartiles", () => {
   it("keeps inclusive quartile boundaries when they sit beyond the median", () => {
@@ -68,45 +68,3 @@ describe("applyFocus", () => {
   });
 });
 
-describe("peerStatsFor", () => {
-  it("returns null when no finite values remain", () => {
-    expect(peerStatsFor([])).toBeNull();
-    expect(peerStatsFor([Number.NaN, Number.POSITIVE_INFINITY])).toBeNull();
-  });
-
-  it("collapses a single value onto every quantile", () => {
-    expect(peerStatsFor([7])).toEqual({
-      p25: 7,
-      p50: 7,
-      p75: 7,
-      min: 7,
-      max: 7,
-      n: 1,
-    });
-  });
-
-  it("interpolates quartiles over a sorted pool", () => {
-    expect(peerStatsFor([4, 1, 3, 2])).toEqual({
-      p25: 1.75,
-      p50: 2.5,
-      p75: 3.25,
-      min: 1,
-      max: 4,
-      n: 4,
-    });
-  });
-
-  it("filters non-finite values before ranking", () => {
-    const stats = peerStatsFor([3, Number.NaN, 1, 2]);
-    expect(stats).not.toBeNull();
-    expect(stats!.n).toBe(3);
-    expect(stats!.p50).toBe(2);
-    expect(stats!.min).toBe(1);
-    expect(stats!.max).toBe(3);
-  });
-
-  it("lands exactly on a sample when the quantile position is integral", () => {
-    // 5 samples → p50 position is exactly index 2.
-    expect(peerStatsFor([10, 20, 30, 40, 50])!.p50).toBe(30);
-  });
-});
diff --git a/src/lib/peers.ts b/src/lib/peers.ts
index 6a659cb4..2f711487 100644
--- a/src/lib/peers.ts
+++ b/src/lib/peers.ts
@@ -42,7 +42,6 @@ export const PEER_TEXT: Record<PeerStatusWithNeutral, string> = {
   neutral: "text-muted-foreground",
 }
 
-
 export const PEER_LABEL: Record<PeerStatusWithNeutral, string> = {
   top: "Top 25%",
   in_pack: "On par",
@@ -57,30 +56,6 @@ export const PEER_FILL: Record<PeerStatusWithNeutral, string> = {
   neutral: "bg-muted-foreground/20",
 }
 
-function percentile(sorted: number[], q: number): number {
-  if (sorted.length === 0) return 0
-  if (sorted.length === 1) return sorted[0]
-  const pos = (sorted.length - 1) * q
-  const lo = Math.floor(pos)
-  const hi = Math.ceil(pos)
-  if (lo === hi) return sorted[lo]
-  return sorted[lo] + (sorted[hi] - sorted[lo]) * (pos - lo)
-}
-
-export function peerStatsFor(values: number[]): PeerStats | null {
-  const filtered = values.filter((v) => Number.isFinite(v))
-  if (filtered.length === 0) return null
-  const sorted = [...filtered].sort((a, b) => a - b)
-  return {
-    p25: percentile(sorted, 0.25),
-    p50: percentile(sorted, 0.5),
-    p75: percentile(sorted, 0.75),
-    min: sorted[0],
-    max: sorted[sorted.length - 1],
-    n: sorted.length,
-  }
-}
-
 export function peerStatusVsQuartiles(
   value: number,
   stats: Pick<PeerStats, "p25" | "p50" | "p75">,
diff --git a/src/lib/scoring.test.ts b/src/lib/scoring.test.ts
index 9f7c06c0..01a6aebd 100644
--- a/src/lib/scoring.test.ts
+++ b/src/lib/scoring.test.ts
@@ -3,7 +3,6 @@ import { describe, expect, it } from "vitest";
 import type { PeerStatusWithNeutral } from "@/lib/peers";
 import {
   gradeSectionStanding,
-  pickSectionHeadline,
   rankCounts,
   rankableCount,
   sectionStandingPhrase,
@@ -90,23 +89,3 @@ describe("sectionStandingPhrase", () => {
   });
 });
 
-describe("pickSectionHeadline", () => {
-  it("returns null for an empty section", () => {
-    expect(pickSectionHeadline([])).toBeNull();
-  });
-
-  it("prefers bottom over in_pack over top over neutral", () => {
-    const metrics = [
-      ranked("neutral", "n"),
-      ranked("top", "t"),
-      ranked("in_pack", "p"),
-      ranked("bottom", "b"),
-    ];
-    expect(pickSectionHeadline(metrics)?.row).toBe("b");
-  });
-
-  it("breaks ties by declaration order", () => {
-    const metrics = [ranked("bottom", "first"), ranked("bottom", "second")];
-    expect(pickSectionHeadline(metrics)?.row).toBe("first");
-  });
-});
diff --git a/src/lib/scoring.ts b/src/lib/scoring.ts
index 95804822..c0c7d222 100644
--- a/src/lib/scoring.ts
+++ b/src/lib/scoring.ts
@@ -68,28 +68,3 @@ export function sectionStandingPhrase(counts: RankCounts): string {
   return "on par with peers"
 }
 
-/**
- * Worst-rank-first headline pick: a bottom outranks an in-pack outranks a
- * top, ties broken by declaration order. Surfaces with a severity signal
- * (the unified group card) refine the tiebreak themselves.
- */
-export function pickSectionHeadline<T>(
-  metrics: RankedMetric<T>[]
-): RankedMetric<T> | null {
-  const priority: Record<PeerStatusWithNeutral, number> = {
-    bottom: 3,
-    in_pack: 2,
-    top: 1,
-    neutral: 0,
-  }
-  let best: RankedMetric<T> | null = null
-  let bestPriority = -1
-  for (const m of metrics) {
-    const p = priority[m.rank]
-    if (p > bestPriority) {
-      best = m
-      bestPriority = p
-    }
-  }
-  return best
-}
diff --git a/src/lib/status.test.ts b/src/lib/status.test.ts
index 2a70ab95..a97fdd97 100644
--- a/src/lib/status.test.ts
+++ b/src/lib/status.test.ts
@@ -1,34 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import {
-  applyFocusStatus,
-  statusForValue,
-  statusVsMedian,
-  type StatusDef,
-} from "@/lib/status";
-
-describe("statusForValue", () => {
-  const higher: StatusDef = { good: 80, warn: 60, higher_is_better: true };
-  const lower: StatusDef = { good: 2, warn: 5, higher_is_better: false };
-
-  it("is neutral for missing or NaN values", () => {
-    expect(statusForValue(null, higher)).toBe("neutral");
-    expect(statusForValue(undefined, higher)).toBe("neutral");
-    expect(statusForValue(Number.NaN, higher)).toBe("neutral");
-  });
-
-  it("grades higher-is-better thresholds inclusively", () => {
-    expect(statusForValue(80, higher)).toBe("good");
-    expect(statusForValue(60, higher)).toBe("warn");
-    expect(statusForValue(59.9, higher)).toBe("bad");
-  });
-
-  it("grades lower-is-better thresholds inclusively", () => {
-    expect(statusForValue(2, lower)).toBe("good");
-    expect(statusForValue(5, lower)).toBe("warn");
-    expect(statusForValue(5.1, lower)).toBe("bad");
-  });
-});
+import { applyFocusStatus, statusVsMedian } from "@/lib/status";
 
 describe("applyFocusStatus", () => {
   it("passes everything through in 'all' mode", () => {
diff --git a/src/lib/status.ts b/src/lib/status.ts
index 6b07bb2e..db1b560a 100644
--- a/src/lib/status.ts
+++ b/src/lib/status.ts
@@ -2,28 +2,6 @@ import type { FocusMode } from "./peers"
 
 export type Status = "good" | "warn" | "bad" | "neutral"
 
-export type StatusDef = {
-  good: number
-  warn: number
-  higher_is_better: boolean
-}
-
-export function statusForValue(
-  value: number | null | undefined,
-  def: StatusDef
-): Status {
-  if (value == null || Number.isNaN(value)) return "neutral"
-  const { good, warn, higher_is_better } = def
-  if (higher_is_better) {
-    if (value >= good) return "good"
-    if (value >= warn) return "warn"
-    return "bad"
-  }
-  if (value <= good) return "good"
-  if (value <= warn) return "warn"
-  return "bad"
-}
-
 export function applyFocusStatus(status: Status, mode: FocusMode): Status {
   if (mode === "all") return status
   if (mode === "critical") return status === "bad" ? status : "neutral"
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index c4c6b6f0..9cde2494 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -100,9 +100,6 @@
     },
     "explanations": {
       "label": "Explanations"
-    },
-    "metrics_v2": {
-      "label": "New metrics UI"
     }
   },
   "whats_new": {
@@ -209,59 +206,6 @@
     "description": "You are signed in as {{impersonator}} and seeing the portal as this person.",
     "exit": "Exit view-as"
   },
-  "members_table": {
-    "view_team_stats": "View team stats",
-    "click_hint": "Click member to open IC dashboard"
-  },
-  "team_metrics_modal": {
-    "title": "All Team Member Metrics",
-    "member_column": "Member",
-    "empty": "No metrics returned for these members.",
-    "sections": {
-      "task_delivery": "Delivery",
-      "collaboration": "Collaboration",
-      "ai_adoption": "AI Adoption",
-      "git_output": "Git"
-    }
-  },
-  "ic_dashboard": {
-    "sections": {
-      "task_delivery": "Task Delivery",
-      "git_output": "Git Output",
-      "code_quality": "Code Quality",
-      "loc_breakdown_title": "LOC Breakdown",
-      "loc_breakdown_subtitle": "Bitbucket · lines added per period · AI-assisted vs manual vs spec/config",
-      "delivery_trends_title": "Delivery Trends",
-      "delivery_trends_subtitle": "Jira + Bitbucket · activity counts · Commits, PRs and Tasks are independent signals",
-      "ai_dev_tools_title": "AI Dev Tools & AI Chat",
-      "ai_adoption": "AI Adoption",
-      "collaboration": "Collaboration"
-    }
-  },
-  "sales_dashboard": {
-    "sections": {
-      "velocity_quality": "Velocity & Quality",
-      "outreach_activity": "Outreach Activity",
-      "deal_flow_title": "Deal Flow",
-      "deal_flow_subtitle": "HubSpot · weekly · opened / closed / won counts"
-    },
-    "hero": {
-      "deals_opened": "Deals Opened",
-      "deals_opened_sublabel": "Created in period",
-      "deals_closed": "Deals Closed",
-      "deals_closed_sublabel": "Won + lost in period",
-      "closed_value": "Closed Value",
-      "closed_value_sublabel": "Won deals · sum",
-      "win_rate": "Win Rate",
-      "win_rate_sublabel": "Won ÷ Closed",
-      "pipeline_now": "Pipeline Now",
-      "pipeline_sublabel": "{{count}} open · as of today"
-    },
-    "pacing": {
-      "closed_this_period": "Closed this period",
-      "vs_prior_year": "vs prior-year same period"
-    }
-  },
   "ic_route": {
     "personal_view_label": "Personal",
     "team_view_label": "Team"
diff --git a/src/main.tsx b/src/main.tsx
index 9f35b150..064012a3 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -5,7 +5,6 @@ import { QueryClientProvider } from "@tanstack/react-query";
 import { I18nextProvider } from "react-i18next";
 
 import "./index.css";
-import { CatalogProvider } from "@/api/catalog-provider";
 import {
   clearAuthErrorAttempts,
   consumeAuthErrorParam,
@@ -73,15 +72,13 @@ function renderApp(): void {
   createRoot(document.getElementById("root")!).render(
     <StrictMode>
       <QueryClientProvider client={queryClient}>
-        <CatalogProvider>
-          <AppErrorBoundary>
-            <ThemeProvider>
-              <I18nextProvider i18n={i18n}>
-                <RouterProvider router={router} />
-              </I18nextProvider>
-            </ThemeProvider>
-          </AppErrorBoundary>
-        </CatalogProvider>
+        <AppErrorBoundary>
+          <ThemeProvider>
+            <I18nextProvider i18n={i18n}>
+              <RouterProvider router={router} />
+            </I18nextProvider>
+          </ThemeProvider>
+        </AppErrorBoundary>
       </QueryClientProvider>
     </StrictMode>
   );
diff --git a/src/mocks/catalog-factory.ts b/src/mocks/catalog-factory.ts
deleted file mode 100644
index 2c0ebe7b..00000000
--- a/src/mocks/catalog-factory.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Mock factory for `POST /catalog/get_metrics` (Refs #66, #82).
- *
- * Serves a frozen snapshot of the production wire response captured on
- * staging (see `docs/metric-catalog-parity/2026-06-02/`). The compile-in
- * metric definitions that previously sourced this factory were removed
- * in #82 once the wire was confirmed parity-clean (#81); the snapshot
- * keeps dev mode rendering against a realistic payload without
- * re-introducing compile-in metric metadata.
- *
- * Per-request fields (`tenant_id`, `generated_at`) are re-stamped so the
- * dev session looks live; metric ids and labels are taken verbatim from
- * the snapshot.
- *
- * TODO: refresh from a production capture quarterly so the dev surface
- * doesn't drift from the live catalog. Re-running `curl … /catalog/get_metrics`
- * on staging and overwriting `catalog-snapshot.json` is enough.
- */
-
-import type {
-  CatalogResponse,
-  MetricQueryLink,
-  CatalogMetric,
-} from '@/api/catalog-client';
-import snapshot from './catalog-snapshot.json';
-
-type Snapshot = {
-  tenant_id: string;
-  generated_at: string;
-  metrics: CatalogMetric[];
-  links?: MetricQueryLink[];
-};
-
-const CATALOG_SNAPSHOT = snapshot as Snapshot;
-
-export function buildMockCatalogResponse(tenantId: string): CatalogResponse {
-  return {
-    tenant_id: tenantId,
-    generated_at: new Date().toISOString(),
-    metrics: CATALOG_SNAPSHOT.metrics,
-    links: CATALOG_SNAPSHOT.links ?? [],
-  };
-}
diff --git a/src/mocks/catalog-snapshot.json b/src/mocks/catalog-snapshot.json
deleted file mode 100644
index aed4d2bc..00000000
--- a/src/mocks/catalog-snapshot.json
+++ /dev/null
@@ -1,1661 +0,0 @@
-{
-  "tenant_id": "3e1d5a65-434c-95b4-8c1b-eb8f53a39bab",
-  "generated_at": "2026-06-02T11:34:11.342769929Z",
-  "metrics": [
-    {
-      "id": "019e83b1-4062-7bf3-910b-6d4c9156b2e8",
-      "metric_key": "task_delivery_bullet_rows.tasks_completed",
-      "label": "Tasks Closed / Developer",
-      "sublabel": "Jira · closed issues · per developer · period total",
-      "unit": "tasks",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 5,
-        "warn": 3,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4073-7353-b7f5-1063409c5100",
-      "metric_key": "task_delivery_bullet_rows.task_dev_time",
-      "label": "Task Development Time",
-      "sublabel": "Jira · time in dev statuses · per-task median · lower = better",
-      "unit": "h",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 15,
-        "warn": 22,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4085-7b33-9775-fcae1205eb34",
-      "metric_key": "task_delivery_bullet_rows.task_reopen_rate",
-      "label": "Task Reopen Rate",
-      "sublabel": "Jira · reopen events ÷ closures (this period) · lower = better",
-      "unit": "%",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 5,
-        "warn": 10,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4097-7642-a73d-33a41dbbc6b6",
-      "metric_key": "task_delivery_bullet_rows.due_date_compliance",
-      "label": "Due Date Compliance",
-      "sublabel": "Jira · tasks closed by due date",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 72,
-        "warn": 55,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-409e-7bb2-81f6-6399f9ef744b",
-      "metric_key": "task_delivery_bullet_rows.estimation_accuracy",
-      "label": "Estimation Accuracy",
-      "sublabel": "Jira · how close estimate matches actual time",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 80,
-        "warn": 50,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-40ab-7c30-bf66-1cad2ecd315d",
-      "metric_key": "task_delivery_bullet_rows.worklog_logging_accuracy",
-      "label": "Worklog Logging Accuracy",
-      "sublabel": "Jira · worklog logged ÷ time in dev statuses · 100 = on target · requires both",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 80,
-        "warn": 50,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4135-7f13-9d9a-151585fa096f",
-      "metric_key": "task_delivery_bullet_rows.bugs_to_task_ratio",
-      "label": "Bugs / Tasks Closed",
-      "sublabel": "Jira · bug-type issues ÷ total closed · lower = better",
-      "unit": "%",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 20,
-        "warn": 35,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-414f-76d2-aa73-73fe6aea34f6",
-      "metric_key": "task_delivery_bullet_rows.mean_time_to_resolution",
-      "label": "Mean Time to Resolution",
-      "sublabel": "Jira · close − create · lower = better",
-      "unit": "d",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 7,
-        "warn": 14,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4158-7c50-9a6a-58228b89f228",
-      "metric_key": "task_delivery_bullet_rows.stale_in_progress",
-      "label": "Stale In-Progress",
-      "sublabel": "Jira · open issues untouched > 14 days · snapshot, as of today",
-      "unit": "tasks",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 0,
-        "warn": 2,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4161-7510-be2e-b87e2a25a051",
-      "metric_key": "task_delivery_bullet_rows.flow_efficiency",
-      "label": "Flow Efficiency",
-      "sublabel": "Jira · time in dev statuses ÷ lifetime · per-task median · higher = better",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 40,
-        "warn": 20,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-416f-7512-a8f8-ce641347076e",
-      "metric_key": "task_delivery_bullet_rows.pickup_time",
-      "label": "Pickup Time",
-      "sublabel": "Jira · created → first dev status · per-task median · lower = better",
-      "unit": "d",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 3,
-        "warn": 7,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4178-7641-a971-3fbc4e3ad3e0",
-      "metric_key": "git_bullet_rows.commits",
-      "label": "Commits Authored",
-      "sublabel": "Bitbucket · commits authored · period total · excl. merge commits",
-      "unit": "count",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 30,
-        "warn": 10,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4180-79f0-abe6-84608a1f0541",
-      "metric_key": "git_bullet_rows.prs_created",
-      "label": "Pull Requests Created",
-      "sublabel": "Bitbucket · PRs authored · period total",
-      "unit": "count",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 6,
-        "warn": 2,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-418c-7c13-99ee-81c3252832fe",
-      "metric_key": "ic_kpis.prs_merged",
-      "label": "Pull Requests Merged",
-      "sublabel": "Bitbucket · authored and merged · period total",
-      "description": "Pull requests authored and merged. Source not ingested yet — cell shows ComingSoon until Bitbucket PR ingestion lands.",
-      "unit": "count",
-      "format": "integer",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 5,
-        "warn": 2,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4193-75f1-94fc-c14a3bc29631",
-      "metric_key": "git_bullet_rows.clean_loc",
-      "label": "Clean LOC",
-      "sublabel": "Bitbucket · lines added · excl. spec/config · period total",
-      "unit": "count",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 5000,
-        "warn": 1000,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-419e-7ca1-bceb-74db40804a7d",
-      "metric_key": "ic_kpis.pr_cycle_time_h",
-      "label": "Pull Request Cycle Time",
-      "sublabel": "Bitbucket · PR opened → merged · per-PR median · lower = better",
-      "description": "Average hours from PR opened to merged. Source not ingested yet — cell shows ComingSoon until Bitbucket PR ingestion lands.",
-      "unit": "h",
-      "format": "hours",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 24,
-        "warn": 48,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41a7-7b02-be97-9697f0fdada3",
-      "metric_key": "git_bullet_rows.pr_size",
-      "label": "PR Size",
-      "sublabel": "Bitbucket · lines changed per PR · per-PR median · smaller = reviewable",
-      "unit": "count",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 200,
-        "warn": 500,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41b6-75f3-9443-b373afa02352",
-      "metric_key": "git_bullet_rows.merge_rate",
-      "label": "PR Merge Rate",
-      "sublabel": "Bitbucket · Σ merged ÷ Σ created over period · higher = better",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 80,
-        "warn": 50,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41c0-7752-a6a1-78057117d593",
-      "metric_key": "git_bullet_rows.lines_per_commit",
-      "label": "Lines / Commit",
-      "sublabel": "Bitbucket · Σ LOC ÷ Σ commits · lower = reviewable",
-      "unit": "count",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 100,
-        "warn": 200,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41d0-77c0-8c4c-1cd8a96a857b",
-      "metric_key": "git_bullet_rows.commits_per_active_day",
-      "label": "Commits / Active Day",
-      "sublabel": "Bitbucket · Σ commits ÷ days with any commit · cadence",
-      "unit": "count",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 3,
-        "warn": 1,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41d7-7390-9c12-ef065fd68f9d",
-      "metric_key": "code_quality_bullet_rows.prs_per_dev",
-      "label": "Pull Requests Merged / Developer",
-      "sublabel": "Bitbucket · authored and merged · per developer · period total",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 6,
-        "warn": 3,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41e0-7093-89d8-8c1cd06b1e43",
-      "metric_key": "code_quality_bullet_rows.build_success",
-      "label": "Build Success Rate",
-      "sublabel": "CI · passed ÷ total runs · target ≥90%",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "ci"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 90,
-        "warn": 80,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41e9-7b90-838e-5a7be5dfd3ef",
-      "metric_key": "code_quality_bullet_rows.pr_cycle_time",
-      "label": "Pull Request Cycle Time",
-      "sublabel": "Bitbucket · PR opened → merged · lower = better",
-      "unit": "h",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "bitbucket"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 22,
-        "warn": 28,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41f6-7010-919b-a928ad78e547",
-      "metric_key": "ic_kpis.bugs_fixed",
-      "label": "Bugs Fixed",
-      "sublabel": "Jira · bug-type issues closed · period total",
-      "description": "Bug-type Jira issues closed in the selected period. Reflects quality contribution and team reliability.",
-      "unit": "count",
-      "format": "integer",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 3,
-        "warn": 1,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-41ff-7bd2-beb7-dcdebda00c28",
-      "metric_key": "task_delivery_bullet_rows.overrun_ratio",
-      "label": "Median overrun ratio",
-      "sublabel": "Jira · actual ÷ estimated · lower = better",
-      "unit": "×",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 1.5,
-        "warn": 2,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-420d-7be0-9319-7acf1b2c137c",
-      "metric_key": "task_delivery_bullet_rows.scope_completion",
-      "label": "Scope Completion Rate",
-      "sublabel": "Jira · tasks done ÷ committed at sprint start",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 75,
-        "warn": 60,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4213-7091-8d3b-bee9d385de89",
-      "metric_key": "task_delivery_bullet_rows.scope_creep",
-      "label": "Scope Creep Rate",
-      "sublabel": "Jira · added mid-sprint ÷ original count · lower = better",
-      "unit": "%",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 19,
-        "warn": 30,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4220-7793-ad4d-292db9b4ae76",
-      "metric_key": "task_delivery_bullet_rows.on_time_delivery",
-      "label": "On-time Delivery Rate",
-      "sublabel": "Jira · closed by due date",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 70,
-        "warn": 55,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-422c-7e23-9965-d2cbfe171e7f",
-      "metric_key": "task_delivery_bullet_rows.avg_slip",
-      "label": "Avg Slip When Late",
-      "sublabel": "Jira · days past due date · lower = better",
-      "unit": "d",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 3.1,
-        "warn": 4.5,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4239-7ab0-9401-5a71b25e28dd",
-      "metric_key": "ai_bullet_rows.active_ai_members",
-      "label": "Active members",
-      "sublabel": "Cursor · Claude Code · Codex · any activity this period",
-      "higher_is_better": true,
-      "is_member_scale": true,
-      "source_tags": [
-        "cursor",
-        "claude_code",
-        "codex"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 6,
-        "warn": 3,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4243-7690-8ee0-0d4308932682",
-      "metric_key": "ai_bullet_rows.cursor_active",
-      "label": "Cursor — active members",
-      "sublabel": "Cursor · any activity this period",
-      "higher_is_better": true,
-      "is_member_scale": true,
-      "source_tags": [
-        "cursor"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 5,
-        "warn": 3,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-424b-7000-880f-559ffe1dabc3",
-      "metric_key": "ai_bullet_rows.cc_active",
-      "label": "Claude Code — active members",
-      "sublabel": "Anthropic Enterprise API · any activity this period",
-      "higher_is_better": true,
-      "is_member_scale": true,
-      "source_tags": [
-        "claude_code"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 3,
-        "warn": 1,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4262-7b51-a77c-0b26e6eb2d17",
-      "metric_key": "ai_bullet_rows.codex_active",
-      "label": "Codex — active members",
-      "sublabel": "OpenAI API · any activity this period",
-      "higher_is_better": true,
-      "is_member_scale": true,
-      "source_tags": [
-        "codex"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 2,
-        "warn": 1,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-426d-7013-b6a1-e88a6704fec1",
-      "metric_key": "ai_bullet_rows.team_ai_loc",
-      "label": "Team AI Accepted Lines",
-      "sublabel": "Cursor + Claude Code · accepted lines · period total",
-      "unit": "lines",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "cursor",
-        "claude_code"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 1000,
-        "warn": 300,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4274-73d1-a43a-c7fb2352a200",
-      "metric_key": "ai_bullet_rows.cursor_acceptance",
-      "label": "Cursor Acceptance Rate",
-      "sublabel": "Cursor · accepted ÷ shown completions · daily avg",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "cursor"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 55,
-        "warn": 35,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4283-7692-adc8-065e457c3c78",
-      "metric_key": "ai_bullet_rows.cc_tool_acceptance",
-      "label": "Claude Code Tool Acceptance",
-      "sublabel": "Anthropic Enterprise API · accepted ÷ offered · daily avg",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "claude_code"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 60,
-        "warn": 40,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-429b-7fc3-94c1-c5572d8e505c",
-      "metric_key": "ai_bullet_rows.cc_tool_accept",
-      "label": "Claude Code Tool Acceptance",
-      "sublabel": "Anthropic Enterprise API · accepted ÷ offered · daily avg",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "claude_code"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 60,
-        "warn": 40,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42b0-74d3-9568-3e87ca259a93",
-      "metric_key": "ai_bullet_rows.cursor_lines",
-      "label": "Cursor Accepted Lines",
-      "sublabel": "Cursor · lines accepted from AI suggestions · period total",
-      "unit": "lines",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "cursor"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 100,
-        "warn": 30,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42ba-7ba3-a2ca-1d6ea122f598",
-      "metric_key": "ai_bullet_rows.cursor_agents",
-      "label": "Cursor Agent Interactions",
-      "sublabel": "Cursor · agent-mode actions · period total",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "cursor"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 10,
-        "warn": 3,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42c5-70a1-9549-e85794394d4c",
-      "metric_key": "ai_bullet_rows.cursor_completions",
-      "label": "Cursor Completions",
-      "sublabel": "Cursor · inline completions offered · period total",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "cursor"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 30,
-        "warn": 10,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42cd-72e3-b3e4-51af300b4cd0",
-      "metric_key": "ai_bullet_rows.cc_lines",
-      "label": "Claude Code Accepted Lines",
-      "sublabel": "Anthropic Enterprise API · accepted lines · period total",
-      "unit": "lines",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "claude_code"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 50,
-        "warn": 10,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42da-7f01-8940-f25ca2ec58b7",
-      "metric_key": "ai_bullet_rows.cc_sessions",
-      "label": "Claude Code Sessions",
-      "sublabel": "Anthropic Enterprise API · sessions · period total",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "claude_code"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 4,
-        "warn": 1,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42e4-7cd0-bd51-5121a75b023d",
-      "metric_key": "ai_bullet_rows.chatgpt",
-      "label": "ChatGPT Activity",
-      "sublabel": "ChatGPT Team · interactions · period total",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "chatgpt"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 10,
-        "warn": 0,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42ed-7990-b7f3-519dfb6ba1bf",
-      "metric_key": "ai_bullet_rows.claude_web",
-      "label": "Claude.ai Activity",
-      "sublabel": "Claude.ai web · interactions · period total",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "claude_web"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 10,
-        "warn": 0,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42f5-7193-9bb7-bdd8adf752b6",
-      "metric_key": "ai_bullet_rows.ai_loc_share2",
-      "label": "AI Code Acceptance",
-      "sublabel": "Cursor + Claude Code · accepted ÷ clean LOC · daily avg",
-      "unit": "%",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "cursor",
-        "claude_code"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 14,
-        "warn": 8,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-42fc-7151-b75f-7f3201559b72",
-      "metric_key": "collab_bullet_rows.slack_messages_sent",
-      "label": "Messages Sent",
-      "sublabel": "Slack · messages sent · period total",
-      "unit": "messages",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "slack"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 100,
-        "warn": 40,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-430b-7270-a263-46d50fe9c246",
-      "metric_key": "collab_bullet_rows.slack_channel_posts",
-      "label": "Channel Posts",
-      "sublabel": "Slack · posts in public channels · period total",
-      "unit": "messages",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "slack"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 25,
-        "warn": 10,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4317-7810-bc29-d3484d0d7998",
-      "metric_key": "collab_bullet_rows.slack_active_days",
-      "label": "Active Days",
-      "sublabel": "Slack · days with any messages · period total",
-      "unit": "days",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "slack"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 15,
-        "warn": 8,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4320-7ce0-8c9f-9024d1b21ba7",
-      "metric_key": "collab_bullet_rows.slack_msgs_per_active_day",
-      "label": "Messages per Active Day",
-      "sublabel": "Slack · messages ÷ active days · daily avg",
-      "unit": "messages/day",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "slack"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 10,
-        "warn": 4,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-432a-7d90-880a-798fb009f648",
-      "metric_key": "collab_bullet_rows.slack_dm_ratio",
-      "label": "DM Ratio",
-      "sublabel": "Slack · DMs ÷ all messages · daily avg · lower = more open",
-      "unit": "%",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "slack"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 30,
-        "warn": 50,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4337-7650-ab29-b6618ec0c884",
-      "metric_key": "collab_bullet_rows.m365_active_days",
-      "label": "Active Days",
-      "sublabel": "M365 · days with any sent / chat / file activity · period total",
-      "unit": "days",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 18,
-        "warn": 10,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4343-7541-be56-34056ccb640d",
-      "metric_key": "collab_bullet_rows.m365_emails_sent",
-      "label": "Emails Sent",
-      "sublabel": "M365 · emails sent · period total",
-      "unit": "emails",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 30,
-        "warn": 5,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-434a-78f3-935f-37e043cd3c71",
-      "metric_key": "collab_bullet_rows.m365_emails_received",
-      "label": "Emails Received",
-      "sublabel": "M365 · inbox volume · period total",
-      "unit": "emails",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 100,
-        "warn": 30,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4351-7771-95ff-868d9e4e3592",
-      "metric_key": "collab_bullet_rows.m365_emails_read",
-      "label": "Emails Read",
-      "sublabel": "M365 · emails read · period total",
-      "unit": "emails",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 200,
-        "warn": 50,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-435a-7ba2-adab-e106f89c4a22",
-      "metric_key": "collab_bullet_rows.m365_teams_chats",
-      "label": "Teams Chats",
-      "sublabel": "Microsoft Teams · DMs and group chats · period total",
-      "unit": "messages",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 50,
-        "warn": 20,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4362-7c40-b109-7aa3411c948a",
-      "metric_key": "collab_bullet_rows.m365_files_engaged",
-      "label": "Files Engaged",
-      "sublabel": "M365 · files viewed or edited · period total",
-      "unit": "files",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 40,
-        "warn": 15,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4368-7330-859b-cdd77f2f81a6",
-      "metric_key": "collab_bullet_rows.m365_files_shared_internal",
-      "label": "Files Shared (Internal)",
-      "sublabel": "M365 · files shared inside org · period total",
-      "unit": "files",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 6,
-        "warn": 2,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-436e-7cf2-ada2-b79c890b1d26",
-      "metric_key": "collab_bullet_rows.m365_files_shared_external",
-      "label": "Files Shared (External)",
-      "sublabel": "M365 · files shared outside org · period total · governance signal",
-      "unit": "files",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 1,
-        "warn": 0,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4376-75f1-afd8-5554afb41a20",
-      "metric_key": "collab_bullet_rows.meeting_hours",
-      "label": "Meeting Hours",
-      "sublabel": "Teams + Zoom · longest modality per meeting · period total",
-      "unit": "h",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365",
-        "zoom"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 40,
-        "warn": 80,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4380-7aa0-9d38-c85cfdf7f141",
-      "metric_key": "collab_bullet_rows.meetings_count",
-      "label": "Meetings Attended",
-      "sublabel": "Teams + Zoom · distinct meetings joined · period total",
-      "unit": "meetings",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365",
-        "zoom"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 40,
-        "warn": 10,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4387-75e1-9f18-3be6fb067937",
-      "metric_key": "collab_bullet_rows.teams_meeting_hours",
-      "label": "Teams Meeting Hours",
-      "sublabel": "Microsoft Teams · longest modality per meeting · period total",
-      "unit": "h",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 30,
-        "warn": 60,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-438e-7c73-bfc0-0725456fe25c",
-      "metric_key": "collab_bullet_rows.zoom_meeting_hours",
-      "label": "Zoom Meeting Hours",
-      "sublabel": "Zoom · longest modality per meeting · period total",
-      "unit": "h",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "zoom"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 20,
-        "warn": 40,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-439c-74e1-a804-138c8eb6d115",
-      "metric_key": "collab_bullet_rows.teams_meetings",
-      "label": "Teams Meetings Attended",
-      "sublabel": "Microsoft Teams · distinct meetings joined · period total",
-      "unit": "meetings",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 25,
-        "warn": 5,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-43a8-7881-90c2-144d924afdd6",
-      "metric_key": "collab_bullet_rows.zoom_meetings",
-      "label": "Zoom Meetings Attended",
-      "sublabel": "Zoom · distinct meetings joined · period total",
-      "unit": "meetings",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "zoom"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 15,
-        "warn": 3,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-43ae-7db2-a910-f1d6ccf19837",
-      "metric_key": "collab_bullet_rows.meeting_free",
-      "label": "Meeting-Free Days",
-      "sublabel": "Teams + Zoom · days with any record but no meeting time · period total",
-      "unit": "days",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365",
-        "zoom"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 4,
-        "warn": 2,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-43b5-7993-a03d-96d232f5f00c",
-      "metric_key": "ic_kpis.ai_loc_share_pct",
-      "label": "AI Code Acceptance",
-      "sublabel": "Cursor + Claude Code",
-      "description": "Share of authored lines accepted from AI suggestions (Cursor + Claude Code). Reflects how much AI tooling contributes to actual output.",
-      "unit": "%",
-      "format": "percent",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "cursor",
-        "claude_code"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 20,
-        "warn": 10,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-43bb-7c32-bc63-948833d913c2",
-      "metric_key": "ic_kpis.focus_time_pct",
-      "label": "Focus Time",
-      "sublabel": "Calendar / M365",
-      "description": "Share of work time spent in uninterrupted 60-minute+ blocks. Higher means fewer context switches and more deep work.",
-      "unit": "%",
-      "format": "percent",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 60,
-        "warn": 50,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-43c2-7e93-aade-4e4be0300a6d",
-      "metric_key": "ic_kpis.tasks_closed",
-      "label": "Tasks Closed",
-      "sublabel": "Jira",
-      "description": "Jira tasks moved to Done in the selected period. Direct measure of delivery throughput.",
-      "format": "integer",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "jira"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 5,
-        "warn": 3,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-43ce-7021-84f0-10ea834edce2",
-      "metric_key": "ic_kpis.ai_sessions",
-      "label": "AI Sessions",
-      "sublabel": "Cursor",
-      "description": "Distinct Cursor sessions in the selected period. Proxy for how often AI tooling is engaged.",
-      "format": "integer",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "cursor"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 4,
-        "warn": 1,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-4593-74b3-a24f-1b6039a5f65d",
-      "metric_key": "ai_bullet_rows.cc_cost",
-      "label": "Claude Code Cost",
-      "sublabel": "Claude Team · usage cost · cents · period total",
-      "description": "Per-user-per-day spend in cents from the Claude Team plan. Claude Team is the only per-user cost source in Silver; Enterprise and Admin costs are org-level only.",
-      "unit": "¢",
-      "higher_is_better": false,
-      "is_member_scale": false,
-      "source_tags": [
-        "claude_team"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 5000,
-        "warn": 10000,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-459a-75b1-ae62-abc1376a272b",
-      "metric_key": "ai_bullet_rows.prs_with_cc",
-      "label": "PRs with Claude Code",
-      "sublabel": "Claude Team GitHub-app · PRs with CC attribution · period total",
-      "description": "Number of pull requests where Claude Code was active at least once in the measurement window. Populated only on tenants with the Anthropic GitHub-app connected; 0 on orgs without it.",
-      "unit": "PRs",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "claude_team"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 3,
-        "warn": 1,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e83b1-45a0-74e0-bbfd-2fd9472afcac",
-      "metric_key": "ai_bullet_rows.prs_total",
-      "label": "Total PRs (CC window)",
-      "sublabel": "Claude Team GitHub-app · total PRs in window · period total",
-      "description": "Total pull requests opened in the measurement window — denominator for the prs_with_cc_pct ratio metric. Same availability caveat as prs_with_cc: requires the Anthropic GitHub-app connection.",
-      "unit": "PRs",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "claude_team"
-      ],
-      "schema_status": "error",
-      "schema_error_code": "column_not_found",
-      "thresholds": {
-        "good": 5,
-        "warn": 2,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e9000-0000-7000-a000-000000000053",
-      "metric_key": "collab_person_counter_daily.messages_sent",
-      "label": "Messages sent",
-      "sublabel": "Chat messages across sources · period total",
-      "unit": "messages",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365",
-        "slack",
-        "zulip"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 200,
-        "warn": 50,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    },
-    {
-      "id": "019e9000-0000-7000-a000-000000000054",
-      "metric_key": "collab_person_counter_daily.channel_posts",
-      "label": "Channel posts",
-      "sublabel": "Channel posts + replies · period total",
-      "unit": "messages",
-      "higher_is_better": true,
-      "is_member_scale": false,
-      "source_tags": [
-        "m365",
-        "slack"
-      ],
-      "schema_status": "ok",
-      "thresholds": {
-        "good": 20,
-        "warn": 5,
-        "resolved_from": "product-default",
-        "bounded_by_lock": false
-      }
-    }
-  ],
-  "links": [
-    {
-      "query_id": "00000000-0000-0000-0001-000000000003",
-      "catalog_metric_ids": [
-        "019e83b1-4062-7bf3-910b-6d4c9156b2e8",
-        "019e83b1-4073-7353-b7f5-1063409c5100",
-        "019e83b1-4085-7b33-9775-fcae1205eb34",
-        "019e83b1-4097-7642-a73d-33a41dbbc6b6",
-        "019e83b1-409e-7bb2-81f6-6399f9ef744b",
-        "019e83b1-40ab-7c30-bf66-1cad2ecd315d",
-        "019e83b1-4135-7f13-9d9a-151585fa096f",
-        "019e83b1-414f-76d2-aa73-73fe6aea34f6",
-        "019e83b1-4158-7c50-9a6a-58228b89f228",
-        "019e83b1-4161-7510-be2e-b87e2a25a051",
-        "019e83b1-416f-7512-a8f8-ce641347076e",
-        "019e83b1-41ff-7bd2-beb7-dcdebda00c28",
-        "019e83b1-420d-7be0-9319-7acf1b2c137c",
-        "019e83b1-4213-7091-8d3b-bee9d385de89",
-        "019e83b1-4220-7793-ad4d-292db9b4ae76",
-        "019e83b1-422c-7e23-9965-d2cbfe171e7f"
-      ]
-    },
-    {
-      "query_id": "00000000-0000-0000-0001-000000000004",
-      "catalog_metric_ids": [
-        "019e83b1-41d7-7390-9c12-ef065fd68f9d",
-        "019e83b1-41e0-7093-89d8-8c1cd06b1e43",
-        "019e83b1-41e9-7b90-838e-5a7be5dfd3ef"
-      ]
-    },
-    {
-      "query_id": "00000000-0000-0000-0001-000000000005",
-      "catalog_metric_ids": [
-        "019e83b1-42fc-7151-b75f-7f3201559b72",
-        "019e83b1-430b-7270-a263-46d50fe9c246",
-        "019e83b1-4317-7810-bc29-d3484d0d7998",
-        "019e83b1-4320-7ce0-8c9f-9024d1b21ba7",
-        "019e83b1-432a-7d90-880a-798fb009f648",
-        "019e83b1-4337-7650-ab29-b6618ec0c884",
-        "019e83b1-4343-7541-be56-34056ccb640d",
-        "019e83b1-434a-78f3-935f-37e043cd3c71",
-        "019e83b1-4351-7771-95ff-868d9e4e3592",
-        "019e83b1-435a-7ba2-adab-e106f89c4a22",
-        "019e83b1-4362-7c40-b109-7aa3411c948a",
-        "019e83b1-4368-7330-859b-cdd77f2f81a6",
-        "019e83b1-436e-7cf2-ada2-b79c890b1d26",
-        "019e83b1-4376-75f1-afd8-5554afb41a20",
-        "019e83b1-4380-7aa0-9d38-c85cfdf7f141",
-        "019e83b1-4387-75e1-9f18-3be6fb067937",
-        "019e83b1-438e-7c73-bfc0-0725456fe25c",
-        "019e83b1-439c-74e1-a804-138c8eb6d115",
-        "019e83b1-43a8-7881-90c2-144d924afdd6",
-        "019e83b1-43ae-7db2-a910-f1d6ccf19837"
-      ]
-    },
-    {
-      "query_id": "00000000-0000-0000-0001-000000000006",
-      "catalog_metric_ids": [
-        "019e83b1-4239-7ab0-9401-5a71b25e28dd",
-        "019e83b1-4243-7690-8ee0-0d4308932682",
-        "019e83b1-424b-7000-880f-559ffe1dabc3",
-        "019e83b1-4262-7b51-a77c-0b26e6eb2d17",
-        "019e83b1-426d-7013-b6a1-e88a6704fec1",
-        "019e83b1-4274-73d1-a43a-c7fb2352a200",
-        "019e83b1-4283-7692-adc8-065e457c3c78",
-        "019e83b1-429b-7fc3-94c1-c5572d8e505c",
-        "019e83b1-42b0-74d3-9568-3e87ca259a93",
-        "019e83b1-42ba-7ba3-a2ca-1d6ea122f598",
-        "019e83b1-42c5-70a1-9549-e85794394d4c",
-        "019e83b1-42cd-72e3-b3e4-51af300b4cd0",
-        "019e83b1-42da-7f01-8940-f25ca2ec58b7",
-        "019e83b1-42e4-7cd0-bd51-5121a75b023d",
-        "019e83b1-42ed-7990-b7f3-519dfb6ba1bf",
-        "019e83b1-42f5-7193-9bb7-bdd8adf752b6"
-      ]
-    },
-    {
-      "query_id": "00000000-0000-0000-0001-000000000010",
-      "catalog_metric_ids": [
-        "019e83b1-418c-7c13-99ee-81c3252832fe",
-        "019e83b1-419e-7ca1-bceb-74db40804a7d",
-        "019e83b1-41f6-7010-919b-a928ad78e547",
-        "019e83b1-43b5-7993-a03d-96d232f5f00c",
-        "019e83b1-43bb-7c32-bc63-948833d913c2",
-        "019e83b1-43c2-7e93-aade-4e4be0300a6d",
-        "019e83b1-43ce-7021-84f0-10ea834edce2"
-      ]
-    },
-    {
-      "query_id": "00000000-0000-0000-0001-000000000011",
-      "catalog_metric_ids": [
-        "019e83b1-4062-7bf3-910b-6d4c9156b2e8",
-        "019e83b1-4073-7353-b7f5-1063409c5100",
-        "019e83b1-4085-7b33-9775-fcae1205eb34",
-        "019e83b1-4097-7642-a73d-33a41dbbc6b6",
-        "019e83b1-409e-7bb2-81f6-6399f9ef744b",
-        "019e83b1-40ab-7c30-bf66-1cad2ecd315d",
-        "019e83b1-4135-7f13-9d9a-151585fa096f",
-        "019e83b1-414f-76d2-aa73-73fe6aea34f6",
-        "019e83b1-4158-7c50-9a6a-58228b89f228",
-        "019e83b1-4161-7510-be2e-b87e2a25a051",
-        "019e83b1-416f-7512-a8f8-ce641347076e",
-        "019e83b1-41ff-7bd2-beb7-dcdebda00c28",
-        "019e83b1-420d-7be0-9319-7acf1b2c137c",
-        "019e83b1-4213-7091-8d3b-bee9d385de89",
-        "019e83b1-4220-7793-ad4d-292db9b4ae76",
-        "019e83b1-422c-7e23-9965-d2cbfe171e7f"
-      ]
-    },
-    {
-      "query_id": "00000000-0000-0000-0001-000000000012",
-      "catalog_metric_ids": [
-        "019e83b1-42fc-7151-b75f-7f3201559b72",
-        "019e83b1-430b-7270-a263-46d50fe9c246",
-        "019e83b1-4317-7810-bc29-d3484d0d7998",
-        "019e83b1-4320-7ce0-8c9f-9024d1b21ba7",
-        "019e83b1-432a-7d90-880a-798fb009f648",
-        "019e83b1-4337-7650-ab29-b6618ec0c884",
-        "019e83b1-4343-7541-be56-34056ccb640d",
-        "019e83b1-434a-78f3-935f-37e043cd3c71",
-        "019e83b1-4351-7771-95ff-868d9e4e3592",
-        "019e83b1-435a-7ba2-adab-e106f89c4a22",
-        "019e83b1-4362-7c40-b109-7aa3411c948a",
-        "019e83b1-4368-7330-859b-cdd77f2f81a6",
-        "019e83b1-436e-7cf2-ada2-b79c890b1d26",
-        "019e83b1-4376-75f1-afd8-5554afb41a20",
-        "019e83b1-4380-7aa0-9d38-c85cfdf7f141",
-        "019e83b1-4387-75e1-9f18-3be6fb067937",
-        "019e83b1-438e-7c73-bfc0-0725456fe25c",
-        "019e83b1-439c-74e1-a804-138c8eb6d115",
-        "019e83b1-43a8-7881-90c2-144d924afdd6",
-        "019e83b1-43ae-7db2-a910-f1d6ccf19837"
-      ]
-    },
-    {
-      "query_id": "00000000-0000-0000-0001-000000000013",
-      "catalog_metric_ids": [
-        "019e83b1-4239-7ab0-9401-5a71b25e28dd",
-        "019e83b1-4243-7690-8ee0-0d4308932682",
-        "019e83b1-424b-7000-880f-559ffe1dabc3",
-        "019e83b1-4262-7b51-a77c-0b26e6eb2d17",
-        "019e83b1-426d-7013-b6a1-e88a6704fec1",
-        "019e83b1-4274-73d1-a43a-c7fb2352a200",
-        "019e83b1-4283-7692-adc8-065e457c3c78",
-        "019e83b1-429b-7fc3-94c1-c5572d8e505c",
-        "019e83b1-42b0-74d3-9568-3e87ca259a93",
-        "019e83b1-42ba-7ba3-a2ca-1d6ea122f598",
-        "019e83b1-42c5-70a1-9549-e85794394d4c",
-        "019e83b1-42cd-72e3-b3e4-51af300b4cd0",
-        "019e83b1-42da-7f01-8940-f25ca2ec58b7",
-        "019e83b1-42e4-7cd0-bd51-5121a75b023d",
-        "019e83b1-42ed-7990-b7f3-519dfb6ba1bf",
-        "019e83b1-42f5-7193-9bb7-bdd8adf752b6"
-      ]
-    },
-    {
-      "query_id": "00000000-0000-0000-0001-000000000018",
-      "catalog_metric_ids": [
-        "019e83b1-4178-7641-a971-3fbc4e3ad3e0",
-        "019e83b1-4180-79f0-abe6-84608a1f0541",
-        "019e83b1-4193-75f1-94fc-c14a3bc29631",
-        "019e83b1-41a7-7b02-be97-9697f0fdada3",
-        "019e83b1-41b6-75f3-9443-b373afa02352",
-        "019e83b1-41c0-7752-a6a1-78057117d593",
-        "019e83b1-41d0-77c0-8c4c-1cd8a96a857b"
-      ]
-    }
-  ]
-}
diff --git a/src/mocks/factories.ts b/src/mocks/factories.ts
deleted file mode 100644
index 278ef802..00000000
--- a/src/mocks/factories.ts
+++ /dev/null
@@ -1,665 +0,0 @@
-import type {
-  RawBulletAggregateRow,
-  RawCrmFlowRow,
-  RawCrmKpisRow,
-  RawCrmPipelineRow,
-  RawDeliveryTrendRow,
-  RawIcAggregateRow,
-  RawLocTrendRow,
-  RawTeamMemberRow,
-} from "@/api/raw-types";
-import { prefixForBulletSection } from "@/api/catalog-client";
-import catalogSnapshot from "./catalog-snapshot.json";
-
-type SnapshotMetric = { metric_key?: string; unit?: string };
-
-// Bare metric keys per bullet section, sourced from the frozen wire
-// catalog snapshot (`catalog-snapshot.json`) — keeps mocks aligned with
-// the live wire shape without re-introducing compile-in metric metadata
-// (Refs #82).
-const BULLET_KEYS_BY_SECTION: Map<string, Array<{ metric_key: string; unit: string }>> = (() => {
-  const out = new Map<string, Array<{ metric_key: string; unit: string }>>();
-  const metrics = (catalogSnapshot as { metrics?: SnapshotMetric[] }).metrics ?? [];
-  for (const section of ["task_delivery", "git_output", "code_quality", "ai_adoption", "collaboration"]) {
-    const prefixDot = `${prefixForBulletSection(section)}.`;
-    const rows: Array<{ metric_key: string; unit: string }> = [];
-    for (const m of metrics) {
-      if (m.metric_key && m.metric_key.startsWith(prefixDot)) {
-        rows.push({
-          metric_key: m.metric_key.slice(prefixDot.length),
-          unit: m.unit ?? "",
-        });
-      }
-    }
-    out.set(section, rows);
-  }
-  return out;
-})();
-
-function vary(base: number, index: number, spread: number): number {
-  const hash = Math.sin(index * 9301 + 49297) * 49297;
-  const factor = (hash - Math.floor(hash)) * 2 - 1; // -1 to 1
-  return Math.round((base + factor * spread) * 10) / 10;
-}
-
-function isoDate(weeksAgo: number): string {
-  const d = new Date();
-  d.setDate(d.getDate() - weeksAgo * 7);
-  return d.toISOString().split('T')[0];
-}
-
-function hashStr(s: string): number {
-  let h = 0;
-  for (let i = 0; i < s.length; i++) {
-    h = ((h << 5) - h + s.charCodeAt(i)) | 0;
-  }
-  return Math.abs(h);
-}
-
-import { PEOPLE, teamMembers } from "./registry";
-export { PEOPLE, teamMembers };
-
-type IcBulletDef = {
-  metric_key: string;
-  section: string;
-  label: string;
-  sublabel: string;
-  unit: string;
-  range_min: string;
-  range_max: string;
-  median: number;
-  median_label: string;
-  bar_width_pct: number;
-  median_left_pct: number;
-  status: string;
-  drill_id: string;
-  defaultValue: number;
-};
-
-const IC_BULLET_MOCKS: IcBulletDef[] = [
-  // task_delivery
-  { metric_key: 'tasks_completed', section: 'task_delivery', label: 'Tasks Completed', sublabel: 'Jira \u00b7 closed issues in sprint', unit: 'count', range_min: '0', range_max: '15', median: 7, median_label: 'Median: 7', bar_width_pct: 80, median_left_pct: 47, status: 'good', drill_id: 'tasks-completed', defaultValue: 12 },
-  { metric_key: 'task_dev_time', section: 'task_delivery', label: 'Task Development Time', sublabel: 'Jira \u00b7 time in In Progress state \u00b7 lower = better', unit: 'h', range_min: '8h', range_max: '31h', median: 15, median_label: 'Median: 15h', bar_width_pct: 43, median_left_pct: 48, status: 'good', drill_id: 'cycle-time', defaultValue: 14 },
-  { metric_key: 'estimation_accuracy', section: 'task_delivery', label: 'Estimation Accuracy', sublabel: 'Jira \u00b7 tasks within \u00b120% of original estimate', unit: '\u00d7', range_min: '0\u00d7', range_max: '3\u00d7', median: 0, median_label: 'Target 0.9\u20131.3\u00d7', bar_width_pct: 22, median_left_pct: 33, status: 'good', drill_id: '', defaultValue: 1.1 },
-  { metric_key: 'task_reopen_rate', section: 'task_delivery', label: 'Task Reopen Rate', sublabel: 'Jira \u00b7 closed then reopened within 14 days \u00b7 lower = better', unit: '%', range_min: '0%', range_max: '15%', median: 5, median_label: 'Median: 5%', bar_width_pct: 27, median_left_pct: 33, status: 'good', drill_id: 'task-reopen', defaultValue: 4 },
-  { metric_key: 'due_date_compliance', section: 'task_delivery', label: 'Due Date Compliance', sublabel: 'Jira \u00b7 tasks closed by due date', unit: '%', range_min: '40%', range_max: '100%', median: 72, median_label: 'Median: 72%', bar_width_pct: 87, median_left_pct: 53, status: 'good', drill_id: '', defaultValue: 92 },
-  { metric_key: 'worklog_logging_accuracy', section: 'task_delivery', label: 'Worklog Logging Accuracy', sublabel: 'Jira \u00b7 worklog logged \u00f7 time in In Progress \u00b7 100 = on target', unit: '%', range_min: '10%', range_max: '120%', median: 65, median_label: 'Median: 65%', bar_width_pct: 60, median_left_pct: 50, status: 'good', drill_id: '', defaultValue: 78 },
-  { metric_key: 'bugs_to_task_ratio', section: 'task_delivery', label: 'Bugs / Tasks Closed', sublabel: 'Jira \u00b7 bug-type issues \u00f7 total closed \u00b7 lower = better', unit: '%', range_min: '0%', range_max: '60%', median: 22, median_label: 'Median: 22%', bar_width_pct: 30, median_left_pct: 35, status: 'good', drill_id: '', defaultValue: 18 },
-  { metric_key: 'mean_time_to_resolution', section: 'task_delivery', label: 'Mean Time to Resolution', sublabel: 'Jira \u00b7 close \u2212 create \u00b7 lower = better', unit: 'd', range_min: '1d', range_max: '60d', median: 12, median_label: 'Median: 12d', bar_width_pct: 25, median_left_pct: 20, status: 'good', drill_id: '', defaultValue: 9 },
-  { metric_key: 'stale_in_progress', section: 'task_delivery', label: 'Stale In-Progress', sublabel: 'Jira \u00b7 In-Progress issues untouched > 14 days', unit: 'tasks', drill_id: '', range_min: '0', range_max: '25', median: 3, median_label: 'Median: 3', bar_width_pct: 12, median_left_pct: 12, status: 'good', defaultValue: 2 },
-  // git_output
-  { metric_key: 'commits', section: 'git_output', label: 'Commits Created', sublabel: 'Bitbucket \u00b7 commits authored', unit: 'count', range_min: '8', range_max: '55', median: 22, median_label: 'Median: 22', bar_width_pct: 55, median_left_pct: 30, status: 'good', drill_id: 'commits', defaultValue: 34 },
-  { metric_key: 'prs_created', section: 'git_output', label: 'Pull Requests Created', sublabel: 'Bitbucket \u00b7 PRs authored', unit: 'count', range_min: '2', range_max: '14', median: 6, median_label: 'Median: 6', bar_width_pct: 75, median_left_pct: 33, status: 'good', drill_id: 'pull-requests', defaultValue: 11 },
-  { metric_key: 'prs_merged', section: 'git_output', label: 'Pull Requests Merged', sublabel: 'Bitbucket \u00b7 authored and merged', unit: 'count', range_min: '0', range_max: '20', median: 6, median_label: 'Median: 6', bar_width_pct: 45, median_left_pct: 38, status: 'good', drill_id: '', defaultValue: 9 },
-  { metric_key: 'clean_loc', section: 'git_output', label: 'Clean LOC', sublabel: 'Bitbucket \u00b7 lines added \u00b7 excl. spec/config', unit: 'count', range_min: '1k', range_max: '18k', median: 7000, median_label: 'Median: 7k', bar_width_pct: 65, median_left_pct: 35, status: 'good', drill_id: '', defaultValue: 12000 },
-  // Per-PR distribution metrics (medians over period) and counter-derived
-  // ratios. Visual variety on the dashboard: different units, statuses, bar fills.
-  // pr_cycle_time_h is opened \u2192 merged. Real "opened \u2192 first review" requires
-  // author\u2194reviewer identity-resolution (reviewer namespace mismatch in silver).
-  { metric_key: 'pr_cycle_time_h', section: 'git_output', label: 'Pull Request Cycle Time', sublabel: 'Bitbucket \u00b7 PR opened \u2192 merged \u00b7 per-PR median \u00b7 lower = better', unit: 'h', range_min: '4h', range_max: '72h', median: 22, median_label: 'Target <24h', bar_width_pct: 41, median_left_pct: 26, status: 'warn', drill_id: 'pull-requests', defaultValue: 28 },
-  { metric_key: 'pr_size', section: 'git_output', label: 'PR Size', sublabel: 'Bitbucket \u00b7 lines changed per PR \u00b7 per-PR median \u00b7 smaller = reviewable', unit: 'count', range_min: '20', range_max: '800', median: 180, median_label: 'Target <200', bar_width_pct: 30, median_left_pct: 22, status: 'good', drill_id: '', defaultValue: 220 },
-  { metric_key: 'merge_rate', section: 'git_output', label: 'PR Merge Rate', sublabel: 'Bitbucket \u00b7 \u03a3 merged \u00f7 \u03a3 created over period \u00b7 higher = better', unit: '%', range_min: '30%', range_max: '100%', median: 78, median_label: 'Median: 78%', bar_width_pct: 84, median_left_pct: 69, status: 'good', drill_id: '', defaultValue: 88 },
-  { metric_key: 'lines_per_commit', section: 'git_output', label: 'Lines / Commit', sublabel: 'Bitbucket \u00b7 \u03a3 LOC \u00f7 \u03a3 commits \u00b7 lower = reviewable', unit: 'count', range_min: '20', range_max: '300', median: 85, median_label: 'Target <100', bar_width_pct: 23, median_left_pct: 23, status: 'good', drill_id: '', defaultValue: 62 },
-  { metric_key: 'commits_per_active_day', section: 'git_output', label: 'Commits / Active Day', sublabel: 'Bitbucket \u00b7 \u03a3 commits \u00f7 days with any commit \u00b7 cadence', unit: 'count', range_min: '0.5', range_max: '8', median: 3.2, median_label: 'Median: 3.2', bar_width_pct: 56, median_left_pct: 36, status: 'good', drill_id: '', defaultValue: 4.5 },
-  // code_quality
-  { metric_key: 'reviews_given', section: 'code_quality', label: 'Reviews Given', sublabel: 'Bitbucket \u00b7 PRs reviewed', unit: 'count', range_min: '0', range_max: '20', median: 8, median_label: 'Median: 8', bar_width_pct: 70, median_left_pct: 40, status: 'good', drill_id: 'reviews', defaultValue: 14 },
-  { metric_key: 'rework_ratio', section: 'code_quality', label: 'Rework Ratio', sublabel: 'Bitbucket \u00b7 lines changed in follow-up commits \u00b7 lower = better', unit: '%', range_min: '0%', range_max: '50%', median: 0, median_label: 'Target <20%', bar_width_pct: 12, median_left_pct: 20, status: 'good', drill_id: '', defaultValue: 12 },
-  { metric_key: 'build_success', section: 'code_quality', label: 'Build Success Rate', sublabel: 'CI \u00b7 passed \u00f7 total runs \u00b7 target \u226590%', unit: '%', range_min: '0%', range_max: '100%', median: 87, median_label: 'Target \u226590% \u00b7 Median: 87%', bar_width_pct: 94, median_left_pct: 83, status: 'good', drill_id: 'builds', defaultValue: 94 },
-  { metric_key: 'pr_cycle_time', section: 'code_quality', label: 'Pull Request Cycle Time', sublabel: 'Bitbucket \u00b7 PR opened \u2192 merged \u00b7 lower = better', unit: 'h', range_min: '0h', range_max: '72h', median: 24, median_label: 'Median: 24h', bar_width_pct: 36, median_left_pct: 35, status: 'good', drill_id: 'pull-requests', defaultValue: 18 },
-  { metric_key: 'pickup_time', section: 'code_quality', label: 'Pickup Time', sublabel: 'Bitbucket \u00b7 PR opened \u2192 first review \u00b7 lower = better', unit: 'h', range_min: '0h', range_max: '48h', median: 0, median_label: 'Target <24h', bar_width_pct: 17, median_left_pct: 24, status: 'good', drill_id: '', defaultValue: 4.2 },
-  { metric_key: 'bugs_fixed', section: 'code_quality', label: 'Bugs Fixed', sublabel: 'Jira \u00b7 bug-type issues closed', unit: 'count', range_min: '0', range_max: '30', median: 9, median_label: 'Median: 9', bar_width_pct: 77, median_left_pct: 30, status: 'good', drill_id: 'bugs-fixed', defaultValue: 23 },
-  { metric_key: 'bug_reopen_rate', section: 'code_quality', label: 'Bug Reopen Rate', sublabel: 'Jira \u00b7 bugs reopened \u00b7 lower = better', unit: '%', range_min: '0%', range_max: '30%', median: 14, median_label: 'Median: 14% \u00b7 Target <15%', bar_width_pct: 30, median_left_pct: 47, status: 'good', drill_id: '', defaultValue: 9 },
-  // ai_tools
-  { metric_key: 'cursor_completions', section: 'ai_tools', label: 'Cursor Completions', sublabel: 'Cursor \u00b7 completions suggested this month', unit: 'count', range_min: '200', range_max: '5k', median: 800, median_label: 'Median: 800', bar_width_pct: 24, median_left_pct: 16, status: 'good', drill_id: '', defaultValue: 1200 },
-  { metric_key: 'cursor_agents', section: 'ai_tools', label: 'Cursor Agent Sessions', sublabel: 'Cursor \u00b7 agentic sessions started', unit: 'count', range_min: '2', range_max: '40', median: 10, median_label: 'Median: 10', bar_width_pct: 45, median_left_pct: 25, status: 'good', drill_id: '', defaultValue: 18 },
-  { metric_key: 'cursor_lines', section: 'ai_tools', label: 'Lines Accepted', sublabel: 'Cursor \u00b7 lines of code accepted', unit: 'count', range_min: '0', range_max: '5k', median: 1800, median_label: 'Median: 1.8k', bar_width_pct: 64, median_left_pct: 36, status: 'good', drill_id: '', defaultValue: 3200 },
-  { metric_key: 'cc_sessions', section: 'ai_tools', label: 'Claude Code Sessions', sublabel: 'Anthropic Enterprise API \u00b7 sessions this month', unit: 'count', range_min: '0', range_max: '60', median: 12, median_label: 'Median: 12', bar_width_pct: 40, median_left_pct: 20, status: 'good', drill_id: '', defaultValue: 24 },
-  { metric_key: 'cc_tool_accept', section: 'ai_tools', label: 'Tool Acceptance Rate', sublabel: 'Anthropic Enterprise API \u00b7 accepted \u00f7 offered', unit: '%', range_min: '0%', range_max: '100%', median: 64, median_label: 'Median: 64%', bar_width_pct: 76, median_left_pct: 64, status: 'good', drill_id: '', defaultValue: 76 },
-  { metric_key: 'cc_lines', section: 'ai_tools', label: 'Lines Added (Claude Code)', sublabel: 'Anthropic Enterprise API \u00b7 lines added by Claude Code', unit: 'count', range_min: '0', range_max: '3k', median: 600, median_label: 'Median: 600', bar_width_pct: 37, median_left_pct: 20, status: 'good', drill_id: '', defaultValue: 1100 },
-  { metric_key: 'ai_loc_share2', section: 'ai_tools', label: 'AI Code Acceptance', sublabel: 'Cursor + Claude Code \u00b7 accepted lines \u00f7 clean LOC', unit: '%', range_min: '0%', range_max: '34%', median: 18, median_label: 'Median: 18%', bar_width_pct: 79, median_left_pct: 53, status: 'good', drill_id: '', defaultValue: 27 },
-  { metric_key: 'claude_web', section: 'ai_tools', label: 'Claude Web Usage', sublabel: 'Claude Web \u00b7 conversations this month', unit: 'count', range_min: '0', range_max: '80', median: 18, median_label: 'Median: 18', bar_width_pct: 40, median_left_pct: 23, status: 'good', drill_id: '', defaultValue: 32 },
-  { metric_key: 'chatgpt', section: 'ai_tools', label: 'ChatGPT Usage', sublabel: 'ChatGPT \u00b7 conversations this month', unit: 'count', range_min: '0', range_max: '40', median: 12, median_label: 'Median: 12', bar_width_pct: 20, median_left_pct: 30, status: 'good', drill_id: '', defaultValue: 8 },
-  // collab
-  { metric_key: 'slack_messages_sent', section: 'collab', label: 'Messages Sent', sublabel: 'Slack \u00b7 messages sent \u00b7 avg per person \u00b7 period total', unit: 'messages', range_min: '0', range_max: '400', median: 120, median_label: 'Median: 120', bar_width_pct: 35, median_left_pct: 30, status: 'good', drill_id: '', defaultValue: 140 },
-  { metric_key: 'slack_channel_posts', section: 'collab', label: 'Channel Posts', sublabel: 'Slack \u00b7 posts in public channels \u00b7 avg per person \u00b7 period total', unit: 'messages', range_min: '0', range_max: '80', median: 29, median_label: 'Median: 29', bar_width_pct: 43, median_left_pct: 36, status: 'good', drill_id: '', defaultValue: 34 },
-  { metric_key: 'slack_active_days', section: 'collab', label: 'Active Days', sublabel: 'Slack \u00b7 days with any messages \u00b7 avg per person \u00b7 period total', unit: 'days', range_min: '0', range_max: '22', median: 14, median_label: 'Median: 14', bar_width_pct: 64, median_left_pct: 64, status: 'good', drill_id: '', defaultValue: 16 },
-  { metric_key: 'slack_msgs_per_active_day', section: 'collab', label: 'Messages per Active Day', sublabel: 'Slack \u00b7 messages \u00f7 active days \u00b7 avg per person \u00b7 daily avg', unit: 'messages/day', range_min: '0', range_max: '40', median: 8, median_label: 'Median: 8', bar_width_pct: 25, median_left_pct: 20, status: 'good', drill_id: '', defaultValue: 9 },
-  { metric_key: 'slack_dm_ratio', section: 'collab', label: 'DM Ratio', sublabel: 'Slack \u00b7 DMs \u00f7 all messages \u00b7 avg per person \u00b7 daily avg \u00b7 lower = more open', unit: '%', range_min: '0%', range_max: '100%', median: 28, median_label: 'Median: 28% \u00b7 lower = more open', bar_width_pct: 24, median_left_pct: 28, status: 'good', drill_id: '', defaultValue: 24 },
-  { metric_key: 'm365_active_days', section: 'collab', label: 'Active Days', sublabel: 'M365 \u00b7 days with any sent / chat / file activity \u00b7 avg per person \u00b7 period total', unit: 'days', range_min: '0', range_max: '22', median: 18, median_label: 'Median: 18', bar_width_pct: 80, median_left_pct: 80, status: 'good', drill_id: '', defaultValue: 19 },
-  { metric_key: 'm365_emails_sent', section: 'collab', label: 'Emails Sent', sublabel: 'M365 \u00b7 emails sent \u00b7 avg per person \u00b7 period total', unit: 'emails', range_min: '0', range_max: '120', median: 35, median_label: 'Median: 35', bar_width_pct: 26, median_left_pct: 29, status: 'good', drill_id: '', defaultValue: 31 },
-  { metric_key: 'm365_emails_received', section: 'collab', label: 'Emails Received', sublabel: 'M365 \u00b7 inbox volume \u00b7 avg per person \u00b7 period total', unit: 'emails', range_min: '0', range_max: '500', median: 150, median_label: 'Median: 150', bar_width_pct: 30, median_left_pct: 30, status: 'good', drill_id: '', defaultValue: 180 },
-  { metric_key: 'm365_emails_read', section: 'collab', label: 'Emails Read', sublabel: 'M365 \u00b7 emails read \u00b7 avg per person \u00b7 period total', unit: 'emails', range_min: '0', range_max: '800', median: 250, median_label: 'Median: 250', bar_width_pct: 35, median_left_pct: 31, status: 'good', drill_id: '', defaultValue: 280 },
-  { metric_key: 'm365_teams_chats', section: 'collab', label: 'Teams Chats', sublabel: 'Microsoft Teams \u00b7 DMs and group chats \u00b7 avg per person \u00b7 period total', unit: 'messages', range_min: '0', range_max: '400', median: 148, median_label: 'Median: 148', bar_width_pct: 42, median_left_pct: 37, status: 'good', drill_id: '', defaultValue: 168 },
-  { metric_key: 'm365_files_engaged', section: 'collab', label: 'Files Engaged', sublabel: 'M365 \u00b7 files viewed or edited \u00b7 avg per person \u00b7 period total', unit: 'files', range_min: '0', range_max: '200', median: 60, median_label: 'Median: 60', bar_width_pct: 30, median_left_pct: 30, status: 'good', drill_id: '', defaultValue: 70 },
-  { metric_key: 'm365_files_shared_internal', section: 'collab', label: 'Files Shared (Internal)', sublabel: 'M365 \u00b7 files shared inside org \u00b7 avg per person \u00b7 period total', unit: 'files', range_min: '0', range_max: '30', median: 8, median_label: 'Median: 8', bar_width_pct: 30, median_left_pct: 27, status: 'good', drill_id: '', defaultValue: 9 },
-  { metric_key: 'm365_files_shared_external', section: 'collab', label: 'Files Shared (External)', sublabel: 'M365 \u00b7 files shared outside org \u00b7 avg per person \u00b7 period total \u00b7 governance signal', unit: 'files', range_min: '0', range_max: '10', median: 1, median_label: 'Median: 1', bar_width_pct: 10, median_left_pct: 10, status: 'good', drill_id: '', defaultValue: 0 },
-  { metric_key: 'meeting_hours', section: 'collab', label: 'Meeting Hours', sublabel: 'Teams + Zoom \u00b7 longest modality per meeting \u00b7 avg per person \u00b7 period total', unit: 'h', range_min: '0', range_max: '60', median: 20, median_label: 'Median: 20h', bar_width_pct: 33, median_left_pct: 33, status: 'good', drill_id: '', defaultValue: 24 },
-  { metric_key: 'meetings_count', section: 'collab', label: 'Meetings Attended', sublabel: 'Teams + Zoom \u00b7 distinct meetings joined \u00b7 avg per person \u00b7 period total', unit: 'meetings', range_min: '0', range_max: '120', median: 40, median_label: 'Median: 40', bar_width_pct: 33, median_left_pct: 33, status: 'good', drill_id: '', defaultValue: 50 },
-  { metric_key: 'teams_meeting_hours', section: 'collab', label: 'Teams Meeting Hours', sublabel: 'Microsoft Teams \u00b7 longest modality per meeting \u00b7 avg per person \u00b7 period total', unit: 'h', range_min: '0', range_max: '50', median: 14, median_label: 'Median: 14h', bar_width_pct: 28, median_left_pct: 28, status: 'good', drill_id: '', defaultValue: 18 },
-  { metric_key: 'zoom_meeting_hours', section: 'collab', label: 'Zoom Meeting Hours', sublabel: 'Zoom \u00b7 longest modality per meeting \u00b7 avg per person \u00b7 period total', unit: 'h', range_min: '0', range_max: '30', median: 6, median_label: 'Median: 6h', bar_width_pct: 20, median_left_pct: 20, status: 'good', drill_id: '', defaultValue: 8 },
-  { metric_key: 'teams_meetings', section: 'collab', label: 'Teams Meetings Attended', sublabel: 'Microsoft Teams \u00b7 distinct meetings joined \u00b7 avg per person \u00b7 period total', unit: 'meetings', range_min: '0', range_max: '80', median: 28, median_label: 'Median: 28', bar_width_pct: 35, median_left_pct: 35, status: 'good', drill_id: '', defaultValue: 32 },
-  { metric_key: 'zoom_meetings', section: 'collab', label: 'Zoom Meetings Attended', sublabel: 'Zoom \u00b7 distinct meetings joined \u00b7 avg per person \u00b7 period total', unit: 'meetings', range_min: '0', range_max: '40', median: 9, median_label: 'Median: 9', bar_width_pct: 25, median_left_pct: 22, status: 'good', drill_id: '', defaultValue: 11 },
-  { metric_key: 'meeting_free', section: 'collab', label: 'Meeting-Free Days', sublabel: 'Teams + Zoom \u00b7 days with any record but no meeting time \u00b7 avg per person \u00b7 period total', unit: 'days', range_min: '0', range_max: '15', median: 5, median_label: 'Median: 5', bar_width_pct: 33, median_left_pct: 33, status: 'good', drill_id: '', defaultValue: 6 },
-];
-
-// IC sections -> metric keys mapping
-const IC_SECTIONS: Record<string, string[]> = {
-  task_delivery: ['tasks_completed', 'task_dev_time', 'estimation_accuracy', 'task_reopen_rate', 'due_date_compliance', 'worklog_logging_accuracy', 'bugs_to_task_ratio', 'mean_time_to_resolution', 'stale_in_progress'],
-  git_output: ['commits', 'prs_created', 'prs_merged', 'clean_loc', 'pr_cycle_time_h', 'pr_size', 'merge_rate', 'lines_per_commit', 'commits_per_active_day'],
-  code_quality: ['reviews_given', 'rework_ratio', 'build_success', 'pr_cycle_time', 'pickup_time', 'bugs_fixed', 'bug_reopen_rate'],
-  ai_tools: ['cursor_completions', 'cursor_agents', 'cursor_lines', 'cc_sessions', 'cc_tool_accept', 'cc_lines', 'ai_loc_share2', 'claude_web', 'chatgpt'],
-  collab: ['slack_messages_sent', 'slack_channel_posts', 'slack_active_days', 'slack_msgs_per_active_day', 'slack_dm_ratio', 'm365_active_days', 'm365_emails_sent', 'm365_emails_received', 'm365_emails_read', 'm365_teams_chats', 'm365_files_engaged', 'm365_files_shared_internal', 'm365_files_shared_external', 'meeting_free', 'meeting_hours', 'meetings_count', 'teams_meeting_hours', 'zoom_meeting_hours', 'teams_meetings', 'zoom_meetings'],
-};
-
-export function mockTeamMemberRow(overrides?: Partial<RawTeamMemberRow>): RawTeamMemberRow {
-  return {
-    person_id: 'p1',
-    display_name: 'Alice Kim',
-    seniority: 'Senior',
-    supervisor_email: null,
-    org_unit_id: 'Engineering',
-    tasks_closed: 12,
-    bugs_fixed: 5,
-    dev_time_h: 14,
-    prs_merged: 11,
-    build_success_pct: 96,
-    focus_time_pct: 72,
-    ai_tools: ['Cursor', 'Claude Code'],
-    ai_loc_share_pct: 27,
-    ...overrides,
-  };
-}
-
-
-export function mockIcAggregateRow(overrides?: Partial<RawIcAggregateRow>): RawIcAggregateRow {
-  return {
-    person_id: 'p1',
-    loc: 12000,
-    ai_loc_share_pct: 27,
-    prs_merged: 9,
-    pr_cycle_time_h: 18,
-    focus_time_pct: 72,
-    tasks_closed: 12,
-    bugs_fixed: 23,
-    build_success_pct: 96,
-    ai_sessions: 42,
-    loc_median: 9000,
-    ai_loc_share_pct_median: 20,
-    prs_merged_median: 6,
-    pr_cycle_time_h_median: 24,
-    focus_time_pct_median: 65,
-    tasks_closed_median: 8,
-    bugs_fixed_median: 14,
-    build_success_pct_median: 90,
-    ai_sessions_median: 30,
-    peer_n: 8,
-    ...overrides,
-  };
-}
-
-export function mockLocTrendRow(overrides?: Partial<RawLocTrendRow>): RawLocTrendRow {
-  return {
-    date_bucket: isoDate(1),
-    code_loc: 2800,
-    spec_lines: 210,
-    config_loc: 140,
-    ...overrides,
-  };
-}
-
-export function mockDeliveryTrendRow(overrides?: Partial<RawDeliveryTrendRow>): RawDeliveryTrendRow {
-  return {
-    date_bucket: isoDate(1),
-    commits: 9,
-    prs_merged: 3,
-    tasks_done: 3,
-    ...overrides,
-  };
-}
-
-export function mockBulletRow(overrides?: Partial<RawBulletAggregateRow>): RawBulletAggregateRow {
-  return {
-    metric_key: 'tasks_completed',
-    value: 5.3,
-    median: 5.8,
-    range_min: null,
-    range_max: null,
-    ...overrides,
-  };
-}
-
-export function mockTeamMemberRows(count = PEOPLE.length): RawTeamMemberRow[] {
-  return PEOPLE.slice(0, count).map((p, i) => {
-    const hasAi = p.ai_tools.length > 0;
-    return mockTeamMemberRow({
-      person_id: p.person_id,
-      display_name: p.name,
-      seniority: p.seniority,
-      org_unit_id: p.department,
-      ai_tools: p.ai_tools,
-      tasks_closed: Math.max(1, Math.round(vary(7, i, 5))),
-      bugs_fixed: Math.max(0, Math.round(vary(3, i, 2))),
-      dev_time_h: Math.max(8, Math.round(vary(16, i, 7))),
-      prs_merged: Math.max(1, Math.round(vary(6, i, 4))),
-      build_success_pct: Math.min(100, Math.max(70, Math.round(vary(90, i, 8)))),
-      focus_time_pct: Math.min(100, Math.max(30, Math.round(vary(63, i, 15)))),
-      ai_loc_share_pct: hasAi ? Math.min(40, Math.max(5, Math.round(vary(18, i, 10)))) : 0,
-    });
-  });
-}
-
-export function mockTeamMemberRowsForTeam(teamId: string): RawTeamMemberRow[] {
-  const members = teamMembers(teamId);
-  return members.map((p, i) => {
-    const hasAi = p.ai_tools.length > 0;
-    return mockTeamMemberRow({
-      person_id: p.person_id,
-      display_name: p.name,
-      seniority: p.seniority,
-      org_unit_id: p.department,
-      ai_tools: p.ai_tools,
-      tasks_closed: Math.max(1, Math.round(vary(7, i, 5))),
-      bugs_fixed: Math.max(0, Math.round(vary(3, i, 2))),
-      dev_time_h: Math.max(8, Math.round(vary(16, i, 7))),
-      prs_merged: Math.max(1, Math.round(vary(6, i, 4))),
-      build_success_pct: Math.min(100, Math.max(70, Math.round(vary(90, i, 8)))),
-      focus_time_pct: Math.min(100, Math.max(30, Math.round(vary(63, i, 15)))),
-      ai_loc_share_pct: hasAi ? Math.min(40, Math.max(5, Math.round(vary(18, i, 10)))) : 0,
-    });
-  });
-}
-
-export function mockLocTrendSeries(weeks = 8): RawLocTrendRow[] {
-  return Array.from({ length: weeks }, (_, i) => ({
-    date_bucket: isoDate(weeks - i),
-    code_loc: Math.max(0, Math.round(vary(2700, i, 800))),
-    spec_lines: Math.max(0, Math.round(vary(200, i, 80))),
-    config_loc: Math.max(0, Math.round(vary(150, i, 60))),
-  }));
-}
-
-export function mockDeliveryTrendSeries(weeks = 8): RawDeliveryTrendRow[] {
-  return Array.from({ length: weeks }, (_, i) => ({
-    date_bucket: isoDate(weeks - i),
-    commits: Math.max(0, Math.round(vary(28, i, 12))),
-    prs_merged: Math.max(0, Math.round(vary(8, i, 4))),
-    tasks_done: Math.max(0, Math.round(vary(9, i, 4))),
-  }));
-}
-
-// Production config no longer carries distribution defaults — only the
-// backend supplies real numbers — so this seed data is mock-only.
-type MockBulletDist = { median: number; range_min: number; range_max: number };
-
-// Partial so unknown keys are typed as `undefined` — the caller's missing-entry
-// guard + fallback below is then visible to the type checker (codacy flagged
-// them as dead code under `Record<string, T>` which always resolves to `T`).
-const MOCK_BULLET_DIST: Partial<Record<string, MockBulletDist>> = {
-  tasks_completed:            { median: 5.8,   range_min: 0,  range_max: 15 },
-  task_dev_time:              { median: 15,    range_min: 8,  range_max: 31 },
-  task_reopen_rate:           { median: 5,     range_min: 0,  range_max: 15 },
-  due_date_compliance:        { median: 72,    range_min: 40, range_max: 100 },
-  estimation_accuracy:        { median: 58,    range_min: 0,  range_max: 100 },
-  worklog_logging_accuracy:   { median: 65,    range_min: 10, range_max: 120 },
-  bugs_to_task_ratio:         { median: 22,    range_min: 0,  range_max: 60 },
-  mean_time_to_resolution:    { median: 12,    range_min: 1,  range_max: 60 },
-  stale_in_progress:          { median: 3,     range_min: 0,  range_max: 25 },
-  commits:                    { median: 50,    range_min: 0,  range_max: 1000 },
-  prs_per_dev:                { median: 6,     range_min: 0,  range_max: 20 },
-  build_success:              { median: 89,    range_min: 78, range_max: 97 },
-  pr_cycle_time:              { median: 22,    range_min: 10, range_max: 35 },
-  bugs_fixed:                 { median: 3,     range_min: 1,  range_max: 8 },
-  overrun_ratio:              { median: 1.5,   range_min: 1,  range_max: 3 },
-  scope_completion:           { median: 79,    range_min: 0,  range_max: 100 },
-  scope_creep:                { median: 19,    range_min: 0,  range_max: 50 },
-  on_time_delivery:           { median: 71,    range_min: 0,  range_max: 100 },
-  avg_slip:                   { median: 3.1,   range_min: 0,  range_max: 6 },
-  active_ai_members:          { median: 7,     range_min: 0,  range_max: 12 },
-  cursor_active:              { median: 6,     range_min: 0,  range_max: 12 },
-  cc_active:                  { median: 3,     range_min: 0,  range_max: 12 },
-  codex_active:               { median: 2,     range_min: 0,  range_max: 12 },
-  team_ai_loc:                { median: 1186,  range_min: 0,  range_max: 5000 },
-  cursor_acceptance:          { median: 58,    range_min: 0,  range_max: 100 },
-  cc_tool_acceptance:         { median: 64,    range_min: 0,  range_max: 100 },
-  cc_tool_accept:             { median: 64,    range_min: 0,  range_max: 100 },
-  cursor_lines:               { median: 200,   range_min: 0,  range_max: 1000 },
-  cursor_agents:              { median: 10,    range_min: 0,  range_max: 100 },
-  cursor_completions:         { median: 40,    range_min: 0,  range_max: 200 },
-  cc_lines:                   { median: 80,    range_min: 0,  range_max: 500 },
-  cc_sessions:                { median: 6,     range_min: 0,  range_max: 40 },
-  chatgpt:                    { median: 0,     range_min: 0,  range_max: 100 },
-  claude_web:                 { median: 0,     range_min: 0,  range_max: 100 },
-  ai_loc_share2:              { median: 14,    range_min: 0,  range_max: 50 },
-  slack_messages_sent:        { median: 120,   range_min: 0,  range_max: 400 },
-  slack_channel_posts:        { median: 29,    range_min: 0,  range_max: 80 },
-  slack_active_days:          { median: 14,    range_min: 0,  range_max: 22 },
-  slack_msgs_per_active_day:  { median: 8,     range_min: 0,  range_max: 40 },
-  slack_dm_ratio:             { median: 28,    range_min: 0,  range_max: 100 },
-  m365_active_days:           { median: 18,    range_min: 0,  range_max: 22 },
-  m365_emails_sent:           { median: 35,    range_min: 0,  range_max: 120 },
-  m365_emails_received:       { median: 150,   range_min: 0,  range_max: 500 },
-  m365_emails_read:           { median: 250,   range_min: 0,  range_max: 800 },
-  m365_teams_chats:           { median: 148,   range_min: 0,  range_max: 400 },
-  m365_files_engaged:         { median: 60,    range_min: 0,  range_max: 200 },
-  m365_files_shared_internal: { median: 8,     range_min: 0,  range_max: 30 },
-  m365_files_shared_external: { median: 1,     range_min: 0,  range_max: 10 },
-  meeting_hours:              { median: 20,    range_min: 0,  range_max: 60 },
-  meetings_count:             { median: 40,    range_min: 0,  range_max: 120 },
-  teams_meeting_hours:        { median: 14,    range_min: 0,  range_max: 50 },
-  zoom_meeting_hours:         { median: 6,     range_min: 0,  range_max: 30 },
-  teams_meetings:             { median: 28,    range_min: 0,  range_max: 80 },
-  zoom_meetings:              { median: 9,     range_min: 0,  range_max: 40 },
-  meeting_free:               { median: 5,     range_min: 0,  range_max: 15 },
-};
-
-export function mockTeamBulletSection(
-  section: string,
-  seed = 0,
-  periodDays = 30,
-): RawBulletAggregateRow[] {
-  const scale = periodDays / 30;
-  const keys = BULLET_KEYS_BY_SECTION.get(section) ?? [];
-  return keys.map((d, i) => {
-    const dist = MOCK_BULLET_DIST[d.metric_key];
-    if (!dist && import.meta.env.DEV) {
-      console.warn(
-        `[insight/mocks] MOCK_BULLET_DIST missing entry for "${d.metric_key}" ` +
-        `(section=${section}) — falling back to zero distribution. ` +
-        `Add the key to MOCK_BULLET_DIST in factories.ts.`,
-      );
-    }
-    const d0 = dist ?? { median: 0, range_min: 0, range_max: 100 };
-    const baseValue =
-      Math.round(vary(d0.median, i + seed, Math.max(1, d0.median * 0.3)) * 10) / 10;
-    const distScale = shouldScaleMetric(d.metric_key, d.unit) ? scale : 1;
-    const value = shouldScaleMetric(d.metric_key, d.unit)
-      ? Math.round(baseValue * scale * 10) / 10
-      : baseValue;
-    const scaleDist = (n: number) => Math.round(n * distScale * 10) / 10;
-    const median = scaleDist(d0.median);
-    const rangeMin = scaleDist(d0.range_min);
-    const rangeMax = scaleDist(d0.range_max);
-    return {
-      metric_key: d.metric_key,
-      value,
-      median,
-      range_min: rangeMin,
-      range_max: rangeMax,
-      p25: rangeMin + (median - rangeMin) * 0.5,
-      p75: median + (rangeMax - median) * 0.5,
-      n: 10,
-    };
-  });
-}
-
-// Returns rows with passthrough display fields that transforms.ts reads
-// via a `Record<string,unknown>` cast.
-const NON_SCALING_UNITS = new Set<string>(["%", "h", "d", "×", "lines"]);
-const NON_SCALING_KEYS = new Set<string>([
-  "build_success",
-  "focus_time_pct",
-  "ai_loc_share",
-  "ai_loc_share2",
-  "merge_rate",
-  "due_date_compliance",
-  "task_reopen_rate",
-  "estimation_accuracy",
-  "bugs_to_task_ratio",
-  "flow_efficiency",
-  "worklog_logging_accuracy",
-  "cursor_acceptance",
-  "cc_tool_acceptance",
-  "slack_dm_ratio",
-]);
-
-function shouldScaleMetric(metricKey: string, unit: string): boolean {
-  if (NON_SCALING_KEYS.has(metricKey)) return false;
-  if (NON_SCALING_UNITS.has(unit)) return false;
-  return true;
-}
-
-export function mockIcBulletSection(
-  section: string,
-  seed = 0,
-  periodDays = 30,
-): RawBulletAggregateRow[] {
-  const keys = IC_SECTIONS[section];
-  if (!keys) return [];
-  const scale = periodDays / 30;
-
-  return keys.map((key, i) => {
-    const def = IC_BULLET_MOCKS.find((d) => d.metric_key === key);
-    if (!def) {
-      return {
-        metric_key: key,
-        value: 0,
-        median: null,
-        range_min: null,
-        range_max: null,
-      };
-    }
-
-    const baseValue = Math.round(vary(def.defaultValue, i + seed, def.defaultValue * 0.2) * 10) / 10;
-    const value = shouldScaleMetric(def.metric_key, def.unit)
-      ? Math.round(baseValue * scale * 10) / 10
-      : baseValue;
-
-    // Build the base raw row
-    const row: RawBulletAggregateRow = {
-      metric_key: def.metric_key,
-      value,
-      median: def.median ?? null,
-      range_min: null,
-      range_max: null,
-    };
-
-    // Attach passthrough display fields that transforms.ts reads
-    // when no team-bullet entry is found (the IC-level path).
-    // range_min/range_max in IC_BULLET_MOCKS are human-friendly strings like
-    // '0%' / '15%' / '1k' / '18k' / '500h'. transforms.ts later runs them
-    // through formatRangeStr which appends the unit again, so we have to
-    // strip the unit characters here. But magnitude suffixes (`k`, `m`)
-    // carry actual scale and **must** be honored — turning '18k' into 18
-    // gives bullets a 1000× wrong range and a broken bar geometry.
-    const numeric = (s: string): number => {
-      const stripped = s.trim().toLowerCase().replace(/[%×hd\s]/g, '');
-      const match = /^(-?\d+(?:\.\d+)?)([km])?$/.exec(stripped);
-      if (!match) return 0;
-      const base = Number(match[1]);
-      if (!Number.isFinite(base)) return 0;
-      const mult = match[2] === 'k' ? 1_000 : match[2] === 'm' ? 1_000_000 : 1;
-      return base * mult;
-    };
-    row.range_min = numeric(def.range_min);
-    row.range_max = numeric(def.range_max);
-    const ext = row as unknown as Record<string, unknown>;
-    ext['section'] = def.section;
-    ext['label'] = def.label;
-    ext['sublabel'] = def.sublabel;
-    ext['unit'] = def.unit;
-    ext['median_label'] = def.median_label;
-    ext['bar_left_pct'] = 0;
-    ext['bar_width_pct'] = def.bar_width_pct;
-    ext['median_left_pct'] = def.median_left_pct;
-    ext['status'] = def.status;
-    ext['drill_id'] = def.drill_id;
-
-    return row;
-  });
-}
-
-export function mockTeamScenario(teamId = 'bob.park@example.com'): {
-  members: RawTeamMemberRow[];
-  bullets: Record<string, RawBulletAggregateRow[]>;
-} {
-  const teamSeed = hashStr(teamId);
-  const members = mockTeamMemberRowsForTeam(teamId);
-
-  const bulletSections = ['task_delivery', 'code_quality', 'estimation', 'ai_adoption', 'collaboration'];
-  const bullets: Record<string, RawBulletAggregateRow[]> = {};
-  for (const section of bulletSections) {
-    bullets[section] = mockTeamBulletSection(section, teamSeed);
-  }
-
-  return { members, bullets };
-}
-
-export function mockIcScenario(personId = 'p1'): {
-  kpiAggregate: RawIcAggregateRow;
-  prevKpiAggregate: RawIcAggregateRow;
-  bullets: Record<string, RawBulletAggregateRow[]>;
-  locTrend: RawLocTrendRow[];
-  deliveryTrend: RawDeliveryTrendRow[];
-} {
-  const personSeed = hashStr(personId);
-
-  const kpiAggregate = mockIcAggregateRow({
-    person_id: personId,
-    loc: Math.round(vary(12000, personSeed, 5000)),
-    ai_loc_share_pct: Math.round(vary(25, personSeed, 10)),
-    prs_merged: Math.round(vary(9, personSeed, 4)),
-    pr_cycle_time_h: Math.round(vary(18, personSeed, 8)),
-    focus_time_pct: Math.round(vary(68, personSeed, 12)),
-    tasks_closed: Math.round(vary(12, personSeed, 5)),
-    bugs_fixed: Math.round(vary(5, personSeed, 3)),
-    build_success_pct: Math.min(100, Math.max(70, Math.round(vary(94, personSeed, 6)))),
-    ai_sessions: Math.round(vary(42, personSeed, 15)),
-  });
-
-  // Previous period aggregate for delta computation (slightly lower values).
-  // RawIcAggregateRow made loc/prs_merged/pr_cycle_time_h nullable to match
-  // the backend; the mock always seeds them non-null above, so propagate
-  // null through in the rare case a caller overrides with null.
-  const scalePrev = (v: number | null, f: number): number | null =>
-    v === null ? null : Math.round(v * f);
-  const subPrev = (v: number | null, min: number, d: number): number | null =>
-    v === null ? null : Math.max(min, v - d);
-  const prevKpiAggregate = mockIcAggregateRow({
-    person_id: personId,
-    loc: scalePrev(kpiAggregate.loc, 0.9),
-    ai_loc_share_pct: Math.round(kpiAggregate.ai_loc_share_pct * 0.85),
-    prs_merged: subPrev(kpiAggregate.prs_merged, 1, 2),
-    pr_cycle_time_h: scalePrev(kpiAggregate.pr_cycle_time_h, 1.1),
-    focus_time_pct: Math.max(30, kpiAggregate.focus_time_pct - 5),
-    tasks_closed: Math.max(1, kpiAggregate.tasks_closed - 3),
-    bugs_fixed: Math.max(0, kpiAggregate.bugs_fixed - 2),
-    build_success_pct: kpiAggregate.build_success_pct !== null
-      ? Math.max(70, kpiAggregate.build_success_pct - 2)
-      : null,
-    ai_sessions: Math.max(0, kpiAggregate.ai_sessions - 8),
-  });
-
-  const icSections = ['task_delivery', 'git_output', 'code_quality', 'ai_tools', 'collab'];
-  const bullets: Record<string, RawBulletAggregateRow[]> = {};
-  for (const section of icSections) {
-    bullets[section] = mockIcBulletSection(section, personSeed);
-  }
-
-  return {
-    kpiAggregate,
-    prevKpiAggregate,
-    bullets,
-    locTrend: mockLocTrendSeries(8),
-    deliveryTrend: mockDeliveryTrendSeries(8),
-  };
-}
-
-// ---------------------------------------------------------------------------
-// CRM (sales-rep dashboard) factories
-// ---------------------------------------------------------------------------
-
-export function mockCrmKpis(
-  personId: string,
-  scale = 1,
-): RawCrmKpisRow {
-  const seed = hashStr(personId);
-  const opened = Math.max(8, Math.round((20 + (seed % 25)) * scale));
-  const closed = Math.max(4, Math.round((12 + (seed % 18)) * scale));
-  const won = Math.min(closed, Math.max(1, Math.round(closed * (0.55 + ((seed >> 4) % 30) / 100))));
-  const avgDealSize = 25_000 + ((seed >> 2) % 40_000);
-  const valueClosed = won * avgDealSize;
-  return {
-    person_id: personId,
-    deals_opened: opened,
-    deals_closed: closed,
-    deals_won: won,
-    deals_value_closed: valueClosed,
-    comms_count: 80 + (seed % 220),
-  };
-}
-
-/**
- * `CRM_PIPELINE_NOW` (…0028) — date-less open-deal snapshot. A separate
- * metric from `mockCrmKpis`: matches the real wire contract where
- * `pipeline_*` come from their own query, not the KPIs row.
- */
-export function mockCrmPipeline(personId: string): RawCrmPipelineRow {
-  const seed = hashStr(personId);
-  const avgDealSize = 25_000 + ((seed >> 2) % 40_000);
-  const pipelineCount = 14 + (seed % 18);
-  const pipelineValue = pipelineCount * (avgDealSize * 0.9);
-  return {
-    person_id: personId,
-    pipeline_count: pipelineCount,
-    pipeline_value: Math.round(pipelineValue),
-  };
-}
-
-export function mockCrmFlowSeries(weeks = 8, personId = "anon"): RawCrmFlowRow[] {
-  const seed = hashStr(personId);
-  const out: RawCrmFlowRow[] = [];
-  const monthFmt = new Intl.DateTimeFormat("en-US", { month: "short", day: "numeric" });
-  for (let w = weeks - 1; w >= 0; w--) {
-    const d = new Date();
-    d.setDate(d.getDate() - w * 7);
-    const iso = d.toISOString().split("T")[0]!;
-    const opened = 4 + ((seed + w * 7) % 9);
-    const closed = 2 + ((seed + w * 5) % 6);
-    const won = Math.min(closed, 1 + ((seed + w * 3) % 4));
-    out.push({
-      date_bucket: monthFmt.format(d),
-      metric_date: iso,
-      opened,
-      closed,
-      won,
-    });
-  }
-  return out;
-}
-
-interface CrmBulletSpec {
-  metric_key: string;
-  value: number;
-  median: number;
-  range_min: number;
-  range_max: number;
-}
-
-const CRM_BULLET_QUALITY_SPEC: CrmBulletSpec[] = [
-  { metric_key: "win_rate",      value: 62, median: 55, range_min: 30, range_max: 85 },
-  { metric_key: "avg_deal_size", value: 42_000, median: 38_000, range_min: 15_000, range_max: 80_000 },
-  { metric_key: "cycle_days",    value: 34, median: 42, range_min: 18, range_max: 75 },
-  { metric_key: "deals_opened",  value: 28, median: 22, range_min: 8, range_max: 50 },
-];
-
-const CRM_BULLET_ACTIVITY_SPEC: CrmBulletSpec[] = [
-  { metric_key: "calls",         value: 84, median: 62, range_min: 20, range_max: 140 },
-  { metric_key: "emails",        value: 220, median: 180, range_min: 60, range_max: 360 },
-  { metric_key: "meetings",      value: 18, median: 14, range_min: 4, range_max: 32 },
-  { metric_key: "comms_per_won", value: 24, median: 32, range_min: 12, range_max: 60 },
-];
-
-export function mockCrmBulletSection(
-  kind: "quality" | "activity",
-  personId: string,
-): RawBulletAggregateRow[] {
-  const seed = hashStr(personId);
-  const spec = kind === "quality" ? CRM_BULLET_QUALITY_SPEC : CRM_BULLET_ACTIVITY_SPEC;
-  return spec.map((s, i) => ({
-    metric_key: s.metric_key,
-    value: vary(s.value, seed + i, s.value * 0.15),
-    median: s.median,
-    range_min: s.range_min,
-    range_max: s.range_max,
-  }));
-}
diff --git a/src/mocks/handlers.ts b/src/mocks/handlers.ts
index 56015288..35293212 100644
--- a/src/mocks/handlers.ts
+++ b/src/mocks/handlers.ts
@@ -1,285 +1,12 @@
 import { http, HttpResponse } from "msw";
 
-import { METRIC_REGISTRY } from "@/api/metric-registry";
 import type { MetricResultsRequest } from "@/api/metric-results-client";
 
 import { buildMetricResultsResponse } from "./metric-results-factory";
-
-import { buildMockCatalogResponse } from "./catalog-factory";
-import {
-  mockCrmBulletSection,
-  mockCrmFlowSeries,
-  mockCrmKpis,
-  mockCrmPipeline,
-  mockDeliveryTrendSeries,
-  mockIcAggregateRow,
-  mockIcBulletSection,
-  mockLocTrendSeries,
-  mockTeamBulletSection,
-  mockTeamMemberRow,
-  mockTeamMemberRows,
-} from "./factories";
-import { buildIdentityTree, PEOPLE, PEOPLE_BY_ID } from "./registry";
-import {
-  mockHistogramBins,
-  mockSectionTrend,
-} from "./v2/factories";
-
-const wrap = <T>(items: T[]) => ({
-  items,
-  page_info: { has_next: false, cursor: null as string | null },
-});
+import { buildIdentityTree, PEOPLE } from "./registry";
 
 const defaultPersonId = PEOPLE[0]?.person_id ?? "bob.park@example.com";
 
-type ODataBody = { $filter?: string };
-
-function parseFilter(body: unknown): {
-  personId?: string;
-  personIds?: string[];
-  orgUnitIds?: string[];
-  metricKey?: string;
-  sectionId?: string;
-  periodDays: number;
-  dateFrom?: string;
-  dateTo?: string;
-} {
-  const f = (body as ODataBody | undefined)?.$filter ?? "";
-  const personMatch = /\bperson_id\s+eq\s+'([^']+)'/i.exec(f);
-  const personInMatch = /\bperson_id\s+in\s+\(([^)]+)\)/i.exec(f);
-  const personIds = personInMatch
-    ? personInMatch[1]
-        .split(",")
-        .map((s) => s.trim().replace(/^'|'$/g, ""))
-        .filter(Boolean)
-    : undefined;
-  const orgUnitInMatch = /\borg_unit_id\s+in\s+\(([^)]+)\)/i.exec(f);
-  const orgUnitIds = orgUnitInMatch
-    ? orgUnitInMatch[1]
-        .split(",")
-        .map((s) => s.trim().replace(/^'|'$/g, ""))
-        .filter(Boolean)
-    : undefined;
-  const metricMatch = /\bmetric_key\s+eq\s+'([^']+)'/i.exec(f);
-  const sectionMatch = /\bsection_id\s+eq\s+'([^']+)'/i.exec(f);
-  const periodDaysMatch = /\bperiod_days\s+eq\s+(\d+)/i.exec(f);
-  const dateFromMatch = /\bmetric_date\s+ge\s+'(\d{4}-\d{2}-\d{2})'/i.exec(f);
-  const dateToMatch = /\bmetric_date\s+l[et]\s+'(\d{4}-\d{2}-\d{2})'/i.exec(f);
-  const dateFrom = dateFromMatch?.[1];
-  const dateTo = dateToMatch?.[1];
-  let periodDays = 30;
-  if (periodDaysMatch) {
-    periodDays = Number(periodDaysMatch[1]);
-  } else if (dateFrom && dateTo) {
-    const from = new Date(dateFrom).getTime();
-    const to = new Date(dateTo).getTime();
-    periodDays = Math.max(
-      1,
-      Math.round((to - from) / 86_400_000) + 1,
-    );
-  }
-  return {
-    personId: personMatch?.[1],
-    personIds,
-    orgUnitIds,
-    metricKey: metricMatch?.[1],
-    sectionId: sectionMatch?.[1],
-    periodDays,
-    dateFrom,
-    dateTo,
-  };
-}
-
-function periodScale(periodDays: number): number {
-  return periodDays / 30;
-}
-
-function seedOf(s: string | undefined): number {
-  if (!s) return 0;
-  let h = 0;
-  for (let i = 0; i < s.length; i++) h = (h * 31 + s.charCodeAt(i)) | 0;
-  return Math.abs(h);
-}
-
-type Handler = (body: unknown) => Record<string, unknown> | unknown[];
-
-const metricHandlers: Record<string, Handler> = {
-  [METRIC_REGISTRY.TEAM_MEMBER]: (body) => {
-    const { personId, personIds, periodDays } = parseFilter(body);
-    const scale = periodScale(periodDays);
-    const rowFor = (p: (typeof PEOPLE)[number]) => {
-      const s = seedOf(p.person_id);
-      return mockTeamMemberRow({
-        person_id: p.person_id,
-        display_name: p.name,
-        seniority: p.seniority,
-        org_unit_id: p.department,
-        ai_tools: p.ai_tools,
-        tasks_closed: Math.max(1, Math.round((3 + (s % 17)) * scale)),
-        bugs_fixed: Math.max(0, Math.round(((s % 11) >> 1) * scale)),
-        dev_time_h: Math.max(8, Math.round((10 + ((s >> 3) % 18)) * scale)),
-        prs_merged: null,
-        build_success_pct: 72 + ((s >> 7) % 26),
-        focus_time_pct: 30 + ((s >> 11) % 55),
-        ai_loc_share_pct: p.ai_tools.length > 0 ? 5 + ((s >> 13) % 35) : 0,
-      });
-    };
-    const lookup = (id: string) =>
-      PEOPLE_BY_ID[id.toLowerCase()] ?? PEOPLE_BY_ID[id];
-    if (personIds) {
-      return wrap(personIds.map(lookup).filter(Boolean).map((p) => rowFor(p!)));
-    }
-    if (personId) {
-      const p = lookup(personId);
-      return wrap(p ? [rowFor(p)] : []);
-    }
-    return wrap(mockTeamMemberRows());
-  },
-
-  [METRIC_REGISTRY.TEAM_BULLET_DELIVERY]: (body) => {
-    const { personIds, periodDays } = parseFilter(body);
-    return wrap(
-      mockTeamBulletSection("task_delivery", seedOf((personIds ?? []).join(",")), periodDays),
-    );
-  },
-  [METRIC_REGISTRY.TEAM_BULLET_QUALITY]: (body) => {
-    const { personIds, periodDays } = parseFilter(body);
-    return wrap(
-      mockTeamBulletSection("code_quality", seedOf((personIds ?? []).join(",")), periodDays),
-    );
-  },
-  [METRIC_REGISTRY.TEAM_BULLET_GIT]: (body) => {
-    const { personIds, periodDays } = parseFilter(body);
-    return wrap(
-      mockTeamBulletSection("git_output", seedOf((personIds ?? []).join(",")), periodDays),
-    );
-  },
-  [METRIC_REGISTRY.TEAM_BULLET_COLLAB]: (body) => {
-    const { personIds, periodDays } = parseFilter(body);
-    return wrap(
-      mockTeamBulletSection("collaboration", seedOf((personIds ?? []).join(",")), periodDays),
-    );
-  },
-  [METRIC_REGISTRY.TEAM_BULLET_AI]: (body) => {
-    const { personIds, periodDays } = parseFilter(body);
-    return wrap(
-      mockTeamBulletSection("ai_adoption", seedOf((personIds ?? []).join(",")), periodDays),
-    );
-  },
-
-  [METRIC_REGISTRY.IC_KPIS]: (body) => {
-    const { personId, periodDays } = parseFilter(body);
-    const scale = periodScale(periodDays);
-    const jitter = seedOf(`${personId ?? "p"}|${periodDays}`) % 1000;
-    const ratio = (base: number, range: number) =>
-      Math.max(1, Math.min(99, Math.round(base + ((jitter / 1000) - 0.5) * range)));
-    return wrap([
-      mockIcAggregateRow({
-        person_id: personId ?? defaultPersonId,
-        loc: Math.round(12000 * scale),
-        prs_merged: Math.max(1, Math.round(9 * scale)),
-        tasks_closed: Math.max(1, Math.round(12 * scale)),
-        bugs_fixed: Math.max(0, Math.round(23 * scale)),
-        ai_sessions: Math.max(1, Math.round(42 * scale)),
-        ai_loc_share_pct: ratio(22, 18),
-        focus_time_pct: ratio(65, 24),
-        build_success_pct: ratio(92, 10),
-        pr_cycle_time_h: Math.max(4, Math.round(18 + ((jitter / 1000) - 0.5) * 16)),
-        loc_median: Math.round(9000 * scale),
-        prs_merged_median: Math.max(1, Math.round(6 * scale)),
-        tasks_closed_median: Math.max(1, Math.round(8 * scale)),
-        bugs_fixed_median: Math.max(0, Math.round(14 * scale)),
-        ai_sessions_median: Math.max(1, Math.round(30 * scale)),
-      }),
-    ]);
-  },
-  [METRIC_REGISTRY.IC_BULLET_DELIVERY]: (body) => {
-    const { personId, periodDays } = parseFilter(body);
-    return wrap(
-      mockIcBulletSection("task_delivery", seedOf(personId), periodDays),
-    );
-  },
-  [METRIC_REGISTRY.IC_BULLET_COLLAB]: (body) => {
-    const { personId, periodDays } = parseFilter(body);
-    return wrap(mockIcBulletSection("collab", seedOf(personId), periodDays));
-  },
-  [METRIC_REGISTRY.IC_BULLET_AI]: (body) => {
-    const { personId, periodDays } = parseFilter(body);
-    return wrap(mockIcBulletSection("ai_tools", seedOf(personId), periodDays));
-  },
-  [METRIC_REGISTRY.IC_BULLET_GIT]: (body) => {
-    const { personId, periodDays } = parseFilter(body);
-    return wrap(
-      mockIcBulletSection("git_output", seedOf(personId), periodDays),
-    );
-  },
-  [METRIC_REGISTRY.V2_MEMBER_PRS]: (body) => {
-    const { personIds, personId, periodDays } = parseFilter(body);
-    const scale = periodScale(periodDays);
-    const ids = personIds ?? (personId ? [personId] : []);
-    return wrap(
-      ids.map((id) => ({
-        person_id: id.toLowerCase(),
-        prs_merged: Math.max(0, Math.round((seedOf(id) % 20) * scale)),
-      })),
-    );
-  },
-  [METRIC_REGISTRY.IC_CHART_LOC]: (body) => {
-    const { periodDays } = parseFilter(body);
-    const weeks = Math.max(2, Math.round(periodDays / 7));
-    return wrap(mockLocTrendSeries(weeks));
-  },
-  [METRIC_REGISTRY.IC_CHART_DELIVERY]: (body) => {
-    const { periodDays } = parseFilter(body);
-    const weeks = Math.max(2, Math.round(periodDays / 7));
-    return wrap(mockDeliveryTrendSeries(weeks));
-  },
-  [METRIC_REGISTRY.IC_DRILL]: () => wrap([]),
-  [METRIC_REGISTRY.IC_TIMEOFF]: () => wrap([]),
-
-  [METRIC_REGISTRY.CRM_KPIS]: (body) => {
-    const { personId } = parseFilter(body);
-    return wrap([mockCrmKpis(personId ?? defaultPersonId)]);
-  },
-  [METRIC_REGISTRY.CRM_PIPELINE_NOW]: (body) => {
-    const { personId } = parseFilter(body);
-    return wrap([mockCrmPipeline(personId ?? defaultPersonId)]);
-  },
-  [METRIC_REGISTRY.CRM_CHART_FLOW]: (body) => {
-    const { personId } = parseFilter(body);
-    return wrap(mockCrmFlowSeries(8, personId ?? defaultPersonId));
-  },
-  [METRIC_REGISTRY.CRM_BULLET_QUALITY]: (body) => {
-    const { personId } = parseFilter(body);
-    return wrap(mockCrmBulletSection("quality", personId ?? defaultPersonId));
-  },
-  [METRIC_REGISTRY.CRM_BULLET_ACTIVITY]: (body) => {
-    const { personId } = parseFilter(body);
-    return wrap(mockCrmBulletSection("activity", personId ?? defaultPersonId));
-  },
-
-  [METRIC_REGISTRY.V2_IC_HISTOGRAM]: (body) => {
-    const { personId, metricKey, periodDays } = parseFilter(body);
-    if (!metricKey) return wrap([]);
-    return wrap(
-      mockHistogramBins(personId ?? defaultPersonId, metricKey, periodDays),
-    );
-  },
-  [METRIC_REGISTRY.V2_IC_SECTION_TREND]: (body) => {
-    const { personId, sectionId, periodDays } = parseFilter(body);
-    if (!personId || !sectionId) return wrap([]);
-    return wrap(mockSectionTrend(personId, sectionId, periodDays ?? 30));
-  },
-};
-
-interface BatchQueryRequest {
-  queries?: Array<{
-    id?: string;
-    metric_id: string;
-    $filter?: string;
-  }>;
-}
-
 // Stable synthetic session for mock/Storybook runs. The old in-code
 // MOCKS_ENABLED viewer path is gone; an authenticated viewer now comes from
 // the same `/auth/me` probe the real app uses, so the boot `loadSession()`
@@ -319,49 +46,6 @@ export const handlers = [
     }
     return HttpResponse.json(buildMetricResultsResponse(body));
   }),
-  http.post(
-    "/api/analytics/v1/metrics/queries",
-    async ({ request }) => {
-      const body = (await request.json().catch(() => ({}))) as BatchQueryRequest;
-      const queries = body.queries ?? [];
-      const results = queries.map((q) => {
-        const handler = metricHandlers[q.metric_id];
-        const payload = handler
-          ? (handler({ $filter: q.$filter }) as { items: unknown[] })
-          : { items: [] };
-        return {
-          status: "ok" as const,
-          id: q.id,
-          metric_id: q.metric_id,
-          items: payload.items,
-          page_info: { has_next: false, cursor: null as string | null },
-        };
-      });
-      return HttpResponse.json({ results });
-    },
-  ),
-  http.post(
-    "/api/analytics/v1/metrics/:metricId/query",
-    async ({ params, request }) => {
-      const metricId = params.metricId as string;
-      const handler = metricHandlers[metricId];
-      if (!handler) return HttpResponse.json(wrap([]));
-      const body = await request.json().catch(() => ({}));
-      return HttpResponse.json(handler(body));
-    },
-  ),
-  http.post(
-    "/api/analytics/v1/catalog/get_metrics",
-    ({ request }) => {
-      // Dev mode uses the X-Tenant-ID header injected by fetchWithAuth so
-      // the mocked response echoes a tenant_id consistent with the
-      // caller's session. Falling back to a synthetic id keeps anonymous
-      // smoke tests from 401'ing in the mock layer.
-      const tenantId =
-        request.headers.get("X-Tenant-ID") ?? "00000000-0000-0000-0000-000000000001";
-      return HttpResponse.json(buildMockCatalogResponse(tenantId));
-    },
-  ),
   http.post(
     "/api/identity/v1/profiles",
     async ({ request }) => {
diff --git a/src/mocks/period-infer.ts b/src/mocks/period-infer.ts
deleted file mode 100644
index a4cb7abe..00000000
--- a/src/mocks/period-infer.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { PeriodValue } from "@/types/insight";
-
-export function inferPeriodFromODataFilter(filter: string): PeriodValue {
-  const match = /metric_date ge '(\d{4}-\d{2}-\d{2})'/.exec(filter);
-  if (!match) return 'month';
-  const days = Math.round(
-    (Date.now() - new Date(match[1]).getTime()) / 86_400_000,
-  );
-  if (days <= 10) return 'week';
-  if (days <= 35) return 'month';
-  if (days <= 100) return 'quarter';
-  return 'year';
-}
diff --git a/src/mocks/registry.ts b/src/mocks/registry.ts
index b44e0744..1cd94557 100644
--- a/src/mocks/registry.ts
+++ b/src/mocks/registry.ts
@@ -44,18 +44,14 @@ export const PEOPLE: MockPerson[] = [
   { person_id: 'dave.sales@example.com',    name: 'Dave Hart',     department: 'Sales',       role: 'Account Executive',        seniority: 'Senior',    is_lead: false, ai_tools: [],                        supervisor_email: null },
 ];
 
-export const PEOPLE_BY_ID: Record<string, MockPerson> = Object.fromEntries(
+const PEOPLE_BY_ID: Record<string, MockPerson> = Object.fromEntries(
   PEOPLE.map((p) => [p.person_id, p]),
 );
 
-export function directReports(supervisorEmail: string): MockPerson[] {
+function directReports(supervisorEmail: string): MockPerson[] {
   return PEOPLE.filter((p) => p.supervisor_email === supervisorEmail);
 }
 
-export function teamMembers(supervisorEmail: string): MockPerson[] {
-  return directReports(supervisorEmail);
-}
-
 export type MockIdentityRaw = {
   email: string;
   display_name: string;
diff --git a/src/mocks/v2/factories.ts b/src/mocks/v2/factories.ts
deleted file mode 100644
index 70dce826..00000000
--- a/src/mocks/v2/factories.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-function hashStr(s: string): number {
-  let h = 0;
-  for (let i = 0; i < s.length; i++) {
-    h = ((h << 5) - h + s.charCodeAt(i)) | 0;
-  }
-  return Math.abs(h);
-}
-
-function rng(seed: number): () => number {
-  let s = seed || 1;
-  return () => {
-    s = (s * 9301 + 49297) % 233280;
-    return s / 233280;
-  };
-}
-
-export interface HistogramBin {
-  metric_key: string;
-  bin: number;
-  bin_end: number;
-  count: number;
-}
-
-export function mockHistogramBins(
-  personId: string,
-  metricKey: string,
-  periodDays = 30,
-): HistogramBin[] {
-  const scale = periodDays / 30;
-  const r = rng(hashStr(`${personId}|${metricKey}|hist`));
-  const binCount = 8;
-  const bins: HistogramBin[] = [];
-  const max = 50 + Math.floor(r() * 50);
-  const step = Math.ceil(max / binCount);
-  for (let i = 0; i < binCount; i++) {
-    bins.push({
-      metric_key: metricKey,
-      bin: i * step,
-      bin_end: (i + 1) * step,
-      count: Math.max(1, Math.round((2 + r() * 14) * scale)),
-    });
-  }
-  return bins;
-}
-
-const SECTION_TREND_SERIES: Record<string, { key: string; base: number; spread: number }[]> = {
-  code_quality: [
-    { key: "pr_cycle_time", base: 22, spread: 12 },
-    { key: "build_success", base: 88, spread: 8 },
-  ],
-  ai_adoption: [
-    { key: "cc_lines", base: 180, spread: 90 },
-    { key: "cursor_lines", base: 240, spread: 120 },
-  ],
-};
-
-export interface SectionTrendLongRow {
-  metric_date: string;
-  section_id: string;
-  series_key: string;
-  value: number;
-}
-
-export function mockSectionTrend(
-  personId: string,
-  sectionId: string,
-  periodDays: number,
-): SectionTrendLongRow[] {
-  const defs = SECTION_TREND_SERIES[sectionId];
-  if (!defs) return [];
-  const days = Math.max(7, Math.min(periodDays, 90));
-  const out: SectionTrendLongRow[] = [];
-  const today = new Date();
-  for (let i = days - 1; i >= 0; i--) {
-    const d = new Date(today);
-    d.setDate(d.getDate() - i);
-    const metric_date = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
-    for (const def of defs) {
-      const r = rng(hashStr(`${personId}|${sectionId}|${def.key}|${i}`));
-      const v = def.base + (r() - 0.5) * 2 * def.spread;
-      out.push({
-        metric_date,
-        section_id: sectionId,
-        series_key: def.key,
-        value: Math.max(0, Math.round(v * 10) / 10),
-      });
-    }
-  }
-  return out;
-}
diff --git a/src/queries/batched-metrics.ts b/src/queries/batched-metrics.ts
deleted file mode 100644
index 8e66f7c3..00000000
--- a/src/queries/batched-metrics.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { useQuery, type UseQueryResult } from "@tanstack/react-query";
-
-import {
-  queryBatchWithRange,
-  type BatchQueryResult,
-} from "@/api/analytics-client";
-import type { DateRange } from "@/api/period-to-date-range";
-
-export interface BatchedMetricSpec {
-  id: string;
-  metricId: string;
-  filter?: string;
-  top?: number;
-  orderby?: string;
-}
-
-export interface UseBatchedMetricsOptions {
-  enabled?: boolean;
-  staleTime?: number;
-  keyPrefix?: string;
-}
-
-export function useBatchedMetrics<T>(
-  specs: BatchedMetricSpec[],
-  range: DateRange,
-  options: UseBatchedMetricsOptions = {},
-): UseQueryResult<Map<string, BatchQueryResult<T>>> {
-  const { enabled = true, staleTime = 5 * 60_000, keyPrefix = "batched" } =
-    options;
-
-  const specsKey = specs.map(
-    (s) => `${s.id}|${s.metricId}|${s.filter ?? ""}|${s.top ?? ""}|${s.orderby ?? ""}`,
-  );
-
-  return useQuery({
-    queryKey: [keyPrefix, range.from, range.to, specsKey],
-    enabled: enabled && specs.length > 0,
-    staleTime,
-    queryFn: async () => {
-      const resp = await queryBatchWithRange<T>(
-        range,
-        specs.map((s) => ({
-          id: s.id,
-          metric_id: s.metricId,
-          $filter: s.filter,
-          $top: s.top,
-          $orderby: s.orderby,
-        })),
-      );
-      const byId = new Map<string, BatchQueryResult<T>>();
-      for (const r of resp.results) {
-        if (r.id !== undefined) byId.set(r.id, r);
-      }
-      return byId;
-    },
-  });
-}
diff --git a/src/queries/ic-dashboard.test.ts b/src/queries/ic-dashboard.test.ts
index 57c00b39..948fcdc0 100644
--- a/src/queries/ic-dashboard.test.ts
+++ b/src/queries/ic-dashboard.test.ts
@@ -3,110 +3,17 @@ import { renderHook, waitFor } from "@testing-library/react";
 import { createElement, type ReactNode } from "react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-import {
-  queryBatchWithRange,
-  queryMetric,
-  type BatchQueryItem,
-  type BatchQueryResult,
-} from "@/api/analytics-client";
 import { getPerson } from "@/api/identity-client";
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import type { RawIcAggregateRow } from "@/api/raw-types";
 import type { IdentityPerson } from "@/types/insight";
-import {
-  useIcBulletSection,
-  useIcDashboardData,
-  useIcDeliveryTrend,
-  useIcDrill,
-  useIcKpis,
-  useIcLocTrend,
-  useIcPerson,
-  useIcTimeOff,
-} from "@/queries/ic-dashboard";
-
-vi.mock("@/api/analytics-client", async (orig) => ({
-  ...(await orig<typeof import("@/api/analytics-client")>()),
-  queryMetric: vi.fn(),
-  queryBatchWithRange: vi.fn(),
-}));
+import { useIcPerson } from "@/queries/ic-dashboard";
 
 vi.mock("@/api/identity-client", async (orig) => ({
   ...(await orig<typeof import("@/api/identity-client")>()),
   getPerson: vi.fn(),
 }));
 
-const CATALOG = vi.hoisted(() => {
-  const metric = (metric_key: string, label: string) => ({
-    id: metric_key,
-    metric_key,
-    label,
-    higher_is_better: true,
-    is_member_scale: false,
-    source_tags: [] as string[],
-    schema_status: "ok" as const,
-    thresholds: {
-      good: 5,
-      warn: 2,
-      resolved_from: "product-default",
-      bounded_by_lock: false,
-    },
-  });
-  return {
-    tenant_id: "t-1",
-    generated_at: "2026-06-01T00:00:00Z",
-    metrics: [
-      metric("ic_kpis.tasks_closed", "Tasks Closed"),
-      metric("task_delivery_bullet_rows.tasks_completed", "Tasks Completed"),
-      metric("code_quality_bullet_rows.build_success", "Build Success"),
-      metric("git_bullet_rows.loc", "Lines of Code"),
-      metric("ai_bullet_rows.ai_sessions", "AI Sessions"),
-      metric("collab_bullet_rows.reviews_given", "Reviews Given"),
-    ],
-    links: [],
-  };
-});
-
-vi.mock("@/api/use-catalog", () => ({
-  useCatalog: () => ({ data: CATALOG }),
-}));
-
-const mockMetric = vi.mocked(queryMetric);
-const mockBatch = vi.mocked(queryBatchWithRange);
 const mockGetPerson = vi.mocked(getPerson);
 
-const RANGE = { from: "2026-06-01", to: "2026-06-30" };
-const PREV_RANGE = { from: "2026-05-01", to: "2026-05-30" };
-const PAGE = { has_next: false, cursor: null };
-
-function odata<T>(items: T[]) {
-  return { items, page_info: PAGE };
-}
-
-function bulletRow(metric_key: string, value = 8) {
-  return {
-    metric_key,
-    value,
-    median: 5,
-    range_min: 0,
-    range_max: 10,
-    p25: 3,
-    p75: 7,
-    n: 12,
-  };
-}
-
-const KPI_CUR = {
-  person_id: "alice@x.com",
-  tasks_closed: 5,
-  tasks_closed_median: 4,
-  peer_n: 9,
-} as unknown as RawIcAggregateRow;
-
-const KPI_PREV = {
-  person_id: "alice@x.com",
-  tasks_closed: 3,
-} as unknown as RawIcAggregateRow;
-
 function wrapper() {
   const client = new QueryClient({
     defaultOptions: { queries: { retry: false, gcTime: 0 } },
@@ -116,8 +23,6 @@ function wrapper() {
 }
 
 beforeEach(() => {
-  mockMetric.mockReset();
-  mockBatch.mockReset();
   mockGetPerson.mockReset();
 });
 
@@ -141,286 +46,3 @@ describe("useIcPerson", () => {
     expect(mockGetPerson).not.toHaveBeenCalled();
   });
 });
-
-describe("useIcKpis", () => {
-  it("fetches current + previous period and computes deltas", async () => {
-    mockMetric.mockImplementation(async (_id, range) =>
-      odata(range.from === RANGE.from ? [KPI_CUR] : [KPI_PREV]),
-    );
-    const { result } = renderHook(
-      () => useIcKpis("alice@x.com", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    expect(result.current.data).toHaveLength(1);
-    expect(result.current.data![0]).toMatchObject({
-      metric_key: "tasks_closed",
-      label: "Tasks Closed",
-      raw_value: 5,
-      delta_type: "good", // 5 vs 3, higher is better
-      peer_median: 4,
-      peer_n: 9,
-    });
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.IC_KPIS,
-      RANGE,
-      { $filter: "person_id eq 'alice@x.com'" },
-    );
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.IC_KPIS,
-      PREV_RANGE,
-      { $filter: "person_id eq 'alice@x.com'" },
-    );
-  });
-});
-
-describe("useIcBulletSection", () => {
-  it("transforms rows for the requested section", async () => {
-    mockMetric.mockResolvedValue(odata([bulletRow("tasks_completed")]));
-    const { result } = renderHook(
-      () => useIcBulletSection("task_delivery", "alice@x.com", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data![0]).toMatchObject({
-      section: "task_delivery",
-      label: "Tasks Completed",
-      status: "good",
-      bar_width_pct: 80,
-    });
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.IC_BULLET_DELIVERY,
-      RANGE,
-      { $filter: "person_id eq 'alice@x.com'" },
-    );
-  });
-});
-
-describe("useIcLocTrend", () => {
-  it("maps raw buckets to chart points", async () => {
-    mockMetric.mockResolvedValue(
-      odata([
-        { date_bucket: "2026-06-01", code_loc: 100, spec_lines: 10, config_loc: 5 },
-      ]),
-    );
-    const { result } = renderHook(
-      () => useIcLocTrend("alice@x.com", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data![0]).toMatchObject({
-      codeLoc: 100,
-      specLines: 10,
-      configLoc: 5,
-    });
-  });
-});
-
-describe("useIcDeliveryTrend", () => {
-  it("maps raw buckets to chart points", async () => {
-    mockMetric.mockResolvedValue(
-      odata([
-        { date_bucket: "2026-06-01", commits: 4, prs_merged: 2, tasks_done: 3 },
-      ]),
-    );
-    const { result } = renderHook(
-      () => useIcDeliveryTrend("alice@x.com", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data![0]).toMatchObject({
-      commits: 4,
-      prsMerged: 2,
-      tasksDone: 3,
-    });
-  });
-});
-
-describe("useIcTimeOff", () => {
-  it("returns the first notice when present", async () => {
-    mockMetric.mockResolvedValue(
-      odata([{ days: 3, date_range: "Jun 1–3", bamboo_hr_url: "https://hr" }]),
-    );
-    const { result } = renderHook(() => useIcTimeOff("alice@x.com", RANGE), {
-      wrapper: wrapper(),
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual({
-      days: 3,
-      dateRange: "Jun 1–3",
-      bambooHrUrl: "https://hr",
-    });
-  });
-
-  it("returns null when there is no notice", async () => {
-    mockMetric.mockResolvedValue(odata([]));
-    const { result } = renderHook(() => useIcTimeOff("alice@x.com", RANGE), {
-      wrapper: wrapper(),
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toBeNull();
-  });
-});
-
-describe("useIcDrill", () => {
-  it("stays disabled with a null drill id", async () => {
-    const { result } = renderHook(
-      () => useIcDrill("alice@x.com", null, RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.fetchStatus).toBe("idle"));
-    expect(mockMetric).not.toHaveBeenCalled();
-  });
-
-  it("fetches and transforms the drill row", async () => {
-    mockMetric.mockResolvedValue(
-      odata([
-        {
-          title: "Bugs",
-          source: "jira",
-          src_class: "jira",
-          value: "4",
-          filter: "f",
-          columns: ["key"],
-          rows: [{ key: "B-1" }],
-        },
-      ]),
-    );
-    const { result } = renderHook(
-      () => useIcDrill("Alice@X.com", "bugs", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toMatchObject({
-      title: "Bugs",
-      srcClass: "jira",
-    });
-    expect(mockMetric).toHaveBeenCalledWith(METRIC_REGISTRY.IC_DRILL, RANGE, {
-      $filter: "person_id eq 'alice@x.com' and drill_id eq 'bugs'",
-    });
-  });
-
-  it("returns null when the drill has no rows", async () => {
-    mockMetric.mockResolvedValue(odata([]));
-    const { result } = renderHook(
-      () => useIcDrill("alice@x.com", "bugs", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toBeNull();
-  });
-});
-
-describe("useIcDashboardData", () => {
-  const DATA_BY_ID: Record<string, unknown[]> = {
-    kpis: [KPI_CUR],
-    kpis_prior: [KPI_PREV],
-    delivery_bullets: [bulletRow("tasks_completed"), bulletRow("build_success")],
-    git_output: [bulletRow("loc")],
-    ai_adoption: [bulletRow("ai_sessions", 1)],
-    collaboration: [bulletRow("reviews_given")],
-    loc_trend: [
-      { date_bucket: "2026-06-01", code_loc: 100, spec_lines: 10, config_loc: 5 },
-    ],
-    delivery_trend: [
-      { date_bucket: "2026-06-01", commits: 4, prs_merged: 2, tasks_done: 3 },
-    ],
-    time_off: [{ days: 2, date_range: "Jun 9–10", bamboo_hr_url: "https://hr" }],
-  };
-
-  it("assembles every section from one batched round-trip pair", async () => {
-    mockBatch.mockImplementation(async (_range, items: BatchQueryItem[]) => ({
-      results: items.map(
-        (it): BatchQueryResult<unknown> => ({
-          status: "ok",
-          id: it.id,
-          metric_id: it.metric_id,
-          items: DATA_BY_ID[it.id!] ?? [],
-          page_info: PAGE,
-        }),
-      ),
-    }));
-    const { result } = renderHook(
-      () => useIcDashboardData("alice@x.com", "month", RANGE, { keepPrevious: true }),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    const data = result.current.data!;
-    expect(data.kpis).toHaveLength(1);
-    expect(data.kpis[0]).toMatchObject({ metric_key: "tasks_closed", raw_value: 5 });
-    // One delivery_bullets payload feeds both sections; each keeps only
-    // the metric keys its catalog wire-prefix owns.
-    expect(data.taskDelivery.map((b) => b.metric_key)).toEqual(["tasks_completed"]);
-    expect(data.codeQuality.map((b) => b.metric_key)).toEqual(["build_success"]);
-    expect(data.gitOutput.map((b) => b.metric_key)).toEqual(["loc"]);
-    expect(data.aiAdoption[0]).toMatchObject({ metric_key: "ai_sessions", status: "bad" });
-    expect(data.collaboration.map((b) => b.metric_key)).toEqual(["reviews_given"]);
-    expect(data.locTrend[0]).toMatchObject({ codeLoc: 100 });
-    expect(data.deliveryTrend[0]).toMatchObject({ commits: 4 });
-    expect(data.timeOff).toEqual({
-      days: 2,
-      dateRange: "Jun 9–10",
-      bambooHrUrl: "https://hr",
-    });
-    expect(Object.values(data.errors).every((e) => e === false)).toBe(true);
-
-    // Two batch calls: current range (8 items) + prior range (kpis only).
-    expect(mockBatch).toHaveBeenCalledTimes(2);
-    expect(mockBatch.mock.calls[0]![0]).toEqual(RANGE);
-    expect(mockBatch.mock.calls[1]![0]).toEqual(PREV_RANGE);
-    expect(
-      (mockBatch.mock.calls[1]![1] as BatchQueryItem[]).map((i) => i.id),
-    ).toEqual(["kpis_prior"]);
-  });
-
-  it("flags every section and returns empty shapes when all items error", async () => {
-    mockBatch.mockImplementation(async (_range, items: BatchQueryItem[]) => ({
-      results: items.map(
-        (it): BatchQueryResult<unknown> => ({
-          status: "error",
-          id: it.id,
-          metric_id: it.metric_id,
-          error: { type: "about:blank", title: "boom", status: 500, detail: "boom" },
-        }),
-      ),
-    }));
-    const { result } = renderHook(
-      () => useIcDashboardData("alice@x.com", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    const data = result.current.data!;
-    expect(data.kpis).toEqual([]);
-    expect(data.taskDelivery).toEqual([]);
-    expect(data.codeQuality).toEqual([]);
-    expect(data.gitOutput).toEqual([]);
-    expect(data.aiAdoption).toEqual([]);
-    expect(data.collaboration).toEqual([]);
-    expect(data.locTrend).toEqual([]);
-    expect(data.deliveryTrend).toEqual([]);
-    expect(data.timeOff).toBeNull();
-    expect(data.errors).toEqual({
-      kpis: true,
-      task_delivery: true,
-      code_quality: true,
-      git_output: true,
-      ai_adoption: true,
-      collaboration: true,
-      loc_trend: true,
-      delivery_trend: true,
-      time_off: true,
-    });
-  });
-
-  it("stays disabled without a person id", async () => {
-    const { result } = renderHook(
-      () => useIcDashboardData("", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.fetchStatus).toBe("idle"));
-    expect(mockBatch).not.toHaveBeenCalled();
-  });
-});
diff --git a/src/queries/ic-dashboard.ts b/src/queries/ic-dashboard.ts
index ceacd1c3..372eacb9 100644
--- a/src/queries/ic-dashboard.ts
+++ b/src/queries/ic-dashboard.ts
@@ -1,56 +1,9 @@
-import {
-  keepPreviousData,
-  useQuery,
-  useQueryClient,
-  type UseQueryResult,
-} from "@tanstack/react-query";
+import { useQuery, useQueryClient, type UseQueryResult } from "@tanstack/react-query";
 
-import {
-  queryBatchWithRange,
-  queryMetric,
-  type BatchQueryResult,
-} from "@/api/analytics-client";
-import type { CatalogResponse } from "@/api/catalog-client";
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import {
-  previousPeriodRange,
-  type DateRange,
-} from "@/api/period-to-date-range";
-import { odataEscapeValue } from "@/api/odata";
 import { getPerson } from "@/api/identity-client";
 import { getViewerEmail } from "@/auth";
 import { findIdentityNode } from "@/lib/insight/identity-tree";
-import {
-  transformBulletMetrics,
-  transformDeliveryTrend,
-  transformDrill,
-  transformIcKpis,
-  transformLocTrend,
-  transformTimeOff,
-} from "@/api/transforms";
-import { useCatalog } from "@/api/use-catalog";
-import type {
-  RawBulletAggregateRow,
-  RawDeliveryTrendRow,
-  RawDrillRow,
-  RawIcAggregateRow,
-  RawLocTrendRow,
-  RawTimeOffRow,
-} from "@/api/raw-types";
-import type {
-  BulletMetric,
-  DeliveryDataPoint,
-  DrillData,
-  IcKpi,
-  IdentityPerson,
-  LocDataPoint,
-  PeriodValue,
-  TimeOffNotice,
-} from "@/types/insight";
-
-function personScope(personId: string): string {
-  return `person_id eq '${odataEscapeValue(personId.toLowerCase())}'`;
-}
+import type { IdentityPerson } from "@/types/insight";
 
 export function useIcPerson(personId: string): UseQueryResult<IdentityPerson> {
   const queryClient = useQueryClient();
@@ -76,361 +29,3 @@ export function useIcPerson(personId: string): UseQueryResult<IdentityPerson> {
     },
   });
 }
-
-export function useIcKpis(
-  personId: string,
-  period: PeriodValue,
-  range: DateRange
-): UseQueryResult<IcKpi[]> {
-  const prevRange = previousPeriodRange(range, period);
-  const { data: catalog } = useCatalog();
-  // Catalog identity in the query key so a late-arriving catalog
-  // hydration re-runs the transform — the queryFn closes over `catalog`
-  // and would otherwise cache an empty result built against an
-  // undefined catalog.
-  const catalogKey = catalog?.generated_at ?? null;
-  return useQuery({
-    queryKey: ["ic", "kpis", personId, period, range.from, range.to, catalogKey],
-    queryFn: async () => {
-      const [cur, prev] = await Promise.all([
-        queryMetric<RawIcAggregateRow>(METRIC_REGISTRY.IC_KPIS, range, {
-          $filter: personScope(personId),
-        }),
-        queryMetric<RawIcAggregateRow>(METRIC_REGISTRY.IC_KPIS, prevRange, {
-          $filter: personScope(personId),
-        }),
-      ]);
-      return transformIcKpis(
-        cur.items[0] ?? null,
-        prev.items[0] ?? null,
-        period,
-        catalog,
-      );
-    },
-  });
-}
-
-const BULLET_SECTIONS = {
-  task_delivery: METRIC_REGISTRY.IC_BULLET_DELIVERY,
-  code_quality: METRIC_REGISTRY.IC_BULLET_DELIVERY,
-  collaboration: METRIC_REGISTRY.IC_BULLET_COLLAB,
-  ai_adoption: METRIC_REGISTRY.IC_BULLET_AI,
-  git_output: METRIC_REGISTRY.IC_BULLET_GIT,
-} as const;
-
-export type IcBulletSectionId = keyof typeof BULLET_SECTIONS;
-
-export function useIcBulletSection(
-  sectionId: IcBulletSectionId,
-  personId: string,
-  period: PeriodValue,
-  range: DateRange
-): UseQueryResult<BulletMetric[]> {
-  const metricId = BULLET_SECTIONS[sectionId];
-  const { data: catalog } = useCatalog();
-  const catalogKey = catalog?.generated_at ?? null;
-  return useQuery({
-    queryKey: [
-      "ic",
-      "bullet",
-      sectionId,
-      personId,
-      period,
-      range.from,
-      range.to,
-      catalogKey,
-    ],
-    queryFn: async () => {
-      const resp = await queryMetric<RawBulletAggregateRow>(metricId, range, {
-        $filter: personScope(personId),
-      });
-      return transformBulletMetrics(
-        resp.items,
-        sectionId,
-        period,
-        undefined,
-        "ic",
-        catalog,
-      );
-    },
-  });
-}
-
-export function useIcLocTrend(
-  personId: string,
-  period: PeriodValue,
-  range: DateRange
-): UseQueryResult<LocDataPoint[]> {
-  return useQuery({
-    queryKey: ["ic", "loc-trend", personId, period, range.from, range.to],
-    queryFn: async () => {
-      const resp = await queryMetric<RawLocTrendRow>(
-        METRIC_REGISTRY.IC_CHART_LOC,
-        range,
-        { $filter: personScope(personId) }
-      );
-      return transformLocTrend(resp.items, period);
-    },
-  });
-}
-
-export function useIcDeliveryTrend(
-  personId: string,
-  period: PeriodValue,
-  range: DateRange
-): UseQueryResult<DeliveryDataPoint[]> {
-  return useQuery({
-    queryKey: ["ic", "delivery-trend", personId, period, range.from, range.to],
-    queryFn: async () => {
-      const resp = await queryMetric<RawDeliveryTrendRow>(
-        METRIC_REGISTRY.IC_CHART_DELIVERY,
-        range,
-        { $filter: personScope(personId) }
-      );
-      return transformDeliveryTrend(resp.items, period);
-    },
-  });
-}
-
-export function useIcTimeOff(
-  personId: string,
-  range: DateRange
-): UseQueryResult<TimeOffNotice | null> {
-  return useQuery({
-    queryKey: ["ic", "timeoff", personId, range.from, range.to],
-    queryFn: async () => {
-      const resp = await queryMetric<RawTimeOffRow>(
-        METRIC_REGISTRY.IC_TIMEOFF,
-        range,
-        { $filter: personScope(personId) }
-      );
-      return resp.items[0] ? transformTimeOff(resp.items[0]) : null;
-    },
-  });
-}
-
-export function useIcDrill(
-  personId: string,
-  drillId: string | null,
-  range: DateRange
-): UseQueryResult<DrillData | null> {
-  return useQuery({
-    queryKey: ["ic", "drill", drillId, personId, range.from, range.to],
-    enabled: Boolean(drillId),
-    queryFn: async () => {
-      if (!drillId) return null;
-      const filter = `${personScope(personId)} and drill_id eq '${odataEscapeValue(drillId)}'`;
-      const resp = await queryMetric<RawDrillRow>(
-        METRIC_REGISTRY.IC_DRILL,
-        range,
-        { $filter: filter }
-      );
-      return resp.items[0] ? transformDrill(resp.items[0]) : null;
-    },
-  });
-}
-
-export type IcDashboardSection =
-  | "kpis"
-  | "task_delivery"
-  | "code_quality"
-  | "git_output"
-  | "ai_adoption"
-  | "collaboration"
-  | "loc_trend"
-  | "delivery_trend"
-  | "time_off";
-
-export interface IcDashboardData {
-  kpis: IcKpi[];
-  taskDelivery: BulletMetric[];
-  codeQuality: BulletMetric[];
-  gitOutput: BulletMetric[];
-  aiAdoption: BulletMetric[];
-  collaboration: BulletMetric[];
-  locTrend: LocDataPoint[];
-  deliveryTrend: DeliveryDataPoint[];
-  timeOff: TimeOffNotice | null;
-  errors: Record<IcDashboardSection, boolean>;
-}
-
-function isOk<T>(
-  r: BatchQueryResult<T> | undefined,
-): r is Extract<BatchQueryResult<T>, { status: "ok" }> {
-  return r?.status === "ok";
-}
-
-export function useIcDashboardData(
-  personId: string,
-  period: PeriodValue,
-  range: DateRange,
-  options?: { keepPrevious?: boolean },
-): UseQueryResult<IcDashboardData> {
-  const prevRange = previousPeriodRange(range, period);
-  const filter = personScope(personId);
-  const { data: catalog } = useCatalog();
-  const catalogKey = catalog?.generated_at ?? null;
-  return useQuery({
-    queryKey: [
-      "ic",
-      "dashboard",
-      personId,
-      period,
-      range.from,
-      range.to,
-      catalogKey,
-    ],
-    enabled: Boolean(personId),
-    placeholderData: options?.keepPrevious ? keepPreviousData : undefined,
-    queryFn: async (): Promise<IcDashboardData> => {
-      const cat: CatalogResponse | undefined = catalog;
-      const [current, prior] = await Promise.all([
-        queryBatchWithRange<
-          | RawIcAggregateRow
-          | RawBulletAggregateRow
-          | RawLocTrendRow
-          | RawDeliveryTrendRow
-          | RawTimeOffRow
-        >(range, [
-          { id: "kpis", metric_id: METRIC_REGISTRY.IC_KPIS, $filter: filter },
-          // One IC_BULLET_DELIVERY execution feeds both the task_delivery and
-          // code_quality transforms (the query emits rows for both sections;
-          // the catalog wire-prefix partitions them).
-          {
-            id: "delivery_bullets",
-            metric_id: METRIC_REGISTRY.IC_BULLET_DELIVERY,
-            $filter: filter,
-          },
-          {
-            id: "git_output",
-            metric_id: METRIC_REGISTRY.IC_BULLET_GIT,
-            $filter: filter,
-          },
-          {
-            id: "ai_adoption",
-            metric_id: METRIC_REGISTRY.IC_BULLET_AI,
-            $filter: filter,
-          },
-          {
-            id: "collaboration",
-            metric_id: METRIC_REGISTRY.IC_BULLET_COLLAB,
-            $filter: filter,
-          },
-          {
-            id: "loc_trend",
-            metric_id: METRIC_REGISTRY.IC_CHART_LOC,
-            $filter: filter,
-          },
-          {
-            id: "delivery_trend",
-            metric_id: METRIC_REGISTRY.IC_CHART_DELIVERY,
-            $filter: filter,
-          },
-          {
-            id: "time_off",
-            metric_id: METRIC_REGISTRY.IC_TIMEOFF,
-            $filter: filter,
-          },
-        ]),
-        queryBatchWithRange<RawIcAggregateRow>(prevRange, [
-          { id: "kpis_prior", metric_id: METRIC_REGISTRY.IC_KPIS, $filter: filter },
-        ]),
-      ]);
-
-      const byId = new Map<string, BatchQueryResult<unknown>>();
-      for (const r of current.results) {
-        if (r.id) byId.set(r.id, r as BatchQueryResult<unknown>);
-      }
-      for (const r of prior.results) {
-        if (r.id) byId.set(r.id, r as BatchQueryResult<unknown>);
-      }
-
-      const get = <T>(id: string): T[] | undefined => {
-        const r = byId.get(id) as BatchQueryResult<T> | undefined;
-        return isOk(r) ? r.items : undefined;
-      };
-
-      const kpisCur = get<RawIcAggregateRow>("kpis");
-      const kpisPrior = get<RawIcAggregateRow>("kpis_prior");
-
-      const kpisErrored =
-        !isOk(byId.get("kpis") as BatchQueryResult<unknown> | undefined) ||
-        !isOk(byId.get("kpis_prior") as BatchQueryResult<unknown> | undefined);
-
-      const sectionErrored = (id: string): boolean =>
-        !isOk(byId.get(id) as BatchQueryResult<unknown> | undefined);
-
-      return {
-        kpis: transformIcKpis(
-          kpisCur?.[0] ?? null,
-          kpisPrior?.[0] ?? null,
-          period,
-          cat,
-        ),
-        taskDelivery: transformBulletMetrics(
-          get<RawBulletAggregateRow>("delivery_bullets") ?? [],
-          "task_delivery",
-          period,
-          undefined,
-          "ic",
-          cat,
-        ),
-        codeQuality: transformBulletMetrics(
-          get<RawBulletAggregateRow>("delivery_bullets") ?? [],
-          "code_quality",
-          period,
-          undefined,
-          "ic",
-          cat,
-        ),
-        gitOutput: transformBulletMetrics(
-          get<RawBulletAggregateRow>("git_output") ?? [],
-          "git_output",
-          period,
-          undefined,
-          "ic",
-          cat,
-        ),
-        aiAdoption: transformBulletMetrics(
-          get<RawBulletAggregateRow>("ai_adoption") ?? [],
-          "ai_adoption",
-          period,
-          undefined,
-          "ic",
-          cat,
-        ),
-        collaboration: transformBulletMetrics(
-          get<RawBulletAggregateRow>("collaboration") ?? [],
-          "collaboration",
-          period,
-          undefined,
-          "ic",
-          cat,
-        ),
-        locTrend: transformLocTrend(
-          get<RawLocTrendRow>("loc_trend") ?? [],
-          period,
-        ),
-        deliveryTrend: transformDeliveryTrend(
-          get<RawDeliveryTrendRow>("delivery_trend") ?? [],
-          period,
-        ),
-        timeOff: (() => {
-          const rows = get<RawTimeOffRow>("time_off");
-          return rows?.[0] ? transformTimeOff(rows[0]) : null;
-        })(),
-        errors: {
-          kpis: kpisErrored,
-          task_delivery: sectionErrored("delivery_bullets"),
-          code_quality: sectionErrored("delivery_bullets"),
-          git_output: sectionErrored("git_output"),
-          ai_adoption: sectionErrored("ai_adoption"),
-          collaboration: sectionErrored("collaboration"),
-          loc_trend: sectionErrored("loc_trend"),
-          delivery_trend: sectionErrored("delivery_trend"),
-          time_off: sectionErrored("time_off"),
-        },
-      };
-    },
-  });
-}
diff --git a/src/queries/v2/member-grid.test.tsx b/src/queries/member-grid.test.tsx
similarity index 98%
rename from src/queries/v2/member-grid.test.tsx
rename to src/queries/member-grid.test.tsx
index bac88af1..c4bb4369 100644
--- a/src/queries/v2/member-grid.test.tsx
+++ b/src/queries/member-grid.test.tsx
@@ -9,7 +9,7 @@ import {
   type MetricResultsResponse,
 } from "@/api/metric-results-client";
 import type { MetricCollectionConfig } from "@/lib/metrics/collection";
-import { useMemberGridData } from "@/queries/v2/member-grid";
+import { useMemberGridData } from "@/queries/member-grid";
 
 vi.mock("@/api/metric-results-client", async (orig) => ({
   ...(await orig<typeof import("@/api/metric-results-client")>()),
diff --git a/src/queries/v2/member-grid.ts b/src/queries/member-grid.ts
similarity index 100%
rename from src/queries/v2/member-grid.ts
rename to src/queries/member-grid.ts
diff --git a/src/queries/sales-dashboard.test.ts b/src/queries/sales-dashboard.test.ts
deleted file mode 100644
index 600ea816..00000000
--- a/src/queries/sales-dashboard.test.ts
+++ /dev/null
@@ -1,330 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { renderHook, waitFor } from "@testing-library/react";
-import { createElement, type ReactNode } from "react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import { queryMetric, queryMetricRaw } from "@/api/analytics-client";
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import {
-  useSalesBulletSection,
-  useSalesDashboardQueries,
-  useSalesFlow,
-  useSalesKpis,
-  useSalesPipelineNow,
-  useSalesPrevKpis,
-} from "@/queries/sales-dashboard";
-
-vi.mock("@/api/analytics-client", async (orig) => ({
-  ...(await orig<typeof import("@/api/analytics-client")>()),
-  queryMetric: vi.fn(),
-  queryMetricRaw: vi.fn(),
-}));
-
-const CATALOG = vi.hoisted(() => {
-  const metric = (
-    metric_key: string,
-    label: string,
-    higher_is_better = true,
-  ) => ({
-    id: metric_key,
-    metric_key,
-    label,
-    higher_is_better,
-    is_member_scale: false,
-    source_tags: [] as string[],
-    schema_status: "ok" as const,
-    thresholds: {
-      good: 5,
-      warn: 2,
-      resolved_from: "product-default",
-      bounded_by_lock: false,
-    },
-  });
-  return {
-    tenant_id: "t-1",
-    generated_at: "2026-06-01T00:00:00Z",
-    metrics: [
-      metric("crm_bullet_rows.win_rate", "Win Rate"),
-      metric("crm_bullet_rows.cycle_days", "Cycle Days", false),
-      metric("crm_bullet_rows.calls", "Calls"),
-    ],
-    links: [],
-  };
-});
-
-vi.mock("@/api/use-catalog", () => ({
-  useCatalog: () => ({ data: CATALOG }),
-}));
-
-const mockMetric = vi.mocked(queryMetric);
-const mockRaw = vi.mocked(queryMetricRaw);
-
-const RANGE = { from: "2026-06-01", to: "2026-06-30" };
-const PAGE = { has_next: false, cursor: null };
-
-function odata<T>(items: T[]) {
-  return { items, page_info: PAGE };
-}
-
-const KPI_ROW = {
-  person_id: "rep@x.com",
-  deals_opened: "5", // CH UInt aggregates arrive as strings
-  deals_closed: 2,
-  deals_won: null, // NULL coerces to 0
-  deals_value_closed: 120000,
-  comms_count: "40",
-};
-
-function wrapper() {
-  const client = new QueryClient({
-    defaultOptions: { queries: { retry: false, gcTime: 0 } },
-  });
-  return ({ children }: { children: ReactNode }) =>
-    createElement(QueryClientProvider, { client }, children);
-}
-
-beforeEach(() => {
-  mockMetric.mockReset();
-  mockRaw.mockReset();
-});
-
-describe("useSalesKpis", () => {
-  it("coerces the CH wire row into numeric KPIs", async () => {
-    mockMetric.mockResolvedValue(odata([KPI_ROW]));
-    const { result } = renderHook(() => useSalesKpis("Rep@X.com", RANGE), {
-      wrapper: wrapper(),
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual({
-      dealsOpened: 5,
-      dealsClosed: 2,
-      dealsWon: 0,
-      dealsValueClosed: 120000,
-      commsCount: 40,
-    });
-    expect(mockMetric).toHaveBeenCalledWith(METRIC_REGISTRY.CRM_KPIS, RANGE, {
-      $filter: "person_id eq 'rep@x.com'",
-    });
-  });
-
-  it("returns null when the person has no row", async () => {
-    mockMetric.mockResolvedValue(odata([]));
-    const { result } = renderHook(() => useSalesKpis("rep@x.com", RANGE), {
-      wrapper: wrapper(),
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toBeNull();
-  });
-});
-
-describe("useSalesPrevKpis", () => {
-  it("shifts the window back one calendar year", async () => {
-    mockMetric.mockResolvedValue(odata([KPI_ROW]));
-    const { result } = renderHook(() => useSalesPrevKpis("rep@x.com", RANGE), {
-      wrapper: wrapper(),
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data?.dealsOpened).toBe(5);
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.CRM_KPIS,
-      { from: "2025-06-01", to: "2025-06-30" },
-      { $filter: "person_id eq 'rep@x.com'" },
-    );
-  });
-});
-
-describe("useSalesFlow", () => {
-  it("sorts flow rows by metric_date and coerces values", async () => {
-    mockMetric.mockResolvedValue(
-      odata([
-        {
-          date_bucket: "W24",
-          metric_date: "2026-06-08",
-          opened: "2",
-          closed: 1,
-          won: 1,
-        },
-        {
-          date_bucket: "W23",
-          metric_date: "2026-06-01",
-          opened: 3,
-          closed: "2",
-          won: 0,
-        },
-      ]),
-    );
-    const { result } = renderHook(() => useSalesFlow("rep@x.com", RANGE), {
-      wrapper: wrapper(),
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual([
-      { label: "W23", opened: 3, closed: 2, won: 0 },
-      { label: "W24", opened: 2, closed: 1, won: 1 },
-    ]);
-  });
-});
-
-describe("useSalesPipelineNow", () => {
-  it("queries the date-less stock metric without a period", async () => {
-    mockRaw.mockResolvedValue(
-      odata([{ person_id: "rep@x.com", pipeline_count: "3", pipeline_value: 1500 }]),
-    );
-    const { result } = renderHook(() => useSalesPipelineNow("rep@x.com"), {
-      wrapper: wrapper(),
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual({ pipelineCount: 3, pipelineValue: 1500 });
-    expect(mockRaw).toHaveBeenCalledWith(METRIC_REGISTRY.CRM_PIPELINE_NOW, {
-      $filter: "person_id eq 'rep@x.com'",
-    });
-    expect(mockMetric).not.toHaveBeenCalled();
-  });
-});
-
-describe("useSalesBulletSection", () => {
-  it("emits quality bullets in pinned order, marking keys without rows unavailable", async () => {
-    mockMetric.mockResolvedValue(
-      odata([
-        {
-          metric_key: "win_rate",
-          value: 50,
-          median: 40,
-          range_min: 0,
-          range_max: 100,
-        },
-      ]),
-    );
-    const { result } = renderHook(
-      () => useSalesBulletSection("quality", "rep@x.com", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    // avg_deal_size / deals_opened have no catalog rows → omitted; the
-    // remaining keys keep the CRM_QUALITY_BARE_KEYS emission order.
-    expect(result.current.data!.map((b) => [b.metric_key, b.status])).toEqual([
-      ["win_rate", "good"], // 50 vs median 40, above tolerance
-      ["cycle_days", "unavailable"], // catalog row present, no data row
-    ]);
-    expect(result.current.data![0]).toMatchObject({
-      section: "velocity_quality",
-      label: "Win Rate",
-      bar_width_pct: 50,
-    });
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.CRM_BULLET_QUALITY,
-      RANGE,
-      { $filter: "person_id eq 'rep@x.com'" },
-    );
-  });
-
-  it("targets the activity metric + section for kind=activity", async () => {
-    mockMetric.mockResolvedValue(
-      odata([
-        {
-          metric_key: "calls",
-          value: 30,
-          median: 40,
-          range_min: 0,
-          range_max: 100,
-        },
-      ]),
-    );
-    const { result } = renderHook(
-      () => useSalesBulletSection("activity", "rep@x.com", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data![0]).toMatchObject({
-      section: "outreach_activity",
-      metric_key: "calls",
-      status: "bad", // 30 vs median 40, higher is better
-    });
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.CRM_BULLET_ACTIVITY,
-      RANGE,
-      { $filter: "person_id eq 'rep@x.com'" },
-    );
-  });
-});
-
-describe("useSalesDashboardQueries", () => {
-  it("runs all six queries and exposes their transformed results", async () => {
-    mockMetric.mockImplementation(async (metricId, range) => {
-      if (metricId === METRIC_REGISTRY.CRM_KPIS) {
-        return odata(
-          range.from.startsWith("2025")
-            ? [{ ...KPI_ROW, deals_opened: "1" }]
-            : [KPI_ROW],
-        );
-      }
-      if (metricId === METRIC_REGISTRY.CRM_CHART_FLOW) {
-        return odata([
-          {
-            date_bucket: "W23",
-            metric_date: "2026-06-01",
-            opened: 3,
-            closed: 2,
-            won: 1,
-          },
-        ]);
-      }
-      if (metricId === METRIC_REGISTRY.CRM_BULLET_QUALITY) {
-        return odata([
-          {
-            metric_key: "win_rate",
-            value: 50,
-            median: 40,
-            range_min: 0,
-            range_max: 100,
-          },
-        ]);
-      }
-      if (metricId === METRIC_REGISTRY.CRM_BULLET_ACTIVITY) {
-        return odata([
-          {
-            metric_key: "calls",
-            value: 30,
-            median: 40,
-            range_min: 0,
-            range_max: 100,
-          },
-        ]);
-      }
-      throw new Error(`unexpected metric ${metricId}`);
-    });
-    mockRaw.mockResolvedValue(
-      odata([{ person_id: "rep@x.com", pipeline_count: 4, pipeline_value: "9000" }]),
-    );
-
-    const { result } = renderHook(
-      () => useSalesDashboardQueries("rep@x.com", "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => {
-      expect(result.current.kpisQ.isSuccess).toBe(true);
-      expect(result.current.prevKpisQ.isSuccess).toBe(true);
-      expect(result.current.pipelineQ.isSuccess).toBe(true);
-      expect(result.current.flowQ.isSuccess).toBe(true);
-      expect(result.current.qualityQ.isSuccess).toBe(true);
-      expect(result.current.activityQ.isSuccess).toBe(true);
-    });
-
-    expect(result.current.kpisQ.data?.dealsOpened).toBe(5);
-    expect(result.current.prevKpisQ.data?.dealsOpened).toBe(1);
-    expect(result.current.pipelineQ.data).toEqual({
-      pipelineCount: 4,
-      pipelineValue: 9000,
-    });
-    expect(result.current.flowQ.data).toEqual([
-      { label: "W23", opened: 3, closed: 2, won: 1 },
-    ]);
-    expect(
-      result.current.qualityQ.data!.map((b) => b.metric_key),
-    ).toEqual(["win_rate", "cycle_days"]);
-    expect(result.current.activityQ.data![0]).toMatchObject({
-      metric_key: "calls",
-      section: "outreach_activity",
-    });
-  });
-});
diff --git a/src/queries/sales-dashboard.ts b/src/queries/sales-dashboard.ts
deleted file mode 100644
index aa6fe493..00000000
--- a/src/queries/sales-dashboard.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-import { useQueries, useQuery, type UseQueryResult } from "@tanstack/react-query";
-
-import { queryMetric, queryMetricRaw } from "@/api/analytics-client";
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import { odataEscapeValue } from "@/api/odata";
-import { type DateRange, toISODate } from "@/api/period-to-date-range";
-import {
-  transformCrmFlow,
-  transformCrmBullets,
-  transformCrmKpis,
-  transformCrmPipeline,
-} from "@/api/transforms";
-import { useCatalog } from "@/api/use-catalog";
-import type {
-  RawBulletAggregateRow,
-  RawCrmFlowRow,
-  RawCrmKpisRow,
-  RawCrmPipelineRow,
-} from "@/api/raw-types";
-import type {
-  BulletMetric,
-  CrmFlowPoint,
-  CrmKpis,
-  CrmPipeline,
-  PeriodValue,
-} from "@/types/insight";
-
-/**
- * Per-section CRM bullet emission order. Bare metric_keys without the
- * `crm_bullet_rows.` wire prefix — `transformCrmBullets` reattaches it
- * when looking up the catalog row. Pinning order here keeps the UI
- * column layout deterministic regardless of CH GROUP BY ordering, and
- * keeps the per-query disjoint-subset rule explicit (Quality keys MUST
- * NOT overlap Activity keys).
- */
-const CRM_QUALITY_BARE_KEYS = [
-  "win_rate",
-  "avg_deal_size",
-  "cycle_days",
-  "deals_opened",
-] as const;
-
-const CRM_ACTIVITY_BARE_KEYS = [
-  "calls",
-  "emails",
-  "meetings",
-  "comms_per_won",
-] as const;
-
-function personScope(personId: string): string {
-  return `person_id eq '${odataEscapeValue(personId.toLowerCase())}'`;
-}
-
-/**
- * Shift both endpoints back by exactly one calendar year.
- *
- * Intentionally distinct from `previousPeriodRange()` in
- * `@/api/period-to-date-range`: that helper is period-aware (week → prior
- * week, month → prior month, etc.) for the engineering dashboard's
- * delta-vs-last-period KPIs. The sales pacing band specifically wants a
- * year-over-year comparison ("Closed $ this period vs prior-year same
- * period") — same calendar window, one year earlier — regardless of which
- * period bucket the user selected. Do NOT consolidate the two helpers.
- */
-function priorYearRange(range: DateRange): DateRange {
-  const shift = (iso: string): string => {
-    const [y, m, d] = iso.split("-").map(Number);
-    const date = new Date(y, (m ?? 1) - 1, d ?? 1);
-    date.setFullYear(date.getFullYear() - 1);
-    return toISODate(date);
-  };
-  return { from: shift(range.from), to: shift(range.to) };
-}
-
-export function useSalesKpis(
-  personId: string,
-  range: DateRange,
-): UseQueryResult<CrmKpis | null> {
-  return useQuery({
-    queryKey: ["crm", "kpis", personId, range.from, range.to],
-    queryFn: async () => {
-      const resp = await queryMetric<RawCrmKpisRow>(
-        METRIC_REGISTRY.CRM_KPIS,
-        range,
-        { $filter: personScope(personId) },
-      );
-      return transformCrmKpis(resp.items[0] ?? null);
-    },
-  });
-}
-
-export function useSalesPrevKpis(
-  personId: string,
-  range: DateRange,
-): UseQueryResult<CrmKpis | null> {
-  const prev = priorYearRange(range);
-  return useQuery({
-    queryKey: ["crm", "prev-kpis", personId, range.from, range.to],
-    queryFn: async () => {
-      const resp = await queryMetric<RawCrmKpisRow>(
-        METRIC_REGISTRY.CRM_KPIS,
-        prev,
-        { $filter: personScope(personId) },
-      );
-      return transformCrmKpis(resp.items[0] ?? null);
-    },
-  });
-}
-
-export function useSalesFlow(
-  personId: string,
-  range: DateRange,
-): UseQueryResult<CrmFlowPoint[]> {
-  return useQuery({
-    queryKey: ["crm", "flow", personId, range.from, range.to],
-    queryFn: async () => {
-      const resp = await queryMetric<RawCrmFlowRow>(
-        METRIC_REGISTRY.CRM_CHART_FLOW,
-        range,
-        { $filter: personScope(personId) },
-      );
-      return transformCrmFlow(resp.items);
-    },
-  });
-}
-
-/**
- * Open-deal pipeline snapshot. `CRM_PIPELINE_NOW` is a date-less stock
- * metric (`insight.crm_pipeline_now` has no `metric_date` column), so we
- * query it WITHOUT a period via `queryMetricRaw` — `queryMetric` would AND
- * in a `metric_date` filter the view can't satisfy.
- */
-export function useSalesPipelineNow(
-  personId: string,
-): UseQueryResult<CrmPipeline | null> {
-  return useQuery({
-    queryKey: ["crm", "pipeline-now", personId],
-    queryFn: async () => {
-      const resp = await queryMetricRaw<RawCrmPipelineRow>(
-        METRIC_REGISTRY.CRM_PIPELINE_NOW,
-        { $filter: personScope(personId) },
-      );
-      return transformCrmPipeline(resp.items[0] ?? null);
-    },
-  });
-}
-
-export type SalesBulletKind = "quality" | "activity";
-
-export function useSalesBulletSection(
-  kind: SalesBulletKind,
-  personId: string,
-  period: PeriodValue,
-  range: DateRange,
-): UseQueryResult<BulletMetric[]> {
-  const uuid =
-    kind === "quality"
-      ? METRIC_REGISTRY.CRM_BULLET_QUALITY
-      : METRIC_REGISTRY.CRM_BULLET_ACTIVITY;
-  const bareKeys =
-    kind === "quality" ? CRM_QUALITY_BARE_KEYS : CRM_ACTIVITY_BARE_KEYS;
-  const sectionId =
-    kind === "quality" ? "velocity_quality" : "outreach_activity";
-  const { data: catalog } = useCatalog();
-  // Catalog identity in the query key so a late-arriving hydration
-  // re-runs the transform — the queryFn closes over `catalog` and
-  // would otherwise cache an empty result built against an undefined
-  // catalog (same pattern as the engineering queries post-#82).
-  const catalogKey = catalog?.generated_at ?? null;
-  return useQuery({
-    queryKey: [
-      "crm",
-      "bullet",
-      kind,
-      personId,
-      period,
-      range.from,
-      range.to,
-      catalogKey,
-    ],
-    queryFn: async () => {
-      const resp = await queryMetric<RawBulletAggregateRow>(uuid, range, {
-        $filter: personScope(personId),
-      });
-      return transformCrmBullets(resp.items, period, sectionId, bareKeys, catalog);
-    },
-  });
-}
-
-export function useSalesDashboardQueries(
-  personId: string,
-  period: PeriodValue,
-  range: DateRange,
-): {
-  kpisQ: UseQueryResult<CrmKpis | null>;
-  prevKpisQ: UseQueryResult<CrmKpis | null>;
-  pipelineQ: UseQueryResult<CrmPipeline | null>;
-  flowQ: UseQueryResult<CrmFlowPoint[]>;
-  qualityQ: UseQueryResult<BulletMetric[]>;
-  activityQ: UseQueryResult<BulletMetric[]>;
-} {
-  const prevRange = priorYearRange(range);
-  const filter = personScope(personId);
-  const { data: catalog } = useCatalog();
-  const catalogKey = catalog?.generated_at ?? null;
-  const results = useQueries({
-    queries: [
-      {
-        queryKey: ["crm", "kpis", personId, range.from, range.to],
-        queryFn: async () => {
-          const resp = await queryMetric<RawCrmKpisRow>(
-            METRIC_REGISTRY.CRM_KPIS,
-            range,
-            { $filter: filter },
-          );
-          return transformCrmKpis(resp.items[0] ?? null);
-        },
-      },
-      {
-        queryKey: ["crm", "prev-kpis", personId, range.from, range.to],
-        queryFn: async () => {
-          const resp = await queryMetric<RawCrmKpisRow>(
-            METRIC_REGISTRY.CRM_KPIS,
-            prevRange,
-            { $filter: filter },
-          );
-          return transformCrmKpis(resp.items[0] ?? null);
-        },
-      },
-      {
-        // Date-less stock metric — no period in the query key, no period
-        // filter on the wire (see `useSalesPipelineNow`).
-        queryKey: ["crm", "pipeline-now", personId],
-        queryFn: async () => {
-          const resp = await queryMetricRaw<RawCrmPipelineRow>(
-            METRIC_REGISTRY.CRM_PIPELINE_NOW,
-            { $filter: filter },
-          );
-          return transformCrmPipeline(resp.items[0] ?? null);
-        },
-      },
-      {
-        queryKey: ["crm", "flow", personId, range.from, range.to],
-        queryFn: async () => {
-          const resp = await queryMetric<RawCrmFlowRow>(
-            METRIC_REGISTRY.CRM_CHART_FLOW,
-            range,
-            { $filter: filter },
-          );
-          return transformCrmFlow(resp.items);
-        },
-      },
-      {
-        queryKey: ["crm", "bullet", "quality", personId, period, range.from, range.to, catalogKey],
-        queryFn: async () => {
-          const resp = await queryMetric<RawBulletAggregateRow>(
-            METRIC_REGISTRY.CRM_BULLET_QUALITY,
-            range,
-            { $filter: filter },
-          );
-          return transformCrmBullets(
-            resp.items,
-            period,
-            "velocity_quality",
-            CRM_QUALITY_BARE_KEYS,
-            catalog,
-          );
-        },
-      },
-      {
-        queryKey: ["crm", "bullet", "activity", personId, period, range.from, range.to, catalogKey],
-        queryFn: async () => {
-          const resp = await queryMetric<RawBulletAggregateRow>(
-            METRIC_REGISTRY.CRM_BULLET_ACTIVITY,
-            range,
-            { $filter: filter },
-          );
-          return transformCrmBullets(
-            resp.items,
-            period,
-            "outreach_activity",
-            CRM_ACTIVITY_BARE_KEYS,
-            catalog,
-          );
-        },
-      },
-    ],
-  });
-  return {
-    kpisQ: results[0] as UseQueryResult<CrmKpis | null>,
-    prevKpisQ: results[1] as UseQueryResult<CrmKpis | null>,
-    pipelineQ: results[2] as UseQueryResult<CrmPipeline | null>,
-    flowQ: results[3] as UseQueryResult<CrmFlowPoint[]>,
-    qualityQ: results[4] as UseQueryResult<BulletMetric[]>,
-    activityQ: results[5] as UseQueryResult<BulletMetric[]>,
-  };
-}
diff --git a/src/queries/team-metrics.ts b/src/queries/team-metrics.ts
deleted file mode 100644
index 7104ed70..00000000
--- a/src/queries/team-metrics.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import { odataEscapeValue } from "@/api/odata";
-import type { DateRange } from "@/api/period-to-date-range";
-import type { RawBulletAggregateRow } from "@/api/raw-types";
-import { useBatchedMetrics } from "@/queries/batched-metrics";
-import type { TeamMember } from "@/types/insight";
-
-export type TeamMetricsSectionId =
-  | "task_delivery"
-  | "collaboration"
-  | "ai_adoption"
-  | "git_output";
-
-const SECTIONS: ReadonlyArray<{
-  id: TeamMetricsSectionId;
-  metricId: string;
-}> = [
-  { id: "task_delivery", metricId: METRIC_REGISTRY.IC_BULLET_DELIVERY },
-  { id: "collaboration", metricId: METRIC_REGISTRY.IC_BULLET_COLLAB },
-  { id: "ai_adoption", metricId: METRIC_REGISTRY.IC_BULLET_AI },
-  { id: "git_output", metricId: METRIC_REGISTRY.IC_BULLET_GIT },
-];
-
-export interface TeamMetricsEntry {
-  personId: string;
-  sectionId: TeamMetricsSectionId;
-  rows: RawBulletAggregateRow[] | undefined;
-}
-
-export interface TeamMetricsResult {
-  entries: TeamMetricsEntry[];
-  isPending: boolean;
-  isError: boolean;
-}
-
-export interface UseTeamMetricsOptions {
-  enabled?: boolean;
-}
-
-export function useTeamMetrics(
-  members: TeamMember[],
-  range: DateRange,
-  options: UseTeamMetricsOptions = {},
-): TeamMetricsResult {
-  const enabled = options.enabled ?? true;
-
-  const pairs = members.flatMap((m) =>
-    SECTIONS.map((s) => ({
-      personId: m.person_id,
-      sectionId: s.id,
-      metricId: s.metricId,
-      key: `${m.person_id.toLowerCase()}:${s.id}`,
-    })),
-  );
-
-  const query = useBatchedMetrics<RawBulletAggregateRow>(
-    pairs.map((p) => ({
-      id: p.key,
-      metricId: p.metricId,
-      filter: `person_id eq '${odataEscapeValue(p.personId.toLowerCase())}'`,
-    })),
-    range,
-    { enabled, keyPrefix: "team-metrics" },
-  );
-
-  const entries: TeamMetricsEntry[] = pairs.map((p) => {
-    const result = query.data?.get(p.key);
-    return {
-      personId: p.personId,
-      sectionId: p.sectionId,
-      rows: result && result.status === "ok" ? result.items : undefined,
-    };
-  });
-
-  return {
-    entries,
-    isPending: enabled && pairs.length > 0 && query.isPending,
-    isError: query.isError,
-  };
-}
diff --git a/src/queries/team-view.test.ts b/src/queries/team-view.test.ts
deleted file mode 100644
index 8e78f570..00000000
--- a/src/queries/team-view.test.ts
+++ /dev/null
@@ -1,359 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { renderHook, waitFor } from "@testing-library/react";
-import { createElement, type ReactNode } from "react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import {
-  queryBatchWithRange,
-  queryMetric,
-  type BatchQueryItem,
-  type BatchQueryResult,
-} from "@/api/analytics-client";
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import type { RawDrillRow, RawTeamMemberRow } from "@/api/raw-types";
-import type { RosterEntry } from "@/lib/insight/identity-tree";
-import {
-  isTeamBulletSectionId,
-  useTeamBulletSection,
-  useTeamBulletSections,
-  useTeamDrill,
-  useTeamMembers,
-} from "@/queries/team-view";
-
-vi.mock("@/api/analytics-client", async (orig) => ({
-  ...(await orig<typeof import("@/api/analytics-client")>()),
-  queryMetric: vi.fn(),
-  queryBatchWithRange: vi.fn(),
-}));
-
-const CATALOG = vi.hoisted(() => {
-  const metric = (metric_key: string, label: string) => ({
-    id: metric_key,
-    metric_key,
-    label,
-    higher_is_better: true,
-    is_member_scale: false,
-    source_tags: [] as string[],
-    schema_status: "ok" as const,
-    thresholds: {
-      good: 5,
-      warn: 2,
-      resolved_from: "product-default",
-      bounded_by_lock: false,
-    },
-  });
-  return {
-    tenant_id: "t-1",
-    generated_at: "2026-06-01T00:00:00Z",
-    metrics: [
-      metric("task_delivery_bullet_rows.tasks_completed", "Tasks Completed"),
-      metric("collab_bullet_rows.reviews_given", "Reviews Given"),
-    ],
-    links: [],
-  };
-});
-
-vi.mock("@/api/use-catalog", () => ({
-  useCatalog: () => ({ data: CATALOG }),
-}));
-
-const mockBatch = vi.mocked(queryBatchWithRange);
-const mockMetric = vi.mocked(queryMetric);
-
-const RANGE = { from: "2026-06-01", to: "2026-06-30" };
-const PAGE = { has_next: false, cursor: null };
-
-function ok<T>(id: string, items: T[]): BatchQueryResult<T> {
-  return { status: "ok", id, metric_id: id, items, page_info: PAGE };
-}
-
-function err(id: string): BatchQueryResult<never> {
-  return {
-    status: "error",
-    id,
-    metric_id: id,
-    error: { type: "about:blank", title: "boom", status: 500, detail: "boom" },
-  };
-}
-
-function odata<T>(items: T[]) {
-  return { items, page_info: PAGE };
-}
-
-function wrapper() {
-  const client = new QueryClient({
-    defaultOptions: { queries: { retry: false, gcTime: 0 } },
-  });
-  return ({ children }: { children: ReactNode }) =>
-    createElement(QueryClientProvider, { client }, children);
-}
-
-const ROSTER: RosterEntry[] = [
-  {
-    email: "Alice@X.com",
-    display_name: "Alice",
-    supervisor_email: "boss@x.com",
-    is_direct: true,
-  },
-  {
-    email: "bob@x.com",
-    display_name: "Bob",
-    supervisor_email: "boss@x.com",
-    is_direct: true,
-  },
-];
-
-const ALICE_ROW: RawTeamMemberRow = {
-  person_id: "alice@x.com",
-  display_name: "Alice A.",
-  seniority: "senior",
-  supervisor_email: "boss@x.com",
-  org_unit_id: "dept-1",
-  tasks_closed: 7.2,
-  bugs_fixed: 1,
-  dev_time_h: 20,
-  prs_merged: null,
-  build_success_pct: 90,
-  focus_time_pct: 55,
-  ai_tools: ["copilot"],
-  ai_loc_share_pct: 10,
-};
-
-beforeEach(() => {
-  mockBatch.mockReset();
-  mockMetric.mockReset();
-});
-
-describe("isTeamBulletSectionId", () => {
-  it("accepts ids backed by a team bullet section", () => {
-    expect(isTeamBulletSectionId("collaboration")).toBe(true);
-    expect(isTeamBulletSectionId("task_delivery")).toBe(true);
-  });
-
-  it("rejects ids with no team bullet section", () => {
-    expect(isTeamBulletSectionId("wiki")).toBe(false);
-    expect(isTeamBulletSectionId("nonsense")).toBe(false);
-  });
-});
-
-describe("useTeamMembers", () => {
-  it("merges member rows with per-person PRs and synthesizes missing members", async () => {
-    mockBatch.mockResolvedValue({
-      results: [
-        ok("members", [ALICE_ROW]),
-        ok("prs", [
-          { person_id: "Alice@X.com", prs_merged: 7 },
-          // Non-finite PR count is skipped, not merged as 0/NaN.
-          { person_id: "bob@x.com", prs_merged: Number.NaN },
-        ]),
-        // Unknown result ids are ignored.
-        ok("junk", [{ person_id: "x", prs_merged: 1 }]),
-        // Errored side results are skipped without failing the query.
-        err("side"),
-      ],
-    });
-
-    const { result } = renderHook(
-      () => useTeamMembers("team-1", ROSTER, "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    const [alice, bob] = result.current.data!;
-    expect(alice).toMatchObject({
-      person_id: "alice@x.com",
-      // Identity (roster) name wins over the analytics row's display_name (#1837).
-      name: "Alice",
-      tasks_closed: 7,
-      prs_merged: 7, // merged from the V2_MEMBER_PRS row
-    });
-    // Bob has no backend row: synthetic member built from the roster entry.
-    expect(bob).toMatchObject({
-      person_id: "bob@x.com",
-      name: "Bob",
-      seniority: "",
-      tasks_closed: 0,
-      prs_merged: null,
-      dev_time_h: null,
-    });
-
-    // The batch was scoped to the roster emails (lowercased).
-    const items = mockBatch.mock.calls[0]![1] as BatchQueryItem[];
-    expect(items.map((i) => i.id)).toEqual(["members", "prs"]);
-    expect(items[0]!.$filter).toBe(
-      "person_id in ('alice@x.com', 'bob@x.com')",
-    );
-  });
-
-  it("errors when the members batch item fails", async () => {
-    mockBatch.mockResolvedValue({ results: [err("members")] });
-    const { result } = renderHook(
-      () => useTeamMembers("team-1", ROSTER, "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isError).toBe(true));
-    expect((result.current.error as Error).message).toBe(
-      "Failed to load team members",
-    );
-  });
-
-  it("stays disabled without a roster", async () => {
-    const { result } = renderHook(
-      () => useTeamMembers("team-1", null, "month", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.fetchStatus).toBe("idle"));
-    expect(mockBatch).not.toHaveBeenCalled();
-  });
-});
-
-describe("useTeamBulletSection", () => {
-  it("transforms bullet aggregate rows for the section", async () => {
-    mockMetric.mockResolvedValue(
-      odata([
-        {
-          metric_key: "tasks_completed",
-          value: 8,
-          median: 5,
-          range_min: 0,
-          range_max: 10,
-          p25: 3,
-          p75: 7,
-          n: 12,
-        },
-      ]),
-    );
-    const { result } = renderHook(
-      () =>
-        useTeamBulletSection("task_delivery", "team-1", 4, "month", RANGE, {
-          roster: ROSTER,
-        }),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    expect(result.current.data).toHaveLength(1);
-    expect(result.current.data![0]).toMatchObject({
-      section: "task_delivery",
-      metric_key: "tasks_completed",
-      label: "Tasks Completed",
-      status: "good", // 8 >= good threshold 5
-      bar_width_pct: 80,
-      peer: { p25: 3, p50: 5, p75: 7, min: 0, max: 10, n: 12 },
-    });
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.TEAM_BULLET_DELIVERY,
-      RANGE,
-      { $filter: "person_id in ('alice@x.com', 'bob@x.com')" },
-    );
-  });
-
-  it("stays disabled without a roster", async () => {
-    const { result } = renderHook(
-      () =>
-        useTeamBulletSection("task_delivery", "team-1", 4, "month", RANGE, {
-          roster: [],
-        }),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.fetchStatus).toBe("idle"));
-    expect(mockMetric).not.toHaveBeenCalled();
-  });
-});
-
-describe("useTeamBulletSections", () => {
-  it("splits ok and errored sections into bySection/errors", async () => {
-    mockBatch.mockResolvedValue({
-      results: [
-        ok("task_delivery", [
-          {
-            metric_key: "tasks_completed",
-            value: 8,
-            median: 5,
-            range_min: 0,
-            range_max: 10,
-          },
-        ]),
-        err("collaboration"),
-      ],
-    });
-    const { result } = renderHook(
-      () =>
-        useTeamBulletSections(
-          ["task_delivery", "collaboration"],
-          "team-1",
-          4,
-          "month",
-          RANGE,
-          { roster: ROSTER, keepPrevious: true },
-        ),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    const data = result.current.data!;
-    expect(data.errors).toEqual({ task_delivery: false, collaboration: true });
-    expect(data.bySection.task_delivery).toHaveLength(1);
-    expect(data.bySection.task_delivery![0]!.label).toBe("Tasks Completed");
-    expect(data.bySection.collaboration).toEqual([]);
-  });
-});
-
-describe("useTeamDrill", () => {
-  const DRILL_ROW: RawDrillRow = {
-    title: "Closed tasks",
-    source: "jira",
-    src_class: "jira",
-    value: "12",
-    filter: "f",
-    columns: ["key"],
-    rows: [{ key: "T-1" }],
-  };
-
-  it("stays disabled with a null target", async () => {
-    const { result } = renderHook(() => useTeamDrill(null, RANGE), {
-      wrapper: wrapper(),
-    });
-    await waitFor(() => expect(result.current.fetchStatus).toBe("idle"));
-    expect(mockMetric).not.toHaveBeenCalled();
-  });
-
-  it("fetches and transforms the drill row for a cell target", async () => {
-    mockMetric.mockResolvedValue(odata([DRILL_ROW]));
-    const { result } = renderHook(
-      () =>
-        useTeamDrill(
-          { kind: "cell", personId: "Alice@X.com", drillId: "tasks" },
-          RANGE,
-        ),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual({
-      title: "Closed tasks",
-      source: "jira",
-      srcClass: "jira",
-      value: "12",
-      filter: "f",
-      columns: ["key"],
-      rows: [{ key: "T-1" }],
-    });
-    expect(mockMetric).toHaveBeenCalledWith(METRIC_REGISTRY.IC_DRILL, RANGE, {
-      $filter: "person_id eq 'alice@x.com' and drill_id eq 'tasks'",
-    });
-  });
-
-  it("returns null when the drill has no rows", async () => {
-    mockMetric.mockResolvedValue(odata([]));
-    const { result } = renderHook(
-      () =>
-        useTeamDrill(
-          { kind: "cell", personId: "alice@x.com", drillId: "tasks" },
-          RANGE,
-        ),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toBeNull();
-  });
-});
diff --git a/src/queries/team-view.ts b/src/queries/team-view.ts
deleted file mode 100644
index ca0fb419..00000000
--- a/src/queries/team-view.ts
+++ /dev/null
@@ -1,325 +0,0 @@
-import { keepPreviousData, useQuery, type UseQueryResult } from "@tanstack/react-query";
-
-import {
-  queryBatchWithRange,
-  queryMetric,
-  type BatchQueryItem,
-  type BatchQueryResult,
-} from "@/api/analytics-client";
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import { odataEscapeValue } from "@/api/odata";
-import type { DateRange } from "@/api/period-to-date-range";
-import type {
-  RawBulletAggregateRow,
-  RawDrillRow,
-  RawTeamMemberRow,
-} from "@/api/raw-types";
-import {
-  transformBulletMetrics,
-  transformDrill,
-  transformTeamMembers,
-} from "@/api/transforms";
-import { useCatalog } from "@/api/use-catalog";
-import type { RosterEntry } from "@/lib/insight/identity-tree";
-import type {
-  BulletMetric,
-  DrillData,
-  PeriodValue,
-  TeamMember,
-} from "@/types/insight";
-
-/** Per-person row from the V2_MEMBER_PRS metric. */
-type RawMemberPrsRow = { person_id: string; prs_merged: number | null };
-
-function buildSyntheticMember(
-  entry: RosterEntry,
-  period: PeriodValue,
-): TeamMember {
-  return {
-    person_id: entry.email,
-    period,
-    name: entry.display_name,
-    seniority: "",
-    supervisor_email: entry.supervisor_email,
-    org_unit_id: null,
-    tasks_closed: 0,
-    bugs_fixed: 0,
-    dev_time_h: null,
-    prs_merged: null,
-    build_success_pct: null,
-    focus_time_pct: null,
-    ai_tools: [],
-    ai_loc_share_pct: null,
-  };
-}
-
-export function useTeamMembers(
-  teamId: string,
-  roster: RosterEntry[] | null,
-  period: PeriodValue,
-  range: DateRange,
-  options?: { keepPrevious?: boolean },
-): UseQueryResult<TeamMember[]> {
-  const rosterKey = roster ? roster.map((r) => r.email).join(",") : null;
-  return useQuery({
-    queryKey: [
-      "team",
-      "members",
-      teamId,
-      rosterKey,
-      period,
-      range.from,
-      range.to,
-    ],
-    enabled: Boolean(teamId) && Boolean(roster?.length),
-    placeholderData: options?.keepPrevious ? keepPreviousData : undefined,
-    queryFn: async () => {
-      if (!roster?.length) return [];
-      const ids = roster
-        .map((r) => `'${odataEscapeValue(r.email.toLowerCase())}'`)
-        .join(", ");
-      const filter = `person_id in (${ids})`;
-      // PRs merged isn't on the team_member row (it's a NULL placeholder there);
-      // fetch it from the period-bounded weekly git silver and merge it in.
-      const items: BatchQueryItem[] = [
-        {
-          id: "members",
-          metric_id: METRIC_REGISTRY.TEAM_MEMBER,
-          $filter: filter,
-          $top: roster.length,
-        },
-        {
-          id: "prs",
-          metric_id: METRIC_REGISTRY.V2_MEMBER_PRS,
-          $filter: filter,
-          $top: roster.length,
-        },
-      ];
-      const resp = await queryBatchWithRange<
-        RawTeamMemberRow | RawMemberPrsRow
-      >(range, items);
-      const membersResult = resp.results.find((r) => r.id === "members");
-      if (!membersResult || membersResult.status !== "ok") {
-        throw new Error("Failed to load team members");
-      }
-      const byEmail = new Map<string, RawTeamMemberRow>();
-      const prsByEmail = new Map<string, number>();
-      for (const r of resp.results) {
-        if (r.status !== "ok") continue;
-        if (r.id === "members") {
-          for (const row of r.items as RawTeamMemberRow[]) {
-            byEmail.set(row.person_id.toLowerCase(), row);
-          }
-        } else if (r.id === "prs") {
-          for (const row of r.items as RawMemberPrsRow[]) {
-            const v = Number(row.prs_merged);
-            if (Number.isFinite(v)) prsByEmail.set(row.person_id.toLowerCase(), v);
-          }
-        }
-      }
-      return roster.map((entry) => {
-        const key = entry.email.toLowerCase();
-        const row = byEmail.get(key);
-        const member = row
-          ? transformTeamMembers([row], period)[0]!
-          : buildSyntheticMember(entry, period);
-        const prs = prsByEmail.get(key);
-        // The analytics row's `display_name` (BambooHR) can disagree with the
-        // identity name shown in the sidebar/header (Entra) for the same
-        // person (#1837). The roster IS the identity source, so the grid
-        // renders the identity name it already holds; analytics supplies only
-        // the metric values.
-        return {
-          ...member,
-          name: entry.display_name,
-          ...(prs != null ? { prs_merged: prs } : {}),
-        };
-      });
-    },
-  });
-}
-
-const TEAM_BULLET_SECTIONS = {
-  task_delivery: METRIC_REGISTRY.TEAM_BULLET_DELIVERY,
-  git_output: METRIC_REGISTRY.TEAM_BULLET_GIT,
-  code_quality: METRIC_REGISTRY.TEAM_BULLET_QUALITY,
-  estimation: METRIC_REGISTRY.TEAM_BULLET_DELIVERY,
-  collaboration: METRIC_REGISTRY.TEAM_BULLET_COLLAB,
-  ai_adoption: METRIC_REGISTRY.TEAM_BULLET_AI,
-} as const;
-
-export type TeamBulletSectionId = keyof typeof TEAM_BULLET_SECTIONS;
-
-export function isTeamBulletSectionId(id: string): id is TeamBulletSectionId {
-  return id in TEAM_BULLET_SECTIONS;
-}
-
-/**
- * Scope a team bullet aggregate to the members actually shown — the
- * identity-tree subtree the screen renders (transitive + active) — by
- * `person_id in (...)`, so the section aggregates over exactly the same
- * people as the heatmap. Callers must gate the query on a non-empty roster.
- */
-function teamScopeFilter(roster: readonly RosterEntry[]): string {
-  const ids = roster
-    .map((r) => `'${odataEscapeValue(r.email.toLowerCase())}'`)
-    .join(", ");
-  return `person_id in (${ids})`;
-}
-
-function teamScopeKey(
-  teamId: string,
-  roster: readonly RosterEntry[] | null | undefined,
-): string {
-  if (roster && roster.length > 0) {
-    return roster.map((r) => r.email.toLowerCase()).join(",");
-  }
-  return teamId.includes("@") ? teamId.toLowerCase() : teamId;
-}
-
-export function useTeamBulletSection(
-  sectionId: TeamBulletSectionId,
-  teamId: string,
-  teamSize: number | undefined,
-  period: PeriodValue,
-  range: DateRange,
-  options?: { keepPrevious?: boolean; roster?: readonly RosterEntry[] | null },
-): UseQueryResult<BulletMetric[]> {
-  const metricId = TEAM_BULLET_SECTIONS[sectionId];
-  const scopeKey = teamScopeKey(teamId, options?.roster);
-  const { data: catalog } = useCatalog();
-  const catalogKey = catalog?.generated_at ?? null;
-  return useQuery({
-    queryKey: [
-      "team",
-      "bullet",
-      sectionId,
-      scopeKey,
-      teamSize,
-      period,
-      range.from,
-      range.to,
-      catalogKey,
-    ],
-    enabled: Boolean(teamId) && Boolean(options?.roster?.length) && Boolean(catalog),
-    placeholderData: options?.keepPrevious ? keepPreviousData : undefined,
-    queryFn: async () => {
-      const roster = options?.roster;
-      if (!roster?.length) return [];
-      const resp = await queryMetric<RawBulletAggregateRow>(metricId, range, {
-        $filter: teamScopeFilter(roster),
-      });
-      return transformBulletMetrics(
-        resp.items,
-        sectionId,
-        period,
-        teamSize,
-        "team",
-        catalog,
-      );
-    },
-  });
-}
-
-export interface TeamBulletSectionsData {
-  bySection: Record<string, BulletMetric[]>;
-  errors: Record<string, boolean>;
-}
-
-export function useTeamBulletSections(
-  sectionIds: readonly TeamBulletSectionId[],
-  teamId: string,
-  teamSize: number | undefined,
-  period: PeriodValue,
-  range: DateRange,
-  options?: { keepPrevious?: boolean; roster?: readonly RosterEntry[] | null },
-): UseQueryResult<TeamBulletSectionsData> {
-  const scopeKey = teamScopeKey(teamId, options?.roster);
-  const { data: catalog } = useCatalog();
-  const catalogKey = catalog?.generated_at ?? null;
-  return useQuery({
-    queryKey: [
-      "team",
-      "bullet-batch",
-      sectionIds.join(","),
-      scopeKey,
-      teamSize,
-      period,
-      range.from,
-      range.to,
-      catalogKey,
-    ],
-    enabled:
-      sectionIds.length > 0 &&
-      Boolean(teamId) &&
-      Boolean(options?.roster?.length) &&
-      Boolean(catalog),
-    placeholderData: options?.keepPrevious ? keepPreviousData : undefined,
-    queryFn: async () => {
-      const roster = options?.roster;
-      if (!roster?.length) return { bySection: {}, errors: {} };
-      const filter = teamScopeFilter(roster);
-      const items: BatchQueryItem[] = sectionIds.map((id) => ({
-        id,
-        metric_id: TEAM_BULLET_SECTIONS[id],
-        $filter: filter,
-      }));
-      const resp = await queryBatchWithRange<RawBulletAggregateRow>(
-        range,
-        items,
-      );
-      const byId = new Map<string, BatchQueryResult<RawBulletAggregateRow>>();
-      for (const r of resp.results) {
-        if (r.id) byId.set(r.id, r);
-      }
-      const bySection: Record<string, BulletMetric[]> = {};
-      const errors: Record<string, boolean> = {};
-      for (const id of sectionIds) {
-        const r = byId.get(id);
-        if (r && r.status === "ok") {
-          errors[id] = false;
-          bySection[id] = transformBulletMetrics(
-            r.items,
-            id,
-            period,
-            teamSize,
-            "team",
-            catalog,
-          );
-        } else {
-          errors[id] = true;
-          bySection[id] = [];
-        }
-      }
-      return { bySection, errors };
-    },
-  });
-}
-
-export type TeamDrillTarget = {
-  kind: "cell";
-  personId: string;
-  drillId: string;
-};
-
-export function useTeamDrill(
-  target: TeamDrillTarget | null,
-  range: DateRange,
-): UseQueryResult<DrillData | null> {
-  const key =
-    target == null ? null : `cell:${target.personId}:${target.drillId}`;
-  return useQuery({
-    queryKey: ["team", "drill", key, range.from, range.to],
-    enabled: Boolean(target),
-    queryFn: async () => {
-      if (!target) return null;
-      const filter = `person_id eq '${odataEscapeValue(target.personId.toLowerCase())}' and drill_id eq '${odataEscapeValue(target.drillId)}'`;
-      const resp = await queryMetric<RawDrillRow>(
-        METRIC_REGISTRY.IC_DRILL,
-        range,
-        { $filter: filter },
-      );
-      return resp.items[0] ? transformDrill(resp.items[0]) : null;
-    },
-  });
-}
diff --git a/src/queries/v2/ic-extras.test.ts b/src/queries/v2/ic-extras.test.ts
deleted file mode 100644
index 001652a4..00000000
--- a/src/queries/v2/ic-extras.test.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { renderHook, waitFor } from "@testing-library/react";
-import { createElement, type ReactNode } from "react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import {
-  queryBatchWithRange,
-  queryMetric,
-  type BatchQueryItem,
-  type BatchQueryResult,
-} from "@/api/analytics-client";
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import {
-  icDrilldownBatchQueryOptions,
-  icHistogramQueryOptions,
-  useIcDrilldownBatch,
-  useIcHistogram,
-  useIcSectionTrend,
-  type HistogramBin,
-} from "@/queries/v2/ic-extras";
-
-vi.mock("@/api/analytics-client", async (orig) => ({
-  ...(await orig<typeof import("@/api/analytics-client")>()),
-  queryMetric: vi.fn(),
-  queryBatchWithRange: vi.fn(),
-}));
-
-const mockMetric = vi.mocked(queryMetric);
-const mockBatch = vi.mocked(queryBatchWithRange);
-
-const RANGE = { from: "2026-06-01", to: "2026-06-30" };
-const PAGE = { has_next: false, cursor: null };
-
-function odata<T>(items: T[]) {
-  return { items, page_info: PAGE };
-}
-
-function ok<T>(id: string, items: T[]): BatchQueryResult<T> {
-  return { status: "ok", id, metric_id: id, items, page_info: PAGE };
-}
-
-function wrapper() {
-  const client = new QueryClient({
-    defaultOptions: { queries: { retry: false, gcTime: 0 } },
-  });
-  return ({ children }: { children: ReactNode }) =>
-    createElement(QueryClientProvider, { client }, children);
-}
-
-const BINS: HistogramBin[] = [
-  { metric_key: "focus_h", bin: 0, bin_end: 2, count: 3 },
-  { metric_key: "focus_h", bin: 2, bin_end: 4, count: 1 },
-];
-
-beforeEach(() => {
-  mockMetric.mockReset();
-  mockBatch.mockReset();
-});
-
-describe("useIcHistogram", () => {
-  it("fetches bins with a canonicalized person + metric filter", async () => {
-    mockMetric.mockResolvedValue(odata(BINS));
-    const { result } = renderHook(
-      () => useIcHistogram("  Alice@X.com ", "focus_h", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual(BINS);
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.V2_IC_HISTOGRAM,
-      RANGE,
-      {
-        $filter:
-          "person_id eq 'alice@x.com' and metric_key eq 'focus_h'",
-      },
-    );
-  });
-
-  it("is disabled when the metric key is empty", () => {
-    const opts = icHistogramQueryOptions("alice@x.com", "", RANGE);
-    expect(opts.enabled).toBe(false);
-    expect(opts.queryKey).toEqual([
-      "v2",
-      "ic-histogram",
-      "alice@x.com",
-      "",
-      RANGE.from,
-      RANGE.to,
-    ]);
-  });
-});
-
-describe("useIcSectionTrend", () => {
-  it("pivots long rows to wide date points, sorted by date", async () => {
-    mockMetric.mockResolvedValue(
-      odata([
-        { metric_date: "2026-06-08", series_key: "b", value: 2 },
-        { date: "2026-06-01", series_key: "a", value: 1 },
-        { metric_date: "2026-06-01", series_key: "b", value: 3 },
-        // Row without any date is dropped.
-        { series_key: "c", value: 9 },
-      ]),
-    );
-    const { result } = renderHook(
-      () => useIcSectionTrend("Alice@X.com", "code_quality", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual([
-      { date: "2026-06-01", a: 1, b: 3 },
-      { date: "2026-06-08", b: 2 },
-    ]);
-    expect(mockMetric).toHaveBeenCalledWith(
-      METRIC_REGISTRY.V2_IC_SECTION_TREND,
-      RANGE,
-      {
-        $filter:
-          "person_id eq 'alice@x.com' and section_id eq 'code_quality'",
-      },
-    );
-  });
-
-  it("passes already-wide rows through untouched", async () => {
-    const wide = [{ date: "2026-06-01", loc: 120 }];
-    mockMetric.mockResolvedValue(odata(wide));
-    const { result } = renderHook(
-      () => useIcSectionTrend("alice@x.com", "ai_adoption", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual(wide);
-  });
-
-  it("returns an empty series for no rows", async () => {
-    mockMetric.mockResolvedValue(odata([]));
-    const { result } = renderHook(
-      () => useIcSectionTrend("alice@x.com", "code_quality", RANGE),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    expect(result.current.data).toEqual([]);
-  });
-});
-
-describe("icDrilldownBatchQueryOptions", () => {
-  it("is disabled and returns the empty shape when any input is missing", async () => {
-    const opts = icDrilldownBatchQueryOptions({
-      sectionId: null,
-      personId: "alice@x.com",
-      range: RANGE,
-      period: "month",
-    });
-    expect(opts.enabled).toBe(false);
-    // Defensive guard inside the queryFn (unreachable through the hook).
-    const data = await opts.queryFn();
-    expect(data.histograms.size).toBe(0);
-    expect(data.sectionTrend).toBeNull();
-    expect(mockBatch).not.toHaveBeenCalled();
-  });
-});
-
-describe("useIcDrilldownBatch", () => {
-  it("adds a section-trend item for code_quality and groups histograms by metric", async () => {
-    mockBatch.mockResolvedValue({
-      results: [
-        ok("histograms", [
-          ...BINS,
-          { metric_key: "build_success", bin: 0, bin_end: 1, count: 5 },
-        ]),
-        ok("section_trend", [
-          { metric_date: "2026-06-01", series_key: "s", value: 7 },
-        ]),
-      ],
-    });
-    const { result } = renderHook(
-      () =>
-        useIcDrilldownBatch({
-          sectionId: "code_quality",
-          personId: "Alice@X.com",
-          range: RANGE,
-          period: "month",
-        }),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    const data = result.current.data!;
-    expect(data.histograms.get("focus_h")).toHaveLength(2);
-    expect(data.histograms.get("build_success")).toHaveLength(1);
-    expect(data.sectionTrend).toEqual([{ date: "2026-06-01", s: 7 }]);
-
-    const items = mockBatch.mock.calls[0]![1] as BatchQueryItem[];
-    expect(items.map((i) => i.id)).toEqual(["histograms", "section_trend"]);
-    expect(items[1]!.$filter).toBe(
-      "person_id eq 'alice@x.com' and section_id eq 'code_quality'",
-    );
-  });
-
-  it("skips the trend item for other sections and tolerates errored histograms", async () => {
-    mockBatch.mockResolvedValue({
-      results: [
-        {
-          status: "error",
-          id: "histograms",
-          metric_id: METRIC_REGISTRY.V2_IC_HISTOGRAM,
-          error: { type: "about:blank", title: "boom", status: 500, detail: "boom" },
-        },
-      ],
-    });
-    const { result } = renderHook(
-      () =>
-        useIcDrilldownBatch({
-          sectionId: "collaboration",
-          personId: "alice@x.com",
-          range: RANGE,
-          period: "month",
-        }),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    expect(result.current.data!.histograms.size).toBe(0);
-    expect(result.current.data!.sectionTrend).toBeNull();
-    const items = mockBatch.mock.calls[0]![1] as BatchQueryItem[];
-    expect(items.map((i) => i.id)).toEqual(["histograms"]);
-  });
-
-  it("stays disabled when inputs are incomplete", async () => {
-    const { result } = renderHook(
-      () =>
-        useIcDrilldownBatch({
-          sectionId: "code_quality",
-          personId: null,
-          range: RANGE,
-          period: "month",
-        }),
-      { wrapper: wrapper() },
-    );
-    await waitFor(() => expect(result.current.fetchStatus).toBe("idle"));
-    expect(mockBatch).not.toHaveBeenCalled();
-  });
-});
diff --git a/src/queries/v2/ic-extras.ts b/src/queries/v2/ic-extras.ts
deleted file mode 100644
index 587107a7..00000000
--- a/src/queries/v2/ic-extras.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import { keepPreviousData, useQuery, type UseQueryResult } from "@tanstack/react-query";
-
-import {
-  queryBatchWithRange,
-  queryMetric,
-  type BatchQueryItem,
-  type BatchQueryResult,
-} from "@/api/analytics-client";
-import { METRIC_REGISTRY } from "@/api/metric-registry";
-import { odataEscapeValue } from "@/api/odata";
-import type { DateRange } from "@/api/period-to-date-range";
-import type { PeriodValue } from "@/types/insight";
-
-function canonicalPersonId(personId: string): string {
-  return personId.trim().toLowerCase();
-}
-
-function personFilter(personId: string): string {
-  return `person_id eq '${odataEscapeValue(canonicalPersonId(personId))}'`;
-}
-
-export interface HistogramBin {
-  metric_key: string;
-  bin: number;
-  bin_end: number;
-  count: number;
-}
-
-export function icHistogramQueryOptions(
-  personId: string,
-  metricKey: string,
-  range: DateRange,
-) {
-  const canonicalId = canonicalPersonId(personId);
-  return {
-    queryKey: ["v2", "ic-histogram", canonicalId, metricKey, range.from, range.to],
-    enabled: Boolean(canonicalId && metricKey),
-    queryFn: async () => {
-      const resp = await queryMetric<HistogramBin>(
-        METRIC_REGISTRY.V2_IC_HISTOGRAM,
-        range,
-        {
-          $filter: `${personFilter(canonicalId)} and metric_key eq '${odataEscapeValue(metricKey)}'`,
-        },
-      );
-      return resp.items;
-    },
-  };
-}
-
-export function useIcHistogram(
-  personId: string,
-  metricKey: string,
-  range: DateRange,
-): UseQueryResult<HistogramBin[]> {
-  return useQuery(icHistogramQueryOptions(personId, metricKey, range));
-}
-
-export type { CompositionRow } from "@/lib/insight/v2/derivations";
-
-export interface SectionTrendPointRow {
-  date: string;
-  [key: string]: number | string;
-}
-
-interface SectionTrendLongRow {
-  metric_date?: string;
-  date?: string;
-  series_key: string;
-  value: number;
-}
-
-function pivotLongToWide(
-  rows: ReadonlyArray<SectionTrendLongRow | SectionTrendPointRow>,
-): SectionTrendPointRow[] {
-  if (rows.length === 0) return [];
-  const first = rows[0] as Record<string, unknown>;
-  const isLong =
-    typeof first.series_key === "string" && typeof first.value === "number";
-  if (!isLong) return rows as SectionTrendPointRow[];
-
-  const byDate = new Map<string, SectionTrendPointRow>();
-  for (const r of rows as SectionTrendLongRow[]) {
-    const date = r.metric_date ?? r.date ?? "";
-    if (!date) continue;
-    let point = byDate.get(date);
-    if (!point) {
-      point = { date };
-      byDate.set(date, point);
-    }
-    point[r.series_key] = r.value;
-  }
-  return Array.from(byDate.values()).sort((a, b) =>
-    String(a.date) < String(b.date) ? -1 : 1,
-  );
-}
-
-export function useIcSectionTrend(
-  personId: string,
-  sectionId: string,
-  range: DateRange,
-): UseQueryResult<SectionTrendPointRow[]> {
-  const canonicalId = canonicalPersonId(personId);
-  return useQuery({
-    queryKey: [
-      "v2",
-      "ic-section-trend",
-      canonicalId,
-      sectionId,
-      range.from,
-      range.to,
-    ],
-    enabled: Boolean(canonicalId && sectionId),
-    placeholderData: keepPreviousData,
-    queryFn: async () => {
-      const resp = await queryMetric<SectionTrendLongRow>(
-        METRIC_REGISTRY.V2_IC_SECTION_TREND,
-        range,
-        {
-          $filter: `${personFilter(canonicalId)} and section_id eq '${sectionId}'`,
-        },
-      );
-      return pivotLongToWide(resp.items);
-    },
-  });
-}
-
-export interface DrilldownBatchData {
-  histograms: Map<string, HistogramBin[]>;
-  sectionTrend: SectionTrendPointRow[] | null;
-}
-
-type DrilldownItem = unknown;
-
-function getItems<T>(
-  byId: Map<string, BatchQueryResult<DrilldownItem>>,
-  id: string,
-): T[] | null {
-  const r = byId.get(id);
-  if (!r || r.status !== "ok") return null;
-  return r.items as T[];
-}
-
-export interface IcDrilldownBatchOpts {
-  sectionId: string | null;
-  personId: string | null;
-  range: DateRange | null;
-  period: PeriodValue | null;
-}
-
-export function icDrilldownBatchQueryOptions(opts: IcDrilldownBatchOpts) {
-  const { sectionId, personId, range, period } = opts;
-  return {
-    queryKey: [
-      "v2",
-      "ic-drilldown-batch",
-      sectionId,
-      personId?.toLowerCase() ?? "",
-      period ?? "",
-      range?.from ?? "",
-      range?.to ?? "",
-    ],
-    enabled: Boolean(sectionId && personId && range && period),
-    placeholderData: keepPreviousData,
-    queryFn: async (): Promise<DrilldownBatchData> => {
-      if (!sectionId || !personId || !range || !period) {
-        return {
-          histograms: new Map(),
-          sectionTrend: null,
-        };
-      }
-
-      const pfilter = personFilter(personId);
-      const items: BatchQueryItem[] = [
-        {
-          id: "histograms",
-          metric_id: METRIC_REGISTRY.V2_IC_HISTOGRAM,
-          $filter: pfilter,
-        },
-      ];
-
-      if (sectionId === "code_quality" || sectionId === "ai_adoption") {
-        items.push({
-          id: "section_trend",
-          metric_id: METRIC_REGISTRY.V2_IC_SECTION_TREND,
-          $filter: `${pfilter} and section_id eq '${sectionId}'`,
-        });
-      }
-      const resp = await queryBatchWithRange<DrilldownItem>(range, items);
-      const byId = new Map<string, BatchQueryResult<DrilldownItem>>();
-      for (const r of resp.results) {
-        if (r.id) byId.set(r.id, r);
-      }
-
-      const histograms = new Map<string, HistogramBin[]>();
-      const histRows = getItems<HistogramBin>(byId, "histograms");
-      if (histRows) {
-        for (const row of histRows) {
-          let arr = histograms.get(row.metric_key);
-          if (!arr) {
-            arr = [];
-            histograms.set(row.metric_key, arr);
-          }
-          arr.push(row);
-        }
-      }
-
-      const sectionTrendRows = getItems<SectionTrendLongRow>(byId, "section_trend");
-
-      return {
-        histograms,
-        sectionTrend: sectionTrendRows
-          ? pivotLongToWide(sectionTrendRows)
-          : null,
-      };
-    },
-  } as const;
-}
-
-export function useIcDrilldownBatch(
-  opts: IcDrilldownBatchOpts,
-): UseQueryResult<DrilldownBatchData> {
-  return useQuery(icDrilldownBatchQueryOptions(opts));
-}
diff --git a/src/routes/ic.$person.personal.tsx b/src/routes/ic.$person.personal.tsx
index 56a7943b..526e4c03 100644
--- a/src/routes/ic.$person.personal.tsx
+++ b/src/routes/ic.$person.personal.tsx
@@ -1,6 +1,6 @@
 import { createFileRoute } from "@tanstack/react-router";
 
-import { IcDashboardScreen } from "@/screens/ic-dashboard";
+import { DashboardScreen } from "@/screens/dashboard";
 
 export const Route = createFileRoute("/ic/$person/personal")({
   component: PersonalRoute,
@@ -8,5 +8,5 @@ export const Route = createFileRoute("/ic/$person/personal")({
 
 function PersonalRoute() {
   const { person } = Route.useParams();
-  return <IcDashboardScreen personId={person} />;
+  return <DashboardScreen personId={person} />;
 }
diff --git a/src/routes/ic.$person.team.tsx b/src/routes/ic.$person.team.tsx
index eb4e1a14..0cc65efd 100644
--- a/src/routes/ic.$person.team.tsx
+++ b/src/routes/ic.$person.team.tsx
@@ -1,9 +1,7 @@
 import { createFileRoute } from "@tanstack/react-router";
 
 import { useViewer } from "@/auth";
-import { useMetricsV2Enabled } from "@/lib/feature-flags";
 import { TeamViewScreen } from "@/screens/team-view";
-import { TeamViewV2Screen } from "@/screens/team-view-v2";
 
 export const Route = createFileRoute("/ic/$person/team")({
   component: TeamScreen,
@@ -13,9 +11,5 @@ function TeamScreen() {
   const { person } = Route.useParams();
   const { email: viewerEmail } = useViewer();
   const viewer = viewerEmail ?? person;
-  const v2 = useMetricsV2Enabled();
-  if (v2) {
-    return <TeamViewV2Screen teamId={person} viewerEmail={viewer} />;
-  }
   return <TeamViewScreen teamId={person} viewerEmail={viewer} />;
 }
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index a52229a1..2086a1ba 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -2,7 +2,7 @@ import { createFileRoute } from "@tanstack/react-router";
 
 import { useViewer } from "@/auth";
 import { FullScreenLoading } from "@/components/full-screen-loading";
-import { IcDashboardScreen } from "@/screens/ic-dashboard";
+import { DashboardScreen } from "@/screens/dashboard";
 
 export const Route = createFileRoute("/")({
   component: IndexRoute,
@@ -13,5 +13,5 @@ function IndexRoute() {
   // An authenticated session always carries an email; the loading fallback
   // only shows in the brief window before the store resolves.
   if (!email) return <FullScreenLoading />;
-  return <IcDashboardScreen personId={email} />;
+  return <DashboardScreen personId={email} />;
 }
diff --git a/src/screens/ic-dashboard/engineering-dashboard-v2.test.tsx b/src/screens/dashboard.test.tsx
similarity index 82%
rename from src/screens/ic-dashboard/engineering-dashboard-v2.test.tsx
rename to src/screens/dashboard.test.tsx
index ff84e584..54b0983c 100644
--- a/src/screens/ic-dashboard/engineering-dashboard-v2.test.tsx
+++ b/src/screens/dashboard.test.tsx
@@ -2,12 +2,10 @@ import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-import { KPI_ROW, metricGroups } from "@/lib/insight/groups";
+import { GROUPS, KPI_ROW } from "@/lib/insight/groups";
 
-const METRIC_KEYS = KPI_ROW.flatMap((s) =>
-  s.kind === "metric" ? [s.metricKey] : []
-);
-const GROUP_IDS = metricGroups().map((def) => def.id);
+const METRIC_KEYS = [...KPI_ROW];
+const GROUP_IDS = GROUPS.map((def) => def.id);
 
 const kpiState = {
   isPending: false,
@@ -15,10 +13,15 @@ const kpiState = {
   isError: false,
   refetch: vi.fn(),
 };
+let personData: { display_name?: string } | undefined;
 let tilesReturn: Array<{ key: string }> = [];
 let attentionPerGroup: Array<{ key: string }> = [];
 let omitGroupId: string | null = null;
 
+vi.mock("@/queries/ic-dashboard", () => ({
+  useIcPerson: () => ({ data: personData }),
+}));
+
 vi.mock("@/hooks/use-period", () => ({
   usePeriod: () => ({
     period: "month",
@@ -64,19 +67,19 @@ vi.mock("@/queries/metric-results", () => ({
     [...set.values()].some((result) => result.isPending),
 }));
 
-vi.mock("@/components/widgets/v2/dashboard-header", () => ({
+vi.mock("@/components/widgets/dashboard/dashboard-header", () => ({
   DashboardHeader: ({ title }: { title: string }) => (
     <div data-testid="header">{title}</div>
   ),
 }));
 
-vi.mock("@/components/widgets/v2/ic-needs-attention", () => ({
+vi.mock("@/components/widgets/dashboard/ic-needs-attention", () => ({
   IcNeedsAttention: ({ items }: { items: unknown[] }) => (
     <div data-testid="attention">{items.length}</div>
   ),
 }));
 
-vi.mock("@/components/widgets/v2/kpi-tile", () => ({
+vi.mock("@/components/widgets/dashboard/kpi-tile", () => ({
   KpiTile: ({ tile }: { tile: { key: string } }) => (
     <div data-testid="kpi-tile">{tile.key}</div>
   ),
@@ -105,7 +108,7 @@ vi.mock("@/components/widgets/metric-views/metric-group-card", () => ({
   ),
 }));
 
-vi.mock("@/components/widgets/v2/group-drilldown-sheet", () => ({
+vi.mock("@/components/widgets/dashboard/group-drilldown-sheet", () => ({
   GroupDrilldownSheet: ({
     def,
     open,
@@ -121,7 +124,7 @@ vi.mock("@/components/widgets/v2/group-drilldown-sheet", () => ({
   ),
 }));
 
-import { EngineeringDashboardV2 } from "./engineering-dashboard-v2";
+import { DashboardScreen } from "./dashboard";
 
 beforeEach(() => {
   kpiState.isPending = false;
@@ -131,19 +134,17 @@ beforeEach(() => {
   tilesReturn = [];
   attentionPerGroup = [];
   omitGroupId = null;
+  personData = undefined;
 });
 
-describe("EngineeringDashboardV2", () => {
+describe("DashboardScreen", () => {
   it("renders a KPI tile, a card per group, and the attention section", () => {
     tilesReturn = METRIC_KEYS.map((key) => ({ key }));
     attentionPerGroup = [{ key: "k" }];
 
-    render(
-      <EngineeringDashboardV2
-        personId="me@x.io"
-        person={{ display_name: "Me Person" } as never}
-      />,
-    );
+    personData = { display_name: "Me Person" };
+
+    render(<DashboardScreen personId="me@x.io" />);
 
     // The header shows the resolved name, never the raw id/email.
     expect(screen.getByTestId("header")).toHaveTextContent("Me Person");
@@ -162,7 +163,7 @@ describe("EngineeringDashboardV2", () => {
   it("shows a retryable error tile per KPI when the collection errored", async () => {
     kpiState.isError = true;
 
-    render(<EngineeringDashboardV2 personId="me@x.io" />);
+    render(<DashboardScreen personId="me@x.io" />);
 
     const errors = screen.getAllByTestId("kpi-error");
     expect(errors).toHaveLength(METRIC_KEYS.length);
@@ -173,7 +174,7 @@ describe("EngineeringDashboardV2", () => {
   it("shows the single page spinner while the collection is pending", () => {
     kpiState.isPending = true;
 
-    render(<EngineeringDashboardV2 personId="me@x.io" />);
+    render(<DashboardScreen personId="me@x.io" />);
 
     // One loading state for the whole dashboard — no per-widget loaders and
     // no partially painted content.
@@ -183,7 +184,7 @@ describe("EngineeringDashboardV2", () => {
   });
 
   it("shows a placeholder per KPI when settled with no data", () => {
-    render(<EngineeringDashboardV2 personId="me@x.io" />);
+    render(<DashboardScreen personId="me@x.io" />);
 
     expect(screen.getAllByTestId("kpi-placeholder")).toHaveLength(
       METRIC_KEYS.length
@@ -193,7 +194,7 @@ describe("EngineeringDashboardV2", () => {
   it("renders no card for a group with no query result", () => {
     omitGroupId = GROUP_IDS[0]!;
 
-    render(<EngineeringDashboardV2 personId="me@x.io" />);
+    render(<DashboardScreen personId="me@x.io" />);
 
     expect(screen.getAllByTestId("metric-card")).toHaveLength(
       GROUP_IDS.length - 1
@@ -201,7 +202,7 @@ describe("EngineeringDashboardV2", () => {
   });
 
   it("opens the drilldown for the group whose card is clicked", async () => {
-    render(<EngineeringDashboardV2 personId="me@x.io" />);
+    render(<DashboardScreen personId="me@x.io" />);
 
     const firstGroup = GROUP_IDS[0]!;
     await userEvent.click(screen.getByRole("button", { name: firstGroup }));
@@ -213,7 +214,7 @@ describe("EngineeringDashboardV2", () => {
   });
 
   it("closes any open drilldown when the viewed person changes", async () => {
-    const { rerender } = render(<EngineeringDashboardV2 personId="me@x.io" />);
+    const { rerender } = render(<DashboardScreen personId="me@x.io" />);
 
     await userEvent.click(screen.getByRole("button", { name: GROUP_IDS[0]! }));
     expect(
@@ -222,7 +223,7 @@ describe("EngineeringDashboardV2", () => {
         .some((el) => el.dataset.open === "true")
     ).toBe(true);
 
-    rerender(<EngineeringDashboardV2 personId="other@x.io" />);
+    rerender(<DashboardScreen personId="other@x.io" />);
     expect(
       screen
         .getAllByTestId("drilldown")
diff --git a/src/screens/ic-dashboard/engineering-dashboard-v2.tsx b/src/screens/dashboard.tsx
similarity index 86%
rename from src/screens/ic-dashboard/engineering-dashboard-v2.tsx
rename to src/screens/dashboard.tsx
index 6675a9ae..da517ff7 100644
--- a/src/screens/ic-dashboard/engineering-dashboard-v2.tsx
+++ b/src/screens/dashboard.tsx
@@ -2,22 +2,22 @@ import { useState } from "react";
 
 import { CenteredSpinner } from "@/components/widgets/centered-spinner";
 import { ComingSoon } from "@/components/widgets/coming-soon";
-import { DashboardHeader } from "@/components/widgets/v2/dashboard-header";
-import { IcNeedsAttention } from "@/components/widgets/v2/ic-needs-attention";
+import { DashboardHeader } from "@/components/widgets/dashboard/dashboard-header";
+import { IcNeedsAttention } from "@/components/widgets/dashboard/ic-needs-attention";
 import {
   KpiTile,
   KpiTilePlaceholder,
-} from "@/components/widgets/v2/kpi-tile";
+} from "@/components/widgets/dashboard/kpi-tile";
 import { MetricGroupCard } from "@/components/widgets/metric-views/metric-group-card";
-import { GroupDrilldownSheet } from "@/components/widgets/v2/group-drilldown-sheet";
+import { GroupDrilldownSheet } from "@/components/widgets/dashboard/group-drilldown-sheet";
 import { usePeriod } from "@/hooks/use-period";
 import { useSettings } from "@/hooks/use-settings";
 import { metricAttentionItems } from "@/lib/insight/attention";
 import { metricKpiTiles, type KpiTileData } from "@/lib/insight/kpi-row";
 import {
+  GROUPS,
   KPI_ROW,
   KPI_ROW_COLLECTION,
-  metricGroups,
   type GroupId,
 } from "@/lib/insight/groups";
 import {
@@ -25,12 +25,12 @@ import {
   type MetricCollectionConfig,
 } from "@/lib/metrics/collection";
 import { normalizePersonId } from "@/lib/metrics/entity";
+import { useIcPerson } from "@/queries/ic-dashboard";
 import {
   collectionSetPending,
   useMetricCollection,
   useMetricCollectionSet,
 } from "@/queries/metric-results";
-import type { IdentityPerson } from "@/types/insight";
 
 // Stable references so the disabled drilldown query keeps a constant key.
 const EMPTY_COLLECTION: MetricCollectionConfig = { metrics: [] };
@@ -45,15 +45,13 @@ const CLOSED_DRILLDOWN_DATA = {
   refetch: () => {},
 } as const;
 
-export interface EngineeringDashboardV2Props {
+export interface DashboardScreenProps {
   personId: string;
-  person?: IdentityPerson | null;
 }
 
-export function EngineeringDashboardV2({
-  personId,
-  person,
-}: EngineeringDashboardV2Props) {
+export function DashboardScreen({ personId }: DashboardScreenProps) {
+  const personQ = useIcPerson(personId);
+  const person = personQ.data ?? null;
   const { period, dateRange } = usePeriod();
   const { focusMode } = useSettings();
   const entityId = normalizePersonId(personId);
@@ -67,7 +65,7 @@ export function EngineeringDashboardV2({
   // as fast as a KPI tile, and let the open drilldown fetch the full
   // collection lazily below.
   const groupData = useMetricCollectionSet(
-    metricGroups().map((def) => ({
+    GROUPS.map((def) => ({
       key: def.id,
       collection: projectViews(def.collection, ["period", "peer"]),
     })),
@@ -83,7 +81,7 @@ export function EngineeringDashboardV2({
   // user doesn't open.
   const openMetricDef =
     openGroup != null
-      ? (metricGroups().find((def) => def.id === openGroup) ?? null)
+      ? (GROUPS.find((def) => def.id === openGroup) ?? null)
       : null;
   const drilldownData = useMetricCollection(
     openMetricDef?.collection ?? EMPTY_COLLECTION,
@@ -111,7 +109,7 @@ export function EngineeringDashboardV2({
     tiles.map((tile) => [tile.key, tile])
   );
 
-  const attentionItems = metricGroups().flatMap((def) =>
+  const attentionItems = GROUPS.flatMap((def) =>
     metricAttentionItems(
       def,
       groupData.get(def.id)?.byKey ?? new Map(),
@@ -145,9 +143,7 @@ export function EngineeringDashboardV2({
                 At a glance
               </p>
               <div className="grid grid-cols-[repeat(auto-fit,minmax(13rem,1fr))] gap-3">
-                {KPI_ROW.map((source) => {
-                  const key =
-                    source.kind === "metric" ? source.metricKey : source.key;
+                {KPI_ROW.map((key) => {
                   const tile = tilesByKey.get(key);
                   if (tile) {
                     return (
@@ -158,7 +154,7 @@ export function EngineeringDashboardV2({
                       />
                     );
                   }
-                  if (source.kind === "metric" && kpiData.isError) {
+                  if (kpiData.isError) {
                     return (
                       <ComingSoon
                         key={key}
@@ -183,7 +179,7 @@ export function EngineeringDashboardV2({
                 Sections
               </p>
               <div className="grid grid-cols-[repeat(auto-fit,minmax(18rem,1fr))] gap-3">
-                {metricGroups().map((def) => {
+                {GROUPS.map((def) => {
                   const result = groupData.get(def.id);
                   if (!result) return null;
                   return (
@@ -202,13 +198,12 @@ export function EngineeringDashboardV2({
         )}
       </main>
 
-      {metricGroups().map((def) => (
+      {GROUPS.map((def) => (
         <GroupDrilldownSheet
           key={def.id}
           open={openGroup === def.id}
           onOpenChange={(o) => setOpenGroup(o ? def.id : null)}
           def={def}
-          rows={[]}
           metricTarget={{
             kind: "person",
             entityId,
@@ -216,7 +211,6 @@ export function EngineeringDashboardV2({
             // query; closed sheets never render their body.
             data: def.id === openGroup ? drilldownData : CLOSED_DRILLDOWN_DATA,
           }}
-          personId={personId}
           range={dateRange}
           period={period}
           cohortLabel="department"
diff --git a/src/screens/ic-dashboard/engineering-dashboard.tsx b/src/screens/ic-dashboard/engineering-dashboard.tsx
deleted file mode 100644
index 73fb660d..00000000
--- a/src/screens/ic-dashboard/engineering-dashboard.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import { filterBulletsByLayoutGroup } from "@/lib/insight/bullet-layout-groups";
-import { IcViewToggle } from "@/components/ic-view-toggle";
-import { SidebarTrigger } from "@/components/ui/sidebar";
-import { CollapsibleSection } from "@/components/widgets/collapsible-section";
-import { ComingSoon } from "@/components/widgets/coming-soon";
-import { DeliveryTrends } from "@/components/widgets/delivery-trends";
-import { DrillModal } from "@/components/widgets/drill-modal";
-import { KpiStrip } from "@/components/widgets/kpi-strip";
-import { LocStackedBar } from "@/components/widgets/loc-stacked-bar";
-import { MetricCard } from "@/components/widgets/metric-card";
-import { PeriodSelectorBar } from "@/components/widgets/period-selector-bar";
-import { PersonHeader } from "@/components/widgets/person-header";
-import { TimeOffBanner } from "@/components/widgets/time-off-banner";
-import { ViewModeToggle } from "@/components/widgets/view-mode-toggle";
-import { usePeriod, useViewMode } from "@/hooks/use-period";
-import {
-  useIcDashboardData,
-  useIcDrill,
-  type IcDashboardSection,
-} from "@/queries/ic-dashboard";
-import type { IdentityPerson } from "@/types/insight";
-
-export interface EngineeringDashboardProps {
-  personId: string;
-  person?: IdentityPerson | null;
-}
-
-export function EngineeringDashboard({
-  personId,
-  person: personProp,
-}: EngineeringDashboardProps) {
-  const { t } = useTranslation();
-  const { period, customRange, dateRange, setPeriod, setCustomRange } =
-    usePeriod();
-  const { viewMode, setViewMode } = useViewMode();
-  const [drillId, setDrillId] = useState<string | null>(null);
-
-  const dashQ = useIcDashboardData(personId, period, dateRange);
-  const drillQ = useIcDrill(personId, drillId, dateRange);
-
-  const sectionState = (section: IcDashboardSection) => ({
-    loading: dashQ.isPending,
-    errored: dashQ.isError || (dashQ.data?.errors[section] ?? false),
-    revalidating: false,
-  });
-
-  // Dispatcher (`<IcDashboardScreen>`) owns the identity fetch and forwards
-  // it as a prop — children trust it and don't re-issue the query.
-  const person = personProp ?? null;
-
-  const handleDrillClick = (id: string): void => {
-    setDrillId(id);
-  };
-
-  return (
-    <div className="flex flex-col gap-4 p-6">
-      <div className="bg-background/95 border-border/60 sticky top-0 z-20 -mx-6 -mt-6 border-b px-6 pt-6 pb-3 backdrop-blur-sm">
-        <div className="flex flex-wrap items-center justify-between gap-3">
-          <div className="flex min-w-0 items-center gap-3">
-            <SidebarTrigger className="md:hidden" />
-            <PersonHeader person={person} fallbackEmail={personId} inline />
-            <IcViewToggle
-              person={personId}
-              hasReports={(person?.subordinates?.length ?? 0) > 0}
-            />
-          </div>
-          <div className="flex flex-wrap items-center gap-2">
-            <PeriodSelectorBar
-              period={period}
-              customRange={customRange}
-              onPeriodChange={setPeriod}
-              onRangeChange={setCustomRange}
-            />
-            <ViewModeToggle mode={viewMode} onChange={setViewMode} />
-          </div>
-        </div>
-      </div>
-
-      <div className="border-border bg-card overflow-hidden rounded-xl border">
-        {dashQ.isPending ? (
-          <div className="p-4">
-            <ComingSoon variant="row" state="loading" />
-          </div>
-        ) : dashQ.isError || dashQ.data?.errors.kpis ? (
-          <div className="p-4">
-            <ComingSoon
-              variant="row"
-              state="error"
-              onRetry={() => dashQ.refetch()}
-            />
-          </div>
-        ) : (
-          <KpiStrip kpis={dashQ.data?.kpis ?? []} plain />
-        )}
-        <TimeOffBanner notice={dashQ.data?.timeOff ?? null} />
-      </div>
-
-      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
-        <MetricCard
-          title={t("ic_dashboard.sections.task_delivery")}
-          metrics={dashQ.data?.taskDelivery ?? []}
-          columns={1}
-          mode={viewMode}
-          personName={person?.display_name}
-          onDrillClick={handleDrillClick}
-          onRetry={() => dashQ.refetch()}
-          {...sectionState("task_delivery")}
-        />
-        <MetricCard
-          title={t("ic_dashboard.sections.git_output")}
-          metrics={dashQ.data?.gitOutput ?? []}
-          columns={1}
-          mode={viewMode}
-          personName={person?.display_name}
-          onDrillClick={handleDrillClick}
-          onRetry={() => dashQ.refetch()}
-          {...sectionState("git_output")}
-        />
-      </div>
-
-      <MetricCard
-        title={t("ic_dashboard.sections.code_quality")}
-        metrics={dashQ.data?.codeQuality ?? []}
-        columns={3}
-        mode={viewMode}
-        personName={person?.display_name}
-        onDrillClick={handleDrillClick}
-        onRetry={() => dashQ.refetch()}
-        {...sectionState("code_quality")}
-      />
-
-      <CollapsibleSection
-        title={t("ic_dashboard.sections.loc_breakdown_title")}
-        subtitle={t("ic_dashboard.sections.loc_breakdown_subtitle")}
-        storageKey="insight:ic-dashboard:loc-breakdown"
-      >
-        <div className="p-4">
-          {dashQ.isPending ? (
-            <ComingSoon variant="card" state="loading" />
-          ) : dashQ.isError || dashQ.data?.errors.loc_trend ? (
-            <ComingSoon
-              variant="card"
-              state="error"
-              onRetry={() => dashQ.refetch()}
-            />
-          ) : (
-            <LocStackedBar data={dashQ.data?.locTrend ?? []} />
-          )}
-        </div>
-      </CollapsibleSection>
-
-      <CollapsibleSection
-        title={t("ic_dashboard.sections.delivery_trends_title")}
-        subtitle={t("ic_dashboard.sections.delivery_trends_subtitle")}
-        storageKey="insight:ic-dashboard:delivery-trends"
-      >
-        <div className="p-4">
-          {dashQ.isPending ? (
-            <ComingSoon variant="card" state="loading" />
-          ) : dashQ.isError || dashQ.data?.errors.delivery_trend ? (
-            <ComingSoon
-              variant="card"
-              state="error"
-              onRetry={() => dashQ.refetch()}
-            />
-          ) : (
-            <DeliveryTrends data={dashQ.data?.deliveryTrend ?? []} />
-          )}
-        </div>
-      </CollapsibleSection>
-
-      <CollapsibleSection
-        title={t("ic_dashboard.sections.ai_dev_tools_title")}
-        storageKey="insight:ic-dashboard:ai-tools"
-      >
-        <div className="p-4">
-          <MetricCard
-            title={t("ic_dashboard.sections.ai_adoption")}
-            metrics={dashQ.data?.aiAdoption ?? []}
-            columns={2}
-            mode={viewMode}
-            personName={person?.display_name}
-            onDrillClick={handleDrillClick}
-            onRetry={() => dashQ.refetch()}
-            {...sectionState("ai_adoption")}
-          />
-        </div>
-      </CollapsibleSection>
-
-      <CollapsibleSection
-        title={t("ic_dashboard.sections.collaboration")}
-        storageKey="insight:ic-dashboard:collaboration"
-      >
-        <div className="p-4">
-          {(() => {
-            const collab = dashQ.data?.collaboration ?? [];
-            return (
-              <MetricCard
-                title={t("ic_dashboard.sections.collaboration")}
-                metrics={collab}
-                groups={[
-                  {
-                    heading: "Chat",
-                    metrics: filterBulletsByLayoutGroup(collab, "chat"),
-                  },
-                  {
-                    heading: "Email",
-                    metrics: filterBulletsByLayoutGroup(collab, "email"),
-                  },
-                  {
-                    heading: "Meetings",
-                    metrics: filterBulletsByLayoutGroup(collab, "meetings"),
-                  },
-                  {
-                    heading: "Files",
-                    metrics: filterBulletsByLayoutGroup(collab, "files"),
-                  },
-                ]}
-                mode={viewMode}
-                personName={person?.display_name}
-                onDrillClick={handleDrillClick}
-                onRetry={() => dashQ.refetch()}
-                {...sectionState("collaboration")}
-              />
-            );
-          })()}
-        </div>
-      </CollapsibleSection>
-
-      <DrillModal
-        drill={drillQ.data ?? null}
-        open={Boolean(drillId)}
-        loading={drillQ.isPending && Boolean(drillId)}
-        errored={drillQ.isError}
-        onClose={() => setDrillId(null)}
-        onRetry={() => drillQ.refetch()}
-      />
-    </div>
-  );
-}
diff --git a/src/screens/ic-dashboard/index.test.tsx b/src/screens/ic-dashboard/index.test.tsx
deleted file mode 100644
index 5cd51792..00000000
--- a/src/screens/ic-dashboard/index.test.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { render, screen } from "@testing-library/react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import type { IdentityPerson } from "@/types/insight";
-
-let personData: IdentityPerson | undefined;
-let v2Enabled = false;
-
-vi.mock("@/queries/ic-dashboard", () => ({
-  useIcPerson: () => ({ data: personData }),
-}));
-
-vi.mock("@/lib/feature-flags", () => ({
-  useMetricsV2Enabled: () => v2Enabled,
-}));
-
-vi.mock("./sales-dashboard", () => ({
-  SalesDashboard: ({
-    personId,
-    person,
-  }: {
-    personId: string;
-    person?: IdentityPerson | null;
-  }) => (
-    <div data-testid="sales" data-person={person?.display_name ?? ""}>
-      {personId}
-    </div>
-  ),
-}));
-
-vi.mock("./engineering-dashboard-v2", () => ({
-  EngineeringDashboardV2: ({ personId }: { personId: string }) => (
-    <div data-testid="eng-v2">{personId}</div>
-  ),
-}));
-
-vi.mock("./engineering-dashboard", () => ({
-  EngineeringDashboard: ({ personId }: { personId: string }) => (
-    <div data-testid="eng-v1">{personId}</div>
-  ),
-}));
-
-import { IcDashboardScreen } from "./index";
-
-function person(department?: string): IdentityPerson {
-  return {
-    person_id: "p@x.io",
-    email: "p@x.io",
-    display_name: "Pat",
-    department,
-    subordinates: [],
-  } as unknown as IdentityPerson;
-}
-
-beforeEach(() => {
-  personData = undefined;
-  v2Enabled = false;
-});
-
-describe("IcDashboardScreen", () => {
-  it("routes sales-department people to the sales dashboard, forwarding the person", () => {
-    personData = person("Inside Sales");
-    v2Enabled = true; // sales wins over the v2 flag
-
-    render(<IcDashboardScreen personId="p@x.io" />);
-
-    expect(screen.getByTestId("sales")).toHaveTextContent("p@x.io");
-    expect(screen.getByTestId("sales")).toHaveAttribute("data-person", "Pat");
-    expect(screen.queryByTestId("eng-v2")).not.toBeInTheDocument();
-  });
-
-  it("routes to the v2 engineering dashboard when the flag is on", () => {
-    personData = person("Engineering");
-    v2Enabled = true;
-
-    render(<IcDashboardScreen personId="p@x.io" />);
-
-    expect(screen.getByTestId("eng-v2")).toHaveTextContent("p@x.io");
-    expect(screen.queryByTestId("sales")).not.toBeInTheDocument();
-    expect(screen.queryByTestId("eng-v1")).not.toBeInTheDocument();
-  });
-
-  it("falls back to the v1 engineering dashboard with the flag off and no person yet", () => {
-    render(<IcDashboardScreen personId="p@x.io" />);
-
-    expect(screen.getByTestId("eng-v1")).toHaveTextContent("p@x.io");
-    expect(screen.queryByTestId("sales")).not.toBeInTheDocument();
-    expect(screen.queryByTestId("eng-v2")).not.toBeInTheDocument();
-  });
-});
diff --git a/src/screens/ic-dashboard/index.tsx b/src/screens/ic-dashboard/index.tsx
deleted file mode 100644
index 85ac35c8..00000000
--- a/src/screens/ic-dashboard/index.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useIcPerson } from "@/queries/ic-dashboard";
-import { useMetricsV2Enabled } from "@/lib/feature-flags";
-import { isSalesDepartment } from "@/lib/insight/is-sales-department";
-
-import { EngineeringDashboard } from "./engineering-dashboard";
-import { EngineeringDashboardV2 } from "./engineering-dashboard-v2";
-import { SalesDashboard } from "./sales-dashboard";
-
-export interface IcDashboardScreenProps {
-  personId: string;
-}
-
-export function IcDashboardScreen({ personId }: IcDashboardScreenProps) {
-  const personQ = useIcPerson(personId);
-  const person = personQ.data ?? null;
-  const v2 = useMetricsV2Enabled();
-  const sales = isSalesDepartment(person?.department);
-  if (sales) {
-    return <SalesDashboard personId={personId} person={person} />;
-  }
-  if (v2) {
-    return <EngineeringDashboardV2 personId={personId} person={person} />;
-  }
-  return <EngineeringDashboard personId={personId} person={person} />;
-}
diff --git a/src/screens/ic-dashboard/sales-dashboard.test.tsx b/src/screens/ic-dashboard/sales-dashboard.test.tsx
deleted file mode 100644
index 1b631ea1..00000000
--- a/src/screens/ic-dashboard/sales-dashboard.test.tsx
+++ /dev/null
@@ -1,307 +0,0 @@
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import "@/i18n";
-
-import type {
-  CrmFlowPoint,
-  CrmKpis,
-  CrmPipeline,
-  IdentityPerson,
-} from "@/types/insight";
-
-interface QueryLike<T> {
-  data: T | undefined;
-  isPending: boolean;
-  isFetching: boolean;
-  isError: boolean;
-  refetch: ReturnType<typeof vi.fn>;
-}
-
-function q<T>(data: T | undefined, over: Partial<QueryLike<T>> = {}): QueryLike<T> {
-  return {
-    data,
-    isPending: false,
-    isFetching: false,
-    isError: false,
-    refetch: vi.fn(),
-    ...over,
-  };
-}
-
-const queries = {
-  kpisQ: q<CrmKpis | null>(null),
-  prevKpisQ: q<CrmKpis | null>(null),
-  pipelineQ: q<CrmPipeline | null>(null),
-  flowQ: q<CrmFlowPoint[]>([]),
-  qualityQ: q<never[]>([]),
-  activityQ: q<never[]>([]),
-};
-
-vi.mock("@/hooks/use-period", () => ({
-  usePeriod: () => ({
-    period: "month",
-    customRange: null,
-    dateRange: { from: "2026-01-01", to: "2026-01-31" },
-    setPeriod: vi.fn(),
-    setCustomRange: vi.fn(),
-  }),
-}));
-
-vi.mock("@/queries/sales-dashboard", () => ({
-  useSalesDashboardQueries: () => queries,
-}));
-
-vi.mock("@/components/ic-view-toggle", () => ({
-  IcViewToggle: ({ hasReports }: { hasReports: boolean }) => (
-    <div data-testid="ic-toggle" data-has-reports={String(hasReports)} />
-  ),
-}));
-
-vi.mock("@/components/ui/sidebar", () => ({
-  SidebarTrigger: () => null,
-}));
-
-vi.mock("@/components/widgets/period-selector-bar", () => ({
-  PeriodSelectorBar: () => null,
-}));
-
-vi.mock("@/components/widgets/person-header", () => ({
-  PersonHeader: ({ fallbackEmail }: { fallbackEmail: string }) => (
-    <div data-testid="person-header">{fallbackEmail}</div>
-  ),
-}));
-
-vi.mock("@/components/widgets/kpi-strip", () => ({
-  KpiStrip: ({
-    kpis,
-  }: {
-    kpis: Array<{ metric_key: string; label: string; value: string; sublabel?: string }>;
-  }) => (
-    <div data-testid="kpi-strip">
-      {kpis.map((kpi) => (
-        <div key={kpi.metric_key} data-testid={`kpi-${kpi.metric_key}`}>
-          {kpi.label}|{kpi.value}|{kpi.sublabel}
-        </div>
-      ))}
-    </div>
-  ),
-}));
-
-vi.mock("@/components/widgets/sales-pacing-band", () => ({
-  SalesPacingBand: () => <div data-testid="pacing-band" />,
-}));
-
-vi.mock("@/components/widgets/metric-card", () => ({
-  MetricCard: ({
-    title,
-    loading,
-    errored,
-    revalidating,
-    onRetry,
-    personName,
-  }: {
-    title: string;
-    loading: boolean;
-    errored: boolean;
-    revalidating: boolean;
-    onRetry: () => void;
-    personName?: string;
-  }) => (
-    <button
-      data-testid="metric-card"
-      data-loading={String(loading)}
-      data-errored={String(errored)}
-      data-revalidating={String(revalidating)}
-      data-person={personName ?? ""}
-      onClick={onRetry}
-    >
-      {title}
-    </button>
-  ),
-}));
-
-vi.mock("@/components/widgets/collapsible-section", () => ({
-  CollapsibleSection: ({
-    title,
-    children,
-  }: {
-    title: string;
-    children: React.ReactNode;
-  }) => (
-    <section>
-      <h2>{title}</h2>
-      {children}
-    </section>
-  ),
-}));
-
-vi.mock("@/components/widgets/deal-flow-chart", () => ({
-  DealFlowChart: ({ data }: { data: unknown[] }) => (
-    <div data-testid="deal-flow">{data.length}</div>
-  ),
-}));
-
-vi.mock("@/components/widgets/coming-soon", () => ({
-  ComingSoon: ({
-    variant,
-    state,
-    onRetry,
-  }: {
-    variant: string;
-    state: string;
-    onRetry?: () => void;
-  }) => (
-    <button
-      data-testid={`coming-soon-${variant}-${state}`}
-      onClick={onRetry}
-    >
-      {state}
-    </button>
-  ),
-}));
-
-import { SalesDashboard } from "./sales-dashboard";
-
-const KPIS: CrmKpis = {
-  dealsOpened: 4,
-  dealsClosed: 2,
-  dealsWon: 1,
-  dealsValueClosed: 25_000,
-  commsCount: 12,
-};
-
-const PIPELINE: CrmPipeline = { pipelineCount: 3, pipelineValue: 1_500_000 };
-
-function person(subordinates: IdentityPerson[] = []): IdentityPerson {
-  return {
-    person_id: "rep@x.io",
-    email: "rep@x.io",
-    display_name: "Rita Rep",
-    subordinates,
-  } as IdentityPerson;
-}
-
-beforeEach(() => {
-  queries.kpisQ = q<CrmKpis | null>(null);
-  queries.prevKpisQ = q<CrmKpis | null>(null);
-  queries.pipelineQ = q<CrmPipeline | null>(null);
-  queries.flowQ = q<CrmFlowPoint[]>([]);
-  queries.qualityQ = q<never[]>([]);
-  queries.activityQ = q<never[]>([]);
-});
-
-describe("SalesDashboard", () => {
-  it("renders hero KPIs from CRM data with formatted values", () => {
-    queries.kpisQ = q<CrmKpis | null>(KPIS);
-    queries.pipelineQ = q<CrmPipeline | null>(PIPELINE);
-    queries.flowQ = q<CrmFlowPoint[]>([
-      { label: "W1", opened: 1, closed: 1, won: 0 },
-      { label: "W2", opened: 2, closed: 0, won: 1 },
-    ]);
-
-    render(<SalesDashboard personId="rep@x.io" person={person([person()])} />);
-
-    expect(screen.getByTestId("person-header")).toHaveTextContent("rep@x.io");
-    expect(screen.getByTestId("ic-toggle")).toHaveAttribute(
-      "data-has-reports",
-      "true"
-    );
-    expect(screen.getByTestId("kpi-deals_opened")).toHaveTextContent(
-      "Deals Opened|4|Created in period"
-    );
-    expect(screen.getByTestId("kpi-deals_closed")).toHaveTextContent(
-      "Deals Closed|2|"
-    );
-    expect(screen.getByTestId("kpi-deals_value_closed")).toHaveTextContent(
-      "Closed Value|$25k|"
-    );
-    expect(screen.getByTestId("kpi-win_rate")).toHaveTextContent(
-      "Win Rate|50% (1/2)|"
-    );
-    expect(screen.getByTestId("kpi-pipeline_value")).toHaveTextContent(
-      "Pipeline Now|$1.50M|3 open"
-    );
-    // KPIs present -> pacing band renders; flow settled -> chart renders.
-    expect(screen.getByTestId("pacing-band")).toBeInTheDocument();
-    expect(screen.getByTestId("deal-flow")).toHaveTextContent("2");
-    // Section metric cards carry the person's display name.
-    const cards = screen.getAllByTestId("metric-card");
-    expect(cards).toHaveLength(2);
-    expect(cards[0]).toHaveTextContent("Velocity & Quality");
-    expect(cards[1]).toHaveTextContent("Outreach Activity");
-    expect(cards[0]).toHaveAttribute("data-person", "Rita Rep");
-  });
-
-  it("falls back to zero pipeline values when the pipeline query has no data", () => {
-    queries.kpisQ = q<CrmKpis | null>(KPIS);
-
-    render(<SalesDashboard personId="rep@x.io" person={person()} />);
-
-    expect(screen.getByTestId("kpi-pipeline_value")).toHaveTextContent(
-      "Pipeline Now|$0|0 open"
-    );
-    expect(screen.getByTestId("ic-toggle")).toHaveAttribute(
-      "data-has-reports",
-      "false"
-    );
-  });
-
-  it("shows the loading row while KPIs are pending and hides the pacing band", () => {
-    queries.kpisQ = q<CrmKpis | null>(undefined, { isPending: true });
-
-    render(<SalesDashboard personId="rep@x.io" />);
-
-    expect(
-      screen.getByTestId("coming-soon-row-loading")
-    ).toBeInTheDocument();
-    expect(screen.queryByTestId("pacing-band")).not.toBeInTheDocument();
-    expect(screen.queryByTestId("kpi-strip")).not.toBeInTheDocument();
-  });
-
-  it("shows a retryable error row when the KPI query fails", async () => {
-    queries.kpisQ = q<CrmKpis | null>(undefined, { isError: true });
-
-    render(<SalesDashboard personId="rep@x.io" />);
-
-    await userEvent.click(screen.getByTestId("coming-soon-row-error"));
-    expect(queries.kpisQ.refetch).toHaveBeenCalled();
-  });
-
-  it("shows the empty row when the KPI query settles with no data", () => {
-    render(<SalesDashboard personId="rep@x.io" />);
-
-    expect(screen.getByTestId("coming-soon-row-empty")).toBeInTheDocument();
-    expect(screen.queryByTestId("pacing-band")).not.toBeInTheDocument();
-  });
-
-  it("shows deal-flow loading and error states with retry", async () => {
-    queries.flowQ = q<CrmFlowPoint[]>([], { isPending: true });
-    const { unmount } = render(<SalesDashboard personId="rep@x.io" />);
-    expect(
-      screen.getByTestId("coming-soon-card-loading")
-    ).toBeInTheDocument();
-    unmount();
-
-    queries.flowQ = q<CrmFlowPoint[]>([], { isError: true });
-    render(<SalesDashboard personId="rep@x.io" />);
-    await userEvent.click(screen.getByTestId("coming-soon-card-error"));
-    expect(queries.flowQ.refetch).toHaveBeenCalled();
-  });
-
-  it("forwards section query states to the metric cards and retries", async () => {
-    queries.qualityQ = q<never[]>([], { isError: true });
-    queries.activityQ = q<never[]>([], { isFetching: true });
-
-    render(<SalesDashboard personId="rep@x.io" />);
-
-    const cards = screen.getAllByTestId("metric-card");
-    expect(cards[0]).toHaveAttribute("data-errored", "true");
-    expect(cards[1]).toHaveAttribute("data-revalidating", "true");
-    await userEvent.click(cards[0]!);
-    expect(queries.qualityQ.refetch).toHaveBeenCalled();
-    await userEvent.click(cards[1]!);
-    expect(queries.activityQ.refetch).toHaveBeenCalled();
-  });
-});
diff --git a/src/screens/ic-dashboard/sales-dashboard.tsx b/src/screens/ic-dashboard/sales-dashboard.tsx
deleted file mode 100644
index 02ffe60c..00000000
--- a/src/screens/ic-dashboard/sales-dashboard.tsx
+++ /dev/null
@@ -1,178 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import { IcViewToggle } from "@/components/ic-view-toggle";
-import { SidebarTrigger } from "@/components/ui/sidebar";
-import { CollapsibleSection } from "@/components/widgets/collapsible-section";
-import { ComingSoon } from "@/components/widgets/coming-soon";
-import { DealFlowChart } from "@/components/widgets/deal-flow-chart";
-import { KpiStrip, type KpiStripKpi } from "@/components/widgets/kpi-strip";
-import { MetricCard } from "@/components/widgets/metric-card";
-import { PeriodSelectorBar } from "@/components/widgets/period-selector-bar";
-import { PersonHeader } from "@/components/widgets/person-header";
-import { SalesPacingBand } from "@/components/widgets/sales-pacing-band";
-import { usePeriod } from "@/hooks/use-period";
-import {
-  formatCurrencyCompact,
-  formatNumber,
-  formatWinRate,
-} from "@/lib/format";
-import { useSalesDashboardQueries } from "@/queries/sales-dashboard";
-import type { CrmKpis, CrmPipeline, IdentityPerson } from "@/types/insight";
-
-export interface SalesDashboardProps {
-  personId: string;
-  person?: IdentityPerson | null;
-}
-
-function heroKpiRows(
-  kpis: CrmKpis,
-  pipeline: CrmPipeline | null,
-  t: (key: string, opts?: Record<string, unknown>) => string,
-): KpiStripKpi[] {
-  return [
-    {
-      metric_key: "deals_opened",
-      label: t("sales_dashboard.hero.deals_opened"),
-      value: formatNumber(kpis.dealsOpened, ""),
-      sublabel: t("sales_dashboard.hero.deals_opened_sublabel"),
-    },
-    {
-      metric_key: "deals_closed",
-      label: t("sales_dashboard.hero.deals_closed"),
-      value: formatNumber(kpis.dealsClosed, ""),
-      sublabel: t("sales_dashboard.hero.deals_closed_sublabel"),
-    },
-    {
-      metric_key: "deals_value_closed",
-      label: t("sales_dashboard.hero.closed_value"),
-      value: formatCurrencyCompact(kpis.dealsValueClosed),
-      sublabel: t("sales_dashboard.hero.closed_value_sublabel"),
-    },
-    {
-      metric_key: "win_rate",
-      label: t("sales_dashboard.hero.win_rate"),
-      value: formatWinRate(kpis.dealsWon, kpis.dealsClosed),
-      sublabel: t("sales_dashboard.hero.win_rate_sublabel"),
-    },
-    {
-      metric_key: "pipeline_value",
-      label: t("sales_dashboard.hero.pipeline_now"),
-      value: formatCurrencyCompact(pipeline?.pipelineValue ?? 0),
-      sublabel: t("sales_dashboard.hero.pipeline_sublabel", {
-        count: formatNumber(pipeline?.pipelineCount ?? 0, ""),
-      }),
-    },
-  ];
-}
-
-export function SalesDashboard({
-  personId,
-  person: personProp,
-}: SalesDashboardProps) {
-  const { t } = useTranslation();
-  const { period, customRange, dateRange, setPeriod, setCustomRange } =
-    usePeriod();
-  const { kpisQ, prevKpisQ, pipelineQ, flowQ, qualityQ, activityQ } =
-    useSalesDashboardQueries(personId, period, dateRange);
-
-  // Dispatcher (`<IcDashboardScreen>`) owns the identity fetch and forwards
-  // it as a prop — children trust it and don't re-issue the query.
-  const person = personProp ?? null;
-  const kpis = kpisQ.data ?? null;
-  const prevKpis = prevKpisQ.data ?? null;
-  const pipeline = pipelineQ.data ?? null;
-  const flow = flowQ.data ?? [];
-  const quality = qualityQ.data ?? [];
-  const activity = activityQ.data ?? [];
-
-  return (
-    <div className="flex flex-col gap-4 p-6">
-      <div className="bg-background/95 border-border/60 sticky top-0 z-20 -mx-6 -mt-6 border-b px-6 pt-6 pb-3 backdrop-blur-sm">
-        <div className="flex flex-wrap items-center justify-between gap-3">
-          <div className="flex min-w-0 items-center gap-3">
-            <SidebarTrigger className="md:hidden" />
-            <PersonHeader person={person} fallbackEmail={personId} inline />
-            <IcViewToggle
-              person={personId}
-              hasReports={(person?.subordinates?.length ?? 0) > 0}
-            />
-          </div>
-          <PeriodSelectorBar
-            period={period}
-            customRange={customRange}
-            onPeriodChange={setPeriod}
-            onRangeChange={setCustomRange}
-          />
-        </div>
-      </div>
-
-      <div className="border-border bg-card overflow-hidden rounded-xl border">
-        {kpisQ.isPending ? (
-          <div className="p-4">
-            <ComingSoon variant="row" state="loading" />
-          </div>
-        ) : kpisQ.isError ? (
-          <div className="p-4">
-            <ComingSoon
-              variant="row"
-              state="error"
-              onRetry={() => kpisQ.refetch()}
-            />
-          </div>
-        ) : kpis ? (
-          <KpiStrip kpis={heroKpiRows(kpis, pipeline, t)} plain />
-        ) : (
-          <div className="p-4">
-            <ComingSoon variant="row" state="empty" />
-          </div>
-        )}
-      </div>
-
-      {kpis ? (
-        <SalesPacingBand kpis={kpis} prevKpis={prevKpis} range={dateRange} />
-      ) : null}
-
-      <MetricCard
-        title={t("sales_dashboard.sections.velocity_quality")}
-        metrics={quality}
-        columns={2}
-        loading={qualityQ.isPending}
-        errored={qualityQ.isError}
-        revalidating={qualityQ.isFetching && !qualityQ.isPending}
-        onRetry={() => qualityQ.refetch()}
-        personName={person?.display_name}
-      />
-
-      <MetricCard
-        title={t("sales_dashboard.sections.outreach_activity")}
-        metrics={activity}
-        columns={2}
-        loading={activityQ.isPending}
-        errored={activityQ.isError}
-        revalidating={activityQ.isFetching && !activityQ.isPending}
-        onRetry={() => activityQ.refetch()}
-        personName={person?.display_name}
-      />
-
-      <CollapsibleSection
-        title={t("sales_dashboard.sections.deal_flow_title")}
-        subtitle={t("sales_dashboard.sections.deal_flow_subtitle")}
-        storageKey="insight:sales-dashboard:deal-flow"
-      >
-        <div className="p-4">
-          {flowQ.isPending && flow.length === 0 ? (
-            <ComingSoon variant="card" state="loading" />
-          ) : flowQ.isError ? (
-            <ComingSoon
-              variant="card"
-              state="error"
-              onRetry={() => flowQ.refetch()}
-            />
-          ) : (
-            <DealFlowChart data={flow} />
-          )}
-        </div>
-      </CollapsibleSection>
-    </div>
-  );
-}
diff --git a/src/screens/team-view-v2.test.tsx b/src/screens/team-view-v2.test.tsx
deleted file mode 100644
index f95b586b..00000000
--- a/src/screens/team-view-v2.test.tsx
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * "Direct reports only" scoping on the v2 team dashboard (#1724).
- *
- * The toggle (default ON, matching the old team view) narrows the roster to
- * depth-1 reports before it reaches any query, so members, heatmap bullets,
- * legacy sections, and metric collections all scope together. Covers:
- *   - default render shows direct reports only, with the scope subtitle
- *     ("Direct reports of X") and the scoped/total count on the toggle.
- *   - toggling off widens the roster to the full subtree and flips the
- *     subtitle to "X's department".
- *   - the scoped roster is what `useTeamMembers` receives — scoping happens
- *     upstream of the fetch, not as a client-side row filter.
- *   - the toggle is hidden when the team has no indirect reports, where it
- *     could never change the roster (#1756).
- *
- * Child widgets are stubbed: this file tests the roster/toggle wiring, not
- * widget render rules (those have their own component tests).
- */
-
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import type { RosterEntry } from "@/lib/insight/identity-tree";
-import type {
-  IdentityPerson,
-  PeriodValue,
-  TeamMember,
-} from "@/types/insight";
-
-vi.mock("@/api/use-catalog", () => ({
-  useCatalog: () => ({
-    data: undefined,
-    isLoading: false,
-    isError: false,
-    byId: () => undefined,
-    byMetricKey: () => undefined,
-    refetch: () => {},
-  }),
-}));
-
-vi.mock("@/components/ic-view-toggle", () => ({
-  IcViewToggle: () => null,
-}));
-vi.mock("@/components/ui/sidebar", () => ({
-  SidebarTrigger: () => null,
-}));
-vi.mock("@/components/widgets/period-selector-bar", () => ({
-  PeriodSelectorBar: () => null,
-}));
-
-vi.mock("@/components/widgets/v2/team-members-attention", () => ({
-  TeamMembersAttention: () => null,
-}));
-vi.mock("@/components/widgets/v2/members-overview", () => ({
-  MembersOverview: ({ members }: { members: TeamMember[] }) => (
-    <div data-testid="heatmap">{members.map((m) => m.name).join(",")}</div>
-  ),
-}));
-vi.mock("@/components/widgets/v2/section-card", () => ({
-  SectionCard: () => null,
-}));
-vi.mock("@/components/widgets/metric-views/team-metric-group-card", () => ({
-  TeamMetricGroupCard: () => null,
-}));
-vi.mock("@/components/widgets/v2/group-drilldown-sheet", () => ({
-  GroupDrilldownSheet: () => null,
-}));
-
-const queryState = {
-  isPending: false,
-  isFetching: false,
-  isError: false,
-  refetch: () => {},
-};
-
-function makeMember(entry: RosterEntry): TeamMember {
-  return {
-    person_id: entry.email,
-    period: "month" as PeriodValue,
-    name: entry.display_name,
-    seniority: "",
-    supervisor_email: entry.supervisor_email,
-    org_unit_id: null,
-    tasks_closed: 0,
-    bugs_fixed: 0,
-    dev_time_h: null,
-    prs_merged: null,
-    build_success_pct: null,
-    focus_time_pct: null,
-    ai_tools: [],
-    ai_loc_share_pct: null,
-  };
-}
-
-const useTeamMembers = vi.fn(
-  (_teamId: string, roster: RosterEntry[] | null) => ({
-    ...queryState,
-    data: (roster ?? []).map(makeMember),
-  }),
-);
-
-vi.mock("@/queries/team-view", () => ({
-  useTeamMembers: (
-    ...args: [string, RosterEntry[] | null, PeriodValue, unknown]
-  ) => useTeamMembers(args[0], args[1]),
-  useTeamBulletSections: () => ({
-    ...queryState,
-    data: { bySection: {}, errors: {} },
-  }),
-}));
-
-vi.mock("@/queries/v2/member-grid", () => ({
-  useMemberGridData: () => ({
-    byKey: new Map(),
-    previousByKey: new Map(),
-    isPending: false,
-    isFetching: false,
-    isError: false,
-    refetch: () => {},
-  }),
-}));
-
-vi.mock("@/queries/metric-results", () => ({
-  useMetricCollectionSet: () => new Map(),
-  collectionSetPending: () => false,
-}));
-
-function person(
-  email: string,
-  name: string,
-  subordinates: IdentityPerson[] = [],
-): IdentityPerson {
-  return {
-    person_id: email,
-    email,
-    display_name: name,
-    subordinates,
-  } as IdentityPerson;
-}
-
-// Alice manages Bob and Erin directly; Carol reports to Bob (indirect).
-const viewerTree = person("alice@x.io", "Alice", [
-  person("bob@x.io", "Bob", [person("carol@x.io", "Carol")]),
-  person("erin@x.io", "Erin"),
-]);
-
-// Dave's team is flat: every report is direct, so scoping is a no-op (#1756).
-const flatTree = person("dave@x.io", "Dave", [
-  person("fay@x.io", "Fay"),
-  person("gil@x.io", "Gil"),
-]);
-
-let currentTree = viewerTree;
-
-vi.mock("@/queries/ic-dashboard", () => ({
-  useIcPerson: () => ({ ...queryState, data: currentTree }),
-}));
-
-import { TeamViewV2Screen } from "./team-view-v2";
-
-beforeEach(() => {
-  currentTree = viewerTree;
-});
-
-function renderScreen(teamId = "alice@x.io") {
-  return render(<TeamViewV2Screen teamId={teamId} viewerEmail={teamId} />);
-}
-
-describe("TeamViewV2Screen direct-reports scoping", () => {
-  it("defaults to direct reports only, scoping the roster before the fetch", () => {
-    renderScreen();
-
-    expect(
-      screen.getByText("Direct reports of Alice · 2 members"),
-    ).toBeInTheDocument();
-    expect(screen.getByText("Direct reports only")).toBeInTheDocument();
-    expect(screen.getByText("(2/3)")).toBeInTheDocument();
-    expect(screen.getByTestId("heatmap")).toHaveTextContent("Bob,Erin");
-
-    const lastRoster = useTeamMembers.mock.lastCall?.[1];
-    expect(lastRoster?.map((r) => r.email)).toEqual([
-      "bob@x.io",
-      "erin@x.io",
-    ]);
-  });
-
-  it("widens to the whole department when toggled off", async () => {
-    const user = userEvent.setup();
-    renderScreen();
-
-    await user.click(screen.getByRole("switch"));
-
-    expect(
-      screen.getByText("Alice's department · 3 members"),
-    ).toBeInTheDocument();
-    expect(screen.getByText("(3/3)")).toBeInTheDocument();
-    expect(screen.getByTestId("heatmap")).toHaveTextContent("Bob,Carol,Erin");
-
-    const lastRoster = useTeamMembers.mock.lastCall?.[1];
-    expect(lastRoster?.map((r) => r.email)).toEqual([
-      "bob@x.io",
-      "carol@x.io",
-      "erin@x.io",
-    ]);
-  });
-
-  it("hides the toggle for a team with no subteams (#1756)", () => {
-    currentTree = flatTree;
-    renderScreen("dave@x.io");
-
-    expect(screen.queryByRole("switch")).not.toBeInTheDocument();
-    expect(screen.queryByText("Direct reports only")).not.toBeInTheDocument();
-    // Without the toggle the scope label is meaningless too — the subtitle
-    // is just the member count, and the full roster reaches the queries.
-    expect(screen.getByText("2 members")).toBeInTheDocument();
-    expect(
-      screen.queryByText(/Direct reports of|department/),
-    ).not.toBeInTheDocument();
-    expect(screen.getByTestId("heatmap")).toHaveTextContent("Fay,Gil");
-
-    const lastRoster = useTeamMembers.mock.lastCall?.[1];
-    expect(lastRoster?.map((r) => r.email)).toEqual([
-      "fay@x.io",
-      "gil@x.io",
-    ]);
-  });
-});
diff --git a/src/screens/team-view-v2.tsx b/src/screens/team-view-v2.tsx
deleted file mode 100644
index e2e4be0d..00000000
--- a/src/screens/team-view-v2.tsx
+++ /dev/null
@@ -1,315 +0,0 @@
-import { useMemo, useState } from "react";
-
-import { ComingSoon } from "@/components/widgets/coming-soon";
-import { DashboardEmptyState } from "@/components/widgets/v2/dashboard-empty-state";
-import { DashboardHeader } from "@/components/widgets/v2/dashboard-header";
-import { GroupDrilldownSheet } from "@/components/widgets/v2/group-drilldown-sheet";
-import { MembersOverview } from "@/components/widgets/v2/members-overview";
-import { TeamMembersAttention } from "@/components/widgets/v2/team-members-attention";
-import { TeamMetricGroupCard } from "@/components/widgets/metric-views/team-metric-group-card";
-import type { TeamMemberRef } from "@/components/widgets/metric-views/team-collection-drilldown";
-import { CenteredSpinner } from "@/components/widgets/centered-spinner";
-import { Switch } from "@/components/ui/switch";
-import { usePeriod } from "@/hooks/use-period";
-import {
-  flattenSubordinates,
-  findIdentityNode,
-  hasIndirectReports,
-  scopeRosterToDirectReports,
-} from "@/lib/insight/identity-tree";
-import {
-  GROUPS,
-  HEATMAP_COLLECTION,
-  legacyGroups,
-  metricGroups,
-  type GroupId,
-} from "@/lib/insight/groups";
-import {
-  memberMetricEntries,
-  metricBelowCounts,
-} from "@/lib/insight/team-metrics";
-import { orderRowsForSection } from "@/lib/insight/v2/metric-order";
-import { hasBulletValue } from "@/lib/insight/v2/peer-status";
-import { projectViews } from "@/lib/metrics/collection";
-import { normalizePersonId } from "@/lib/metrics/entity";
-import { useIcPerson } from "@/queries/ic-dashboard";
-import {
-  collectionSetPending,
-  useMetricCollectionSet,
-} from "@/queries/metric-results";
-import {
-  isTeamBulletSectionId,
-  useTeamBulletSections,
-  useTeamMembers,
-  type TeamBulletSectionId,
-} from "@/queries/team-view";
-import { useMemberGridData } from "@/queries/v2/member-grid";
-import type { BulletMetric } from "@/types/insight";
-
-// The map/filter callbacks are inert while no group is `kind: "legacy"`
-// (the array is empty) — retained so the legacy team-bullet path lights up
-// again if a legacy group returns.
-/* v8 ignore start -- map/filter callbacks run only when a legacy group exists */
-const LEGACY_GROUP_IDS = legacyGroups()
-  .map((def) => def.id)
-  .filter((id): id is Extract<GroupId, TeamBulletSectionId> =>
-    isTeamBulletSectionId(id),
-  );
-/* v8 ignore stop */
-
-// Team surfaces request period + peer only: a per-member timeseries over a
-// large roster would exceed the backend's all-or-nothing row limit and fail
-// the whole request.
-const TEAM_METRIC_COLLECTIONS = metricGroups().map((def) => ({
-  key: def.id,
-  collection: projectViews(def.collection, ["period", "peer"]),
-}));
-
-export interface TeamViewV2ScreenProps {
-  teamId: string;
-  viewerEmail: string;
-}
-
-export function TeamViewV2Screen({ teamId, viewerEmail }: TeamViewV2ScreenProps) {
-  const { period, dateRange, setPeriod } = usePeriod();
-  const [openGroup, setOpenGroup] = useState<GroupId | null>(null);
-  const [directReportsOnly, setDirectReportsOnly] = useState(true);
-
-  // Close any open drilldown when the viewed team changes. Render-phase
-  // reset against the previous id rather than an effect (no cascading commit).
-  const [prevTeamId, setPrevTeamId] = useState(teamId);
-  if (teamId !== prevTeamId) {
-    setPrevTeamId(teamId);
-    setOpenGroup(null);
-  }
-
-  const viewerQ = useIcPerson(viewerEmail);
-  const viewerTree = viewerQ.data ?? null;
-
-  const pivot = useMemo(() => {
-    if (!viewerTree) return null;
-    if (teamId.includes("@")) return findIdentityNode(viewerTree, teamId);
-    return null;
-  }, [viewerTree, teamId]);
-
-  const fullRoster = useMemo(
-    () => (pivot ? flattenSubordinates(pivot) : null),
-    [pivot],
-  );
-  // With no indirect reports, direct reports == the whole team, so the
-  // toggle could never change the roster — hide it (#1756).
-  const canScopeToDirectReports = hasIndirectReports(fullRoster);
-  // Scoping the roster scopes everything downstream — members, heatmap
-  // bullets, legacy sections, and metric collections all derive from it.
-  const roster = useMemo(
-    () =>
-      scopeRosterToDirectReports(
-        fullRoster,
-        canScopeToDirectReports && directReportsOnly,
-      ),
-    [fullRoster, canScopeToDirectReports, directReportsOnly],
-  );
-  // Never fall back to the raw id (an email) — the shell prefetches the
-  // viewer tree, so the pivot resolves synchronously in practice.
-  const teamName = pivot?.display_name ?? "";
-  const teamSize = roster?.length;
-
-  const membersQ = useTeamMembers(teamId, roster, period, dateRange, {
-    keepPrevious: true,
-  });
-  const members = membersQ.data ?? [];
-  const memberIds = members.map((m) => m.person_id);
-  const memberEntityIds = memberIds.map(normalizePersonId);
-  const memberRefs: TeamMemberRef[] = members.map((m) => ({
-    entityId: normalizePersonId(m.person_id),
-    displayName: m.name,
-  }));
-  const heatmapQ = useMemberGridData(
-    HEATMAP_COLLECTION,
-    { type: "person", ids: memberEntityIds },
-    dateRange,
-    period,
-  );
-
-  const sectionsQ = useTeamBulletSections(
-    LEGACY_GROUP_IDS,
-    teamId,
-    teamSize,
-    period,
-    dateRange,
-    { keepPrevious: true, roster },
-  );
-
-  const metricGroupData = useMetricCollectionSet(
-    TEAM_METRIC_COLLECTIONS,
-    { type: "person", ids: memberEntityIds },
-    dateRange,
-  );
-
-  const sectionData = sectionsQ.data;
-  const legacyRowsByGroup: Record<string, BulletMetric[]> =
-    Object.fromEntries(
-      LEGACY_GROUP_IDS.map((id) => [
-        id,
-        orderRowsForSection(id, sectionData?.bySection[id] ?? []),
-      ]),
-    );
-
-  const metricBelowByMember = new Map<string, number>();
-  for (const def of metricGroups()) {
-    const byKey = metricGroupData.get(def.id)?.byKey;
-    if (!byKey) continue;
-    for (const [memberId, count] of metricBelowCounts(
-      def,
-      byKey,
-      memberEntityIds,
-    )) {
-      metricBelowByMember.set(
-        memberId,
-        (metricBelowByMember.get(memberId) ?? 0) + count,
-      );
-    }
-  }
-
-  // Per-person unified-path entries (git/ai) feed the heatmap's member
-  // details sheet — the legacy per-member bullet fetch no longer covers
-  // groups that flipped to `kind: "metrics"`.
-  const metricEntriesByPerson = memberMetricEntries(
-    metricGroups(),
-    (id) => metricGroupData.get(id)?.byKey,
-    memberEntityIds,
-  );
-
-  // With no legacy groups the bullet query is disabled and never leaves
-  // TanStack's "pending" state — an empty section set is settled, not loading.
-  const hasLegacySections = LEGACY_GROUP_IDS.length > 0;
-  const sectionsPending = hasLegacySections && sectionsQ.isPending;
-  // The one loading gate: a single page spinner while ANY of the screen's
-  // queries has no data. A period or scope change mints new query keys, so
-  // the same gate re-trips — no per-widget loaders, no partial paints. The
-  // roster query (viewer tree) comes first: every other query derives its
-  // entity ids from it.
-  // A roster-less team disables the members query, which then never leaves
-  // "pending" — only count it while it can actually run.
-  const membersPending = (roster?.length ?? 0) > 0 && membersQ.isPending;
-  const isLoading =
-    viewerQ.isPending ||
-    membersPending ||
-    heatmapQ.isPending ||
-    collectionSetPending(metricGroupData) ||
-    sectionsPending;
-  const hasGroupData = Object.values(legacyRowsByGroup).some((rows) =>
-    rows.some(hasBulletValue),
-  );
-  const hasMembers = members.length > 0;
-  const isAllEmpty = !isLoading && !hasGroupData && !hasMembers;
-
-  const memberCountLabel = `${members.length} member${members.length === 1 ? "" : "s"}`;
-  const scopeLabel = directReportsOnly
-    ? `Direct reports of ${teamName}`
-    : `${teamName}'s department`;
-
-  return (
-    <div className="flex flex-col">
-      <DashboardHeader
-        title={teamName ? `Team of ${teamName}` : ""}
-        subtitle={
-          canScopeToDirectReports
-            ? `${scopeLabel} · ${memberCountLabel}`
-            : memberCountLabel
-        }
-        person={teamId}
-        hasReports
-        actions={
-          canScopeToDirectReports && fullRoster ? (
-            <label className="text-foreground flex cursor-pointer items-center gap-2 text-sm select-none">
-              <Switch
-                checked={directReportsOnly}
-                onCheckedChange={setDirectReportsOnly}
-              />
-              <span>Direct reports only</span>
-              <span className="text-muted-foreground text-xs">
-                ({roster?.length ?? 0}/{fullRoster.length})
-              </span>
-            </label>
-          ) : null
-        }
-      />
-      <main className="flex flex-1 flex-col gap-8 p-4 md:p-6">
-        {isLoading ? (
-          <CenteredSpinner className="min-h-[70vh]" />
-        ) : isAllEmpty ? (
-          <DashboardEmptyState period={period} onSetPeriod={setPeriod} />
-        ) : (
-          <div className="flex flex-col gap-8">
-            <TeamMembersAttention
-              members={members}
-              metricBelowByMember={metricBelowByMember}
-              metricEntriesByPerson={metricEntriesByPerson}
-            />
-
-            {membersQ.isError || heatmapQ.isError ? (
-              <ComingSoon
-                state="error"
-                label="Heatmap — unable to load"
-                onRetry={() => {
-                  if (membersQ.isError) membersQ.refetch();
-                  if (heatmapQ.isError) heatmapQ.refetch();
-                }}
-              />
-            ) : (
-              <MembersOverview
-                members={members}
-                heatmapByKey={heatmapQ.byKey}
-                previousHeatmapByKey={heatmapQ.previousByKey}
-                metricBelowByMember={metricBelowByMember}
-                metricEntriesByPerson={metricEntriesByPerson}
-              />
-            )}
-
-            <section className="flex flex-col gap-3">
-              <p className="text-xs font-medium uppercase tracking-wider text-muted-foreground">
-                Sections
-              </p>
-              <div className="grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-4">
-                {GROUPS.map((def) => {
-                  if (def.kind !== "metrics") return null;
-                  const result = metricGroupData.get(def.id);
-                  if (!result) return null;
-                  return (
-                    <TeamMetricGroupCard
-                      key={def.id}
-                      def={def}
-                      data={result}
-                      memberIds={memberEntityIds}
-                      onOpen={() => setOpenGroup(def.id)}
-                      subtitle="vs department peers"
-                    />
-                  );
-                })}
-              </div>
-            </section>
-          </div>
-        )}
-      </main>
-
-      {GROUPS.map((def) => (
-        <GroupDrilldownSheet
-          key={def.id}
-          open={openGroup === def.id}
-          onOpenChange={(o) => setOpenGroup(o ? def.id : null)}
-          def={def}
-          rows={legacyRowsByGroup[def.id] ?? []}
-          metricTarget={
-            def.kind === "metrics"
-              ? { kind: "team", members: memberRefs }
-              : undefined
-          }
-          range={dateRange}
-          period={period}
-          cohortLabel="department"
-        />
-      ))}
-    </div>
-  );
-}
diff --git a/src/screens/team-view.test.tsx b/src/screens/team-view.test.tsx
index c73786e8..2f54d8e3 100644
--- a/src/screens/team-view.test.tsx
+++ b/src/screens/team-view.test.tsx
@@ -1,24 +1,27 @@
 /**
- * "Direct reports only" scoping on the legacy team view.
+ * "Direct reports only" scoping on the v2 team dashboard (#1724).
  *
- * Mirrors the v2 screen tests: the toggle narrows the member list to depth-1
- * reports, and is hidden entirely when the team has no indirect reports —
- * there it could never change the roster (#1756).
+ * The toggle (default ON) narrows the roster to depth-1 reports before it
+ * reaches any query, so the member list, the heatmap, and the metric
+ * collections all scope together. Covers:
+ *   - default render shows direct reports only, with the scope subtitle
+ *     ("Direct reports of X") and the scoped/total count on the toggle.
+ *   - toggling off widens the roster to the full subtree and flips the
+ *     subtitle to "X's department".
+ *   - the scoped roster is what reaches the metric fetch — scoping happens
+ *     upstream of it, not as a client-side row filter.
+ *   - the toggle is hidden when the team has no indirect reports, where it
+ *     could never change the roster (#1756).
  *
  * Child widgets are stubbed: this file tests the roster/toggle wiring, not
- * widget render rules.
+ * widget render rules (those have their own component tests).
  */
 
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-import type { RosterEntry } from "@/lib/insight/identity-tree";
-import type {
-  IdentityPerson,
-  PeriodValue,
-  TeamMember,
-} from "@/types/insight";
+import type { IdentityPerson, TeamMember } from "@/types/insight";
 
 vi.mock("@/components/ic-view-toggle", () => ({
   IcViewToggle: () => null,
@@ -29,38 +32,20 @@ vi.mock("@/components/ui/sidebar", () => ({
 vi.mock("@/components/widgets/period-selector-bar", () => ({
   PeriodSelectorBar: () => null,
 }));
-vi.mock("@/components/widgets/view-mode-toggle", () => ({
-  ViewModeToggle: () => null,
-}));
-vi.mock("@/components/widgets/team-hero-strip", () => ({
-  TeamHeroStrip: () => null,
-}));
-vi.mock("@/components/widgets/attention-needed", () => ({
-  AttentionNeeded: () => null,
+
+vi.mock("@/components/widgets/dashboard/team-members-attention", () => ({
+  TeamMembersAttention: () => null,
 }));
-vi.mock("@/components/widgets/members-table", () => ({
-  MembersTable: ({ members }: { members: TeamMember[] }) => (
-    <div data-testid="members">{members.map((m) => m.name).join(",")}</div>
+vi.mock("@/components/widgets/dashboard/members-overview", () => ({
+  MembersOverview: ({ members }: { members: TeamMember[] }) => (
+    <div data-testid="heatmap">{members.map((m) => m.name).join(",")}</div>
   ),
 }));
-vi.mock("@/components/widgets/team-bullet-sections", () => ({
-  TeamBulletSections: () => null,
-}));
-vi.mock("@/components/widgets/drill-modal", () => ({
-  DrillModal: () => null,
-}));
-vi.mock("@/components/widgets/team-metrics-modal", () => ({
-  TeamMetricsModal: () => null,
-}));
-
-vi.mock("@/api/view-configs", () => ({
-  useTeamViewConfig: () => ({
-    alert_thresholds: [],
-    column_thresholds: {},
-  }),
+vi.mock("@/components/widgets/metric-views/team-metric-group-card", () => ({
+  TeamMetricGroupCard: () => null,
 }));
-vi.mock("@/lib/insight/team-kpis", () => ({
-  useTeamKpis: () => ({}),
+vi.mock("@/components/widgets/dashboard/group-drilldown-sheet", () => ({
+  GroupDrilldownSheet: () => null,
 }));
 
 const queryState = {
@@ -70,32 +55,28 @@ const queryState = {
   refetch: () => {},
 };
 
-function makeMember(entry: RosterEntry): TeamMember {
-  return {
-    person_id: entry.email,
-    period: "month" as PeriodValue,
-    name: entry.display_name,
-    seniority: "",
-    supervisor_email: entry.supervisor_email,
-    org_unit_id: null,
-    tasks_closed: 0,
-    bugs_fixed: 0,
-    dev_time_h: null,
-    prs_merged: null,
-    build_success_pct: null,
-    focus_time_pct: null,
-    ai_tools: [],
-    ai_loc_share_pct: null,
-  };
+const useMemberGridData = vi.fn((_collection: unknown, _entity: unknown) => ({
+  byKey: new Map(),
+  previousByKey: new Map(),
+  ...queryState,
+}));
+
+vi.mock("@/queries/member-grid", () => ({
+  useMemberGridData: (...args: [unknown, unknown]) =>
+    useMemberGridData(args[0], args[1]),
+}));
+
+/** Entity ids the scoped roster sent to the heatmap fetch. */
+function heatmapFetchedIds(): string[] {
+  const entity = useMemberGridData.mock.lastCall?.[1] as
+    | { ids: string[] }
+    | undefined;
+  return entity?.ids ?? [];
 }
 
-vi.mock("@/queries/team-view", () => ({
-  useTeamMembers: (_teamId: string, roster: RosterEntry[] | null) => ({
-    ...queryState,
-    data: (roster ?? []).map(makeMember),
-  }),
-  useTeamBulletSection: () => ({ ...queryState, data: undefined }),
-  useTeamDrill: () => ({ ...queryState, data: undefined }),
+vi.mock("@/queries/metric-results", () => ({
+  useMetricCollectionSet: () => new Map(),
+  collectionSetPending: () => false,
 }));
 
 function person(
@@ -140,13 +121,17 @@ function renderScreen(teamId = "alice@x.io") {
 }
 
 describe("TeamViewScreen direct-reports scoping", () => {
-  it("defaults to direct reports only when subteams exist", () => {
+  it("defaults to direct reports only, scoping the roster before the fetch", () => {
     renderScreen();
 
+    expect(
+      screen.getByText("Direct reports of Alice · 2 members"),
+    ).toBeInTheDocument();
     expect(screen.getByText("Direct reports only")).toBeInTheDocument();
     expect(screen.getByText("(2/3)")).toBeInTheDocument();
-    expect(screen.getByText("Direct reports of Alice")).toBeInTheDocument();
-    expect(screen.getByTestId("members")).toHaveTextContent("Bob,Erin");
+    expect(screen.getByTestId("heatmap")).toHaveTextContent("Bob,Erin");
+
+    expect(heatmapFetchedIds()).toEqual(["bob@x.io", "erin@x.io"]);
   });
 
   it("widens to the whole department when toggled off", async () => {
@@ -155,9 +140,13 @@ describe("TeamViewScreen direct-reports scoping", () => {
 
     await user.click(screen.getByRole("switch"));
 
-    expect(screen.getByText("Alice's department")).toBeInTheDocument();
+    expect(
+      screen.getByText("Alice's department · 3 members"),
+    ).toBeInTheDocument();
     expect(screen.getByText("(3/3)")).toBeInTheDocument();
-    expect(screen.getByTestId("members")).toHaveTextContent("Bob,Carol,Erin");
+    expect(screen.getByTestId("heatmap")).toHaveTextContent("Bob,Carol,Erin");
+
+    expect(heatmapFetchedIds()).toEqual(["bob@x.io", "carol@x.io", "erin@x.io"]);
   });
 
   it("hides the toggle for a team with no subteams (#1756)", () => {
@@ -166,7 +155,14 @@ describe("TeamViewScreen direct-reports scoping", () => {
 
     expect(screen.queryByRole("switch")).not.toBeInTheDocument();
     expect(screen.queryByText("Direct reports only")).not.toBeInTheDocument();
-    expect(screen.getByText("Dave's department")).toBeInTheDocument();
-    expect(screen.getByTestId("members")).toHaveTextContent("Fay,Gil");
+    // Without the toggle the scope label is meaningless too — the subtitle
+    // is just the member count, and the full roster reaches the queries.
+    expect(screen.getByText("2 members")).toBeInTheDocument();
+    expect(
+      screen.queryByText(/Direct reports of|department/),
+    ).not.toBeInTheDocument();
+    expect(screen.getByTestId("heatmap")).toHaveTextContent("Fay,Gil");
+
+    expect(heatmapFetchedIds()).toEqual(["fay@x.io", "gil@x.io"]);
   });
 });
diff --git a/src/screens/team-view.tsx b/src/screens/team-view.tsx
index 6ab3c489..aaf68bd5 100644
--- a/src/screens/team-view.tsx
+++ b/src/screens/team-view.tsx
@@ -1,90 +1,66 @@
 import { useMemo, useState } from "react";
 
-import { AttentionNeeded } from "@/components/widgets/attention-needed";
-import { DrillModal } from "@/components/widgets/drill-modal";
-import { IcViewToggle } from "@/components/ic-view-toggle";
-import { MembersTable } from "@/components/widgets/members-table";
-import { TeamMetricsModal } from "@/components/widgets/team-metrics-modal";
-import { PeriodSelectorBar } from "@/components/widgets/period-selector-bar";
-import { TeamBulletSections } from "@/components/widgets/team-bullet-sections";
-import { TeamHeroStrip } from "@/components/widgets/team-hero-strip";
-import { ViewModeToggle } from "@/components/widgets/view-mode-toggle";
-import { Avatar, AvatarFallback } from "@/components/ui/avatar";
-import { SidebarTrigger } from "@/components/ui/sidebar";
+import { ComingSoon } from "@/components/widgets/coming-soon";
+import { DashboardEmptyState } from "@/components/widgets/dashboard/dashboard-empty-state";
+import { DashboardHeader } from "@/components/widgets/dashboard/dashboard-header";
+import { GroupDrilldownSheet } from "@/components/widgets/dashboard/group-drilldown-sheet";
+import { MembersOverview } from "@/components/widgets/dashboard/members-overview";
+import { TeamMembersAttention } from "@/components/widgets/dashboard/team-members-attention";
+import { TeamMetricGroupCard } from "@/components/widgets/metric-views/team-metric-group-card";
+import type { TeamMemberRef } from "@/components/widgets/metric-views/team-collection-drilldown";
+import { CenteredSpinner } from "@/components/widgets/centered-spinner";
 import { Switch } from "@/components/ui/switch";
-import { useTeamViewConfig } from "@/api/view-configs";
-import { usePeriod, useViewMode } from "@/hooks/use-period";
+import { usePeriod } from "@/hooks/use-period";
 import {
   flattenSubordinates,
   findIdentityNode,
   hasIndirectReports,
+  scopeRosterToDirectReports,
 } from "@/lib/insight/identity-tree";
-import { getInitials } from "@/lib/insight/get-initials";
-import { useTeamKpis } from "@/lib/insight/team-kpis";
+import {
+  GROUPS,
+  HEATMAP_COLLECTION,
+  type GroupId,
+} from "@/lib/insight/groups";
+import {
+  memberMetricEntries,
+  metricBelowCounts,
+} from "@/lib/insight/team-metrics";
+import { projectViews } from "@/lib/metrics/collection";
+import { normalizePersonId } from "@/lib/metrics/entity";
 import { useIcPerson } from "@/queries/ic-dashboard";
 import {
-  useTeamBulletSection,
-  useTeamDrill,
-  useTeamMembers,
-  type TeamBulletSectionId,
-  type TeamDrillTarget,
-} from "@/queries/team-view";
-import type { BulletMetric, TeamMember } from "@/types/insight";
+  collectionSetPending,
+  useMetricCollectionSet,
+} from "@/queries/metric-results";
+import { useMemberGridData } from "@/queries/member-grid";
+import type { TeamMember } from "@/types/insight";
+
+// Team surfaces request period + peer only: a per-member timeseries over a
+// large roster would exceed the backend's all-or-nothing row limit and fail
+// the whole request.
+const TEAM_METRIC_COLLECTIONS = GROUPS.map((def) => ({
+  key: def.id,
+  collection: projectViews(def.collection, ["period", "peer"]),
+}));
 
 export interface TeamViewScreenProps {
-  /** Email of the team owner — the IR node whose subordinates form the roster. */
   teamId: string;
-  /** Email of the viewer signed into the app — used to walk identity tree. */
   viewerEmail: string;
 }
 
-type BulletStatus = "loading" | "loaded" | "errored";
-type BulletQ = ReturnType<typeof useTeamBulletSection>;
-
-function bulletStatus(q: BulletQ): BulletStatus {
-  if (q.isPending) return "loading";
-  if (q.isError) return "errored";
-  return "loaded";
-}
-
-function scopeAiBullets(
-  metrics: BulletMetric[],
-  members: TeamMember[],
-): BulletMetric[] {
-  const teamSize = members.length;
-  const recompute: Record<string, number> = {
-    active_ai_members: members.filter((m) => m.ai_tools.length > 0).length,
-    cursor_active: members.filter((m) => m.ai_tools.includes("Cursor")).length,
-    cc_active: members.filter((m) => m.ai_tools.includes("Claude Code")).length,
-    codex_active: members.filter((m) => m.ai_tools.includes("Codex")).length,
-  };
-  return metrics.map((m) => {
-    if (!(m.metric_key in recompute)) return m;
-    const value = recompute[m.metric_key]!;
-    const valuePct =
-      teamSize > 0 ? Math.min(100, (value / teamSize) * 100) : 0;
-    return {
-      ...m,
-      value: String(value),
-      unit: `/ ${teamSize}`,
-      range_min: "0",
-      range_max: String(teamSize),
-      median: "—",
-      median_label: "",
-      median_left_pct: 0,
-      bar_left_pct: 0,
-      bar_width_pct: valuePct,
-    };
-  });
-}
-
 export function TeamViewScreen({ teamId, viewerEmail }: TeamViewScreenProps) {
-  const { period, customRange, dateRange, setPeriod, setCustomRange } =
-    usePeriod();
-  const { viewMode, setViewMode } = useViewMode();
+  const { period, dateRange, setPeriod } = usePeriod();
+  const [openGroup, setOpenGroup] = useState<GroupId | null>(null);
   const [directReportsOnly, setDirectReportsOnly] = useState(true);
-  const [drillTarget, setDrillTarget] = useState<TeamDrillTarget | null>(null);
-  const [metricsModalOpen, setMetricsModalOpen] = useState(false);
+
+  // Close any open drilldown when the viewed team changes. Render-phase
+  // reset against the previous id rather than an effect (no cascading commit).
+  const [prevTeamId, setPrevTeamId] = useState(teamId);
+  if (teamId !== prevTeamId) {
+    setPrevTeamId(teamId);
+    setOpenGroup(null);
+  }
 
   const viewerQ = useIcPerson(viewerEmail);
   const viewerTree = viewerQ.data ?? null;
@@ -95,133 +71,109 @@ export function TeamViewScreen({ teamId, viewerEmail }: TeamViewScreenProps) {
     return null;
   }, [viewerTree, teamId]);
 
-  const roster = useMemo(
+  const fullRoster = useMemo(
     () => (pivot ? flattenSubordinates(pivot) : null),
     [pivot],
   );
+  // With no indirect reports, direct reports == the whole team, so the
+  // toggle could never change the roster — hide it (#1756).
+  const canScopeToDirectReports = hasIndirectReports(fullRoster);
+  // Scoping the roster scopes everything downstream — members, the heatmap,
+  // and metric collections all derive from it.
+  const roster = useMemo(
+    () =>
+      scopeRosterToDirectReports(
+        fullRoster,
+        canScopeToDirectReports && directReportsOnly,
+      ),
+    [fullRoster, canScopeToDirectReports, directReportsOnly],
+  );
+  // Never fall back to the raw id (an email) — the shell prefetches the
+  // viewer tree, so the pivot resolves synchronously in practice.
+  const teamName = pivot?.display_name ?? "";
 
-  const teamName = pivot?.display_name ?? teamId;
-
-  const membersQ = useTeamMembers(teamId, roster, period, dateRange);
-  const allMembers = membersQ.data ?? [];
-
-  const hasRoster = roster !== null;
-  // Only offer the direct-reports filter when it can change the roster —
-  // with no subteams every report is direct and the toggle is a no-op (#1756).
-  const canFilterDirectReports = hasIndirectReports(roster);
-  const directReportEmails = useMemo(() => {
-    if (!roster) return null;
-    return new Set(
-      roster.filter((r) => r.is_direct).map((r) => r.email.toLowerCase()),
-    );
-  }, [roster]);
-  const members =
-    canFilterDirectReports && directReportsOnly && directReportEmails
-      ? allMembers.filter((m) =>
-          directReportEmails.has(m.person_id.toLowerCase()),
-        )
-      : allMembers;
-
-  const teamViewConfig = useTeamViewConfig();
-  const teamKpis = useTeamKpis(members, period);
-
-  const teamSize = roster?.length;
-  const taskQ = useTeamBulletSection(
-    "task_delivery",
-    teamId,
-    teamSize,
-    period,
-    dateRange,
-    { roster },
+  // The roster IS the member list: identity owns who is on the team, and
+  // every metric for them comes from `/v1/metric-results` below. There is no
+  // second source to reconcile.
+  const members = useMemo<TeamMember[]>(
+    () =>
+      (roster ?? []).map((entry) => ({
+        person_id: entry.email,
+        name: entry.display_name,
+      })),
+    [roster],
   );
-  const qualityQ = useTeamBulletSection(
-    "code_quality",
-    teamId,
-    teamSize,
-    period,
+  const memberEntityIds = members.map((m) => normalizePersonId(m.person_id));
+  const memberRefs: TeamMemberRef[] = members.map((m) => ({
+    entityId: normalizePersonId(m.person_id),
+    displayName: m.name,
+  }));
+  const heatmapQ = useMemberGridData(
+    HEATMAP_COLLECTION,
+    { type: "person", ids: memberEntityIds },
     dateRange,
-    { roster },
-  );
-  const estimationQ = useTeamBulletSection(
-    "estimation",
-    teamId,
-    teamSize,
     period,
-    dateRange,
-    { roster },
   );
-  const collabQ = useTeamBulletSection(
-    "collaboration",
-    teamId,
-    teamSize,
-    period,
-    dateRange,
-    { roster },
-  );
-  const aiQ = useTeamBulletSection(
-    "ai_adoption",
-    teamId,
-    teamSize,
-    period,
+
+  const metricGroupData = useMetricCollectionSet(
+    TEAM_METRIC_COLLECTIONS,
+    { type: "person", ids: memberEntityIds },
     dateRange,
-    { roster },
   );
 
-  const drillQ = useTeamDrill(drillTarget, dateRange);
-
-  const scopingActive =
-    canFilterDirectReports &&
-    directReportsOnly &&
-    members.length !== allMembers.length;
-
-  const aiMetrics = aiQ.data
-    ? scopingActive
-      ? scopeAiBullets(aiQ.data, members)
-      : aiQ.data
-    : undefined;
+  const metricBelowByMember = new Map<string, number>();
+  for (const def of GROUPS) {
+    const byKey = metricGroupData.get(def.id)?.byKey;
+    if (!byKey) continue;
+    for (const [memberId, count] of metricBelowCounts(
+      def,
+      byKey,
+      memberEntityIds,
+    )) {
+      metricBelowByMember.set(
+        memberId,
+        (metricBelowByMember.get(memberId) ?? 0) + count,
+      );
+    }
+  }
 
-  const scopedBulletNote = scopingActive
-    ? `AI Adoption is scoped to direct reports (${members.length} of ${allMembers.length} members). Other sections still reflect the whole team.`
-    : null;
+  // Per-person entries (git/ai) feed the heatmap's member details sheet.
+  const metricEntriesByPerson = memberMetricEntries(
+    GROUPS,
+    (id) => metricGroupData.get(id)?.byKey,
+    memberEntityIds,
+  );
 
-  const handleCellDrill = (personId: string, drillId: string): void => {
-    setDrillTarget({ kind: "cell", personId, drillId });
-  };
+  // The one loading gate: a single page spinner while ANY of the screen's
+  // queries has no data. A period or scope change mints new query keys, so
+  // the same gate re-trips — no per-widget loaders, no partial paints. The
+  // roster query (viewer tree) comes first: every other query derives its
+  // entity ids from it.
+  const isLoading =
+    viewerQ.isPending ||
+    heatmapQ.isPending ||
+    collectionSetPending(metricGroupData);
+  const hasMembers = members.length > 0;
+  const isAllEmpty = !isLoading && !hasMembers;
 
-  const retrySection = (sid: TeamBulletSectionId): void => {
-    if (sid === "task_delivery") void taskQ.refetch();
-    else if (sid === "code_quality") void qualityQ.refetch();
-    else if (sid === "estimation") void estimationQ.refetch();
-    else if (sid === "collaboration") void collabQ.refetch();
-    else void aiQ.refetch();
-  };
+  const memberCountLabel = `${members.length} member${members.length === 1 ? "" : "s"}`;
+  const scopeLabel = directReportsOnly
+    ? `Direct reports of ${teamName}`
+    : `${teamName}'s department`;
 
   return (
-    <div className="flex flex-col gap-4 p-6">
-      <div className="bg-background/95 border-border/60 sticky top-0 z-20 -mx-6 -mt-6 flex flex-wrap items-center justify-between gap-3 border-b px-6 pt-6 pb-3 backdrop-blur-sm">
-        <div className="flex min-w-0 flex-1 items-center gap-2">
-          <SidebarTrigger className="md:hidden" />
-          <Avatar className="size-10 shrink-0">
-            <AvatarFallback className="bg-primary/10 text-primary text-base font-extrabold">
-              {getInitials(teamName)}
-            </AvatarFallback>
-          </Avatar>
-          <div className="min-w-0">
-            <div className="text-foreground truncate text-lg leading-tight font-bold">
-              {teamName}
-            </div>
-            <div className="text-muted-foreground truncate text-sm">
-              {canFilterDirectReports && directReportsOnly
-                ? `Direct reports of ${pivot?.display_name ?? teamName}`
-                : `${pivot?.display_name ?? teamName}'s department`}
-            </div>
-          </div>
-          <div className="shrink-0">
-            <IcViewToggle person={teamId} hasReports={hasRoster} />
-          </div>
-        </div>
-        <div className="flex flex-wrap items-center gap-2">
-          {canFilterDirectReports ? (
+    <div className="flex flex-col">
+      <DashboardHeader
+        title={teamName ? `Team of ${teamName}` : ""}
+        subtitle={
+          canScopeToDirectReports
+            ? `${scopeLabel} · ${memberCountLabel}`
+            : memberCountLabel
+        }
+        person={teamId}
+        hasReports
+        actions={
+          canScopeToDirectReports && fullRoster ? (
             <label className="text-foreground flex cursor-pointer items-center gap-2 text-sm select-none">
               <Switch
                 checked={directReportsOnly}
@@ -229,77 +181,78 @@ export function TeamViewScreen({ teamId, viewerEmail }: TeamViewScreenProps) {
               />
               <span>Direct reports only</span>
               <span className="text-muted-foreground text-xs">
-                ({members.length}/{allMembers.length})
+                ({roster?.length ?? 0}/{fullRoster.length})
               </span>
             </label>
-          ) : null}
-          <PeriodSelectorBar
-            period={period}
-            customRange={customRange}
-            onPeriodChange={setPeriod}
-            onRangeChange={setCustomRange}
-          />
-          <ViewModeToggle mode={viewMode} onChange={setViewMode} />
-        </div>
-      </div>
-
-      <TeamHeroStrip teamKpis={teamKpis} />
-
-      <AttentionNeeded
-        members={members}
-        alertThresholds={teamViewConfig.alert_thresholds}
-      />
-
-      <MembersTable
-        members={members}
-        columnThresholds={teamViewConfig.column_thresholds}
-        loading={membersQ.isPending}
-        onCellDrill={handleCellDrill}
-        onViewAllStats={
-          members.length > 0 ? () => setMetricsModalOpen(true) : undefined
+          ) : null
         }
       />
+      <main className="flex flex-1 flex-col gap-8 p-4 md:p-6">
+        {isLoading ? (
+          <CenteredSpinner className="min-h-[70vh]" />
+        ) : isAllEmpty ? (
+          <DashboardEmptyState period={period} onSetPeriod={setPeriod} />
+        ) : (
+          <div className="flex flex-col gap-8">
+            <TeamMembersAttention
+              members={members}
+              metricBelowByMember={metricBelowByMember}
+              metricEntriesByPerson={metricEntriesByPerson}
+            />
 
-      {scopedBulletNote ? (
-        <div className="border-warning/30 bg-warning/10 text-warning rounded-md border px-3 py-2 text-xs">
-          {scopedBulletNote}
-        </div>
-      ) : null}
-
-      <TeamBulletSections
-        sections={{
-          task_delivery: taskQ.data,
-          code_quality: qualityQ.data,
-          estimation: estimationQ.data,
-          ai_adoption: aiMetrics,
-          collaboration: collabQ.data,
-        }}
-        status={{
-          task_delivery: bulletStatus(taskQ),
-          code_quality: bulletStatus(qualityQ),
-          estimation: bulletStatus(estimationQ),
-          ai_adoption: bulletStatus(aiQ),
-          collaboration: bulletStatus(collabQ),
-        }}
-        viewMode={viewMode}
-        onRetry={retrySection}
-      />
+            {heatmapQ.isError ? (
+              <ComingSoon
+                state="error"
+                label="Heatmap — unable to load"
+                onRetry={() => heatmapQ.refetch()}
+              />
+            ) : (
+              <MembersOverview
+                members={members}
+                heatmapByKey={heatmapQ.byKey}
+                previousHeatmapByKey={heatmapQ.previousByKey}
+                metricBelowByMember={metricBelowByMember}
+                metricEntriesByPerson={metricEntriesByPerson}
+              />
+            )}
 
-      <DrillModal
-        drill={drillQ.data ?? null}
-        open={Boolean(drillTarget)}
-        loading={drillQ.isPending && Boolean(drillTarget)}
-        errored={drillQ.isError}
-        onClose={() => setDrillTarget(null)}
-        onRetry={() => drillQ.refetch()}
-      />
+            <section className="flex flex-col gap-3">
+              <p className="text-xs font-medium uppercase tracking-wider text-muted-foreground">
+                Sections
+              </p>
+              <div className="grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-4">
+                {GROUPS.map((def) => {
+                  const result = metricGroupData.get(def.id);
+                  if (!result) return null;
+                  return (
+                    <TeamMetricGroupCard
+                      key={def.id}
+                      def={def}
+                      data={result}
+                      memberIds={memberEntityIds}
+                      onOpen={() => setOpenGroup(def.id)}
+                      subtitle="vs department peers"
+                    />
+                  );
+                })}
+              </div>
+            </section>
+          </div>
+        )}
+      </main>
 
-      <TeamMetricsModal
-        open={metricsModalOpen}
-        onClose={() => setMetricsModalOpen(false)}
-        members={members}
-        range={dateRange}
-      />
+      {GROUPS.map((def) => (
+        <GroupDrilldownSheet
+          key={def.id}
+          open={openGroup === def.id}
+          onOpenChange={(o) => setOpenGroup(o ? def.id : null)}
+          def={def}
+          metricTarget={{ kind: "team", members: memberRefs }}
+          range={dateRange}
+          period={period}
+          cohortLabel="department"
+        />
+      ))}
     </div>
   );
 }
diff --git a/src/test/catalog-test-utils.tsx b/src/test/catalog-test-utils.tsx
deleted file mode 100644
index 46f67b8e..00000000
--- a/src/test/catalog-test-utils.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Shared component-test scaffolding for wave-3 catalog-driven widgets
- * (Refs #80).
- *
- * Each v2 widget reads from `useCatalog()`; tests stub `fetchCatalog`
- * directly (same pattern `view-configs.test.tsx` and
- * `use-catalog.test.tsx` adopt) so assertions exercise the
- * catalog→widget wiring without MSW. Helpers here keep the
- * boilerplate-per-test small while keeping each test file
- * self-documenting on the specific render rule it covers.
- *
- * `vi.mock('@/api/catalog-client', ...)` must be declared in each test
- * file before this module is imported — `vi.mock` is hoisted relative
- * to the file that owns it, not transitively to helpers.
- */
-
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { render } from "@testing-library/react";
-import type React from "react";
-
-import { authStore } from "@/auth/auth-store";
-import type {
-  CatalogMetric,
-  CatalogResponse,
-} from "@/api/catalog-client";
-
-export function buildCatalogResponse(
-  rows: Array<Partial<CatalogMetric>>,
-): CatalogResponse {
-  return {
-    tenant_id: authStore.getSnapshot().session?.tenantId || "t-1",
-    generated_at: "2026-06-01T00:00:00Z",
-    metrics: rows.map((r, i) => ({
-      id: r.id ?? `id-${i}`,
-      metric_key: r.metric_key ?? `mock.metric_${i}`,
-      label: r.label ?? `Metric ${i}`,
-      higher_is_better: r.higher_is_better ?? true,
-      is_member_scale: r.is_member_scale ?? false,
-      source_tags: r.source_tags ?? [],
-      schema_status: r.schema_status ?? "ok",
-      schema_error_code: r.schema_error_code,
-      thresholds: r.thresholds ?? {
-        good: 1,
-        warn: 0,
-        resolved_from: "product-default",
-        bounded_by_lock: false,
-      },
-      unit: r.unit,
-      sublabel: r.sublabel,
-      description: r.description,
-      format: r.format,
-    })),
-    links: [],
-  };
-}
-
-export function renderWithCatalogClient(ui: React.ReactElement): {
-  client: QueryClient;
-} {
-  const client = new QueryClient({
-    defaultOptions: { queries: { retry: false, gcTime: 0 } },
-  });
-  render(<QueryClientProvider client={client}>{ui}</QueryClientProvider>);
-  return { client };
-}
diff --git a/src/test/storybook/with-providers.tsx b/src/test/storybook/with-providers.tsx
index 976658cc..d1d814e5 100644
--- a/src/test/storybook/with-providers.tsx
+++ b/src/test/storybook/with-providers.tsx
@@ -6,10 +6,6 @@
  *   - TanStack Router      — memory-history router (story = not-found route)
  *   - ThemeProvider        — light/dark classes; the theme toolbar drives it
  *   - I18nextProvider      — app i18n instance
- *
- * `CatalogProvider` is intentionally NOT included globally — catalog-driven
- * widgets mock `POST /catalog/get_metrics` via MSW per story, so the story
- * exercises the real `useCatalog()` wiring instead of a stubbed provider.
  */
 
 import type { Decorator } from "@storybook/react-vite";
diff --git a/src/types/insight.ts b/src/types/insight.ts
index 152cd111..5f58525b 100644
--- a/src/types/insight.ts
+++ b/src/types/insight.ts
@@ -1,248 +1,9 @@
-import type { PeerStats } from "@/lib/peers";
-
 export type PeriodValue = "week" | "month" | "quarter" | "year";
 export type CustomRange = { from: string; to: string };
-export type ViewMode = "chart" | "tile";
-export interface PeriodState {
-  period: PeriodValue;
-  customRange: CustomRange | null;
-  scale: number;
-}
-
-export interface ODataParams {
-  $filter?: string;
-  $orderby?: string;
-  $top?: number;
-  $select?: string;
-  $skip?: string;
-}
-export interface ODataResponse<T> {
-  items: T[];
-  page_info: { has_next: boolean; cursor: string | null };
-}
-export interface ProblemFieldViolation {
-  field: string;
-  description?: string;
-  reason?: string;
-}
-export interface ProblemContext {
-  resource_type?: string;
-  resource_name?: string;
-  field_violations?: ProblemFieldViolation[];
-}
-export interface ProblemDetails {
-  type: string;
-  title: string;
-  status: number;
-  detail: string;
-  context?: ProblemContext;
-}
-export type ThresholdLevel = "good" | "warning" | "critical";
-export type Thresholds = Record<string, ThresholdLevel>;
-
-export type ConnectorAvailability = "available" | "no-connector" | "syncing";
-export interface ConnectorStatus {
-  id: string;
-  name: string;
-  status: ConnectorAvailability;
-}
-export type DataAvailability = {
-  git: ConnectorAvailability;
-  tasks: ConnectorAvailability;
-  ci: ConnectorAvailability;
-  comms: ConnectorAvailability;
-  hr: ConnectorAvailability;
-  ai: ConnectorAvailability;
-};
 
-export interface TeamKpi {
-  metric_key: string;
-  label: string;
-  value: string;
-  unit: string;
-  sublabel?: string;
-  chipLabel?: string;
-  description?: string;
-  status: "good" | "warn" | "bad";
-  section: string;
-}
 export interface TeamMember {
-  person_id: string;
-  period: PeriodValue;
-  name: string;
-  seniority: string;
-  supervisor_email: string | null;
-  org_unit_id: string | null;
-  tasks_closed: number;
-  bugs_fixed: number;
-  dev_time_h: number | null;
-  prs_merged: number | null;
-  build_success_pct: number | null;
-  focus_time_pct: number | null;
-  ai_tools: string[];
-  ai_loc_share_pct: number | null;
-}
-export interface BulletMetric {
-  period: PeriodValue;
-  section: string;
-  metric_key: string;
-  label: string;
-  sublabel?: string;
-  value: string;
-  unit: string;
-  range_min: string;
-  range_max: string;
-  median: string;
-  median_label: string;
-  bar_left_pct: number;
-  bar_width_pct: number;
-  median_left_pct: number;
-  status: "good" | "warn" | "bad" | "unavailable";
-  /**
-   * Peer cohort distribution for this metric (p25/p50/p75/min/max/n),
-   * carried on the row by the bullet query_ref — same cohort that draws the
-   * bar. For IC rows this is the person's department; for team-bullet
-   * (TEAM_BULLET_*) rows the backend folds a blended department expectation
-   * (the roster's per-department distributions combined) onto each row, so
-   * team section cards color "vs department expectation" with no FE math.
-   * Drives quartile coloring + the drilldown distribution strip. Absent when
-   * the backend returned no cohort (e.g. honest-zero / unavailable rows).
-   */
-  peer?: PeerStats;
-  drill_id: string;
-  /**
-   * Set when the catalog row for this metric reported
-   * `schema_status='error'` (ClickHouse table/column missing or query
-   * failed). Consumers should suppress threshold-based coloring and show
-   * the "Metric source unavailable" indicator; label remains visible.
-   * Absent / false ⇒ render normally.
-   */
-  schema_error?: boolean;
-  /**
-   * Data-source tags from the catalog (`source_tags`), e.g. `["m365","zoom"]`,
-   * `["jira"]`, `["bitbucket"]`. Used to show provenance ("M365 · Zoom") in
-   * place of a peer-status line for metrics with no cohort.
-   */
-  source_tags?: string[];
-}
-export interface BulletSection {
-  id: string;
-  title: string;
-  metrics: BulletMetric[];
-}
-export interface AlertThreshold {
-  metric_key: string;
-  trigger: number;
-  bad: number;
-  reason: string;
-}
-export interface ColumnThreshold {
-  metric_key: string;
-  good: number;
-  warn: number;
-  higher_is_better: boolean;
-}
-export interface TeamViewConfig {
-  alert_thresholds: AlertThreshold[];
-  column_thresholds: ColumnThreshold[];
-}
-export interface TeamViewData {
-  teamName: string;
-  teamKpis: TeamKpi[];
-  members: TeamMember[];
-  bulletSections: BulletSection[];
-  config: TeamViewConfig;
-}
-
-export interface PersonData {
   person_id: string;
   name: string;
-  role: string;
-  seniority: string;
-}
-export interface IcKpi {
-  period: PeriodValue;
-  metric_key: string;
-  label: string;
-  value: string | null;
-  raw_value: number | null;
-  unit: string;
-  sublabel: string;
-  description?: string;
-  delta: string;
-  delta_type: "good" | "warn" | "bad" | "neutral";
-  /**
-   * Department peer median for this KPI + cohort size, folded into the
-   * IC_KPIS query_ref. Raw numeric (consumers format). NULL when the person
-   * has no department cohort. Replaces the standalone ic_kpi_peer_median.
-   */
-  peer_median?: number | null;
-  peer_n?: number | null;
-}
-export interface TimeOffNotice {
-  days: number;
-  dateRange: string;
-  bambooHrUrl: string;
-}
-export interface LocDataPoint {
-  label: string;
-  codeLoc: number;
-  specLines: number;
-  configLoc: number;
-}
-export interface DeliveryDataPoint {
-  label: string;
-  commits: number;
-  prsMerged: number | null;
-  tasksDone: number;
-}
-export interface IcChartsData {
-  locTrend: LocDataPoint[];
-  deliveryTrend: DeliveryDataPoint[];
-}
-export interface DrillRow {
-  [key: string]: string | number;
-}
-export interface DrillData {
-  title: string;
-  source: string;
-  srcClass: string;
-  value: string;
-  filter: string;
-  columns: string[];
-  rows: DrillRow[];
-}
-export interface IcDashboardData {
-  kpis: IcKpi[];
-  bulletMetrics: BulletMetric[];
-  charts: IcChartsData;
-  timeOffNotice: TimeOffNotice | null;
-  drills: Record<string, DrillData>;
-}
-
-export interface CrmKpis {
-  dealsOpened: number;
-  dealsClosed: number;
-  dealsWon: number;
-  dealsValueClosed: number;
-  commsCount: number;
-}
-
-/**
- * Open-deal pipeline snapshot — sourced from the date-less `CRM_PIPELINE_NOW`
- * metric, kept separate from {@link CrmKpis} (a period flow sum) because the
- * two come from different metrics with different time semantics.
- */
-export interface CrmPipeline {
-  pipelineCount: number;
-  pipelineValue: number;
-}
-
-export interface CrmFlowPoint {
-  label: string;
-  opened: number;
-  closed: number;
-  won: number;
 }
 
 /** Lightweight projection of the C# PersonResponse shape. */