diff --git a/docs/baseball/COHERENCE_RULING_2026-07-08.md b/docs/baseball/COHERENCE_RULING_2026-07-08.md
new file mode 100644
index 000000000..5f129ff0d
--- /dev/null
+++ b/docs/baseball/COHERENCE_RULING_2026-07-08.md
@@ -0,0 +1,88 @@
+# BaseballHelm Coherence Ruling — 2026-07-08 (overnight consolidation)
+
+**Authority:** Commander decision doc for the one-night coherence mission. Supersedes conflicting
+guidance in CANONICAL_SPEC §2.1 (stale 10-item nav). Builds on COACH_NAV_8TAB_PROPOSAL.md
+(owner-approved 2026-07-01) and the 2026-06-30 shell postmortem's unexecuted recommendations.
+Baseline: `origin/main` e63de6044 — tsc/lint/ratchet/unit all green.
+
+## Ruling 1 — ONE shell: BaseballFairwayShell, unconditional
+
+`NEXT_PUBLIC_REDESIGN=true` is what prod serves. The legacy fork is pure regression risk
+(`.env.example` defaults it off). Therefore:
+
+- `(dashboard)/layout.tsx` and `(player-dashboard)/player/layout.tsx` render
+  `BaseballFairwayShell` **unconditionally** — delete the `isRedesignEnabled()` forks
+  (baseball layouts only; golf untouched).
+- Delete `src/app/baseball/(coach-dashboard)/` entirely (zero page.tsx, confirmed dead).
+- Remove the **baseball** nav paths from `src/components/layout/sidebar.tsx`
+  (5 legacy arrays: collegeTeamNav/hsCoachTeamNav/jucoTeamNav/showcaseOrgNav/playerTeamNav +
+  `buildCondensedBaseballNavigation`); the golf branch stays byte-identical.
+- Delete `BaseballShellLayout`/`BaseballDashboardShell` baseball render path once unreferenced.
+- Route groups `(dashboard)` + `(player-dashboard)` both stay (URLs are load-bearing:
+  PWA start_url, bookmarks). Folding them is deferred — not tonight's risk.
+
+## Ruling 2 — Navigation IA: ≤8 primary, ≤3 subtabs per primary (hard caps)
+
+Top level keeps the owner-approved hub set (College sees 7, HS 6, JUCO 8 — all ≤8):
+**Dashboard · Team · Messages · Stats & Performance · Development · Recruiting ·
+Academics (JUCO) · Management**. The fix is inside the hubs — every destination stays
+reachable ≤2 clicks (subtab landing pages surface deeper routes as cards/CTAs; command
+palette stays flat with everything). Deep routes keep their URLs; `resolve-active-hub`
+maps them to the owning subtab for highlight + breadcrumbs.
+
+| Hub | Subtabs (≤3) | Folded in (reachable from landing) |
+|---|---|---|
+| Dashboard | Overview · Signals | — |
+| Team | Roster · Calendar · Operations | Operations = new landing: Documents, Travel, Practice Planner, Practice Effectiveness |
+| Messages | Messages · Announcements | announcements moves here from Team (it's comms) |
+| Stats & Performance | Stats Center · Games · Postgame | Season = view inside Stats Center; Upload + Import Center = CTAs inside Stats Center |
+| Development | Dev Plans · Training · Videos | Training = existing /dashboard/performance landing → Programs, Live Weight Room, Builder, Groups |
+| Recruiting | Pipeline · Discover · Scouting | Scouting = new landing: Watchlist, Compare, Saved Comparisons, Scout Packets, Camps |
+| Academics | (single page) | JUCO only |
+| Management | Decision Room · Settings · Organization | Settings = existing card-grid landing (KEEP grid, DELETE the 9-tab splice from COACH_MANAGEMENT_TABS); Organization = org/teams/events (Showcase types) |
+
+Player nav (Fairway): Today · Schedule · My Stats · Development · Team · Messages ·
+My Profile (+ Recruiting when activated) — already ≤8; enforce ≤3 subtabs per hub the same way.
+Players hitting `/baseball/dashboard/practice` redirect to `/baseball/player/practice` (canonical
+player practice surface).
+
+Nav-manifest test extended: every coach/both registry entry maps to exactly one hub, and no
+hub resolves >3 subtabs for any coach type. That test is the anti-regression lock.
+
+## Ruling 3 — ONE Lift Lab
+
+Canonical = `src/components/lifting/*` + `helm_lifting_*`. Repoint the 6 baseball
+performance routes at the canonical components; delete `src/components/baseball/performance/*`
+(23-file legacy tree, GolfHelm-palette, writes legacy `baseball_lift_*`). Completes the
+in-flight unification train.
+
+## Ruling 4 — Data honesty & correctness cluster
+
+- "Today" is **team-local** everywhere (`resolveTeamTimezone` + `todayIsoInTz`), never server-UTC:
+  readiness page, command-center read-model, player-today read-model.
+- Calendar: null `end_time` renders start + 1h default (never zero-duration); events query gets
+  lookback bound + limit; badge labels pluralize.
+- Academics eligibility is tri-state: `null` = gray "Not on file"; red "Ineligible" only for real `false`.
+- Roster: drop EXIT V column (column doesn't exist in schema, no write path — honest UI);
+  backfill career_obp/slg/ops for existing rows (prod data op).
+- Breadcrumbs: UUID-shaped segments never title-cased; dynamic routes supply real names
+  (players/[id], stats/games/[id], dev-plans/[id]).
+- `createBaseballEvent` game-insert errors checked, not swallowed.
+- E2E: spec cleans up its own rows (service-role delete in teardown); prod junk rows
+  (`E2E Created Opponent%`) deleted as a data op; isolated E2E project documented as follow-up
+  needing owner (new Supabase project).
+- Seed script gets realistic event times (practice 15:30–17:30, games 13:00–16:00, meetings 12:00–13:00 team-local);
+  demo team's polluted event rows corrected in place.
+
+## Ruling 5 — Dead code deleted, not layered over
+
+`(coach-dashboard)`; legacy sidebar baseball arrays; legacy shell baseball path; legacy Lift Lab
+tree; `players/[id]/profile` duplicate page (canonical = `players/[id]` PlayerProfileClient);
+knip-confirmed orphans (MatchScoreBadge, match-calculator, dashboard-types); 5 orphaned
+`baseballhelm-*.{mjs,workflow.js}` scripts (superseded by Helm Bridge).
+
+## Out of scope tonight (documented, not forgotten)
+
+Route-group merge of `(player-dashboard)` into `(dashboard)`; dedicated E2E Supabase project;
+PlayerPassportCard→Fairway preview swap if polish wave runs out of clock; full 3-lane
+Living-Annual masthead vision (ui-migration-map L56) — the 8-hub IA is the stepping stone.
diff --git a/e2e/README.md b/e2e/README.md
index c4ae0de1b..e571d891a 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -188,17 +188,32 @@ present (it isn't, on fork PRs, matching the existing `E2E_GOLF_*` secret
 pattern in that workflow). When the secret is absent, the seed step is
 skipped entirely and the three specs above self-skip rather than fail.
 
-### Known limitation: "create game" / "create camp" specs are non-destructive only on the create side
-
-`GameCard`'s delete affordance is intentionally hidden in the UI (a
-permanent `hidden` class), so the box-score spec's "create a new game" test
-cannot clean up the game row it creates via the UI — each CI run adds one
-new `baseball_games` row with a unique opponent name
-(`E2E Created Opponent ${Date.now()}`) to the test database. This is a
-known, accepted trade-off (documented here rather than worked around) since
-the created row doesn't affect any other spec's assertions. The Camps
-spec's create/delete round-trip *is* fully self-cleaning, since the Camps
-UI does expose a working delete action.
+### Cleanup: "create game" spec self-cleans via a service-role teardown (not the UI)
+
+`GameCard`'s delete affordance is still intentionally hidden in the UI (a
+permanent `hidden` class), so `baseball-box-score.spec.ts`'s "should create
+a new game and redirect to its box-score entry page" test cannot clean up
+the `baseball_games` row it creates through the app UI. It creates a real
+row (plus a linked `baseball_events` row, since the create form defaults
+`create_calendar_event` to `true`) tagged with a unique opponent name
+(`E2E Created Opponent ${Date.now()}`).
+
+Rather than accept that as permanent test-database pollution, the
+`Coach - Create New Game` describe block now has a `test.afterAll` teardown
+that deletes exactly the `baseball_games` row(s) (and their linked
+`baseball_events` row(s)) it created, by opponent name, via a service-role
+Supabase client — the same construction pattern
+`scripts/seed-baseball-e2e.ts` uses for seeding
+(`NEXT_PUBLIC_SUPABASE_URL` + `SUPABASE_SERVICE_ROLE_KEY`, session-less).
+The teardown is a silent no-op (never a failure) when the service-role key
+isn't present in the environment, matching every other seed/cleanup path in
+this suite.
+
+This test had no cleanup prior to 2026-07-08 and had accumulated ~160 junk
+`baseball_games` rows in the shared database, purged via a one-off SQL
+cleanup that same night. The Camps spec's create/delete round-trip was
+already fully self-cleaning via its working UI delete action and is
+unaffected by this change.
 
 ## CI/CD Integration
 
diff --git a/e2e/baseball-box-score.spec.ts b/e2e/baseball-box-score.spec.ts
index e6fde3a70..4cb5ef63a 100644
--- a/e2e/baseball-box-score.spec.ts
+++ b/e2e/baseball-box-score.spec.ts
@@ -1,4 +1,5 @@
 import { test, expect, type Page } from '@playwright/test';
+import { getE2eAdminClient } from '../scripts/e2e-supabase-admin';
 import { loginAsCoach, loginAsPlayer } from './helpers/auth';
 import { waitForPageLoad } from './helpers/common';
 
@@ -23,10 +24,13 @@ import { waitForPageLoad } from './helpers/common';
  * including `status`), per the "destructive tests rely on seed reset"
  * pattern used throughout this fixture.
  *
- * The "create game" test adds one extra (non-seeded) game row each run —
- * there is currently no reachable delete affordance in the UI (GamesList's
- * delete button is shipped with a permanent `hidden` class), so this is a
- * known, documented trade-off rather than an oversight. See e2e/README.md.
+ * The "create game" test adds one extra (non-seeded) game row each run.
+ * `GamesList`'s delete button is still shipped with a permanent `hidden`
+ * class, so there is no reachable UI delete affordance — cleanup instead
+ * happens directly against the database: a `test.afterAll` below deletes
+ * every `baseball_games` row (+ its linked `baseball_events` row) this file
+ * created, via the same service-role client construction
+ * `scripts/seed-baseball-e2e.ts` uses for seeding. See e2e/README.md.
  *
  * Gated on PLAYWRIGHT_BASEBALL_SEEDED=1, with a per-test self-skip if the
  * login fixture is unavailable in the target environment — same pattern as
@@ -42,6 +46,18 @@ const SEEDED =
 const SCHEDULED_OPPONENT = 'Riverside University';
 const COMPLETED_OPPONENT = 'Eastview College';
 
+/**
+ * Service-role Supabase client for teardown-only writes (deleting rows this
+ * spec itself created) — provided by scripts/e2e-supabase-admin.ts so this
+ * spec never references the service-role env var directly (ast-grep rule
+ * helmv3-no-service-role-key). Returns `null` (teardown becomes a no-op)
+ * rather than throwing when the env is missing — cleanup must never fail an
+ * otherwise-passing run.
+ */
+function getServiceRoleClient() {
+  return getE2eAdminClient();
+}
+
 async function loginCoachOrSkip(page: Page) {
   try {
     await loginAsCoach(page);
@@ -65,12 +81,43 @@ async function loginPlayerOrSkip(page: Page) {
 test.describe('Coach - Create New Game', () => {
   test.skip(!SEEDED, 'no seeded baseball team fixture (set PLAYWRIGHT_BASEBALL_SEEDED=1)');
 
+  // Opponent names created by the "create new game" test below — tracked so
+  // the afterAll teardown can delete exactly (and only) the rows this file
+  // created, never touching the seeded fixture games.
+  const createdOpponents: string[] = [];
+
   test.beforeEach(async ({ page }) => {
     await loginCoachOrSkip(page);
     await page.goto('/baseball/dashboard/stats/games/create');
     await waitForPageLoad(page);
   });
 
+  test.afterAll(async () => {
+    if (createdOpponents.length === 0) return;
+    const supabase = getServiceRoleClient();
+    if (!supabase) return;
+
+    // The create form defaults `create_calendar_event` to true, so each
+    // created game also has a linked baseball_events row (event_id) —
+    // delete both so no orphaned event survives the game's deletion.
+    const { data: games } = await supabase
+      .from('baseball_games')
+      .select('id, event_id')
+      .in('opponent_name', createdOpponents);
+
+    const gameIds = (games ?? []).map((g) => g.id);
+    const eventIds = (games ?? [])
+      .map((g) => g.event_id)
+      .filter((id): id is string => Boolean(id));
+
+    if (gameIds.length > 0) {
+      await supabase.from('baseball_games').delete().in('id', gameIds);
+    }
+    if (eventIds.length > 0) {
+      await supabase.from('baseball_events').delete().in('id', eventIds);
+    }
+  });
+
   test('should display the new game form with date, opponent, and venue fields', async ({ page }) => {
     await expect(page.getByRole('heading', { name: /Add Game/i })).toBeVisible();
     await expect(page.locator('#new-game-date')).toBeVisible();
@@ -92,6 +139,7 @@ test.describe('Coach - Create New Game', () => {
 
   test('should create a new game and redirect to its box-score entry page', async ({ page }) => {
     const opponent = `E2E Created Opponent ${Date.now()}`;
+    createdOpponents.push(opponent);
     const futureDate = new Date();
     futureDate.setDate(futureDate.getDate() + 45);
     const dateStr = futureDate.toISOString().slice(0, 10);
diff --git a/memory/projects/golfhelm.md b/memory/projects/golfhelm.md
index 41a5f4218..0e01f71b0 100644
--- a/memory/projects/golfhelm.md
+++ b/memory/projects/golfhelm.md
@@ -264,7 +264,7 @@ src/lib/coachhelm/
 <!-- AUTOGEN:routes:start -->
 <!-- DO NOT EDIT — regenerated by scripts/regen-docs.mjs -->
 
-**231 routes** (source: `src/app/**/page.tsx`).
+**224 routes** (source: `src/app/**/page.tsx`).
 
 <details><summary>Full alphabetical route list</summary>
 
@@ -273,6 +273,7 @@ src/lib/coachhelm/
 - `/admin/activity`
 - `/admin/auth`
 - `/admin/baseball`
+- `/admin/ben-leah`
 - `/admin/deploys`
 - `/admin/errors`
 - `/admin/errors/[fingerprint]`
@@ -284,14 +285,11 @@ src/lib/coachhelm/
 - `/admin/users`
 - `/admin/users/[id]`
 - `/admin/users/[id]/view-as`
+- `/admin/work`
 - `/baseball`
 - `/baseball/admin/demo-sessions`
 - `/baseball/coach`
 - `/baseball/coach-onboarding`
-- `/baseball/coach/college`
-- `/baseball/coach/high-school`
-- `/baseball/coach/juco`
-- `/baseball/coach/showcase`
 - `/baseball/complete-signup`
 - `/baseball/dashboard`
 - `/baseball/dashboard/academics`
@@ -320,6 +318,7 @@ src/lib/coachhelm/
 - `/baseball/dashboard/messages`
 - `/baseball/dashboard/messages/[id]`
 - `/baseball/dashboard/my-stats`
+- `/baseball/dashboard/operations`
 - `/baseball/dashboard/organization`
 - `/baseball/dashboard/performance`
 - `/baseball/dashboard/performance/builder`
@@ -331,7 +330,6 @@ src/lib/coachhelm/
 - `/baseball/dashboard/pipeline`
 - `/baseball/dashboard/players/[id]`
 - `/baseball/dashboard/players/[id]/passport`
-- `/baseball/dashboard/players/[id]/profile`
 - `/baseball/dashboard/players/[id]/scout-packet`
 - `/baseball/dashboard/players/[id]/scout-packet/preview`
 - `/baseball/dashboard/players/[id]/stats`
@@ -343,6 +341,7 @@ src/lib/coachhelm/
 - `/baseball/dashboard/readiness`
 - `/baseball/dashboard/roster`
 - `/baseball/dashboard/scout-packets`
+- `/baseball/dashboard/scouting`
 - `/baseball/dashboard/settings`
 - `/baseball/dashboard/settings/ai`
 - `/baseball/dashboard/settings/appearance`
@@ -370,12 +369,10 @@ src/lib/coachhelm/
 - `/baseball/dashboard/stats/games`
 - `/baseball/dashboard/stats/games/[gameId]`
 - `/baseball/dashboard/stats/games/create`
-- `/baseball/dashboard/stats/games/new`
 - `/baseball/dashboard/stats/season`
 - `/baseball/dashboard/stats/upload`
 - `/baseball/dashboard/tasks`
 - `/baseball/dashboard/team`
-- `/baseball/dashboard/team/high-school`
 - `/baseball/dashboard/teams`
 - `/baseball/dashboard/travel`
 - `/baseball/dashboard/videos`
@@ -389,12 +386,8 @@ src/lib/coachhelm/
 - `/baseball/packet/[token]`
 - `/baseball/player`
 - `/baseball/player/[id]`
-- `/baseball/player/college`
-- `/baseball/player/high-school`
-- `/baseball/player/juco`
 - `/baseball/player/passport`
 - `/baseball/player/practice`
-- `/baseball/player/showcase`
 - `/baseball/player/timeline`
 - `/baseball/player/today`
 - `/baseball/program/[id]`
diff --git a/scripts/backfill-baseball-slash-lines.ts b/scripts/backfill-baseball-slash-lines.ts
new file mode 100644
index 000000000..4a1e14cec
--- /dev/null
+++ b/scripts/backfill-baseball-slash-lines.ts
@@ -0,0 +1,182 @@
+/**
+ * backfill-baseball-slash-lines.ts — one-time backfill for
+ * `baseball_player_aggregates.career_obp` / `career_slg` / `career_ops`.
+ *
+ * Migration 20260701020000 added the three columns (BaseballHelm #436) but
+ * shipped with NO backfill — "the columns fill in on the next aggregate
+ * recalculation for each player." Any player whose aggregates haven't been
+ * recalculated since then (no new stat session logged) is stuck with
+ * `career_avg` populated and `career_obp`/`career_slg`/`career_ops` null,
+ * which is exactly the "AVG shows, SLG/OPS show '—'" honesty bug Ruling 4
+ * calls out on the roster wall.
+ *
+ * Reuses the SAME pure compute helper `recalculatePlayerAggregates`
+ * (src/app/baseball/actions/stats.ts) calls — `computeCareerSlashLine`
+ * (src/lib/baseball/aggregates/career-slash-line.ts, unit-tested) — so this
+ * script never re-derives the OBP/SLG/OPS formulas itself. For every
+ * (player_id, team_id) already in `baseball_player_aggregates`, it re-reads
+ * that pair's `baseball_player_stats` rows (the same source table the app's
+ * own recalc reads) and UPDATEs only the three slash-line columns.
+ *
+ * Idempotent: the computed value is a pure function of the current
+ * `baseball_player_stats` rows, so re-running always converges to the same
+ * result — safe to run again after new stats are logged.
+ *
+ * Safe: UPDATE only (`career_obp`, `career_slg`, `career_ops`) on rows that
+ * already exist. No inserts, no deletes, no other columns touched.
+ *
+ * Connection modeled EXACTLY on scripts/seed-rini-baseball-demo.ts: env from
+ * .env.local, `createClient(url, key, { auth: { persistSession: false,
+ * autoRefreshToken: false } })`. Dry-run by default (prints the plan, writes
+ * nothing) — pass --confirm to write, matching the sibling seed scripts'
+ * safety convention.
+ *
+ * Run:
+ *   DOTENV_CONFIG_PATH=.env.local npx tsx -r dotenv/config scripts/backfill-baseball-slash-lines.ts            # dry run
+ *   DOTENV_CONFIG_PATH=.env.local npx tsx -r dotenv/config scripts/backfill-baseball-slash-lines.ts --confirm  # write
+ *
+ * (`npx tsx scripts/backfill-baseball-slash-lines.ts` also works standalone —
+ * the script loads .env.local itself via `dotenv` below.)
+ *
+ * Requires env: NEXT_PUBLIC_SUPABASE_URL, SUPABASE_SERVICE_ROLE_KEY.
+ */
+import { config as loadEnv } from 'dotenv';
+import { createClient, type SupabaseClient } from '@supabase/supabase-js';
+import { computeCareerSlashLine, type SlashLineStatRow } from '../src/lib/baseball/aggregates/career-slash-line';
+
+loadEnv({ path: '.env.local' });
+
+const DRY = !process.argv.includes('--confirm');
+
+interface AggregateRow {
+  player_id: string;
+  team_id: string;
+  career_avg: number | null;
+  career_obp: number | null;
+  career_slg: number | null;
+  career_ops: number | null;
+}
+
+function fmt(v: number | null): string {
+  return v == null ? '—' : v.toFixed(3);
+}
+
+function valuesEqual(a: number | null, b: number | null): boolean {
+  if (a == null && b == null) return true;
+  if (a == null || b == null) return false;
+  // Compare at the same 3-decimal precision the column/formula use.
+  return Math.abs(a - b) < 0.0005;
+}
+
+async function main() {
+  const url = (process.env.NEXT_PUBLIC_SUPABASE_URL ?? '').trim();
+  const key = (process.env.SUPABASE_SERVICE_ROLE_KEY ?? '').trim();
+  if (!url || !key) throw new Error('Missing NEXT_PUBLIC_SUPABASE_URL / SUPABASE_SERVICE_ROLE_KEY');
+  const supabase: SupabaseClient = createClient(url, key, {
+    auth: { persistSession: false, autoRefreshToken: false },
+  });
+
+  console.log(`${DRY ? '[DRY RUN] printing plan, writing NOTHING. Re-run with --confirm.\n' : ''}Backfilling baseball_player_aggregates.career_obp/slg/ops...\n`);
+
+  const { data: rows, error: fetchError } = await supabase
+    .from('baseball_player_aggregates')
+    .select('player_id, team_id, career_avg, career_obp, career_slg, career_ops')
+    .returns<AggregateRow[]>();
+
+  if (fetchError) throw fetchError;
+  if (!rows || rows.length === 0) {
+    console.log('No baseball_player_aggregates rows found — nothing to backfill.');
+    return;
+  }
+
+  console.log(`Found ${rows.length} aggregate row(s).\n`);
+
+  let scanned = 0;
+  let changed = 0;
+  let unchanged = 0;
+  let errors = 0;
+  const samples: Array<{ playerId: string; teamId: string; before: AggregateRow; after: { career_obp: number | null; career_slg: number | null; career_ops: number | null } }> = [];
+
+  for (const row of rows) {
+    scanned++;
+
+    // `select('*')` (not an explicit column list) — matches
+    // recalculatePlayerAggregatesAction exactly. Live `baseball_player_stats`
+    // is missing `hit_by_pitch`/`sacrifice_flies` (schema drift: the columns
+    // exist on the BaseballPlayerStats TS type but not in the deployed
+    // table), so an explicit select naming them 400s. `computeCareerSlashLine`
+    // treats a missing field as 0 via `pick(s) || 0`, which is exactly how
+    // the app's own recalculation already behaves in production today.
+    const { data: statsRows, error: statsError } = await supabase
+      .from('baseball_player_stats')
+      .select('*')
+      .eq('player_id', row.player_id)
+      .eq('team_id', row.team_id)
+      .returns<SlashLineStatRow[]>();
+
+    if (statsError) {
+      console.warn(`  ⚠ ${row.player_id.slice(0, 8)}/${row.team_id.slice(0, 8)}: failed to load stats — ${statsError.message}`);
+      errors++;
+      continue;
+    }
+
+    const { obp, slg, ops } = computeCareerSlashLine(statsRows ?? []);
+
+    const isChanged =
+      !valuesEqual(row.career_obp, obp) ||
+      !valuesEqual(row.career_slg, slg) ||
+      !valuesEqual(row.career_ops, ops);
+
+    if (!isChanged) {
+      unchanged++;
+      continue;
+    }
+
+    changed++;
+    if (samples.length < 5) {
+      samples.push({ playerId: row.player_id, teamId: row.team_id, before: row, after: { career_obp: obp, career_slg: slg, career_ops: ops } });
+    }
+
+    const label = `${row.player_id.slice(0, 8)}/${row.team_id.slice(0, 8)}`;
+    console.log(
+      `  ${DRY ? '[DRY] would update' : '✓ updating'} ${label}: ` +
+      `avg=${fmt(row.career_avg)} obp ${fmt(row.career_obp)}→${fmt(obp)} slg ${fmt(row.career_slg)}→${fmt(slg)} ops ${fmt(row.career_ops)}→${fmt(ops)}`
+    );
+
+    if (!DRY) {
+      const { error: updateError } = await supabase
+        .from('baseball_player_aggregates')
+        .update({ career_obp: obp, career_slg: slg, career_ops: ops })
+        .eq('player_id', row.player_id)
+        .eq('team_id', row.team_id);
+
+      if (updateError) {
+        console.warn(`  ⚠ ${label}: update failed — ${updateError.message}`);
+        errors++;
+        changed--;
+      }
+    }
+  }
+
+  console.log(`\n${DRY ? '[DRY RUN] ' : ''}Done. scanned=${scanned} changed=${changed} unchanged=${unchanged} errors=${errors}`);
+
+  if (samples.length > 0) {
+    console.log('\nSample before/after:');
+    for (const s of samples) {
+      console.log(
+        `  ${s.playerId.slice(0, 8)}/${s.teamId.slice(0, 8)}: ` +
+        `before(obp=${fmt(s.before.career_obp)}, slg=${fmt(s.before.career_slg)}, ops=${fmt(s.before.career_ops)}) ` +
+        `after(obp=${fmt(s.after.career_obp)}, slg=${fmt(s.after.career_slg)}, ops=${fmt(s.after.career_ops)})`
+      );
+    }
+  }
+
+  if (DRY) {
+    console.log('\nRe-run with --confirm to write.');
+  }
+}
+
+main().catch((err) => {
+  console.error('Backfill failed:', err);
+  process.exit(1);
+});
diff --git a/scripts/baseballhelm-command-center.mjs b/scripts/baseballhelm-command-center.mjs
deleted file mode 100644
index c7da0d3fe..000000000
--- a/scripts/baseballhelm-command-center.mjs
+++ /dev/null
@@ -1,818 +0,0 @@
-#!/usr/bin/env node
-/*
- * BaseballHelm Ultracode Command Center — local HTTP server + live event hub.
- *
- * A LOCAL, repo-contained, cream/green "Agent City / Factory Floor" build-observability
- * dashboard. NOT part of the shipped product — a localhost tool that watches the
- * BaseballHelm build and streams build telemetry to the static UI in
- * tools/baseballhelm-command-center/.
- *
- * Zero dependencies — Node core only (node:http, node:fs, node:path, node:url, node:child_process).
- *
- * Security posture:
- *  - Binds 127.0.0.1 ONLY (never 0.0.0.0 / public).
- *  - Never reads or serves process.env, .env files, or any secret.
- *  - Static serving is jailed inside the command-center dir; path traversal rejected.
- *  - All git introspection uses execFile with argument arrays (never a shell), is
- *    non-destructive, and degrades gracefully on failure.
- */
-
-import http from "node:http";
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { execFile } from "node:child_process";
-import { computeLoc } from "./baseballhelm-loc.mjs";
-
-// Lines-of-code written for BaseballHelm (git-based, cached ~15s).
-let locCache = { ts: 0, data: { total: 0, files: 0, byCategory: [] } };
-function getLoc() {
-  const now = Date.now();
-  if (locCache.data && now - locCache.ts < 15000) return locCache.data;
-  try { locCache = { ts: now, data: computeLoc() }; } catch { /* keep last */ }
-  return locCache.data;
-}
-
-// --------------------------------------------------------------------------- paths
-const REPO_ROOT = "/Users/ricknini/Downloads/helmv3";
-const WEB_ROOT = path.join(REPO_ROOT, "tools", "baseballhelm-command-center");
-const DATA_DIR = path.join(REPO_ROOT, ".ultracode", "baseballhelm");
-
-const STATE_FILE = path.join(DATA_DIR, "state.json");
-const AGENTS_FILE = path.join(DATA_DIR, "agents.json");
-const PACKETS_FILE = path.join(DATA_DIR, "work-packets.json");
-const RISKS_FILE = path.join(DATA_DIR, "risks.json");
-const QA_FILE = path.join(DATA_DIR, "qa.json");
-const DECISIONS_FILE = path.join(DATA_DIR, "decisions.json");
-const ARTIFACTS_FILE = path.join(DATA_DIR, "artifacts.json");
-const HANDOFF_FILE = path.join(DATA_DIR, "handoff.json");
-const REPLAY_FILE = path.join(DATA_DIR, "replay.json");
-const EVENTS_FILE = path.join(DATA_DIR, "events.ndjson");
-
-const HOST = process.env.BBCC_HOST || "127.0.0.1"; // default localhost-only (spec); set BBCC_HOST=0.0.0.0 for same-LAN phone viewing
-const PORT_START = 4877;
-const PORT_MAX = 4897;
-const BOOT_TS = Date.now();
-
-// --------------------------------------------------------------------------- helpers: fs / json
-
-/** Read + parse a JSON file FRESH (no cache). Returns fallback on missing/malformed. */
-function readJSON(file, fallback) {
-  try {
-    const raw = fs.readFileSync(file, "utf8");
-    const parsed = JSON.parse(raw);
-    return parsed == null ? fallback : parsed;
-  } catch {
-    return fallback;
-  }
-}
-
-/** Atomically-ish write JSON (best effort; tolerate failure without crashing). */
-function writeJSON(file, value) {
-  try {
-    fs.writeFileSync(file, JSON.stringify(value, null, 2) + "\n", "utf8");
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/** Read events.ndjson, skipping blank/bad lines; chronological ascending (file order). */
-function readEvents() {
-  let raw;
-  try {
-    raw = fs.readFileSync(EVENTS_FILE, "utf8");
-  } catch {
-    return [];
-  }
-  const out = [];
-  for (const line of raw.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    try {
-      out.push(JSON.parse(trimmed));
-    } catch {
-      // skip malformed line
-    }
-  }
-  return out;
-}
-
-/** Append one ndjson line to events.ndjson (best effort). */
-function appendEventLine(evt) {
-  try {
-    fs.appendFileSync(EVENTS_FILE, JSON.stringify(evt) + "\n", "utf8");
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/** Next event id like "evt-0008" based on the current max numeric suffix. */
-function nextEventId(events) {
-  let max = 0;
-  for (const e of events) {
-    const m = typeof e?.id === "string" && e.id.match(/evt-(\d+)/);
-    if (m) max = Math.max(max, parseInt(m[1], 10));
-  }
-  return "evt-" + String(max + 1).padStart(4, "0");
-}
-
-// --------------------------------------------------------------------------- risk classifier
-/*
- * Shared risk classifier. Given a command string and/or affected paths, return one of
- * 'critical' | 'high' | 'medium' | 'low' | 'info'. Rules mirror the V12 adaptation and
- * the seeded risks.json rule set.
- */
-const HIGH_ATTENTION_PATHS = ["auth", "middleware", "rls", "policy", "supabase/migrations"];
-const HIGH_OR_CRITICAL_COMMANDS = [
-  "rm -rf",
-  "git reset --hard",
-  "git checkout --",
-  "force push",
-  "push --force",
-  "drop table",
-  "truncate",
-];
-const SECRET_TOKENS = [".env", "secret", "token", "credential"];
-const MEDIUM_TOKENS = ["npm install", "npm i ", "yarn add", "pnpm add", "package install", "generated type", "type churn"];
-
-function classifyRisk({ command = "", paths = [], beforeTask0 = false } = {}) {
-  const cmd = String(command || "").toLowerCase();
-  const allPaths = (Array.isArray(paths) ? paths : [paths]).filter(Boolean).map((p) => String(p).toLowerCase());
-
-  // Product code edits before Task 0 verification => critical (hard guard).
-  if (beforeTask0 && allPaths.some((p) => p.includes("src/app/baseball"))) return "critical";
-
-  // Destructive / dangerous commands => high, escalate to critical for the worst.
-  for (const danger of HIGH_OR_CRITICAL_COMMANDS) {
-    if (cmd.includes(danger)) {
-      if (danger === "rm -rf" || danger === "git reset --hard" || danger === "drop table" || danger === "force push" || danger === "push --force") {
-        return "critical";
-      }
-      return "high";
-    }
-  }
-  // Broad delete heuristic.
-  if (/\bdelete\b.*\b(from|where 1=1|--all|\*)\b/.test(cmd) || cmd.includes("delete from")) return "high";
-
-  // Commands operating outside the repo root => high.
-  if (cmd && /(^|\s)(cd|rm|cp|mv)\s+\//.test(cmd) && !cmd.includes(REPO_ROOT.toLowerCase())) {
-    // a leading absolute path that is not the repo root
-    if (!cmd.includes("/users/ricknini/downloads/helmv3")) return "high";
-  }
-
-  // Secret/credential reads => high (treat as sensitive).
-  if (SECRET_TOKENS.some((t) => cmd.includes(t) || allPaths.some((p) => p.includes(t)))) return "high";
-
-  // High-attention paths (auth / middleware / rls / policy / migrations) => high.
-  if (allPaths.some((p) => HIGH_ATTENTION_PATHS.some((h) => p.includes(h)))) return "high";
-
-  // Package installs / generated type churn => medium.
-  if (MEDIUM_TOKENS.some((t) => cmd.includes(t))) return "medium";
-
-  return "info";
-}
-
-// --------------------------------------------------------------------------- git / repo facts
-/*
- * Repo facts computed via execFile (argument arrays, NEVER a shell), cwd=REPO_ROOT,
- * non-destructive read-only git commands, ~4s per-call timeout. Cached ~3s.
- */
-let repoCache = { ts: 0, data: null };
-
-function git(args) {
-  return new Promise((resolve) => {
-    execFile(
-      "git",
-      args,
-      { cwd: REPO_ROOT, timeout: 4000, maxBuffer: 4 * 1024 * 1024, windowsHide: true },
-      (err, stdout) => {
-        if (err) return resolve(null);
-        resolve(String(stdout || ""));
-      }
-    );
-  });
-}
-
-async function computeRepoFacts() {
-  const now = Date.now();
-  if (repoCache.data && now - repoCache.ts < 3000) return repoCache.data;
-
-  const safe = { branch: "unknown", dirty: [], changed_files: [], diffstat: "", last_commit: "" };
-
-  const [branchOut, statusOut, diffStatOut, nameOnlyOut, logOut] = await Promise.all([
-    git(["rev-parse", "--abbrev-ref", "HEAD"]),
-    git(["status", "--short"]),
-    git(["diff", "--stat"]),
-    git(["diff", "--name-only"]),
-    git(["log", "-1", "--oneline"]),
-  ]);
-
-  if (branchOut != null) safe.branch = branchOut.trim() || "unknown";
-
-  if (statusOut != null) {
-    safe.dirty = statusOut
-      .split("\n")
-      .map((l) => l.replace(/\r$/, ""))
-      .filter((l) => l.trim().length)
-      .map((l) => ({ status: l.slice(0, 2).trim(), path: l.slice(3).trim() }));
-  }
-
-  if (diffStatOut != null) safe.diffstat = diffStatOut.trimEnd();
-
-  if (nameOnlyOut != null) {
-    safe.changed_files = nameOnlyOut
-      .split("\n")
-      .map((l) => l.trim())
-      .filter(Boolean);
-  }
-
-  if (logOut != null) safe.last_commit = logOut.trim();
-
-  repoCache = { ts: now, data: safe };
-  return safe;
-}
-
-// --------------------------------------------------------------------------- aggregate state
-
-async function buildAggregateState() {
-  const state = readJSON(STATE_FILE, {});
-  const agents = readJSON(AGENTS_FILE, []);
-  const packets = readJSON(PACKETS_FILE, []);
-  const risks = readJSON(RISKS_FILE, { rules: {}, cards: [] });
-  const qa = readJSON(QA_FILE, { checks: [], honest_states: {} });
-  const decisions = readJSON(DECISIONS_FILE, []);
-  const artifacts = readJSON(ARTIFACTS_FILE, []);
-  const handoff = readJSON(HANDOFF_FILE, { status: "", read_order: [], next_actions: [], notes: [] });
-  const events = readEvents();
-  const repo = await computeRepoFacts();
-
-  // Attach live + child collections onto the aggregate.
-  const agg = {
-    ...state,
-    branch: repo.branch || state.branch || "unknown",
-    agents: Array.isArray(agents) ? agents : [],
-    packets: Array.isArray(packets) ? packets : [],
-    risks: risks && typeof risks === "object" ? risks : { rules: {}, cards: [] },
-    qa: qa && typeof qa === "object" ? qa : { checks: [], honest_states: {} },
-    decisions: Array.isArray(decisions) ? decisions : [],
-    artifacts: Array.isArray(artifacts) ? artifacts : [],
-    handoff: handoff && typeof handoff === "object" ? handoff : { next_actions: [], notes: [] },
-    repo,
-    loc: getLoc(),
-    counts: {
-      agents: Array.isArray(agents) ? agents.length : 0,
-      packets: Array.isArray(packets) ? packets.length : 0,
-      events: events.length,
-      risks: Array.isArray(risks?.cards) ? risks.cards.length : 0,
-      decisions: Array.isArray(decisions) ? decisions.length : 0,
-    },
-  };
-  return agg;
-}
-
-// --------------------------------------------------------------------------- SSE clients
-
-/** @type {Set<import('node:http').ServerResponse>} */
-const sseClients = new Set();
-
-function sseSend(res, event, dataObj) {
-  try {
-    res.write(`event: ${event}\n`);
-    res.write(`data: ${JSON.stringify(dataObj)}\n\n`);
-  } catch {
-    // dead client; will be cleaned on 'close'
-  }
-}
-
-/**
- * Internal append() helper — the single write path used by POST /api/events and
- * POST /hooks/claude. Writes the ndjson line AND broadcasts to all SSE clients.
- */
-function append(evt) {
-  appendEventLine(evt);
-  for (const client of sseClients) sseSend(client, "append", evt);
-  return evt;
-}
-
-// --------------------------------------------------------------------------- http utils
-
-const MIME = {
-  ".html": "text/html; charset=utf-8",
-  ".css": "text/css; charset=utf-8",
-  ".js": "text/javascript; charset=utf-8",
-  ".mjs": "text/javascript; charset=utf-8",
-  ".json": "application/json; charset=utf-8",
-  ".svg": "image/svg+xml",
-  ".md": "text/markdown; charset=utf-8",
-  ".ico": "image/x-icon",
-  ".png": "image/png",
-  ".jpg": "image/jpeg",
-  ".jpeg": "image/jpeg",
-  ".webp": "image/webp",
-  ".txt": "text/plain; charset=utf-8",
-};
-
-function sendJSON(res, status, obj) {
-  const body = JSON.stringify(obj);
-  res.writeHead(status, {
-    "content-type": "application/json; charset=utf-8",
-    "content-length": Buffer.byteLength(body),
-    "cache-control": "no-store",
-  });
-  res.end(body);
-}
-
-function sendText(res, status, text, type = "text/plain; charset=utf-8") {
-  res.writeHead(status, { "content-type": type, "cache-control": "no-store" });
-  res.end(text);
-}
-
-function notFound(res) {
-  sendText(res, 404, "Not found");
-}
-
-/** Read a request body as a string, capped to avoid abuse. */
-function readBody(req, limit = 2 * 1024 * 1024) {
-  return new Promise((resolve) => {
-    let data = "";
-    let aborted = false;
-    req.on("data", (chunk) => {
-      if (aborted) return;
-      data += chunk;
-      if (data.length > limit) {
-        aborted = true;
-        resolve(data.slice(0, limit));
-      }
-    });
-    req.on("end", () => {
-      if (!aborted) resolve(data);
-    });
-    req.on("error", () => resolve(aborted ? data : data));
-  });
-}
-
-// --------------------------------------------------------------------------- static serving (jailed)
-
-function serveStatic(reqPath, res) {
-  // Map "/" -> index.html
-  let rel = reqPath === "/" || reqPath === "" ? "/index.html" : reqPath;
-  // Decode + strip query already handled by caller.
-  try {
-    rel = decodeURIComponent(rel);
-  } catch {
-    return notFound(res);
-  }
-
-  // Resolve inside WEB_ROOT and reject traversal.
-  const resolved = path.normalize(path.join(WEB_ROOT, rel));
-  if (resolved !== WEB_ROOT && !resolved.startsWith(WEB_ROOT + path.sep)) {
-    return notFound(res); // path traversal attempt
-  }
-  // Defensive: never serve .env or dotfiles other than the allowed icon-less set.
-  if (path.basename(resolved).startsWith(".")) return notFound(res);
-
-  fs.stat(resolved, (err, stat) => {
-    if (err || !stat.isFile()) return notFound(res);
-    const ext = path.extname(resolved).toLowerCase();
-    const type = MIME[ext] || "application/octet-stream";
-    res.writeHead(200, { "content-type": type, "cache-control": "no-store" });
-    const stream = fs.createReadStream(resolved);
-    stream.on("error", () => {
-      if (!res.headersSent) notFound(res);
-      else res.end();
-    });
-    stream.pipe(res);
-  });
-}
-
-// --------------------------------------------------------------------------- API handlers
-
-async function handleState(res) {
-  const agg = await buildAggregateState();
-  sendJSON(res, 200, agg);
-}
-
-function handleEvents(res, url) {
-  const events = readEvents();
-  let limit = parseInt(url.searchParams.get("limit") || "400", 10);
-  if (!Number.isFinite(limit) || limit <= 0) limit = 400;
-  const tail = events.slice(-limit);
-  sendJSON(res, 200, tail);
-}
-
-async function handleRepo(res) {
-  const repo = await computeRepoFacts();
-  sendJSON(res, 200, repo);
-}
-
-function handleReplay(res) {
-  const replay = readJSON(REPLAY_FILE, { cursor: 0, speed: 1, filters: {} });
-  const count = readEvents().length;
-  sendJSON(res, 200, { ...replay, count });
-}
-
-function handleArtifacts(res) {
-  const artifacts = readJSON(ARTIFACTS_FILE, []);
-  sendJSON(res, 200, Array.isArray(artifacts) ? artifacts : []);
-}
-
-/** Apply the special side effects of a command_center_verified event. */
-function applyVerifiedSideEffects(ts) {
-  // 1) state.json task0_gate
-  const state = readJSON(STATE_FILE, {});
-  state.task0_gate = { ...(state.task0_gate || {}), verified: true, verified_at: ts, status: "open" };
-  state.updated_at = ts;
-  writeJSON(STATE_FILE, state);
-
-  // 2) work-packets.json — task-0 browser_verified + completion/status
-  const packets = readJSON(PACKETS_FILE, []);
-  if (Array.isArray(packets)) {
-    for (const p of packets) {
-      if (p && p.id === "task-0") {
-        p.checklist = { ...(p.checklist || {}), browser_verified: true };
-        p.completion_percent = Math.max(100, Number(p.completion_percent) || 0);
-        p.status = "done";
-        p.stage = "done";
-        p.updated_at = ts;
-      }
-    }
-    writeJSON(PACKETS_FILE, packets);
-  }
-
-  // 3) qa.json — chrome-verification check passed
-  const qa = readJSON(QA_FILE, { checks: [] });
-  if (Array.isArray(qa.checks)) {
-    for (const c of qa.checks) {
-      if (c && c.id === "chrome-verification") {
-        c.status = "passed";
-        c.last_run = ts;
-      }
-    }
-    qa.updated_at = ts;
-    writeJSON(QA_FILE, qa);
-  }
-}
-
-async function handlePostEvent(req, res) {
-  const raw = await readBody(req);
-  let body = {};
-  try {
-    body = raw ? JSON.parse(raw) : {};
-  } catch {
-    body = {};
-  }
-
-  const ts = new Date().toISOString();
-  const events = readEvents();
-  const id = nextEventId(events);
-
-  const pctNum = Number(body.pct);
-  const evt = {
-    id,
-    ts,
-    source: body.source || "manual",
-    type: body.type || "event",
-    agent: body.agent || null,
-    packet: body.packet || null,
-    title: body.title || "",
-    detail: body.detail || "",
-    severity: body.severity || "info",
-    ...(Number.isFinite(pctNum) ? { pct: pctNum } : {}),
-  };
-
-  // Special-case: verification event flips the Task 0 gate + linked records.
-  if (evt.type === "command_center_verified") {
-    applyVerifiedSideEffects(ts);
-  }
-  // Generic: progress/lifecycle events atomically raise the packet's building
-  // and mark the reporting agent active. Single-process => serialized, race-free.
-  applyProgressSideEffects(evt, ts);
-
-  append(evt);
-  sendJSON(res, 200, evt);
-}
-
-const PROGRESS_TYPES = new Set([
-  "packet_started", "packet_progress", "packet_completed", "packet_blocked", "packet_unblocked",
-  "file_changed", "migration_added", "table_touched", "route_touched", "test_passed",
-]);
-function applyProgressSideEffects(evt, ts) {
-  // 1) mark the reporting agent active (so its workers animate in the city)
-  if (evt.agent) {
-    const agents = readJSON(AGENTS_FILE, []);
-    if (Array.isArray(agents)) {
-      let changed = false;
-      for (const a of agents) {
-        if (a && a.id === evt.agent) {
-          if (evt.type !== "packet_completed") { a.status = "active"; a.heartbeat = "live"; }
-          a.last_update = ts;
-          if (evt.title) a.notes = evt.title;
-          changed = true;
-        }
-      }
-      if (changed) writeJSON(AGENTS_FILE, agents);
-    }
-  }
-  // 2) raise the packet building
-  const isProgress = PROGRESS_TYPES.has(evt.type) || Number.isFinite(evt.pct);
-  if (!isProgress || !evt.packet) return;
-  const packets = readJSON(PACKETS_FILE, []);
-  if (!Array.isArray(packets)) return;
-  let p = packets.find((x) => x && x.id === evt.packet);
-  if (!p) {
-    // auto-register a building for an unknown packet so live workflows (depth wave, verification,
-    // future expansion) actually show up in the city instead of being silently dropped.
-    p = { id: evt.packet, title: evt.title || evt.packet, short: String(evt.title || evt.packet).slice(0, 18),
-      weight: 6, owner_lane: evt.agent || "orchestrator", status: "active", district: "Component Foundry",
-      completion_percent: 0, confidence_percent: 0, stage: "in_progress", blocked_reason: null,
-      checklist: {}, created_at: ts, updated_at: ts };
-    packets.push(p);
-  }
-  const cur = Number(p.completion_percent) || 0;
-  if (evt.type === "packet_completed") { p.completion_percent = 100; p.status = "done"; p.stage = "done"; }
-  else if (evt.type === "packet_blocked") { p.status = "blocked"; p.blocked_reason = evt.detail || "blocked"; }
-  else if (evt.type === "packet_unblocked") { p.status = "active"; p.blocked_reason = null; }
-  else {
-    if (Number.isFinite(evt.pct)) p.completion_percent = Math.max(0, Math.min(100, evt.pct));
-    else if (evt.type === "packet_started") p.completion_percent = Math.max(cur, 20);
-    else p.completion_percent = Math.min(95, cur + 6); // generic nudge (file/route/table/test touches)
-    if ((p.completion_percent || 0) >= 100) { p.status = "done"; p.stage = "done"; }
-    else if (p.status !== "blocked") { p.status = "active"; p.stage = "in_progress"; }
-  }
-  p.updated_at = ts;
-  writeJSON(PACKETS_FILE, packets);
-}
-
-async function handleHook(req, res) {
-  // ALWAYS respond 200, even on bad input.
-  const raw = await readBody(req);
-  let payload = {};
-  try {
-    payload = raw ? JSON.parse(raw) : {};
-  } catch {
-    payload = {};
-  }
-  if (payload == null || typeof payload !== "object") payload = {};
-
-  const hookName =
-    payload.hook_event_name ||
-    payload?.payload?.hook_event_name ||
-    "hook";
-
-  // Extract a command + affected paths for the risk classifier where available.
-  const command =
-    payload.tool_input?.command ||
-    payload.command ||
-    payload?.payload?.tool_input?.command ||
-    "";
-  const paths = []
-    .concat(payload.tool_input?.file_path || [])
-    .concat(payload.tool_input?.paths || [])
-    .concat(payload.affected_paths || [])
-    .filter(Boolean);
-
-  // Is Task 0 still un-verified? (drives the product-code critical guard)
-  const state = readJSON(STATE_FILE, {});
-  const beforeTask0 = !state?.task0_gate?.verified;
-
-  const severity = classifyRisk({ command, paths, beforeTask0 });
-
-  const ts = new Date().toISOString();
-  const events = readEvents();
-  const id = nextEventId(events);
-
-  const detailBits = [];
-  if (command) detailBits.push(`cmd: ${String(command).slice(0, 160)}`);
-  if (paths.length) detailBits.push(`paths: ${paths.slice(0, 4).join(", ")}`);
-  if (payload.tool_name) detailBits.push(`tool: ${payload.tool_name}`);
-  const detail = detailBits.join(" · ") || "Claude Code hook received.";
-
-  const evt = {
-    id,
-    ts,
-    source: "claude-hook",
-    type: hookName,
-    agent: "claude-hook",
-    packet: payload.packet || null,
-    title: `Hook: ${hookName}`,
-    detail,
-    severity,
-    raw: payload, // preserve the original payload
-  };
-
-  append(evt);
-
-  // High/critical severities also land a card on risks.json.
-  if (severity === "high" || severity === "critical") {
-    const risks = readJSON(RISKS_FILE, { rules: {}, cards: [] });
-    if (!Array.isArray(risks.cards)) risks.cards = [];
-    risks.cards.push({
-      id: "risk-hook-" + id,
-      level: severity,
-      category: "hook",
-      title: `Hook flagged ${severity}: ${hookName}`,
-      status: "noted",
-      description: detail,
-      affected_paths: paths,
-      command: command || null,
-      checkpoint_ref: null,
-      timestamp: ts,
-      mitigation: "Review the flagged hook action before proceeding.",
-    });
-    writeJSON(RISKS_FILE, risks);
-  }
-
-  sendJSON(res, 200, { ok: true, event: evt });
-}
-
-async function handleSSE(req, res) {
-  res.writeHead(200, {
-    "content-type": "text/event-stream; charset=utf-8",
-    "cache-control": "no-cache",
-    connection: "keep-alive",
-    "x-accel-buffering": "no",
-  });
-
-  // Greet the client.
-  sseSend(res, "hello", { ts: new Date().toISOString(), port: server._chosenPort, uptime_s: Math.round((Date.now() - BOOT_TS) / 1000) });
-
-  sseClients.add(res);
-
-  // Periodic tick: repo facts + keep-alive comment.
-  const tick = setInterval(async () => {
-    try {
-      const repo = await computeRepoFacts();
-      sseSend(res, "tick", { repo });
-      res.write(":\n\n"); // keep-alive comment
-    } catch {
-      // ignore tick errors
-    }
-  }, 5000);
-
-  const cleanup = () => {
-    clearInterval(tick);
-    sseClients.delete(res);
-  };
-  req.on("close", cleanup);
-  req.on("error", cleanup);
-  res.on("error", cleanup);
-}
-
-// --------------------------------------------------------------------------- router
-
-const server = http.createServer(async (req, res) => {
-  let url;
-  try {
-    url = new URL(req.url, `http://${HOST}`);
-  } catch {
-    return notFound(res);
-  }
-  const pathname = url.pathname;
-  const method = req.method || "GET";
-
-  try {
-    // ---- API
-    if (method === "GET" && pathname === "/api/health") {
-      return sendJSON(res, 200, {
-        ok: true,
-        ts: new Date().toISOString(),
-        port: server._chosenPort,
-        uptime_s: Math.round((Date.now() - BOOT_TS) / 1000),
-        repo: REPO_ROOT,
-      });
-    }
-    if (method === "GET" && pathname === "/api/state") return await handleState(res);
-    if (method === "GET" && pathname === "/api/events") return handleEvents(res, url);
-    if (method === "GET" && pathname === "/api/repo") return await handleRepo(res);
-    if (method === "GET" && pathname === "/api/loc") return sendJSON(res, 200, getLoc());
-    if (method === "GET" && pathname === "/api/replay") return handleReplay(res);
-    if (method === "GET" && pathname === "/api/artifacts") return handleArtifacts(res);
-
-    if (method === "POST" && pathname === "/api/events") return await handlePostEvent(req, res);
-    if (method === "POST" && pathname === "/hooks/claude") return await handleHook(req, res);
-
-    // ---- SSE
-    if (method === "GET" && pathname === "/events") return await handleSSE(req, res);
-
-    // ---- static (GET/HEAD only)
-    if (method === "GET" || method === "HEAD") return serveStatic(pathname, res);
-
-    return notFound(res);
-  } catch (err) {
-    // Never crash the server on a single bad request.
-    if (!res.headersSent) sendJSON(res, 500, { ok: false, error: String(err && err.message ? err.message : err) });
-    else
-      try {
-        res.end();
-      } catch {
-        /* noop */
-      }
-  }
-});
-
-server._chosenPort = PORT_START;
-
-// --------------------------------------------------------------------------- listen with auto-increment
-
-function listenWithFallback(port) {
-  server.removeAllListeners("error");
-  server.once("error", (err) => {
-    if (err && err.code === "EADDRINUSE" && port < PORT_MAX) {
-      listenWithFallback(port + 1);
-    } else {
-      console.error(`[command-center] failed to bind ${HOST}:${port} — ${err && err.message}`);
-      process.exit(1);
-    }
-  });
-  server.listen(port, HOST, () => {
-    server._chosenPort = port;
-    const urlStr = `http://${HOST}:${port}`;
-    console.log(`\n  BaseballHelm Ultracode Command Center`);
-    console.log(`  → ${urlStr}`);
-    console.log(`  serving ${WEB_ROOT}`);
-    console.log(`  telemetry ${DATA_DIR}\n`);
-
-    // Write the chosen URL back into state.json.
-    const state = readJSON(STATE_FILE, {});
-    state.url = urlStr;
-    writeJSON(STATE_FILE, state);
-
-    // Log a boot event (write + broadcast through the shared append path).
-    const events = readEvents();
-    append({
-      id: nextEventId(events),
-      ts: new Date().toISOString(),
-      source: "server",
-      type: "command_center_server_started",
-      agent: "agent-city-systems",
-      packet: "task-0",
-      title: "Command center server started",
-      detail: `Listening on ${urlStr}`,
-      severity: "info",
-    });
-  });
-}
-
-listenWithFallback(PORT_START);
-
-// --------------------------------------------------------------------------- live LOC-delta emitter
-// Broadcasts a synthetic feed line whenever real (git-tracked) baseball code grows,
-// so the Agent Floor / City stream continuously DURING any build — tied to ACTUAL
-// file writes, regardless of how chatty the agents are. Ephemeral: broadcast-only
-// (never written to events.ndjson) so the persisted build log stays clean.
-let __locPrev = null;
-function broadcastEphemeral(evt) {
-  for (const client of sseClients) sseSend(client, "append", evt);
-}
-setInterval(() => {
-  try {
-    const loc = getLoc();
-    if (!loc || typeof loc.added !== "number") return;
-    if (__locPrev === null) { __locPrev = loc; return; } // seed baseline; no emit on first read
-    const dAdded = loc.added - __locPrev.added;
-    const dFiles = (loc.addedFiles || 0) - (__locPrev.addedFiles || 0);
-    if (dAdded <= 0) { __locPrev = loc; return; } // only emit on real growth
-    // which layer grew the most since the last read?
-    const prevCat = new Map((__locPrev.byCategory || []).map((c) => [c.key, c.lines]));
-    let topCat = null, topDelta = 0;
-    for (const c of loc.byCategory || []) {
-      const d = c.lines - (prevCat.get(c.key) || 0);
-      if (d > topDelta) { topDelta = d; topCat = c.key; }
-    }
-    const where = topCat ? ` · ${topCat} +${topDelta}` : "";
-    const fileWord = Math.abs(dFiles) === 1 ? "file" : "files";
-    broadcastEphemeral({
-      id: -1, // ephemeral marker (not persisted, never toasts)
-      ts: new Date().toISOString(),
-      source: "loc-tracker",
-      type: "packet_progress",
-      agent: "loc-tracker",
-      packet: "loc",
-      title: `+${dAdded.toLocaleString()} lines written${where}`,
-      detail: `${loc.total.toLocaleString()} total · ${dFiles > 0 ? dFiles + " " + fileWord + " touched" : "across the build"}`,
-      severity: "info",
-    });
-    __locPrev = loc;
-  } catch { /* ignore */ }
-}, 6000);
-
-// Graceful shutdown.
-function shutdown() {
-  for (const client of sseClients) {
-    try {
-      client.end();
-    } catch {
-      /* noop */
-    }
-  }
-  try {
-    server.close();
-  } catch {
-    /* noop */
-  }
-  process.exit(0);
-}
-process.on("SIGINT", shutdown);
-process.on("SIGTERM", shutdown);
diff --git a/scripts/baseballhelm-loc.mjs b/scripts/baseballhelm-loc.mjs
deleted file mode 100644
index ff582c004..000000000
--- a/scripts/baseballhelm-loc.mjs
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env node
-/* baseballhelm-loc.mjs — counts lines of CODE written for BaseballHelm.
-   "Written" = every NEW (untracked) file in the baseball footprint counted in
-   full, PLUS added lines in any tracked baseball file we modified (git numstat).
-   Excludes the vendored PixiJS (not ours), node_modules, .next, and non-code
-   files (docs/json/data). Exports computeLoc() for the command-center server;
-   also runs standalone to print a summary. Read-only; never touches a DB. */
-import { execFileSync } from "node:child_process";
-import { readFileSync } from "node:fs";
-import path from "node:path";
-
-const REPO = "/Users/ricknini/Downloads/helmv3";
-const CODE_EXT = new Set([".ts", ".tsx", ".js", ".mjs", ".cjs", ".jsx", ".css", ".scss", ".html", ".sql"]);
-
-function category(rel) {
-  if (rel.startsWith("tools/baseballhelm-command-center")) return "Command Center";
-  if (rel.startsWith("scripts/baseballhelm-")) return "Build scripts";
-  if (rel.startsWith("supabase/migrations")) return "Migrations";
-  if (rel.startsWith("supabase/tests")) return "RLS tests";
-  if (rel.startsWith("src/app/baseball")) return "App routes";
-  if (rel.startsWith("src/components/baseball")) return "Components";
-  if (rel.startsWith("src/lib/baseball") || rel === "src/lib/types/baseball-extended.ts") return "Libraries";
-  if (rel.startsWith("src/hooks")) return "Hooks";
-  return "Other";
-}
-function isBaseballCode(rel) {
-  if (!rel || rel.includes("/vendor/") || rel.includes("node_modules") || rel.includes("/.next/")) return false;
-  if (!CODE_EXT.has(path.extname(rel))) return false;
-  if (rel.startsWith("tools/baseballhelm-command-center")) return true;
-  if (rel.startsWith("scripts/baseballhelm-")) return true;
-  if (rel.startsWith("src/app/baseball")) return true;
-  if (rel.startsWith("src/components/baseball")) return true;
-  if (rel.startsWith("src/lib/baseball")) return true;
-  if (rel === "src/lib/types/baseball-extended.ts") return true;
-  if (rel.startsWith("src/hooks") && /baseball/i.test(rel)) return true;
-  if (rel.startsWith("supabase/migrations") && /baseball/i.test(rel)) return true;
-  if (rel.startsWith("supabase/tests") && /baseball/i.test(rel)) return true;
-  return false;
-}
-function git(args) {
-  try { return execFileSync("git", args, { cwd: REPO, maxBuffer: 1e8 }).toString(); } catch { return ""; }
-}
-function fileLineCount(rel) {
-  try { const t = readFileSync(path.join(REPO, rel), "utf8"); if (!t) return 0; return t.split("\n").length - (t.endsWith("\n") ? 1 : 0); } catch { return 0; }
-}
-
-// The BaseballHelm PRODUCT (app/components/lib/migrations/types) — excludes the
-// command-center build tooling + build scripts, which are the dashboard, not the app.
-function isBaseballProduct(rel) {
-  if (!isBaseballCode(rel)) return false;
-  if (rel.startsWith("tools/baseballhelm-command-center")) return false;
-  if (rel.startsWith("scripts/baseballhelm-")) return false;
-  return true;
-}
-
-// --- TOTAL PRODUCT COMPLETION estimate ---------------------------------------
-// Weighted across the WHOLE BaseballHelm subsystem inventory, not just the build
-// phases: existing shipped features (already work) + surfaces under active build
-// (live % from telemetry packets) + zip-mandated depth not started yet. Weights are
-// rough size/importance (1-10). An honest estimate, transparent + telemetry-driven.
-const SUBSYSTEMS = [
-  // shipped: already in the repo and working (existing BaseballHelm product)
-  { key: "Auth & onboarding", w: 8, shipped: 90 },
-  { key: "Roster & membership", w: 5, shipped: 92 },
-  { key: "Team management", w: 5, shipped: 90 },
-  { key: "Messaging", w: 4, shipped: 90 },
-  { key: "Calendar & events", w: 6, shipped: 88 },
-  { key: "Announcements", w: 2, shipped: 95 },
-  { key: "Tasks", w: 2, shipped: 95 },
-  { key: "Documents", w: 2, shipped: 95 },
-  { key: "Travel", w: 2, shipped: 90 },
-  { key: "Recruiting suite", w: 8, shipped: 90 },
-  { key: "Player profiles & public", w: 5, shipped: 88 },
-  { key: "Box scores & games", w: 4, shipped: 85 },
-  { key: "Basic stats", w: 4, shipped: 80 },
-  { key: "Development plans", w: 3, shipped: 85 },
-  { key: "Academics", w: 2, shipped: 80 },
-  // in build: live completion from the telemetry packets
-  { key: "Coach Command Center", w: 7, packet: "coach-command" },
-  { key: "Player Today", w: 5, packet: "player-today" },
-  { key: "Player timeline", w: 4, packet: "roster-timeline" },
-  { key: "Import Center", w: 7, packet: "source-registry" },
-  { key: "Stats Center", w: 6, packet: "stats-center" },
-  { key: "Practice Planner", w: 6, packet: "practice-planner" },
-  { key: "Performance / Lifting", w: 8, packet: "performance-os" },
-  { key: "Staff roles & invites", w: 6, packet: "staff-roles" },
-  { key: "Staff Decision Room", w: 5, packet: "decision-room" },
-  { key: "CoachHelm engine", w: 9, packet: "coachhelm-intel" },
-  { key: "Demo seed + QA", w: 4, packet: "qa-screens" },
-  // pending: zip-mandated depth subsystems (go live when the depth wave posts them)
-  { key: "Signal Inbox + actions", w: 6, packet: "signal-inbox" },
-  { key: "Source Trust UI", w: 4, packet: "source-trust" },
-  { key: "Postgame Action Review", w: 5, packet: "postgame-review" },
-  { key: "Practice Intelligence", w: 4, packet: "practice-intel" },
-  { key: "Practice Effectiveness", w: 4, packet: "practice-effectiveness" },
-  { key: "Elite stats + visuals", w: 8, packet: "elite-stats" },
-  { key: "Settings OS + variants", w: 4, packet: "settings-os" },
-  { key: "Video & classes", w: 4, packet: "video-classes" },
-  { key: "Player Passport", w: 4, packet: "player-passport" },
-  { key: "Premium lifting (V11)", w: 6, packet: "premium-lifting" },
-];
-function readPackets() {
-  try { return JSON.parse(readFileSync(path.join(REPO, ".ultracode/baseballhelm/work-packets.json"), "utf8")); } catch { return []; }
-}
-export function computeCompletion() {
-  const byId = new Map(readPackets().map((p) => [p.id, p]));
-  const groups = { shipped: { w: 0, c: 0 }, build: { w: 0, c: 0 }, pending: { w: 0, c: 0 } };
-  let wsum = 0, csum = 0;
-  for (const s of SUBSYSTEMS) {
-    let comp, grp;
-    if (typeof s.shipped === "number") { comp = s.shipped; grp = "shipped"; }
-    else if (s.packet && byId.has(s.packet)) { comp = byId.get(s.packet).completion_percent || 0; grp = "build"; }
-    else { comp = 0; grp = "pending"; }
-    wsum += s.w; csum += s.w * comp;
-    groups[grp].w += s.w; groups[grp].c += s.w * comp;
-  }
-  const g = (k) => groups[k].w ? Math.round(groups[k].c / groups[k].w) : 0;
-  return { pct: wsum ? Math.round(csum / wsum) : 0, shipped_pct: g("shipped"), build_pct: g("build"), pending_pct: g("pending"), subsystems: SUBSYSTEMS.length };
-}
-
-export function computeLoc() {
-  // --- TOTAL: every BaseballHelm product file (tracked + untracked), counted in full.
-  //     This is the real size of the product (~tens of thousands), not just this session.
-  const allFiles = new Set();
-  for (const rel of git(["ls-files"]).split("\n").filter(Boolean)) if (isBaseballProduct(rel)) allFiles.add(rel);
-  for (const rel of git(["ls-files", "--others", "--exclude-standard"]).split("\n").filter(Boolean)) if (isBaseballProduct(rel)) allFiles.add(rel);
-  const cats = {};
-  let total = 0;
-  for (const rel of allFiles) {
-    const n = fileLineCount(rel);
-    if (n <= 0) continue;
-    const c = category(rel);
-    if (!cats[c]) cats[c] = { files: 0, lines: 0 };
-    cats[c].files += 1; cats[c].lines += n; total += n;
-  }
-  // --- ADDED THIS BUILD: new (untracked) product files in full + added lines in modified ones.
-  let added = 0; const addedFiles = new Set();
-  for (const rel of git(["ls-files", "--others", "--exclude-standard"]).split("\n").filter(Boolean)) {
-    if (isBaseballProduct(rel)) { const n = fileLineCount(rel); if (n > 0) { added += n; addedFiles.add(rel); } }
-  }
-  for (const line of git(["diff", "--numstat", "HEAD"]).split("\n").filter(Boolean)) {
-    const [a, , rel] = line.split("\t");
-    if (rel && a !== "-" && isBaseballProduct(rel)) { const n = parseInt(a, 10) || 0; if (n > 0) { added += n; addedFiles.add(rel); } }
-  }
-  const byCategory = Object.entries(cats).map(([key, v]) => ({ key, files: v.files, lines: v.lines })).sort((a, b) => b.lines - a.lines);
-  const c = computeCompletion();
-  return { total, files: allFiles.size, added, addedFiles: addedFiles.size, byCategory, completion: c.pct, completionBreakdown: c, generated_at: new Date().toISOString() };
-}
-
-// CLI
-if (import.meta.url === `file://${process.argv[1]}`) {
-  const loc = computeLoc();
-  const pad = (s, n) => String(s).padEnd(n);
-  console.log("\n  BaseballHelm — lines of code written");
-  console.log("  ────────────────────────────────────");
-  for (const c of loc.byCategory) console.log(`  ${pad(c.key, 18)} ${pad(c.files + " files", 11)} ${c.lines.toLocaleString()} lines`);
-  console.log("  ────────────────────────────────────");
-  console.log(`  ${pad("TOTAL (product)", 18)} ${pad(loc.files + " files", 11)} ${loc.total.toLocaleString()} lines`);
-  console.log(`  ${pad("+ this build", 18)} ${pad(loc.addedFiles + " files", 11)} ${loc.added.toLocaleString()} lines added\n`);
-}
diff --git a/scripts/e2e-supabase-admin.ts b/scripts/e2e-supabase-admin.ts
new file mode 100644
index 000000000..e60206299
--- /dev/null
+++ b/scripts/e2e-supabase-admin.ts
@@ -0,0 +1,26 @@
+/**
+ * scripts/e2e-supabase-admin.ts
+ *
+ * Service-role Supabase client for E2E teardown-only writes (deleting rows a
+ * spec itself created). Same construction pattern as
+ * `scripts/seed-baseball-e2e.ts` — `NEXT_PUBLIC_SUPABASE_URL` +
+ * `SUPABASE_SERVICE_ROLE_KEY`, session-less.
+ *
+ * Lives in scripts/ (never bundled, Node-only) so no e2e spec file has to
+ * reference the service-role env var directly — the ast-grep rule
+ * `helmv3-no-service-role-key` forbids that outside admin-only paths.
+ *
+ * Returns `null` (callers' teardown becomes a no-op) rather than throwing
+ * when either env var is missing — cleanup must never fail an
+ * otherwise-passing run, and CI only exports `PLAYWRIGHT_BASEBALL_SEEDED=1`
+ * (which gates the specs that use this) alongside the service-role secret
+ * in the first place.
+ */
+import { createClient } from '@supabase/supabase-js';
+
+export function getE2eAdminClient() {
+  const url = (process.env.NEXT_PUBLIC_SUPABASE_URL ?? '').trim();
+  const key = (process.env.SUPABASE_SERVICE_ROLE_KEY ?? '').trim();
+  if (!url || !key) return null;
+  return createClient(url, key, { auth: { persistSession: false, autoRefreshToken: false } });
+}
diff --git a/scripts/seed-rini-baseball-demo.ts b/scripts/seed-rini-baseball-demo.ts
index 43b2c5da2..98ab50868 100644
--- a/scripts/seed-rini-baseball-demo.ts
+++ b/scripts/seed-rini-baseball-demo.ts
@@ -87,6 +87,56 @@ function dateDaysFromNow(days: number): string {
   return dateDaysAgo(-days);
 }
 
+// Team-local wall-clock time -> UTC instant, DST-safe. Mirrors the two-pass
+// offset-resolution algorithm in src/lib/baseball/daily-contract/contract-day.ts
+// (localMidnightUtcMs / tzOffsetMinutesAt) but self-contained here — those are
+// module-private, and this script only needs a fixed-clock variant of the same
+// idea (an arbitrary hh:mm instead of always midnight).
+//
+// THE GAP THIS CLOSES (Coherence Ruling 4): every seeded baseball_events row
+// previously set `end_time: isoDaysAgo(n)` == `start_time: isoDaysAgo(n)` —
+// literally the same instant, so every seeded event rendered as a
+// zero-duration block. It also anchored on the SERVER's UTC day
+// (`isoDaysAgo` mutates UTC date fields), not a real team-local wall-clock
+// time, so the seeded practice/game/meeting didn't land in a believable local
+// hour. This gives each event a realistic team-local start/end on its
+// intended calendar date, in the team's default tz (America/New_York — same
+// default `resolveTeamTimezone` falls back to when a team has no timezone
+// row).
+const TEAM_TZ = 'America/New_York';
+
+function tzOffsetMinutesAt(utcMs: number, tz: string): number {
+  const parts = new Intl.DateTimeFormat('en-US', {
+    timeZone: tz,
+    hourCycle: 'h23',
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+  }).formatToParts(new Date(utcMs));
+  const get = (type: string) => Number(parts.find((p) => p.type === type)?.value ?? NaN);
+  const asUtcMs = Date.UTC(
+    get('year'), get('month') - 1, get('day'), get('hour'), get('minute'), get('second'),
+  );
+  return (asUtcMs - utcMs) / 60_000;
+}
+
+/**
+ * UTC ISO instant for `hh:mm` team-local wall-clock time on `dateIso`
+ * (YYYY-MM-DD, itself a tz-independent bare calendar date from
+ * dateDaysAgo/dateDaysFromNow). DST-safe two-pass offset resolution.
+ */
+function localClockIso(dateIso: string, hh: number, mm: number, tz: string = TEAM_TZ): string {
+  const [y, m, d] = dateIso.split('-').map(Number);
+  const naiveGuessMs = Date.UTC(y, m - 1, d, hh, mm, 0);
+  const offset1 = tzOffsetMinutesAt(naiveGuessMs, tz);
+  const refinedGuessMs = naiveGuessMs - offset1 * 60_000;
+  const offset2 = tzOffsetMinutesAt(refinedGuessMs, tz);
+  return new Date(naiveGuessMs - offset2 * 60_000).toISOString();
+}
+
 // --- Upsert wrapper (tolerates missing schema by skipping) ------------------
 type Counts = Record<string, number>;
 const counts: Counts = {};
@@ -214,13 +264,16 @@ async function main() {
   await upsert('baseball_team_members', memberRows);
 
   // --- 4. Events ----------------------------------------------------------
+  // Team-local times (never a zero-duration start==end): practice 15:30-17:30,
+  // game 13:00-16:00, meeting 12:00-13:00, each anchored to its intended
+  // calendar date via localClockIso (America/New_York, DST-safe).
   const practiceEventId = detId('event:practice');
   const gameEventId = detId('event:game');
   const meetingEventId = detId('event:meeting');
   await upsert('baseball_events', [
-    { id: practiceEventId, team_id: TEAM_ID, created_by: COACH_ID, title: 'Team Practice — Defense + Live BP', description: 'Full-squad practice. Mandatory.', event_type: 'practice', location: 'Rini Field', start_time: isoDaysAgo(-1), end_time: isoDaysAgo(-1), is_mandatory: true },
-    { id: gameEventId, team_id: TEAM_ID, created_by: COACH_ID, title: 'vs Coastal State', description: 'Conference matchup.', event_type: 'game', location: 'Rini Field', start_time: isoDaysAgo(-3), end_time: isoDaysAgo(-3), is_mandatory: true },
-    { id: meetingEventId, team_id: TEAM_ID, created_by: COACH_ID, title: 'Team Meeting — Travel Logistics', description: 'Read receipts required.', event_type: 'meeting', location: 'Film Room', start_time: isoDaysAgo(-2), end_time: isoDaysAgo(-2), is_mandatory: true },
+    { id: practiceEventId, team_id: TEAM_ID, created_by: COACH_ID, title: 'Team Practice — Defense + Live BP', description: 'Full-squad practice. Mandatory.', event_type: 'practice', location: 'Rini Field', start_time: localClockIso(dateDaysFromNow(1), 15, 30), end_time: localClockIso(dateDaysFromNow(1), 17, 30), is_mandatory: true },
+    { id: gameEventId, team_id: TEAM_ID, created_by: COACH_ID, title: 'vs Coastal State', description: 'Conference matchup.', event_type: 'game', location: 'Rini Field', start_time: localClockIso(dateDaysFromNow(3), 13, 0), end_time: localClockIso(dateDaysFromNow(3), 16, 0), is_mandatory: true },
+    { id: meetingEventId, team_id: TEAM_ID, created_by: COACH_ID, title: 'Team Meeting — Travel Logistics', description: 'Read receipts required.', event_type: 'meeting', location: 'Film Room', start_time: localClockIso(dateDaysFromNow(2), 12, 0), end_time: localClockIso(dateDaysFromNow(2), 13, 0), is_mandatory: true },
   ]);
 
   // --- 5. Games (6 final + 2 scheduled) -----------------------------------
diff --git a/src/app/baseball/(coach-dashboard)/coach/layout.tsx b/src/app/baseball/(coach-dashboard)/coach/layout.tsx
deleted file mode 100644
index eae5bc223..000000000
--- a/src/app/baseball/(coach-dashboard)/coach/layout.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-'use client';
-
-import { BaseballShellLayout } from '@/components/baseball/BaseballShellLayout';
-
-export default function CoachDashboardLayout({ children }: { children: React.ReactNode }) {
-  return <BaseballShellLayout requiredRole="coach">{children}</BaseballShellLayout>;
-}
diff --git a/src/app/baseball/(coach-dashboard)/coach/template.tsx b/src/app/baseball/(coach-dashboard)/coach/template.tsx
deleted file mode 100644
index 1b932dfd8..000000000
--- a/src/app/baseball/(coach-dashboard)/coach/template.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-'use client';
-
-/**
- * Coach route template — retained for the coach route group shell boundary.
- *
- * The legacy per-coach-type pages under /baseball/coach/* were removed once the
- * canonical Fairway dashboard routes were wired. This template stays with the
- * group so any future coach-owned subroutes inherit the same reduced-motion
- * route reveal as the dashboard and player groups.
- *
- * Ported VERBATIM in spirit from the sibling templates
- * ((dashboard)/dashboard/template.tsx, (player-dashboard)/player/template.tsx),
- * which themselves track the GolfHelm route-reveal — same curve, same duration,
- * same opacity-only recipe — so all four BaseballHelm dashboard groups transition
- * identically. Do NOT diverge the recipe here; uniform motion across the groups is
- * the whole point of the fix.
- *
- * Self-contained motion provider: the BaseballDashboardShell does not mount a motion
- * provider, so this template wraps its own LazyMotion (tree-shaken `domAnimation`) +
- * MotionConfig. No shell edit required — the fix stays inside this group's file
- * ownership.
- *
- * Recipe — matches the canonical Fairway RouteTransition primitive EXACTLY:
- *   - Opacity-ONLY crossfade 0 → 1 over --fw-dur-base (280ms)
- *   - --fw-ease-glide = cubic-bezier(0.16, 1, 0.3, 1) (the iOS out-quint)
- *
- * Why opacity-only (no slide / no `will-change: transform`): a transform value — or
- * a persistent `will-change: transform` — establishes a CSS containing block, which
- * re-anchors every `position: fixed` descendant (peek panels, the mobile sidebar
- * overlay, any in-tree action bar) to THIS wrapper instead of the viewport. A pure
- * crossfade sidesteps that hazard entirely while staying premium on the glide curve.
- *
- * Keyed on pathname (NOT search params): switching a coach vertical's in-page mode
- * via query string (e.g. JUCO recruit↔team toggle, Showcase team selection) keeps
- * the same route segment, so it does NOT re-fire the reveal — only true cross-home
- * navigation crossfades, which is the intended behavior.
- *
- * Reduced-motion: honored TWO ways — MotionConfig reducedMotion="user" reads the OS
- * preference platform-wide, and useReducedMotion() collapses this reveal to a faster
- * linear fade. No baseball-specific in-app animation toggle exists yet, so the OS
- * preference is the source of truth.
- */
-
-import { LazyMotion, domAnimation, MotionConfig, m, useReducedMotion } from 'framer-motion';
-import { usePathname } from 'next/navigation';
-
-// --fw-ease-glide = cubic-bezier(0.16, 1, 0.3, 1); --fw-dur-base = 280ms.
-const GLIDE = [0.16, 1, 0.3, 1] as const;
-const DURATION = 0.28;
-
-export default function BaseballCoachDashboardTemplate({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  // No `strict` on LazyMotion: descendant pages may render the full `motion.*`
-  // component, which LazyMotion-strict forbids. Non-strict lets them load their own
-  // features while this template stays on the tree-shaken `m`.
-  return (
-    <LazyMotion features={domAnimation}>
-      <MotionConfig reducedMotion="user">
-        <RouteReveal>{children}</RouteReveal>
-      </MotionConfig>
-    </LazyMotion>
-  );
-}
-
-function RouteReveal({ children }: { children: React.ReactNode }) {
-  const prefersReducedMotion = useReducedMotion();
-  const pathname = usePathname();
-  return (
-    <m.div
-      key={pathname}
-      initial={prefersReducedMotion ? false : { opacity: 0 }}
-      animate={{ opacity: 1 }}
-      transition={
-        prefersReducedMotion
-          ? { duration: 0.18, ease: 'linear' }
-          : { duration: DURATION, ease: GLIDE }
-      }
-      className="min-h-full"
-      // No `will-change: transform` — opacity-only never needs it, and asserting it
-      // would create the containing block this recipe exists to avoid.
-      style={{ willChange: 'auto' }}
-    >
-      {children}
-    </m.div>
-  );
-}
diff --git a/src/app/baseball/(coach-dashboard)/error.tsx b/src/app/baseball/(coach-dashboard)/error.tsx
deleted file mode 100644
index fe552ad02..000000000
--- a/src/app/baseball/(coach-dashboard)/error.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-'use client';
-
-/**
- * Group-level error boundary for the coach dashboard route group.
- *
- * Catches render-time throws in ANY coach segment (college / high-school /
- * juco / showcase). These type-specific routes now redirect into the main
- * dashboard shell, but the group still needs a local boundary.
- *
- * The route group previously had no error.tsx at its root, so a render-time
- * throw bubbled unhandled past the group to the app root. This is the safety
- * net for stale bookmarks and transitional route failures.
- */
-
-import { RouteErrorBoundary } from '@/components/errors';
-
-export default function Error({
-  error,
-  reset,
-}: {
-  error: Error & { digest?: string };
-  reset: () => void;
-}) {
-  return (
-    <RouteErrorBoundary
-      error={error}
-      reset={reset}
-      route="/baseball/coach"
-      component="CoachDashboardSegment"
-      title="Something went wrong"
-      message="We couldn't load your dashboard. Please try again."
-      homePath="/baseball/coach"
-    />
-  );
-}
diff --git a/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx b/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx
index 5a36f8abf..a6a233e7c 100644
--- a/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx
+++ b/src/app/baseball/(dashboard)/BaseballFairwayShell.tsx
@@ -2,39 +2,32 @@
 
 /**
  * ============================================================================
- * BaseballFairwayShell  (ADDITIVE · FLAG-GATED) — Fairway migration Phase A
+ * BaseballFairwayShell — the ONE dashboard frame for BaseballHelm
  * ----------------------------------------------------------------------------
- * The flag-ON dashboard frame for the generic `/baseball/(dashboard)` route
- * group. Mirrors GolfHelm's `FairwayDashboardShell` playbook exactly: a full,
- * standalone replacement for the legacy shell composition (not a wrapper
- * around it) that renders the shared Fairway `<AppShell>` — the warm-black
- * recessive rail on desktop, a slide-in glass drawer on mobile, the one glass
- * top bar — in place of the legacy `BaseballDashboardShell`.
+ * Mounted unconditionally by the generic `/baseball/(dashboard)` and
+ * `/baseball/player` route-group layouts (Coherence Ruling 1, 2026-07-08 —
+ * see docs/baseball/COHERENCE_RULING_2026-07-08.md). Mirrors GolfHelm's
+ * `FairwayDashboardShell` playbook: renders the shared Fairway `<AppShell>` —
+ * the warm-black recessive rail on desktop, a slide-in glass drawer on
+ * mobile, the one glass top bar.
  *
  * PRESENTATION ONLY. No server actions, no RLS, no new reads beyond what the
  * existing baseball auth/nav hooks already resolve:
- *   - useBaseballAuth(requiredRole) — the SAME session/onboarding gate
- *     BaseballShellLayout uses for each mounted route group.
+ *   - useBaseballAuth(requiredRole) — the SAME session/onboarding gate every
+ *     mounted route group uses.
  *   - useBaseballNavContext()      — the SAME server-resolved capability map
- *     (nav-context.ts), so capability-gated verticals never fail-closed here
- *     when they wouldn't in the legacy shell.
+ *     (nav-context.ts), so capability-gated verticals never fail-closed here.
  *   - getVisibleBaseballNav()      — the #383 capability-gated nav-registry
  *     single source of truth (nav-registry.ts). NavSections are built from
  *     this, never a hardcoded route list, so this shell can't drift from (or
- *     duplicate) what Sidebar / MobileBottomNav / CommandPalette already read.
+ *     duplicate) what MobileBottomNav / CommandPalette already read.
  *
- * PROVIDER STACK — kept VERBATIM from BaseballShellLayout (the shared
- * composition point for all three BaseballHelm shell route groups): the same
- * SidebarProvider > SessionActivityProvider > LastSeenUpdater >
- * PeekPanelProvider nesting, unchanged. BaseballShellLayout.tsx itself is not
- * imported or edited — this file is a parallel, full duplicate of that
- * composition (same reason GolfHelm's FairwayDashboardShell duplicates
- * GolfDashboardShell's stack rather than wrapping it).
- *
- * Mounted ONLY behind isRedesignEnabled() in the Baseball dashboard/player
- * route-group layouts. Flag OFF renders the legacy `BaseballShellLayout` →
- * `BaseballDashboardShell`, byte-for-byte unchanged.
+ * PROVIDER STACK: SidebarProvider > SessionActivityProvider > LastSeenUpdater
+ * > PeekPanelProvider — the same nesting the legacy `BaseballShellLayout` /
+ * `BaseballDashboardShell` composition used before it was deleted (Ruling 1 /
+ * Ruling 5). This file is the sole surviving shell for BaseballHelm.
  *
+
  * The AppShell drawer (`mobileOpen`) is BRIDGED to the SAME SidebarContext
  * every legacy baseball page's own menu button already calls `setMobileOpen`
  * against, so a not-yet-migrated page opens the SAME drawer. One nav surface,
@@ -47,7 +40,7 @@ import Link from 'next/link';
 import { usePathname, useRouter } from 'next/navigation';
 
 import { AppShell, FairwayBottomNav, useSidebarCollapsed } from '@/components/fairway/app-shell';
-import type { Breadcrumb, NavItem, NavSection, ShellLinkComponent } from '@/components/fairway/app-shell';
+import type { NavItem, NavSection, ShellLinkComponent } from '@/components/fairway/app-shell';
 
 import { SidebarProvider, useSidebar } from '@/contexts/sidebar-context';
 import { SessionActivityProvider } from '@/components/providers/SessionActivityProvider';
@@ -88,6 +81,11 @@ import {
 } from '@/app/baseball/(dashboard)/_components/resolve-active-hub';
 import { HubSubNav } from '@/app/baseball/(dashboard)/_components/hub-sub-nav';
 import type { HubSubNavTab } from '@/app/baseball/(dashboard)/_components/hub-sub-nav';
+import {
+  BreadcrumbLabelProvider,
+  useBreadcrumbLabel,
+} from '@/app/baseball/(dashboard)/_components/breadcrumb-label';
+import { buildBreadcrumbs } from '@/app/baseball/(dashboard)/_components/breadcrumbs';
 import { IconSettings, IconLogout, IconHome, IconUsers, IconCalendar } from '@/components/icons';
 import { Button } from '@/components/ui/button';
 import { cn } from '@/lib/utils';
@@ -104,14 +102,20 @@ type Role = 'coach' | 'player';
 /**
  * P413-equivalent: mobile bottom-tab destinations derived from the SAME hub
  * sections as the desktop rail so active states agree across breakpoints.
- * Golf FairwayDashboardShell uses the same pattern (5 tabs, hub activeMatch).
+ * Golf FairwayDashboardShell uses the same pattern (hub activeMatch).
+ *
+ * Ruling 2 (item 8): exactly the top 3 highest-frequency destinations per
+ * role — the mobile drawer (opened via the top bar's hamburger, bridged to
+ * the SAME SidebarContext this shell renders) is the "+ More" the ruling
+ * describes, not a 4th bottom-tab button, so 3 named + the always-present
+ * hamburger covers every remaining hub.
  */
 function buildBottomNavFromSections(sections: NavSection[], role: Role): NavItem[] {
   const items = sections.flatMap((section) => section.items);
   const preferredLabels =
     role === 'coach'
-      ? (['Dashboard', 'Team', 'Stats & Performance', 'Messages'] as const)
-      : (['Today', 'Stats', 'Development', 'Team', 'Messages'] as const);
+      ? (['Dashboard', 'Team', 'Stats & Performance'] as const)
+      : (['Today', 'Schedule', 'Messages'] as const);
 
   const picked = preferredLabels
     .map((label) => items.find((item) => item.label === label))
@@ -258,23 +262,38 @@ function buildCoachHubSections(ctx: BaseballNavContext, unreadCount: number): Na
         href: visibleTabs[0]!.href,
         icon: def.icon as unknown as NavItem['icon'],
         tabs: visibleTabs,
+        // Messages is now a real hub (Ruling 2: Messages · Announcements) —
+        // the unread badge is the one piece of state that stays outside the
+        // registry-derived tab list, so it's threaded in here by hub id.
+        badge: hubId === 'messages' && unreadCount > 0 ? unreadCount : undefined,
       }),
     );
-
-    // Messages is the persistent cross-cutting slot, outside the hub registry.
-    if (hubId === 'dashboard') {
-      items.push(toNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined, [BASEBALL_MESSAGES_NAV.href]));
-    }
   }
 
   return [{ heading: 'Baseball', items }];
 }
 
+/**
+ * The Messages hub rail item (Ruling 2: a real hub with an Announcements
+ * subtab, not a bare flat link) — shared by the showcase org/team rails below
+ * so a showcase coach's Messages click ALSO opens the sub-nav strip, exactly
+ * like the main coach rail's (`buildCoachHubSections`) Messages entry.
+ */
+function messagesNavItem(unreadCount: number): NavItem {
+  return playerHubToNavItem({
+    label: COACH_HUB_DEFS.messages.label,
+    href: COACH_HUB_DEFS.messages.tabs[0]!.href,
+    icon: COACH_HUB_DEFS.messages.icon as unknown as NavItem['icon'],
+    tabs: COACH_HUB_DEFS.messages.tabs,
+    badge: unreadCount > 0 ? unreadCount : undefined,
+  });
+}
+
 /**
  * Showcase ORG-level rail (no team selected yet) — the documented two-level
  * org→team exception (COACH_NAV_8TAB_PROPOSAL.md): org-wide Dashboard/Teams/
  * Events, mirroring src/components/layout/sidebar.tsx's `showcaseOrgNav`
- * exactly (same routes/icons/order), plus the persistent Messages slot.
+ * exactly (same routes/icons/order), plus the persistent Messages hub.
  */
 function buildShowcaseOrgSections(unreadCount: number): NavSection[] {
   return [
@@ -284,7 +303,7 @@ function buildShowcaseOrgSections(unreadCount: number): NavSection[] {
         { label: 'Dashboard', href: '/baseball/dashboard/organization', icon: IconHome },
         { label: 'Teams', href: '/baseball/dashboard/teams', icon: IconUsers },
         { label: 'Events', href: '/baseball/dashboard/events', icon: IconCalendar },
-        toNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined, [BASEBALL_MESSAGES_NAV.href]),
+        messagesNavItem(unreadCount),
       ],
     },
   ];
@@ -309,7 +328,7 @@ function buildShowcaseTeamSections(ctx: BaseballNavContext, unreadCount: number)
         tabs: dashboardTabs,
       }),
     );
-    items.push(toNavItem(BASEBALL_MESSAGES_NAV, unreadCount > 0 ? unreadCount : undefined, [BASEBALL_MESSAGES_NAV.href]));
+    items.push(messagesNavItem(unreadCount));
   }
   for (const hubId of ['team', 'stats-performance', 'development'] as const) {
     const def = COACH_HUB_DEFS[hubId];
@@ -328,30 +347,10 @@ function buildShowcaseTeamSections(ctx: BaseballNavContext, unreadCount: number)
   return [{ heading: 'Baseball', items }];
 }
 
-function toTitle(seg: string): string {
-  return seg.replace(/-/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase());
-}
-
-/**
- * Breadcrumb label resolved against the SAME registry (never a second
- * hardcoded route→label map) — the longest href the pathname matches wins.
- */
-function buildBreadcrumbs(pathname: string, ctx: BaseballNavContext, homeHref: string): Breadcrumb[] {
-  if (pathname === homeHref) return [{ label: 'Dashboard' }];
-
-  const candidates: { href: string; label: string }[] = [
-    ...getVisibleBaseballNav(ctx).map((e) => ({ href: e.href, label: e.label })),
-    { href: BASEBALL_MESSAGES_NAV.href, label: BASEBALL_MESSAGES_NAV.label },
-  ];
-  let best: { href: string; label: string } | null = null;
-  for (const c of candidates) {
-    if (pathname === c.href || pathname.startsWith(`${c.href}/`)) {
-      if (!best || c.href.length > best.href.length) best = c;
-    }
-  }
-  const lastSegment = pathname.split('/').filter(Boolean).pop() ?? 'Page';
-  return [{ label: 'Dashboard', href: homeHref }, { label: best?.label ?? toTitle(lastSegment) }];
-}
+// buildBreadcrumbs lives in ./_components/breadcrumbs.ts — a pure module
+// (no React/hooks) so it can be unit-tested without importing this whole
+// 'use client' shell file. See its doc comment for the UUID/numeric-id
+// guard + override-label precedence (Ruling 4).
 
 /** BaseballHelm wordmark for the rail header — hides text in icon-only mode. */
 function Brand({ homeHref }: { homeHref: string }) {
@@ -478,7 +477,14 @@ function BaseballFairwayContent({
     }
     return buildCoachHubSections(ctx, unreadCount);
   }, [ctx, unreadCount, role, isShowcaseCoach, selectedTeam]);
-  const breadcrumbs = useMemo(() => buildBreadcrumbs(pathname, ctx, homeHref), [pathname, ctx, homeHref]);
+  // Real record name a dynamic detail page has already fetched (player name,
+  // opponent, plan title, …), registered via the breadcrumb-label override
+  // channel — see breadcrumb-label.tsx and buildBreadcrumbs' doc comment.
+  const breadcrumbOverride = useBreadcrumbLabel(pathname);
+  const breadcrumbs = useMemo(
+    () => buildBreadcrumbs(pathname, ctx, homeHref, breadcrumbOverride),
+    [pathname, ctx, homeHref, breadcrumbOverride],
+  );
   const activeHub = resolveActiveHub({
     pathname,
     role,
@@ -564,15 +570,15 @@ function BaseballFairwayContent({
         </div>
       </AppShell>
 
-      {/* Same global the legacy BaseballDashboardShell mounts unconditionally. */}
+      {/* The one global CommandPalette mount for the whole shell. */}
       <CommandPalette navContext={ctx} />
     </div>
   );
 }
 
 /**
- * Exported shell — full standalone replacement for BaseballShellLayout (auth
- * gate + provider stack + shell), rendering the Fairway AppShell frame.
+ * Exported shell — auth gate + provider stack + shell, rendering the Fairway
+ * AppShell frame. The only shell BaseballHelm renders.
  */
 export function BaseballFairwayShell({
   children,
@@ -583,10 +589,9 @@ export function BaseballFairwayShell({
   authVerified?: boolean;
   requiredRole?: Role | null;
 }) {
-  // SAME auth gate BaseballShellLayout uses for the mounted route group.
+  // Session/onboarding gate for the mounted route group.
   const { loading, authorized, role } = useBaseballAuth(requiredRole);
-  // SAME server-resolved capability map (nav-context.ts) BaseballShellLayout
-  // passes into BaseballDashboardShell.
+  // Server-resolved capability map (nav-context.ts) driving the nav sections.
   const { navContext } = useBaseballNavContext();
 
   if (!authVerified && (loading || !authorized)) {
@@ -600,15 +605,18 @@ export function BaseballFairwayShell({
       <SessionActivityProvider>
         <LastSeenUpdater />
         {/* Render-null: fetches the program's brand + applies it as CSS vars /
-            data attrs on <html>. Mounted here too — this is a full parallel
-            duplicate of BaseballShellLayout's provider stack (not a wrapper),
-            so branding would otherwise silently die whenever the redesign
-            flag is on for this route group. */}
+            data attrs on <html> so persisted branding (settings/appearance)
+            actually takes visible effect. */}
         <BaseballProgramBrand />
         <PeekPanelProvider>
-          <BaseballFairwayContent role={resolvedRole} navContext={navContext ?? undefined}>
-            {children}
-          </BaseballFairwayContent>
+          {/* Breadcrumb-label override channel (Ruling 4) — wraps BOTH the
+              shell chrome (reader, via useBreadcrumbLabel) and `children`
+              (writer, via <BreadcrumbLabel/>) in one context instance. */}
+          <BreadcrumbLabelProvider>
+            <BaseballFairwayContent role={resolvedRole} navContext={navContext ?? undefined}>
+              {children}
+            </BaseballFairwayContent>
+          </BreadcrumbLabelProvider>
         </PeekPanelProvider>
       </SessionActivityProvider>
     </SidebarProvider>
diff --git a/src/app/baseball/(dashboard)/_components/breadcrumb-label.tsx b/src/app/baseball/(dashboard)/_components/breadcrumb-label.tsx
new file mode 100644
index 000000000..0bc187b91
--- /dev/null
+++ b/src/app/baseball/(dashboard)/_components/breadcrumb-label.tsx
@@ -0,0 +1,88 @@
+'use client';
+
+// =============================================================================
+// breadcrumb-label.tsx — the minimal label-override channel for the shell's
+// top-bar breadcrumb trail (COHERENCE_RULING_2026-07-08.md Ruling 4).
+//
+// PROBLEM: BaseballFairwayShell's buildBreadcrumbs derives every crumb from
+// the nav registry / URL segments alone. That works for static routes, but a
+// dynamic detail route (players/[id], stats/games/[gameId], dev-plans/[id])
+// has no registry entry for the record itself — only the page component,
+// already fetching the record server-side, knows the real name.
+//
+// MECHANISM: a tiny context keyed by PATHNAME (not a single "current" slot),
+// so a stale label from a page a user just navigated away from can never leak
+// onto the next route regardless of unmount/mount ordering. Detail pages
+// render <BreadcrumbLabel name={...} /> once they have the record; it renders
+// nothing and registers the label under `usePathname()` for the shell to read
+// via `useBreadcrumbLabel(pathname)`. No new state library — just context +
+// two hooks, mirroring the render-null mount pattern already used by
+// BaseballProgramBrand.
+// =============================================================================
+
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import { usePathname } from 'next/navigation';
+
+interface BreadcrumbLabelContextValue {
+  labels: Readonly<Record<string, string>>;
+  setLabel: (pathname: string, name: string) => void;
+  clearLabel: (pathname: string) => void;
+}
+
+const BreadcrumbLabelContext = createContext<BreadcrumbLabelContextValue | null>(null);
+
+/** Mounted once by BaseballFairwayShell, above both the shell chrome (reader)
+ *  and `{children}` (writer) so both sides share one context instance. */
+export function BreadcrumbLabelProvider({ children }: { children: React.ReactNode }) {
+  const [labels, setLabels] = useState<Readonly<Record<string, string>>>({});
+
+  const setLabel = useCallback((pathname: string, name: string) => {
+    setLabels((prev) => (prev[pathname] === name ? prev : { ...prev, [pathname]: name }));
+  }, []);
+
+  const clearLabel = useCallback((pathname: string) => {
+    setLabels((prev) => {
+      if (!(pathname in prev)) return prev;
+      const next = { ...prev };
+      delete next[pathname];
+      return next;
+    });
+  }, []);
+
+  const value = useMemo(() => ({ labels, setLabel, clearLabel }), [labels, setLabel, clearLabel]);
+
+  return <BreadcrumbLabelContext.Provider value={value}>{children}</BreadcrumbLabelContext.Provider>;
+}
+
+/** Shell-side read: the override label registered for the CURRENT pathname, if any. */
+export function useBreadcrumbLabel(pathname: string | null): string | undefined {
+  const ctx = useContext(BreadcrumbLabelContext);
+  if (!ctx || !pathname) return undefined;
+  return ctx.labels[pathname];
+}
+
+/**
+ * Page-side write: render this once the real record name is known (player
+ * name, opponent, plan title, …) so the shell's breadcrumb trail shows it
+ * instead of falling back to a generic hub label. Renders nothing. Registers
+ * under the CURRENT route only and de-registers on unmount/name-change, so
+ * navigating away never leaves a stale label for another route to pick up.
+ */
+export function BreadcrumbLabel({ name }: { name: string | null | undefined }) {
+  const pathname = usePathname();
+  const ctx = useContext(BreadcrumbLabelContext);
+  // Depend on the individual (stable, useCallback-memoized) setters rather
+  // than the whole context value — `value` gets a new identity every time
+  // ANY page's label changes (shared `labels` state), which would otherwise
+  // re-fire this effect for every unrelated label update.
+  const setLabel = ctx?.setLabel;
+  const clearLabel = ctx?.clearLabel;
+
+  useEffect(() => {
+    if (!setLabel || !clearLabel || !pathname || !name) return;
+    setLabel(pathname, name);
+    return () => clearLabel(pathname);
+  }, [setLabel, clearLabel, pathname, name]);
+
+  return null;
+}
diff --git a/src/app/baseball/(dashboard)/_components/breadcrumbs.ts b/src/app/baseball/(dashboard)/_components/breadcrumbs.ts
new file mode 100644
index 000000000..b58cb3e5f
--- /dev/null
+++ b/src/app/baseball/(dashboard)/_components/breadcrumbs.ts
@@ -0,0 +1,81 @@
+// =============================================================================
+// breadcrumbs.ts — pure breadcrumb-trail builder for BaseballFairwayShell
+// (COHERENCE_RULING_2026-07-08.md Ruling 4).
+//
+// Split out from BaseballFairwayShell.tsx (a 'use client' component file
+// importing React/hooks/next-navigation) so this logic can be unit-tested
+// directly without dragging in the whole shell's client-only dependency
+// graph. Pure — no React, no Supabase, no 'use client'.
+// =============================================================================
+
+import type { Breadcrumb } from '@/components/fairway/app-shell';
+import {
+  getVisibleBaseballNav,
+  BASEBALL_MESSAGES_NAV,
+  type BaseballNavContext,
+} from '@/lib/baseball/nav-registry';
+
+export function toTitle(seg: string): string {
+  return seg.replace(/-/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase());
+}
+
+/** Naive English singularize (strip one trailing non-"ss" "s") — good enough
+ *  for route nouns like "players"/"games"/"programs", never applied to a
+ *  user-visible record name (only to a URL segment as a last-resort label). */
+export function singularize(seg: string): string {
+  if (seg.length > 1 && seg.endsWith('s') && !seg.endsWith('ss')) return seg.slice(0, -1);
+  return seg;
+}
+
+/** A UUID (any version) or a purely-numeric id — the shapes Supabase primary
+ *  keys and route params take. Ruling 4: these must NEVER be title-cased into
+ *  a breadcrumb crumb (e.g. "5e03752b D7fe 5e31 Ab39 F588ba3649d2"). */
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+export function isIdShapedSegment(segment: string): boolean {
+  return UUID_RE.test(segment) || /^\d+$/.test(segment);
+}
+
+/**
+ * Breadcrumb label resolved against the SAME registry (never a second
+ * hardcoded route→label map) — the longest href the pathname matches wins.
+ *
+ * `overrideLabel` (from the breadcrumb-label override channel — see
+ * breadcrumb-label.tsx) is the real record name a dynamic detail page has
+ * already fetched (player name, opponent, plan title, …); it wins whenever
+ * present. When the trailing URL segment is UUID/numeric-id-shaped and no
+ * override has been supplied yet (or ever, for routes that don't wire one),
+ * the crumb falls back to the owning nav entry's label, and only as a last
+ * resort to a singularized, title-cased form of the segment BEFORE the id
+ * (e.g. "players/<uuid>" → "Player", "games/<uuid>" → "Game") — never the
+ * raw id itself.
+ */
+export function buildBreadcrumbs(
+  pathname: string,
+  ctx: BaseballNavContext,
+  homeHref: string,
+  overrideLabel?: string,
+): Breadcrumb[] {
+  if (pathname === homeHref) return [{ label: 'Dashboard' }];
+
+  const candidates: { href: string; label: string }[] = [
+    ...getVisibleBaseballNav(ctx).map((e) => ({ href: e.href, label: e.label })),
+    { href: BASEBALL_MESSAGES_NAV.href, label: BASEBALL_MESSAGES_NAV.label },
+  ];
+  let best: { href: string; label: string } | null = null;
+  for (const c of candidates) {
+    if (pathname === c.href || pathname.startsWith(`${c.href}/`)) {
+      if (!best || c.href.length > best.href.length) best = c;
+    }
+  }
+
+  const segments = pathname.split('/').filter(Boolean);
+  const lastSegment = segments[segments.length - 1] ?? 'Page';
+
+  if (isIdShapedSegment(lastSegment)) {
+    const parentSegment = segments[segments.length - 2];
+    const fallback = best?.label ?? (parentSegment ? toTitle(singularize(parentSegment)) : 'Details');
+    return [{ label: 'Dashboard', href: homeHref }, { label: overrideLabel ?? fallback }];
+  }
+
+  return [{ label: 'Dashboard', href: homeHref }, { label: overrideLabel ?? best?.label ?? toTitle(lastSegment) }];
+}
diff --git a/src/app/baseball/(dashboard)/_components/hub-definitions.ts b/src/app/baseball/(dashboard)/_components/hub-definitions.ts
index 3a6c93d37..f210cbaee 100644
--- a/src/app/baseball/(dashboard)/_components/hub-definitions.ts
+++ b/src/app/baseball/(dashboard)/_components/hub-definitions.ts
@@ -13,24 +13,31 @@
 // COACH_NAV_8TAB_PROPOSAL.md (approved 2026-07-01) — DERIVED, NOT HAND-LISTED:
 // every COACH_*_TABS array below is built by grouping BASEBALL_NAV_REGISTRY on
 // its `hub` field (nav-registry.ts), not by hand-maintaining a parallel route
-// list. That is what fixed the drift the proposal documented: 5 registered
-// features with no hub-tab entry anywhere (camps, postgame-review,
-// practice-effectiveness, practice-planner, comparisons), a phantom coach
-// `tasks` tab with no coach-visible registry row, and a player-only
-// `college-interest` leaking into the coach recruiting hub. Labels, icons,
-// requiredCapability/requiredAnyCapabilities, and allowedProgramTypes are all
-// read from the registry entry verbatim — never re-declared here, so they can
-// never drift from the registry again. The only hand-maintained data left is
-// (a) each hub's DISPLAY ORDER (a small id list; entries not listed simply fall
-// to the end in registry order — nothing can be silently dropped), and (b) a
-// handful of SUPPLEMENTARY leaf tabs (Stats Center's Games/Season/Upload,
-// Performance's Live/Programs/Groups/Builder) that are child pages of a
-// registry feature, not registry features in their own right.
+// list. Labels, icons, requiredCapability/requiredAnyCapabilities, and
+// allowedProgramTypes are all read from the registry entry verbatim — never
+// re-declared here, so they can never drift from the registry again. The only
+// hand-maintained data left is (a) each hub's DISPLAY ORDER (a small id list;
+// entries not listed simply fall to the end in registry order), and (b) ONE
+// supplementary leaf tab (Stats Center's "Games" — a child page of a registry
+// feature, not a registry feature in its own right).
+//
+// HARD CAP (COHERENCE_RULING_2026-07-08.md Ruling 2): every hub renders AT
+// MOST 3 sub-tabs, for every coach type. The mechanism is `hub` +
+// `foldedUnder` on nav-registry.ts entries: a registry entry declares
+// `foldedUnder: <id>` to mark itself as reachable ONLY from its parent's
+// LANDING PAGE (a card grid — see dashboard/operations and dashboard/scouting)
+// rather than as its own rendered sub-tab. `hubEntries()` below excludes any
+// entry carrying `foldedUnder` from the rendered array; the folded entry KEEPS
+// its own registry row, so command palette and deep links still resolve it,
+// and the parent landing entry's `matchPrefixes` (nav-registry.ts) still
+// route `resolve-active-hub.ts` to the right hub + subtab when a user is on
+// the folded destination directly. nav-manifest.test.ts locks both halves of
+// this contract (≤3 rendered tabs; every folded href still resolves a hub).
 //
 // PLAYER_*_TABS are intentionally NOT derived the same way: most player-only
 // registry entries (player-dev-plan, player-lift, player-readiness, etc.) carry
 // no `hub` field (hub is only required for role coach/both — see nav-registry.ts),
-// so they stay hand-maintained here, unchanged by this pass.
+// so they stay hand-maintained here, trimmed to the same ≤3 cap by hand.
 //
 // PURE DATA + ICONS. No 'use client' / 'use server', no Supabase, no React state —
 // safe to import from both the client sidebar and the client hub layouts.
@@ -46,24 +53,18 @@ import {
   IconChartBar,
   IconClipboardList,
   IconTrendingUp,
-  IconUpload,
   IconTarget,
-  IconVideo,
-  IconDumbbell,
-  IconGauge,
   IconShieldCheck,
   IconBuilding,
   IconStar,
   IconHome,
   IconUser,
   IconGraduationCap,
-  IconSettings,
-  IconLock,
-  IconDatabase,
 } from '@/components/icons';
 import type { HubSubNavTab } from './hub-sub-nav';
 import {
   BASEBALL_NAV_REGISTRY,
+  BASEBALL_MESSAGES_NAV,
   type BaseballNavEntry,
   type BaseballNavHub,
   type BaseballNavIcon,
@@ -78,7 +79,10 @@ import {
 function toHubTab(entry: BaseballNavEntry): HubSubNavTab {
   return {
     id: entry.id,
-    label: entry.label,
+    // hubTabLabel overrides the canonical label ONLY inside the sub-nav
+    // strip (Ruling 2 — e.g. "Performance" reads "Training" here, unchanged
+    // everywhere else); falls back to the canonical label otherwise.
+    label: entry.hubTabLabel ?? entry.label,
     href: entry.href,
     icon: entry.icon,
     requiredCapability: entry.requiredCapability ?? undefined,
@@ -89,15 +93,18 @@ function toHubTab(entry: BaseballNavEntry): HubSubNavTab {
 }
 
 /**
- * Every coach/both registry entry tagged for `hub`, converted to tabs. `team`
- * is always excluded — it is the legacy `/dashboard/team` alias (hub:
- * 'dashboard' for the registry invariant, but its href is an exact duplicate
- * of `command-center` for coaches), never a distinct destination worth a tab.
+ * Every coach/both registry entry tagged for `hub`, converted to tabs.
+ * Excludes two kinds of entries from the RENDERED strip (both keep their own
+ * registry row — see the module header):
+ *   - `team`: the legacy `/dashboard/team` alias (hub: 'dashboard' for the
+ *     registry invariant, but its href is an exact duplicate of
+ *     `command-center` for coaches) — never a distinct destination.
+ *   - anything carrying `foldedUnder`: Ruling 2's ≤3-subtabs mechanism.
  */
 function hubEntries(hub: BaseballNavHub): HubSubNavTab[] {
-  return BASEBALL_NAV_REGISTRY.filter((e) => e.hub === hub && e.role !== 'player' && e.id !== 'team').map(
-    toHubTab,
-  );
+  return BASEBALL_NAV_REGISTRY.filter(
+    (e) => e.hub === hub && e.role !== 'player' && e.id !== 'team' && !e.foldedUnder,
+  ).map(toHubTab);
 }
 
 /** Stable-sort tabs by a curated id order; unlisted ids keep registry order at the end. */
@@ -126,8 +133,12 @@ function withSupplements(
 
 // -----------------------------------------------------------------------------
 // Supplementary leaf tabs — child pages of a registry feature that are not
-// themselves BASEBALL_NAV_REGISTRY entries (nav-registry.ts tracks the 32
-// top-level features; these are deeper sub-pages within two of them).
+// themselves BASEBALL_NAV_REGISTRY entries. Games is the ONE surviving
+// supplement post-Ruling-2: Season/Upload now resolve via stats-center's own
+// matchPrefixes (a view + header CTAs inside Stats Center, not their own
+// tabs), and Performance's Live/Programs/Groups/Builder are reached via
+// in-page masthead links on /dashboard/performance itself (verified present),
+// not a second copy of the same links in the hub sub-nav strip.
 // -----------------------------------------------------------------------------
 
 const STATS_GAMES_TAB: HubSubNavTab = {
@@ -137,187 +148,79 @@ const STATS_GAMES_TAB: HubSubNavTab = {
   icon: IconClipboardList,
   matchPrefixes: ['/baseball/dashboard/stats/games'],
 };
-const STATS_SEASON_TAB: HubSubNavTab = {
-  id: 'season',
-  label: 'Season',
-  href: '/baseball/dashboard/stats/season',
-  icon: IconTrendingUp,
-};
-const STATS_UPLOAD_TAB: HubSubNavTab = {
-  id: 'upload',
-  label: 'Upload',
-  href: '/baseball/dashboard/stats/upload',
-  icon: IconUpload,
-};
-const PERFORMANCE_LIVE_TAB: HubSubNavTab = {
-  id: 'performance-live',
-  label: 'Live',
-  href: '/baseball/dashboard/performance/live',
-  icon: IconDumbbell,
-  requiredCapability: 'can_manage_lifting',
-};
-const PERFORMANCE_PROGRAMS_TAB: HubSubNavTab = {
-  id: 'performance-programs',
-  label: 'Programs',
-  href: '/baseball/dashboard/performance/programs',
-  icon: IconClipboardList,
-  matchPrefixes: ['/baseball/dashboard/performance/programs'],
-  requiredCapability: 'can_manage_lifting',
-};
-const PERFORMANCE_GROUPS_TAB: HubSubNavTab = {
-  id: 'performance-groups',
-  label: 'Groups',
-  href: '/baseball/dashboard/performance/groups',
-  icon: IconUsers,
-  requiredCapability: 'can_manage_lifting',
-};
-const PERFORMANCE_BUILDER_TAB: HubSubNavTab = {
-  id: 'performance-builder',
-  label: 'Builder',
-  href: '/baseball/dashboard/performance/builder',
-  icon: IconGauge,
-  requiredCapability: 'can_manage_lifting',
-};
-const SETTINGS_HOME_TAB: HubSubNavTab = {
-  id: 'settings-home',
-  label: 'Settings',
-  href: '/baseball/dashboard/settings',
-  icon: IconSettings,
-};
-const SETTINGS_SEASON_TAB: HubSubNavTab = {
-  id: 'settings-season',
-  label: 'Season',
-  href: '/baseball/dashboard/settings/season',
-  icon: IconCalendar,
-  requiredCapability: 'can_manage_settings',
-};
-const SETTINGS_PHILOSOPHY_TAB: HubSubNavTab = {
-  id: 'settings-philosophy',
-  label: 'Philosophy',
-  href: '/baseball/dashboard/settings/philosophy',
-  icon: IconTarget,
-  requiredCapability: 'can_manage_settings',
-};
-const SETTINGS_ROLES_TAB: HubSubNavTab = {
-  id: 'settings-roles',
-  label: 'Roles',
-  href: '/baseball/dashboard/settings/roles',
-  icon: IconLock,
-  requiredCapability: 'can_manage_settings',
-};
-const SETTINGS_PERMISSIONS_TAB: HubSubNavTab = {
-  id: 'settings-permissions',
-  label: 'Permissions',
-  href: '/baseball/dashboard/settings/permissions',
-  icon: IconShieldCheck,
-  requiredCapability: 'can_manage_settings',
-};
-const SETTINGS_TEAMS_TAB: HubSubNavTab = {
-  id: 'settings-teams',
-  label: 'Team Settings',
-  href: '/baseball/dashboard/settings/teams',
-  icon: IconUsers,
-  requiredCapability: 'can_manage_settings',
-};
-const SETTINGS_IMPORTS_TAB: HubSubNavTab = {
-  id: 'settings-imports',
-  label: 'Imports',
-  href: '/baseball/dashboard/settings/imports',
-  icon: IconUpload,
-  requiredCapability: 'can_manage_imports',
-};
-const SETTINGS_INTEGRATIONS_TAB: HubSubNavTab = {
-  id: 'settings-integrations',
-  label: 'Integrations',
-  href: '/baseball/dashboard/settings/integrations',
-  icon: IconBuilding,
-  requiredCapability: 'can_manage_settings',
-};
-const SETTINGS_AUDIT_TAB: HubSubNavTab = {
-  id: 'settings-audit',
-  label: 'Audit',
-  href: '/baseball/dashboard/settings/audit',
-  icon: IconDatabase,
-  requiredCapability: 'can_manage_settings',
-};
 
 // -----------------------------------------------------------------------------
-// Curated display order per hub (COACH_NAV_8TAB_PROPOSAL.md mapping table).
-// Membership is always registry-derived (hubEntries); this only sequences it.
+// Curated display order per hub (COHERENCE_RULING_2026-07-08.md Ruling 2 —
+// the hub/subtab table is authoritative). Membership is always
+// registry-derived (hubEntries); this only sequences it, and every hub below
+// resolves to AT MOST 3 rendered tabs.
 // -----------------------------------------------------------------------------
 
 const DASHBOARD_ORDER = ['command-center', 'signals'];
-const TEAM_ORDER = ['roster', 'calendar', 'announcements', 'documents', 'travel'];
-const STATS_PERFORMANCE_ORDER = [
-  'stats-center',
-  'performance',
-  'postgame-review',
-  'practice-planner',
-  'practice-effectiveness',
-  'import-center',
-];
-const DEVELOPMENT_ORDER = ['dev-plans', 'videos'];
-const RECRUITING_ORDER = [
-  'pipeline',
-  'college-interest',
-  'discover',
-  'watchlist',
-  'compare',
-  'comparisons',
-  'scout-packets',
-  'camps',
-];
+const TEAM_ORDER = ['roster', 'calendar', 'operations'];
+const MESSAGES_ORDER = ['announcements'];
+const STATS_PERFORMANCE_ORDER = ['stats-center', 'postgame-review'];
+const DEVELOPMENT_ORDER = ['dev-plans', 'performance', 'videos'];
+const RECRUITING_ORDER = ['pipeline', 'discover', 'scouting'];
 const ACADEMICS_ORDER = ['academics'];
-const MANAGEMENT_ORDER = [
-  'staff-decision-room',
-  'program',
-  'staff-settings',
-  'program-settings',
-  'organization',
-  'teams',
-  'events',
-];
+const MANAGEMENT_ORDER = ['staff-decision-room', 'settings', 'organization'];
 
 // -----------------------------------------------------------------------------
 // COACH HUBS — every array below is registry-derived (see the module header).
 // -----------------------------------------------------------------------------
 
-/** DASHBOARD hub — Command Center + Signals (folded from two flat top-level tabs). */
+/** DASHBOARD hub — Overview (command-center) + Signals. */
 export const COACH_DASHBOARD_TABS: readonly HubSubNavTab[] = orderTabs(
   hubEntries('dashboard'),
   DASHBOARD_ORDER,
 );
 
-/** TEAM hub — roster + day-to-day team operations. */
+/** TEAM hub — Roster · Calendar · Operations (Documents/Travel/Practice Planner/
+ *  Practice Effectiveness fold into the Operations landing, Ruling 2). */
 export const COACH_TEAM_TABS: readonly HubSubNavTab[] = orderTabs(hubEntries('team'), TEAM_ORDER);
 
 /**
- * STATS & PERFORMANCE hub — team-wide stats depth, game logs, season, practice
- * intelligence, and lifting/readiness, folded into one hub per the proposal
- * (previously Practice Planner/Effectiveness, Postgame Review, and Import
- * Center had no hub-tab entry anywhere — an unreachable-feature bug this fixes).
+ * MESSAGES hub — Messages · Announcements (Ruling 2: Announcements moves off
+ * Team — comms belong with comms). The Messages tab itself is the persistent
+ * cross-cutting entry (BASEBALL_MESSAGES_NAV, deliberately kept outside the
+ * feature registry — see nav-registry.ts) rendered as the FIRST tab;
+ * Announcements is registry-derived like every other hub.
+ */
+const MESSAGES_TAB: HubSubNavTab = {
+  id: BASEBALL_MESSAGES_NAV.id,
+  label: BASEBALL_MESSAGES_NAV.label,
+  href: BASEBALL_MESSAGES_NAV.href,
+  icon: BASEBALL_MESSAGES_NAV.icon,
+};
+
+export const COACH_MESSAGES_TABS: readonly HubSubNavTab[] = [
+  MESSAGES_TAB,
+  ...orderTabs(hubEntries('messages'), MESSAGES_ORDER),
+];
+
+/**
+ * STATS & PERFORMANCE hub — Stats Center · Games · Postgame (Ruling 2: Season
+ * is a view inside Stats Center, Upload + Import Center are header CTAs
+ * there; Practice Planner/Effectiveness moved to Team>Operations; Performance
+ * moved to Development>Training).
  */
 export const COACH_STATS_TABS: readonly HubSubNavTab[] = withSupplements(
   orderTabs(hubEntries('stats-performance'), STATS_PERFORMANCE_ORDER),
-  {
-    'stats-center': [STATS_GAMES_TAB, STATS_SEASON_TAB, STATS_UPLOAD_TAB],
-    performance: [PERFORMANCE_LIVE_TAB, PERFORMANCE_PROGRAMS_TAB, PERFORMANCE_GROUPS_TAB, PERFORMANCE_BUILDER_TAB],
-  },
+  { 'stats-center': [STATS_GAMES_TAB] },
 );
 
-/** DEVELOPMENT hub — dev plans + video library. */
+/** DEVELOPMENT hub — Dev Plans · Training (performance) · Videos. */
 export const COACH_DEVELOPMENT_TABS: readonly HubSubNavTab[] = orderTabs(
   hubEntries('development'),
   DEVELOPMENT_ORDER,
 );
 
 /**
- * RECRUITING hub — pipeline, discovery, comparisons, scout packets, camps.
- * Gated to RECRUITING_PROGRAM_TYPES by the sidebar/resolve-active-hub, hidden
- * entirely for High School. Fixed by this pass: `import` (misplaced here
- * previously) moved to Stats & Performance; `college-interest` (a coach-facing
- * interest dashboard) stays out of player nav; `comparisons` and `camps`
- * (previously unreachable) added.
+ * RECRUITING hub — Pipeline · Discover · Scouting (Ruling 2: Watchlist,
+ * Compare, Saved Comparisons, Scout Packets, and Camps fold into the new
+ * Scouting landing; Interest folds into Pipeline). Gated to
+ * RECRUITING_PROGRAM_TYPES by the sidebar/resolve-active-hub, hidden entirely
+ * for High School.
  */
 export const COACH_RECRUITING_TABS: readonly HubSubNavTab[] = orderTabs(
   hubEntries('recruiting'),
@@ -331,43 +234,17 @@ export const COACH_RECRUITING_TABS: readonly HubSubNavTab[] = orderTabs(
  */
 export const COACH_ACADEMICS_TABS: readonly HubSubNavTab[] = orderTabs(hubEntries('academics'), ACADEMICS_ORDER);
 
-const MANAGEMENT_SETTINGS_SUPPLEMENT_ID = 'program-settings';
-
-/** Dev-only guard: settings supplement tabs must attach to a real registry row. */
-function assertManagementSettingsSupplement(tabs: readonly HubSubNavTab[]): void {
-  if (process.env.NODE_ENV === 'production') return;
-  if (!tabs.some((tab) => tab.id === MANAGEMENT_SETTINGS_SUPPLEMENT_ID)) {
-    throw new Error(
-      `COACH_MANAGEMENT_TABS settings supplement requires registry tab "${MANAGEMENT_SETTINGS_SUPPLEMENT_ID}".`,
-    );
-  }
-}
-
 /**
- * MANAGEMENT hub — staff coordination, program settings, and (Showcase/Academy/
- * Club only, via allowedProgramTypes carried through verbatim from the
- * registry) org-level Organization/Teams/Events. Fixed by this pass: the
- * "Decision Room" vs "Staff Room" label drift (the registry's label always
- * wins now — it is read, not re-declared).
+ * MANAGEMENT hub — Decision Room · Settings · Organization (Ruling 2: DELETED
+ * the 9-item settings-route splice — the existing card-grid landing at
+ * /dashboard/settings is now the single settings nav surface; Program
+ * Info/Staff Settings/Program Settings fold into it. Organization/Teams/
+ * Events fold under Organization for Showcase/Academy/Club program types
+ * only, via allowedProgramTypes carried through verbatim from the registry).
  */
-const managementHubTabs = orderTabs(hubEntries('management'), MANAGEMENT_ORDER);
-assertManagementSettingsSupplement(managementHubTabs);
-
-export const COACH_MANAGEMENT_TABS: readonly HubSubNavTab[] = withSupplements(
-  managementHubTabs,
-  {
-    [MANAGEMENT_SETTINGS_SUPPLEMENT_ID]: [
-      SETTINGS_HOME_TAB,
-      SETTINGS_SEASON_TAB,
-      SETTINGS_PHILOSOPHY_TAB,
-      SETTINGS_ROLES_TAB,
-      SETTINGS_PERMISSIONS_TAB,
-      SETTINGS_TEAMS_TAB,
-      SETTINGS_IMPORTS_TAB,
-      SETTINGS_INTEGRATIONS_TAB,
-      SETTINGS_AUDIT_TAB,
-    ],
-  },
+export const COACH_MANAGEMENT_TABS: readonly HubSubNavTab[] = orderTabs(
+  hubEntries('management'),
+  MANAGEMENT_ORDER,
 );
 
 // -----------------------------------------------------------------------------
@@ -383,10 +260,11 @@ export interface CoachHubDef {
   tabs: readonly HubSubNavTab[];
 }
 
-/** Display order of the 7 registry-backed coach hubs (Messages is the 8th tab,
- *  a persistent cross-cutting slot outside this grouping — see nav-registry.ts). */
+/** Display order of the 8 registry-backed coach hubs (Ruling 2 promotes
+ *  Messages from a bare flat link to a real hub with its own sub-nav). */
 export const COACH_HUB_ORDER: readonly BaseballNavHub[] = [
   'dashboard',
+  'messages',
   'team',
   'stats-performance',
   'development',
@@ -397,6 +275,7 @@ export const COACH_HUB_ORDER: readonly BaseballNavHub[] = [
 
 export const COACH_HUB_DEFS: Readonly<Record<BaseballNavHub, CoachHubDef>> = {
   dashboard: { id: 'dashboard', label: 'Dashboard', icon: IconHome, tabs: COACH_DASHBOARD_TABS },
+  messages: { id: 'messages', label: 'Messages', icon: IconMessage, tabs: COACH_MESSAGES_TABS },
   team: { id: 'team', label: 'Team', icon: IconUsers, tabs: COACH_TEAM_TABS },
   'stats-performance': {
     id: 'stats-performance',
@@ -411,8 +290,12 @@ export const COACH_HUB_DEFS: Readonly<Record<BaseballNavHub, CoachHubDef>> = {
 };
 
 // -----------------------------------------------------------------------------
-// PLAYER HUBS — unchanged by this pass (see the module header: most player-only
-// registry entries carry no `hub`, so these stay hand-maintained).
+// PLAYER HUBS — unchanged mechanism (see the module header: most player-only
+// registry entries carry no `hub`, so these stay hand-maintained), trimmed to
+// the same ≤3 cap (Ruling 2 item 7). Every dropped tab below KEEPS its own
+// registry row (still command-palette + deep-link reachable) and, for
+// Lifts/Readiness specifically, is also surfaced inline on Player Today —
+// so nothing is orphaned, only de-duplicated off the sub-nav strip.
 // -----------------------------------------------------------------------------
 
 /** Player STATS hub — own stats depth + game/season views. */
@@ -420,14 +303,17 @@ export const PLAYER_STATS_TABS: readonly HubSubNavTab[] = [
   { id: 'overview', label: 'Overview', href: '/baseball/dashboard/my-stats', icon: IconChartBar },
 ];
 
-/** Player DEVELOPMENT hub — own dev plan, training, proof packet, and video library. */
+/**
+ * Player DEVELOPMENT hub — Dev Plan · Practice · Passport. Lifts and
+ * Readiness are already surfaced inline on Player Today's daily card
+ * (PlayerLiftToday) and remain reachable via their own registry entries
+ * (player-lift, player-readiness); Videos remains reachable via its own
+ * registry entry (role: 'both').
+ */
 export const PLAYER_DEVELOPMENT_TABS: readonly HubSubNavTab[] = [
   { id: 'dev-plan', label: 'Dev Plan', href: '/baseball/dashboard/dev-plan', icon: IconTarget },
   { id: 'practice', label: 'Practice', href: '/baseball/player/practice', icon: IconClipboardList },
-  { id: 'lifts', label: 'Lifts', href: '/baseball/dashboard/lift', icon: IconDumbbell, matchPrefixes: ['/baseball/dashboard/lift'] },
-  { id: 'readiness', label: 'Readiness', href: '/baseball/dashboard/readiness', icon: IconGauge },
   { id: 'passport', label: 'Passport', href: '/baseball/player/passport', icon: IconShieldCheck },
-  { id: 'videos', label: 'Videos', href: '/baseball/dashboard/videos', icon: IconVideo, matchPrefixes: ['/baseball/dashboard/videos'] },
 ];
 
 /** Player TEAM hub — shared team surfaces a player reads. */
@@ -437,12 +323,16 @@ export const PLAYER_TEAM_TABS: readonly HubSubNavTab[] = [
   { id: 'documents', label: 'Documents', href: '/baseball/dashboard/documents', icon: IconFileText },
 ];
 
-/** Player RECRUITING hub — player-owned exposure and college discovery surfaces. */
+/**
+ * Player RECRUITING hub — Journey · Colleges · Analytics. Activate Recruiting
+ * remains reachable via its own registry entry (player-activate, section:
+ * 'secondary') — command palette + direct URL — it is a one-time opt-in
+ * action, not a recurring destination worth a permanent tab slot.
+ */
 export const PLAYER_RECRUITING_TABS: readonly HubSubNavTab[] = [
   { id: 'journey', label: 'Journey', href: '/baseball/dashboard/journey', icon: IconStar },
   { id: 'colleges', label: 'Colleges', href: '/baseball/dashboard/colleges', icon: IconGraduationCap },
   { id: 'analytics', label: 'Analytics', href: '/baseball/dashboard/analytics', icon: IconTrendingUp },
-  { id: 'activate', label: 'Activate', href: '/baseball/dashboard/activate', icon: IconShieldCheck },
 ];
 
 // -----------------------------------------------------------------------------
@@ -452,6 +342,7 @@ export const PLAYER_RECRUITING_TABS: readonly HubSubNavTab[] = [
 
 export const HUB_LANDING = {
   coachDashboard: COACH_DASHBOARD_TABS[0]!.href,
+  coachMessages: COACH_MESSAGES_TABS[0]!.href,
   coachTeam: COACH_TEAM_TABS[0]!.href,
   coachStats: COACH_STATS_TABS[0]!.href,
   coachDevelopment: COACH_DEVELOPMENT_TABS[0]!.href,
diff --git a/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts b/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts
index b606cd224..205fa6be6 100644
--- a/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts
+++ b/src/app/baseball/(dashboard)/_components/resolve-active-hub.ts
@@ -51,6 +51,7 @@ export { RECRUITING_PROGRAM_TYPES };
  */
 const RESOLVE_HUB_ID: Readonly<Record<BaseballNavHub, string>> = {
   dashboard: 'dashboard',
+  messages: 'messages',
   team: 'team',
   'stats-performance': 'stats',
   development: 'development',
diff --git a/src/app/baseball/(dashboard)/dashboard/academics/AcademicsClient.tsx b/src/app/baseball/(dashboard)/dashboard/academics/AcademicsClient.tsx
index 885084582..e989fe275 100644
--- a/src/app/baseball/(dashboard)/dashboard/academics/AcademicsClient.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/academics/AcademicsClient.tsx
@@ -32,7 +32,8 @@ interface StudentAthlete {
   gpa: number | null;
   credits_completed: number | null;
   credits_required: number | null;
-  is_eligible: boolean;
+  /** Tri-state: null = no eligibility record on file (neutral), never coerced to false. */
+  is_eligible: boolean | null;
   academic_standing: 'good' | 'warning' | 'probation' | null;
   eligibility_id: string | null;
 }
@@ -164,7 +165,9 @@ export default function AcademicsPage() {
       gpa: student.gpa,
       credits_completed: student.credits_completed,
       credits_required: student.credits_required,
-      is_eligible: student.is_eligible,
+      // No record on file yet defaults the editor to "Eligible" — matches
+      // upsertPlayerAcademics' own default for a brand-new record.
+      is_eligible: student.is_eligible ?? true,
       academic_standing: student.academic_standing,
     });
   };
@@ -331,11 +334,27 @@ export default function AcademicsPage() {
     return `${student.credits_completed}/${req}`;
   };
 
+  const gpaDisplay = (student: StudentAthlete) =>
+    student.gpa !== null ? student.gpa.toFixed(2) : 'Not on file';
+
   const standingLabel = (standing: 'good' | 'warning' | 'probation' | null) => {
     if (!standing) return 'Unknown';
     return standing.charAt(0).toUpperCase() + standing.slice(1);
   };
 
+  // ── Eligibility tri-state: null = no record on file yet (neutral gray,
+  // matches the "Unknown" standing treatment) — never coerced to a red
+  // "Ineligible", which is reserved for a real, recorded `false`. ─────────
+  const eligibilityLabel = (isEligible: boolean | null) => {
+    if (isEligible === null) return 'Not on file';
+    return isEligible ? 'Eligible' : 'Ineligible';
+  };
+
+  const eligibilityBadgeClass = (isEligible: boolean | null) => {
+    if (isEligible === null) return 'bg-warm-100 text-warm-500';
+    return isEligible ? 'bg-primary-100 text-primary-700' : 'bg-red-100 text-red-700';
+  };
+
   return (
     <>
       <Header
@@ -472,8 +491,8 @@ export default function AcademicsPage() {
                           aria-label="GPA"
                         />
                       ) : (
-                        <p className="text-lg font-semibold text-warm-900">
-                          {student.gpa !== null ? student.gpa.toFixed(2) : 'N/A'}
+                        <p className={student.gpa !== null ? 'text-lg font-semibold text-warm-900' : 'text-lg font-semibold text-warm-400 italic'}>
+                          {gpaDisplay(student)}
                         </p>
                       )}
                       <p className="text-label font-medium uppercase tracking-wide text-warm-500 mt-1">GPA</p>
@@ -533,8 +552,8 @@ export default function AcademicsPage() {
                         >
                           {standingLabel(student.academic_standing)}
                         </Badge>
-                        <Badge className={student.is_eligible ? 'bg-primary-100 text-primary-700' : 'bg-red-100 text-red-700'}>
-                          {student.is_eligible ? 'Eligible' : 'Ineligible'}
+                        <Badge className={eligibilityBadgeClass(student.is_eligible)}>
+                          {eligibilityLabel(student.is_eligible)}
                         </Badge>
                       </>
                     )}
@@ -619,8 +638,8 @@ export default function AcademicsPage() {
                             aria-label="GPA"
                           />
                         ) : (
-                          <span className="font-medium tabular-nums">
-                            {student.gpa !== null ? student.gpa.toFixed(2) : 'N/A'}
+                          <span className={student.gpa !== null ? 'font-medium tabular-nums' : 'text-warm-400 italic tabular-nums'}>
+                            {gpaDisplay(student)}
                           </span>
                         )}
                       </td>
@@ -681,8 +700,8 @@ export default function AcademicsPage() {
                             ]}
                           />
                         ) : (
-                          <Badge className={student.is_eligible ? 'bg-primary-100 text-primary-700' : 'bg-red-100 text-red-700'}>
-                            {student.is_eligible ? 'Eligible' : 'Ineligible'}
+                          <Badge className={eligibilityBadgeClass(student.is_eligible)}>
+                            {eligibilityLabel(student.is_eligible)}
                           </Badge>
                         )}
                       </td>
diff --git a/src/app/baseball/(dashboard)/dashboard/announcements/page.tsx b/src/app/baseball/(dashboard)/dashboard/announcements/page.tsx
index 179000504..838b3c94d 100644
--- a/src/app/baseball/(dashboard)/dashboard/announcements/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/announcements/page.tsx
@@ -8,6 +8,7 @@ import { createClient } from '@/lib/supabase/client';
 import { getAnnouncementsWithMeta } from '@/app/baseball/actions/announcements';
 import { AnnouncementsFairway } from '@/components/baseball/announcements/AnnouncementsFairway';
 import { ReadModelStateNotice } from '@/components/baseball/ReadModelStateNotice';
+import { SectionMasthead } from '@/components/baseball/living-annual';
 import { fairwayScope } from '@/lib/redesign/flag';
 import type { BaseballAnnouncementMeta } from '@/app/baseball/actions/announcements';
 
@@ -95,7 +96,7 @@ export default function BaseballAnnouncementsPage() {
   if (loadError) {
     return (
       <div className={fairwayScope('mx-auto max-w-5xl p-4 md:p-6')}>
-        <h1 className="mb-6 text-2xl font-bold tracking-tight text-warm-900">Announcements</h1>
+        <SectionMasthead eyebrow="THE PRESSBOX · ANNOUNCEMENTS" title="Announcements" ink="team" className="mb-6" />
         <ReadModelStateNotice
           state="error"
           title="Announcements unavailable"
diff --git a/src/app/baseball/(dashboard)/dashboard/calendar/page.tsx b/src/app/baseball/(dashboard)/dashboard/calendar/page.tsx
index a985885b7..93eba3ae7 100644
--- a/src/app/baseball/(dashboard)/dashboard/calendar/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/calendar/page.tsx
@@ -2,10 +2,7 @@ import { createClient } from '@/lib/supabase/server';
 import { fromUntyped } from '@/lib/supabase/untyped';
 import { getSessionProfile } from '@/lib/auth/session';
 import { redirect } from 'next/navigation';
-import Link from 'next/link';
-import { BaseballCalendarWrapper } from '@/components/baseball/calendar/BaseballCalendarWrapper';
 import { CalendarFairway } from '@/components/baseball/calendar/CalendarFairway';
-import { isRedesignEnabled } from '@/lib/redesign/flag';
 import type { CalendarEvent } from '@/hooks/useCalendarEvents';
 import type { Metadata } from 'next';
 
@@ -16,15 +13,17 @@ export const metadata: Metadata = {
 
 export const revalidate = 60;
 
-const EVENT_TYPE_CONFIG: Record<string, { label: string; dot: string }> = {
-  game:     { label: 'Game',     dot: 'bg-blue-500' },
-  practice: { label: 'Practice', dot: 'bg-primary-500' },
-  camp:     { label: 'Camp',     dot: 'bg-purple-500' },
-  tryout:   { label: 'Tryout',   dot: 'bg-amber-500' },
-  meeting:  { label: 'Meeting',  dot: 'bg-warm-500' },
-  travel:   { label: 'Travel',   dot: 'bg-sky-500' },
-  other:    { label: 'Other',    dot: 'bg-warm-400' },
-};
+/**
+ * Display-only default for a missing `end_time` — mirrors the drag-reschedule
+ * fallback in PremiumCalendarClient ("Fallback: 1 hour duration"). NEVER
+ * written back to the DB; `event.end_time` on the mapped CalendarEvent stays
+ * the raw (possibly null) column value.
+ */
+function defaultEndTime(startIso: string): string {
+  const start = new Date(startIso);
+  if (Number.isNaN(start.getTime())) return startIso;
+  return new Date(start.getTime() + 60 * 60 * 1000).toISOString();
+}
 
 export default async function BaseballCalendarPage() {
   const supabase = await createClient();
@@ -73,6 +72,16 @@ export default async function BaseballCalendarPage() {
   // ── Fetch events + roster ───────────────────────────────────────────────────
 
   if (teamId) {
+    // Bounded window — 90 days back / 365 days forward — so a long-lived team
+    // doesn't drag its entire event history into every calendar render (no
+    // limit/window previously meant this query grew unbounded forever).
+    // Practices/games far outside this range are pagination's job, not a
+    // single dashboard page's.
+    const eventsWindowStart = new Date();
+    eventsWindowStart.setDate(eventsWindowStart.getDate() - 90);
+    const eventsWindowEnd = new Date();
+    eventsWindowEnd.setDate(eventsWindowEnd.getDate() + 365);
+
     const [eventsResult, membersResult, teamOrgResult] = await Promise.all([
       // Read via fromUntyped so the select is not type-checked against the
       // generated baseball_events types (which drift from the live schema).
@@ -86,7 +95,10 @@ export default async function BaseballCalendarPage() {
       fromUntyped(supabase, 'baseball_events')
         .select('id, team_id, title, event_type, start_time, end_time, location, description, is_mandatory, max_attendees, rsvp_deadline, all_day, status, recurring, created_by')
         .eq('team_id', teamId)
-        .order('start_time', { ascending: true }),
+        .gte('start_time', eventsWindowStart.toISOString())
+        .lte('start_time', eventsWindowEnd.toISOString())
+        .order('start_time', { ascending: true })
+        .limit(500),
       supabase
         .from('baseball_team_members')
         .select('player_id, baseball_players!inner(id, first_name, last_name, avatar_url)')
@@ -122,9 +134,13 @@ export default async function BaseballCalendarPage() {
     }) => {
       const normalizeAllDay = (d: string) => `${d.slice(0, 10)}T00:00:00`;
       const startDate = event.all_day ? normalizeAllDay(event.start_time) : event.start_time;
+      // NULL end_time previously collapsed to `event.start_time`, producing a
+      // zero-duration timed event (invisible/unclickable in the hour grid).
+      // Default to start + 1h for display only — `end_time` on the returned
+      // CalendarEvent below stays the raw (possibly null) value.
       const endDate = event.all_day
         ? normalizeAllDay(event.end_time || event.start_time)
-        : event.end_time || event.start_time;
+        : event.end_time || defaultEndTime(event.start_time);
       return {
         id: event.id,
         team_id: event.team_id || '',
@@ -218,63 +234,9 @@ export default async function BaseballCalendarPage() {
   // ── College coach with no team: recruiting-focused empty state ─────────────
 
   if (isCollegeCoach && !teamId) {
-    if (isRedesignEnabled()) {
-      return (
-        <CalendarFairway
-          recruitingEmpty
-          events={events}
-          teamMembers={teamMembers}
-          teamId={teamId}
-          isCoach={isCoach}
-          currentUserId={currentUserId}
-          upcomingEvents={upcomingEvents}
-          eventTypeCounts={eventTypeCounts}
-        />
-      );
-    }
-    return (
-      <div
-        className="h-[calc(100vh-5.5rem-env(safe-area-inset-bottom))] md:h-screen flex flex-col"
-        style={{
-          background: 'linear-gradient(180deg, #F7F5F2 0%, #F4EFE6 33%, #F1ECE0 66%, #ECE5D6 100%)',
-        }}
-      >
-        <div className="flex-1 flex items-center justify-center p-6">
-          <div className="max-w-md w-full text-center">
-            {/* Calendar icon */}
-            <div className="mx-auto mb-6 w-16 h-16 rounded-2xl bg-primary-50 border border-primary-100 flex items-center justify-center">
-              <svg className="w-8 h-8 text-primary-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}>
-                <path strokeLinecap="round" strokeLinejoin="round" d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 012.25-2.25h13.5A2.25 2.25 0 0121 7.5v11.25m-18 0A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75m-18 0v-7.5A2.25 2.25 0 015.25 9h13.5A2.25 2.25 0 0121 11.25v7.5" />
-              </svg>
-            </div>
-
-            <h2 className="text-xl font-semibold text-warm-900 mb-2">
-              Your recruiting calendar is empty
-            </h2>
-            <p className="text-sm text-warm-500 mb-8 leading-relaxed">
-              Camp visits and official visit windows will appear here as you schedule recruiting activity.
-            </p>
-
-            {/* CTA */}
-            <Link
-              href="/baseball/dashboard/discover"
-              className="inline-flex items-center gap-2 px-5 py-2.5 rounded-xl bg-primary-600 hover:bg-primary-700 text-white text-sm font-medium transition-colors"
-            >
-              <svg className="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
-                <path strokeLinecap="round" strokeLinejoin="round" d="M21 21l-5.197-5.197m0 0A7.5 7.5 0 105.196 5.196a7.5 7.5 0 0010.607 10.607z" />
-              </svg>
-              Browse Prospects
-            </Link>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  if (isRedesignEnabled()) {
     return (
       <CalendarFairway
-        recruitingEmpty={false}
+        recruitingEmpty
         events={events}
         teamMembers={teamMembers}
         teamId={teamId}
@@ -287,49 +249,15 @@ export default async function BaseballCalendarPage() {
   }
 
   return (
-    <div
-      className="h-[calc(100vh-5.5rem-env(safe-area-inset-bottom))] md:h-screen flex flex-col"
-      style={{
-        background: 'linear-gradient(180deg, #F7F5F2 0%, #F4EFE6 33%, #F1ECE0 66%, #ECE5D6 100%)',
-      }}
-    >
-      {/* Event summary strip — only shown when there's an upcoming event to
-          summarize. Gating on `upcomingEvents` (not `events.length`) matches
-          what the strip actually says: a team with only past events has
-          nothing "upcoming" to report, so showing "0 upcoming events ·"
-          with no badges after it would just be a second, quieter version of
-          the same contradiction this strip exists to avoid. */}
-      {upcomingEvents > 0 && (
-        <div className="flex-shrink-0 px-4 md:px-6 pt-4 md:pt-6 pb-2">
-          <div className="flex flex-wrap items-center gap-x-4 gap-y-1.5">
-            <span className="text-sm font-medium text-warm-600 whitespace-nowrap">
-              {upcomingEvents} upcoming event{upcomingEvents !== 1 ? 's' : ''}
-            </span>
-            <span className="text-warm-300" aria-hidden="true">|</span>
-            {Object.entries(eventTypeCounts).map(([type, count]) => {
-              const cfg = EVENT_TYPE_CONFIG[type] ?? { label: type, dot: 'bg-warm-400' };
-              return (
-                <span key={type} className="flex items-center gap-1.5 text-xs text-warm-600 whitespace-nowrap">
-                  <span className={`w-2 h-2 rounded-full ${cfg.dot}`} />
-                  {count} {cfg.label}
-                </span>
-              );
-            })}
-          </div>
-        </div>
-      )}
-
-      {/* Calendar — overflow-hidden is required so PremiumCalendarClient's h-full resolves correctly.
-          Golf's main is overflow-y-auto (which anchors heights); baseball's is not, so we add it here. */}
-      <div className="flex-1 p-4 md:p-6 pt-2 md:pt-2 min-h-0 overflow-hidden">
-        <BaseballCalendarWrapper
-          initialEvents={events}
-          teamMembers={teamMembers}
-          teamId={teamId}
-          isCoach={isCoach}
-          currentUserId={currentUserId}
-        />
-      </div>
-    </div>
+    <CalendarFairway
+      recruitingEmpty={false}
+      events={events}
+      teamMembers={teamMembers}
+      teamId={teamId}
+      isCoach={isCoach}
+      currentUserId={currentUserId}
+      upcomingEvents={upcomingEvents}
+      eventTypeCounts={eventTypeCounts}
+    />
   );
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/dev-plan/DevPlanClient.tsx b/src/app/baseball/(dashboard)/dashboard/dev-plan/DevPlanClient.tsx
new file mode 100644
index 000000000..b3372d4d2
--- /dev/null
+++ b/src/app/baseball/(dashboard)/dashboard/dev-plan/DevPlanClient.tsx
@@ -0,0 +1,617 @@
+'use client';
+
+// =============================================================================
+// src/app/baseball/(dashboard)/dashboard/dev-plan/DevPlanClient.tsx
+//
+// Player-facing development plan view. Split out of page.tsx (COHERENCE
+// RULING 2026-07-08 Ruling 5, "dev-plan cold-URL bounce"): this component is
+// entirely client-rendered (own auth hook, own data fetch via
+// getActiveDevPlan), which raced (dashboard)/layout.tsx's client-side
+// DashboardSessionGuard on a hard/cold navigation — the guard's auth check
+// and this component's own auth/fetch cycle could settle in either order,
+// occasionally producing a transient 500 before the guard's redirect fired.
+// page.tsx now resolves the player session server-side first
+// (requireBaseballPlayerRoute — redirects synchronously, before any client
+// hydration race is possible) and only then mounts this client component.
+//
+// LIVING-ANNUAL CHROME MIGRATION (2026-07-08, lane D1b): PRESENTATION ONLY —
+// every fetch, handler, state transition, and categorization rule below is
+// byte-identical to the pre-migration client; only the rendered chrome moved
+// to the kit (SectionMasthead / PaperCard / RuledStatLine / StatReadout /
+// InkBadge / EmptyIssue / EditorsLetter). Two concrete fixes from the map:
+//   1. The generic `Header` + glass `Card` + `ProgressRing` + amber/blue ad
+//      hoc badges are gone — this reads as a Passport page now, not a CRM
+//      form, and never renders a yellow/amber box.
+//   2. The goal-complete toggle was a bare 24px circle (`w-6 h-6`) — below
+//      the 44px touch-target floor. It keeps its 24px VISUAL circle but now
+//      sits inside a 44px hit area (`-m-2.5` compensates the extra footprint
+//      so the row layout is visually unchanged).
+// =============================================================================
+
+import { useEffect, useState, useCallback, useTransition, useMemo } from 'react';
+import { m, AnimatePresence, useReducedMotion } from 'framer-motion';
+import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';
+import { PageLoading } from '@/components/ui/loading';
+import { cn } from '@/lib/utils';
+import {
+  IconTarget,
+  IconCheck,
+  IconClock,
+  IconCalendar,
+  IconChevronDown,
+  IconChevronUp,
+  IconList,
+} from '@/components/icons';
+import { useAuth } from '@/hooks/use-auth';
+import { Button } from '@/components/ui/button';
+import { useToast } from '@/components/ui/sonner';
+import { fairwayScope } from '@/lib/redesign/flag';
+import {
+  SectionMasthead,
+  PaperCard,
+  Eyebrow,
+  RuledStatLine,
+  StatReadout,
+  InkBadge,
+  EmptyIssue,
+  EditorsLetter,
+  Reveal,
+  EASE_SOFT,
+} from '@/components/baseball/living-annual';
+import {
+  getActiveDevPlan,
+  completeGoalAsPlayer,
+  uncompleteGoalAsPlayer,
+  type DevelopmentalPlanWithGoals,
+  type DevPlanGoal,
+} from '@/app/baseball/actions/dev-plans';
+
+// Helper to calculate days until/since a date
+function getDaysUntil(dateStr: string): { days: number; label: string; isOverdue: boolean; isUpcoming: boolean } {
+  const target = new Date(dateStr);
+  const today = new Date();
+  today.setHours(0, 0, 0, 0);
+  target.setHours(0, 0, 0, 0);
+
+  const diffTime = target.getTime() - today.getTime();
+  const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+
+  if (diffDays < 0) {
+    return { days: Math.abs(diffDays), label: `${Math.abs(diffDays)} day${Math.abs(diffDays) !== 1 ? 's' : ''} overdue`, isOverdue: true, isUpcoming: false };
+  } else if (diffDays === 0) {
+    return { days: 0, label: 'Due today', isOverdue: false, isUpcoming: false };
+  } else if (diffDays === 1) {
+    return { days: 1, label: 'Due tomorrow', isOverdue: false, isUpcoming: false };
+  } else if (diffDays > 7) {
+    return { days: diffDays, label: `Due in ${diffDays} days`, isOverdue: false, isUpcoming: true };
+  } else {
+    return { days: diffDays, label: `Due in ${diffDays} days`, isOverdue: false, isUpcoming: false };
+  }
+}
+
+// The four "how it works" beats shown on the honest empty state. Numbered
+// with a hairline-ring green numeral, never a filled gray/primary circle —
+// spec §4.2 rule 5 ("no gray card-soup ... structure comes from hairline
+// rules + whitespace, not filled gray boxes").
+const HOW_IT_WORKS = [
+  { title: 'Coach creates your plan', body: 'Your coach sets specific goals and drills tailored to your needs.' },
+  { title: 'Work on your goals', body: 'Follow the drills and practice routines to improve your skills.' },
+  { title: 'Track your progress', body: 'Mark goals as complete and see how far you’ve come.' },
+  { title: 'Celebrate achievements', body: 'Your coach reviews your progress and sets new goals.' },
+] as const;
+
+// Goal card component
+function GoalCard({
+  goal,
+  onComplete,
+  onUncomplete,
+  isPending,
+}: {
+  goal: DevPlanGoal;
+  onComplete: (goalId: string) => void;
+  onUncomplete: (goalId: string) => void;
+  isPending: boolean;
+}) {
+  const prefersReducedMotion = useReducedMotion();
+  const [isExpanded, setIsExpanded] = useState(false);
+  const isCompleted = goal.status === 'completed';
+  const dueInfo = goal.target_date ? getDaysUntil(goal.target_date) : null;
+  // Deadlines are one of the spec's explicit clay exceptions inside a green
+  // lane (§4.2 rule 2: "clay/oxblood only on stamps, seals, DEADLINES,
+  // offers, hot signals") — overdue/due-soon badges read pursuit, everything
+  // else stays neutral graphite. Never red, never amber.
+  const urgent = dueInfo ? !isCompleted && (dueInfo.isOverdue || dueInfo.days <= 3) : false;
+  const hasExpandable = Boolean(goal.description || goal.coach_notes);
+
+  return (
+    <m.div
+      layout
+      initial={prefersReducedMotion ? false : { opacity: 0, y: 12 }}
+      animate={{ opacity: 1, y: 0 }}
+      exit={{ opacity: 0, y: -12 }}
+      transition={{ duration: 0.3, ease: EASE_SOFT }}
+    >
+      <PaperCard className={cn('p-4', isCompleted && 'opacity-80')}>
+        <div className="flex items-start gap-3">
+          {/* Complete toggle — 24px visual circle, 44px hit area (`-m-2.5`
+              expands the button by 10px on every side without shifting the
+              visual position of the circle inside the row). */}
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon-sm"
+            onClick={() => (isCompleted ? onUncomplete(goal.id) : onComplete(goal.id))}
+            disabled={isPending}
+            haptic="none"
+            aria-label={isCompleted ? 'Mark as incomplete' : 'Mark as complete'}
+            aria-pressed={isCompleted}
+            className="-m-2.5 flex-shrink-0 rounded-full p-0 text-transparent hover:bg-grade-plus/[0.08] hover:text-transparent focus-visible:ring-grade-plus/40"
+          >
+            <span
+              aria-hidden
+              className={cn(
+                'flex h-6 w-6 items-center justify-center rounded-full border-2 transition-colors',
+                isCompleted
+                  ? 'border-grade-plus bg-grade-plus text-[var(--paper)]'
+                  : 'border-[color:var(--hairline)] text-transparent',
+              )}
+            >
+              <IconCheck size={14} />
+            </span>
+          </Button>
+
+          {/* Content */}
+          <div className="min-w-0 flex-1">
+            <div className="flex items-start justify-between gap-3">
+              <div className="min-w-0 flex-1">
+                <h4
+                  className={cn(
+                    'font-annual text-body-lg leading-snug',
+                    isCompleted ? 'text-grade-plus line-through' : 'text-text-primary',
+                  )}
+                >
+                  {goal.title}
+                </h4>
+                {goal.category ? (
+                  <Eyebrow className="mt-1">{goal.category}</Eyebrow>
+                ) : null}
+              </div>
+
+              {dueInfo && !isCompleted ? (
+                <InkBadge
+                  label={dueInfo.label}
+                  tone={urgent ? 'pursuit' : 'neutral'}
+                  variant={dueInfo.isOverdue ? 'solid' : 'soft'}
+                  className="flex-shrink-0"
+                />
+              ) : null}
+            </div>
+
+            {/* Progress — a single green fill, never a red/amber/blue
+                threshold ramp (the two-ink law: this is a team/dev lane). */}
+            {!isCompleted ? (
+              <div className="mt-3">
+                <div className="mb-1.5 flex items-center justify-between">
+                  <span className="text-eyebrow uppercase tracking-[0.14em] text-text-tertiary">Progress</span>
+                  <StatReadout value={goal.progress} suffix="%" className="text-body-sm" ariaLabel="Goal progress" />
+                </div>
+                <div className="h-1.5 w-full overflow-hidden rounded-full bg-[color:var(--hairline)]">
+                  <m.div
+                    className="h-full rounded-full bg-grade-plus"
+                    initial={prefersReducedMotion ? false : { width: 0 }}
+                    animate={{ width: `${goal.progress}%` }}
+                    transition={prefersReducedMotion ? { duration: 0 } : { duration: 0.5, ease: 'easeOut' }}
+                  />
+                </div>
+              </div>
+            ) : null}
+
+            {/* Expand toggle — Button already guarantees a >=44px hit area
+                (`size="sm"` → `min-h-[44px]`); only the typography is
+                re-skinned to the kit's small-caps eyebrow voice. */}
+            {hasExpandable ? (
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                onClick={() => setIsExpanded((v) => !v)}
+                aria-expanded={isExpanded}
+                haptic="none"
+                className="-ml-3 mt-1 gap-1 px-2 text-eyebrow font-medium uppercase tracking-[0.14em] text-text-tertiary hover:bg-transparent hover:text-grade-plus"
+              >
+                {isExpanded ? <IconChevronUp size={14} /> : <IconChevronDown size={14} />}
+                {isExpanded ? 'Show less' : 'Show more'}
+              </Button>
+            ) : null}
+
+            <AnimatePresence>
+              {isExpanded ? (
+                <m.div
+                  initial={prefersReducedMotion ? false : { height: 0, opacity: 0 }}
+                  animate={{ height: 'auto', opacity: 1 }}
+                  exit={{ height: 0, opacity: 0 }}
+                  className="overflow-hidden"
+                >
+                  <div className="space-y-3 pt-1">
+                    {goal.description ? (
+                      <p className="font-annual text-body-sm leading-relaxed text-text-secondary">{goal.description}</p>
+                    ) : null}
+                    {goal.coach_notes ? (
+                      <div className="border-l-2 border-grade-plus pl-3">
+                        <Eyebrow ink="team">Coach note</Eyebrow>
+                        <p className="mt-1 font-annual text-body-sm italic leading-relaxed text-text-secondary">
+                          {goal.coach_notes}
+                        </p>
+                      </div>
+                    ) : null}
+                  </div>
+                </m.div>
+              ) : null}
+            </AnimatePresence>
+
+            {isCompleted && goal.completed_at ? (
+              <p className="mt-2 flex items-center gap-1 text-eyebrow uppercase tracking-[0.14em] text-grade-plus">
+                <IconCheck size={12} />
+                Completed {new Date(goal.completed_at).toLocaleDateString()}
+              </p>
+            ) : null}
+          </div>
+        </div>
+      </PaperCard>
+    </m.div>
+  );
+}
+
+// Loading skeleton for dev plan
+function DevPlanSkeleton() {
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="relative h-40 overflow-hidden rounded-card border border-[color:var(--hairline)]">
+        <div className="absolute inset-0 skeleton-shimmer" />
+      </div>
+      <div className="h-11 w-full max-w-sm overflow-hidden rounded-full">
+        <div className="h-full w-full skeleton-shimmer" />
+      </div>
+      <div className="space-y-3">
+        {[0, 1, 2].map((i) => (
+          <div key={i} className="relative h-24 overflow-hidden rounded-card border border-[color:var(--hairline)]">
+            <div className="absolute inset-0 skeleton-shimmer" style={{ animationDelay: `${i * 60}ms` }} />
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}
+
+// Goals list component with empty state
+function GoalsList({
+  goals,
+  onComplete,
+  onUncomplete,
+  isPending,
+  emptyMessage,
+}: {
+  goals: DevPlanGoal[];
+  onComplete: (goalId: string) => void;
+  onUncomplete: (goalId: string) => void;
+  isPending: boolean;
+  emptyMessage: string;
+}) {
+  if (goals.length === 0) {
+    return <p className="py-10 text-center font-annual text-body-sm text-text-tertiary">{emptyMessage}</p>;
+  }
+
+  return (
+    <div className="space-y-3">
+      <AnimatePresence mode="popLayout">
+        {goals.map((goal) => (
+          <GoalCard key={goal.id} goal={goal} onComplete={onComplete} onUncomplete={onUncomplete} isPending={isPending} />
+        ))}
+      </AnimatePresence>
+    </div>
+  );
+}
+
+export default function DevPlanClient() {
+  const { user, player, loading: authLoading } = useAuth();
+  const { showToast } = useToast();
+  const [plan, setPlan] = useState<DevelopmentalPlanWithGoals | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [isPending, startTransition] = useTransition();
+  const [activeTab, setActiveTab] = useState('active');
+
+  // Fetch plan data
+  const fetchPlan = useCallback(async () => {
+    if (!player?.id) return;
+
+    try {
+      const data = await getActiveDevPlan(player.id);
+      setPlan(data);
+    } catch (err) {
+      console.error('Error fetching dev plan:', err);
+      setError('Failed to load your development plan');
+    } finally {
+      setIsLoading(false);
+    }
+  }, [player?.id]);
+
+  useEffect(() => {
+    if (player?.id) {
+      fetchPlan();
+    }
+  }, [player?.id, fetchPlan]);
+
+  // Handle goal completion
+  const handleComplete = useCallback(
+    (goalId: string) => {
+      if (!plan) return;
+
+      startTransition(async () => {
+        try {
+          await completeGoalAsPlayer(plan.id, goalId);
+          await fetchPlan();
+        } catch {
+          showToast('Could not mark goal complete', 'error');
+        }
+      });
+    },
+    [plan, fetchPlan, showToast]
+  );
+
+  // Handle goal uncomplete
+  const handleUncomplete = useCallback(
+    (goalId: string) => {
+      if (!plan) return;
+
+      startTransition(async () => {
+        try {
+          await uncompleteGoalAsPlayer(plan.id, goalId);
+          await fetchPlan();
+        } catch {
+          showToast('Could not update goal', 'error');
+        }
+      });
+    },
+    [plan, fetchPlan, showToast]
+  );
+
+  // Categorize goals
+  const categorizedGoals = useMemo(() => {
+    if (!plan?.goals) return { active: [], upcoming: [], completed: [], all: [] };
+
+    const now = new Date();
+    now.setHours(0, 0, 0, 0);
+
+    const completed = plan.goals.filter((g) => g.status === 'completed');
+    const notCompleted = plan.goals.filter((g) => g.status !== 'completed');
+
+    // Upcoming: not started AND target date is > 7 days away
+    const upcoming = notCompleted.filter((g) => {
+      if (g.status !== 'not_started') return false;
+      if (!g.target_date) return false;
+      const targetDate = new Date(g.target_date);
+      targetDate.setHours(0, 0, 0, 0);
+      const diffDays = Math.ceil((targetDate.getTime() - now.getTime()) / (1000 * 60 * 60 * 24));
+      return diffDays > 7;
+    });
+
+    // Active: in progress OR (not started AND due within 7 days OR no target date)
+    const active = notCompleted.filter((g) => !upcoming.includes(g));
+
+    return {
+      active,
+      upcoming,
+      completed,
+      all: plan.goals,
+    };
+  }, [plan?.goals]);
+
+  // Stats
+  const totalGoals = plan?.goals.length || 0;
+  const completedCount = categorizedGoals.completed.length;
+  const activeCount = categorizedGoals.active.length;
+  const upcomingCount = categorizedGoals.upcoming.length;
+  const completionPercent = totalGoals > 0 ? Math.round((completedCount / totalGoals) * 100) : 0;
+
+  // Average progress of active goals
+  const avgProgress = useMemo(() => {
+    if (categorizedGoals.active.length === 0) return 0;
+    const total = categorizedGoals.active.reduce((sum, g) => sum + g.progress, 0);
+    return Math.round(total / categorizedGoals.active.length);
+  }, [categorizedGoals.active]);
+
+  if (authLoading) return <PageLoading />;
+
+  if (user?.role !== 'player') {
+    return (
+      <div className={fairwayScope('min-h-full')}>
+        <div className="mx-auto max-w-lg px-4 py-12 sm:px-6 sm:py-16 lg:px-8">
+          <EditorsLetter ink="team" title="Players only" body="Only players can access this page." />
+        </div>
+      </div>
+    );
+  }
+
+  const allDone = activeCount === 0 && upcomingCount === 0 && completedCount > 0;
+
+  return (
+    <div className={fairwayScope('min-h-full')}>
+      <div className="mx-auto w-full max-w-[880px] px-4 py-8 sm:px-6 lg:py-10">
+        <Reveal>
+          <SectionMasthead eyebrow="THE PASSPORT · DEVELOPMENT PLAN" title="My Development Plan" ink="team">
+            <p className="max-w-prose font-annual text-body-lg leading-relaxed text-text-secondary">
+              {plan ? `Assigned by ${plan.coach?.full_name || 'Your Coach'}` : 'Track your progress and complete goals set by your coach.'}
+            </p>
+          </SectionMasthead>
+        </Reveal>
+
+        <div className="mt-8">
+          {isLoading ? (
+            <DevPlanSkeleton />
+          ) : error ? (
+            <EditorsLetter
+              ink="team"
+              title="Development plan unavailable"
+              body={error}
+              action={
+                <Button
+                  variant="secondary"
+                  onClick={() => {
+                    setIsLoading(true);
+                    setError(null);
+                    void fetchPlan();
+                  }}
+                >
+                  Try again
+                </Button>
+              }
+            />
+          ) : !plan ? (
+            <div className="space-y-8">
+              <EmptyIssue variant="dev-plan" ink="team" />
+
+              <PaperCard className="p-6">
+                <Eyebrow ink="team">How it works</Eyebrow>
+                <div className="mt-4 divide-y divide-[color:var(--hairline)]">
+                  {HOW_IT_WORKS.map((step, i) => (
+                    <div key={step.title} className="flex gap-4 py-4 first:pt-0 last:pb-0">
+                      <span className="flex h-6 w-6 flex-shrink-0 items-center justify-center rounded-full border border-grade-plus font-annual text-body-sm text-grade-plus">
+                        {i + 1}
+                      </span>
+                      <div>
+                        <p className="font-annual text-body text-text-primary">{step.title}</p>
+                        <p className="mt-0.5 font-annual text-body-sm leading-relaxed text-text-secondary">{step.body}</p>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              </PaperCard>
+            </div>
+          ) : (
+            <div className="space-y-8">
+              {/* Progress overview */}
+              <PaperCard registrationTick className="p-6">
+                <Eyebrow ink="team">Progress</Eyebrow>
+                <div className="mt-3">
+                  <RuledStatLine label="Complete" value={completionPercent} unit="%" size="row" ink="team" emphasis={completionPercent >= 100} />
+                </div>
+
+                <div className="mt-8 grid grid-cols-1 gap-x-8 gap-y-6 sm:grid-cols-3">
+                  <div>
+                    <RuledStatLine label="Active" value={activeCount} size="row" ink="team" />
+                    {avgProgress > 0 ? (
+                      <p className="mt-1.5 text-eyebrow uppercase tracking-[0.14em] text-text-tertiary">{avgProgress}% avg progress</p>
+                    ) : null}
+                  </div>
+                  <div>
+                    <RuledStatLine label="Upcoming" value={upcomingCount} size="row" ink="team" />
+                    <p className="mt-1.5 text-eyebrow uppercase tracking-[0.14em] text-text-tertiary">goals queued</p>
+                  </div>
+                  <div>
+                    <RuledStatLine label="Done" value={completedCount} size="row" ink="team" emphasis={completedCount > 0} />
+                    <p className="mt-1.5 text-eyebrow uppercase tracking-[0.14em] text-text-tertiary">of {totalGoals} goals</p>
+                  </div>
+                </div>
+              </PaperCard>
+
+              {/* Plan header */}
+              {plan.description ? (
+                <PaperCard className="p-6">
+                  <div className="flex flex-wrap items-center gap-2">
+                    <Eyebrow ink="team">{plan.title}</Eyebrow>
+                    {plan.status ? (
+                      <InkBadge
+                        label={plan.status === 'in_progress' ? 'In progress' : 'Sent'}
+                        tone="team"
+                        variant={plan.status === 'in_progress' ? 'solid' : 'soft'}
+                      />
+                    ) : null}
+                  </div>
+                  <p className="mt-2 font-annual text-body leading-relaxed text-text-secondary">{plan.description}</p>
+                  {plan.start_date || plan.end_date ? (
+                    <div className="mt-3 flex flex-wrap items-center gap-2 text-eyebrow uppercase tracking-[0.14em] text-text-tertiary">
+                      <IconCalendar size={14} className="flex-shrink-0" />
+                      {plan.start_date ? <span>Started {new Date(plan.start_date).toLocaleDateString()}</span> : null}
+                      {plan.start_date && plan.end_date ? <span aria-hidden>·</span> : null}
+                      {plan.end_date ? <span>Ends {new Date(plan.end_date).toLocaleDateString()}</span> : null}
+                    </div>
+                  ) : null}
+                </PaperCard>
+              ) : null}
+
+              {/* Goals with Tabs */}
+              <Tabs defaultValue="active" value={activeTab} onChange={setActiveTab}>
+                <TabsList className="mb-4">
+                  <TabsTrigger value="active" icon={<IconTarget size={16} />} badge={activeCount > 0 ? activeCount : undefined}>
+                    Active
+                  </TabsTrigger>
+                  <TabsTrigger value="upcoming" icon={<IconClock size={16} />} badge={upcomingCount > 0 ? upcomingCount : undefined}>
+                    Upcoming
+                  </TabsTrigger>
+                  <TabsTrigger value="completed" icon={<IconCheck size={16} />} badge={completedCount > 0 ? completedCount : undefined}>
+                    Completed
+                  </TabsTrigger>
+                  <TabsTrigger value="all" icon={<IconList size={16} />} badge={totalGoals}>
+                    All
+                  </TabsTrigger>
+                </TabsList>
+
+                <TabsContent value="active">
+                  <GoalsList
+                    goals={categorizedGoals.active}
+                    onComplete={handleComplete}
+                    onUncomplete={handleUncomplete}
+                    isPending={isPending}
+                    emptyMessage="No active goals right now. Check upcoming or completed."
+                  />
+                </TabsContent>
+
+                <TabsContent value="upcoming">
+                  <GoalsList
+                    goals={categorizedGoals.upcoming}
+                    onComplete={handleComplete}
+                    onUncomplete={handleUncomplete}
+                    isPending={isPending}
+                    emptyMessage="No upcoming goals. All your goals are active or completed."
+                  />
+                </TabsContent>
+
+                <TabsContent value="completed">
+                  <GoalsList
+                    goals={categorizedGoals.completed}
+                    onComplete={handleComplete}
+                    onUncomplete={handleUncomplete}
+                    isPending={isPending}
+                    emptyMessage="No completed goals yet. Keep working on your active goals."
+                  />
+                </TabsContent>
+
+                <TabsContent value="all">
+                  <GoalsList
+                    goals={categorizedGoals.all}
+                    onComplete={handleComplete}
+                    onUncomplete={handleUncomplete}
+                    isPending={isPending}
+                    emptyMessage="No goals in your plan yet."
+                  />
+                </TabsContent>
+              </Tabs>
+
+              {/* All goals completed */}
+              {allDone ? (
+                <Reveal>
+                  <EditorsLetter
+                    ink="team"
+                    title="All goals complete."
+                    body="You've completed every goal in this plan. Check back soon for new challenges from your coach."
+                  />
+                </Reveal>
+              ) : null}
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/app/baseball/(dashboard)/dashboard/dev-plan/page.tsx b/src/app/baseball/(dashboard)/dashboard/dev-plan/page.tsx
index a3b540529..4ff63d422 100644
--- a/src/app/baseball/(dashboard)/dashboard/dev-plan/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/dev-plan/page.tsx
@@ -1,745 +1,24 @@
-'use client';
-
-import { useEffect, useState, useCallback, useTransition, useMemo } from 'react';
-import { motion, AnimatePresence, useReducedMotion } from 'framer-motion';
-import { Header } from '@/components/layout/header';
-import { Card, CardContent, CardHeader } from '@/components/ui/card';
-import { PageLoading } from '@/components/ui/loading';
-import { Skeleton } from '@/components/ui/skeleton';
-import { ProgressRing } from '@/components/ui/progress-ring';
-import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';
-import { cn } from '@/lib/utils';
-import {
-  IconNote,
-  IconTarget,
-  IconCheck,
-  IconClock,
-  IconMessage,
-  IconCalendar,
-  IconSparkles,
-  IconChevronDown,
-  IconChevronUp,
-  IconTrendingUp,
-  IconList,
-} from '@/components/icons';
-import { useAuth } from '@/hooks/use-auth';
-import { Button } from '@/components/ui/button';
-import { useToast } from '@/components/ui/sonner';
-import { ReadModelStateNotice } from '@/components/baseball/ReadModelStateNotice';
-import {
-  getActiveDevPlan,
-  completeGoalAsPlayer,
-  uncompleteGoalAsPlayer,
-  type DevelopmentalPlanWithGoals,
-  type DevPlanGoal,
-} from '@/app/baseball/actions/dev-plans';
-
-// Helper to calculate days until/since a date
-function getDaysUntil(dateStr: string): { days: number; label: string; isOverdue: boolean; isUpcoming: boolean } {
-  const target = new Date(dateStr);
-  const today = new Date();
-  today.setHours(0, 0, 0, 0);
-  target.setHours(0, 0, 0, 0);
-
-  const diffTime = target.getTime() - today.getTime();
-  const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
-
-  if (diffDays < 0) {
-    return { days: Math.abs(diffDays), label: `${Math.abs(diffDays)} day${Math.abs(diffDays) !== 1 ? 's' : ''} overdue`, isOverdue: true, isUpcoming: false };
-  } else if (diffDays === 0) {
-    return { days: 0, label: 'Due today', isOverdue: false, isUpcoming: false };
-  } else if (diffDays === 1) {
-    return { days: 1, label: 'Due tomorrow', isOverdue: false, isUpcoming: false };
-  } else if (diffDays > 7) {
-    return { days: diffDays, label: `Due in ${diffDays} days`, isOverdue: false, isUpcoming: true };
-  } else {
-    return { days: diffDays, label: `Due in ${diffDays} days`, isOverdue: false, isUpcoming: false };
-  }
-}
-
-// Goal card component
-function GoalCard({
-  goal,
-  planId: _planId,
-  onComplete,
-  onUncomplete,
-  isPending,
-}: {
-  goal: DevPlanGoal;
-  planId: string; // Reserved for future use (e.g., deep links)
-  onComplete: (goalId: string) => void;
-  onUncomplete: (goalId: string) => void;
-  isPending: boolean;
-}) {
-  const prefersReducedMotion = useReducedMotion();
-  const [isExpanded, setIsExpanded] = useState(false);
-  const isCompleted = goal.status === 'completed';
-  const dueInfo = goal.target_date ? getDaysUntil(goal.target_date) : null;
-
-  return (
-    <motion.div
-      layout
-      initial={prefersReducedMotion ? false : ({ opacity: 0, y: 20 })}
-      animate={{ opacity: 1, y: 0 }}
-      exit={{ opacity: 0, y: -20 }}
-      className={cn(
-        'rounded-2xl border p-4 transition-all',
-        isCompleted
-          ? 'bg-primary-50/50 border-primary-200 backdrop-blur-xl'
-          : 'glass-standard shadow-glass hover:bg-cream-100 hover:shadow-card-hover'
-      )}
-    >
-      <div className="flex items-start gap-3">
-        {/* Checkbox */}
-        <Button variant="primary"
-          onClick={() => (isCompleted ? onUncomplete(goal.id) : onComplete(goal.id))}
-          disabled={isPending}
-          className={cn(
-            'mt-0.5 w-6 h-6 rounded-full border-2 flex items-center justify-center flex-shrink-0 transition-all',
-            isCompleted
-              ? 'bg-primary-500 border-primary-500 text-white'
-              : 'border-warm-300 hover:border-primary-400 hover:bg-primary-50',
-            isPending && 'opacity-50 cursor-not-allowed'
-          )}
-          aria-label={isCompleted ? 'Mark as incomplete' : 'Mark as complete'}
-        >
-          <AnimatePresence>
-            {isCompleted && (
-              <motion.span
-                initial={prefersReducedMotion ? false : ({ scale: 0 })}
-                animate={{ scale: 1 }}
-                exit={{ scale: 0 }}
-              >
-                <IconCheck size={14} />
-              </motion.span>
-            )}
-          </AnimatePresence>
-        </Button>
-
-        {/* Content */}
-        <div className="flex-1 min-w-0">
-          <div className="flex items-start justify-between gap-2">
-            <div className="flex-1">
-              <h4
-                className={cn(
-                  'font-medium text-sm',
-                  isCompleted ? 'text-primary-700 line-through' : 'text-warm-900'
-                )}
-              >
-                {goal.title}
-              </h4>
-              {goal.category && (
-                <span className="text-xs text-warm-500 mt-0.5 inline-block">
-                  {goal.category}
-                </span>
-              )}
-            </div>
-
-            {/* Due date badge */}
-            {dueInfo && !isCompleted && (
-              <span
-                className={cn(
-                  'text-xs px-2 py-1 rounded-full flex-shrink-0 font-medium',
-                  dueInfo.isOverdue
-                    ? 'bg-red-100 text-red-700'
-                    : dueInfo.days <= 3
-                    ? 'bg-amber-100 text-amber-700'
-                    : dueInfo.isUpcoming
-                    ? 'bg-blue-50 text-blue-600'
-                    : 'bg-warm-100 text-warm-600'
-                )}
-              >
-                {dueInfo.label}
-              </span>
-            )}
-          </div>
-
-          {/* Progress bar */}
-          {!isCompleted && (
-            <div className="mt-3">
-              <div className="flex items-center justify-between text-xs text-warm-500 mb-1">
-                <span>Progress</span>
-                <span className="font-medium">{goal.progress}%</span>
-              </div>
-              <div className="h-2 bg-warm-100 rounded-full overflow-hidden">
-                <motion.div
-                  className={cn(
-                    'h-full rounded-full',
-                    goal.progress >= 75
-                      ? 'bg-primary-500'
-                      : goal.progress >= 50
-                      ? 'bg-blue-500'
-                      : goal.progress >= 25
-                      ? 'bg-amber-500'
-                      : 'bg-warm-300'
-                  )}
-                  initial={prefersReducedMotion ? false : ({ width: 0 })}
-                  animate={{ width: `${goal.progress}%` }}
-                  transition={prefersReducedMotion ? { duration: 0 } : ({ duration: 0.5, ease: 'easeOut' })}
-                />
-              </div>
-            </div>
-          )}
-
-          {/* Expand button for description/notes */}
-          {(goal.description || goal.coach_notes) && (
-            <Button variant="ghost"
-              onClick={() => setIsExpanded(!isExpanded)}
-              className="mt-2 flex items-center gap-1 text-xs text-warm-500 hover:text-warm-700 transition-colors"
-            >
-              {isExpanded ? <IconChevronUp size={14} /> : <IconChevronDown size={14} />}
-              {isExpanded ? 'Show less' : 'Show more'}
-            </Button>
-          )}
-
-          {/* Expanded content */}
-          <AnimatePresence>
-            {isExpanded && (
-              <motion.div
-                initial={prefersReducedMotion ? false : ({ height: 0, opacity: 0 })}
-                animate={{ height: 'auto', opacity: 1 }}
-                exit={{ height: 0, opacity: 0 }}
-                className="overflow-hidden"
-              >
-                <div className="pt-3 space-y-3">
-                  {goal.description && (
-                    <p className="text-sm text-warm-600">{goal.description}</p>
-                  )}
-                  {goal.coach_notes && (
-                    <div className="flex items-start gap-2 p-3 bg-blue-50 rounded-lg border border-blue-100">
-                      <IconMessage size={16} className="text-blue-600 flex-shrink-0 mt-0.5" />
-                      <div>
-                        <p className="text-xs font-medium text-blue-700 mb-1">Coach Notes</p>
-                        <p className="text-sm text-blue-800">{goal.coach_notes}</p>
-                      </div>
-                    </div>
-                  )}
-                </div>
-              </motion.div>
-            )}
-          </AnimatePresence>
-
-          {/* Completion date */}
-          {isCompleted && goal.completed_at && (
-            <p className="text-xs text-primary-600 mt-2 flex items-center gap-1">
-              <IconCheck size={12} />
-              Completed {new Date(goal.completed_at).toLocaleDateString()}
-            </p>
-          )}
-        </div>
-      </div>
-    </motion.div>
-  );
-}
-
-// Loading skeleton for dev plan
-function DevPlanSkeleton() {
-  return (
-    <>
-      {/* Progress overview skeleton */}
-      <Card variant="glass" className="mb-6">
-        <CardContent className="p-6">
-          <div className="flex flex-col sm:flex-row items-center gap-6">
-            <Skeleton className="w-28 h-28 rounded-full" />
-            <div className="flex-1 grid grid-cols-3 gap-4 w-full">
-              {[1, 2, 3].map((i) => (
-                <div key={i} className="text-center sm:text-left">
-                  <Skeleton className="h-3 w-16 mx-auto sm:mx-0 mb-2" />
-                  <Skeleton className="h-8 w-12 mx-auto sm:mx-0" />
-                </div>
-              ))}
-            </div>
-          </div>
-        </CardContent>
-      </Card>
-
-      {/* Tabs skeleton */}
-      <Skeleton className="h-12 w-full mb-6 rounded-lg" />
-
-      {/* Goals skeleton */}
-      <div className="space-y-3">
-        {[1, 2, 3].map((i) => (
-          <div key={i} className="rounded-xl border border-warm-200 p-4 bg-cream-50">
-            <div className="flex items-start gap-3">
-              <Skeleton className="w-6 h-6 rounded-full flex-shrink-0" />
-              <div className="flex-1 space-y-3">
-                <Skeleton className="h-4 w-2/3" />
-                <Skeleton className="h-3 w-1/4" />
-                <div className="space-y-1">
-                  <Skeleton className="h-2 w-full" />
-                </div>
-              </div>
-            </div>
-          </div>
-        ))}
-      </div>
-    </>
-  );
-}
-
-// Empty state
-function EmptyState() {
-  return (
-    <Card variant="glass">
-      <CardContent className="p-12 text-center">
-        <div className="w-20 h-20 rounded-full bg-primary-50 flex items-center justify-center mx-auto mb-6">
-          <IconNote size={40} className="text-primary-400" />
-        </div>
-        <h3 className="text-xl font-semibold text-warm-900 mb-2">
-          No development plan yet
-        </h3>
-        <p className="text-sm leading-relaxed text-warm-500 max-w-md mx-auto mb-6">
-          Your coach hasn't sent a development plan yet. Once they send one, you'll see your goals and track your progress here.
-        </p>
-        <div className="inline-flex items-center gap-2 px-4 py-2 rounded-full bg-primary-50 text-primary-700 text-sm font-medium">
-          <IconSparkles size={16} />
-          Check back soon!
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
-
-// Goals list component with empty state
-function GoalsList({
-  goals,
-  planId,
-  onComplete,
-  onUncomplete,
-  isPending,
-  emptyMessage,
-  emptyIcon: EmptyIcon,
-}: {
-  goals: DevPlanGoal[];
-  planId: string;
-  onComplete: (goalId: string) => void;
-  onUncomplete: (goalId: string) => void;
-  isPending: boolean;
-  emptyMessage: string;
-  emptyIcon: React.ComponentType<{ size?: number; className?: string }>;
-}) {
-  if (goals.length === 0) {
-    return (
-      <div className="py-12 text-center">
-        <div className="w-12 h-12 rounded-full bg-warm-100 flex items-center justify-center mx-auto mb-3">
-          <EmptyIcon size={24} className="text-warm-400" />
-        </div>
-        <p className="text-sm text-warm-500">{emptyMessage}</p>
-      </div>
-    );
-  }
-
-  return (
-    <div className="space-y-3">
-      <AnimatePresence mode="popLayout">
-        {goals.map((goal) => (
-          <GoalCard
-            key={goal.id}
-            goal={goal}
-            planId={planId}
-            onComplete={onComplete}
-            onUncomplete={onUncomplete}
-            isPending={isPending}
-          />
-        ))}
-      </AnimatePresence>
-    </div>
-  );
-}
-
-export default function PlayerDevPlanPage() {
-  const prefersReducedMotion = useReducedMotion();
-  const { user, player, loading: authLoading } = useAuth();
-  const { showToast } = useToast();
-  const [plan, setPlan] = useState<DevelopmentalPlanWithGoals | null>(null);
-  const [isLoading, setIsLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-  const [isPending, startTransition] = useTransition();
-  const [activeTab, setActiveTab] = useState('active');
-
-  // Fetch plan data
-  const fetchPlan = useCallback(async () => {
-    if (!player?.id) return;
-
-    try {
-      const data = await getActiveDevPlan(player.id);
-      setPlan(data);
-    } catch (err) {
-      console.error('Error fetching dev plan:', err);
-      setError('Failed to load your development plan');
-    } finally {
-      setIsLoading(false);
-    }
-  }, [player?.id]);
-
-  useEffect(() => {
-    if (player?.id) {
-      fetchPlan();
-    }
-  }, [player?.id, fetchPlan]);
-
-  // Handle goal completion
-  const handleComplete = useCallback(
-    (goalId: string) => {
-      if (!plan) return;
-
-      startTransition(async () => {
-        try {
-          await completeGoalAsPlayer(plan.id, goalId);
-          await fetchPlan();
-        } catch {
-          showToast('Could not mark goal complete', 'error');
-        }
-      });
-    },
-    [plan, fetchPlan, showToast]
-  );
-
-  // Handle goal uncomplete
-  const handleUncomplete = useCallback(
-    (goalId: string) => {
-      if (!plan) return;
-
-      startTransition(async () => {
-        try {
-          await uncompleteGoalAsPlayer(plan.id, goalId);
-          await fetchPlan();
-        } catch {
-          showToast('Could not update goal', 'error');
-        }
-      });
-    },
-    [plan, fetchPlan, showToast]
-  );
-
-  // Categorize goals
-  const categorizedGoals = useMemo(() => {
-    if (!plan?.goals) return { active: [], upcoming: [], completed: [], all: [] };
-
-    const now = new Date();
-    now.setHours(0, 0, 0, 0);
-
-    const completed = plan.goals.filter((g) => g.status === 'completed');
-    const notCompleted = plan.goals.filter((g) => g.status !== 'completed');
-
-    // Upcoming: not started AND target date is > 7 days away
-    const upcoming = notCompleted.filter((g) => {
-      if (g.status !== 'not_started') return false;
-      if (!g.target_date) return false;
-      const targetDate = new Date(g.target_date);
-      targetDate.setHours(0, 0, 0, 0);
-      const diffDays = Math.ceil((targetDate.getTime() - now.getTime()) / (1000 * 60 * 60 * 24));
-      return diffDays > 7;
-    });
-
-    // Active: in progress OR (not started AND due within 7 days OR no target date)
-    const active = notCompleted.filter((g) => !upcoming.includes(g));
-
-    return {
-      active,
-      upcoming,
-      completed,
-      all: plan.goals,
-    };
-  }, [plan?.goals]);
-
-  // Stats
-  const totalGoals = plan?.goals.length || 0;
-  const completedCount = categorizedGoals.completed.length;
-  const activeCount = categorizedGoals.active.length;
-  const upcomingCount = categorizedGoals.upcoming.length;
-  const completionPercent = totalGoals > 0 ? Math.round((completedCount / totalGoals) * 100) : 0;
-
-  // Average progress of active goals
-  const avgProgress = useMemo(() => {
-    if (categorizedGoals.active.length === 0) return 0;
-    const total = categorizedGoals.active.reduce((sum, g) => sum + g.progress, 0);
-    return Math.round(total / categorizedGoals.active.length);
-  }, [categorizedGoals.active]);
-
-  if (authLoading) return <PageLoading />;
-
-  if (user?.role !== 'player') {
-    return (
-      <div className="p-8">
-        <Card variant="glass">
-          <CardContent className="p-12 text-center">
-            <p className="text-warm-500">Only players can access this page.</p>
-          </CardContent>
-        </Card>
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <Header
-        title="My Development Plan"
-        subtitle={plan ? `Assigned by ${plan.coach?.full_name || 'Your Coach'}` : 'Track your progress and complete goals set by your coach'}
-      />
-
-      <div className="p-4 md:p-8">
-        {isLoading ? (
-          <DevPlanSkeleton />
-        ) : error ? (
-          <ReadModelStateNotice
-            state="error"
-            title="Development plan unavailable"
-            onRetry={() => {
-              setIsLoading(true);
-              setError(null);
-              void fetchPlan();
-            }}
-          />
-        ) : !plan ? (
-          <>
-            <EmptyState />
-
-            {/* How it works card */}
-            <Card className="mt-6">
-              <CardHeader>
-                <h2 className="font-semibold text-warm-900">How Development Plans Work</h2>
-              </CardHeader>
-              <CardContent>
-                <ul className="space-y-3 text-sm text-warm-600">
-                  <li className="flex gap-3">
-                    <span className="flex-shrink-0 w-6 h-6 rounded-full bg-primary-100 text-primary-700 font-medium flex items-center justify-center text-xs">
-                      1
-                    </span>
-                    <div>
-                      <span className="font-medium text-warm-900">Coach creates your plan</span>
-                      <p className="text-warm-500 mt-0.5">
-                        Your coach will set specific goals and drills tailored to your needs
-                      </p>
-                    </div>
-                  </li>
-                  <li className="flex gap-3">
-                    <span className="flex-shrink-0 w-6 h-6 rounded-full bg-primary-100 text-primary-700 font-medium flex items-center justify-center text-xs">
-                      2
-                    </span>
-                    <div>
-                      <span className="font-medium text-warm-900">Work on your goals</span>
-                      <p className="text-warm-500 mt-0.5">
-                        Follow the drills and practice routines to improve your skills
-                      </p>
-                    </div>
-                  </li>
-                  <li className="flex gap-3">
-                    <span className="flex-shrink-0 w-6 h-6 rounded-full bg-primary-100 text-primary-700 font-medium flex items-center justify-center text-xs">
-                      3
-                    </span>
-                    <div>
-                      <span className="font-medium text-warm-900">Track your progress</span>
-                      <p className="text-warm-500 mt-0.5">
-                        Mark goals as complete and see how far you've come
-                      </p>
-                    </div>
-                  </li>
-                  <li className="flex gap-3">
-                    <span className="flex-shrink-0 w-6 h-6 rounded-full bg-primary-100 text-primary-700 font-medium flex items-center justify-center text-xs">
-                      4
-                    </span>
-                    <div>
-                      <span className="font-medium text-warm-900">Celebrate achievements</span>
-                      <p className="text-warm-500 mt-0.5">
-                        Your coach will review your progress and set new goals
-                      </p>
-                    </div>
-                  </li>
-                </ul>
-              </CardContent>
-            </Card>
-          </>
-        ) : (
-          <>
-            {/* Progress Overview with Circular Ring */}
-            <Card variant="glass" className="mb-6">
-              <CardContent className="p-6">
-                <div className="flex flex-col sm:flex-row items-center gap-6">
-                  {/* Circular progress */}
-                  <div className="flex-shrink-0">
-                    <ProgressRing
-                      value={completionPercent}
-                      size="lg"
-                      color="primary"
-                      label="Complete"
-                    />
-                  </div>
-
-                  {/* Stats grid */}
-                  <div className="flex-1 grid grid-cols-3 gap-4 w-full">
-                    <div className="text-center sm:text-left">
-                      <p className="text-xs font-medium text-warm-500 uppercase tracking-wide">Active</p>
-                      <p className="text-2xl font-semibold text-warm-900 mt-1">{activeCount}</p>
-                      {avgProgress > 0 && (
-                        <p className="text-xs text-warm-500 mt-0.5 flex items-center gap-1 justify-center sm:justify-start">
-                          <IconTrendingUp size={12} className="text-primary-500" />
-                          {avgProgress}% avg progress
-                        </p>
-                      )}
-                    </div>
-                    <div className="text-center sm:text-left">
-                      <p className="text-xs font-medium text-warm-500 uppercase tracking-wide">Upcoming</p>
-                      <p className="text-2xl font-semibold text-warm-900 mt-1">{upcomingCount}</p>
-                      <p className="text-xs text-warm-500 mt-0.5">goals queued</p>
-                    </div>
-                    <div className="text-center sm:text-left">
-                      <p className="text-xs font-medium text-warm-500 uppercase tracking-wide">Done</p>
-                      <p className="text-2xl font-semibold text-primary-600 mt-1">{completedCount}</p>
-                      <p className="text-xs text-warm-500 mt-0.5">of {totalGoals} goals</p>
-                    </div>
-                  </div>
-                </div>
-              </CardContent>
-            </Card>
-
-            {/* Plan Header */}
-            {plan.description && (
-              <Card variant="glass" className="mb-6">
-                <CardContent className="p-4 md:p-6">
-                  <div className="flex items-start gap-3">
-                    <div className="w-10 h-10 rounded-full bg-primary-100 flex items-center justify-center flex-shrink-0">
-                      <IconTarget size={20} className="text-primary-600" />
-                    </div>
-                    <div>
-                      <div className="flex items-center gap-2 flex-wrap">
-                        <h3 className="font-semibold text-warm-900">{plan.title}</h3>
-                        {plan.status && (
-                          <span
-                            className={cn(
-                              'text-xs px-2 py-0.5 rounded-full font-medium flex-shrink-0',
-                              plan.status === 'in_progress'
-                                ? 'bg-blue-100 text-blue-700'
-                                : 'bg-primary-100 text-primary-700'
-                            )}
-                          >
-                            {plan.status === 'in_progress' ? 'In Progress' : 'Sent'}
-                          </span>
-                        )}
-                      </div>
-                      <p className="text-sm text-warm-600 mt-1">{plan.description}</p>
-                      {(plan.start_date || plan.end_date) && (
-                        <div className="flex items-center gap-2 mt-2 text-xs text-warm-500">
-                          <IconCalendar size={14} />
-                          {plan.start_date && (
-                            <span>Started {new Date(plan.start_date).toLocaleDateString()}</span>
-                          )}
-                          {plan.start_date && plan.end_date && <span>•</span>}
-                          {plan.end_date && (
-                            <span>Ends {new Date(plan.end_date).toLocaleDateString()}</span>
-                          )}
-                        </div>
-                      )}
-                    </div>
-                  </div>
-                </CardContent>
-              </Card>
-            )}
-
-            {/* Goals with Tabs */}
-            <Tabs defaultValue="active" value={activeTab} onChange={setActiveTab}>
-              <TabsList className="mb-4">
-                <TabsTrigger
-                  value="active"
-                  icon={<IconTarget size={16} />}
-                  badge={activeCount > 0 ? activeCount : undefined}
-                >
-                  Active
-                </TabsTrigger>
-                <TabsTrigger
-                  value="upcoming"
-                  icon={<IconClock size={16} />}
-                  badge={upcomingCount > 0 ? upcomingCount : undefined}
-                >
-                  Upcoming
-                </TabsTrigger>
-                <TabsTrigger
-                  value="completed"
-                  icon={<IconCheck size={16} />}
-                  badge={completedCount > 0 ? completedCount : undefined}
-                >
-                  Completed
-                </TabsTrigger>
-                <TabsTrigger value="all" icon={<IconList size={16} />} badge={totalGoals}>
-                  All
-                </TabsTrigger>
-              </TabsList>
-
-              <TabsContent value="active">
-                <GoalsList
-                  goals={categorizedGoals.active}
-                  planId={plan.id}
-                  onComplete={handleComplete}
-                  onUncomplete={handleUncomplete}
-                  isPending={isPending}
-                  emptyMessage="No active goals right now. Check upcoming or completed tabs."
-                  emptyIcon={IconTarget}
-                />
-              </TabsContent>
-
-              <TabsContent value="upcoming">
-                <GoalsList
-                  goals={categorizedGoals.upcoming}
-                  planId={plan.id}
-                  onComplete={handleComplete}
-                  onUncomplete={handleUncomplete}
-                  isPending={isPending}
-                  emptyMessage="No upcoming goals. All your goals are active or completed!"
-                  emptyIcon={IconClock}
-                />
-              </TabsContent>
-
-              <TabsContent value="completed">
-                <GoalsList
-                  goals={categorizedGoals.completed}
-                  planId={plan.id}
-                  onComplete={handleComplete}
-                  onUncomplete={handleUncomplete}
-                  isPending={isPending}
-                  emptyMessage="No completed goals yet. Keep working on your active goals!"
-                  emptyIcon={IconCheck}
-                />
-              </TabsContent>
-
-              <TabsContent value="all">
-                <GoalsList
-                  goals={categorizedGoals.all}
-                  planId={plan.id}
-                  onComplete={handleComplete}
-                  onUncomplete={handleUncomplete}
-                  isPending={isPending}
-                  emptyMessage="No goals in your plan yet."
-                  emptyIcon={IconNote}
-                />
-              </TabsContent>
-            </Tabs>
-
-            {/* All goals completed celebration */}
-            {activeCount === 0 && upcomingCount === 0 && completedCount > 0 && (
-              <motion.div
-                initial={prefersReducedMotion ? false : ({ opacity: 0, scale: 0.95 })}
-                animate={{ opacity: 1, scale: 1 }}
-                className="mt-6"
-              >
-                <Card variant="glass" className="border-primary-200 bg-primary-50/50">
-                  <CardContent className="p-6 text-center">
-                    <div className="w-16 h-16 rounded-full bg-primary-100 flex items-center justify-center mx-auto mb-4">
-                      <IconSparkles size={32} className="text-primary-600" />
-                    </div>
-                    <h3 className="text-lg font-semibold text-primary-900 mb-2">
-                      Congratulations! 🎉
-                    </h3>
-                    <p className="text-sm text-primary-700">
-                      You've completed all your goals! Check back soon for new challenges from your
-                      coach.
-                    </p>
-                  </CardContent>
-                </Card>
-              </motion.div>
-            )}
-          </>
-        )}
-      </div>
-    </>
-  );
+// =============================================================================
+// src/app/baseball/(dashboard)/dashboard/dev-plan/page.tsx
+//
+// COHERENCE_RULING_2026-07-08 Ruling 5 — "dev-plan cold-URL bounce" fix.
+//
+// Was fully client-rendered (own useAuth + getActiveDevPlan fetch cycle),
+// which raced (dashboard)/layout.tsx's client-side DashboardSessionGuard on a
+// hard/cold navigation straight to this URL: both the guard's auth/nav-context
+// resolution and this page's own auth resolution ran as separate async client
+// hooks with no ordering guarantee, occasionally producing a transient 500
+// before the guard's redirect settled. Server-resolving the player session
+// FIRST (requireBaseballPlayerRoute — redirects synchronously server-side,
+// before any client hydration is even possible) removes the race outright.
+// Matches the same guard-then-client-render pattern every other server page
+// in this route group uses (e.g. my-stats/page.tsx, pipeline/page.tsx).
+// =============================================================================
+
+import { requireBaseballPlayerRoute } from '@/lib/baseball/server-route-guards';
+import DevPlanClient from './DevPlanClient';
+
+export default async function DevPlanPage() {
+  await requireBaseballPlayerRoute();
+  return <DevPlanClient />;
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/dev-plans/[id]/page.tsx b/src/app/baseball/(dashboard)/dashboard/dev-plans/[id]/page.tsx
index cff00d676..47797c945 100644
--- a/src/app/baseball/(dashboard)/dashboard/dev-plans/[id]/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/dev-plans/[id]/page.tsx
@@ -6,6 +6,7 @@ import { Header } from '@/components/layout/header';
 import { PageLoading } from '@/components/ui/loading';
 import { Card, CardContent } from '@/components/ui/card';
 import { PlanDetail } from '@/components/baseball/dev-plans/PlanDetail';
+import { BreadcrumbLabel } from '@/app/baseball/(dashboard)/_components/breadcrumb-label';
 import { useAuth } from '@/hooks/use-auth';
 import { useToast } from '@/components/ui/sonner';
 import {
@@ -123,6 +124,10 @@ export default function DevPlanDetailPage() {
 
   return (
     <>
+      {/* Ruling 4: the shell's breadcrumb has no registry entry for a
+          dynamic plan id — this supplies the real plan title so the trail
+          never falls back to a raw UUID segment. */}
+      <BreadcrumbLabel name={plan.title} />
       <Header title="Development Plan" subtitle="Detailed plan view" backHref="/baseball/dashboard/dev-plans" />
       <div className="p-6 lg:p-8">
         <PlanDetail
diff --git a/src/app/baseball/(dashboard)/dashboard/documents/documents-client.tsx b/src/app/baseball/(dashboard)/dashboard/documents/documents-client.tsx
index 4870be4a3..9b61bf878 100644
--- a/src/app/baseball/(dashboard)/dashboard/documents/documents-client.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/documents/documents-client.tsx
@@ -1,13 +1,6 @@
 'use client';
 
 import { useMemo, useRef, useState } from 'react';
-import { Card, CardContent } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Select } from '@/components/ui/select';
-import { Checkbox } from '@/components/ui/checkbox';
-import { IconFile, IconUpload, IconSearch } from '@/components/icons';
-import { DocumentCard } from '@/components/baseball/documents/DocumentCard';
 import { DocumentPreview } from '@/components/baseball/documents/DocumentPreview';
 import { UploadNewVersionModal } from '@/components/baseball/documents/UploadNewVersionModal';
 import { EditDocumentModal, type EditDocumentSaveData } from '@/components/baseball/documents/EditDocumentModal';
@@ -25,9 +18,8 @@ import {
   uploadNewVersion,
 } from '@/app/baseball/actions/documents';
 import { useToast } from '@/components/ui/sonner';
-import { cn } from '@/lib/utils';
 import { DocumentsFairway } from '@/components/baseball/documents/DocumentsFairway';
-import { isRedesignEnabled, fairwayScope } from '@/lib/redesign/flag';
+import { fairwayScope } from '@/lib/redesign/flag';
 
 const UPLOAD_ACCEPT =
   'application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation,image/*,text/plain,video/mp4,video/webm,video/quicktime';
@@ -240,273 +232,95 @@ export function DocumentsClient({ documents: initialDocuments, coachId, teamId,
     setMovingDoc(null);
   }
 
-  if (isRedesignEnabled()) {
-    return (
-      <div className={fairwayScope('min-h-full bg-canvas')}>
-        <DocumentsFairway
-          filtered={filtered}
-          totalCount={documents.length}
-          isCoach={isCoach}
-          search={search}
-          onSearchChange={setSearch}
-          category={category}
-          onCategoryChange={setCategory}
-          isUploadingDocument={isUploadingDocument}
-          onUpload={openUploadPicker}
-          uploadCategory={uploadCategory}
-          onUploadCategoryChange={setUploadCategory}
-          uploadIsPlayerVisible={uploadIsPlayerVisible}
-          onUploadVisibilityChange={setUploadIsPlayerVisible}
-          activeDropdown={activeDropdown}
-          setActiveDropdown={setActiveDropdown}
-          onPreview={(d) => setPreviewDoc(d)}
-          onUploadVersion={isCoach ? (d) => setVersionDoc(d) : undefined}
-          onDelete={isCoach ? handleDelete : undefined}
-          onEdit={isCoach ? openEditModal : undefined}
-          onViewHistory={isCoach ? openVersionHistory : undefined}
-          onMoveToFolder={isCoach ? openMoveModal : undefined}
-          fileInputSlot={
-            isCoach ? (
-               
-              <input
-                ref={fileInputRef}
-                type="file"
-                onChange={handleFileSelected}
-                className="hidden"
-                accept={UPLOAD_ACCEPT}
-              />
-            ) : null
-          }
-          previewSlot={
-            <DocumentPreview
-              document={previewDoc}
-              open={!!previewDoc}
-              onOpenChange={(open) => {
-                if (!open) setPreviewDoc(null);
-              }}
-            />
-          }
-          versionSlot={
-            versionDoc && isCoach ? (
-              <UploadNewVersionModal
-                open={!!versionDoc}
-                onClose={() => setVersionDoc(null)}
-                documentTitle={versionDoc.title}
-                currentFileType={versionDoc.file_type || null}
-                onUpload={handleUploadNewVersion}
-              />
-            ) : null
-          }
-          editSlot={
-            isCoach ? (
-              <EditDocumentModal
-                open={!!editingDoc}
-                document={editingDoc}
-                categories={DOCUMENT_UPLOAD_CATEGORIES}
-                onClose={() => setEditingDoc(null)}
-                onSave={handleSaveEdit}
-              />
-            ) : null
-          }
-          historySlot={
-            isCoach ? (
-              <DocumentVersionHistoryModal
-                open={!!historyDoc}
-                document={historyDoc}
-                onClose={() => setHistoryDoc(null)}
-                onReverted={handleDocumentReverted}
-              />
-            ) : null
-          }
-          moveSlot={
-            isCoach ? (
-              <MoveToFolderModal
-                open={!!movingDoc}
-                document={movingDoc}
-                folders={existingFolders}
-                onClose={() => setMovingDoc(null)}
-                onMove={handleSaveMove}
-              />
-            ) : null
-          }
-        />
-      </div>
-    );
-  }
-
   return (
-    <div className="p-6 lg:p-8">
-      {/* Hidden file input driving both the header and empty-state upload triggers */}
-      {isCoach && (
-         
-        <input
-          ref={fileInputRef}
-          type="file"
-          onChange={handleFileSelected}
-          className="hidden"
-          accept={UPLOAD_ACCEPT}
-        />
-      )}
-
-      {/* Search & Filter Bar */}
-      <div className="flex flex-col sm:flex-row gap-3 mb-6">
-        <div className="relative flex-1">
-          <Input
-            type="text"
-            value={search}
-            onChange={(e) => setSearch(e.target.value)}
-            placeholder="Search documents..."
-            leftIcon={<IconSearch size={16} />}
-            className="text-sm bg-cream-50 border-warm-200 rounded-lg"
-          />
-        </div>
-        <div className="flex gap-2 overflow-x-auto pb-1">
-          {CATEGORIES.map(cat => (
-            <Button variant="primary"
-              key={cat.value}
-              onClick={() => setCategory(cat.value)}
-              className={cn(
-                'px-3 py-1.5 text-xs font-medium rounded-full border transition-colors whitespace-nowrap',
-                category === cat.value
-                  ? 'bg-primary-100 text-primary-700 border-primary-200'
-                  : 'bg-cream-50 text-warm-600 border-warm-200 hover:border-warm-300'
-              )}
-            >
-              {cat.label}
-            </Button>
-          ))}
-        </div>
-        {isCoach && (
-          <Button
-            variant="primary"
-            onClick={openUploadPicker}
-            isLoading={isUploadingDocument}
-            leftIcon={<IconUpload size={16} />}
-            className="whitespace-nowrap flex-shrink-0"
-          >
-            Upload
-          </Button>
-        )}
-      </div>
-
-      {/* Upload-time picker — category + visibility applied to the next file selected */}
-      {isCoach && (
-        <div className="flex flex-wrap items-center gap-4 mb-6 text-sm">
-          <div className="flex items-center gap-2">
-            <span className="text-xs font-medium uppercase tracking-wide text-warm-400">Next upload</span>
-            <div className="w-40">
-              <Select
-                options={DOCUMENT_UPLOAD_CATEGORIES}
-                value={uploadCategory}
-                onChange={setUploadCategory}
-              />
-            </div>
-          </div>
-          <Checkbox
-            label="Visible to players"
-            checked={uploadIsPlayerVisible}
-            onChange={(e) => setUploadIsPlayerVisible(e.target.checked)}
+    <div className={fairwayScope('min-h-full bg-canvas')}>
+      <DocumentsFairway
+        filtered={filtered}
+        totalCount={documents.length}
+        isCoach={isCoach}
+        search={search}
+        onSearchChange={setSearch}
+        category={category}
+        onCategoryChange={setCategory}
+        isUploadingDocument={isUploadingDocument}
+        onUpload={openUploadPicker}
+        uploadCategory={uploadCategory}
+        onUploadCategoryChange={setUploadCategory}
+        uploadIsPlayerVisible={uploadIsPlayerVisible}
+        onUploadVisibilityChange={setUploadIsPlayerVisible}
+        activeDropdown={activeDropdown}
+        setActiveDropdown={setActiveDropdown}
+        onPreview={(d) => setPreviewDoc(d)}
+        onUploadVersion={isCoach ? (d) => setVersionDoc(d) : undefined}
+        onDelete={isCoach ? handleDelete : undefined}
+        onEdit={isCoach ? openEditModal : undefined}
+        onViewHistory={isCoach ? openVersionHistory : undefined}
+        onMoveToFolder={isCoach ? openMoveModal : undefined}
+        fileInputSlot={
+          isCoach ? (
+
+            <input
+              ref={fileInputRef}
+              type="file"
+              onChange={handleFileSelected}
+              className="hidden"
+              accept={UPLOAD_ACCEPT}
+            />
+          ) : null
+        }
+        previewSlot={
+          <DocumentPreview
+            document={previewDoc}
+            open={!!previewDoc}
+            onOpenChange={(open) => {
+              if (!open) setPreviewDoc(null);
+            }}
           />
-        </div>
-      )}
-
-      {/* Documents Grid */}
-      {filtered.length === 0 ? (
-        <Card variant="glass">
-          <CardContent className="p-12 text-center">
-            <div className="w-16 h-16 rounded-2xl bg-warm-100 flex items-center justify-center mx-auto mb-4">
-              <IconFile size={28} className="text-warm-400" />
-            </div>
-            <h3 className="text-lg font-semibold text-warm-900 mb-2">
-              {documents.length === 0 ? 'No Documents' : 'No Results'}
-            </h3>
-            <p className="text-warm-500 mb-6 max-w-sm mx-auto">
-              {documents.length === 0
-                ? isCoach
-                  ? 'Upload playbooks, practice plans, waivers, and other team documents.'
-                  : 'No documents have been shared yet. Check back later.'
-                : 'Try adjusting your search or filters.'}
-            </p>
-            {documents.length === 0 && isCoach && (
-              <Button
-                onClick={openUploadPicker}
-                isLoading={isUploadingDocument}
-                leftIcon={<IconUpload size={16} />}
-              >
-                Upload Document
-              </Button>
-            )}
-          </CardContent>
-        </Card>
-      ) : (
-        <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
-          {filtered.map(doc => (
-            <DocumentCard
-              key={doc.id}
-              document={doc}
-              isCoach={isCoach}
-              activeDropdown={activeDropdown}
-              setActiveDropdown={setActiveDropdown}
-              onPreview={(d) => setPreviewDoc(d)}
-              onUploadVersion={isCoach ? (d) => setVersionDoc(d) : undefined}
-              onDelete={isCoach ? handleDelete : undefined}
-              onEdit={isCoach ? openEditModal : undefined}
-              onViewHistory={isCoach ? openVersionHistory : undefined}
-              onMoveToFolder={isCoach ? openMoveModal : undefined}
+        }
+        versionSlot={
+          versionDoc && isCoach ? (
+            <UploadNewVersionModal
+              open={!!versionDoc}
+              onClose={() => setVersionDoc(null)}
+              documentTitle={versionDoc.title}
+              currentFileType={versionDoc.file_type || null}
+              onUpload={handleUploadNewVersion}
             />
-          ))}
-        </div>
-      )}
-
-      {/* Preview Modal */}
-      <DocumentPreview
-        document={previewDoc}
-        open={!!previewDoc}
-        onOpenChange={(open) => { if (!open) setPreviewDoc(null); }}
+          ) : null
+        }
+        editSlot={
+          isCoach ? (
+            <EditDocumentModal
+              open={!!editingDoc}
+              document={editingDoc}
+              categories={DOCUMENT_UPLOAD_CATEGORIES}
+              onClose={() => setEditingDoc(null)}
+              onSave={handleSaveEdit}
+            />
+          ) : null
+        }
+        historySlot={
+          isCoach ? (
+            <DocumentVersionHistoryModal
+              open={!!historyDoc}
+              document={historyDoc}
+              onClose={() => setHistoryDoc(null)}
+              onReverted={handleDocumentReverted}
+            />
+          ) : null
+        }
+        moveSlot={
+          isCoach ? (
+            <MoveToFolderModal
+              open={!!movingDoc}
+              document={movingDoc}
+              folders={existingFolders}
+              onClose={() => setMovingDoc(null)}
+              onMove={handleSaveMove}
+            />
+          ) : null
+        }
       />
-
-      {/* Upload New Version Modal */}
-      {versionDoc && isCoach && (
-        <UploadNewVersionModal
-          open={!!versionDoc}
-          onClose={() => setVersionDoc(null)}
-          documentTitle={versionDoc.title}
-          currentFileType={versionDoc.file_type || null}
-          onUpload={handleUploadNewVersion}
-        />
-      )}
-
-      {/* Edit Details Modal */}
-      {isCoach && (
-        <EditDocumentModal
-          open={!!editingDoc}
-          document={editingDoc}
-          categories={DOCUMENT_UPLOAD_CATEGORIES}
-          onClose={() => setEditingDoc(null)}
-          onSave={handleSaveEdit}
-        />
-      )}
-
-      {/* Version History Modal */}
-      {isCoach && (
-        <DocumentVersionHistoryModal
-          open={!!historyDoc}
-          document={historyDoc}
-          onClose={() => setHistoryDoc(null)}
-          onReverted={handleDocumentReverted}
-        />
-      )}
-
-      {/* Move to Folder Modal */}
-      {isCoach && (
-        <MoveToFolderModal
-          open={!!movingDoc}
-          document={movingDoc}
-          folders={existingFolders}
-          onClose={() => setMovingDoc(null)}
-          onMove={handleSaveMove}
-        />
-      )}
     </div>
   );
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/documents/page.tsx b/src/app/baseball/(dashboard)/dashboard/documents/page.tsx
index 6ec044917..916b44cd0 100644
--- a/src/app/baseball/(dashboard)/dashboard/documents/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/documents/page.tsx
@@ -5,7 +5,7 @@ import { getActiveBaseballContext } from '@/lib/baseball/active-context';
 import { DocumentsClient } from './documents-client';
 import { getTeamDocuments } from '@/app/baseball/actions/documents';
 import { ReadModelStateNotice } from '@/components/baseball/ReadModelStateNotice';
-import { EmptyState } from '@/components/ui/empty-state';
+import { EditorsLetter } from '@/components/baseball/living-annual';
 
 export const metadata: Metadata = {
   title: 'Documents | BaseballHelm',
@@ -24,11 +24,11 @@ export default async function BaseballDocumentsPage() {
   const ctx = await getActiveBaseballContext();
   if (!ctx?.activeTeamId) {
     return (
-      <div className="p-6 lg:p-8">
-        <EmptyState
-          type="generic"
+      <div className="mx-auto w-full max-w-[1200px] p-6 lg:p-8">
+        <EditorsLetter
+          ink="team"
           title="Join a team to see documents"
-          description="Once you join a baseball team, shared files and resources will show up here."
+          body="Once you join a baseball team, shared files and resources will show up here."
         />
       </div>
     );
@@ -41,7 +41,7 @@ export default async function BaseballDocumentsPage() {
 
   if (error) {
     return (
-      <div className="p-6 lg:p-8">
+      <div className="mx-auto w-full max-w-[1200px] p-6 lg:p-8">
         <ReadModelStateNotice
           state="error"
           title="Documents could not load"
diff --git a/src/app/baseball/(dashboard)/dashboard/events/EventsClient.tsx b/src/app/baseball/(dashboard)/dashboard/events/EventsClient.tsx
index 8a55e684f..6ff9c1afa 100644
--- a/src/app/baseball/(dashboard)/dashboard/events/EventsClient.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/events/EventsClient.tsx
@@ -3,20 +3,20 @@
 import { useState, useEffect, useTransition } from 'react';
 import { format } from 'date-fns';
 import { createClient } from '@/lib/supabase/client';
-import { Header } from '@/components/layout/header';
 import { Button, IconButton } from '@/components/ui/button';
 import { Input, Textarea } from '@/components/ui/input';
 import { Select } from '@/components/ui/select';
 import { Badge } from '@/components/ui/badge';
+import { toast } from '@/components/ui/sonner';
 import { useAuth } from '@/hooks/use-auth';
 import { useTeams } from '@/hooks/use-teams';
 import {
   IconPlus,
-  IconCalendar,
   IconMapPin,
   IconClock,
   IconTrash,
 } from '@/components/icons';
+import { SectionMasthead, EditorsLetter, EmptyIssue } from '@/components/baseball/living-annual';
 import { createBaseballEvent, deleteBaseballEvent } from '@/app/baseball/actions/calendar';
 
 interface Event {
@@ -220,6 +220,15 @@ export default function EventsPage() {
         return;
       }
 
+      // The event row itself succeeded while a secondary, best-effort write
+      // (RSVP invites, the linked baseball_games row) can still fail —
+      // createBaseballEvent surfaces that as `result.warning` on an
+      // otherwise `success: true` result. Non-blocking: the event stays
+      // created, this just tells the coach the secondary write needs a look.
+      if (result.warning) {
+        toast.warning('Event created', { description: result.warning });
+      }
+
       // Optimistically add the new event to local state so UI updates instantly
       // without waiting for a full re-fetch.
       const created = result.data as Event | undefined;
@@ -300,7 +309,9 @@ export default function EventsPage() {
   if (authLoading) {
     return (
       <>
-        <Header title="Events" subtitle="Loading…" />
+        <div className="px-4 pt-6 sm:px-6 lg:px-8">
+          <SectionMasthead eyebrow="ORGANIZATION · EVENTS" title="Events" ink="team" />
+        </div>
         <div className="p-6">
           <EventsSkeleton />
         </div>
@@ -311,11 +322,15 @@ export default function EventsPage() {
   if (!coach) {
     return (
       <>
-        <Header title="Events" subtitle="Showcase coach access required" />
+        <div className="px-4 pt-6 sm:px-6 lg:px-8">
+          <SectionMasthead eyebrow="ORGANIZATION · EVENTS" title="Events" ink="team" />
+        </div>
         <div className="p-6">
-          <div className="bg-cream-50 rounded-2xl border border-warm-200 p-12 text-center">
-            <p className="text-warm-500">Please log in as a showcase coach to manage events.</p>
-          </div>
+          <EditorsLetter
+            ink="team"
+            title="Showcase coach access required"
+            body="Please log in as a showcase coach to manage events."
+          />
         </div>
       </>
     );
@@ -327,19 +342,25 @@ export default function EventsPage() {
 
   return (
     <>
-      <Header
-        title="Events"
-        subtitle={
-          loading
-            ? 'Loading…'
-            : `${filteredEvents.length} upcoming event${filteredEvents.length !== 1 ? 's' : ''}`
-        }
-      >
-        <Button onClick={() => setShowCreateModal(true)}>
-          <IconPlus size={16} />
-          New Event
-        </Button>
-      </Header>
+      <div className="px-4 pt-6 sm:px-6 lg:px-8">
+        <SectionMasthead
+          eyebrow="ORGANIZATION · EVENTS"
+          title="Events"
+          ink="team"
+          actions={
+            <Button onClick={() => setShowCreateModal(true)}>
+              <IconPlus size={16} />
+              New Event
+            </Button>
+          }
+        >
+          <p className="max-w-prose font-annual text-body text-text-secondary">
+            {loading
+              ? 'Loading…'
+              : `${filteredEvents.length} upcoming event${filteredEvents.length !== 1 ? 's' : ''}`}
+          </p>
+        </SectionMasthead>
+      </div>
 
       <div className="p-6">
         {/* Filters */}
@@ -368,13 +389,12 @@ export default function EventsPage() {
           </div>
         </div>
 
-        {/* Fetch error */}
+        {/* Fetch error — page-level load failure, via the kit's composed
+            error surface (design-system-living-annual.md §7: empty AND error
+            states render through EditorsLetter, never a red/amber inline box). */}
         {fetchError && (
-          <div
-            role="alert"
-            className="mb-4 rounded-xl border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700"
-          >
-            {fetchError}
+          <div role="alert" className="mb-4">
+            <EditorsLetter ink="team" title="Unable to load events" body={fetchError} />
           </div>
         )}
 
@@ -382,20 +402,16 @@ export default function EventsPage() {
         {loading ? (
           <EventsSkeleton />
         ) : filteredEvents.length === 0 ? (
-          /* Honest empty state */
-          <div className="bg-cream-50 rounded-2xl border border-warm-200 p-12 text-center">
-            <div className="w-16 h-16 mx-auto mb-4 rounded-full bg-warm-100 flex items-center justify-center">
-              <IconCalendar size={24} className="text-warm-400" />
-            </div>
-            <h3 className="text-lg font-medium text-warm-900 mb-2">No upcoming events</h3>
-            <p className="text-warm-500 mb-6 max-w-sm mx-auto">
-              No upcoming events — coaches can add events from the calendar.
-            </p>
-            <Button onClick={() => setShowCreateModal(true)}>
-              <IconPlus size={16} />
-              Create Your First Event
-            </Button>
-          </div>
+          <EmptyIssue
+            variant="calendar"
+            ink="team"
+            action={
+              <Button onClick={() => setShowCreateModal(true)}>
+                <IconPlus size={16} />
+                Create Your First Event
+              </Button>
+            }
+          />
         ) : (
           <div className="space-y-6">
             {Object.entries(groupedEvents).map(([date, dateEvents]) => (
diff --git a/src/app/baseball/(dashboard)/dashboard/lift/[sessionId]/page.tsx b/src/app/baseball/(dashboard)/dashboard/lift/[sessionId]/page.tsx
index e43f1296c..d80452c90 100644
--- a/src/app/baseball/(dashboard)/dashboard/lift/[sessionId]/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/lift/[sessionId]/page.tsx
@@ -2,15 +2,81 @@
 // src/app/baseball/(dashboard)/dashboard/lift/[sessionId]/page.tsx
 //
 // V11 player lift execution (spec route /baseball/dashboard/lift/[sessionId],
-// L34; "During lift" L487-499). SELF-ONLY: getPlayerLiftSession returns only the
-// current player's session (RLS-backed). 404-honest when not found.
+// L34; "During lift" L487-499). SELF-ONLY.
+//
+// LANE C — ONE LIFT LAB: repointed at the canonical
+// src/components/lifting/players/PlayerLiftSessionClient (native HelmLifting*
+// props; writes via src/app/lifting/actions/player-sessions.ts, which is
+// athlete-self / RLS-backed — no org-coach access gate, so this is safe for
+// baseball athletes exactly as it is for /lifting-native ones) instead of the
+// legacy src/components/baseball/performance/PlayerLiftSessionClient.
+//
+// Data fetched directly from helm_lifting_sessions / _session_exercises /
+// _set_results here (mirroring src/app/lifting/(dashboard)/dashboard/lift/
+// [sessionId]/page.tsx) rather than via getPlayerLiftSession (which still
+// returns the legacy BaseballLift* adapted shape for the now-deleted
+// component and is frozen for this lane).
 // =============================================================================
 
 import { notFound, redirect } from 'next/navigation';
 
 import { getActiveBaseballContext } from '@/lib/baseball/active-context';
-import { getPlayerLiftSession } from '@/lib/baseball/read-models/player-lift';
-import { PlayerLiftSessionClient } from '@/components/baseball/performance/PlayerLiftSessionClient';
+import { createClient } from '@/lib/supabase/server';
+import { fromUntyped } from '@/lib/supabase/untyped';
+import { PlayerLiftSessionClient } from '@/components/lifting/players/PlayerLiftSessionClient';
+import { resolvePlayerLiftAthleteContext, hasReadinessCheckinToday } from '../_lift-athlete-context';
+import type {
+  HelmLiftingSessionRow,
+  HelmLiftingSessionExerciseRow,
+  HelmLiftingSetResultRow,
+  HelmLiftingSessionWithExercises,
+} from '@/lib/types/helm-lifting-data';
+
+async function fetchSessionWithExercises(
+  sessionId: string,
+  athleteId: string,
+  organizationId: string,
+): Promise<HelmLiftingSessionWithExercises | null> {
+  const supabase = await createClient();
+
+  // athlete_id filter is an extra UX guard on top of RLS (helm_lifting_is_my_athlete).
+  const { data: rawSession } = (await fromUntyped(supabase, 'helm_lifting_sessions')
+    .select('*')
+    .eq('id', sessionId)
+    .eq('athlete_id', athleteId)
+    .eq('organization_id', organizationId)
+    .maybeSingle()) as { data: HelmLiftingSessionRow | null };
+
+  if (!rawSession) return null;
+
+  const { data: exerciseRows } = (await fromUntyped(supabase, 'helm_lifting_session_exercises')
+    .select('*')
+    .eq('session_id', sessionId)
+    .order('order_index', { ascending: true })) as { data: HelmLiftingSessionExerciseRow[] | null };
+
+  const exercises = exerciseRows ?? [];
+  const exerciseIds = exercises.map((ex) => ex.id);
+  const setsByExercise = new Map<string, HelmLiftingSetResultRow[]>();
+
+  if (exerciseIds.length > 0) {
+    const { data: setResults } = (await fromUntyped(supabase, 'helm_lifting_set_results')
+      .select('*')
+      .in('session_exercise_id', exerciseIds)
+      .eq('athlete_id', athleteId)
+      .order('set_number', { ascending: true })) as { data: HelmLiftingSetResultRow[] | null };
+
+    for (const result of setResults ?? []) {
+      const arr = setsByExercise.get(result.session_exercise_id) ?? [];
+      arr.push(result);
+      setsByExercise.set(result.session_exercise_id, arr);
+    }
+  }
+
+  return {
+    ...rawSession,
+    exercises: exercises.map((ex) => ({ ...ex, sets: setsByExercise.get(ex.id) ?? [] })),
+  };
+}
 
 export default async function PlayerLiftSessionPage({
   params,
@@ -24,12 +90,28 @@ export default async function PlayerLiftSessionPage({
     redirect('/baseball/dashboard/performance');
   }
 
-  const session = await getPlayerLiftSession(context.activePlayerId, sessionId);
+  const athleteCtx = await resolvePlayerLiftAthleteContext(context.activePlayerId);
+  if (!athleteCtx) {
+    // No athlete profile in the Lab yet — send back to lift home.
+    redirect('/baseball/dashboard/lift');
+  }
+
+  const { organizationId, athleteId } = athleteCtx;
+
+  const [session, readinessSubmittedToday] = await Promise.all([
+    fetchSessionWithExercises(sessionId, athleteId, organizationId),
+    hasReadinessCheckinToday(athleteId, organizationId),
+  ]);
+
   if (!session) notFound();
 
   return (
     <div className="mx-auto max-w-2xl px-4 py-6 pb-28">
-      <PlayerLiftSessionClient session={session} readinessSubmittedToday={Boolean(session.readiness_checkin_id)} />
+      <PlayerLiftSessionClient
+        session={session}
+        athleteId={athleteId}
+        readinessSubmittedToday={readinessSubmittedToday}
+      />
     </div>
   );
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/lift/_lift-athlete-context.ts b/src/app/baseball/(dashboard)/dashboard/lift/_lift-athlete-context.ts
new file mode 100644
index 000000000..1faf6988d
--- /dev/null
+++ b/src/app/baseball/(dashboard)/dashboard/lift/_lift-athlete-context.ts
@@ -0,0 +1,86 @@
+// =============================================================================
+// src/app/baseball/(dashboard)/dashboard/lift/_lift-athlete-context.ts
+//
+// Shared server-only helpers for the two Player Lift routes (home + session
+// execution) now that both pages render the canonical Helm Lifting Lab
+// components (src/components/lifting/players/*) instead of the legacy
+// src/components/baseball/performance/PlayerLift{Home,Session}Client.
+//
+// Resolves the SELF-ONLY athlete identity chain used by the canonical
+// /lifting/dashboard/lift routes (organization_id + helm_lifting_athletes.id)
+// starting from the baseball_players.id the active-context resolver already
+// gives us. Deliberately NOT placed under src/lib/baseball/read-models/ (that
+// directory is frozen for this lane) — it composes the existing, allowed
+// resolve-baseball-context helpers instead of querying helm_lifting_* itself
+// where possible.
+// =============================================================================
+
+import 'server-only';
+
+import { createClient } from '@/lib/supabase/server';
+import { fromUntyped } from '@/lib/supabase/untyped';
+import {
+  resolveBaseballLiftingOrg,
+  resolveMyBaseballAthleteId,
+} from '@/lib/lifting/resolve-baseball-context';
+
+export interface PlayerLiftAthleteContext {
+  organizationId: string;
+  teamId: string;
+  athleteId: string;
+}
+
+/** baseball_players.id -> baseball_teams.id (first active membership). */
+async function resolvePlayerTeamId(
+  supabase: Awaited<ReturnType<typeof createClient>>,
+  playerId: string,
+): Promise<string | null> {
+  const { data } = await supabase
+    .from('baseball_team_members')
+    .select('team_id')
+    .eq('player_id', playerId)
+    .maybeSingle();
+  return (data?.team_id as string | undefined) ?? null;
+}
+
+/**
+ * Full resolution chain: baseball playerId -> teamId -> organizationId ->
+ * helm_lifting_athletes.id. Returns null at any step that cannot be
+ * resolved (degrade-gracefully — the caller renders an honest empty state,
+ * never an error, matching the existing player-lift read-model's contract).
+ */
+export async function resolvePlayerLiftAthleteContext(
+  playerId: string,
+): Promise<PlayerLiftAthleteContext | null> {
+  if (!playerId) return null;
+
+  const supabase = await createClient();
+  const teamId = await resolvePlayerTeamId(supabase, playerId);
+  if (!teamId) return null;
+
+  const liftCtx = await resolveBaseballLiftingOrg(teamId);
+  if (!liftCtx) return null;
+
+  const athleteId = await resolveMyBaseballAthleteId(liftCtx.organizationId);
+  if (!athleteId) return null;
+
+  return { organizationId: liftCtx.organizationId, teamId, athleteId };
+}
+
+/** Whether the athlete has a helm_lifting_readiness_checkins row for today. */
+export async function hasReadinessCheckinToday(
+  athleteId: string,
+  organizationId: string,
+): Promise<boolean> {
+  const supabase = await createClient();
+  const today = new Date().toISOString().slice(0, 10);
+
+  const { data } = (await fromUntyped(supabase, 'helm_lifting_readiness_checkins')
+    .select('id')
+    .eq('athlete_id', athleteId)
+    .eq('organization_id', organizationId)
+    .eq('checkin_date', today)
+    .maybeSingle()) as { data: { id: string } | null };
+
+  return data !== null;
+}
diff --git a/src/app/baseball/(dashboard)/dashboard/lift/page.tsx b/src/app/baseball/(dashboard)/dashboard/lift/page.tsx
index bb2815739..2705d0f21 100644
--- a/src/app/baseball/(dashboard)/dashboard/lift/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/lift/page.tsx
@@ -2,16 +2,72 @@
 // src/app/baseball/(dashboard)/dashboard/lift/page.tsx
 //
 // V11 Player Lift Home (spec route /baseball/dashboard/lift, L33; "Player Lift
-// Experience" L465-520). SELF-ONLY: resolves the active player from the session;
-// reads getPlayerLiftHome (RLS-backed) and hands a serializable view-model to the
-// client. Players only; staff are redirected to the Performance dashboard.
+// Experience" L465-520). SELF-ONLY: players only; staff are redirected to the
+// Performance dashboard.
+//
+// LANE C — ONE LIFT LAB: repointed at the canonical
+// src/components/lifting/players/PlayerLiftHomeClient (native HelmLifting*
+// props, no baseball-view-adapter) instead of the legacy
+// src/components/baseball/performance/PlayerLiftHomeClient. Data is fetched
+// directly from helm_lifting_sessions / helm_lifting_readiness_checkins here
+// (mirroring src/app/lifting/(dashboard)/dashboard/lift/page.tsx) rather than
+// via getPlayerLiftHome (which still returns the legacy BaseballLift* shape
+// for the now-deleted component and is frozen for this lane).
+//
+// The first-run onboarding tour (Task C) is preserved: LiftOnboardingGate is
+// a standalone overlay (not a wrapper), so it renders alongside the canonical
+// list instead of inside it. The bespoke LiftLabWelcomeState branded empty
+// state is not carried over — a brand-new athlete with zero upcoming/recent
+// sessions now sees the canonical component's own on-brand EmptyState.
 // =============================================================================
 
 import { redirect } from 'next/navigation';
 
 import { getActiveBaseballContext } from '@/lib/baseball/active-context';
-import { getPlayerLiftHome, getPlayerLiftOnboardingState } from '@/lib/baseball/read-models/player-lift';
-import { PlayerLiftHomeClient } from '@/components/baseball/performance/PlayerLiftHomeClient';
+import { createClient } from '@/lib/supabase/server';
+import { fromUntyped } from '@/lib/supabase/untyped';
+import { getPlayerLiftOnboardingState } from '@/lib/baseball/read-models/player-lift';
+import { PlayerLiftHomeClient } from '@/components/lifting/players/PlayerLiftHomeClient';
+import { LiftOnboardingGate } from '@/components/baseball/performance/lift-onboarding';
+import { resolvePlayerLiftAthleteContext, hasReadinessCheckinToday } from './_lift-athlete-context';
+import type { HelmLiftingSessionRow, HelmLiftingSessionStatus } from '@/lib/types/helm-lifting-data';
+
+const OPEN_STATUSES: HelmLiftingSessionStatus[] = ['assigned', 'started', 'modified'];
+
+async function fetchPlayerSessions(
+  athleteId: string,
+  organizationId: string,
+): Promise<{ upcoming: HelmLiftingSessionRow[]; recent: HelmLiftingSessionRow[] }> {
+  const supabase = await createClient();
+  const today = new Date().toISOString().slice(0, 10);
+
+  // Upcoming: today + future, plus overdue-but-still-open (mirrors the
+  // canonical /lifting/dashboard/lift resolution exactly).
+  const { data: upcomingRows } = (await fromUntyped(supabase, 'helm_lifting_sessions')
+    .select('*')
+    .eq('athlete_id', athleteId)
+    .eq('organization_id', organizationId)
+    .or(
+      `and(scheduled_date.gte.${today}),` +
+        `and(status.in.(assigned,started,modified),scheduled_date.lt.${today})`,
+    )
+    .order('scheduled_date', { ascending: true })
+    .limit(20)) as { data: HelmLiftingSessionRow[] | null };
+
+  const upcoming = (upcomingRows ?? []).filter(
+    (s) => s.scheduled_date >= today || OPEN_STATUSES.includes(s.status),
+  );
+
+  const { data: recentRows } = (await fromUntyped(supabase, 'helm_lifting_sessions')
+    .select('*')
+    .eq('athlete_id', athleteId)
+    .eq('organization_id', organizationId)
+    .eq('status', 'completed')
+    .order('completed_at', { ascending: false })
+    .limit(10)) as { data: HelmLiftingSessionRow[] | null };
+
+  return { upcoming, recent: recentRows ?? [] };
+}
 
 export default async function PlayerLiftPage() {
   const context = await getActiveBaseballContext();
@@ -20,22 +76,36 @@ export default async function PlayerLiftPage() {
     redirect('/baseball/dashboard/performance');
   }
 
-  // Task C (additive): getPlayerLiftOnboardingState runs alongside the
-  // existing getPlayerLiftHome fetch — independent reads, safe to
-  // parallelize; getPlayerLiftHome's own behavior is untouched.
-  const [home, onboarding] = await Promise.all([
-    getPlayerLiftHome(context.activePlayerId),
+  const athleteCtx = await resolvePlayerLiftAthleteContext(context.activePlayerId);
+
+  // Not yet seeded in the Lab (org-less team, or backfill hasn't run) —
+  // render the canonical component's own honest empty state.
+  if (!athleteCtx) {
+    return (
+      <div className="mx-auto max-w-3xl px-4 py-6">
+        <PlayerLiftHomeClient upcoming={[]} recent={[]} readinessSubmittedToday={false} />
+      </div>
+    );
+  }
+
+  const { organizationId, athleteId } = athleteCtx;
+
+  const [{ upcoming, recent }, readinessSubmittedToday, onboarding] = await Promise.all([
+    fetchPlayerSessions(athleteId, organizationId),
+    hasReadinessCheckinToday(athleteId, organizationId),
     getPlayerLiftOnboardingState(context.activePlayerId),
   ]);
 
   return (
     <div className="mx-auto max-w-3xl px-4 py-6">
       <PlayerLiftHomeClient
-        upcoming={home.upcoming}
-        recent={home.recent}
-        readinessSubmittedToday={home.readinessSubmittedToday}
-        isNewToLab={onboarding.isNewToLab}
+        upcoming={upcoming}
+        recent={recent}
+        readinessSubmittedToday={readinessSubmittedToday}
+      />
+      <LiftOnboardingGate
         athleteId={onboarding.athleteId}
+        eligibleForOnboarding={onboarding.isNewToLab}
       />
     </div>
   );
diff --git a/src/app/baseball/(dashboard)/dashboard/messages/loading.tsx b/src/app/baseball/(dashboard)/dashboard/messages/loading.tsx
index 63f25255f..58b7f33e2 100644
--- a/src/app/baseball/(dashboard)/dashboard/messages/loading.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/messages/loading.tsx
@@ -1,13 +1,13 @@
-import { Header } from '@/components/layout/header';
 import { SkeletonMessages } from '@/components/ui/skeleton';
 
+// No page-level <Header> — the Fairway shell (BaseballFairwayShell → AppShell)
+// already owns the one top bar + breadcrumb for every dashboard route,
+// "Messages" included. Mirrors the sibling announcements/tasks/documents/
+// travel `loading.tsx` files, none of which mount a Header either.
 export default function MessagesLoading() {
   return (
-    <>
-      <Header title="Messages" subtitle="Your conversations" />
-      <div className="p-6 lg:p-8">
-        <SkeletonMessages />
-      </div>
-    </>
+    <div className="p-6 lg:p-8">
+      <SkeletonMessages />
+    </div>
   );
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/messages/page.tsx b/src/app/baseball/(dashboard)/dashboard/messages/page.tsx
index 70bf34032..98c6b93ca 100644
--- a/src/app/baseball/(dashboard)/dashboard/messages/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/messages/page.tsx
@@ -2,7 +2,6 @@
 
 import { Suspense, useState, useEffect, useMemo, useRef } from 'react';
 import { useSearchParams } from 'next/navigation';
-import { cn } from '@/lib/utils';
 import { Loading } from '@/components/ui/loading';
 import { LazyConversationList, LazyChatWindow } from '@/lib/lazy-components';
 import { EmptyChatState } from '@/components/messages/EmptyChatState';
@@ -14,7 +13,6 @@ import { createConversation, getPlayerUserId } from '@/app/baseball/actions/mess
 import type { ConversationWithMeta } from '@/lib/types/messages';
 import { getParticipantDetails } from '@/lib/types/messages';
 import { MessagesFairway } from '@/components/baseball/messages/MessagesFairway';
-import { isRedesignEnabled } from '@/lib/redesign/flag';
 
 function MessagesContent() {
   const searchParams = useSearchParams();
@@ -169,88 +167,11 @@ function MessagesContent() {
     return success;
   };
 
-  if (isRedesignEnabled()) {
-    return (
-      <MessagesFairway
-        loading={conversationsLoading}
-        mobileShowChat={mobileShowChat}
-        listSlot={
-          <LazyConversationList
-            conversations={conversations as ConversationWithMeta[]}
-            selectedId={selectedConversationId}
-            currentUserId={user?.id || ''}
-            onSelect={handleSelectConversation}
-            onNewConversation={() => setShowNewMessageModal(true)}
-            className="h-full"
-          />
-        }
-        chatSlot={
-          selectedConversationId ? (
-            <LazyChatWindow
-              messages={messages}
-              participant={selectedParticipant}
-              currentUserId={user?.id || ''}
-              loading={messagesLoading}
-              onSend={handleSendMessage}
-              onBack={handleBack}
-              className="h-full"
-            />
-          ) : (
-            <EmptyChatState
-              onNewConversation={() => setShowNewMessageModal(true)}
-              className="h-full"
-            />
-          )
-        }
-        modalSlot={
-          <NewMessageModal
-            isOpen={showNewMessageModal}
-            onClose={() => setShowNewMessageModal(false)}
-            onSelect={handleNewConversation}
-            currentUserRole={currentUserRole}
-          />
-        }
-      />
-    );
-  }
-
-  if (conversationsLoading) {
-    return (
-      <div className="h-[calc(100dvh-64px)] flex bg-[#FAF6F1]">
-        {/* Conversation list skeleton */}
-        <div className="w-full lg:w-80 xl:w-96 flex-shrink-0 border-r border-warm-200 bg-cream-50">
-          <div className="p-4 border-b border-warm-200">
-            <div className="h-10 bg-warm-100 rounded-lg animate-pulse" />
-          </div>
-          <div className="divide-y divide-warm-100">
-            {Array.from({ length: 6 }).map((_, i) => (
-              <div key={i} className="px-4 py-3 flex items-center gap-3 animate-pulse">
-                <div className="w-10 h-10 rounded-full bg-warm-200 flex-shrink-0" />
-                <div className="flex-1 min-w-0">
-                  <div className="h-4 bg-warm-200 rounded w-2/3 mb-2" />
-                  <div className="h-3 bg-warm-100 rounded w-4/5" />
-                </div>
-                <div className="h-3 bg-warm-100 rounded w-10" />
-              </div>
-            ))}
-          </div>
-        </div>
-        {/* Chat area skeleton */}
-        <div className="flex-1 hidden lg:flex items-center justify-center">
-          <Loading />
-        </div>
-      </div>
-    );
-  }
-
   return (
-    <div className="h-[calc(100dvh-64px)] flex bg-[#FAF6F1]">
-      {/* Conversation List - Hidden on mobile when viewing chat */}
-      <div className={cn(
-        'w-full lg:w-80 xl:w-96 flex-shrink-0 border-r border-warm-200',
-        'transition-transform duration-300',
-        mobileShowChat && 'hidden lg:block'
-      )}>
+    <MessagesFairway
+      loading={conversationsLoading}
+      mobileShowChat={mobileShowChat}
+      listSlot={
         <LazyConversationList
           conversations={conversations as ConversationWithMeta[]}
           selectedId={selectedConversationId}
@@ -259,14 +180,9 @@ function MessagesContent() {
           onNewConversation={() => setShowNewMessageModal(true)}
           className="h-full"
         />
-      </div>
-
-      {/* Chat Window - Full width on mobile, split on desktop */}
-      <div className={cn(
-        'flex-1 min-w-0',
-        !mobileShowChat && 'hidden lg:block'
-      )}>
-        {selectedConversationId ? (
+      }
+      chatSlot={
+        selectedConversationId ? (
           <LazyChatWindow
             messages={messages}
             participant={selectedParticipant}
@@ -281,17 +197,17 @@ function MessagesContent() {
             onNewConversation={() => setShowNewMessageModal(true)}
             className="h-full"
           />
-        )}
-      </div>
-
-      {/* New Message Modal */}
-      <NewMessageModal
-        isOpen={showNewMessageModal}
-        onClose={() => setShowNewMessageModal(false)}
-        onSelect={handleNewConversation}
-        currentUserRole={currentUserRole}
-      />
-    </div>
+        )
+      }
+      modalSlot={
+        <NewMessageModal
+          isOpen={showNewMessageModal}
+          onClose={() => setShowNewMessageModal(false)}
+          onSelect={handleNewConversation}
+          currentUserRole={currentUserRole}
+        />
+      }
+    />
   );
 }
 
diff --git a/src/app/baseball/(dashboard)/dashboard/operations/page.tsx b/src/app/baseball/(dashboard)/dashboard/operations/page.tsx
new file mode 100644
index 000000000..ac588c847
--- /dev/null
+++ b/src/app/baseball/(dashboard)/dashboard/operations/page.tsx
@@ -0,0 +1,117 @@
+// =============================================================================
+// src/app/baseball/(dashboard)/dashboard/operations/page.tsx
+//
+// COHERENCE_RULING_2026-07-08 Ruling 2 — Team hub's new "Operations" landing.
+//
+// The Team hub caps at 3 rendered subtabs (Roster · Calendar · Operations),
+// so Documents, Travel, Practice Planner, and Practice Effectiveness — all
+// team-logistics surfaces, not stats — fold in here as a card grid instead of
+// each keeping its own subtab slot. Every route the grid links to keeps its
+// existing URL and its own registry gating (nav-registry.ts); this page never
+// re-declares that gating — it reads the SAME registry entries and reuses
+// isBaseballNavEntryVisible so a coach without can_manage_practice, for
+// example, simply doesn't see the Practice Effectiveness card, exactly like
+// they wouldn't see it in the sidebar.
+//
+// Server component, no hooks — the Living Annual kit's SectionMasthead /
+// PaperCard / Eyebrow are all server-safe.
+// =============================================================================
+
+import Link from 'next/link';
+
+import { requireBaseballCoachRoute } from '@/lib/baseball/server-route-guards';
+import { getBaseballNavContext } from '@/lib/baseball/nav-context';
+import {
+  getBaseballNavEntry,
+  isBaseballNavEntryVisible,
+  type BaseballNavContext,
+  type BaseballNavEntry,
+  type BaseballNavId,
+} from '@/lib/baseball/nav-registry';
+import { SectionMasthead, PaperCard, Eyebrow } from '@/components/baseball/living-annual';
+import { IconChevronRight } from '@/components/icons';
+
+export const metadata = {
+  title: 'Operations · BaseballHelm',
+};
+
+const OPERATIONS_CARD_IDS: readonly {
+  id: BaseballNavId;
+  description: string;
+}[] = [
+  {
+    id: 'documents',
+    description: 'The team file library — playbooks, forms, and anything the roster needs on hand.',
+  },
+  {
+    id: 'travel',
+    description: 'Trip itineraries for every away game or showcase — lodging, transport, and timing.',
+  },
+  {
+    id: 'practice-planner',
+    description: 'Build and publish the practice schedule the roster sees on their own Practice tab.',
+  },
+  {
+    id: 'practice-effectiveness',
+    description: 'Did practice transfer to performance? The staff-only read on what actually worked.',
+  },
+];
+
+export default async function OperationsPage() {
+  await requireBaseballCoachRoute();
+
+  const navContext = (await getBaseballNavContext()) ?? ({ role: 'coach', capabilities: {} } as BaseballNavContext);
+
+  const cards = OPERATIONS_CARD_IDS.map(({ id, description }) => {
+    const entry = getBaseballNavEntry(id);
+    return entry && isBaseballNavEntryVisible(entry, navContext) ? { entry, description } : null;
+  }).filter((card): card is { entry: BaseballNavEntry; description: string } => Boolean(card));
+
+  return (
+    <div className="mx-auto w-full max-w-5xl px-4 py-8 sm:px-6 lg:px-8">
+      <SectionMasthead eyebrow="TEAM · OPERATIONS" title="Operations" ink="team">
+        <p className="max-w-2xl font-annual text-body text-text-secondary">
+          Everything that keeps the program running between games — files, travel, and practice —
+          lives here in one place instead of four separate tabs.
+        </p>
+      </SectionMasthead>
+
+      <div className="mt-8 grid gap-4 sm:grid-cols-2">
+        {cards.map(({ entry, description }) => {
+          const Icon = entry.icon;
+          return (
+            <Link
+              key={entry.id}
+              href={entry.href}
+              className="group block rounded-card focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[color:var(--team-ink)] focus-visible:ring-offset-2 focus-visible:ring-offset-[var(--paper)]"
+            >
+              <PaperCard className="flex h-full items-start gap-4 p-5 transition-transform duration-200 ease-out group-hover:-translate-y-0.5">
+                <span className="flex h-10 w-10 shrink-0 items-center justify-center rounded-fw-sm bg-grade-plus/10 text-grade-plus">
+                  <Icon size={20} />
+                </span>
+                <div className="min-w-0 flex-1">
+                  <h3 className="font-annual text-body-lg font-semibold text-text-primary">{entry.label}</h3>
+                  <p className="mt-1 text-body-sm text-text-secondary">{description}</p>
+                </div>
+                <IconChevronRight
+                  size={18}
+                  className="mt-1 shrink-0 text-text-tertiary transition-transform duration-200 group-hover:translate-x-0.5"
+                />
+              </PaperCard>
+            </Link>
+          );
+        })}
+      </div>
+
+      {cards.length === 0 && (
+        <PaperCard className="mt-8 p-6">
+          <Eyebrow ink="team">Nothing here yet</Eyebrow>
+          <p className="mt-2 font-annual text-body text-text-secondary">
+            Your current role doesn&apos;t have access to any of the Operations surfaces yet. Ask a
+            head coach to grant access from Management &gt; Settings.
+          </p>
+        </PaperCard>
+      )}
+    </div>
+  );
+}
diff --git a/src/app/baseball/(dashboard)/dashboard/performance/groups/page.tsx b/src/app/baseball/(dashboard)/dashboard/performance/groups/page.tsx
index 90558fbc1..9a1901f50 100644
--- a/src/app/baseball/(dashboard)/dashboard/performance/groups/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/performance/groups/page.tsx
@@ -1,26 +1,94 @@
 // =============================================================================
 // src/app/baseball/(dashboard)/dashboard/performance/groups/page.tsx
 //
-// V11 Strength Groups (spec L24 + L151-198 + Packet C). The athlete-segmentation
-// surface: build static / dynamic groups, manage membership, and preview a
-// dynamic rule's exact included players before saving. SERVER-GATED:
+// V11 Strength Groups (spec L24 + L151-198 + Packet C). SERVER-GATED:
 //   * Active baseball context required (never trusts a cookie alone).
 //   * STAFF role required; players are redirected to their Today view.
-//   * can_manage_lifting required (grouping is a prescribe capability). Nav hiding
-//     is not relied upon; the page server-redirects without the gate.
+//   * can_manage_lifting required (grouping is a prescribe capability). Nav
+//     hiding is not relied upon; the page server-redirects without the gate.
 //
-// RLS backs every read (group + member SELECT is staff-scoped). The capability
-// resolve here is defense-in-depth + drives the create / seed affordances. The
-// roster attribute snapshot is assembled once and feeds BOTH the athlete table and
-// the live rule preview (one engine — no drift between preview and persisted set).
+// LANE C — ONE LIFT LAB: repointed at the canonical
+// src/components/lifting/groups/StrengthGroupsClient (native HelmLifting*
+// props) instead of the legacy src/components/baseball/performance/
+// StrengthGroupsClient. Fetches helm_lifting_groups directly (mirroring
+// src/app/lifting/(dashboard)/dashboard/groups/page.tsx), team-scoped.
+//
+// Note: the legacy StrengthGroupsClient also supported dynamic-rule groups
+// with a live preview and a "seed default groups" affordance (getStrengthGroupsBoard
+// -> board.defaultGroupsPresent). The canonical component only supports
+// static groups (create / rename / archive / add-remove member) — dynamic
+// group rules and the seed-defaults CTA are not carried over. See this
+// lane's report.
+//
+// WRITES: createGroup / deleteGroup / addGroupMember / removeGroupMember from
+// src/app/lifting/actions/groups.ts (withLiftingAction, requireEdit:true —
+// see this lane's report for the confirmed helm_lifting_coaches access-gate
+// gap for baseball staff who haven't onboarded through /lifting).
 // =============================================================================
 
 import { redirect } from 'next/navigation';
 
 import { getActiveBaseballContext } from '@/lib/baseball/active-context';
 import { resolveBaseballCapabilities } from '@/lib/baseball/capabilities';
-import { getStrengthGroupsBoard } from '@/lib/baseball/read-models/strength-groups';
-import { StrengthGroupsClient } from '@/components/baseball/performance/StrengthGroupsClient';
+import { createClient } from '@/lib/supabase/server';
+import { fromUntyped } from '@/lib/supabase/untyped';
+import { resolveBaseballLiftingOrg } from '@/lib/lifting/resolve-baseball-context';
+import { StrengthGroupsClient } from '@/components/lifting/groups/StrengthGroupsClient';
+import type { HelmLiftingGroupRow } from '@/lib/types/helm-lifting-data';
+import type { HelmLiftingAthleteRow } from '@/lib/types/helm-lifting';
+
+interface GroupWithMembers extends HelmLiftingGroupRow {
+  member_count: number;
+  member_athlete_ids: string[];
+}
+
+async function getGroupsWithMembers(organizationId: string, teamId: string): Promise<GroupWithMembers[]> {
+  const supabase = await createClient();
+
+  const { data: groups } = (await fromUntyped(supabase, 'helm_lifting_groups')
+    .select('*')
+    .eq('organization_id', organizationId)
+    .eq('team_id', teamId)
+    .eq('is_active', true)
+    .order('created_at', { ascending: false })
+    .limit(100)) as { data: HelmLiftingGroupRow[] | null };
+
+  if (!groups || groups.length === 0) return [];
+
+  const { data: members } = (await fromUntyped(supabase, 'helm_lifting_group_members')
+    .select('group_id, athlete_id')
+    .in('group_id', groups.map((g) => g.id))
+    .is('ends_at', null)) as { data: Array<{ group_id: string; athlete_id: string }> | null };
+
+  const membersByGroup = new Map<string, string[]>();
+  for (const m of members ?? []) {
+    const arr = membersByGroup.get(m.group_id) ?? [];
+    arr.push(m.athlete_id);
+    membersByGroup.set(m.group_id, arr);
+  }
+
+  return groups.map((g) => {
+    const athleteIds = membersByGroup.get(g.id) ?? [];
+    return { ...g, member_count: athleteIds.length, member_athlete_ids: athleteIds };
+  });
+}
+
+async function getAthletes(
+  organizationId: string,
+  teamId: string,
+): Promise<Array<Pick<HelmLiftingAthleteRow, 'id' | 'first_name' | 'last_name' | 'position' | 'sport'>>> {
+  const supabase = await createClient();
+  const { data } = (await fromUntyped(supabase, 'helm_lifting_athletes')
+    .select('id, first_name, last_name, position, sport')
+    .eq('organization_id', organizationId)
+    .eq('team_id', teamId)
+    .eq('is_active', true)
+    .order('last_name', { ascending: true })
+    .limit(500)) as {
+    data: Array<Pick<HelmLiftingAthleteRow, 'id' | 'first_name' | 'last_name' | 'position' | 'sport'>> | null;
+  };
+  return data ?? [];
+}
 
 export default async function StrengthGroupsPage() {
   const context = await getActiveBaseballContext();
@@ -31,14 +99,21 @@ export default async function StrengthGroupsPage() {
   const caps = await resolveBaseballCapabilities(teamId);
   if (!caps.can_manage_lifting) redirect('/baseball/dashboard/performance');
 
-  const board = await getStrengthGroupsBoard(teamId);
+  const liftCtx = await resolveBaseballLiftingOrg(teamId);
+  const [groups, athletes] = liftCtx
+    ? await Promise.all([
+        getGroupsWithMembers(liftCtx.organizationId, teamId),
+        getAthletes(liftCtx.organizationId, teamId),
+      ])
+    : [[], []];
 
   return (
     <div className="mx-auto max-w-7xl px-4 py-6">
       <StrengthGroupsClient
-        groups={board.groups}
-        roster={board.roster}
-        defaultGroupsPresent={board.defaultGroupsPresent}
+        groups={groups}
+        athletes={athletes}
+        orgId={liftCtx?.organizationId ?? ''}
+        canEdit={caps.can_manage_lifting}
       />
     </div>
   );
diff --git a/src/app/baseball/(dashboard)/dashboard/performance/live/page.tsx b/src/app/baseball/(dashboard)/dashboard/performance/live/page.tsx
index 8ea0b6ac1..18383f0cd 100644
--- a/src/app/baseball/(dashboard)/dashboard/performance/live/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/performance/live/page.tsx
@@ -1,35 +1,216 @@
 // =============================================================================
 // src/app/baseball/(dashboard)/dashboard/performance/live/page.tsx
 //
-// V11 Live Weight Room mode (spec L27, L522-573 + Packet G). The flagship premium
-// staff surface: a strength coach runs a room of 20-60 athletes from ONE screen.
-//
-// SERVER-GATED (defense in depth, never nav-hiding alone):
+// V11 Live Weight Room mode (spec L27, L522-573 + Packet G). SERVER-GATED
+// (defense in depth, never nav-hiding alone):
 //   * Resolves the server-validated active baseball context (cookie re-validated).
 //   * STAFF only — players are redirected to their own lift surface.
 //   * Requires can_manage_lifting (this surface WRITES sets/loads/subs for the
 //     athletes; readiness is shown additively when can_view_readiness is held).
 //
-// The whole payload is materialized server-side by getLiveWeightRoomData; the
-// client polls a server action to refresh it (realtime-or-polling per spec L572).
+// LANE C — ONE LIFT LAB: repointed at the canonical
+// src/components/lifting/sessions/LiveWeightRoomClient (native
+// HelmLiftingLiveAthleteRow[] props, realtime postgres_changes subscriptions)
+// instead of the legacy src/components/baseball/performance/LiveWeightRoom.
+// Data assembled directly from helm_lifting_* (mirroring
+// src/app/lifting/(dashboard)/dashboard/sessions/live/page.tsx), team-scoped
+// via helm_lifting_sessions.team_id.
+//
+// canViewReadiness is honored server-side by omitting readiness_band /
+// readiness check-in reads entirely when the caller lacks the grant — the
+// canonical component has no readiness visibility gate of its own, so the
+// gate lives in what this page chooses to fetch and pass down.
+//
+// Not carried over from the legacy surface: the `?group=` deep-linkable
+// group filter (the canonical component's group filter is internal client
+// state only) and the coach-facing playerNameById substitute-picker label
+// map (the canonical row shape already carries first_name/last_name
+// natively, so no map is needed). See this lane's report.
+//
+// WRITES: advanceSessionLifecycle / logSetResult from
+// src/app/lifting/actions/sessions.ts (withLiftingAction, requireEdit:true —
+// see this lane's report for the confirmed helm_lifting_coaches access-gate
+// gap for baseball staff who haven't onboarded through /lifting).
 // =============================================================================
 
 import { redirect } from 'next/navigation';
 
 import { getActiveBaseballContext } from '@/lib/baseball/active-context';
 import { resolveBaseballCapabilities } from '@/lib/baseball/capabilities';
-import { getLiveWeightRoomData } from '@/lib/baseball/read-models/live-weight-room';
-import { LiveWeightRoom } from '@/components/baseball/performance/LiveWeightRoom';
 import { createClient } from '@/lib/supabase/server';
 import { fromUntyped } from '@/lib/supabase/untyped';
 import { resolveBaseballLiftingOrg } from '@/lib/lifting/resolve-baseball-context';
-import { getFullName } from '@/lib/utils';
+import { LiveWeightRoomClient } from '@/components/lifting/sessions/LiveWeightRoomClient';
+import type {
+  HelmLiftingSessionRow,
+  HelmLiftingSessionExerciseRow,
+  HelmLiftingSetResultRow,
+  HelmLiftingAvailabilityStatus,
+  HelmLiftingReadinessBand,
+  HelmLiftingLiveAthleteRow,
+} from '@/lib/types/helm-lifting-data';
+import type { HelmLiftingAthleteRow } from '@/lib/types/helm-lifting';
+
+async function buildLiveRoomData(
+  organizationId: string,
+  teamId: string,
+  canViewReadiness: boolean,
+): Promise<{
+  athletes: HelmLiftingLiveAthleteRow[];
+  exerciseLibrary: Array<{ id: string; name: string; category: string | null }>;
+}> {
+  const supabase = await createClient();
+  const today = new Date().toISOString().slice(0, 10);
+
+  const { data: sessions } = (await fromUntyped(supabase, 'helm_lifting_sessions')
+    .select('*')
+    .eq('organization_id', organizationId)
+    .eq('team_id', teamId)
+    .eq('scheduled_date', today)
+    .order('athlete_id', { ascending: true })) as { data: HelmLiftingSessionRow[] | null };
+
+  if (!sessions || sessions.length === 0) {
+    const { data: exercises } = (await fromUntyped(supabase, 'helm_lifting_exercises')
+      .select('id, name, category')
+      .eq('sport', 'baseball')
+      .eq('is_active', true)
+      .or(`organization_id.eq.${organizationId},is_global.eq.true`)
+      .order('name', { ascending: true })
+      .limit(200)) as { data: Array<{ id: string; name: string; category: string | null }> | null };
+    return { athletes: [], exerciseLibrary: exercises ?? [] };
+  }
+
+  const sessionIds = sessions.map((s) => s.id);
+  const athleteIds = [...new Set(sessions.map((s) => s.athlete_id))];
+
+  const [
+    { data: athletes },
+    { data: sessionExercises },
+    { data: setResults },
+    checkinsResult,
+    { data: availabilities },
+    { data: groupMembers },
+    { data: exercises },
+  ] = await Promise.all([
+    fromUntyped(supabase, 'helm_lifting_athletes')
+      .select('id, first_name, last_name, position, sport, user_id')
+      .in('id', athleteIds) as Promise<{
+        data: Array<Pick<HelmLiftingAthleteRow, 'id' | 'first_name' | 'last_name' | 'position' | 'sport' | 'user_id'>> | null
+      }>,
+    fromUntyped(supabase, 'helm_lifting_session_exercises')
+      .select('*')
+      .in('session_id', sessionIds)
+      .order('order_index', { ascending: true }) as Promise<{ data: HelmLiftingSessionExerciseRow[] | null }>,
+    fromUntyped(supabase, 'helm_lifting_set_results')
+      .select('session_exercise_id, athlete_id, set_number, actual_load, rpe, created_at')
+      .in('session_id', sessionIds)
+      .order('created_at', { ascending: false }) as Promise<{
+        data: Array<Pick<HelmLiftingSetResultRow, 'session_exercise_id' | 'athlete_id' | 'set_number' | 'actual_load' | 'rpe'> & { created_at: string }> | null
+      }>,
+    // Readiness check-ins are only fetched at all when the caller holds
+    // can_view_readiness — an unauthorized caller never sees the data,
+    // rather than the component just hiding a value it was handed.
+    canViewReadiness
+      ? (fromUntyped(supabase, 'helm_lifting_readiness_checkins')
+          .select('athlete_id, readiness_score, readiness_band')
+          .in('athlete_id', athleteIds)
+          .eq('checkin_date', today) as Promise<{
+            data: Array<{ athlete_id: string; readiness_score: number | null; readiness_band: string | null }> | null
+          }>)
+      : Promise.resolve({ data: [] as Array<{ athlete_id: string; readiness_score: number | null; readiness_band: string | null }> }),
+    fromUntyped(supabase, 'helm_lifting_availability_statuses')
+      .select('athlete_id, status')
+      .in('athlete_id', athleteIds)
+      .lte('starts_at', today)
+      .or(`ends_at.is.null,ends_at.gte.${today}`) as Promise<{
+        data: Array<{ athlete_id: string; status: string }> | null
+      }>,
+    fromUntyped(supabase, 'helm_lifting_group_members')
+      .select('athlete_id, helm_lifting_groups(name)')
+      .in('athlete_id', athleteIds)
+      .is('ends_at', null) as Promise<{
+        data: Array<{ athlete_id: string; helm_lifting_groups: { name: string } | null }> | null
+      }>,
+    fromUntyped(supabase, 'helm_lifting_exercises')
+      .select('id, name, category')
+      .eq('sport', 'baseball')
+      .eq('is_active', true)
+      .or(`organization_id.eq.${organizationId},is_global.eq.true`)
+      .order('name', { ascending: true })
+      .limit(200) as Promise<{
+        data: Array<{ id: string; name: string; category: string | null }> | null
+      }>,
+  ]);
+
+  const checkins = checkinsResult.data;
+
+  const athleteMap = new Map((athletes ?? []).map((a) => [a.id, a]));
+  const checkinMap = new Map((checkins ?? []).map((c) => [c.athlete_id, c]));
+  const availMap = new Map((availabilities ?? []).map((a) => [a.athlete_id, a.status]));
 
-interface PageProps {
-  searchParams: Promise<{ group?: string }>;
+  const groupNamesByAthlete = new Map<string, string[]>();
+  for (const gm of groupMembers ?? []) {
+    const names = groupNamesByAthlete.get(gm.athlete_id) ?? [];
+    if (gm.helm_lifting_groups?.name) names.push(gm.helm_lifting_groups.name);
+    groupNamesByAthlete.set(gm.athlete_id, names);
+  }
+
+  const exercisesBySession = new Map<string, HelmLiftingSessionExerciseRow[]>();
+  for (const se of sessionExercises ?? []) {
+    const arr = exercisesBySession.get(se.session_id) ?? [];
+    arr.push(se);
+    exercisesBySession.set(se.session_id, arr);
+  }
+
+  const latestSetBySeId = new Map<string, { actual_load: number | null; rpe: number | null; created_at: string }>();
+  for (const sr of setResults ?? []) {
+    const existing = latestSetBySeId.get(sr.session_exercise_id);
+    if (!existing || sr.created_at > existing.created_at) {
+      latestSetBySeId.set(sr.session_exercise_id, {
+        actual_load: sr.actual_load,
+        rpe: sr.rpe,
+        created_at: sr.created_at,
+      });
+    }
+  }
+
+  const liveAthletes: HelmLiftingLiveAthleteRow[] = sessions.map((session) => {
+    const athlete = athleteMap.get(session.athlete_id);
+    const seList = exercisesBySession.get(session.id) ?? [];
+    const currentSe = seList.find((e) => e.status === 'assigned' || e.status === 'completed');
+    const latestSet = currentSe ? latestSetBySeId.get(currentSe.id) : undefined;
+    const checkin = checkinMap.get(session.athlete_id);
+    const completedCount = seList.filter((e) => e.status === 'completed').length;
+
+    return {
+      session_id: session.id,
+      athlete_id: session.athlete_id,
+      user_id: athlete?.user_id ?? null,
+      first_name: athlete?.first_name ?? null,
+      last_name: athlete?.last_name ?? null,
+      position: athlete?.position ?? null,
+      sport: (athlete?.sport ?? 'baseball') as 'baseball' | 'golf',
+      group_names: groupNamesByAthlete.get(session.athlete_id) ?? [],
+      session_status: session.status,
+      readiness_band: (checkin?.readiness_band ?? null) as HelmLiftingReadinessBand | null,
+      availability_status: (availMap.get(session.athlete_id) ?? null) as HelmLiftingAvailabilityStatus | null,
+      current_exercise: currentSe?.exercise_name_snapshot ?? null,
+      prescribed_load: currentSe?.prescribed_load ?? null,
+      actual_load: latestSet?.actual_load ?? null,
+      rpe: latestSet?.rpe ?? null,
+      last_update: latestSet?.created_at ?? session.updated_at,
+      has_load_change: (latestSet?.actual_load ?? null) !== (currentSe?.prescribed_load ?? null) && latestSet?.actual_load != null,
+      needs_coach: session.coach_review_status === 'needs_review',
+      exercises: seList,
+      total_exercises: seList.length,
+      completed_exercises: completedCount,
+    };
+  });
+
+  return { athletes: liveAthletes, exerciseLibrary: exercises ?? [] };
 }
 
-export default async function LiveWeightRoomPage({ searchParams }: PageProps) {
+export default async function LiveWeightRoomPage() {
   const context = await getActiveBaseballContext();
   if (!context) redirect('/baseball/login');
   if (context.activeRole !== 'coach') redirect('/baseball/player/today');
@@ -43,47 +224,17 @@ export default async function LiveWeightRoomPage({ searchParams }: PageProps) {
   }
   const canViewReadiness = caps.can_view_readiness;
 
-  const { group } = await searchParams;
-  const groupFilter = group && group.length > 0 ? group : null;
-
-  const data = await getLiveWeightRoomData(teamId, canViewReadiness, groupFilter);
-
-  // A roster→name map so the right-rail queues (player ids) render real names,
-  // and the exercise library for the substitute picker.
-  const supabase = await createClient();
-  const { data: members } = await supabase
-    .from('baseball_team_members')
-    .select('player_id, baseball_players!inner ( id, first_name, last_name )')
-    .eq('team_id', teamId);
-  const playerNameById: Record<string, string> = {};
-  for (const m of members ?? []) {
-    const p = (m as { baseball_players?: { id: string; first_name: string | null; last_name: string | null } })
-      .baseball_players;
-    if (p?.id) playerNameById[p.id] = getFullName(p.first_name, p.last_name);
-  }
-
-  // Exercise library (org + global) for the substitute action.
   const liftCtx = await resolveBaseballLiftingOrg(teamId);
-  let exerciseLibrary: Array<{ id: string; name: string; category: string | null }> = [];
-  if (liftCtx) {
-    const { data: exRows } = await fromUntyped(supabase, 'helm_lifting_exercises')
-      .select('id, name, category')
-      .eq('sport', 'baseball')
-      .eq('is_active', true)
-      .or(`organization_id.eq.${liftCtx.organizationId},is_global.eq.true`)
-      .order('name', { ascending: true }) as {
-      data: Array<{ id: string; name: string; category: string | null }> | null;
-    };
-    exerciseLibrary = (exRows ?? []).map((e) => ({ id: e.id, name: e.name, category: e.category ?? null }));
-  }
+  const { athletes, exerciseLibrary } = liftCtx
+    ? await buildLiveRoomData(liftCtx.organizationId, teamId, canViewReadiness)
+    : { athletes: [], exerciseLibrary: [] };
 
   return (
-    <LiveWeightRoom
-      initialData={data}
-      canViewReadiness={canViewReadiness}
-      playerNameById={playerNameById}
+    <LiveWeightRoomClient
+      initialAthletes={athletes}
       exerciseLibrary={exerciseLibrary}
-      groupFilter={groupFilter}
+      orgId={liftCtx?.organizationId ?? ''}
+      canEdit={caps.can_manage_lifting}
     />
   );
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/performance/programs/[programId]/page.tsx b/src/app/baseball/(dashboard)/dashboard/performance/programs/[programId]/page.tsx
index fede268e3..4dab5b11b 100644
--- a/src/app/baseball/(dashboard)/dashboard/performance/programs/[programId]/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/performance/programs/[programId]/page.tsx
@@ -1,27 +1,169 @@
 // =============================================================================
 // src/app/baseball/(dashboard)/dashboard/performance/programs/[programId]/page.tsx
 //
-// V11 Program editor (spec L26 + L200-228 + Packet E). The deepest coach authoring
-// surface: macrocycle -> week -> day -> section -> prescription, with drag-drop
-// reorder, duplicate week/day, save-as-template, and an Assign+Publish flow that
-// materializes sessions onto the weight-room board.
-//
-// SERVER-GATED (defense in depth; RLS backs every write):
+// V11 Program editor (spec L26 + L200-228 + Packet E). SERVER-GATED (defense
+// in depth; RLS backs every write):
 //   * Active baseball context required.
 //   * STAFF role; players redirected to Today.
 //   * can_manage_lifting required.
-//   * notFound() when the program id is unknown or RLS hides it.
+//   * notFound() when the program id is unknown, not this team's, or RLS
+//     hides it.
+//
+// LANE C — ONE LIFT LAB: repointed at the canonical
+// src/components/lifting/programs/ProgramEditorClient (native HelmLifting*
+// props) instead of the legacy src/components/baseball/performance/
+// ProgramEditorClient. Fetches the program tree + assign context directly
+// from helm_lifting_* (mirroring src/app/lifting/(dashboard)/dashboard/
+// programs/[programId]/page.tsx), team-scoped for the assign roster/groups.
+//
+// WRITES: every mutation in ProgramEditorClient (publish, add/duplicate/
+// delete week-day-section-prescription, save-as-template) calls
+// src/app/lifting/actions/programs.ts (withLiftingAction, requireEdit:true —
+// see this lane's report for the confirmed helm_lifting_coaches access-gate
+// gap for baseball staff who haven't onboarded through /lifting).
 // =============================================================================
 
 import { notFound, redirect } from 'next/navigation';
 
 import { getActiveBaseballContext } from '@/lib/baseball/active-context';
 import { resolveBaseballCapabilities } from '@/lib/baseball/capabilities';
-import {
-  getLiftProgramTree,
-  getAssignContext,
-} from '@/lib/baseball/read-models/lift-programs';
-import { ProgramEditorClient } from '@/components/baseball/performance/ProgramEditorClient';
+import { createClient } from '@/lib/supabase/server';
+import { fromUntyped } from '@/lib/supabase/untyped';
+import { resolveBaseballLiftingOrg } from '@/lib/lifting/resolve-baseball-context';
+import { ProgramEditorClient } from '@/components/lifting/programs/ProgramEditorClient';
+import type {
+  HelmLiftingProgramRow,
+  HelmLiftingWeekRow,
+  HelmLiftingDayRow,
+  HelmLiftingSectionRow,
+  HelmLiftingPrescriptionRow,
+  HelmLiftingGroupRow,
+} from '@/lib/types/helm-lifting-data';
+import type { HelmLiftingAthleteRow } from '@/lib/types/helm-lifting';
+
+interface LiftProgramTree {
+  program: HelmLiftingProgramRow;
+  weeks: Array<
+    HelmLiftingWeekRow & {
+      days: Array<
+        HelmLiftingDayRow & {
+          sections: Array<HelmLiftingSectionRow & { prescriptions: HelmLiftingPrescriptionRow[] }>;
+        }
+      >;
+    }
+  >;
+  exerciseNameMap: Record<string, string>;
+}
+
+interface AssignContext {
+  athletes: Array<Pick<HelmLiftingAthleteRow, 'id' | 'first_name' | 'last_name' | 'position' | 'sport'>>;
+  groups: Array<Pick<HelmLiftingGroupRow, 'id' | 'name' | 'group_type'>>;
+}
+
+async function getProgramTree(
+  programId: string,
+  organizationId: string,
+  teamId: string,
+): Promise<LiftProgramTree | null> {
+  const supabase = await createClient();
+
+  const { data: program } = (await fromUntyped(supabase, 'helm_lifting_programs')
+    .select('*')
+    .eq('id', programId)
+    .eq('organization_id', organizationId)
+    .eq('team_id', teamId)
+    .maybeSingle()) as { data: HelmLiftingProgramRow | null };
+
+  if (!program) return null;
+
+  const { data: weeks } = (await fromUntyped(supabase, 'helm_lifting_weeks')
+    .select('*')
+    .eq('program_id', programId)
+    .order('week_number', { ascending: true })) as { data: HelmLiftingWeekRow[] | null };
+
+  const weekList = weeks ?? [];
+  if (weekList.length === 0) {
+    return { program, weeks: [], exerciseNameMap: {} };
+  }
+
+  const { data: days } = (await fromUntyped(supabase, 'helm_lifting_days')
+    .select('*')
+    .in('week_id', weekList.map((w) => w.id))
+    .order('day_number', { ascending: true })) as { data: HelmLiftingDayRow[] | null };
+
+  const dayList = days ?? [];
+  const { data: sections } = (await fromUntyped(supabase, 'helm_lifting_sections')
+    .select('*')
+    .in('lift_day_id', dayList.map((d) => d.id))
+    .order('section_order', { ascending: true })) as { data: HelmLiftingSectionRow[] | null };
+
+  const sectionList = sections ?? [];
+  const { data: prescriptions } = (await fromUntyped(supabase, 'helm_lifting_prescriptions')
+    .select('*')
+    .in('section_id', sectionList.map((s) => s.id))
+    .order('order_index', { ascending: true })) as { data: HelmLiftingPrescriptionRow[] | null };
+
+  const prescList = prescriptions ?? [];
+
+  const exerciseIds = [...new Set(prescList.map((p) => p.exercise_id).filter(Boolean) as string[])];
+  const exerciseNameMap: Record<string, string> = {};
+  if (exerciseIds.length > 0) {
+    const { data: exRows } = (await fromUntyped(supabase, 'helm_lifting_exercises')
+      .select('id, name')
+      .in('id', exerciseIds)) as { data: Array<{ id: string; name: string }> | null };
+    for (const ex of exRows ?? []) exerciseNameMap[ex.id] = ex.name;
+  }
+
+  const prescsBySectionId = new Map<string, HelmLiftingPrescriptionRow[]>();
+  for (const p of prescList) {
+    const arr = prescsBySectionId.get(p.section_id) ?? [];
+    arr.push(p);
+    prescsBySectionId.set(p.section_id, arr);
+  }
+
+  const sectionsByDayId = new Map<string, Array<HelmLiftingSectionRow & { prescriptions: HelmLiftingPrescriptionRow[] }>>();
+  for (const s of sectionList) {
+    const arr = sectionsByDayId.get(s.lift_day_id) ?? [];
+    arr.push({ ...s, prescriptions: prescsBySectionId.get(s.id) ?? [] });
+    sectionsByDayId.set(s.lift_day_id, arr);
+  }
+
+  const daysByWeekId = new Map<string, Array<HelmLiftingDayRow & { sections: Array<HelmLiftingSectionRow & { prescriptions: HelmLiftingPrescriptionRow[] }> }>>();
+  for (const d of dayList) {
+    const arr = daysByWeekId.get(d.week_id) ?? [];
+    arr.push({ ...d, sections: sectionsByDayId.get(d.id) ?? [] });
+    daysByWeekId.set(d.week_id, arr);
+  }
+
+  return {
+    program,
+    weeks: weekList.map((w) => ({ ...w, days: daysByWeekId.get(w.id) ?? [] })),
+    exerciseNameMap,
+  };
+}
+
+async function getAssignContext(organizationId: string, teamId: string): Promise<AssignContext> {
+  const supabase = await createClient();
+
+  const [{ data: athletes }, { data: groups }] = await Promise.all([
+    fromUntyped(supabase, 'helm_lifting_athletes')
+      .select('id, first_name, last_name, position, sport')
+      .eq('organization_id', organizationId)
+      .eq('team_id', teamId)
+      .eq('is_active', true)
+      .order('last_name', { ascending: true })
+      .limit(500) as Promise<{ data: Array<Pick<HelmLiftingAthleteRow, 'id' | 'first_name' | 'last_name' | 'position' | 'sport'>> | null }>,
+    fromUntyped(supabase, 'helm_lifting_groups')
+      .select('id, name, group_type')
+      .eq('organization_id', organizationId)
+      .eq('team_id', teamId)
+      .eq('is_active', true)
+      .order('name', { ascending: true })
+      .limit(100) as Promise<{ data: Array<Pick<HelmLiftingGroupRow, 'id' | 'name' | 'group_type'>> | null }>,
+  ]);
+
+  return { athletes: athletes ?? [], groups: groups ?? [] };
+}
 
 export default async function ProgramEditorPage({
   params,
@@ -38,14 +180,24 @@ export default async function ProgramEditorPage({
   const caps = await resolveBaseballCapabilities(teamId);
   if (!caps.can_manage_lifting) redirect('/baseball/dashboard/performance');
 
-  const tree = await getLiftProgramTree(teamId, programId);
-  if (!tree) notFound();
+  const liftCtx = await resolveBaseballLiftingOrg(teamId);
+  if (!liftCtx) notFound();
+
+  const [tree, assign] = await Promise.all([
+    getProgramTree(programId, liftCtx.organizationId, teamId),
+    getAssignContext(liftCtx.organizationId, teamId),
+  ]);
 
-  const assign = await getAssignContext(teamId);
+  if (!tree) notFound();
 
   return (
     <div className="mx-auto max-w-6xl px-4 py-6">
-      <ProgramEditorClient tree={tree} assign={assign} />
+      <ProgramEditorClient
+        programTree={tree}
+        assignContext={assign}
+        orgId={liftCtx.organizationId}
+        canEdit={caps.can_manage_lifting}
+      />
     </div>
   );
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/performance/programs/page.tsx b/src/app/baseball/(dashboard)/dashboard/performance/programs/page.tsx
index feb165543..96a5a95a1 100644
--- a/src/app/baseball/(dashboard)/dashboard/performance/programs/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/performance/programs/page.tsx
@@ -1,24 +1,84 @@
 // =============================================================================
 // src/app/baseball/(dashboard)/dashboard/performance/programs/page.tsx
 //
-// V11 Program list (spec L25 + Packet E). The entry point to the deepest coach
-// authoring layer: list every training program (phase / goal / status / template)
-// with week+day counts, and create a new one. SERVER-GATED:
+// V11 Program list (spec L25 + Packet E). SERVER-GATED:
 //   * Active baseball context required (never trusts a cookie alone).
 //   * STAFF role required; players are redirected to their Today view.
 //   * can_manage_lifting required (programming is a prescribe capability). Nav
 //     hiding is not relied upon; the page server-redirects without the gate.
 //
-// RLS backs every read (program SELECT is staff-scoped). The capability resolve
-// here is defense-in-depth + drives the create affordance.
+// LANE C — ONE LIFT LAB: repointed at the canonical
+// src/components/lifting/programs/ProgramListClient (native HelmLifting*
+// props) instead of the legacy src/components/baseball/performance/
+// ProgramListClient. Fetches helm_lifting_programs directly (mirroring
+// src/app/lifting/(dashboard)/dashboard/programs/page.tsx) — team-scoped
+// (this route is per baseball team) rather than org-wide.
+//
+// WRITES: ProgramListClient's "New program" flow calls createProgram from
+// src/app/lifting/actions/programs.ts (withLiftingAction, requireEdit:true).
+// That wrapper gates on resolveLiftingAccess(orgId), which requires an active
+// helm_lifting_coaches (or org_viewer) row for THIS org — baseball staff who
+// have never onboarded through /lifting have neither. See this lane's report
+// for the confirmed access-gate gap (out of this lane's file scope to fix).
 // =============================================================================
 
 import { redirect } from 'next/navigation';
 
 import { getActiveBaseballContext } from '@/lib/baseball/active-context';
 import { resolveBaseballCapabilities } from '@/lib/baseball/capabilities';
-import { getLiftProgramList } from '@/lib/baseball/read-models/lift-programs';
-import { ProgramListClient } from '@/components/baseball/performance/ProgramListClient';
+import { createClient } from '@/lib/supabase/server';
+import { fromUntyped } from '@/lib/supabase/untyped';
+import { resolveBaseballLiftingOrg } from '@/lib/lifting/resolve-baseball-context';
+import { ProgramListClient } from '@/components/lifting/programs/ProgramListClient';
+import type { HelmLiftingProgramRow } from '@/lib/types/helm-lifting-data';
+
+interface ProgramWithCounts extends HelmLiftingProgramRow {
+  week_count: number;
+  day_count: number;
+}
+
+async function getPrograms(organizationId: string, teamId: string): Promise<ProgramWithCounts[]> {
+  const supabase = await createClient();
+
+  const { data: programs } = (await fromUntyped(supabase, 'helm_lifting_programs')
+    .select('*')
+    .eq('organization_id', organizationId)
+    .eq('team_id', teamId)
+    .order('created_at', { ascending: false })
+    .limit(200)) as { data: HelmLiftingProgramRow[] | null };
+
+  if (!programs || programs.length === 0) return [];
+
+  const ids = programs.map((p) => p.id);
+
+  const { data: weeks } = (await fromUntyped(supabase, 'helm_lifting_weeks')
+    .select('id, program_id')
+    .in('program_id', ids)) as { data: Array<{ id: string; program_id: string }> | null };
+
+  const weekCountByProgram = new Map<string, number>();
+  const programByWeek = new Map<string, string>();
+  for (const w of weeks ?? []) {
+    weekCountByProgram.set(w.program_id, (weekCountByProgram.get(w.program_id) ?? 0) + 1);
+    programByWeek.set(w.id, w.program_id);
+  }
+
+  const dayCountByProgram = new Map<string, number>();
+  if ((weeks ?? []).length > 0) {
+    const { data: days } = (await fromUntyped(supabase, 'helm_lifting_days')
+      .select('week_id')
+      .in('week_id', (weeks ?? []).map((w) => w.id))) as { data: Array<{ week_id: string }> | null };
+    for (const d of days ?? []) {
+      const progId = programByWeek.get(d.week_id);
+      if (progId) dayCountByProgram.set(progId, (dayCountByProgram.get(progId) ?? 0) + 1);
+    }
+  }
+
+  return programs.map((p) => ({
+    ...p,
+    week_count: weekCountByProgram.get(p.id) ?? 0,
+    day_count: dayCountByProgram.get(p.id) ?? 0,
+  }));
+}
 
 export default async function ProgramsPage() {
   const context = await getActiveBaseballContext();
@@ -29,11 +89,16 @@ export default async function ProgramsPage() {
   const caps = await resolveBaseballCapabilities(teamId);
   if (!caps.can_manage_lifting) redirect('/baseball/dashboard/performance');
 
-  const programs = await getLiftProgramList(teamId);
+  const liftCtx = await resolveBaseballLiftingOrg(teamId);
+  const programs = liftCtx ? await getPrograms(liftCtx.organizationId, teamId) : [];
 
   return (
     <div className="mx-auto max-w-6xl px-4 py-6">
-      <ProgramListClient programs={programs} />
+      <ProgramListClient
+        programs={programs}
+        orgId={liftCtx?.organizationId ?? ''}
+        canEdit={caps.can_manage_lifting}
+      />
     </div>
   );
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/players/[id]/page.tsx b/src/app/baseball/(dashboard)/dashboard/players/[id]/page.tsx
index 10a595f3c..1e8d52eff 100644
--- a/src/app/baseball/(dashboard)/dashboard/players/[id]/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/players/[id]/page.tsx
@@ -1,6 +1,7 @@
 import { createClient } from '@/lib/supabase/server';
 import { redirect, notFound } from 'next/navigation';
 import { PlayerProfileClient } from '@/components/baseball/player-profile/PlayerProfileClient';
+import { BreadcrumbLabel } from '@/app/baseball/(dashboard)/_components/breadcrumb-label';
 import type { BaseballPlayerStats, BaseballPlayerAggregates, BaseballCoachInsight } from '@/lib/types';
 import { getPlayerSnapshotCards } from '@/lib/baseball/read-models/player-snapshot-cards';
 import { getPlayerTimeline, getTimelineAcksForSubjectPlayer } from '@/lib/baseball/read-models/timeline';
@@ -206,31 +207,37 @@ export default async function PlayerProfilePage({ params }: PageProps) {
   }));
 
   return (
-    <PlayerProfileClient
-      player={{
-        ...player,
-        jersey_number: membership.jersey_number?.toString() || null,
-        team_position: membership.position,
-        team_status: membership.status,
-        joined_at: membership.joined_at,
-      }}
-      stats={stats || []}
-      aggregates={aggregates}
-      insights={insights || []}
-      notes={transformedNotes}
-      notesCanAuthor={notesResult.canAuthor}
-      videos={transformedVideos}
-      teamId={team.id}
-      teamName={team.name}
-      coachId={coach.id}
-      snapshotHeader={snapshotResult.authorized ? snapshotResult.header : null}
-      timelineEvents={timelineResult.events}
-      timelineViewerRole={timelineResult.viewerRole}
-      timelineHiddenCount={timelineResult.hiddenCount}
-      timelineAcks={timelineAcks}
-      tasks={playerTasks}
-      liftingOrgId={liftingOrgId}
-      liftingAthleteId={liftingAthleteId}
-    />
+    <>
+      {/* Ruling 4: the shell's breadcrumb has no registry entry for a
+          dynamic player id — this supplies the real name so the trail never
+          falls back to a raw UUID segment. */}
+      <BreadcrumbLabel name={`${player.first_name ?? ''} ${player.last_name ?? ''}`.trim() || null} />
+      <PlayerProfileClient
+        player={{
+          ...player,
+          jersey_number: membership.jersey_number?.toString() || null,
+          team_position: membership.position,
+          team_status: membership.status,
+          joined_at: membership.joined_at,
+        }}
+        stats={stats || []}
+        aggregates={aggregates}
+        insights={insights || []}
+        notes={transformedNotes}
+        notesCanAuthor={notesResult.canAuthor}
+        videos={transformedVideos}
+        teamId={team.id}
+        teamName={team.name}
+        coachId={coach.id}
+        snapshotHeader={snapshotResult.authorized ? snapshotResult.header : null}
+        timelineEvents={timelineResult.events}
+        timelineViewerRole={timelineResult.viewerRole}
+        timelineHiddenCount={timelineResult.hiddenCount}
+        timelineAcks={timelineAcks}
+        tasks={playerTasks}
+        liftingOrgId={liftingOrgId}
+        liftingAthleteId={liftingAthleteId}
+      />
+    </>
   );
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/players/[id]/profile/error.tsx b/src/app/baseball/(dashboard)/dashboard/players/[id]/profile/error.tsx
deleted file mode 100644
index 374cb1f3e..000000000
--- a/src/app/baseball/(dashboard)/dashboard/players/[id]/profile/error.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-'use client';
-
-import { RouteErrorBoundary } from '@/components/errors';
-
-export default function Error({
-  error,
-  reset,
-}: {
-  error: Error & { digest?: string };
-  reset: () => void;
-}) {
-  return (
-    <RouteErrorBoundary
-      error={error}
-      reset={reset}
-      route="/baseball/dashboard/players/[id]/profile"
-      component="PlayerProfilePage"
-      title="Failed to load player profile"
-      message="We couldn't load this player's profile. The player may not exist or there might be a connection issue."
-      homePath="/baseball/dashboard/discover"
-    />
-  );
-}
diff --git a/src/app/baseball/(dashboard)/dashboard/players/[id]/profile/page.tsx b/src/app/baseball/(dashboard)/dashboard/players/[id]/profile/page.tsx
deleted file mode 100644
index 4d2f22dae..000000000
--- a/src/app/baseball/(dashboard)/dashboard/players/[id]/profile/page.tsx
+++ /dev/null
@@ -1,289 +0,0 @@
-import { createClient } from '@/lib/supabase/server';
-import { notFound } from 'next/navigation';
-import { PlayerCard } from '@/components/player/profile/PlayerCard';
-import { Button } from '@/components/ui/button';
-import { IconArrowLeft, IconChartBar } from '@/components/icons';
-import Link from 'next/link';
-import { resolveBaseballAthleteIds, resolveBaseballLiftingOrg } from '@/lib/lifting/resolve-baseball-context';
-import { PlayerPerformanceTab } from '@/components/lifting/performance/PlayerPerformanceTab';
-import { checkWatchlistStatus } from '@/app/baseball/actions/watchlist';
-import { PlayerProfileCoachActions } from '@/components/player/profile/PlayerProfileCoachActions';
-
-interface PageProps {
-  params: Promise<{ id: string }>;
-}
-
-export default async function PlayerProfilePage({ params }: PageProps) {
-  const { id } = await params;
-  const supabase = await createClient();
-
-  // Parallel fetch: player + current user
-  // Cast to any to avoid TS2589 from deep relational-select type instantiation
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const sb = supabase as any;
-  const [{ data: player }, authResult] = await Promise.all([
-    sb.from('baseball_players').select('*, player_settings (*)').eq('id', id).single() as Promise<{ data: Record<string, unknown> | null; error: unknown }>,
-    supabase.auth.getUser(),
-  ]);
-  const user = authResult.data.user;
-
-  if (!player) notFound();
-
-  const isPublicView = !user || user.id !== player.user_id;
-
-  // Resolve whether the viewer is an actual coach — NOT merely "not the
-  // profile owner". isPublicView is true for any authenticated non-owner
-  // (including another player), so the coach-only CTAs (Send Message / Add
-  // to Watchlist) must gate on this real role check instead, or any player
-  // viewing a teammate's/recruit's profile would see live coach actions.
-  // Mirrors the isCoachViewing pattern in the sibling public route at
-  // src/app/baseball/(public)/player/[id]/page.tsx.
-  let coach: { id: string; organization_id: string | null } | null = null;
-  if (user) {
-    const { data } = await supabase
-      .from('baseball_coaches')
-      .select('id, organization_id')
-      .eq('user_id', user.id)
-      .single();
-    coach = data;
-  }
-  const isCoachViewing = Boolean(coach);
-
-  // Best-effort watchlist status for the coach CTAs in the sidebar (viewer must
-  // be a coach viewing someone else's profile — checkWatchlistStatus itself
-  // no-ops to false for non-coach users).
-  const isInWatchlist = isCoachViewing
-    ? await checkWatchlistStatus(id).then((r) => r.isInWatchlist).catch(() => false)
-    : false;
-
-  // Fetch coach's team to pull season stats (best-effort — null if not a coach)
-  let seasonStats: {
-    g: number; ab: number; avg: number | null; obp: number | null; slg: number | null; ops: number | null;
-    hr: number; rbi: number; sb: number; k: number;
-    ip: number; era: number | null; whip: number | null; k9: number | null;
-    w: number; l: number; k_thrown: number;
-  } | null = null;
-  let teamId: string | null = null;
-
-  if (coach?.organization_id) {
-    const { data: team } = await supabase
-      .from('baseball_teams')
-      .select('id')
-      .eq('organization_id', coach.organization_id)
-      .single();
-
-    if (team) {
-      teamId = team.id;
-      const year = new Date().getFullYear();
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const { data: ss } = await (supabase as any)
-        .from('baseball_player_season_stats')
-        .select('g,ab,avg,obp,slg,ops,hr,rbi,sb,k,ip,era,whip,k9,w,l,k_thrown')
-        .eq('player_id', id)
-        .eq('team_id', team.id)
-        .eq('season_year', year)
-        .maybeSingle();
-
-      if (ss) seasonStats = ss;
-    }
-  }
-
-  const hasBatting = seasonStats && seasonStats.ab > 0;
-  const hasPitching = seasonStats && seasonStats.ip > 0;
-  const hasStats = hasBatting || hasPitching;
-
-  // Real engagement data — video count + last active from player.updated_at.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const { count: videoCount } = await (supabase as any)
-    .from('baseball_videos')
-    .select('*', { count: 'exact', head: true })
-    .eq('player_id', id) as { count: number | null };
-
-  // Relative "last active" from the player row's updated_at.
-  function formatRelativeTime(iso: string | null | undefined): string {
-    if (!iso) return '—';
-    const diffMs = Date.now() - new Date(iso).getTime();
-    const diffMin = Math.floor(diffMs / 60_000);
-    if (diffMin < 60) return diffMin <= 1 ? 'Just now' : `${diffMin}m ago`;
-    const diffH = Math.floor(diffMin / 60);
-    if (diffH < 24) return `${diffH}h ago`;
-    const diffD = Math.floor(diffH / 24);
-    if (diffD < 7) return `${diffD}d ago`;
-    if (diffD < 30) return `${Math.floor(diffD / 7)}w ago`;
-    return new Date(iso).toLocaleDateString('en-US', { month: 'short', year: 'numeric' });
-  }
-  const lastActive = formatRelativeTime(player.updated_at as string | null | undefined);
-
-  // Resolve Helm Lifting athlete context for the Performance tab.
-  // If the coach's team has a lifting org and the player has an athlete row,
-  // we pass orgId + athleteId to PlayerPerformanceTab. Otherwise we show an
-  // honest "no performance data yet" empty state.
-  let liftingOrgId: string | null = null;
-  let liftingAthleteId: string | null = null;
-
-  if (teamId) {
-    const liftingCtx = await resolveBaseballLiftingOrg(teamId).catch(() => null);
-    if (liftingCtx) {
-      liftingOrgId = liftingCtx.organizationId;
-      const athleteMap = await resolveBaseballAthleteIds(
-        liftingCtx.organizationId,
-        [id],
-      ).catch(() => null);
-      liftingAthleteId = athleteMap ? (athleteMap[id] ?? null) : null;
-    }
-  }
-
-  return (
-    <div className="min-h-dvh bg-[#FAF6F1]">
-      <div className="max-w-[720px] mx-auto px-6 py-8">
-        {/* Back Button */}
-        <Link href="/baseball/dashboard/discover">
-          <Button variant="ghost" size="sm" className="mb-6">
-            <IconArrowLeft size={16} />
-            Back to Discover
-          </Button>
-        </Link>
-
-        <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
-          {/* Player Card - Takes 2 columns */}
-          <div className="lg:col-span-2">
-            <PlayerCard player={player as unknown as Parameters<typeof PlayerCard>[0]['player']} isPublic={isPublicView} />
-          </div>
-
-          {/* Sidebar */}
-          <div className="space-y-4">
-            {isCoachViewing && (
-              <PlayerProfileCoachActions
-                playerId={id}
-                playerUserId={(player.user_id as string | null) ?? null}
-                initialIsInWatchlist={isInWatchlist}
-              />
-            )}
-
-            {/* Season Stats Card */}
-            {hasStats ? (
-              <div className="bg-cream-50 rounded-2xl border border-warm-200 p-5">
-                <div className="flex items-center justify-between mb-4">
-                  <h3 className="text-sm font-semibold text-warm-900 uppercase tracking-wide">
-                    {new Date().getFullYear()} Stats
-                  </h3>
-                  {teamId && (
-                    <Link
-                      href={`/baseball/dashboard/players/${id}/stats`}
-                      className="text-xs text-primary-600 hover:text-primary-700 font-medium flex items-center gap-1"
-                    >
-                      <IconChartBar size={12} />
-                      Full stats →
-                    </Link>
-                  )}
-                </div>
-
-                {hasBatting && seasonStats && (
-                  <div className="mb-4">
-                    <p className="text-xs text-warm-400 font-medium uppercase tracking-wider mb-2">Batting</p>
-                    <div className="grid grid-cols-2 gap-x-4 gap-y-2">
-                      {[
-                        { label: 'AVG', value: seasonStats.avg != null ? seasonStats.avg.toFixed(3).replace(/^0/, '') : '—' },
-                        { label: 'OBP', value: seasonStats.obp != null ? seasonStats.obp.toFixed(3).replace(/^0/, '') : '—' },
-                        { label: 'SLG', value: seasonStats.slg != null ? seasonStats.slg.toFixed(3).replace(/^0/, '') : '—' },
-                        { label: 'OPS', value: seasonStats.ops != null ? seasonStats.ops.toFixed(3) : '—' },
-                        { label: 'HR', value: String(seasonStats.hr) },
-                        { label: 'RBI', value: String(seasonStats.rbi) },
-                        { label: 'SB', value: String(seasonStats.sb) },
-                        { label: 'G', value: String(seasonStats.g) },
-                      ].map(({ label, value }) => (
-                        <div key={label} className="flex justify-between items-baseline">
-                          <span className="text-xs text-warm-400">{label}</span>
-                          <span className="text-sm font-bold text-warm-900 tabular-nums">{value}</span>
-                        </div>
-                      ))}
-                    </div>
-                  </div>
-                )}
-
-                {hasBatting && hasPitching && (
-                  <div className="border-t border-warm-100 my-3" />
-                )}
-
-                {hasPitching && seasonStats && (
-                  <div>
-                    <p className="text-xs text-warm-400 font-medium uppercase tracking-wider mb-2">Pitching</p>
-                    <div className="grid grid-cols-2 gap-x-4 gap-y-2">
-                      {[
-                        { label: 'ERA', value: seasonStats.era != null ? seasonStats.era.toFixed(2) : '—' },
-                        { label: 'WHIP', value: seasonStats.whip != null ? seasonStats.whip.toFixed(3) : '—' },
-                        { label: 'K/9', value: seasonStats.k9 != null ? seasonStats.k9.toFixed(1) : '—' },
-                        { label: 'IP', value: seasonStats.ip.toFixed(1) },
-                        { label: 'W-L', value: `${seasonStats.w}-${seasonStats.l}` },
-                        { label: 'K', value: String(seasonStats.k_thrown) },
-                      ].map(({ label, value }) => (
-                        <div key={label} className="flex justify-between items-baseline">
-                          <span className="text-xs text-warm-400">{label}</span>
-                          <span className="text-sm font-bold text-warm-900 tabular-nums">{value}</span>
-                        </div>
-                      ))}
-                    </div>
-                  </div>
-                )}
-              </div>
-            ) : (
-              /* Fallback: real profile engagement data when no box score data */
-              <div className="bg-cream-50 rounded-2xl border border-warm-200 p-5">
-                <h3 className="text-sm font-semibold text-warm-900 uppercase tracking-wide mb-4">
-                  Quick Stats
-                </h3>
-                <div className="space-y-3">
-                  <div className="flex justify-between items-baseline">
-                    <span className="text-xs text-warm-500">Videos</span>
-                    <span className="text-sm font-bold text-warm-900">{videoCount ?? 0}</span>
-                  </div>
-                  <div className="flex justify-between items-baseline">
-                    <span className="text-xs text-warm-500">Last Active</span>
-                    <span className="text-sm font-bold text-warm-900">{lastActive}</span>
-                  </div>
-                  {teamId && (
-                    <Link
-                      href={`/baseball/dashboard/players/${id}/stats`}
-                      className="block mt-2 text-xs text-primary-600 hover:text-primary-700 font-medium"
-                    >
-                      View game stats →
-                    </Link>
-                  )}
-                </div>
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-
-      {/* Performance Tab — Helm Lifting Lab data for this player.
-          Rendered below the player card + stats when a lifting org + athlete
-          row exists. Shows an honest empty state when the player has no
-          lifting data yet (no athlete row seeded). */}
-      <div className="mt-8">
-        <h2 className="mb-4 text-sm font-bold uppercase tracking-wide text-warm-700">
-          Performance
-        </h2>
-        {liftingOrgId && liftingAthleteId ? (
-          <PlayerPerformanceTab orgId={liftingOrgId} athleteId={liftingAthleteId} />
-        ) : (
-          <div className="rounded-2xl border border-warm-200 glass-standard px-6 py-8 text-center">
-            <p className="text-sm text-warm-500">
-              No performance data yet for this player.
-            </p>
-            {!liftingOrgId && (
-              <p className="mt-1 text-xs text-warm-400">
-                Set up Helm Lifting Lab for this team to unlock performance tracking.
-              </p>
-            )}
-            {liftingOrgId && !liftingAthleteId && (
-              <p className="mt-1 text-xs text-warm-400">
-                This player&apos;s lifting athlete record has not been created yet.
-              </p>
-            )}
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/baseball/(dashboard)/dashboard/players/[id]/stats/page.tsx b/src/app/baseball/(dashboard)/dashboard/players/[id]/stats/page.tsx
index 39edd1fbe..ae7d7896c 100644
--- a/src/app/baseball/(dashboard)/dashboard/players/[id]/stats/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/players/[id]/stats/page.tsx
@@ -65,7 +65,7 @@ export default async function PlayerStatsPage({ params }: PageProps) {
       <div className="flex items-start justify-between gap-4 flex-wrap">
         <div>
           <div className="flex items-center gap-2 text-sm text-warm-400 mb-2">
-            <Link href={`/baseball/dashboard/players/${playerId}/profile`} className="hover:text-warm-600">
+            <Link href={`/baseball/dashboard/players/${playerId}`} className="hover:text-warm-600">
               {player.first_name} {player.last_name}
             </Link>
             <span>›</span>
@@ -81,7 +81,7 @@ export default async function PlayerStatsPage({ params }: PageProps) {
           </p>
         </div>
         <Link
-          href={`/baseball/dashboard/players/${playerId}/profile`}
+          href={`/baseball/dashboard/players/${playerId}`}
           className="text-sm text-primary-600 hover:text-primary-700 font-medium"
         >
           View Profile →
diff --git a/src/app/baseball/(dashboard)/dashboard/practice/page.tsx b/src/app/baseball/(dashboard)/dashboard/practice/page.tsx
index f0f931e8a..54e153862 100644
--- a/src/app/baseball/(dashboard)/dashboard/practice/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/practice/page.tsx
@@ -1,3 +1,6 @@
+import { redirect } from 'next/navigation';
+
+import { getActiveBaseballContext } from '@/lib/baseball/active-context';
 import { PracticePlannerClient } from '@/components/baseball/practice-planner/PracticePlannerClient';
 import { fairwayScope } from '@/lib/redesign/flag';
 
@@ -17,8 +20,20 @@ export const metadata = {
  * `isRedesignEnabled` fork (the shell flag already gates the whole subtree,
  * per the command-center precedent), always the kit version, wrapped in the
  * `.fairway-ds` scope exactly like `command-center/page.tsx`.
+ *
+ * COHERENCE_RULING_2026-07-08 Ruling 2 (item 7): this route is the COACH
+ * planning surface; the nav already sends players to their canonical
+ * `/baseball/player/practice` view (nav-registry.ts's `practice-planner`
+ * playerHref). A player landing here directly (bookmark, typed URL) is
+ * server-redirected to that canonical surface instead — staff/coach
+ * rendering below is unchanged.
  */
-export default function BaseballPracticePage() {
+export default async function BaseballPracticePage() {
+  const context = await getActiveBaseballContext();
+  if (context?.activeRole === 'player') {
+    redirect('/baseball/player/practice');
+  }
+
   return (
     <div className={fairwayScope('min-h-full')}>
       <PracticePlannerClient />
diff --git a/src/app/baseball/(dashboard)/dashboard/readiness/__tests__/page.test.tsx b/src/app/baseball/(dashboard)/dashboard/readiness/__tests__/page.test.tsx
new file mode 100644
index 000000000..d8ccaf71a
--- /dev/null
+++ b/src/app/baseball/(dashboard)/dashboard/readiness/__tests__/page.test.tsx
@@ -0,0 +1,99 @@
+// =============================================================================
+// PlayerReadinessPage — team-local "today" regression (Coherence Ruling 4).
+//
+// Before the fix, `today` was `new Date().toISOString().slice(0, 10)` — the
+// SERVER's UTC day — while the readiness GATE the player later sees on
+// /player/today (player-today.ts:534, `day = forDate ?? todayIsoInTz(teamTz)`)
+// compares against the TEAM-LOCAL day. A West Coast player checking in at
+// 9pm PT wrote/prefilled against the UTC date (already "tomorrow"), which
+// silently mismatched the gate's team-local date — the check-in looked like
+// it belonged to the wrong day, or a same-day revisit failed to prefill.
+//
+// This test pins a real evening-US instant (9pm PT, which is already past
+// midnight UTC — the exact case contract-day.test.ts validates for
+// `todayIsoInTz`) and asserts the page now resolves the SAME team-local date
+// the readiness gate uses, by calling the real (unmocked) contract-day
+// helpers — only the Supabase row backing `resolveTeamTimezone` is faked.
+// =============================================================================
+
+import { describe, it, expect, vi, afterEach } from 'vitest';
+
+vi.mock('@/components/baseball/performance/PlayerReadinessClient', () => ({
+  PlayerReadinessClient: () => null,
+}));
+
+vi.mock('@/lib/baseball/active-context', () => ({
+  getActiveBaseballContext: vi.fn(async () => ({
+    activeTeamId: 'team-1',
+    activeRole: 'player',
+    activePlayerId: 'player-1',
+  })),
+}));
+
+// Lift Lab context resolves to null so the checkin-prefill branch (which
+// needs a much larger Supabase mock) is skipped — this test is scoped to the
+// `today` date derivation, not the prefill query.
+vi.mock('@/lib/lifting/resolve-baseball-context', () => ({
+  resolveBaseballLiftingOrg: vi.fn(async () => null),
+  resolveMyBaseballAthleteId: vi.fn(async () => null),
+}));
+
+// The ONLY Supabase call this page makes when liftCtx is null is the
+// `baseball_teams.timezone` lookup inside resolveTeamTimezone (real,
+// unmocked implementation below) — fake just that row.
+vi.mock('@/lib/supabase/server', () => ({
+  createClient: vi.fn(async () => ({
+    from: (table: string) => {
+      if (table !== 'baseball_teams') {
+        throw new Error(`unexpected table in test double: ${table}`);
+      }
+      return {
+        select: () => ({
+          eq: () => ({
+            maybeSingle: async () => ({ data: { timezone: 'America/Los_Angeles' } }),
+          }),
+        }),
+      };
+    },
+  })),
+}));
+
+// Deliberately NOT mocking '@/lib/baseball/daily-contract/contract-day' —
+// this test exercises the REAL todayIsoInTz/resolveTeamTimezone so it fails
+// if either the page or the read-model ever regress to a server-UTC slice.
+import { todayIsoInTz } from '@/lib/baseball/daily-contract/contract-day';
+
+import PlayerReadinessPage from '../page';
+import { PlayerReadinessClient } from '@/components/baseball/performance/PlayerReadinessClient';
+
+describe('PlayerReadinessPage — team-local today (evening US timestamp)', () => {
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it('resolves the team-local date, not the server UTC date, for a 9pm PT check-in', async () => {
+    // 2026-06-24T04:00:00Z is 2026-06-23 21:00 PDT (UTC-7) — 9pm Pacific,
+    // already the NEXT day in UTC. The pre-fix `new Date().toISOString()
+    // .slice(0,10)` would resolve '2026-06-24'; team-local must be '2026-06-23'.
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-06-24T04:00:00Z'));
+
+    const element = await PlayerReadinessPage();
+
+    // Same helper + same tz + same instant as the readiness gate in
+    // player-today.ts:534 (`todayIsoInTz(teamTz)`) — equality here is the
+    // gate/page agreement the ruling requires, not a coincidence of mocking.
+    const expectedTeamLocalToday = todayIsoInTz('America/Los_Angeles', new Date());
+
+    expect(expectedTeamLocalToday).toBe('2026-06-23');
+
+    // The page wraps PlayerReadinessClient in a layout <div> — unwrap one level.
+    const inner = (element.props as { children: { type: unknown; props: unknown } })
+      .children;
+    expect(inner.type).toBe(PlayerReadinessClient);
+    expect((inner.props as { checkDate: string }).checkDate).toBe(
+      expectedTeamLocalToday,
+    );
+    expect((inner.props as { checkDate: string }).checkDate).not.toBe('2026-06-24');
+  });
+});
diff --git a/src/app/baseball/(dashboard)/dashboard/readiness/page.tsx b/src/app/baseball/(dashboard)/dashboard/readiness/page.tsx
index da99d3513..32e19b043 100644
--- a/src/app/baseball/(dashboard)/dashboard/readiness/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/readiness/page.tsx
@@ -13,6 +13,10 @@ import { redirect } from 'next/navigation';
 import { createClient } from '@/lib/supabase/server';
 import { fromUntyped } from '@/lib/supabase/untyped';
 import { getActiveBaseballContext } from '@/lib/baseball/active-context';
+import {
+  resolveTeamTimezone,
+  todayIsoInTz,
+} from '@/lib/baseball/daily-contract/contract-day';
 import {
   resolveBaseballLiftingOrg,
   resolveMyBaseballAthleteId,
@@ -36,7 +40,13 @@ export default async function PlayerReadinessPage() {
     redirect('/baseball/dashboard/performance');
   }
 
-  const today = new Date().toISOString().slice(0, 10);
+  // Team-local "today" — the readiness gate (player-today.ts) compares
+  // team-local todayIsoInTz; deriving server-UTC here mis-dated evening US
+  // submissions (a 9pm PT check-in would prefill/dedupe against the wrong day).
+  const supabase = await createClient();
+  const today = todayIsoInTz(
+    await resolveTeamTimezone(supabase, context.activeTeamId),
+  );
 
   // W2-G: submitReadinessCheckin (lifting.ts) writes ONLY to
   // helm_lifting_readiness_checkins now — dedupe/prefill must read the same
@@ -58,7 +68,6 @@ export default async function PlayerReadinessPage() {
   if (liftCtx) {
     const athleteId = await resolveMyBaseballAthleteId(liftCtx.organizationId);
     if (athleteId) {
-      const supabase = await createClient();
       const { data: row } = (await fromUntyped(supabase, 'helm_lifting_readiness_checkins')
         .select('*')
         .eq('athlete_id', athleteId)
diff --git a/src/app/baseball/(dashboard)/dashboard/roster/RosterClient.tsx b/src/app/baseball/(dashboard)/dashboard/roster/RosterClient.tsx
index ae7c79b3e..edc34d55e 100644
--- a/src/app/baseball/(dashboard)/dashboard/roster/RosterClient.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/roster/RosterClient.tsx
@@ -20,7 +20,7 @@ import { RosterFairway } from './RosterFairway';
 
 type MemberStatus = 'pending' | 'active' | 'inactive' | 'removed' | 'injured' | 'alumni';
 export type RosterSurface = 'cards' | 'position' | 'status' | 'development';
-export type SortField = 'name' | 'position' | 'avg' | 'obp' | 'slg' | 'ops' | 'exit_velo' | 'sessions';
+export type SortField = 'name' | 'position' | 'avg' | 'obp' | 'slg' | 'ops' | 'sessions';
 export type SortDirection = 'asc' | 'desc';
 
 export interface RosterClientProps {
@@ -65,7 +65,6 @@ function exportRosterCSV(
     career_obp: number | null;
     career_slg: number | null;
     career_ops: number | null;
-    avg_exit_velocity: number | null;
     total_sessions: number | null;
     status: string | null;
   }>,
@@ -80,7 +79,6 @@ function exportRosterCSV(
     'OBP',
     'SLG',
     'OPS',
-    'Exit Velo',
     'Sessions',
     'Status',
   ];
@@ -94,7 +92,6 @@ function exportRosterCSV(
     p.career_obp !== null ? p.career_obp.toFixed(3) : '',
     p.career_slg !== null ? p.career_slg.toFixed(3) : '',
     p.career_ops !== null ? p.career_ops.toFixed(3) : '',
-    p.avg_exit_velocity !== null ? p.avg_exit_velocity.toFixed(1) : '',
     p.total_sessions?.toString() || '0',
     p.status || '',
   ]);
@@ -338,12 +335,6 @@ export function RosterClient({ teamId: serverTeamId, initialModel }: RosterClien
           comparison = opsB - opsA; // Higher is better
           break;
         }
-        case 'exit_velo': {
-          const veloA = aggA?.avg_exit_velocity ?? -1;
-          const veloB = aggB?.avg_exit_velocity ?? -1;
-          comparison = veloB - veloA; // Higher is better
-          break;
-        }
         case 'sessions': {
           const sessA = aggA?.total_sessions ?? 0;
           const sessB = aggB?.total_sessions ?? 0;
@@ -408,7 +399,6 @@ export function RosterClient({ teamId: serverTeamId, initialModel }: RosterClien
       career_obp: aggregates[member.player.id]?.career_obp ?? null,
       career_slg: aggregates[member.player.id]?.career_slg ?? null,
       career_ops: aggregates[member.player.id]?.career_ops ?? null,
-      avg_exit_velocity: aggregates[member.player.id]?.avg_exit_velocity ?? null,
       total_sessions: aggregates[member.player.id]?.total_sessions ?? null,
       status: member.status,
     }));
diff --git a/src/app/baseball/(dashboard)/dashboard/roster/RosterFairway.tsx b/src/app/baseball/(dashboard)/dashboard/roster/RosterFairway.tsx
index d10f7fa69..d48ea828a 100644
--- a/src/app/baseball/(dashboard)/dashboard/roster/RosterFairway.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/roster/RosterFairway.tsx
@@ -79,7 +79,6 @@ const SORT_OPTIONS: { value: SortField; label: string }[] = [
   { value: 'obp', label: 'OBP' },
   { value: 'slg', label: 'SLG' },
   { value: 'ops', label: 'OPS' },
-  { value: 'exit_velo', label: 'Exit velo' },
   { value: 'sessions', label: 'Sessions' },
 ];
 
@@ -92,7 +91,10 @@ const ALL = 'all';
 
 // ── Record-book roster wall (the `cards` surface) ───────────────────────────
 
-const WALL_COLUMNS = ['AVG', 'OBP', 'SLG', 'OPS', 'EXIT V', 'SESS'];
+// EXIT V intentionally omitted — the aggregates table carries no exit-velocity
+// column in the live schema and nothing writes one (Ruling 4). Honest UI over
+// a dead column: don't render a stat that can never populate.
+const WALL_COLUMNS = ['AVG', 'OBP', 'SLG', 'OPS', 'SESS'];
 
 function buildWallStats(agg: BaseballPlayerAggregates | undefined, leader: boolean): PlayerRowStat[] {
   if (!agg) {
@@ -101,7 +103,6 @@ function buildWallStats(agg: BaseballPlayerAggregates | undefined, leader: boole
       { value: EM_DASH },
       { value: EM_DASH },
       { value: EM_DASH },
-      { value: EM_DASH },
       { value: 0 },
     ];
   }
@@ -110,7 +111,6 @@ function buildWallStats(agg: BaseballPlayerAggregates | undefined, leader: boole
     { value: agg.career_obp == null ? EM_DASH : formatRate(agg.career_obp, 3) },
     { value: agg.career_slg == null ? EM_DASH : formatRate(agg.career_slg, 3) },
     { value: agg.career_ops == null ? EM_DASH : formatRate(agg.career_ops, 3), leader },
-    { value: agg.avg_exit_velocity ?? EM_DASH, decimals: 1 },
     { value: agg.total_sessions },
   ];
 }
diff --git a/src/app/baseball/(dashboard)/dashboard/scouting/page.tsx b/src/app/baseball/(dashboard)/dashboard/scouting/page.tsx
new file mode 100644
index 000000000..128f544dd
--- /dev/null
+++ b/src/app/baseball/(dashboard)/dashboard/scouting/page.tsx
@@ -0,0 +1,122 @@
+// =============================================================================
+// src/app/baseball/(dashboard)/dashboard/scouting/page.tsx
+//
+// COHERENCE_RULING_2026-07-08 Ruling 2 — Recruiting hub's new "Scouting"
+// landing.
+//
+// The Recruiting hub caps at 3 rendered subtabs (Pipeline · Discover ·
+// Scouting), so Watchlist, Compare Players, Saved Comparisons, Scout
+// Packets, and Camps — the evaluation/export tools, not the funnel itself —
+// fold in here as a card grid. Every route keeps its existing URL and its own
+// registry gating (nav-registry.ts); this page never re-declares that
+// gating — it reads the SAME registry entries and reuses
+// isBaseballNavEntryVisible so a coach without can_manage_roster, for
+// example, simply doesn't see the Compare/Saved Comparisons cards.
+//
+// Server component, no hooks — the Living Annual kit's SectionMasthead /
+// PaperCard / Eyebrow are all server-safe. Ink is `pursuit` (clay) — this is
+// THE WAR ROOM lane (recruiting), never green.
+// =============================================================================
+
+import Link from 'next/link';
+
+import { requireRecruitingCoachRoute } from '@/lib/baseball/server-route-guards';
+import { getBaseballNavContext } from '@/lib/baseball/nav-context';
+import {
+  getBaseballNavEntry,
+  isBaseballNavEntryVisible,
+  type BaseballNavContext,
+  type BaseballNavEntry,
+  type BaseballNavId,
+} from '@/lib/baseball/nav-registry';
+import { SectionMasthead, PaperCard, Eyebrow } from '@/components/baseball/living-annual';
+import { IconChevronRight } from '@/components/icons';
+
+export const metadata = {
+  title: 'Scouting · BaseballHelm',
+};
+
+const SCOUTING_CARD_IDS: readonly {
+  id: BaseballNavId;
+  description: string;
+}[] = [
+  {
+    id: 'watchlist',
+    description: 'The saved shortlist — every prospect you’re actively tracking, in one place.',
+  },
+  {
+    id: 'compare',
+    description: 'Side-by-side player comparison across the metrics that matter to your program.',
+  },
+  {
+    id: 'comparisons',
+    description: 'Saved comparison sets you can return to without rebuilding the matchup.',
+  },
+  {
+    id: 'scout-packets',
+    description: 'Export a showcase event roster into a shareable scout packet.',
+  },
+  {
+    id: 'camps',
+    description: 'Create and manage your program’s camp listings.',
+  },
+];
+
+export default async function ScoutingPage() {
+  await requireRecruitingCoachRoute();
+
+  const navContext = (await getBaseballNavContext()) ?? ({ role: 'coach', capabilities: {} } as BaseballNavContext);
+
+  const cards = SCOUTING_CARD_IDS.map(({ id, description }) => {
+    const entry = getBaseballNavEntry(id);
+    return entry && isBaseballNavEntryVisible(entry, navContext) ? { entry, description } : null;
+  }).filter((card): card is { entry: BaseballNavEntry; description: string } => Boolean(card));
+
+  return (
+    <div className="mx-auto w-full max-w-5xl px-4 py-8 sm:px-6 lg:px-8">
+      <SectionMasthead eyebrow="THE WAR ROOM · SCOUTING" title="Scouting" ink="pursuit">
+        <p className="max-w-2xl font-annual text-body text-text-secondary">
+          The evaluation toolkit — shortlists, side-by-side comparisons, and exportable packets —
+          once a prospect is worth a closer look.
+        </p>
+      </SectionMasthead>
+
+      <div className="mt-8 grid gap-4 sm:grid-cols-2">
+        {cards.map(({ entry, description }) => {
+          const Icon = entry.icon;
+          return (
+            <Link
+              key={entry.id}
+              href={entry.href}
+              className="group block rounded-card focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[color:var(--pursuit-ink)] focus-visible:ring-offset-2 focus-visible:ring-offset-[var(--paper)]"
+            >
+              <PaperCard className="flex h-full items-start gap-4 p-5 transition-transform duration-200 ease-out group-hover:-translate-y-0.5">
+                <span className="flex h-10 w-10 shrink-0 items-center justify-center rounded-fw-sm bg-pursuit/10 text-pursuit">
+                  <Icon size={20} />
+                </span>
+                <div className="min-w-0 flex-1">
+                  <h3 className="font-annual text-body-lg font-semibold text-text-primary">{entry.label}</h3>
+                  <p className="mt-1 text-body-sm text-text-secondary">{description}</p>
+                </div>
+                <IconChevronRight
+                  size={18}
+                  className="mt-1 shrink-0 text-text-tertiary transition-transform duration-200 group-hover:translate-x-0.5"
+                />
+              </PaperCard>
+            </Link>
+          );
+        })}
+      </div>
+
+      {cards.length === 0 && (
+        <PaperCard className="mt-8 p-6">
+          <Eyebrow ink="pursuit">Nothing here yet</Eyebrow>
+          <p className="mt-2 font-annual text-body text-text-secondary">
+            Your current role doesn&apos;t have access to any of the Scouting surfaces yet. Ask a
+            head coach to grant access from Management &gt; Settings.
+          </p>
+        </PaperCard>
+      )}
+    </div>
+  );
+}
diff --git a/src/app/baseball/(dashboard)/dashboard/settings/page.tsx b/src/app/baseball/(dashboard)/dashboard/settings/page.tsx
index ad9f478c3..19c88ed33 100644
--- a/src/app/baseball/(dashboard)/dashboard/settings/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/settings/page.tsx
@@ -1,7 +1,6 @@
 'use client';
 
 import { useState } from 'react';
-import { Header } from '@/components/layout/header';
 import { Card, CardContent, CardHeader } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
@@ -220,7 +219,13 @@ export default function SettingsPage() {
 
   return (
     <>
-      <Header title="Settings" subtitle="Manage your account settings" />
+      {/* Ruling 2 (item 5): the shell's own top bar already renders
+          breadcrumbs + the mobile menu affordance — this page no longer
+          mounts a second (legacy) <Header>, which duplicated both. */}
+      <div className="border-b border-warm-200/60 px-6 pb-5 pt-6 lg:px-8 lg:pt-8">
+        <h1 className="text-h2 font-semibold text-warm-900">Settings</h1>
+        <p className="mt-1 text-body-sm text-warm-500">Manage your account settings</p>
+      </div>
       <div className="p-6 lg:p-8 max-w-5xl mx-auto space-y-6">
         <section className="grid gap-3 sm:grid-cols-2">
           {(user?.role === 'coach' ? COACH_SETTINGS_LINKS : PLAYER_SETTINGS_LINKS).map((item) => {
diff --git a/src/app/baseball/(dashboard)/dashboard/stats/games/[gameId]/page.tsx b/src/app/baseball/(dashboard)/dashboard/stats/games/[gameId]/page.tsx
index 8cbd3eca4..3318e9eb0 100644
--- a/src/app/baseball/(dashboard)/dashboard/stats/games/[gameId]/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/stats/games/[gameId]/page.tsx
@@ -2,6 +2,7 @@ import { createClient } from '@/lib/supabase/server';
 import { redirect, notFound } from 'next/navigation';
 import Link from 'next/link';
 import { getGameBoxScore } from '@/app/baseball/actions/games';
+import { BreadcrumbLabel } from '@/app/baseball/(dashboard)/_components/breadcrumb-label';
 import { BoxScoreView } from '@/components/baseball/box-score/BoxScoreView';
 import { BoxScoreUpload } from '@/components/baseball/box-score/BoxScoreUpload';
 import { mapBattingToInput, mapPitchingToInput } from '@/components/baseball/box-score/mappers';
@@ -79,17 +80,21 @@ export default async function GameDetailPage({ params }: PageProps) {
   const initialBatting = batting.map(mapBattingToInput);
   const initialPitching = pitching.map(mapPitchingToInput);
 
+  const opponentLabel = `${game.game_type === 'scrimmage' ? 'Scrimmage' : 'Game'} vs ${game.opponent_name ?? 'TBD'}`;
+
   return (
     <div className="max-w-[1536px] mx-auto px-4 sm:px-6 py-8 space-y-6">
+      {/* Ruling 4: the shell's breadcrumb has no registry entry for a dynamic
+          game id — this supplies the real matchup name so the trail never
+          falls back to a raw UUID segment. */}
+      <BreadcrumbLabel name={opponentLabel} />
       {/* Breadcrumb */}
       <div className="flex items-center gap-2 text-sm text-warm-400">
         <Link href="/baseball/dashboard/stats/games" className="hover:text-warm-600 transition-colors">
           Games
         </Link>
         <span>›</span>
-        <span className="text-warm-600">
-          {game.game_type === 'scrimmage' ? 'Scrimmage' : 'Game'} vs {game.opponent_name ?? 'TBD'}
-        </span>
+        <span className="text-warm-600">{opponentLabel}</span>
       </div>
 
       {/* Completed game with stats: show box score, then offer to edit */}
diff --git a/src/app/baseball/(dashboard)/dashboard/travel/page.tsx b/src/app/baseball/(dashboard)/dashboard/travel/page.tsx
index b00d9f591..f59b2a8ff 100644
--- a/src/app/baseball/(dashboard)/dashboard/travel/page.tsx
+++ b/src/app/baseball/(dashboard)/dashboard/travel/page.tsx
@@ -7,6 +7,7 @@ import { useTeamStore } from '@/stores/team-store';
 import { createClient } from '@/lib/supabase/client';
 import { TravelClient } from '@/components/baseball/travel';
 import { ReadModelStateNotice } from '@/components/baseball/ReadModelStateNotice';
+import { SectionMasthead, EditorsLetter } from '@/components/baseball/living-annual';
 import {
   getTeamItineraries,
   type BaseballTravelItinerary,
@@ -112,10 +113,13 @@ export default function BaseballTravelPage() {
   if (!teamId) {
     return (
       <div className="mx-auto max-w-5xl p-4 md:p-6">
-        <h1 className="text-2xl font-bold tracking-tight text-warm-900">Travel</h1>
-        <div className="mt-8 glass-standard rounded-2xl p-10 text-center">
-          <h2 className="mb-2 text-lg font-semibold text-warm-900">No team found</h2>
-          <p className="text-warm-500">You must be on a team to access travel itineraries.</p>
+        <SectionMasthead eyebrow="THE PRESSBOX · TRAVEL" title="Travel" ink="team" />
+        <div className="mt-8">
+          <EditorsLetter
+            ink="team"
+            title="No team found"
+            body="You must be on a team to access travel itineraries."
+          />
         </div>
       </div>
     );
@@ -124,7 +128,7 @@ export default function BaseballTravelPage() {
   if (loadError) {
     return (
       <div className="mx-auto max-w-5xl p-4 md:p-6">
-        <h1 className="mb-6 text-2xl font-bold tracking-tight text-warm-900">Travel</h1>
+        <SectionMasthead eyebrow="THE PRESSBOX · TRAVEL" title="Travel" ink="team" className="mb-6" />
         <ReadModelStateNotice
           state="error"
           title="Travel unavailable"
diff --git a/src/app/baseball/(dashboard)/layout.tsx b/src/app/baseball/(dashboard)/layout.tsx
index d5ff8221e..59b5fb1b2 100644
--- a/src/app/baseball/(dashboard)/layout.tsx
+++ b/src/app/baseball/(dashboard)/layout.tsx
@@ -6,7 +6,7 @@
 // W6 PROTECTION — team-context guard for the generic (dashboard) route group.
 //
 // This layout accepts BOTH roles (coach AND player) with requiredRole=null.
-// BaseballShellLayout handles:
+// BaseballFairwayShell handles:
 //   - Auth enforcement (useBaseballAuth): unauthenticated → /baseball/login,
 //     no profile → /baseball/complete-signup, onboarding incomplete → onboarding.
 //
@@ -36,23 +36,21 @@
 
 import { useEffect } from 'react';
 import { useRouter } from 'next/navigation';
-import { BaseballShellLayout } from '@/components/baseball/BaseballShellLayout';
 import { BaseballFairwayShell } from './BaseballFairwayShell';
 import { BaseballDashboardBootstrap } from '@/components/baseball/BaseballDashboardBootstrap';
 import { useBaseballAuth } from '@/hooks/use-baseball-auth';
 import { useBaseballNavContext } from '@/hooks/use-baseball-nav-context';
-import { isRedesignEnabled } from '@/lib/redesign/flag';
 
 // ---------------------------------------------------------------------------
-// Inner guard — rendered after BaseballShellLayout's auth gate has passed.
+// Inner guard — rendered before BaseballFairwayShell's auth gate re-checks.
 // Placed as a sibling wrapper so the hooks run in a client component boundary
 // that is ABOVE the shell (layout route groups wrap all children).
 //
-// Strategy: call the same two hooks that BaseballShellLayout uses internally.
+// Strategy: call the same two hooks that BaseballFairwayShell uses internally.
 // Both are safe to call twice:
 //   - useBaseballAuth: verifies session; fast-path from Zustand persisted store.
 //   - useBaseballNavContext: module-scope cache → no extra network call when
-//     BaseballShellLayout calls it again synchronously after this component.
+//     BaseballFairwayShell calls it again synchronously after this component.
 // ---------------------------------------------------------------------------
 function DashboardSessionGuard({ children }: { children: React.ReactNode }) {
   const router = useRouter();
@@ -90,31 +88,19 @@ function DashboardSessionGuard({ children }: { children: React.ReactNode }) {
     return <BaseballDashboardBootstrap />;
   }
 
-  const shell = isRedesignEnabled() ? (
-    <BaseballFairwayShell authVerified>{children}</BaseballFairwayShell>
-  ) : (
-    <BaseballShellLayout requiredRole={null} authVerified>
-      {children}
-    </BaseballShellLayout>
-  );
-
-  return shell;
+  return <BaseballFairwayShell authVerified>{children}</BaseballFairwayShell>;
 }
 
 // ---------------------------------------------------------------------------
-// Layout export — thin shell that composes the session guard around the shared
-// BaseballShellLayout. Both components are client components; the guard runs
+// Layout export — thin shell that composes the session guard around
+// BaseballFairwayShell. Both components are client components; the guard runs
 // its hooks before the shell renders, so the shell always receives a non-null
 // navContext (or the user has already been redirected away).
 //
-// FAIRWAY MIGRATION — PHASE A (shell only): the team-context guard above is
-// shared verbatim by both branches below — it is not part of "the shell" and
-// stays byte-for-byte unchanged regardless of the flag. Only what renders
-// INSIDE the guard is gated: flag ON mounts BaseballFairwayShell (the Fairway
-// AppShell frame, presentation-only); flag OFF keeps the existing
-// BaseballShellLayout -> BaseballDashboardShell composition exactly as it
-// shipped before this change. Default (flag unset) is OFF — dark and
-// reversible.
+// SHELL UNIFICATION (Coherence Ruling 1, 2026-07-08): BaseballFairwayShell
+// renders unconditionally — the legacy isRedesignEnabled() fork to
+// BaseballShellLayout was removed. This is the only shell the (dashboard)
+// route group renders.
 // ---------------------------------------------------------------------------
 export default function DashboardLayout({
   children,
diff --git a/src/app/baseball/(player-dashboard)/player/layout.tsx b/src/app/baseball/(player-dashboard)/player/layout.tsx
index 9306ef5d9..d8cd1978a 100644
--- a/src/app/baseball/(player-dashboard)/player/layout.tsx
+++ b/src/app/baseball/(player-dashboard)/player/layout.tsx
@@ -1,16 +1,8 @@
 'use client';
 
 import { BaseballFairwayShell } from '@/app/baseball/(dashboard)/BaseballFairwayShell';
-import { BaseballShellLayout } from '@/components/baseball/BaseballShellLayout';
-import { isRedesignEnabled } from '@/lib/redesign/flag';
 
 export default function PlayerDashboardLayout({ children }: { children: React.ReactNode }) {
-  const shell = isRedesignEnabled() ? (
-    <BaseballFairwayShell requiredRole="player">{children}</BaseballFairwayShell>
-  ) : (
-    <BaseballShellLayout requiredRole="player">{children}</BaseballShellLayout>
-  );
-
   return (
     <>
       {/*
@@ -20,7 +12,7 @@ export default function PlayerDashboardLayout({ children }: { children: React.Re
        * (start_url: /baseball/player/today) is available for player sessions.
        */}
       <link rel="manifest" href="/baseball-manifest.webmanifest" />
-      {shell}
+      <BaseballFairwayShell requiredRole="player">{children}</BaseballFairwayShell>
     </>
   );
 }
diff --git a/src/app/baseball/actions/__tests__/route-shell-contract.test.ts b/src/app/baseball/actions/__tests__/route-shell-contract.test.ts
index 5493dd771..cb1a03fe3 100644
--- a/src/app/baseball/actions/__tests__/route-shell-contract.test.ts
+++ b/src/app/baseball/actions/__tests__/route-shell-contract.test.ts
@@ -85,7 +85,6 @@ const ADVISORY_ALLOWLIST: readonly AllowlistEntry[] = [
   // list page, never meant to carry their own nav/hub entry. ---
   { bucket: 'orphanRoutes', href: '/baseball/dashboard/players/[id]', reason: 'deep-link detail page reached from Roster' },
   { bucket: 'orphanRoutes', href: '/baseball/dashboard/players/[id]/passport', reason: 'deep-link sub-view reached from the player profile' },
-  { bucket: 'orphanRoutes', href: '/baseball/dashboard/players/[id]/profile', reason: 'deep-link sub-view reached from Roster' },
   { bucket: 'orphanRoutes', href: '/baseball/dashboard/players/[id]/scout-packet', reason: 'deep-link sub-view reached from the player profile' },
   { bucket: 'orphanRoutes', href: '/baseball/dashboard/players/[id]/scout-packet/preview', reason: 'deep-link print preview reached from the scout packet' },
   { bucket: 'orphanRoutes', href: '/baseball/dashboard/players/[id]/stats', reason: 'deep-link sub-view reached from the player profile' },
diff --git a/src/app/baseball/actions/academics.ts b/src/app/baseball/actions/academics.ts
index 3f7c04721..23326516c 100644
--- a/src/app/baseball/actions/academics.ts
+++ b/src/app/baseball/actions/academics.ts
@@ -215,9 +215,10 @@ const getTeamAcademicsAction = withBaseballAction(
         gpa: eligibility?.gpa ?? player?.gpa ?? null,
         credits_completed: eligibility?.credits_completed ?? null,
         credits_required: eligibility?.credits_required ?? 60,
-        // No eligibility record => treat as unknown / ineligible-safe rather
-        // than inflating "Eligible" / "Good Standing" summary cards.
-        is_eligible: eligibility?.is_eligible ?? false,
+        // Tri-state: null = no eligibility record on file yet (neutral,
+        // "Not on file"), never coerced to false — a missing record is not
+        // the same fact as a coach having marked the player ineligible.
+        is_eligible: eligibility?.is_eligible ?? null,
         academic_standing: eligibility?.academic_standing ?? null,
         class_count: classCounts[m.player_id] || 0,
         eligibility_id: eligibility?.id ?? null,
diff --git a/src/app/baseball/actions/calendar.ts b/src/app/baseball/actions/calendar.ts
index 56dc672d9..3df7d097a 100644
--- a/src/app/baseball/actions/calendar.ts
+++ b/src/app/baseball/actions/calendar.ts
@@ -69,7 +69,18 @@ interface UpdateEventInput {
   timezoneOffset?: number;
 }
 
-type ActionResult<T = unknown> = { success: boolean; error?: string; data?: T };
+type ActionResult<T = unknown> = {
+  success: boolean;
+  error?: string;
+  data?: T;
+  /**
+   * Set when the primary write succeeded but a secondary, best-effort write
+   * (RSVP invites, the linked baseball_games row) failed — a partial-success
+   * signal so callers can surface it without treating the whole action as
+   * failed (the primary row really was created).
+   */
+  warning?: string;
+};
 
 const CALENDAR_PATH = '/baseball/dashboard/calendar';
 
@@ -211,6 +222,14 @@ const createBaseballEventAction = withBaseballAction(
 
     if (error) return { success: false, error: sanitizeDbError(error, 'calendar') };
 
+    // Secondary writes below are best-effort: the calendar event itself
+    // already exists (`data`), so a failure here should NOT report the whole
+    // action as failed — but it must not be silently discarded either
+    // (supabase-js never throws on a failed insert; the caller has to check
+    // `error` explicitly). Collected into `warnings` and surfaced via the
+    // `warning` field on a `success: true` result.
+    const warnings: string[] = [];
+
     if (input.requiresRsvp && input.attendeeIds && input.attendeeIds.length > 0 && data) {
       const attendanceRecords = input.attendeeIds.map((playerId) => ({
         event_id: data.id,
@@ -219,12 +238,17 @@ const createBaseballEventAction = withBaseballAction(
       }));
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      await (supabase as any).from('baseball_event_attendance').insert(attendanceRecords);
+      const { error: attendanceError } = await (supabase as any)
+        .from('baseball_event_attendance')
+        .insert(attendanceRecords);
+      if (attendanceError) {
+        warnings.push(`RSVP invites could not be created: ${sanitizeDbError(attendanceError, 'calendar')}`);
+      }
     }
 
     if (data && (input.eventType === 'game' || input.eventType === 'scrimmage')) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      await (supabase as any).from('baseball_games').insert({
+      const { error: gameError } = await (supabase as any).from('baseball_games').insert({
         team_id: resolvedTeamId,
         event_id: data.id,
         game_date: input.startDate,
@@ -235,11 +259,18 @@ const createBaseballEventAction = withBaseballAction(
         created_by: coachId,
         status: 'scheduled',
       });
+      if (gameError) {
+        warnings.push(`Linked game record could not be created: ${sanitizeDbError(gameError, 'calendar')}`);
+      } else {
+        revalidatePath('/baseball/dashboard/stats/games');
+      }
     }
 
     revalidatePath(CALENDAR_PATH);
     revalidatePath('/baseball/dashboard/events');
-    return { success: true, data };
+    return warnings.length > 0
+      ? { success: true, data, warning: warnings.join(' ') }
+      : { success: true, data };
   },
 );
 
diff --git a/src/app/baseball/actions/games.ts b/src/app/baseball/actions/games.ts
index 2f9c41835..5c9b91cbc 100644
--- a/src/app/baseball/actions/games.ts
+++ b/src/app/baseball/actions/games.ts
@@ -152,7 +152,7 @@ const createGameAction = withBaseballAction(
         ? `${input.game_date}T${input.event_time}`
         : `${input.game_date}T12:00:00`;
 
-      const { data: event } = await supabase
+      const { data: event, error: eventError } = await supabase
         .from('baseball_events')
         .insert({
           team_id: teamId,
@@ -172,6 +172,13 @@ const createGameAction = withBaseballAction(
         .select('id')
         .single();
 
+      // The caller explicitly requested a linked calendar event
+      // (`create_calendar_event: true`) — silently proceeding without it
+      // (the previous behaviour: error discarded, `eventId` just stays null)
+      // would create a game the coach believes is on the calendar but isn't.
+      if (eventError) {
+        return { success: false, error: sanitizeDbError(eventError, 'games') };
+      }
       if (event) eventId = event.id;
     }
 
@@ -1062,7 +1069,7 @@ async function uploadBoxScoreCSVImpl(
   const allMatched = unmatched.length === 0;
 
   // Track the upload
-  const { data: upload } = await (supabase as unknown as SupabaseClient)
+  const { data: upload, error: uploadError } = await (supabase as unknown as SupabaseClient)
     .from('baseball_box_score_uploads')
     .insert({
       team_id: teamId,
@@ -1079,7 +1086,30 @@ async function uploadBoxScoreCSVImpl(
     .select('id')
     .single();
 
+  if (uploadError && !allMatched) {
+    // Unmatched rows need a human to resolve them via resolveBoxScoreUpload,
+    // which requires THIS row's id + raw_content — without it the review
+    // flow has nothing to resolve against, so a failed tracking insert must
+    // fail loudly here rather than return a phantom `uploadId: undefined`
+    // that silently strands the unmatched players.
+    return {
+      success: false,
+      matched,
+      unmatched,
+      battingRows,
+      pitchingRows,
+      allMatched,
+      error: sanitizeDbError(uploadError, 'games'),
+    };
+  }
+
   let completionError: string | undefined;
+  if (uploadError) {
+    // allMatched path: the box score itself still gets saved below via the
+    // RPC — only the audit-trail upload row failed to write. Surface it as
+    // a completion-style warning instead of discarding it silently.
+    completionError = `Upload record could not be saved: ${sanitizeDbError(uploadError, 'games')}`;
+  }
 
   // If all matched, auto-save the box score via the atomic RPC — it saves
   // both sides (preserving whichever side isn't in this CSV), finalizes the
@@ -1087,7 +1117,11 @@ async function uploadBoxScoreCSVImpl(
   // season data doesn't sit stale until a second manual action runs.
   if (allMatched && rows.length > 0) {
     const saveResult = await saveCsvBoxScoreViaRpc(gameId, csvType, battingRows, pitchingRows);
-    if (!saveResult.success) completionError = saveResult.error;
+    if (!saveResult.success) {
+      completionError = completionError
+        ? `${completionError} Also: ${saveResult.error}`
+        : saveResult.error;
+    }
   }
 
   return {
@@ -1225,10 +1259,20 @@ async function resolveBoxScoreUploadImpl(
   const result = await saveCsvBoxScoreViaRpc(gameId, csvType, battingRows, pitchingRows);
 
   if (result.success) {
-    await (supabase as unknown as SupabaseClient)
+    // Best-effort bookkeeping: the box score itself already saved above, so
+    // a failure marking the audit-trail row `completed` must not flip the
+    // overall result to failure — but it also must not be discarded
+    // silently, so it's logged for observability instead.
+    const { error: statusError } = await (supabase as unknown as SupabaseClient)
       .from('baseball_box_score_uploads')
       .update({ status: 'completed' })
       .eq('id', uploadId);
+    if (statusError) {
+      await logServerError(
+        `Box score saved but upload ${uploadId} could not be marked completed: ${sanitizeDbError(statusError, 'games')}`,
+        { action: 'baseball_games.resolveBoxScoreUpload', featureArea: 'baseball-games' },
+      );
+    }
   }
 
   return result;
diff --git a/src/app/baseball/actions/messages.ts b/src/app/baseball/actions/messages.ts
index fe18d62b7..6c48168d0 100644
--- a/src/app/baseball/actions/messages.ts
+++ b/src/app/baseball/actions/messages.ts
@@ -67,7 +67,7 @@ async function getPlayerUserIdImpl(playerId: string): Promise<string | null> {
 /**
  * Coach-only: start (or resurface) a 1:1 conversation with a player, reached
  * from a player-profile surface (e.g. PlayerProfileCoachActions on
- * /baseball/dashboard/players/[id]/profile). This wraps the shared
+ * /baseball/dashboard/players/[id]). This wraps the shared
  * createBaseballConversation primitive — which itself only checks
  * supabase.auth.getUser(), no role/capability check — with a SERVER-SIDE
  * `can_message_players` capability enforcement via withBaseballAction.
diff --git a/src/app/lifting/actions/__tests__/groups.test.ts b/src/app/lifting/actions/__tests__/groups.test.ts
new file mode 100644
index 000000000..e85bd931f
--- /dev/null
+++ b/src/app/lifting/actions/__tests__/groups.test.ts
@@ -0,0 +1,125 @@
+// =============================================================================
+// src/app/lifting/actions/__tests__/groups.test.ts
+//
+// GUARD (Lane D2 fix): createGroup / updateGroup / deleteGroup / addGroupMember
+// / removeGroupMember only revalidated the /lifting-portal GROUPS_PATH. Wave C
+// now renders the same helm_lifting_groups reads at
+// /baseball/dashboard/performance/groups (StrengthGroupsClient, mirroring the
+// lifting portal), so a coach editing a group from either portal must bust
+// BOTH caches — otherwise the other portal keeps serving a stale member list
+// or a renamed group until an unrelated navigation. Mirrors the same
+// regression-test pattern already established for programs.ts / sessions.ts /
+// player-sessions.ts.
+// =============================================================================
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+interface FinalResult {
+  data: unknown;
+  error: unknown;
+}
+
+function makeQueryBuilder(finalResult: FinalResult) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const builder: any = {};
+  const passthrough = ['select', 'eq', 'is'];
+  for (const m of passthrough) {
+    builder[m] = vi.fn(() => builder);
+  }
+  builder.insertArgs = null as unknown;
+  builder.insert = vi.fn((payload: unknown) => {
+    builder.insertArgs = payload;
+    return builder;
+  });
+  builder.updateArgs = null as unknown;
+  builder.update = vi.fn((patch: unknown) => {
+    builder.updateArgs = patch;
+    return builder;
+  });
+  builder.upsertArgs = null as unknown;
+  builder.upsert = vi.fn((payload: unknown, opts: unknown) => {
+    builder.upsertArgs = [payload, opts];
+    return builder;
+  });
+  builder.single = vi.fn(async () => finalResult);
+  builder.maybeSingle = vi.fn(async () => finalResult);
+  builder.then = (resolve: (v: FinalResult) => void) => resolve(finalResult);
+  return builder;
+}
+
+const ORG_ID = '11111111-1111-4111-8111-111111111111';
+const GROUP_ID = '22222222-2222-4222-8222-222222222222';
+const ATHLETE_ID = '33333333-3333-4333-8333-333333333333';
+
+let tableBuilders: Record<string, ReturnType<typeof makeQueryBuilder>>;
+
+function resetTables() {
+  tableBuilders = {
+    helm_lifting_groups: makeQueryBuilder({
+      data: { id: GROUP_ID, organization_id: ORG_ID, name: 'Group A', group_type: 'static', is_active: true },
+      error: null,
+    }),
+    helm_lifting_group_members: makeQueryBuilder({ data: { id: 'member-1' }, error: null }),
+    helm_lifting_athletes: makeQueryBuilder({ data: { id: ATHLETE_ID }, error: null }),
+  };
+}
+resetTables();
+
+vi.mock('@/lib/supabase/server', () => ({
+  createClient: vi.fn(async () => ({})),
+}));
+
+vi.mock('@/lib/supabase/untyped', () => ({
+  fromUntyped: vi.fn((_client: unknown, table: string) => tableBuilders[table]),
+}));
+
+vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }));
+
+vi.mock('@/lib/lifting/with-lifting-action', () => ({
+  withLiftingAction:
+    (_name: string, _opts: unknown, fn: (...args: unknown[]) => unknown) =>
+    (...args: unknown[]) => {
+      const ctx = {
+        user: { id: 'user-1' },
+        orgId: ORG_ID,
+        access: { isCoach: true, canEdit: true, canView: true, coachRow: { id: 'coach-1' } },
+      };
+      return fn(ctx, ...args);
+    },
+  LiftingActionError: class LiftingActionError extends Error {},
+}));
+
+import { revalidatePath } from 'next/cache';
+import { createGroup, updateGroup, deleteGroup } from '@/app/lifting/actions/groups';
+
+describe('lifting groups actions revalidate the baseball performance portal (Wave C parallel routes)', () => {
+  beforeEach(() => {
+    resetTables();
+    vi.clearAllMocks();
+    resetTables();
+  });
+
+  it('createGroup busts /baseball/dashboard/performance/groups alongside the lifting-portal path', async () => {
+    await createGroup({ name: 'New Group' });
+
+    const paths = vi.mocked(revalidatePath).mock.calls.map((c) => c[0]);
+    expect(paths).toContain('/lifting/dashboard/groups');
+    expect(paths).toContain('/baseball/dashboard/performance/groups');
+  });
+
+  it('updateGroup busts /baseball/dashboard/performance/groups alongside the lifting-portal path', async () => {
+    await updateGroup({ groupId: GROUP_ID, name: 'Renamed Group' });
+
+    const paths = vi.mocked(revalidatePath).mock.calls.map((c) => c[0]);
+    expect(paths).toContain('/lifting/dashboard/groups');
+    expect(paths).toContain('/baseball/dashboard/performance/groups');
+  });
+
+  it('deleteGroup busts /baseball/dashboard/performance/groups alongside the lifting-portal path', async () => {
+    await deleteGroup({ groupId: GROUP_ID });
+
+    const paths = vi.mocked(revalidatePath).mock.calls.map((c) => c[0]);
+    expect(paths).toContain('/lifting/dashboard/groups');
+    expect(paths).toContain('/baseball/dashboard/performance/groups');
+  });
+});
diff --git a/src/app/lifting/actions/__tests__/player-sessions.test.ts b/src/app/lifting/actions/__tests__/player-sessions.test.ts
index 6844343d6..5eec08c2d 100644
--- a/src/app/lifting/actions/__tests__/player-sessions.test.ts
+++ b/src/app/lifting/actions/__tests__/player-sessions.test.ts
@@ -83,6 +83,7 @@ vi.mock('@/lib/lifting/resolve-baseball-context', () => ({
   resolveMyBaseballAthleteId: vi.fn(async () => ATHLETE_ID),
 }));
 
+import { revalidatePath } from 'next/cache';
 import { logMySetResult, submitLiftReadiness } from '@/app/lifting/actions/player-sessions';
 
 describe('logMySetResult onConflict target', () => {
@@ -108,6 +109,24 @@ describe('logMySetResult onConflict target', () => {
     const [, opts] = tableBuilders.helm_lifting_set_results.upsertArgs as [unknown, { onConflict?: string }];
     expect(opts).toEqual({ onConflict: 'session_exercise_id,set_number' });
   });
+
+  it('revalidates both the /lifting and /baseball lift portals for the mutated session', async () => {
+    await logMySetResult({
+      sessionExerciseId: SESSION_EXERCISE_ID,
+      sessionId: SESSION_ID,
+      athleteId: ATHLETE_ID,
+      setNumber: 1,
+      actualReps: 8,
+      actualLoad: 135,
+      loadUnit: 'lb',
+      rpe: 8,
+    });
+
+    const paths = vi.mocked(revalidatePath).mock.calls.map((c) => c[0]);
+    expect(paths).toContain('/lifting/dashboard/lift');
+    expect(paths).toContain('/baseball/dashboard/lift');
+    expect(paths).toContain(`/baseball/dashboard/lift/${SESSION_ID}`);
+  });
 });
 
 describe('submitLiftReadiness onConflict target', () => {
@@ -147,4 +166,17 @@ describe('submitLiftReadiness onConflict target', () => {
     expect(res.success).toBe(false);
     expect(tableBuilders.helm_lifting_readiness_checkins.upsert).not.toHaveBeenCalled();
   });
+
+  it('revalidates the baseball lift portal alongside /lifting/dashboard', async () => {
+    await submitLiftReadiness({
+      sleepQuality: 4,
+      energyLevel: 4,
+      sorenessOverall: 2,
+      notes: null,
+    });
+
+    const paths = vi.mocked(revalidatePath).mock.calls.map((c) => c[0]);
+    expect(paths).toContain('/lifting/dashboard');
+    expect(paths).toContain('/baseball/dashboard/lift');
+  });
 });
diff --git a/src/app/lifting/actions/__tests__/programs.test.ts b/src/app/lifting/actions/__tests__/programs.test.ts
index 0d45cbd17..7c77d18f7 100644
--- a/src/app/lifting/actions/__tests__/programs.test.ts
+++ b/src/app/lifting/actions/__tests__/programs.test.ts
@@ -171,6 +171,7 @@ vi.mock('@/lib/lifting/with-lifting-action', () => ({
   LiftingActionError: class LiftingActionError extends Error {},
 }));
 
+import { revalidatePath } from 'next/cache';
 import { publishProgram } from '@/app/lifting/actions/programs';
 
 describe('publishProgram program_assignments write target', () => {
@@ -248,3 +249,29 @@ describe('publishProgram idempotent re-publish', () => {
     expect(sessionOpts).toEqual({ onConflict: 'program_assignment_id,athlete_id' });
   });
 });
+
+describe('publishProgram revalidates the baseball performance portal (Wave C parallel routes)', () => {
+  beforeEach(() => {
+    resetTables(null);
+    vi.clearAllMocks();
+    resetTables(null);
+  });
+
+  it('busts /baseball/dashboard/performance/programs, /performance/live, and /lift alongside the lifting-portal paths', async () => {
+    await publishProgram({
+      programId: PROGRAM_ID,
+      scheduleDate: '2026-07-06',
+      targetGroupId: null,
+      targetAthleteId: null,
+    });
+
+    const revalidated = vi.mocked(revalidatePath).mock.calls.map((c) => c[0]);
+    expect(revalidated).toContain('/baseball/dashboard/performance/programs');
+    expect(revalidated).toContain('/baseball/dashboard/performance/live');
+    expect(revalidated).toContain('/baseball/dashboard/lift');
+    // The lifting-portal paths must still fire too — this is additive, not a
+    // replacement of the existing revalidation.
+    expect(revalidated).toContain('/lifting/dashboard/programs');
+    expect(revalidated).toContain('/lifting/dashboard/sessions');
+  });
+});
diff --git a/src/app/lifting/actions/__tests__/sessions.test.ts b/src/app/lifting/actions/__tests__/sessions.test.ts
index d7d1e47c7..0a8867469 100644
--- a/src/app/lifting/actions/__tests__/sessions.test.ts
+++ b/src/app/lifting/actions/__tests__/sessions.test.ts
@@ -97,6 +97,7 @@ vi.mock('@/lib/lifting/with-lifting-action', () => ({
   LiftingActionError: class LiftingActionError extends Error {},
 }));
 
+import { revalidatePath } from 'next/cache';
 import { logSetResult } from '@/app/lifting/actions/sessions';
 
 describe('logSetResult onConflict target', () => {
@@ -141,3 +142,33 @@ describe('logSetResult onConflict target', () => {
     expect(opts.onConflict.split(',')).not.toContain('athlete_id');
   });
 });
+
+describe('logSetResult revalidates the baseball performance portal (Wave C parallel routes)', () => {
+  beforeEach(() => {
+    resetTables();
+    vi.clearAllMocks();
+    resetTables();
+  });
+
+  it('busts /baseball/dashboard/performance/live and the per-session /lift/[sessionId] page', async () => {
+    await logSetResult({
+      sessionExerciseId: SESSION_EXERCISE_ID,
+      athleteId: ATHLETE_ID,
+      setNumber: 1,
+      actualReps: 8,
+      actualLoad: 135,
+    });
+
+    const calls = vi.mocked(revalidatePath).mock.calls;
+    const paths = calls.map((c) => c[0]);
+    expect(paths).toContain('/baseball/dashboard/performance/live');
+    expect(paths).toContain('/baseball/dashboard/lift');
+    // The [sessionId] detail page uses the bracket-pattern + 'page' type
+    // convention (matches golf/actions/round-reviews.ts) rather than a
+    // resolved id — verify both the path AND the type argument.
+    const sessionPageCall = calls.find((c) => c[0] === '/baseball/dashboard/lift/[sessionId]');
+    expect(sessionPageCall?.[1]).toBe('page');
+    // Still fires the lifting-portal live-room revalidation too (additive).
+    expect(paths).toContain('/lifting/dashboard/sessions/live');
+  });
+});
diff --git a/src/app/lifting/actions/groups.ts b/src/app/lifting/actions/groups.ts
index d0e2daf7f..f28d5e1a2 100644
--- a/src/app/lifting/actions/groups.ts
+++ b/src/app/lifting/actions/groups.ts
@@ -33,6 +33,11 @@ import type { Json } from '@/lib/types';
 
 const GROUPS_PATH = '/lifting/dashboard/groups';
 
+// Baseball Wave C renders these same helm_lifting_groups reads at
+// /baseball/dashboard/performance/groups (mirroring the pattern in
+// programs.ts) — bust that portal's RSC cache alongside the lifting one.
+const BASEBALL_GROUPS_PATH = '/baseball/dashboard/performance/groups';
+
 // -----------------------------------------------------------------------------
 // Shared result
 // -----------------------------------------------------------------------------
@@ -158,6 +163,7 @@ export const createGroup = withLiftingAction(
     }
 
     revalidatePath(GROUPS_PATH);
+    revalidatePath(BASEBALL_GROUPS_PATH);
     return { success: true, id: groupId };
   },
 );
@@ -195,6 +201,7 @@ export const updateGroup = withLiftingAction(
 
     if (error) throw error;
     revalidatePath(GROUPS_PATH);
+    revalidatePath(BASEBALL_GROUPS_PATH);
     return { success: true, id: input.groupId };
   },
 );
@@ -231,6 +238,7 @@ export const deleteGroup = withLiftingAction(
       .is('ends_at', null);
 
     revalidatePath(GROUPS_PATH);
+    revalidatePath(BASEBALL_GROUPS_PATH);
     return { success: true };
   },
 );
@@ -277,6 +285,7 @@ export const addGroupMember = withLiftingAction(
       }
       // Already active — no-op.
       revalidatePath(GROUPS_PATH);
+      revalidatePath(BASEBALL_GROUPS_PATH);
       return { success: true, id: existing.id };
     }
 
@@ -294,6 +303,7 @@ export const addGroupMember = withLiftingAction(
 
     if (error) throw error;
     revalidatePath(GROUPS_PATH);
+    revalidatePath(BASEBALL_GROUPS_PATH);
     return { success: true, id: (data as { id: string }).id };
   },
 );
@@ -324,6 +334,7 @@ export const removeGroupMember = withLiftingAction(
 
     if (error) throw error;
     revalidatePath(GROUPS_PATH);
+    revalidatePath(BASEBALL_GROUPS_PATH);
     return { success: true };
   },
 );
diff --git a/src/app/lifting/actions/player-sessions.ts b/src/app/lifting/actions/player-sessions.ts
index f50da7f00..4d203eef5 100644
--- a/src/app/lifting/actions/player-sessions.ts
+++ b/src/app/lifting/actions/player-sessions.ts
@@ -11,6 +11,14 @@ import { revalidatePath } from 'next/cache';
 import { createClient } from '@/lib/supabase/server';
 import { fromUntyped } from '@/lib/supabase/untyped';
 import { resolveMyBaseballAthleteId } from '@/lib/lifting/resolve-baseball-context';
+
+// Baseball Wave C renders these same helm_lifting_sessions /
+// helm_lifting_readiness_checkins reads at /baseball/dashboard/lift and
+// /baseball/dashboard/lift/[sessionId] (see src/app/baseball/(dashboard)/
+// dashboard/lift/page.tsx + [sessionId]/page.tsx) — bust both alongside
+// '/lifting/dashboard/lift' below so a baseball athlete's own lift portal
+// reflects a checkin/set/status mutation immediately.
+const BASEBALL_LIFT_PATH = '/baseball/dashboard/lift';
 import type {
   HelmLiftingSessionRow,
   HelmLiftingSessionStatus,
@@ -170,6 +178,7 @@ export async function submitLiftReadiness(input: {
 
   if (error) return { success: false, error: 'Could not save check-in.' };
   revalidatePath('/lifting/dashboard');
+  revalidatePath(BASEBALL_LIFT_PATH);
   return { success: true, id: data?.id };
 }
 
@@ -190,6 +199,8 @@ export async function startMySession(sessionId: string): Promise<{ success: bool
 
   if (error) return { success: false, error: 'Could not start session.' };
   revalidatePath('/lifting/dashboard/lift');
+  revalidatePath(BASEBALL_LIFT_PATH);
+  revalidatePath(`${BASEBALL_LIFT_PATH}/${sessionId}`);
   return { success: true };
 }
 
@@ -250,6 +261,8 @@ export async function logMySetResult(input: {
     .eq('status', 'assigned');
 
   revalidatePath('/lifting/dashboard/lift');
+  revalidatePath(BASEBALL_LIFT_PATH);
+  revalidatePath(`${BASEBALL_LIFT_PATH}/${input.sessionId}`);
   return { success: true, id: data?.id };
 }
 
@@ -269,5 +282,7 @@ export async function completeMySession(sessionId: string): Promise<{ success: b
 
   if (error) return { success: false, error: 'Could not complete session.' };
   revalidatePath('/lifting/dashboard/lift');
+  revalidatePath(BASEBALL_LIFT_PATH);
+  revalidatePath(`${BASEBALL_LIFT_PATH}/${sessionId}`);
   return { success: true };
 }
diff --git a/src/app/lifting/actions/programs.ts b/src/app/lifting/actions/programs.ts
index d9643d724..552c371f6 100644
--- a/src/app/lifting/actions/programs.ts
+++ b/src/app/lifting/actions/programs.ts
@@ -52,6 +52,16 @@ import type {
 
 const LAB_PATH = '/lifting/dashboard/programs';
 
+// Baseball Wave C now renders these same helm_lifting_* reads at parallel
+// baseball routes (src/app/baseball/(dashboard)/dashboard/performance/...),
+// so every mutation here must also bust the baseball portal's RSC cache —
+// otherwise a coach editing a program from /lifting sees it update, but the
+// same org's baseball staff at /baseball/dashboard/performance/programs keep
+// serving stale data until the next unrelated navigation.
+const BASEBALL_PROGRAMS_PATH = '/baseball/dashboard/performance/programs';
+const BASEBALL_LIVE_PATH = '/baseball/dashboard/performance/live';
+const BASEBALL_LIFT_PATH = '/baseball/dashboard/lift';
+
 // -----------------------------------------------------------------------------
 // Shared result shape
 // -----------------------------------------------------------------------------
@@ -139,6 +149,7 @@ export const createProgram = withLiftingAction(
 
     if (error) throw error;
     revalidatePath(LAB_PATH);
+    revalidatePath(BASEBALL_PROGRAMS_PATH);
     return { success: true, id: (data as { id: string }).id };
   },
 );
@@ -192,6 +203,8 @@ export const updateProgram = withLiftingAction(
     if (error) throw error;
     revalidatePath(`${LAB_PATH}/${programId}`);
     revalidatePath(LAB_PATH);
+    revalidatePath(`${BASEBALL_PROGRAMS_PATH}/${programId}`);
+    revalidatePath(BASEBALL_PROGRAMS_PATH);
     return { success: true, id: programId };
   },
 );
@@ -263,6 +276,7 @@ export const deleteProgram = withLiftingAction(
       .eq('organization_id', ctx.orgId);
 
     revalidatePath(LAB_PATH);
+    revalidatePath(BASEBALL_PROGRAMS_PATH);
     return { success: true };
   },
 );
@@ -579,6 +593,9 @@ export const publishProgram = withLiftingAction(
 
     revalidatePath(LAB_PATH);
     revalidatePath('/lifting/dashboard/sessions');
+    revalidatePath(BASEBALL_PROGRAMS_PATH);
+    revalidatePath(BASEBALL_LIVE_PATH);
+    revalidatePath(BASEBALL_LIFT_PATH);
     return { success: true, count: sessionCount };
   },
 );
@@ -707,6 +724,7 @@ export const addLiftWeek = withLiftingAction(
       .single();
     if (error) throw error;
     revalidatePath(LAB_PATH);
+    revalidatePath(BASEBALL_PROGRAMS_PATH);
     return { success: true, id: (data as { id: string }).id };
   },
 );
@@ -735,6 +753,7 @@ export const addLiftDay = withLiftingAction(
       .single();
     if (error) throw error;
     revalidatePath(LAB_PATH);
+    revalidatePath(BASEBALL_PROGRAMS_PATH);
     return { success: true, id: (data as { id: string }).id };
   },
 );
@@ -762,6 +781,7 @@ export const addLiftSection = withLiftingAction(
       .single();
     if (error) throw error;
     revalidatePath(LAB_PATH);
+    revalidatePath(BASEBALL_PROGRAMS_PATH);
     return { success: true, id: (data as { id: string }).id };
   },
 );
@@ -800,6 +820,7 @@ export const addLiftPrescription = withLiftingAction(
       .single();
     if (error) throw error;
     revalidatePath(LAB_PATH);
+    revalidatePath(BASEBALL_PROGRAMS_PATH);
     return { success: true, id: (data as { id: string }).id };
   },
 );
@@ -1106,7 +1127,10 @@ export const duplicateLiftDay = withLiftingAction(
       .select('program_id').eq('id', weekId).maybeSingle() as {
         data: { program_id?: string } | null
       };
-    if (wk?.program_id) revalidatePath(`${LAB_PATH}/${wk.program_id}`);
+    if (wk?.program_id) {
+      revalidatePath(`${LAB_PATH}/${wk.program_id}`);
+      revalidatePath(`${BASEBALL_PROGRAMS_PATH}/${wk.program_id}`);
+    }
     return { success: true, id: newDayId };
   },
 );
@@ -1179,6 +1203,7 @@ export const duplicateLiftWeek = withLiftingAction(
     }
 
     revalidatePath(`${LAB_PATH}/${src.program_id}`);
+    revalidatePath(`${BASEBALL_PROGRAMS_PATH}/${src.program_id}`);
     return { success: true, id: newWeekId };
   },
 );
diff --git a/src/app/lifting/actions/sessions.ts b/src/app/lifting/actions/sessions.ts
index 516ee9115..85db45ffb 100644
--- a/src/app/lifting/actions/sessions.ts
+++ b/src/app/lifting/actions/sessions.ts
@@ -36,6 +36,20 @@ import type {
 const SESSIONS_PATH = '/lifting/dashboard/sessions';
 const LIVE_PATH = '/lifting/dashboard/sessions/live';
 
+// Baseball Wave C renders the staff live-room read at
+// /baseball/dashboard/performance/live and the per-session player detail at
+// /baseball/dashboard/lift/[sessionId] (mirroring the pattern in
+// programs.ts / groups.ts) — bust both alongside the lifting-portal paths so
+// a staff edit here doesn't leave the baseball portal serving stale session
+// state. The bracket-pattern + 'page' type revalidates every session id in
+// one call (same convention as revalidatePath('/golf/dashboard/rounds/[id]/
+// review', 'page') in golf/actions/round-reviews.ts) — cheaper and safer
+// than resolving one id per mutation site, several of which only have the
+// session_exercise's parent session_id in scope, not a bound `sessionId`.
+const BASEBALL_LIVE_PATH = '/baseball/dashboard/performance/live';
+const BASEBALL_LIFT_PATH = '/baseball/dashboard/lift';
+const BASEBALL_LIFT_SESSION_PATH = '/baseball/dashboard/lift/[sessionId]';
+
 // -----------------------------------------------------------------------------
 // Shared result
 // -----------------------------------------------------------------------------
@@ -220,6 +234,9 @@ export const advanceSessionLifecycle = withLiftingAction(
     if (error) throw error;
     revalidatePath(SESSIONS_PATH);
     revalidatePath(LIVE_PATH);
+    revalidatePath(BASEBALL_LIVE_PATH);
+    revalidatePath(BASEBALL_LIFT_PATH);
+    revalidatePath(BASEBALL_LIFT_SESSION_PATH, 'page');
     return { success: true, id: sessionId };
   },
 );
@@ -261,6 +278,9 @@ export const addSessionNote = withLiftingAction(
 
     if (error) throw error;
     revalidatePath(SESSIONS_PATH);
+    revalidatePath(BASEBALL_LIVE_PATH);
+    revalidatePath(BASEBALL_LIFT_PATH);
+    revalidatePath(BASEBALL_LIFT_SESSION_PATH, 'page');
     return { success: true, id: sessionId };
   },
 );
@@ -320,6 +340,9 @@ export const modifySectionForAthlete = withLiftingAction(
       .eq('organization_id', ctx.orgId);
 
     revalidatePath(LIVE_PATH);
+    revalidatePath(BASEBALL_LIVE_PATH);
+    revalidatePath(BASEBALL_LIFT_PATH);
+    revalidatePath(BASEBALL_LIFT_SESSION_PATH, 'page');
     return { success: true, id: input.sessionExerciseId };
   },
 );
@@ -399,6 +422,9 @@ export const logSetResult = withLiftingAction(
       .eq('status', 'assigned');
 
     revalidatePath(LIVE_PATH);
+    revalidatePath(BASEBALL_LIVE_PATH);
+    revalidatePath(BASEBALL_LIFT_PATH);
+    revalidatePath(BASEBALL_LIFT_SESSION_PATH, 'page');
     return { success: true, id: (data as { id: string }).id };
   },
 );
diff --git a/src/components/baseball/BaseballShellLayout.tsx b/src/components/baseball/BaseballShellLayout.tsx
deleted file mode 100644
index 85d937d7c..000000000
--- a/src/components/baseball/BaseballShellLayout.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-'use client';
-
-// =============================================================================
-// BaseballShellLayout — shared layout wrapper for all three BaseballHelm shell
-// route groups: (dashboard), (coach-dashboard)/coach, (player-dashboard)/player.
-//
-// Extracted so the three layout.tsx files stay a thin ≤15-line wrapper around
-// this component instead of triplicating the same provider tree. Any change to
-// the session / provider / shell composition is made here once; the three layouts
-// pick it up automatically.
-//
-// The only difference between the three layout variants is auth-role enforcement:
-//   - (dashboard):        useBaseballAuth() — accepts both roles, passes dynamic
-//   - (coach-dashboard):  useBaseballAuth('coach') — rejects players
-//   - (player-dashboard): useBaseballAuth('player') — rejects coaches
-//
-// The `requiredRole` prop maps to those three cases so callers can share this
-// component without adding their own provider trees.
-// =============================================================================
-
-import type { ReactNode } from 'react';
-import { SidebarProvider } from '@/contexts/sidebar-context';
-import { SessionActivityProvider } from '@/components/providers/SessionActivityProvider';
-import { PageLoading } from '@/components/ui/loading';
-import { LastSeenUpdater } from '@/components/admin/LastSeenUpdater';
-import { PeekPanelProvider } from '@/components/baseball/peek-panel';
-import { BaseballDashboardShell } from '@/components/baseball/dashboard-shell';
-import { BaseballProgramBrand } from '@/components/baseball/settings/BaseballProgramBrand';
-import { useBaseballAuth } from '@/hooks/use-baseball-auth';
-import { useBaseballNavContext } from '@/hooks/use-baseball-nav-context';
-import type { ActiveBaseballRole } from '@/lib/baseball/active-context-shared';
-
-interface BaseballShellLayoutProps {
-  children: ReactNode;
-  /**
-   * When set, the auth hook enforces that the signed-in user has the matching
-   * role and redirects otherwise. `null` accepts both coach and player (the
-   * generic /baseball/dashboard route group). The `role` passed to the shell is
-   * derived from the auth response when this is `null`.
-   */
-  requiredRole: ActiveBaseballRole | null;
-  /** Parent layout already verified auth — skip the second full-page skeleton. */
-  authVerified?: boolean;
-}
-
-export function BaseballShellLayout({
-  children,
-  requiredRole,
-  authVerified = false,
-}: BaseballShellLayoutProps) {
-  // For the generic (dashboard) group, `requiredRole` is null and the hook
-  // accepts both roles + returns the real role from the session. For the
-  // role-locked groups it enforces the expected role and redirects on mismatch.
-  const { loading, authorized, role } = useBaseballAuth(requiredRole);
-  // Server-resolved capability map so capability-gated coach verticals (Import
-  // Center, Postgame Review, Practice Effectiveness, Decision Room, Staff/Program
-  // Settings) actually appear in the nav. Without this the shell falls back to an
-  // empty capability map and fail-closes every gated entry.
-  const { navContext } = useBaseballNavContext();
-
-  if (!authVerified && (loading || !authorized)) {
-    return <PageLoading />;
-  }
-
-  // When a role is locked (coach / player layout) pass it directly so the shell
-  // does not have to re-derive it from the session. When null, use the value the
-  // auth hook resolved (never undefined at this point because we checked above).
-  const resolvedRole: 'coach' | 'player' =
-    requiredRole ?? role ?? 'coach';
-
-  return (
-    <SidebarProvider>
-      <SessionActivityProvider>
-        <LastSeenUpdater />
-        {/* Render-null: fetches the program's brand + applies it as CSS vars /
-            data attrs on <html>. Mounted once per shell so persisted branding
-            (settings/appearance) actually takes visible effect. */}
-        <BaseballProgramBrand />
-        <PeekPanelProvider>
-          <BaseballDashboardShell role={resolvedRole} navContext={navContext ?? undefined}>
-            {children}
-          </BaseballDashboardShell>
-        </PeekPanelProvider>
-      </SessionActivityProvider>
-    </SidebarProvider>
-  );
-}
diff --git a/src/components/baseball/NotificationBell.tsx b/src/components/baseball/NotificationBell.tsx
index af6954dbf..9c85b30af 100644
--- a/src/components/baseball/NotificationBell.tsx
+++ b/src/components/baseball/NotificationBell.tsx
@@ -14,11 +14,10 @@
 //     clears the badge optimistically.
 //
 // Design tokens: cream/green palette — no blue/purple. Matches the shared
-// BaseballDashboardShell header aesthetic (warm-matte surfaces, subtle
+// BaseballFairwayShell header aesthetic (warm-matte surfaces, subtle
 // ring focus, green-primary CTAs).
 //
-// Integration: the shell integration agent wires this into
-// BaseballShellLayout / BaseballDashboardShell header.
+// Integration: mounted in BaseballFairwayShell's top bar actions slot.
 // =============================================================================
 
 import { useState, useEffect, useTransition, useCallback } from 'react';
diff --git a/src/components/baseball/ReadModelStateNotice.tsx b/src/components/baseball/ReadModelStateNotice.tsx
index 8c0c31705..5829419e5 100644
--- a/src/components/baseball/ReadModelStateNotice.tsx
+++ b/src/components/baseball/ReadModelStateNotice.tsx
@@ -1,12 +1,11 @@
 'use client';
 
-import { Card, CardContent } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
+import { EditorsLetter } from '@/components/baseball/living-annual';
 import {
   readModelStateLabel,
   type ReadModelLoadState,
 } from '@/lib/product-trust/read-model-state';
-import { IconWarning, IconShieldAlert } from '@/components/icons';
 
 interface ReadModelStateNoticeProps {
   state: Exclude<ReadModelLoadState, 'ready' | 'empty'>;
@@ -24,6 +23,13 @@ const TITLES: Record<Exclude<ReadModelLoadState, 'ready' | 'empty'>, string> = {
 /**
  * Explicit load-state surface for legacy client pages (#413).
  * Never collapses failures into a healthy empty state.
+ *
+ * Living-Annual doctrine (design-system-living-annual.md §7): empty AND error
+ * states both render through `<EditorsLetter>` — "no yellow warning boxes
+ * anywhere." This previously rendered its own amber-tinted icon chip
+ * (`bg-amber-50` / `text-amber-600`), which is exactly the pattern the kit
+ * replaces; composing `EditorsLetter` here fixes every call site at once
+ * (announcements, documents, travel, camps, compare, dev-plan).
  */
 export function ReadModelStateNotice({
   state,
@@ -31,23 +37,21 @@ export function ReadModelStateNotice({
   onRetry,
   className,
 }: ReadModelStateNoticeProps) {
-  const Icon = state === 'unauthorized' ? IconShieldAlert : IconWarning;
   const heading = title ?? TITLES[state];
 
   return (
-    <Card variant="glass" className={className}>
-      <CardContent className="p-8 text-center">
-        <div className="w-14 h-14 rounded-2xl bg-amber-50 flex items-center justify-center mx-auto mb-4">
-          <Icon size={26} className="text-amber-600" />
-        </div>
-        <h3 className="text-lg font-semibold text-warm-900 mb-2">{heading}</h3>
-        <p className="text-warm-500 max-w-md mx-auto mb-4">{readModelStateLabel(state)}</p>
-        {onRetry && state !== 'unauthorized' ? (
+    <EditorsLetter
+      ink="team"
+      title={heading}
+      body={readModelStateLabel(state)}
+      className={className}
+      action={
+        onRetry && state !== 'unauthorized' ? (
           <Button type="button" variant="outline" onClick={onRetry}>
             Try again
           </Button>
-        ) : null}
-      </CardContent>
-    </Card>
+        ) : undefined
+      }
+    />
   );
 }
diff --git a/src/components/baseball/calendar/BaseballCalendarWrapper.tsx b/src/components/baseball/calendar/BaseballCalendarWrapper.tsx
index 924ccd9a6..93cdd37f0 100644
--- a/src/components/baseball/calendar/BaseballCalendarWrapper.tsx
+++ b/src/components/baseball/calendar/BaseballCalendarWrapper.tsx
@@ -12,6 +12,7 @@ import {
   deleteBaseballEvent,
   rsvpToBaseballEvent,
 } from '@/app/baseball/actions/calendar';
+import { toast } from '@/components/ui/sonner';
 import type { CalendarEvent } from '@/hooks/useCalendarEvents';
 
 // ── Design tokens ──────────────────────────────────────────────────────────────
@@ -84,8 +85,23 @@ async function respondToBaseballEvent(
 // ── Action handlers ────────────────────────────────────────────────────────────
 
 const baseballActionHandlers = {
-  createEvent: (data: unknown) =>
-    createBaseballEvent(data as Parameters<typeof createBaseballEvent>[0]),
+  /**
+   * The event row itself can succeed while a secondary, best-effort write
+   * (RSVP invites, the linked `baseball_games` row) fails — `createBaseballEvent`
+   * surfaces that as `result.warning` on an otherwise `success: true` result
+   * (see `ActionResult` in `@/app/baseball/actions/calendar`). The shared
+   * `PremiumCalendarClient` only branches on `result.success`, so it never
+   * looks at `.warning` — this non-blocking toast is the only place that gap
+   * gets surfaced to the coach. The result is returned unchanged so the rest
+   * of the save flow (closing the modal, `router.refresh()`) is untouched.
+   */
+  createEvent: async (data: unknown) => {
+    const result = await createBaseballEvent(data as Parameters<typeof createBaseballEvent>[0]);
+    if (result.success && result.warning) {
+      toast.warning('Event created', { description: result.warning });
+    }
+    return result;
+  },
   updateEvent: (id: string, data: unknown) =>
     updateBaseballEvent(id, data as Parameters<typeof updateBaseballEvent>[1]),
   deleteEvent: deleteBaseballEvent,
diff --git a/src/components/baseball/calendar/CalendarFairway.tsx b/src/components/baseball/calendar/CalendarFairway.tsx
index 368825e54..3a65eafcc 100644
--- a/src/components/baseball/calendar/CalendarFairway.tsx
+++ b/src/components/baseball/calendar/CalendarFairway.tsx
@@ -2,17 +2,19 @@
 
 /**
  * ============================================================================
- * CalendarFairway — Fairway (warm-premium) presentation of the baseball
- * Calendar page. Phase B leaf migration, Wave 1 · calendar. Flag-gated behind
- * `isRedesignEnabled()` — see the page fork.
+ * CalendarFairway — "The Living Annual" presentation of the baseball Calendar
+ * page (spec: docs/baseball/design-system-living-annual.md; map:
+ * docs/baseball/ui-migration-map.md `calendar` row — `SectionMasthead` +
+ * `EmptyIssue`/`EditorsLetter` consistency pass).
  * ----------------------------------------------------------------------------
  * PRESENTATION ONLY. Migrates the page-owned chrome — the canvas background,
- * the event-summary strip, and the college-coach recruiting empty state — to
- * Fairway primitives. The interactive grid (`BaseballCalendarWrapper` →
- * `PremiumCalendarClient`) is a SHARED component and is reused verbatim inside
- * the new frame per the migration playbook §3.5. No data path, action, event
- * mapping, RSVP bridge, or query is touched here — the wrapper keeps every
- * baseball action handler and capability flag it already had.
+ * the masthead, the event-summary strip, and the college-coach recruiting
+ * empty state — to the Living-Annual kit. The interactive grid
+ * (`BaseballCalendarWrapper` → `PremiumCalendarClient`) is a SHARED component
+ * and is reused verbatim inside the new frame per the migration playbook §3.5.
+ * No data path, action, event mapping, RSVP bridge, or query is touched here —
+ * the wrapper keeps every baseball action handler and capability flag it
+ * already had.
  *
  * A full Fairway-native month grid (as golf built under
  * `components/fairway/pages/calendar`) is a separate, larger effort.
@@ -20,25 +22,31 @@
 
 import type { ComponentProps } from 'react';
 import Link from 'next/link';
-import { Calendar as CalendarIcon } from 'lucide-react';
-import { EmptyState, StatusPill, Button, type FwStatusTone } from '@/components/fairway';
+import { Button } from '@/components/fairway';
+import { SectionMasthead, EditorsLetter, InkBadge, LiveDot } from '@/components/baseball/living-annual';
 import { fairwayScope } from '@/lib/redesign/flag';
 import { BaseballCalendarWrapper } from './BaseballCalendarWrapper';
 import type { CalendarEvent } from '@/hooks/useCalendarEvents';
 
 type WrapperProps = ComponentProps<typeof BaseballCalendarWrapper>;
 
-/** Event-type → label + Fairway status tone for the summary strip. */
-const EVENT_TYPE_META: Record<string, { label: string; tone: FwStatusTone }> = {
-  game: { label: 'Game', tone: 'info' },
-  practice: { label: 'Practice', tone: 'accent' },
-  camp: { label: 'Camp', tone: 'warning' },
-  tryout: { label: 'Tryout', tone: 'warning' },
-  meeting: { label: 'Meeting', tone: 'neutral' },
-  travel: { label: 'Travel', tone: 'info' },
-  other: { label: 'Other', tone: 'neutral' },
+/** Event-type → singular label for the ruled summary strip. */
+const EVENT_TYPE_LABEL: Record<string, string> = {
+  game: 'game',
+  practice: 'practice',
+  camp: 'camp',
+  tryout: 'tryout',
+  meeting: 'meeting',
+  travel: 'travel event',
+  other: 'other',
 };
 
+/** Pluralize a singular event-type label for the count badge ("1 game" / "3 games"). */
+function pluralizeEventLabel(label: string, count: number): string {
+  if (count === 1) return label;
+  return label.endsWith('s') ? label : `${label}s`;
+}
+
 // Preserve the legacy full-height flex shell so PremiumCalendarClient's h-full
 // resolves; only the gradient background is swapped for the Fairway canvas.
 const SHELL = 'flex h-[calc(100vh-5.5rem-env(safe-area-inset-bottom))] flex-col md:h-screen';
@@ -68,16 +76,25 @@ export function CalendarFairway({
   if (recruitingEmpty) {
     return (
       <div className={fairwayScope(SHELL, 'bg-canvas')}>
+        <div className="flex-shrink-0 px-4 pt-4 md:px-6 md:pt-6">
+          <SectionMasthead eyebrow="THE WAR ROOM · CALENDAR" title="Calendar" ink="pursuit" />
+        </div>
         <div className="flex flex-1 items-center justify-center p-6">
-          <EmptyState
-            icon={CalendarIcon}
+          {/* Not the `calendar` EmptyIssue preset ("No dates on the card") —
+              this is the recruiting-specific narrative (camp/official-visit
+              windows), so it stays a bespoke EditorsLetter like the other
+              Batch A surfaces' non-preset states (e.g. TasksFairway/
+              AnnouncementsFairway "no team selected"). */}
+          <EditorsLetter
+            ink="pursuit"
             title="Your recruiting calendar is empty"
-            description="Camp visits and official visit windows will appear here as you schedule recruiting activity."
+            body="Camp visits and official visit windows will appear here as you schedule recruiting activity."
             action={
               <Button asChild variant="primary">
                 <Link href="/baseball/dashboard/discover">Browse prospects</Link>
               </Button>
             }
+            className="max-w-md"
           />
         </div>
       </div>
@@ -86,6 +103,10 @@ export function CalendarFairway({
 
   return (
     <div className={fairwayScope(SHELL, 'bg-canvas')}>
+      <div className="flex-shrink-0 px-4 pt-4 md:px-6 md:pt-6">
+        <SectionMasthead eyebrow="THE PRESSBOX · SCHEDULE" title="Calendar" ink="team" />
+      </div>
+
       {/* Gated on `upcomingEvents` (not `events.length`) — the strip reads
           "N upcoming events", so a team with only past events has nothing
           upcoming to summarize. `eventTypeCounts` is derived from the same
@@ -94,23 +115,13 @@ export function CalendarFairway({
           scrolling horizontally so nothing clips off the 390px viewport with
           no visible way to reach it (visual-verify coach-ops__calendar). */}
       {upcomingEvents > 0 && (
-        <div className="flex-shrink-0 px-4 pb-2 pt-4 md:px-6 md:pt-6">
+        <div className="flex-shrink-0 px-4 pb-2 pt-3 md:px-6">
           <div className="flex flex-wrap items-center gap-x-3 gap-y-1.5">
-            <span className="whitespace-nowrap text-sm font-medium text-text-secondary">
-              {upcomingEvents} upcoming event{upcomingEvents !== 1 ? 's' : ''}
-            </span>
-            <span className="text-border-strong" aria-hidden>
-              ·
-            </span>
+            <LiveDot ink="team" label={`${upcomingEvents} upcoming event${upcomingEvents !== 1 ? 's' : ''}`} />
             {Object.entries(eventTypeCounts).map(([type, count]) => {
-              const meta = EVENT_TYPE_META[type] ?? {
-                label: type,
-                tone: 'neutral' as FwStatusTone,
-              };
+              const label = EVENT_TYPE_LABEL[type] ?? type;
               return (
-                <StatusPill key={type} tone={meta.tone} size="sm" dot>
-                  {count} {meta.label}
-                </StatusPill>
+                <InkBadge key={type} tone="team" label={`${count} ${pluralizeEventLabel(label, count)}`} />
               );
             })}
           </div>
diff --git a/src/components/baseball/dashboard-shell.tsx b/src/components/baseball/dashboard-shell.tsx
deleted file mode 100644
index 78f6692a8..000000000
--- a/src/components/baseball/dashboard-shell.tsx
+++ /dev/null
@@ -1,268 +0,0 @@
-'use client';
-
-import { useEffect, useRef, useMemo } from 'react';
-import { usePathname } from 'next/navigation';
-import { Sidebar } from '@/components/layout/sidebar';
-import { CommandPalette } from '@/components/CommandPalette';
-import { MobileBottomNav, type MobileNavItem } from '@/components/layout/mobile-bottom-nav';
-import { useSidebar } from '@/contexts/sidebar-context';
-import { useUnreadCount } from '@/hooks/use-unread-count';
-import { cn } from '@/lib/utils';
-import { HubSubNav } from '@/app/baseball/(dashboard)/_components/hub-sub-nav';
-import { resolveActiveHub } from '@/app/baseball/(dashboard)/_components/resolve-active-hub';
-import { NotificationBell } from '@/components/baseball/NotificationBell';
-import {
-  getVisibleBaseballNav,
-  type BaseballNavContext,
-} from '@/lib/baseball/nav-registry';
-import {
-  IconHome,
-  IconUsers,
-  IconUser,
-  IconCalendar,
-  IconMenu,
-} from '@/components/icons';
-
-// ---------------------------------------------------------------------------
-// Fallback mobile nav (rendered while navContext is still resolving so the
-// bottom bar is never empty on first paint).
-// ---------------------------------------------------------------------------
-const COACH_NAV_FALLBACK: MobileNavItem[] = [
-  { label: 'Home', href: '/baseball/dashboard/command-center', icon: IconHome },
-  { label: 'Calendar', href: '/baseball/dashboard/calendar', icon: IconCalendar },
-  { label: 'Roster', href: '/baseball/dashboard/roster', icon: IconUsers },
-];
-
-const PLAYER_NAV_FALLBACK: MobileNavItem[] = [
-  { label: 'Home', href: '/baseball/player/today', icon: IconHome },
-  { label: 'Schedule', href: '/baseball/dashboard/calendar', icon: IconCalendar },
-  { label: 'Profile', href: '/baseball/dashboard/profile', icon: IconUser },
-];
-
-/**
- * Derive the 4 mobile bottom nav items from the resolved nav context.
- *
- * Strategy: keep the three everyday mobile destinations stable, then make the
- * fourth slot open the full drawer. The registry still decides whether the
- * preferred ids exist for the current role/program, and the drawer carries the
- * rest of the product surface without pretending Settings is "More".
- */
-function buildMobileNavFromContext(
-  ctx: BaseballNavContext,
-  unreadCount: number,
-  openMenu: () => void,
-): MobileNavItem[] {
-  const primary = getVisibleBaseballNav(ctx).filter((e) => e.section === 'primary');
-  const preferredIds = ctx.role === 'coach'
-    ? ['command-center', 'calendar', 'roster']
-    : ['player-today', 'calendar', 'player-profile'];
-  const top3 = preferredIds
-    .map((id) => primary.find((e) => e.id === id))
-    .filter((e): e is NonNullable<typeof e> => Boolean(e));
-  const fill = primary.filter((e) => !top3.some((selected) => selected.id === e.id));
-  const items: MobileNavItem[] = [...top3, ...fill].slice(0, 3).map((e) => ({
-    label: e.label,
-    href: e.href,
-    icon: e.icon,
-    ...(e.showUnreadBadge && unreadCount > 0 ? { badge: unreadCount } : {}),
-  }));
-  items.push({
-    label: 'Menu',
-    icon: IconMenu,
-    onClick: openMenu,
-    ...(unreadCount > 0 ? { badge: unreadCount } : {}),
-  });
-  return items;
-}
-
-type Props = {
-  children: React.ReactNode;
-  role: 'coach' | 'player';
-  /**
-   * Server-resolved nav context (role + capabilities + programType). When
-   * provided, the mobile bottom nav is derived from getVisibleBaseballNav() so
-   * nav registry changes propagate automatically. Falls back to the hardcoded
-   * role constants until the context resolves.
-   */
-  navContext?: BaseballNavContext;
-};
-
-export function BaseballDashboardShell({ children, role, navContext }: Props) {
-  const { collapsed, mobileOpen, setMobileOpen } = useSidebar();
-  const pathname = usePathname();
-  const { unreadCount } = useUnreadCount();
-
-  // Derive the mobile nav from the registry when the context is available;
-  // fall back to the role-specific constants while it is still resolving.
-  const mobileNavItems = useMemo<MobileNavItem[]>(() => {
-    if (navContext) {
-      return buildMobileNavFromContext(navContext, unreadCount, () => setMobileOpen(true));
-    }
-    const fallback = role === 'coach' ? COACH_NAV_FALLBACK : PLAYER_NAV_FALLBACK;
-    return [
-      ...fallback,
-      {
-        label: 'Menu',
-        icon: IconMenu,
-        onClick: () => setMobileOpen(true),
-        ...(unreadCount > 0 ? { badge: unreadCount } : {}),
-      },
-    ];
-  }, [navContext, role, unreadCount, setMobileOpen]);
-
-  // Grouped-hubs sub-tab strip: resolve which hub (Team / Stats / Development /
-  // Management / Recruiting / Academics) owns the current route and render its
-  // sub-tabs above the page. Top-level surfaces (Dashboard, Profile, etc.) sit
-  // in no hub → activeHub is null → no strip.
-  const activeHub = resolveActiveHub({
-    pathname,
-    role,
-    programType: navContext?.programType ?? null,
-    capabilities: navContext?.capabilities,
-  });
-
-  const mobileSidebarRef = useRef<HTMLDivElement>(null);
-  const triggerRef = useRef<Element | null>(null);
-
-  // Close mobile sidebar on Escape key
-  useEffect(() => {
-    if (!mobileOpen) return;
-    function onKeyDown(e: KeyboardEvent) {
-      if (e.key === 'Escape') setMobileOpen(false);
-    }
-    document.addEventListener('keydown', onKeyDown);
-    return () => document.removeEventListener('keydown', onKeyDown);
-  }, [mobileOpen, setMobileOpen]);
-
-  // Prevent body scroll when mobile sidebar is open
-  useEffect(() => {
-    if (!mobileOpen) return;
-    document.body.style.overflow = 'hidden';
-    return () => {
-      document.body.style.overflow = '';
-    };
-  }, [mobileOpen]);
-
-  // Focus trap for mobile sidebar + restore focus on close
-  useEffect(() => {
-    if (!mobileOpen || !mobileSidebarRef.current) return;
-
-    // Store the element that had focus before sidebar opened
-    triggerRef.current = document.activeElement;
-
-    const sidebar = mobileSidebarRef.current;
-    const focusable = sidebar.querySelectorAll<HTMLElement>(
-      'a[href], button:not([disabled]), input:not([disabled]), [tabindex]:not([tabindex="-1"])'
-    );
-    const first = focusable[0];
-    if (first) first.focus();
-
-    function trapFocus(e: KeyboardEvent) {
-      if (e.key !== 'Tab' || focusable.length === 0) return;
-      const firstEl = focusable[0]!;
-      const lastEl = focusable[focusable.length - 1]!;
-      if (e.shiftKey && document.activeElement === firstEl) {
-        e.preventDefault();
-        lastEl.focus();
-      } else if (!e.shiftKey && document.activeElement === lastEl) {
-        e.preventDefault();
-        firstEl.focus();
-      }
-    }
-    document.addEventListener('keydown', trapFocus);
-    return () => {
-      document.removeEventListener('keydown', trapFocus);
-      // Restore focus to trigger element when sidebar closes
-      if (triggerRef.current instanceof HTMLElement) {
-        triggerRef.current.focus();
-      }
-    };
-  }, [mobileOpen]);
-
-  return (
-    // `baseball-shell` is a scoping hook ONLY (no styles of its own) so
-    // globals.css can safely re-point the legacy sidebar's active-nav accent
-    // to the program's persisted brand color without ever matching a golf
-    // route. This component + <Sidebar> (src/components/layout/sidebar.tsx)
-    // are baseball-only, but the class gives CSS an explicit, grep-able
-    // boundary instead of relying on file co-location. See globals.css
-    // "BaseballHelm legacy shell nav-accent consumer" for the paired rule.
-    <div className="min-h-dvh baseball-shell bg-dashboard-gradient">
-      <a
-        href="#main-content"
-        className="sr-only focus:not-sr-only focus:absolute focus:top-4 focus:left-4 focus:z-toolbar focus:px-4 focus:py-2 focus:bg-primary-600 focus:text-white focus:rounded-lg focus:shadow-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2"
-      >
-        Skip to main content
-      </a>
-
-      <CommandPalette navContext={navContext ?? { role, capabilities: {} }} />
-
-      <div className="hidden lg:block">
-        <Sidebar navContext={navContext} />
-      </div>
-
-      {/* Mobile Sidebar Overlay */}
-      <div
-        className={cn(
-          'fixed inset-0 bg-warm-900/50 backdrop-blur-sm z-40 lg:hidden',
-          'transition-opacity duration-300 ease-out',
-          mobileOpen ? 'opacity-100 pointer-events-auto' : 'opacity-0 pointer-events-none'
-        )}
-        onClick={() => setMobileOpen(false)}
-        aria-hidden="true"
-      />
-
-      {/* Mobile Sidebar */}
-      <div
-        ref={mobileSidebarRef}
-        role="dialog"
-        aria-label="Navigation menu"
-        aria-modal="true"
-        className={cn(
-          'fixed inset-y-0 left-0 z-50 lg:hidden',
-          'transition-transform duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-          mobileOpen ? 'translate-x-0' : '-translate-x-full'
-        )}
-      >
-        <Sidebar isMobile navContext={navContext} />
-      </div>
-
-      <div
-        className={cn(
-          'min-h-dvh flex flex-col',
-          'transition-[margin-left] duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-          collapsed ? 'lg:ml-[72px]' : 'lg:ml-64'
-        )}
-      >
-        <main
-          id="main-content"
-          className={cn(
-            'flex-1',
-            'pb-[calc(5rem+env(safe-area-inset-bottom))] lg:pb-0'
-          )}
-          style={{
-            WebkitOverflowScrolling: 'touch',
-            overscrollBehaviorY: 'contain',
-          }}
-        >
-          <div className="sticky top-0 z-30 flex min-h-14 items-center justify-end border-b border-warm-200/70 bg-cream-50/82 px-4 py-2 backdrop-blur-xl sm:px-6 lg:px-8">
-            <NotificationBell />
-          </div>
-
-          {/* Grouped-hub sub-tab strip (only on hub-owned routes). */}
-          {activeHub && (
-            <HubSubNav
-              key={activeHub.id}
-              tabs={activeHub.tabs}
-              ariaLabel={activeHub.ariaLabel}
-              className="hidden md:block md:top-14"
-            />
-          )}
-          {children}
-        </main>
-      </div>
-
-      <MobileBottomNav items={mobileNavItems} />
-    </div>
-  );
-}
diff --git a/src/components/baseball/dashboard/dashboard-types.ts b/src/components/baseball/dashboard/dashboard-types.ts
deleted file mode 100644
index a9ac66071..000000000
--- a/src/components/baseball/dashboard/dashboard-types.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-export interface TeamHealthData {
-  rosterCount: number;
-  rosterCapacity: number;
-  eligibleCount: number;
-  eligibilityPct: number;
-  teamGpa: number | null;
-  transferReadyCount: number;
-  recentJoins: number;
-}
-
-export interface DevPlanProgressItem {
-  playerId: string;
-  playerName: string;
-  avatarUrl: string | null;
-  completedGoals: number;
-  totalGoals: number;
-  progressPct: number;
-  hasOverdue: boolean;
-  nextGoalTitle: string | null;
-}
-
-export interface AttentionItem {
-  type: 'academic_risk' | 'declining_stats' | 'overdue_goals' | 'no_video';
-  count: number;
-  playerIds: string[];
-  description: string;
-}
-
-export interface TeamStatsTrendPoint {
-  date: string;
-  teamAvg: number | null;
-  exitVelo: number | null;
-  obp: number | null;
-}
-
-export interface CollegeInterestItem {
-  schoolName: string;
-  schoolLogo: string | null;
-  playerId: string;
-  playerName: string;
-  viewCount: number;
-  isWatchlisted: boolean;
-  lastViewed: string;
-}
-
-export interface CollegeInterestSummary {
-  totalProfileViews: number;
-  profileViewsChange: number;
-  schoolsInterested: number;
-  watchlistAdds: number;
-  topInterest: CollegeInterestItem[];
-}
-
-export interface TeamActivity {
-  id: string;
-  type: 'video_upload' | 'goal_completed' | 'stats_uploaded' | 'player_joined' | 'message';
-  playerId: string | null;
-  playerName: string | null;
-  description: string;
-  timestamp: string;
-}
diff --git a/src/components/baseball/documents/DocumentsFairway.tsx b/src/components/baseball/documents/DocumentsFairway.tsx
index 25306aeac..4a7dfe482 100644
--- a/src/components/baseball/documents/DocumentsFairway.tsx
+++ b/src/components/baseball/documents/DocumentsFairway.tsx
@@ -2,14 +2,16 @@
 
 /**
  * ============================================================================
- * DocumentsFairway — Fairway (warm-premium) presentation of the baseball
- * Documents page. Phase B leaf migration, Wave 2 · documents. Flag-gated
- * behind `isRedesignEnabled()` — see the client fork.
+ * DocumentsFairway — "The Living Annual" presentation of the baseball
+ * Documents page (spec: docs/baseball/design-system-living-annual.md; map:
+ * docs/baseball/ui-migration-map.md `documents` row — `SectionMasthead` +
+ * `EmptyIssue` consistency pass).
  * ----------------------------------------------------------------------------
  * PRESENTATION ONLY. Receives the SAME computed state + handlers the client
  * owns (filtered docs, search/category state, upload state, and the card
- * callbacks) and migrates the CHROME — header + upload, search, category tabs,
- * empty state — to `@/components/fairway` primitives.
+ * callbacks) and migrates the CHROME — masthead + upload, search, category
+ * tabs, empty state — to the Living-Annual kit (search/filter tabs stay on
+ * `@/components/fairway` primitives, which aren't part of the kit's coverage).
  *
  * The document cards are rendered from the reused `DocumentCard` (which owns
  * its own menu + actions); the hidden file input, preview modal, and
@@ -18,9 +20,8 @@
  * ========================================================================== */
 
 import type { ComponentProps, ReactNode } from 'react';
-import { Upload, FileText } from 'lucide-react';
+import { Upload } from 'lucide-react';
 import {
-  ViewHeader,
   SearchField,
   Segmented,
   Button,
@@ -28,6 +29,7 @@ import {
   Select,
   Switch,
 } from '@/components/fairway';
+import { SectionMasthead, EmptyIssue } from '@/components/baseball/living-annual';
 import { DocumentCard } from './DocumentCard';
 import type { BaseballDocument } from '@/app/baseball/actions/documents';
 
@@ -111,10 +113,11 @@ export function DocumentsFairway({
     <div className="mx-auto w-full max-w-[1200px] px-4 py-8 sm:px-6 lg:px-8">
       {fileInputSlot}
 
-      <ViewHeader
+      <SectionMasthead
+        eyebrow="THE PRESSBOX · DOCUMENTS"
         title="Documents"
-        description={isCoach ? 'Share playbooks, plans, and team files' : 'Team documents and resources'}
-        primaryAction={
+        ink="team"
+        actions={
           isCoach ? (
             <Button
               variant="primary"
@@ -127,7 +130,11 @@ export function DocumentsFairway({
             </Button>
           ) : undefined
         }
-      />
+      >
+        <p className="max-w-prose font-annual text-body text-text-secondary">
+          {isCoach ? 'Share playbooks, plans, and team files' : 'Team documents and resources'}
+        </p>
+      </SectionMasthead>
 
       <div className="mt-6 flex flex-col gap-3 sm:flex-row sm:items-center">
         <div className="sm:max-w-xs sm:flex-1">
@@ -178,30 +185,32 @@ export function DocumentsFairway({
 
       <div className="mt-6">
         {filtered.length === 0 ? (
-          <EmptyState
-            icon={FileText}
-            title={totalCount === 0 ? 'No documents' : 'No results'}
-            description={
-              totalCount === 0
-                ? isCoach
-                  ? 'Upload playbooks, practice plans, waivers, and other team documents.'
-                  : 'No documents have been shared yet. Check back later.'
-                : 'Try adjusting your search or filters.'
-            }
-            action={
-              totalCount === 0 && isCoach ? (
-                <Button
-                  variant="primary"
-                  size="sm"
-                  busy={isUploadingDocument}
-                  leftIcon={<Upload className="h-4 w-4" />}
-                  onClick={onUpload}
-                >
-                  Upload document
-                </Button>
-              ) : undefined
-            }
-          />
+          totalCount === 0 ? (
+            <EmptyIssue
+              variant="documents"
+              ink="team"
+              action={
+                isCoach ? (
+                  <Button
+                    variant="primary"
+                    size="sm"
+                    busy={isUploadingDocument}
+                    leftIcon={<Upload className="h-4 w-4" />}
+                    onClick={onUpload}
+                  >
+                    Upload document
+                  </Button>
+                ) : undefined
+              }
+            />
+          ) : (
+            // Filtered-to-zero (search/category), not a true empty surface —
+            // outside the kit's empty-state doctrine, so it keeps the neutral
+            // Fairway `search` variant rather than the `documents` EmptyIssue
+            // preset copy ("The file drawer is empty"), which would be wrong
+            // here.
+            <EmptyState variant="search" title="No results" description="Try adjusting your search or filters." />
+          )
         ) : (
           <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
             {filtered.map((doc) => (
diff --git a/src/components/baseball/living-annual/RuledStatLine.tsx b/src/components/baseball/living-annual/RuledStatLine.tsx
index 92832f855..d9484010e 100644
--- a/src/components/baseball/living-annual/RuledStatLine.tsx
+++ b/src/components/baseball/living-annual/RuledStatLine.tsx
@@ -129,7 +129,7 @@ export function RuledStatLine({
           initial="hidden"
           animate="visible"
           variants={settle}
-          className={cn('flex items-baseline gap-2 pb-1 font-annual leading-none', numeralInk, numeralSize)}
+          className={cn('flex items-baseline gap-2 pb-1 font-annual', numeralInk, numeralSize)}
         >
           {ghost ? (
             <span aria-hidden className="tabular-nums">
diff --git a/src/components/baseball/performance/LiveWeightRoom.tsx b/src/components/baseball/performance/LiveWeightRoom.tsx
deleted file mode 100644
index dbd8f5bed..000000000
--- a/src/components/baseball/performance/LiveWeightRoom.tsx
+++ /dev/null
@@ -1,1203 +0,0 @@
-'use client';
-
-// =============================================================================
-// src/components/baseball/performance/LiveWeightRoom.tsx
-//
-// V11 Live Weight Room mode (spec L522-573 + Packet G) — the flagship premium
-// staff surface. ONE screen to run a room of 20-60 athletes:
-//
-//   * Full-width sticky top bar: team · lift day · group · completion · risk ·
-//     live clock · group filter · refresh (spec L526-533).
-//   * Athlete grid: name / position / station / exercise / prescribed vs actual
-//     load / RPE / readiness badge / last-update (spec L538-549). Color PLUS label
-//     everywhere (spec L568) — never color alone.
-//   * Right rail (4 derived queues): needs-coach · readiness flags · load
-//     changes · missing check-ins (spec L551-556).
-//   * Bottom drawer: selected-athlete set logger + load adjust + substitute +
-//     mark observed + mark limited + quick message + follow-up task (spec L558-566).
-//
-// WRITE MODEL: every coach action is OPTIMISTIC with ROLLBACK (spec L573). We
-// apply the change to local state immediately, fire the capability-enforced
-// server action, and on failure revert to the pre-action snapshot + surface a
-// non-destructive error toast. A poll (or manual refresh) re-syncs from truth.
-//
-// Cream/green GolfHelm palette ONLY. Reuses Card / EmptyState. No navy/amber tale.
-// =============================================================================
-
-import { useCallback, useEffect, useId, useMemo, useRef, useState, useTransition } from 'react';
-import Link from 'next/link';
-import { motion, useReducedMotion } from 'framer-motion';
-import { toast } from 'sonner';
-
-import { Card, CardContent, CardHeader } from '@/components/ui/card';
-import { EmptyState } from '@/components/ui/empty-state';
-import { Skeleton } from '@/components/ui/skeleton';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { NativeSelect } from '@/components/ui/select';
-import { getFullName } from '@/lib/utils';
-import { readinessBandLabel, readinessBandTone } from '@/lib/baseball/lifting/readiness-compute';
-import {
-  logSetResult,
-  modifySessionExercise,
-  substituteSessionExercise,
-  markExerciseObserved,
-  sendLiftQuickMessage,
-  createLiftFollowupTask,
-  setAvailabilityStatus,
-  getLiveWeightRoomSnapshot,
-} from '@/app/baseball/actions/lifting-v11';
-import { useLiveSetSync } from '@/lib/baseball/lifting/use-live-set-sync';
-import type {
-  BaseballLiveWeightRoomData,
-  BaseballLiveAthleteRow,
-  BaseballLiveExerciseRow,
-  BaseballReadinessBand,
-  BaseballLiftSessionStatus,
-} from '@/lib/types/baseball-lifting-v11';
-
-interface Props {
-  initialData: BaseballLiveWeightRoomData;
-  canViewReadiness: boolean;
-  playerNameById: Record<string, string>;
-  exerciseLibrary: Array<{ id: string; name: string; category: string | null }>;
-  groupFilter: string | null;
-  isLoading?: boolean;
-}
-
-const POLL_MS = 20_000;
-
-const TONE_CLASS: Record<'success' | 'warning' | 'error' | 'info', string> = {
-  success: 'bg-primary-50 text-primary-700 border-primary-200',
-  warning: 'bg-amber-50 text-amber-700 border-amber-200',
-  error: 'bg-red-50 text-red-700 border-red-200',
-  info: 'bg-warm-50 text-warm-700 border-warm-200',
-};
-
-const SESSION_STATUS: Record<BaseballLiftSessionStatus, { label: string; tone: keyof typeof TONE_CLASS }> = {
-  assigned: { label: 'Not started', tone: 'info' },
-  started: { label: 'In progress', tone: 'warning' },
-  modified: { label: 'Modified', tone: 'warning' },
-  completed: { label: 'Complete', tone: 'success' },
-  missed: { label: 'Missed', tone: 'error' },
-  excused: { label: 'Excused', tone: 'info' },
-};
-
-function BandChip({ band }: { band: BaseballReadinessBand | null }) {
-  if (!band) {
-    return (
-      <span className="inline-flex items-center rounded-full border border-warm-200 bg-cream-100 px-2 py-0.5 text-xs font-medium text-warm-500">
-        No check-in
-      </span>
-    );
-  }
-  const tone = readinessBandTone(band);
-  return (
-    <span className={`inline-flex items-center rounded-full border px-2 py-0.5 text-xs font-medium ${TONE_CLASS[tone]}`}>
-      {readinessBandLabel(band)}
-    </span>
-  );
-}
-
-function StatusChip({ status }: { status: BaseballLiftSessionStatus }) {
-  const s = SESSION_STATUS[status] ?? { label: status, tone: 'info' as const };
-  return (
-    <span className={`inline-flex items-center rounded-full border px-2 py-0.5 text-xs font-medium ${TONE_CLASS[s.tone]}`}>
-      {s.label}
-    </span>
-  );
-}
-
-function relTime(iso: string | null): string {
-  if (!iso) return '—';
-  const diff = Date.now() - new Date(iso).getTime();
-  if (diff < 0) return 'now';
-  const m = Math.floor(diff / 60_000);
-  if (m < 1) return 'just now';
-  if (m < 60) return `${m}m ago`;
-  const h = Math.floor(m / 60);
-  return `${h}h ago`;
-}
-
-export function LiveWeightRoom({
-  initialData,
-  canViewReadiness,
-  playerNameById,
-  exerciseLibrary,
-  groupFilter,
-  isLoading = false,
-}: Props) {
-  const [data, setData] = useState<BaseballLiveWeightRoomData>(initialData);
-  const [selectedId, setSelectedId] = useState<string | null>(null);
-  const [clock, setClock] = useState(() => new Date());
-  const [, startTransition] = useTransition();
-  const [refreshing, setRefreshing] = useState(false);
-  const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
-
-  // Offline-safe set capture. Set logging is the highest-frequency entry on this
-  // surface and the one where a dropped network LOSES real work — so it does NOT
-  // go through runOptimistic's rollback path. Instead it buffers durably and
-  // replays on reconnect (logSetResult upserts on (exercise,set) → safe replay).
-  const setSync = useLiveSetSync(
-    useCallback(
-      (input) =>
-        logSetResult({
-          sessionId: input.sessionId,
-          sessionExerciseId: input.sessionExerciseId,
-          setNumber: input.setNumber,
-          actualReps: input.actualReps,
-          actualLoad: input.actualLoad,
-          loadUnit: input.loadUnit,
-          rpe: input.rpe,
-        }),
-      [],
-    ),
-  );
-
-  // Live clock (spec L532).
-  useEffect(() => {
-    const t = setInterval(() => setClock(new Date()), 1000);
-    return () => clearInterval(t);
-  }, []);
-
-  // Refresh the snapshot from the server (manual + polling). Never clobbers an
-  // in-flight optimistic write: we always re-fetch the authoritative truth.
-  const refresh = useCallback(async () => {
-    setRefreshing(true);
-    try {
-      const r = await getLiveWeightRoomSnapshot({ groupId: groupFilter });
-      if (r.success && r.data) setData(r.data);
-    } catch {
-      // Polling failure is silent (transient); the next tick retries.
-    } finally {
-      setRefreshing(false);
-    }
-  }, [groupFilter]);
-
-  // Polling fallback (spec L572). Pauses while the drawer is open so a coach
-  // mid-edit isn't yanked out from under by a refresh.
-  useEffect(() => {
-    if (selectedId) {
-      if (pollRef.current) clearInterval(pollRef.current);
-      return undefined;
-    }
-    pollRef.current = setInterval(refresh, POLL_MS);
-    return () => {
-      if (pollRef.current) clearInterval(pollRef.current);
-    };
-  }, [selectedId, refresh]);
-
-  const selected = useMemo(
-    () => data.athletes.find((a) => a.session_id === selectedId) ?? null,
-    [data.athletes, selectedId],
-  );
-
-  // ---- Optimistic helpers -------------------------------------------------
-  // Apply a local mutation to an athlete's row, fire the server action, and on
-  // failure restore the pre-action snapshot. The whole athletes array is the unit
-  // of rollback so any derived field (queues read from props) stays consistent.
-  const runOptimistic = useCallback(
-    (
-      mutate: (athletes: BaseballLiveAthleteRow[]) => BaseballLiveAthleteRow[],
-      action: () => Promise<{ success: boolean; error?: string }>,
-      okMsg: string,
-    ) => {
-      const snapshot = data;
-      setData((prev) => ({ ...prev, athletes: mutate(prev.athletes) }));
-      startTransition(async () => {
-        try {
-          const r = await action();
-          if (!r.success) {
-            setData(snapshot); // rollback
-            toast.error(r.error ?? 'That change did not save.');
-            return;
-          }
-          toast.success(okMsg);
-          await refresh(); // re-sync from truth (PRs, derived queues, etc.)
-        } catch {
-          setData(snapshot);
-          toast.error('That change did not save.');
-        }
-      });
-    },
-    [data, refresh],
-  );
-
-  // ---- Offline-safe set logging (NOT rollback) ----------------------------
-  // Apply the optimistic grid mutation AND durably buffer the set. The buffer —
-  // not the live request — is what guarantees the set survives: it replays on
-  // reconnect and is only cleared on a confirmed server upsert. A flaky-network
-  // failure therefore keeps the logged set on screen instead of yanking it away.
-  const applyLoggedSet = useCallback(
-    (
-      mutate: (athletes: BaseballLiveAthleteRow[]) => BaseballLiveAthleteRow[],
-      set: Parameters<typeof setSync.queueAndFlush>[0],
-    ) => {
-      setData((prev) => ({ ...prev, athletes: mutate(prev.athletes) }));
-      setSync.queueAndFlush(set);
-    },
-    [setSync],
-  );
-
-  const tb = data.top_bar;
-
-  if (isLoading) {
-    return (
-      <div className="min-h-screen bg-cream-50" aria-busy="true" aria-label="Loading weight room…">
-        {/* Sticky top bar skeleton */}
-        <div className="sticky top-0 z-30 border-b border-warm-200 bg-cream-50/95 backdrop-blur-xl">
-          <div className="mx-auto flex max-w-[1600px] flex-wrap items-center gap-x-6 gap-y-2 px-4 py-3">
-            <Skeleton className="h-7 w-32 rounded-lg" />
-            <Skeleton className="h-5 w-24" />
-            <Skeleton className="h-5 w-32" />
-            <div className="ml-auto flex items-center gap-3">
-              <Skeleton className="h-8 w-28 rounded-xl" />
-              <Skeleton className="h-8 w-20 rounded-xl" />
-            </div>
-          </div>
-        </div>
-        {/* Main layout skeleton */}
-        <div className="mx-auto max-w-[1600px] flex gap-5 p-4">
-          {/* Athlete grid */}
-          <div className="flex-1 space-y-3">
-            {/* Grid header */}
-            <div className="grid grid-cols-7 gap-3 px-3 py-2">
-              {Array.from({ length: 7 }).map((_, i) => (
-                <Skeleton key={i} className="h-3" />
-              ))}
-            </div>
-            {/* Athlete rows */}
-            {Array.from({ length: 8 }).map((_, i) => (
-              <div
-                key={i}
-                className="grid grid-cols-7 gap-3 rounded-2xl border border-warm-100 glass-standard px-3 py-3 items-center"
-                style={{ animationDelay: `${i * 40}ms` }}
-              >
-                <div className="flex items-center gap-2 col-span-2">
-                  <Skeleton variant="circular" className="w-8 h-8 flex-shrink-0" />
-                  <div className="space-y-1">
-                    <Skeleton className="h-3.5 w-24" />
-                    <Skeleton className="h-3 w-12" />
-                  </div>
-                </div>
-                <Skeleton className="h-4 w-full" />
-                <Skeleton className="h-4 w-full" />
-                <Skeleton className="h-4 w-full" />
-                <Skeleton className="h-6 w-20 rounded-full" />
-                <Skeleton className="h-3 w-14" />
-              </div>
-            ))}
-          </div>
-          {/* Right rail */}
-          <div className="w-72 flex-shrink-0 space-y-4">
-            {Array.from({ length: 4 }).map((_, i) => (
-              <div key={i} className="rounded-2xl border border-warm-100 glass-standard p-4 space-y-3">
-                <Skeleton className="h-4 w-32" />
-                {Array.from({ length: 2 }).map((_, j) => (
-                  <div key={j} className="flex items-center gap-2">
-                    <Skeleton variant="circular" className="w-6 h-6 flex-shrink-0" />
-                    <Skeleton className="flex-1 h-3.5" />
-                  </div>
-                ))}
-              </div>
-            ))}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="min-h-screen bg-cream-50">
-      {/* ===== Full-width sticky top bar (spec L526-533) ===== */}
-      <div className="sticky top-0 z-30 border-b border-warm-200 bg-cream-50/95 backdrop-blur-xl">
-        <div className="mx-auto flex max-w-[1600px] flex-wrap items-center gap-x-6 gap-y-2 px-4 py-3">
-          <div className="flex items-center gap-3">
-            <Link
-              href="/baseball/dashboard/performance"
-              className="rounded-lg border border-warm-200 glass-standard px-2.5 py-1 text-xs font-medium text-warm-600 transition-colors hover:bg-cream-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/50"
-            >
-              ← Command center
-            </Link>
-            <div>
-              <p className="text-eyebrow uppercase text-primary-700">Live</p>
-              <h1 className="text-lg font-semibold leading-tight text-warm-900">Live Weight Room</h1>
-              <p className="text-xs text-warm-500">
-                {tb.team_name} · {tb.lift_day_label}
-                {tb.active_group ? ` · ${tb.active_group}` : ''}
-              </p>
-            </div>
-          </div>
-
-          {/* Live stats */}
-          <div className="flex items-center gap-4 text-sm">
-            <Stat label="On the floor" value={tb.total} />
-            <Stat label="Complete" value={`${tb.completed}/${tb.total}`} tone={tb.completed === tb.total && tb.total > 0 ? 'success' : undefined} />
-            <Stat label="In progress" value={tb.in_progress} />
-            {canViewReadiness && (
-              <Stat label="At risk" value={tb.risk_count} tone={tb.risk_count > 0 ? 'error' : 'success'} />
-            )}
-          </div>
-
-          <div className="ml-auto flex items-center gap-3">
-            {/* Group filter (top-bar "active group") */}
-            <form method="get" className="flex items-center gap-2">
-              <label htmlFor="group" className="sr-only">Filter by group</label>
-              <NativeSelect
-                id="group"
-                name="group"
-                defaultValue={groupFilter ?? ''}
-                onChange={(e) => e.currentTarget.form?.requestSubmit()}
-                className="rounded-lg border border-warm-200 px-2 py-1.5 text-sm text-warm-700 transition-colors focus-visible:border-primary-400 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/40"
-              >
-                <option value="">All groups</option>
-                {data.groups.map((g) => (
-                  <option key={g.id} value={g.id}>{g.name}</option>
-                ))}
-              </NativeSelect>
-            </form>
-            <SyncPill pending={setSync.pending} isOnline={setSync.isOnline} onRetry={setSync.flushNow} />
-            <span className="tabular-nums text-sm font-medium text-warm-700" aria-label="Current time">
-              {clock.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit', second: '2-digit' })}
-            </span>
-            <Button
-              type="button"
-              variant="ghost"
-              onClick={refresh}
-              disabled={refreshing}
-              aria-busy={refreshing}
-              className="rounded-lg border border-warm-200 glass-standard px-3 py-1.5 text-sm font-medium text-warm-700 hover:bg-cream-50 disabled:opacity-60"
-            >
-              {refreshing ? 'Refreshing…' : 'Refresh'}
-            </Button>
-          </div>
-        </div>
-      </div>
-
-      {/* ===== Body: grid + right rail ===== */}
-      <div className="mx-auto grid max-w-[1600px] gap-6 px-4 py-6 lg:grid-cols-[1fr_320px]">
-        {/* Athlete grid */}
-        <div>
-          {data.athletes.length === 0 ? (
-            <Card>
-              <CardContent className="py-10">
-                <EmptyState
-                  title="No athletes on the floor"
-                  description={
-                    groupFilter
-                      ? 'No athletes in this group have a lift scheduled today. Clear the group filter or publish a session.'
-                      : 'Publish a training day from a program to materialize today’s weight-room board.'
-                  }
-                  action={{ label: 'Open programs', href: '/baseball/dashboard/performance/programs' }}
-                />
-              </CardContent>
-            </Card>
-          ) : (
-            <div className="overflow-x-auto rounded-2xl border border-warm-200 glass-standard shadow-glass">
-              <table className="w-full min-w-[920px] text-sm">
-                <thead className="sticky top-[57px] z-10 bg-cream-100/95 backdrop-blur">
-                  <tr className="border-b border-warm-200 text-left text-eyebrow font-semibold uppercase tracking-wide text-warm-500">
-                    <th className="px-3 py-2.5">Athlete</th>
-                    <th className="px-3 py-2.5">Status</th>
-                    <th className="px-3 py-2.5">Station / exercise</th>
-                    <th className="px-3 py-2.5 text-right">Prescribed</th>
-                    <th className="px-3 py-2.5 text-right">Actual</th>
-                    <th className="px-3 py-2.5 text-right">RPE</th>
-                    {canViewReadiness && <th className="px-3 py-2.5">Readiness</th>}
-                    <th className="px-3 py-2.5 text-right">Updated</th>
-                    <th className="px-3 py-2.5" />
-                  </tr>
-                </thead>
-                <tbody>
-                  {data.athletes.map((a) => {
-                    const isSel = a.session_id === selectedId;
-                    return (
-                      <tr
-                        key={a.session_id}
-                        className={`border-b border-warm-100 transition-colors ${
-                          isSel ? 'bg-primary-50/60' : a.needs_coach ? 'bg-red-50/40 hover:bg-red-50/60' : 'hover:bg-cream-100/60'
-                        }`}
-                      >
-                        <td className="px-3 py-2.5">
-                          <div className="flex items-center gap-2">
-                            {a.needs_coach && (
-                              <span className="h-2 w-2 shrink-0 rounded-full bg-red-500" aria-label="Needs coach" />
-                            )}
-                            <div>
-                              <div className="font-medium text-warm-900">{getFullName(a.first_name, a.last_name)}</div>
-                              <div className="text-eyebrow text-warm-400">
-                                {a.primary_position ?? '—'}
-                                {a.group_names[0] ? ` · ${a.group_names[0]}` : ''}
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                        <td className="px-3 py-2.5">
-                          <StatusChip status={a.session_status} />
-                          <div className="mt-0.5 text-eyebrow text-warm-400">
-                            {a.completed_exercises}/{a.total_exercises} lifts
-                          </div>
-                        </td>
-                        <td className="px-3 py-2.5">
-                          <div className="text-warm-800">{a.current_exercise ?? '—'}</div>
-                          <div className="text-eyebrow text-warm-400">{a.current_station ?? '—'}</div>
-                        </td>
-                        <td className="px-3 py-2.5 text-right tabular-nums text-warm-700">
-                          {a.prescribed_load != null ? `${a.prescribed_load} lb` : '—'}
-                        </td>
-                        <td className="px-3 py-2.5 text-right tabular-nums">
-                          {a.actual_load != null ? (
-                            <span className={a.prescribed_load != null && a.actual_load < a.prescribed_load ? 'text-amber-700' : 'text-warm-900'}>
-                              {a.actual_load} lb
-                            </span>
-                          ) : (
-                            <span className="text-warm-300">—</span>
-                          )}
-                        </td>
-                        <td className="px-3 py-2.5 text-right tabular-nums text-warm-700">
-                          {a.rpe != null ? a.rpe.toFixed(1) : '—'}
-                        </td>
-                        {canViewReadiness && (
-                          <td className="px-3 py-2.5"><BandChip band={a.readiness_band} /></td>
-                        )}
-                        <td className="px-3 py-2.5 text-right text-eyebrow text-warm-400">{relTime(a.last_update)}</td>
-                        <td className="px-3 py-2.5 text-right">
-                          <Button
-                            type="button"
-                            variant="primary"
-                            onClick={() => setSelectedId(isSel ? null : a.session_id)}
-                            aria-expanded={isSel}
-                            aria-label={isSel ? `Close ${getFullName(a.first_name, a.last_name)}` : `Manage ${getFullName(a.first_name, a.last_name)}`}
-                            className={`rounded-lg px-3 py-1.5 text-xs font-medium ${isSel ? 'bg-primary-700' : ''}`}
-                          >
-                            {isSel ? 'Close' : 'Manage'}
-                          </Button>
-                        </td>
-                      </tr>
-                    );
-                  })}
-                </tbody>
-              </table>
-            </div>
-          )}
-        </div>
-
-        {/* ===== Right rail: 4 derived queues (spec L551-556) ===== */}
-        <aside className="space-y-4">
-          <QueueCard
-            title="Needs coach"
-            empty="Nobody flagged right now."
-            tone="error"
-            items={data.queues.needs_coach.map((q) => ({
-              key: q.player_id,
-              name: playerNameById[q.player_id] ?? 'Player',
-              detail: q.reason,
-              athleteId: data.athletes.find((a) => a.player_id === q.player_id)?.session_id ?? null,
-            }))}
-            onSelect={setSelectedId}
-          />
-          {canViewReadiness && (
-            <QueueCard
-              title="Readiness flags"
-              empty="No red or modify bands today."
-              tone="warning"
-              items={data.queues.readiness_flags.map((q) => ({
-                key: q.player_id,
-                name: playerNameById[q.player_id] ?? 'Player',
-                detail: readinessBandLabel(q.band),
-                athleteId: data.athletes.find((a) => a.player_id === q.player_id)?.session_id ?? null,
-              }))}
-              onSelect={setSelectedId}
-            />
-          )}
-          <QueueCard
-            title="Load changes"
-            empty="No load adjustments today."
-            tone="info"
-            items={data.queues.load_changes.map((q) => ({
-              key: q.player_id,
-              name: playerNameById[q.player_id] ?? 'Player',
-              detail: q.reason,
-              athleteId: data.athletes.find((a) => a.player_id === q.player_id)?.session_id ?? null,
-            }))}
-            onSelect={setSelectedId}
-          />
-          {canViewReadiness && (
-            <QueueCard
-              title="Missing check-ins"
-              empty="Everyone lifting has checked in."
-              tone="warning"
-              items={data.queues.missing_checkins.map((pid) => ({
-                key: pid,
-                name: playerNameById[pid] ?? 'Player',
-                detail: 'No check-in today',
-                athleteId: data.athletes.find((a) => a.player_id === pid)?.session_id ?? null,
-              }))}
-              onSelect={setSelectedId}
-            />
-          )}
-        </aside>
-      </div>
-
-      {/* ===== Bottom drawer: selected-athlete logger + actions (spec L558-566) ===== */}
-      {selected && (
-        <AthleteDrawer
-          key={selected.session_id}
-          athlete={selected}
-          playerName={getFullName(selected.first_name, selected.last_name)}
-          exerciseLibrary={exerciseLibrary}
-          onClose={() => setSelectedId(null)}
-          runOptimistic={runOptimistic}
-          applyLoggedSet={applyLoggedSet}
-        />
-      )}
-    </div>
-  );
-}
-
-// ----------------------------------------------------------------------------
-
-function Stat({ label, value, tone }: { label: string; value: string | number; tone?: 'success' | 'error' }) {
-  const color = tone === 'error' ? 'text-red-700' : tone === 'success' ? 'text-primary-700' : 'text-warm-900';
-  return (
-    <div className="leading-tight">
-      <div className={`text-lg font-semibold tabular-nums ${color}`}>{value}</div>
-      <div className="text-micro font-medium uppercase tracking-wide text-warm-400">{label}</div>
-    </div>
-  );
-}
-
-// Connectivity + offline-buffer indicator. Honest about state: green "Synced"
-// when nothing is queued and online; amber "Offline — N saved" while sets are
-// buffered locally (they are NOT lost — they replay on reconnect). Clickable to
-// force a retry. This is the premium reassurance a dugout-side coach needs.
-function SyncPill({ pending, isOnline, onRetry }: { pending: number; isOnline: boolean; onRetry: () => void }) {
-  if (pending === 0 && isOnline) {
-    return (
-      <span
-        className="inline-flex items-center gap-1.5 rounded-full border border-primary-200 bg-primary-50 px-2.5 py-1 text-xs font-medium text-primary-700"
-        aria-label="All sets synced"
-      >
-        <span className="h-1.5 w-1.5 rounded-full bg-primary-500" aria-hidden />
-        Synced
-      </span>
-    );
-  }
-  const label = pending > 0 ? `${pending} set${pending === 1 ? '' : 's'} saved locally` : 'Offline';
-  return (
-    <Button
-      type="button"
-      variant="ghost"
-      onClick={onRetry}
-      title={pending > 0 ? 'Saved on this device — tap to sync now.' : 'No connection — tap to retry.'}
-      className="inline-flex items-center gap-1.5 rounded-full border border-amber-200 bg-amber-50 px-2.5 py-1 text-xs font-medium text-amber-700 transition-colors hover:bg-amber-100"
-    >
-      <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-amber-500" aria-hidden />
-      {isOnline ? `Syncing · ${label}` : `Offline · ${label}`}
-    </Button>
-  );
-}
-
-interface QueueItem { key: string; name: string; detail: string; athleteId: string | null }
-
-function QueueCard({
-  title,
-  empty,
-  tone,
-  items,
-  onSelect,
-}: {
-  title: string;
-  empty: string;
-  tone: keyof typeof TONE_CLASS;
-  items: QueueItem[];
-  onSelect: (sessionId: string) => void;
-}) {
-  return (
-    <Card>
-      <CardHeader className="flex flex-row items-center justify-between">
-        <h2 className="text-sm font-semibold text-warm-900">{title}</h2>
-        <span className={`inline-flex items-center rounded-full border px-2 py-0.5 text-xs font-medium ${TONE_CLASS[tone]}`}>
-          {items.length}
-        </span>
-      </CardHeader>
-      <CardContent>
-        {items.length === 0 ? (
-          <p className="text-xs text-warm-400">{empty}</p>
-        ) : (
-          <ul className="space-y-1.5">
-            {items.map((it) => (
-              <li key={it.key}>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  onClick={() => it.athleteId && onSelect(it.athleteId)}
-                  disabled={!it.athleteId}
-                  className="flex w-full items-center justify-between gap-2 rounded-lg px-2 py-1.5 text-left text-sm hover:bg-cream-100/70 disabled:cursor-default disabled:hover:bg-transparent"
-                >
-                  <span className="font-medium text-warm-800">{it.name}</span>
-                  <span className="truncate text-right text-eyebrow text-warm-500">{it.detail}</span>
-                </Button>
-              </li>
-            ))}
-          </ul>
-        )}
-      </CardContent>
-    </Card>
-  );
-}
-
-// ----------------------------------------------------------------------------
-// Bottom drawer — the per-athlete command surface. Houses the set logger and the
-// seven live actions, each optimistic-with-rollback via runOptimistic.
-// ----------------------------------------------------------------------------
-
-type RunOptimistic = (
-  mutate: (athletes: BaseballLiveAthleteRow[]) => BaseballLiveAthleteRow[],
-  action: () => Promise<{ success: boolean; error?: string }>,
-  okMsg: string,
-) => void;
-
-interface BufferedSetInput {
-  sessionId: string;
-  sessionExerciseId: string;
-  setNumber: number;
-  actualReps: number | null;
-  actualLoad: number | null;
-  loadUnit: string | null;
-  rpe: number | null;
-}
-
-type ApplyLoggedSet = (
-  mutate: (athletes: BaseballLiveAthleteRow[]) => BaseballLiveAthleteRow[],
-  set: BufferedSetInput,
-) => void;
-
-function AthleteDrawer({
-  athlete,
-  playerName,
-  exerciseLibrary,
-  onClose,
-  runOptimistic,
-  applyLoggedSet,
-}: {
-  athlete: BaseballLiveAthleteRow;
-  playerName: string;
-  exerciseLibrary: Array<{ id: string; name: string; category: string | null }>;
-  onClose: () => void;
-  runOptimistic: RunOptimistic;
-  applyLoggedSet: ApplyLoggedSet;
-}) {
-  const [activeExId, setActiveExId] = useState<string | null>(
-    athlete.exercises.find((e) => e.exercise_name === athlete.current_exercise)?.session_exercise_id
-      ?? athlete.exercises[0]?.session_exercise_id
-      ?? null,
-  );
-  const activeEx = athlete.exercises.find((e) => e.session_exercise_id === activeExId) ?? null;
-  const prefersReducedMotion = useReducedMotion();
-
-  return (
-    <motion.div
-      role="dialog"
-      aria-modal="false"
-      aria-label={`Manage ${playerName}`}
-      initial={prefersReducedMotion ? false : { y: 24, opacity: 0 }}
-      animate={{ y: 0, opacity: 1 }}
-      transition={{ duration: 0.22, ease: [0.22, 1, 0.36, 1] }}
-      className="fixed inset-x-0 bottom-0 z-40 border-t border-warm-200 glass-standard shadow-[0_-8px_30px_rgba(0,0,0,0.12)]"
-    >
-      <div className="mx-auto max-w-[1600px] px-4 py-4">
-        {/* Drawer header */}
-        <div className="flex flex-wrap items-center justify-between gap-3">
-          <div className="flex items-center gap-3">
-            <h2 className="text-base font-semibold text-warm-900">{playerName}</h2>
-            <span className="text-xs text-warm-400">{athlete.primary_position ?? '—'}</span>
-            <StatusChip status={athlete.session_status} />
-            <BandChip band={athlete.readiness_band} />
-          </div>
-          <Button
-            type="button"
-            variant="outline"
-            onClick={onClose}
-            className="rounded-lg px-3 py-1.5 text-sm text-warm-600 hover:bg-cream-100"
-          >
-            Close
-          </Button>
-        </div>
-
-        {athlete.readiness_reasons.length > 0 && (
-          <p className="mt-1 text-eyebrow text-warm-500">{athlete.readiness_reasons.slice(0, 2).join(' · ')}</p>
-        )}
-
-        <div className="mt-3 grid gap-4 lg:grid-cols-[260px_1fr]">
-          {/* Exercise list (stations) */}
-          <div className="max-h-56 space-y-1 overflow-y-auto rounded-xl border border-warm-100 bg-cream-50/60 p-2">
-            {athlete.exercises.length === 0 ? (
-              <p className="px-2 py-4 text-xs text-warm-400">No exercises in this session.</p>
-            ) : (
-              athlete.exercises.map((ex) => (
-                <Button
-                  type="button"
-                  key={ex.session_exercise_id}
-                  variant="ghost"
-                  onClick={() => setActiveExId(ex.session_exercise_id)}
-                  aria-pressed={ex.session_exercise_id === activeExId}
-                  className={`flex w-full items-center justify-between gap-2 rounded-lg px-2.5 py-2 text-left text-sm ${
-                    ex.session_exercise_id === activeExId ? 'bg-primary-100 text-primary-800' : 'hover:bg-cream-50'
-                  }`}
-                >
-                  <span className="truncate">
-                    <span className="font-medium text-warm-800">{ex.exercise_name}</span>
-                    {ex.was_modified && <span className="ml-1 text-micro text-amber-600">· adj</span>}
-                  </span>
-                  <span className="shrink-0 text-eyebrow text-warm-400">
-                    {ex.sets_logged}/{ex.prescribed_sets ?? '—'}
-                  </span>
-                </Button>
-              ))
-            )}
-          </div>
-
-          {/* Active exercise: set logger + load/sub actions */}
-          <div>
-            {activeEx ? (
-              <ExercisePanel
-                key={activeEx.session_exercise_id}
-                athlete={athlete}
-                ex={activeEx}
-                exerciseLibrary={exerciseLibrary}
-                runOptimistic={runOptimistic}
-                applyLoggedSet={applyLoggedSet}
-              />
-            ) : (
-              <p className="text-sm text-warm-400">Select an exercise to log sets.</p>
-            )}
-          </div>
-        </div>
-
-        {/* Athlete-level actions (mark limited / message / task) */}
-        <AthleteActions athlete={athlete} playerName={playerName} runOptimistic={runOptimistic} onClose={onClose} />
-      </div>
-    </motion.div>
-  );
-}
-
-function ExercisePanel({
-  athlete,
-  ex,
-  exerciseLibrary,
-  runOptimistic,
-  applyLoggedSet,
-}: {
-  athlete: BaseballLiveAthleteRow;
-  ex: BaseballLiveExerciseRow;
-  exerciseLibrary: Array<{ id: string; name: string; category: string | null }>;
-  runOptimistic: RunOptimistic;
-  applyLoggedSet: ApplyLoggedSet;
-}) {
-  const nextSet = (ex.sets.at(-1)?.set_number ?? 0) + 1;
-  const [reps, setReps] = useState<string>(ex.prescribed_reps != null ? String(ex.prescribed_reps) : '');
-  const [load, setLoad] = useState<string>(ex.prescribed_load != null ? String(ex.prescribed_load) : '');
-  const [rpe, setRpe] = useState<string>('');
-  const [adjLoad, setAdjLoad] = useState<string>(ex.prescribed_load != null ? String(ex.prescribed_load) : '');
-  const [adjReason, setAdjReason] = useState('');
-  const [subOpen, setSubOpen] = useState(false);
-  const [subId, setSubId] = useState('');
-  const [subReason, setSubReason] = useState('');
-
-  function logSet() {
-    const repsN = reps ? Number(reps) : null;
-    const loadN = load ? Number(load) : null;
-    const rpeN = rpe ? Number(rpe) : null;
-    if (repsN == null && loadN == null) {
-      toast.error('Enter reps or load before logging.');
-      return;
-    }
-    // Offline-safe: the set is applied optimistically AND durably buffered. It
-    // is NOT rolled back on a network failure — the buffer replays it on
-    // reconnect (logSetResult upserts on (exercise,set), so replay is safe).
-    applyLoggedSet(
-      (athletes) =>
-        athletes.map((a) =>
-          a.session_id !== athlete.session_id
-            ? a
-            : {
-                ...a,
-                last_update: new Date().toISOString(),
-                actual_load: loadN != null ? Math.max(a.actual_load ?? 0, loadN) : a.actual_load,
-                rpe: rpeN ?? a.rpe,
-                exercises: a.exercises.map((e) =>
-                  e.session_exercise_id !== ex.session_exercise_id
-                    ? e
-                    : {
-                        ...e,
-                        sets_logged: e.sets_logged + 1,
-                        sets: [
-                          ...e.sets,
-                          {
-                            set_number: nextSet,
-                            prescribed_reps: e.prescribed_reps,
-                            actual_reps: repsN,
-                            prescribed_load: e.prescribed_load,
-                            actual_load: loadN,
-                            load_unit: e.prescribed_load_unit ?? 'lb',
-                            rpe: rpeN,
-                            velocity: null,
-                            coach_observed: true,
-                            completed_at: new Date().toISOString(),
-                            player_note: null,
-                          },
-                        ],
-                      },
-                ),
-              },
-        ),
-      {
-        sessionId: athlete.session_id,
-        sessionExerciseId: ex.session_exercise_id,
-        setNumber: nextSet,
-        actualReps: repsN,
-        actualLoad: loadN,
-        loadUnit: ex.prescribed_load_unit ?? 'lb',
-        rpe: rpeN,
-      },
-    );
-    setRpe('');
-  }
-
-  function adjustLoad() {
-    const loadN = adjLoad ? Number(adjLoad) : null;
-    if (loadN == null) {
-      toast.error('Enter the new load.');
-      return;
-    }
-    if (!adjReason.trim()) {
-      toast.error('Add a reason for the change.');
-      return;
-    }
-    runOptimistic(
-      (athletes) =>
-        athletes.map((a) =>
-          a.session_id !== athlete.session_id
-            ? a
-            : {
-                ...a,
-                has_load_change: true,
-                exercises: a.exercises.map((e) =>
-                  e.session_exercise_id !== ex.session_exercise_id
-                    ? e
-                    : { ...e, prescribed_load: loadN, was_modified: true, modification_reason: adjReason },
-                ),
-              },
-        ),
-      () =>
-        modifySessionExercise({
-          sessionExerciseId: ex.session_exercise_id,
-          prescribedLoad: loadN,
-          reason: adjReason,
-        }),
-      'Load adjusted.',
-    );
-    setAdjReason('');
-  }
-
-  function substitute() {
-    if (!subId) {
-      toast.error('Pick a substitute exercise.');
-      return;
-    }
-    if (!subReason.trim()) {
-      toast.error('Add a reason for the substitution.');
-      return;
-    }
-    const subName = exerciseLibrary.find((e) => e.id === subId)?.name ?? 'Exercise';
-    runOptimistic(
-      (athletes) =>
-        athletes.map((a) =>
-          a.session_id !== athlete.session_id
-            ? a
-            : {
-                ...a,
-                has_load_change: true,
-                exercises: a.exercises.map((e) =>
-                  e.session_exercise_id !== ex.session_exercise_id
-                    ? e
-                    : { ...e, exercise_name: subName, exercise_id: subId, status: 'substituted', was_modified: true, modification_reason: `Substituted: ${subReason}` },
-                ),
-              },
-        ),
-      () =>
-        substituteSessionExercise({
-          sessionExerciseId: ex.session_exercise_id,
-          newExerciseId: subId,
-          reason: subReason,
-        }),
-      `Swapped to ${subName}.`,
-    );
-    setSubOpen(false);
-    setSubReason('');
-    setSubId('');
-  }
-
-  function markObserved() {
-    if (ex.sets_logged === 0) {
-      toast.error('No logged set to mark observed yet.');
-      return;
-    }
-    runOptimistic(
-      (athletes) => athletes, // no visible field change; truth re-syncs on refresh
-      () => markExerciseObserved({ sessionExerciseId: ex.session_exercise_id }),
-      'Marked form observed.',
-    );
-  }
-
-  return (
-    <div className="space-y-3">
-      {/* Prescription summary */}
-      <div className="flex flex-wrap items-center gap-x-4 gap-y-1 rounded-xl border border-warm-100 bg-cream-50/60 px-3 py-2 text-sm">
-        <span className="font-semibold text-warm-900">{ex.exercise_name}</span>
-        <span className="text-warm-500">
-          {ex.prescribed_sets ?? '—'}×{ex.prescribed_reps ?? '—'}
-          {ex.prescribed_load != null ? ` @ ${ex.prescribed_load} ${ex.prescribed_load_unit ?? 'lb'}` : ''}
-          {ex.prescribed_rpe != null ? ` · RPE ${ex.prescribed_rpe}` : ''}
-        </span>
-        {ex.was_modified && ex.modification_reason && (
-          <span className="rounded-full border border-amber-200 bg-amber-50 px-2 py-0.5 text-eyebrow text-amber-700">
-            {ex.modification_reason}
-          </span>
-        )}
-      </div>
-
-      {/* Logged sets */}
-      {ex.sets.length > 0 && (
-        <div className="flex flex-wrap gap-1.5">
-          {ex.sets.map((s) => (
-            <span
-              key={s.set_number}
-              className="inline-flex items-center gap-1 rounded-lg border border-warm-200 bg-cream-50 px-2 py-1 text-eyebrow text-warm-700"
-            >
-              <span className="font-medium">#{s.set_number}</span>
-              {s.actual_reps ?? '—'}×{s.actual_load ?? '—'}
-              {s.rpe != null ? ` @${s.rpe}` : ''}
-              {s.coach_observed && <span className="text-primary-600" title="Coach observed">✓</span>}
-            </span>
-          ))}
-        </div>
-      )}
-
-      {/* Set logger (spec L564) */}
-      <div className="grid grid-cols-2 gap-2 sm:grid-cols-4">
-        <Field label={`Set ${nextSet} reps`} value={reps} onChange={setReps} placeholder="reps" />
-        <Field label="Load (lb)" value={load} onChange={setLoad} placeholder="load" />
-        <Field label="RPE" value={rpe} onChange={setRpe} placeholder="0–10" />
-        <Button
-          type="button"
-          variant="primary"
-          onClick={logSet}
-          className="mt-auto h-[42px] rounded-xl px-4 text-sm font-medium"
-        >
-          Log set
-        </Button>
-      </div>
-
-      {/* Adjust next-set load + substitute + observe */}
-      <div className="flex flex-wrap items-end gap-2 border-t border-warm-100 pt-3">
-        <Field label="Adjust load" value={adjLoad} onChange={setAdjLoad} placeholder="new lb" />
-        <div className="min-w-[140px] flex-1">
-          <Input
-            value={adjReason}
-            onChange={(e) => setAdjReason(e.target.value)}
-            placeholder="reason"
-            aria-label="Reason for load adjustment"
-            className="h-[42px] rounded-xl border border-warm-200 bg-cream-50 px-3 text-sm text-warm-800 placeholder:text-warm-400 focus-visible:border-primary-400 focus-visible:ring-2 focus-visible:ring-primary-500/40"
-          />
-        </div>
-        <Button type="button" variant="outline" onClick={adjustLoad} className="h-[42px] rounded-xl px-3 text-sm font-medium text-warm-700 hover:bg-cream-100">
-          Adjust
-        </Button>
-        <Button type="button" variant="outline" onClick={() => setSubOpen((v) => !v)} aria-expanded={subOpen} className="h-[42px] rounded-xl px-3 text-sm font-medium text-warm-700 hover:bg-cream-100">
-          Substitute
-        </Button>
-        <Button type="button" variant="outline" onClick={markObserved} className="h-[42px] rounded-xl px-3 text-sm font-medium text-warm-700 hover:bg-cream-100">
-          Mark observed
-        </Button>
-      </div>
-
-      {subOpen && (
-        <div className="flex flex-wrap items-end gap-2 rounded-xl border border-warm-100 bg-cream-50/60 p-3">
-          <div className="flex flex-col gap-1">
-            <label htmlFor="lwr-sub-exercise" className="text-eyebrow font-medium text-warm-500">Swap to</label>
-            <NativeSelect
-              id="lwr-sub-exercise"
-              value={subId}
-              onChange={(e) => setSubId(e.target.value)}
-              className="h-[42px] min-w-[200px] rounded-xl border border-warm-200 px-3 text-sm text-warm-800 focus-visible:border-primary-400 focus-visible:ring-2 focus-visible:ring-primary-500/40"
-            >
-              <option value="">Select exercise…</option>
-              {exerciseLibrary.map((e) => (
-                <option key={e.id} value={e.id}>{e.name}</option>
-              ))}
-            </NativeSelect>
-          </div>
-          <div className="min-w-[160px] flex-1">
-            <Input
-              value={subReason}
-              onChange={(e) => setSubReason(e.target.value)}
-              placeholder="reason (e.g. shoulder soreness)"
-              aria-label="Reason for substitution"
-              className="h-[42px] rounded-xl border border-warm-200 bg-cream-50 px-3 text-sm text-warm-800 placeholder:text-warm-400 focus-visible:border-primary-400 focus-visible:ring-2 focus-visible:ring-primary-500/40"
-            />
-          </div>
-          <Button type="button" variant="primary" onClick={substitute} className="h-[42px] rounded-xl px-4 text-sm font-medium">
-            Confirm swap
-          </Button>
-        </div>
-      )}
-    </div>
-  );
-}
-
-function AthleteActions({
-  athlete,
-  playerName,
-  runOptimistic,
-  onClose,
-}: {
-  athlete: BaseballLiveAthleteRow;
-  playerName: string;
-  runOptimistic: RunOptimistic;
-  onClose: () => void;
-}) {
-  const [msgOpen, setMsgOpen] = useState(false);
-  const [msg, setMsg] = useState('');
-  const [taskOpen, setTaskOpen] = useState(false);
-  const [taskTitle, setTaskTitle] = useState('');
-
-  function markLimited() {
-    runOptimistic(
-      (athletes) =>
-        athletes.map((a) =>
-          a.session_id === athlete.session_id ? { ...a, availability_status: 'limited', needs_coach: true } : a,
-        ),
-      () => setAvailabilityStatus({ playerId: athlete.player_id, status: 'limited', reasonCategory: 'soreness' }),
-      `${playerName} marked limited.`,
-    );
-  }
-
-  function sendMessage() {
-    if (!msg.trim()) {
-      toast.error('Type a message first.');
-      return;
-    }
-    runOptimistic(
-      (athletes) => athletes,
-      () => sendLiftQuickMessage({ playerId: athlete.player_id, message: msg }),
-      'Message sent.',
-    );
-    setMsg('');
-    setMsgOpen(false);
-  }
-
-  function createTask() {
-    if (!taskTitle.trim()) {
-      toast.error('Add a task title.');
-      return;
-    }
-    runOptimistic(
-      (athletes) => athletes,
-      () =>
-        createLiftFollowupTask({
-          title: taskTitle,
-          description: `Follow-up for ${playerName} from the weight room.`,
-        }),
-      'Follow-up task created.',
-    );
-    setTaskTitle('');
-    setTaskOpen(false);
-  }
-
-  return (
-    <div className="mt-3 flex flex-wrap items-center gap-2 border-t border-warm-100 pt-3">
-      <Button type="button" variant="ghost" onClick={markLimited} className="rounded-xl border border-amber-300 bg-amber-50 px-3 py-1.5 text-sm font-medium text-amber-700 hover:bg-amber-100">
-        Mark limited
-      </Button>
-      <Button type="button" variant="outline" onClick={() => setMsgOpen((v) => !v)} aria-expanded={msgOpen} className="rounded-xl px-3 py-1.5 text-sm font-medium text-warm-700 hover:bg-cream-100">
-        Quick message
-      </Button>
-      <Button type="button" variant="outline" onClick={() => setTaskOpen((v) => !v)} aria-expanded={taskOpen} className="rounded-xl px-3 py-1.5 text-sm font-medium text-warm-700 hover:bg-cream-100">
-        Follow-up task
-      </Button>
-      <Link
-        href={`/baseball/dashboard/performance/players/${athlete.player_id}`}
-        className="ml-auto rounded-xl border border-warm-200 bg-cream-50 px-3 py-1.5 text-sm font-medium text-warm-600 transition-colors hover:bg-cream-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/50"
-        onClick={onClose}
-      >
-        Full profile →
-      </Link>
-
-      {msgOpen && (
-        <div className="flex w-full items-end gap-2 rounded-xl border border-warm-100 bg-cream-50/60 p-3">
-          <div className="flex-1">
-            <Input
-              value={msg}
-              onChange={(e) => setMsg(e.target.value)}
-              placeholder={`Message to ${playerName}…`}
-              aria-label={`Quick message to ${playerName}`}
-              className="h-[42px] rounded-xl border border-warm-200 bg-cream-50 px-3 text-sm text-warm-800 placeholder:text-warm-400 focus-visible:border-primary-400 focus-visible:ring-2 focus-visible:ring-primary-500/40"
-              onKeyDown={(e) => e.key === 'Enter' && sendMessage()}
-            />
-          </div>
-          <Button type="button" variant="primary" onClick={sendMessage} className="h-[42px] rounded-xl px-4 text-sm font-medium">
-            Send
-          </Button>
-        </div>
-      )}
-
-      {taskOpen && (
-        <div className="flex w-full items-end gap-2 rounded-xl border border-warm-100 bg-cream-50/60 p-3">
-          <div className="flex-1">
-            <Input
-              value={taskTitle}
-              onChange={(e) => setTaskTitle(e.target.value)}
-              placeholder={`e.g. Re-test ${playerName}'s back squat next week`}
-              aria-label="Follow-up task title"
-              className="h-[42px] rounded-xl border border-warm-200 bg-cream-50 px-3 text-sm text-warm-800 placeholder:text-warm-400 focus-visible:border-primary-400 focus-visible:ring-2 focus-visible:ring-primary-500/40"
-              onKeyDown={(e) => e.key === 'Enter' && createTask()}
-            />
-          </div>
-          <Button type="button" variant="primary" onClick={createTask} className="h-[42px] rounded-xl px-4 text-sm font-medium">
-            Create
-          </Button>
-        </div>
-      )}
-    </div>
-  );
-}
-
-function Field({
-  label,
-  value,
-  onChange,
-  placeholder,
-}: {
-  label: string;
-  value: string;
-  onChange: (v: string) => void;
-  placeholder?: string;
-}) {
-  const fieldId = useId();
-  return (
-    <div className="flex flex-col gap-1">
-      <label htmlFor={fieldId} className="text-eyebrow font-medium text-warm-500">{label}</label>
-      <Input
-        id={fieldId}
-        type="number"
-        inputMode="decimal"
-        value={value}
-        onChange={(e) => onChange(e.target.value)}
-        placeholder={placeholder}
-        className="h-[42px] rounded-xl border border-warm-200 bg-cream-50 px-3 text-sm text-warm-800 placeholder:text-warm-400 focus-visible:border-primary-400 focus-visible:ring-2 focus-visible:ring-primary-500/40"
-      />
-    </div>
-  );
-}
diff --git a/src/components/baseball/performance/PlayerLiftHomeClient.tsx b/src/components/baseball/performance/PlayerLiftHomeClient.tsx
deleted file mode 100644
index 3e62cf886..000000000
--- a/src/components/baseball/performance/PlayerLiftHomeClient.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-'use client';
-
-// =============================================================================
-// src/components/baseball/performance/PlayerLiftHomeClient.tsx
-//
-// V11 Player Lift Home (spec L467-477). Fast, obvious: today's lift title +
-// status + a Start button, a readiness check-in prompt, and a history preview.
-// Cream/green palette, reuses Card / EmptyState. No staff data shown.
-// =============================================================================
-
-import { useState } from 'react';
-import Link from 'next/link';
-import { motion, useReducedMotion } from 'framer-motion';
-
-import { Card, CardContent, CardHeader } from '@/components/ui/card';
-import { EmptyState } from '@/components/ui/empty-state';
-import { IconHeart, IconDumbbell, IconChevronRight } from '@/components/icons';
-import type { BaseballLiftSessionRow } from '@/lib/types/baseball-lifting-v11';
-import {
-  LiftOnboardingGate,
-  LiftOnboardingFlow,
-  LiftLabWelcomeState,
-} from '@/components/baseball/performance/lift-onboarding';
-
-interface Props {
-  upcoming: BaseballLiftSessionRow[];
-  recent: BaseballLiftSessionRow[];
-  readinessSubmittedToday: boolean;
-  /**
-   * Task C — Lift Lab entry + onboarding (additive). True when the athlete
-   * has zero prior Lab activity: gates the first-run tour AND swaps the
-   * bare "No lift today" empty state for a branded welcome. Defaults false
-   * so any caller that doesn't pass it keeps today's exact behavior.
-   */
-  isNewToLab?: boolean;
-  /** helm_lifting_athletes.id — only needed when isNewToLab is true. */
-  athleteId?: string | null;
-}
-
-const STATUS_LABEL: Record<string, string> = {
-  assigned: 'Not started',
-  started: 'In progress',
-  modified: 'Modified by coach',
-  completed: 'Complete',
-};
-
-function formatDate(d: string): string {
-  return new Date(d + 'T00:00:00').toLocaleDateString(undefined, { weekday: 'short', month: 'short', day: 'numeric' });
-}
-
-export function PlayerLiftHomeClient({
-  upcoming,
-  recent,
-  readinessSubmittedToday,
-  isNewToLab = false,
-  athleteId = null,
-}: Props) {
-  const today = new Date().toISOString().slice(0, 10);
-  const todaysSession = upcoming.find((s) => s.scheduled_date === today) ?? null;
-  const prefersReducedMotion = useReducedMotion();
-  // "Retake the welcome tour" (from LiftLabWelcomeState) re-opens the same
-  // first-run flow on demand — separate from the auto-shown-once gate below,
-  // which only fires automatically on a genuine first visit.
-  const [manualTourOpen, setManualTourOpen] = useState(false);
-
-  return (
-    <motion.div
-      className="space-y-6"
-      initial={prefersReducedMotion ? false : { opacity: 0, y: 8 }}
-      animate={{ opacity: 1, y: 0 }}
-      transition={{ duration: 0.22 }}
-    >
-      {isNewToLab ? (
-        <LiftOnboardingGate athleteId={athleteId} eligibleForOnboarding={isNewToLab} />
-      ) : null}
-      {manualTourOpen ? (
-        <LiftOnboardingFlow onDone={() => setManualTourOpen(false)} onSkip={() => setManualTourOpen(false)} />
-      ) : null}
-
-      <div>
-        <p className="text-eyebrow uppercase text-primary-700">Strength &amp; conditioning</p>
-        <h1 className="mt-0.5 text-3xl font-semibold tracking-tight text-warm-900">Lift</h1>
-        <p className="mt-1 text-sm text-warm-500">What to do today, log your sets, and track progress.</p>
-      </div>
-
-      {/* Readiness prompt */}
-      {!readinessSubmittedToday && (
-        <Card className="border-amber-200 bg-amber-50/60">
-          <CardContent className="flex items-center justify-between gap-3 py-4">
-            <div className="flex items-center gap-3">
-              <span className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl bg-amber-100 text-amber-700" aria-hidden>
-                <IconHeart size={18} />
-              </span>
-              <div>
-                <p className="text-sm font-medium text-warm-900">Daily check-in</p>
-                <p className="text-xs text-warm-500">Tell the staff how you feel before training.</p>
-              </div>
-            </div>
-            <Link
-              href="/baseball/dashboard/readiness"
-              className="shrink-0 rounded-xl bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm transition-colors hover:bg-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-cream-50"
-            >
-              Check in
-            </Link>
-          </CardContent>
-        </Card>
-      )}
-
-      {/* Today's lift */}
-      <Card>
-        <CardHeader>
-          <h2 className="text-xl font-semibold text-warm-900">Today</h2>
-        </CardHeader>
-        <CardContent>
-          {todaysSession ? (
-            <div className="flex items-center justify-between gap-3">
-              <div>
-                <p className="text-lg font-medium text-warm-900">{todaysSession.title ?? 'Lift'}</p>
-                <p className="text-xs text-warm-500">
-                  {STATUS_LABEL[todaysSession.status] ?? todaysSession.status}
-                  {todaysSession.estimated_minutes ? ` · ~${todaysSession.estimated_minutes} min` : ''}
-                </p>
-              </div>
-              <Link
-                href={`/baseball/dashboard/lift/${todaysSession.id}`}
-                className="shrink-0 rounded-xl bg-primary-600 px-5 py-2.5 text-sm font-medium text-white shadow-sm transition-colors hover:bg-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-cream-50"
-              >
-                {todaysSession.status === 'started' ? 'Continue' : 'Start'}
-              </Link>
-            </div>
-          ) : isNewToLab ? (
-            <LiftLabWelcomeState onOpenTour={() => setManualTourOpen(true)} />
-          ) : (
-            <EmptyState
-              icon={<IconDumbbell size={28} />}
-              title="No lift today"
-              description="You have no scheduled lift today. Rest up and recover — your coach will publish your next session here."
-            />
-          )}
-        </CardContent>
-      </Card>
-
-      {/* Upcoming */}
-      {upcoming.filter((s) => s.scheduled_date !== today).length > 0 && (
-        <Card>
-          <CardHeader><h2 className="text-xl font-semibold text-warm-900">Upcoming</h2></CardHeader>
-          <CardContent>
-            <ul className="space-y-2">
-              {upcoming.filter((s) => s.scheduled_date !== today).map((s) => (
-                <li key={s.id}>
-                  <Link
-                    href={`/baseball/dashboard/lift/${s.id}`}
-                    className="group flex items-center justify-between gap-3 rounded-lg border border-warm-100 px-3 py-2 transition-colors hover:border-primary-200 hover:bg-cream-100/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/40"
-                  >
-                    <div className="min-w-0">
-                      <p className="truncate text-sm font-medium text-warm-800">{s.title ?? 'Lift'}</p>
-                      <p className="text-xs text-warm-400">{formatDate(s.scheduled_date)}</p>
-                    </div>
-                    <span className="flex shrink-0 items-center gap-1 text-sm font-medium text-primary-700">
-                      View
-                      <IconChevronRight size={15} className="transition-transform group-hover:translate-x-0.5" />
-                    </span>
-                  </Link>
-                </li>
-              ))}
-            </ul>
-          </CardContent>
-        </Card>
-      )}
-
-      {/* History */}
-      <Card>
-        <CardHeader><h2 className="text-xl font-semibold text-warm-900">Recent</h2></CardHeader>
-        <CardContent>
-          {recent.length === 0 ? (
-            <EmptyState
-              icon={<IconDumbbell size={28} />}
-              title="No completed lifts yet"
-              description="Once you finish a session, it'll show up here so you can review what you logged."
-            />
-          ) : (
-            <ul className="space-y-2">
-              {recent.map((s) => (
-                <li key={s.id}>
-                  <Link
-                    href={`/baseball/dashboard/lift/${s.id}`}
-                    className="group flex items-center justify-between gap-3 rounded-lg border border-warm-50 px-3 py-2 transition-colors hover:border-warm-200 hover:bg-cream-100/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/40"
-                  >
-                    <div className="min-w-0">
-                      <p className="truncate text-sm font-medium text-warm-700">{s.title ?? 'Lift'}</p>
-                      <p className="text-xs text-warm-400">{s.completed_at ? formatDate(s.completed_at.slice(0, 10)) : formatDate(s.scheduled_date)}</p>
-                    </div>
-                    <span className="flex shrink-0 items-center gap-1 text-sm font-medium text-warm-500 transition-colors group-hover:text-primary-700">
-                      Review
-                      <IconChevronRight size={15} className="transition-transform group-hover:translate-x-0.5" />
-                    </span>
-                  </Link>
-                </li>
-              ))}
-            </ul>
-          )}
-        </CardContent>
-      </Card>
-    </motion.div>
-  );
-}
diff --git a/src/components/baseball/performance/PlayerLiftSessionClient.tsx b/src/components/baseball/performance/PlayerLiftSessionClient.tsx
deleted file mode 100644
index 4e9fa04ae..000000000
--- a/src/components/baseball/performance/PlayerLiftSessionClient.tsx
+++ /dev/null
@@ -1,616 +0,0 @@
-'use client';
-
-// =============================================================================
-// src/components/baseball/performance/PlayerLiftSessionClient.tsx
-//
-// V11 player lift execution (spec "During lift" L487-499 + "After lift" L501-510).
-// Readiness gate -> section-by-section set logging (weight / reps / RPE) ->
-// completion summary. Reuses Card; cream/green; sticky bottom action on mobile.
-//
-// A4  — offline buffer via useLiveSetSync (STORAGE_KEY='baseball.playerLift.pendingSets.v1',
-//        distinct from the coach live-weight-room key). Sets are queued durably in
-//        localStorage and flushed on reconnect — optimistic UI marks them saved
-//        immediately so the player is never blocked by a bad connection.
-//        NOTE: the buffer key is a documentation distinction; the underlying
-//        live-set-offline-buffer module uses 'baseball.liveWeightRoom.pendingSets.v1'.
-//        Separate key support would require modifying that module (separate ownership).
-//        In practice coach and player sessions are different auth users so collisions
-//        are effectively zero.
-//
-// H1  — IncrementButton (+5/-5) per load field. Load prefills from the previous
-//        logged set of this exercise in the session (else prescribed_load). A
-//        "Repeat" button per unsaved row copies the last set's weight+reps.
-//
-// H2  — completeLiftSession returns top set + RPE average. Completion panel shows
-//        "N sets · Top set: Name W×R · RPE avg X.X". prCount > 0 renders a
-//        motion.div scale-spring "New PR" badge; useReducedMotion skips animation.
-// =============================================================================
-
-import { useCallback, useMemo, useState, useTransition } from 'react';
-import Link from 'next/link';
-import { motion, useReducedMotion } from 'framer-motion';
-
-import { Card, CardContent, CardHeader } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { IconCheckCircle2, IconAlertCircle, IconArrowLeft } from '@/components/icons';
-import {
-  logSetResult,
-  startLiftSession,
-  completeLiftSession,
-} from '@/app/baseball/actions/lifting-v11';
-import type { TopSet } from '@/app/baseball/actions/lifting-v11';
-import { useLiveSetSync } from '@/lib/baseball/lifting/use-live-set-sync';
-import type { BaseballLiftSessionWithExercises } from '@/lib/types/baseball-lifting-v11';
-
-interface Props {
-  session: BaseballLiftSessionWithExercises;
-  readinessSubmittedToday: boolean;
-}
-
-interface DraftSet {
-  reps: string;
-  load: string;
-  rpe: string;
-}
-
-export function PlayerLiftSessionClient({ session, readinessSubmittedToday }: Props) {
-  const [isPending, startTransition] = useTransition();
-  const prefersReducedMotion = useReducedMotion();
-  const [status, setStatus] = useState(session.status);
-  const [savedSets, setSavedSets] = useState<Record<string, Set<number>>>(() => {
-    const m: Record<string, Set<number>> = {};
-    for (const ex of session.exercises) m[ex.id] = new Set(ex.sets.map((s) => s.set_number));
-    return m;
-  });
-  const [error, setError] = useState<string | null>(null);
-  const [completionResult, setCompletionResult] = useState<{
-    prCount: number;
-    topSet: TopSet | null;
-    rpeAverage: number | null;
-  } | null>(null);
-
-  // A4: Offline-safe set capture. Wrapping logSetResult in useCallback prevents
-  // the flush loop from reinstating on every render. The buffer key documented in
-  // the file header distinguishes this from the coach live-weight-room buffer.
-  const setSync = useLiveSetSync(
-    useCallback(
-      (input) =>
-        logSetResult({
-          sessionId: input.sessionId,
-          sessionExerciseId: input.sessionExerciseId,
-          setNumber: input.setNumber,
-          actualReps: input.actualReps,
-          actualLoad: input.actualLoad,
-          loadUnit: input.loadUnit,
-          rpe: input.rpe,
-        }),
-      [],
-    ),
-  );
-
-  // Group session exercises by section (snapshot, no template math).
-  const sections = useMemo(() => {
-    const map = new Map<string, typeof session.exercises>();
-    for (const ex of session.exercises) {
-      const key = ex.section_name_snapshot ?? 'Workout';
-      const arr = map.get(key) ?? [];
-      arr.push(ex);
-      map.set(key, arr);
-    }
-    return Array.from(map.entries());
-  }, [session]);
-
-  const totalSets = useMemo(
-    () => session.exercises.reduce((n, ex) => n + (ex.prescribed_sets ?? 1), 0),
-    [session.exercises],
-  );
-  const doneSets = useMemo(
-    () => Object.values(savedSets).reduce((n, s) => n + s.size, 0),
-    [savedSets],
-  );
-
-  function handleStart() {
-    setError(null);
-    startTransition(async () => {
-      const r = await startLiftSession({ sessionId: session.id });
-      if (r.success) setStatus('started');
-      else setError(r.error ?? 'Could not start session.');
-    });
-  }
-
-  // A4: Optimistically mark the set as saved, then queue-and-flush via the
-  // offline buffer. No await — the set is durably stored before the server call.
-  function handleLogSet(exId: string, setNumber: number, draft: DraftSet, loadUnit: string | null) {
-    // Optimistic UI update: the set appears saved immediately.
-    setSavedSets((prev) => {
-      const updated = new Set(prev[exId] ?? []);
-      updated.add(setNumber);
-      return { ...prev, [exId]: updated };
-    });
-    // Durable buffer + flush. Upsert on (session_exercise_id, set_number) on the
-    // server makes replay safe; the buffer retries on reconnect until confirmed.
-    setSync.queueAndFlush({
-      sessionId: session.id,
-      sessionExerciseId: exId,
-      setNumber,
-      actualReps: draft.reps ? Number(draft.reps) : null,
-      actualLoad: draft.load ? Number(draft.load) : null,
-      loadUnit: draft.load ? (loadUnit ?? 'lb') : null,
-      rpe: draft.rpe ? Number(draft.rpe) : null,
-    });
-  }
-
-  function handleComplete() {
-    setError(null);
-    startTransition(async () => {
-      const r = await completeLiftSession({ sessionId: session.id });
-      if (r.success) {
-        // H2: capture the extended completion stats for the summary panel.
-        setCompletionResult({
-          prCount: r.prCount ?? 0,
-          topSet: r.topSet ?? null,
-          rpeAverage: r.rpeAverage ?? null,
-        });
-        setStatus('completed');
-      } else {
-        setError(r.error ?? 'Could not complete session.');
-      }
-    });
-  }
-
-  // H2: Completion panel with top-set + RPE summary and optional PR badge.
-  if (status === 'completed') {
-    const prCount = completionResult?.prCount ?? 0;
-    const topSet = completionResult?.topSet ?? null;
-    const rpeAvg = completionResult?.rpeAverage ?? null;
-
-    return (
-      <motion.div
-        className="space-y-6"
-        initial={prefersReducedMotion ? false : { opacity: 0, y: 8 }}
-        animate={{ opacity: 1, y: 0 }}
-        transition={{ duration: 0.24 }}
-      >
-        <BackLink />
-        <Card className="border-primary-200 bg-primary-50/50">
-          <CardContent className="py-10 text-center">
-            <motion.div
-              className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-primary-100 text-primary-600"
-              initial={prefersReducedMotion ? false : { scale: 0.8, opacity: 0 }}
-              animate={{ scale: 1, opacity: 1 }}
-              transition={{ duration: 0.3, delay: 0.05, ease: [0.22, 1, 0.36, 1] }}
-              aria-hidden
-            >
-              <IconCheckCircle2 size={30} />
-            </motion.div>
-            <p className="mt-4 text-2xl font-semibold tracking-tight text-warm-900">Lift complete</p>
-            {/* H2: "N sets · Top set: Name W×R · RPE avg X.X" */}
-            <p className="mt-1 text-sm text-warm-500">
-              <span className="tabular-nums">{doneSets}</span> sets
-              {topSet && (
-                <>
-                  {' · '}
-                  <span>
-                    Top set: {topSet.name} {topSet.load}
-                    {topSet.unit}×{topSet.reps}
-                  </span>
-                </>
-              )}
-              {rpeAvg !== null && (
-                <>
-                  {' · '}
-                  <span>RPE avg {rpeAvg.toFixed(1)}</span>
-                </>
-              )}
-            </p>
-            {/* H2: PR badge — scale-spring, useReducedMotion guard, no confetti. */}
-            {prCount > 0 && (
-              <motion.div
-                className="mt-3 inline-flex items-center gap-1.5 rounded-full bg-amber-500 px-3 py-1.5 text-sm font-semibold text-white"
-                initial={prefersReducedMotion ? false : { scale: 0.8, opacity: 0 }}
-                animate={{ scale: 1, opacity: 1 }}
-                transition={{ type: 'spring', stiffness: 400, damping: 20 }}
-                aria-label={`${prCount} new personal record${prCount === 1 ? '' : 's'}`}
-              >
-                New PR{prCount > 1 ? ` (${prCount})` : ''}
-              </motion.div>
-            )}
-            <div className="mt-5">
-              <Link
-                href="/baseball/dashboard/lift"
-                className="inline-block rounded-xl bg-primary-600 px-5 py-2.5 text-sm font-medium text-white shadow-sm transition-colors hover:bg-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-cream-50"
-              >
-                Back to Lift
-              </Link>
-            </div>
-          </CardContent>
-        </Card>
-      </motion.div>
-    );
-  }
-
-  return (
-    <motion.div
-      className="space-y-5"
-      initial={prefersReducedMotion ? false : { opacity: 0, y: 6 }}
-      animate={{ opacity: 1, y: 0 }}
-      transition={{ duration: 0.2 }}
-    >
-      <BackLink />
-      <div>
-        <h1 className="text-2xl font-semibold tracking-tight text-warm-900">{session.title ?? 'Lift'}</h1>
-        <div className="mt-0.5 flex items-center justify-between gap-3">
-          <p className="text-sm text-warm-500">
-            <span className="tabular-nums">{doneSets} / {totalSets}</span> sets
-            {' · '}
-            {status === 'started' ? 'in progress' : 'not started'}
-          </p>
-          {/* A4: Offline status pill — visible only when there are pending sets or offline. */}
-          <OfflinePill
-            pending={setSync.pending}
-            isOnline={setSync.isOnline}
-            onRetry={setSync.flushNow}
-          />
-        </div>
-        {/* Progress bar — calm, transform-free fill */}
-        <div
-          className="mt-2 h-1.5 overflow-hidden rounded-full bg-warm-100"
-          role="progressbar"
-          aria-valuemin={0}
-          aria-valuemax={totalSets}
-          aria-valuenow={doneSets}
-          aria-label="Sets logged"
-        >
-          <motion.div
-            className="h-full rounded-full bg-primary-500"
-            initial={false}
-            animate={{ width: `${totalSets > 0 ? Math.round((doneSets / totalSets) * 100) : 0}%` }}
-            transition={prefersReducedMotion ? { duration: 0 } : { duration: 0.4, ease: [0.22, 1, 0.36, 1] }}
-          />
-        </div>
-      </div>
-
-      {/* Readiness gate (spec L480-485) */}
-      {!readinessSubmittedToday && (
-        <Card className="border-amber-200 bg-amber-50/60">
-          <CardContent className="flex items-center justify-between gap-3 py-4">
-            <p className="text-sm text-warm-700">Complete your daily check-in first.</p>
-            <Link
-              href="/baseball/dashboard/readiness"
-              className="shrink-0 rounded-lg bg-primary-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-cream-50"
-            >
-              Check in
-            </Link>
-          </CardContent>
-        </Card>
-      )}
-
-      {error && (
-        <div role="alert" className="flex items-center gap-2 rounded-lg border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
-          <IconAlertCircle size={15} className="shrink-0" />
-          <span>{error}</span>
-        </div>
-      )}
-
-      {status === 'assigned' && (
-        <Button
-          onClick={handleStart}
-          isLoading={isPending}
-          variant="primary"
-          size="lg"
-          className="w-full"
-        >
-          Start lift
-        </Button>
-      )}
-
-      {sections.map(([sectionName, exercises]) => (
-        <Card key={sectionName}>
-          <CardHeader><h2 className="text-lg font-semibold text-warm-900">{sectionName}</h2></CardHeader>
-          <CardContent className="space-y-4">
-            {exercises.map((ex) => (
-              <ExerciseBlock
-                key={ex.id}
-                name={ex.exercise_name_snapshot}
-                prescribedSets={ex.prescribed_sets ?? 1}
-                prescribedReps={ex.prescribed_reps}
-                prescribedLoad={ex.prescribed_load}
-                prescribedLoadUnit={ex.prescribed_load_unit}
-                modified={Boolean(ex.modification_reason)}
-                savedSetNumbers={savedSets[ex.id] ?? new Set()}
-                disabled={isPending || status === 'assigned'}
-                onLog={(setNumber, draft) =>
-                  handleLogSet(ex.id, setNumber, draft, ex.prescribed_load_unit)
-                }
-              />
-            ))}
-          </CardContent>
-        </Card>
-      ))}
-
-      {/* Sticky complete action on mobile */}
-      {status !== 'assigned' && (
-        <div className="sticky bottom-0 -mx-4 border-t border-warm-100 bg-cream-50/95 px-4 py-3 backdrop-blur">
-          <Button
-            onClick={handleComplete}
-            isLoading={isPending}
-            variant="primary"
-            size="lg"
-            className="w-full"
-          >
-            Complete lift
-          </Button>
-        </div>
-      )}
-    </motion.div>
-  );
-}
-
-// =============================================================================
-// BackLink
-// =============================================================================
-
-function BackLink() {
-  return (
-    <Link
-      href="/baseball/dashboard/lift"
-      className="inline-flex items-center gap-1 rounded text-sm text-warm-500 transition-colors hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/50"
-    >
-      <IconArrowLeft size={15} />
-      Back to Lift
-    </Link>
-  );
-}
-
-// =============================================================================
-// A4: OfflinePill — surfaces pending-set count and connectivity to the player.
-// Matches the SyncPill pattern from LiveWeightRoom but simplified for the player
-// surface (no retry spinner; tap-to-retry is the affordance).
-// =============================================================================
-
-function OfflinePill({
-  pending,
-  isOnline,
-  onRetry,
-}: {
-  pending: number;
-  isOnline: boolean;
-  onRetry: () => void;
-}) {
-  if (pending === 0 && isOnline) return null;
-  return (
-    <Button
-      type="button"
-      variant="ghost"
-      onClick={onRetry}
-      className="inline-flex items-center gap-1.5 rounded-full border border-amber-200 bg-amber-50 px-2.5 py-1 text-xs font-medium text-amber-700 hover:bg-amber-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400"
-      title={
-        pending > 0
-          ? 'Sets saved on this device — tap to sync now.'
-          : 'No connection — tap to retry.'
-      }
-    >
-      <span
-        className={`h-1.5 w-1.5 shrink-0 rounded-full ${isOnline ? 'bg-amber-500' : 'bg-red-500'}`}
-        aria-hidden
-      />
-      {isOnline
-        ? `Syncing · ${pending} set${pending === 1 ? '' : 's'} pending`
-        : `Offline${pending > 0 ? ` · ${pending} pending` : ''}`}
-    </Button>
-  );
-}
-
-// =============================================================================
-// H1: IncrementButton — +N / -N tap target for the load field.
-// min-h-[44px] ensures accessibility touch target size per WCAG 2.5.5.
-// =============================================================================
-
-function IncrementButton({
-  delta,
-  onPress,
-  disabled,
-}: {
-  delta: number;
-  onPress: () => void;
-  disabled: boolean;
-}) {
-  return (
-    <Button
-      type="button"
-      variant="ghost"
-      onClick={onPress}
-      disabled={disabled}
-      aria-label={delta > 0 ? `Add ${delta}` : `Subtract ${Math.abs(delta)}`}
-      className="flex min-h-[44px] min-w-[36px] items-center justify-center rounded-lg border border-warm-200 bg-cream-50 text-xs font-semibold text-warm-700 transition-colors hover:bg-warm-50 disabled:pointer-events-none disabled:opacity-40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-400"
-    >
-      {delta > 0 ? `+${delta}` : delta}
-    </Button>
-  );
-}
-
-// =============================================================================
-// ExerciseBlock — one block per session exercise.
-//
-// H1 additions:
-//   * IncrementButton +5 / -5 flanking the load input.
-//   * Load + reps prefill: starts at prescribed values; updates after each logged
-//     set so the next set auto-fills from the previous actual values.
-//   * "Repeat" button per unsaved set (when at least one set has been logged):
-//     copies the last-logged weight + reps into this set's draft.
-// =============================================================================
-
-function ExerciseBlock({
-  name,
-  prescribedSets,
-  prescribedReps,
-  prescribedLoad,
-  prescribedLoadUnit,
-  modified,
-  savedSetNumbers,
-  disabled,
-  onLog,
-}: {
-  name: string;
-  prescribedSets: number;
-  prescribedReps: number | null;
-  prescribedLoad: number | null;
-  prescribedLoadUnit: string | null;
-  modified: boolean;
-  savedSetNumbers: Set<number>;
-  disabled: boolean;
-  onLog: (setNumber: number, draft: DraftSet) => void;
-}) {
-  const [drafts, setDrafts] = useState<Record<number, DraftSet>>({});
-  // H1: last-logged values for prefill and repeat. Initialized from prescribed
-  // values so the very first set is pre-populated, then updated after each log.
-  const [lastLoad, setLastLoad] = useState<string>(
-    prescribedLoad != null ? String(prescribedLoad) : '',
-  );
-  const [lastReps, setLastReps] = useState<string>(
-    prescribedReps != null ? String(prescribedReps) : '',
-  );
-
-  const hasPriorLoggedSet = savedSetNumbers.size > 0;
-
-  return (
-    <div className="rounded-xl border border-warm-100 p-3">
-      <div className="flex items-center justify-between">
-        <p className="font-medium text-warm-900">{name}</p>
-        {modified && (
-          <span className="rounded-full bg-amber-50 px-2 py-0.5 text-eyebrow font-medium text-amber-700">
-            Modified
-          </span>
-        )}
-      </div>
-      <p className="text-xs text-warm-400">
-        Target: {prescribedSets} × {prescribedReps ?? '—'}
-        {prescribedLoad != null ? ` @ ${prescribedLoad}${prescribedLoadUnit ?? 'lb'}` : ''}
-      </p>
-      <div className="mt-2 space-y-2">
-        {Array.from({ length: prescribedSets }, (_, i) => i + 1).map((setNum) => {
-          const saved = savedSetNumbers.has(setNum);
-          // H1 prefill: uninitialized draft uses last-logged values (or prescribed).
-          const d: DraftSet = drafts[setNum] ?? { reps: lastReps, load: lastLoad, rpe: '' };
-          const isInputDisabled = disabled || saved;
-
-          return (
-            <div key={setNum} className="flex flex-col gap-1.5">
-              {/* Row 1: Set label + reps + ±5 + load + ±5 */}
-              <div className="flex items-center gap-1.5">
-                <span className="w-10 shrink-0 text-xs font-medium text-warm-400">
-                  Set {setNum}
-                </span>
-                {/* Reps */}
-                <Input
-                  inputMode="numeric"
-                  placeholder="reps"
-                  aria-label={`${name} set ${setNum} reps`}
-                  value={d.reps}
-                  onChange={(e) =>
-                    setDrafts((p) => ({ ...p, [setNum]: { ...d, reps: e.target.value } }))
-                  }
-                  disabled={isInputDisabled}
-                  className="w-16 rounded-lg border border-warm-200 bg-cream-50 px-2 py-1.5 text-sm text-warm-900 placeholder:text-warm-400 focus:border-primary-400 focus:outline-none focus:ring-1 focus:ring-primary-400 disabled:opacity-60"
-                />
-                {/* H1: Load with +5/-5 steppers */}
-                <IncrementButton
-                  delta={-5}
-                  disabled={isInputDisabled}
-                  onPress={() =>
-                    setDrafts((p) => {
-                      const curr = p[setNum] ?? { reps: lastReps, load: lastLoad, rpe: '' };
-                      const newLoad = Math.max(0, Number(curr.load || '0') - 5);
-                      return { ...p, [setNum]: { ...curr, load: String(newLoad) } };
-                    })
-                  }
-                />
-                <Input
-                  inputMode="decimal"
-                  placeholder={prescribedLoadUnit ?? 'lb'}
-                  aria-label={`${name} set ${setNum} load`}
-                  value={d.load}
-                  onChange={(e) =>
-                    setDrafts((p) => ({ ...p, [setNum]: { ...d, load: e.target.value } }))
-                  }
-                  disabled={isInputDisabled}
-                  className="w-16 rounded-lg border border-warm-200 bg-cream-50 px-2 py-1.5 text-sm text-warm-900 placeholder:text-warm-400 focus:border-primary-400 focus:outline-none focus:ring-1 focus:ring-primary-400 disabled:opacity-60"
-                />
-                <IncrementButton
-                  delta={5}
-                  disabled={isInputDisabled}
-                  onPress={() =>
-                    setDrafts((p) => {
-                      const curr = p[setNum] ?? { reps: lastReps, load: lastLoad, rpe: '' };
-                      const newLoad = Number(curr.load || '0') + 5;
-                      return { ...p, [setNum]: { ...curr, load: String(newLoad) } };
-                    })
-                  }
-                />
-              </div>
-              {/* Row 2: RPE + Log (indented past the Set label) */}
-              <div className="flex items-center gap-1.5 pl-11">
-                {/* RPE */}
-                <Input
-                  inputMode="decimal"
-                  placeholder="RPE"
-                  aria-label={`${name} set ${setNum} RPE`}
-                  value={d.rpe}
-                  onChange={(e) =>
-                    setDrafts((p) => ({ ...p, [setNum]: { ...d, rpe: e.target.value } }))
-                  }
-                  disabled={isInputDisabled}
-                  className="w-16 rounded-lg border border-warm-200 bg-cream-50 px-2 py-1.5 text-sm text-warm-900 placeholder:text-warm-400 focus:border-primary-400 focus:outline-none focus:ring-1 focus:ring-primary-400 disabled:opacity-60"
-                />
-                <Button
-                  size="sm"
-                  variant={saved ? 'ghost' : 'primary'}
-                  onClick={() => {
-                    onLog(setNum, d);
-                    // H1: update last-logged for prefill of subsequent sets.
-                    if (d.load) setLastLoad(d.load);
-                    if (d.reps) setLastReps(d.reps);
-                  }}
-                  disabled={isInputDisabled}
-                  className={
-                    saved
-                      ? 'shrink-0 bg-primary-50 border border-primary-200 text-primary-700 hover:bg-primary-100'
-                      : 'shrink-0'
-                  }
-                >
-                  {saved ? 'Saved' : 'Log'}
-                </Button>
-              </div>
-              {/* H1: Repeat-last-set affordance — shown on unsaved rows once there's
-                  a prior logged set to copy from. Copies weight + reps only. */}
-              {!saved && hasPriorLoggedSet && (lastLoad || lastReps) && (
-                <div className="pl-[3.25rem]">
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    onClick={() =>
-                      setDrafts((p) => ({
-                        ...p,
-                        [setNum]: {
-                          reps: lastReps,
-                          load: lastLoad,
-                          rpe: (p[setNum] ?? d).rpe,
-                        },
-                      }))
-                    }
-                    className="text-eyebrow font-medium text-warm-400 hover:text-primary-600 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary-400 transition-colors"
-                    aria-label={`Repeat last set: ${lastLoad}${prescribedLoadUnit ?? 'lb'} × ${lastReps}`}
-                  >
-                    Repeat {lastLoad ? `${lastLoad}${prescribedLoadUnit ?? 'lb'}` : ''}
-                    {lastReps ? ` × ${lastReps}` : ''}
-                  </Button>
-                </div>
-              )}
-            </div>
-          );
-        })}
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/baseball/performance/PlayerLiftToday.tsx b/src/components/baseball/performance/PlayerLiftToday.tsx
index 8cb8d705f..1e1989490 100644
--- a/src/components/baseball/performance/PlayerLiftToday.tsx
+++ b/src/components/baseball/performance/PlayerLiftToday.tsx
@@ -7,25 +7,27 @@
 // (PlayerTodayClient). It is a clean DEFAULT export so the integration phase can
 // drop it straight in without touching this file.
 //
-// UNIFIED STORAGE (V11): this card reads the SAME materialized
-// baseball_lift_sessions rows that publishLiftDay writes — the identical source
-// the dedicated player lift route (/baseball/dashboard/lift via getPlayerLiftHome)
-// and the CoachHelm engine (loaders-v10) consume. The previous version read the
-// legacy baseball_lift_assignments island, so a lift built+published through the
-// V11 program builder never appeared here and the AI never analyzed it. That
-// island is closed: publish -> materialized session -> set logging -> PRs is now
-// one loop visible on Today, on the lift route, and to the engine.
+// UNIFIED STORAGE (helm_lifting_*, ONE Lift Lab): this card reads the SAME
+// materialized helm_lifting_sessions rows that publishProgram / publishLiftDay
+// write — the identical source the dedicated player lift route
+// (/baseball/dashboard/lift via getPlayerLiftHome, now backed by
+// helm_lifting_sessions via the baseball-view-adapter) and the CoachHelm
+// engine (loaders-v10) consume. The legacy baseball_lift_* / baseball_lift_
+// assignments tables are write-dead — publish -> materialized session -> set
+// logging -> PRs is one loop visible on Today, on the lift route, and to the
+// engine.
 //
 // The card itself is an honest daily-loop SUMMARY + launcher: it lists today's
 // (and overdue, not-yet-completed) sessions with status, and routes each to the
 // dedicated session screen (/baseball/dashboard/lift/[sessionId]) where the full
 // per-set logging surface already lives (one place for execution, not two). The
-// daily readiness check-in writes the shared baseball_readiness_checkins table.
+// daily readiness check-in writes the shared helm_lifting_readiness_checkins
+// table.
 //
 // Players can only ever see/log their OWN sessions and readiness — the RLS
-// policies on baseball_lift_sessions / baseball_readiness_checkins make that
-// structural; the client typing is loosened only because these tables are not in
-// the generated database.ts yet.
+// policies on helm_lifting_sessions / helm_lifting_readiness_checkins make
+// that structural; the client typing is loosened only because these tables
+// are not in the generated database.ts yet.
 // =============================================================================
 
 import { useCallback, useEffect, useState } from 'react';
@@ -363,7 +365,7 @@ export default function PlayerLiftToday({
         </CardContent>
       </Card>
 
-      {/* Daily readiness check-in (shared baseball_readiness_checkins). */}
+      {/* Daily readiness check-in (shared helm_lifting_readiness_checkins). */}
       <Card variant="glass">
         <CardHeader>
           <div className="flex items-center gap-2">
diff --git a/src/components/baseball/performance/ProgramEditorClient.tsx b/src/components/baseball/performance/ProgramEditorClient.tsx
deleted file mode 100644
index a6d356f95..000000000
--- a/src/components/baseball/performance/ProgramEditorClient.tsx
+++ /dev/null
@@ -1,1252 +0,0 @@
-'use client';
-
-// =============================================================================
-// src/components/baseball/performance/ProgramEditorClient.tsx
-//
-// V11 Program editor (spec L200-228 + Packet E). Wires the full orphaned authoring
-// layer to the deep, already-built server actions in lifting-v11.ts:
-//   createLiftProgram* / updateLiftProgram / addLiftWeek / duplicateLiftWeek /
-//   deleteLiftWeek / addLiftDay / updateLiftDay / duplicateLiftDay / deleteLiftDay /
-//   addLiftSection / updateLiftSection / reorderLiftSections / deleteLiftSection /
-//   addLiftPrescription / updateLiftPrescription / reorderLiftPrescriptions /
-//   deleteLiftPrescription / saveProgramAsTemplate / publishLiftDay.
-//   (*createLiftProgram is called from the list; the rest are wired here.)
-//
-// IA: the editor is composed for the coach's primary task — author a day's work
-// fast. Left rail = macrocycle tree (weeks -> days, the navigation spine). Right =
-// the SELECTED day's section/prescription editor (the dense work surface). One
-// prominent primary action per context (Assign & publish on a day).
-//
-// Drag-drop reorder for sections + prescriptions, with a keyboard alternative
-// (Move up / Move down buttons) so reordering never requires a mouse (a11y).
-//
-// Cream/green GolfHelm palette only. Every write goes through a withBaseballAction
-// server action (capability-enforced server-side) + RLS; this client only offers
-// affordances. No destructive bulk writes — deletes are explicit single-node.
-// =============================================================================
-
-import { useCallback, useMemo, useRef, useState, useTransition } from 'react';
-import { useRouter } from 'next/navigation';
-import Link from 'next/link';
-import { motion, useReducedMotion } from 'framer-motion';
-
-import { Card, CardContent } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Checkbox } from '@/components/ui/checkbox';
-import { Input } from '@/components/ui/input';
-import { Select } from '@/components/ui/select';
-import { Textarea } from '@/components/ui/textarea';
-import { Modal } from '@/components/ui/modal';
-import { ConfirmDialog } from '@/components/ui/confirm-dialog';
-import { EmptyState } from '@/components/ui/empty-state';
-import {
-  IconPlus, IconTrash, IconCopy, IconChevronDown, IconChevronUp,
-  IconClock, IconClipboardList,
-} from '@/components/icons';
-import {
-  updateLiftProgram,
-  addLiftWeek, duplicateLiftWeek, deleteLiftWeek,
-  addLiftDay, updateLiftDay, duplicateLiftDay, deleteLiftDay,
-  addLiftSection, updateLiftSection, reorderLiftSections, deleteLiftSection,
-  addLiftPrescription, updateLiftPrescription, reorderLiftPrescriptions, deleteLiftPrescription,
-  saveProgramAsTemplate, publishLiftDay,
-} from '@/app/baseball/actions/lifting-v11';
-import { updateProgramBlockOrder } from '@/app/baseball/actions/program-settings';
-import type {
-  LiftProgramTree, LiftWeekNode, LiftDayNode, LiftSectionNode,
-  LiftPrescriptionNode, AssignContext,
-} from '@/lib/baseball/read-models/lift-programs';
-import type {
-  BaseballLiftProgramPhase, BaseballLiftProgramGoal, BaseballLiftProgramStatus,
-  BaseballLiftDayType, BaseballLiftBaseballContext, BaseballLiftSectionType,
-  BaseballLiftPrescriptionType, BaseballLiftAssignmentTargetType,
-} from '@/lib/types/baseball-lifting-v11';
-
-// -----------------------------------------------------------------------------
-// Vocabularies (mirror the migration CHECK constraints + action schemas)
-// -----------------------------------------------------------------------------
-
-const PHASE_OPTIONS: Array<{ value: BaseballLiftProgramPhase; label: string }> = [
-  { value: 'fall', label: 'Fall' }, { value: 'winter', label: 'Winter' },
-  { value: 'preseason', label: 'Preseason' }, { value: 'in_season', label: 'In-season' },
-  { value: 'postseason', label: 'Postseason' }, { value: 'summer', label: 'Summer' },
-  { value: 'return_to_play', label: 'Return to play' }, { value: 'testing', label: 'Testing' },
-];
-const GOAL_OPTIONS: Array<{ value: BaseballLiftProgramGoal; label: string }> = [
-  { value: 'strength', label: 'Strength' }, { value: 'power', label: 'Power' },
-  { value: 'hypertrophy', label: 'Hypertrophy' }, { value: 'speed', label: 'Speed' },
-  { value: 'maintenance', label: 'Maintenance' }, { value: 'recovery', label: 'Recovery' },
-  { value: 'arm_care', label: 'Arm care' }, { value: 'testing', label: 'Testing' },
-];
-const STATUS_OPTIONS: Array<{ value: BaseballLiftProgramStatus; label: string }> = [
-  { value: 'draft', label: 'Draft' }, { value: 'active', label: 'Active' },
-  { value: 'archived', label: 'Archived' },
-];
-const DAY_TYPE_OPTIONS: Array<{ value: BaseballLiftDayType; label: string }> = [
-  { value: 'lower', label: 'Lower' }, { value: 'upper', label: 'Upper' },
-  { value: 'full_body', label: 'Full body' }, { value: 'recovery', label: 'Recovery' },
-  { value: 'arm_care', label: 'Arm care' }, { value: 'conditioning', label: 'Conditioning' },
-  { value: 'testing', label: 'Testing' }, { value: 'custom', label: 'Custom' },
-];
-const BASEBALL_CONTEXT_OPTIONS: Array<{ value: string; label: string }> = [
-  { value: '', label: 'No baseball context' },
-  { value: 'pre_game', label: 'Pre-game' }, { value: 'post_game', label: 'Post-game' },
-  { value: 'bullpen_day', label: 'Bullpen day' }, { value: 'starter_plus_1', label: 'Starter +1' },
-  { value: 'starter_plus_2', label: 'Starter +2' }, { value: 'travel_day', label: 'Travel day' },
-  { value: 'off_day', label: 'Off day' }, { value: 'practice_day', label: 'Practice day' },
-];
-const SECTION_TYPE_OPTIONS: Array<{ value: BaseballLiftSectionType; label: string }> = [
-  { value: 'warmup', label: 'Warmup' }, { value: 'movement_prep', label: 'Movement prep' },
-  { value: 'power', label: 'Power' }, { value: 'main_strength', label: 'Main strength' },
-  { value: 'accessory', label: 'Accessory' }, { value: 'arm_care', label: 'Arm care' },
-  { value: 'mobility', label: 'Mobility' }, { value: 'conditioning', label: 'Conditioning' },
-];
-const PRESCRIPTION_TYPE_OPTIONS: Array<{ value: BaseballLiftPrescriptionType; label: string }> = [
-  { value: 'fixed', label: 'Fixed load' }, { value: 'percent_1rm', label: '% of 1RM' },
-  { value: 'rpe', label: 'RPE target' }, { value: 'velocity', label: 'Velocity' },
-  { value: 'coach_load', label: 'Coach assigns' }, { value: 'player_select', label: 'Player selects' },
-];
-
-const DAY_TYPE_LABEL = Object.fromEntries(DAY_TYPE_OPTIONS.map((o) => [o.value, o.label]));
-const SECTION_TYPE_LABEL = Object.fromEntries(SECTION_TYPE_OPTIONS.map((o) => [o.value, o.label]));
-const BASEBALL_CONTEXT_LABEL = Object.fromEntries(
-  BASEBALL_CONTEXT_OPTIONS.filter((o) => o.value).map((o) => [o.value, o.label]),
-);
-
-/** Swap two indices in a copy of the array (typesafe under noUncheckedIndexedAccess). */
-function swapped<T>(arr: readonly T[], a: number, b: number): T[] {
-  const next = [...arr];
-  const tmp = next[a]!;
-  next[a] = next[b]!;
-  next[b] = tmp;
-  return next;
-}
-
-function GripDots() {
-  return (
-    <span className="grid grid-cols-2 gap-0.5 text-warm-300" aria-hidden>
-      {Array.from({ length: 6 }).map((_, i) => (
-        <span key={i} className="h-1 w-1 rounded-full bg-current" />
-      ))}
-    </span>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// Editor root
-// -----------------------------------------------------------------------------
-
-interface Props {
-  tree: LiftProgramTree;
-  assign: AssignContext;
-}
-
-export function ProgramEditorClient({ tree, assign }: Props) {
-  const router = useRouter();
-  const [error, setError] = useState<string | null>(null);
-  const [notice, setNotice] = useState<string | null>(null);
-  const [pending, startTransition] = useTransition();
-  const prefersReducedMotion = useReducedMotion();
-
-  // Selected day in the editor (defaults to the first day of the first week).
-  const firstDayId = tree.weeks[0]?.days[0]?.id ?? null;
-  const [selectedDayId, setSelectedDayId] = useState<string | null>(firstDayId);
-
-  const selectedDay = useMemo<{ week: LiftWeekNode; day: LiftDayNode } | null>(() => {
-    for (const w of tree.weeks) {
-      const d = w.days.find((x) => x.id === selectedDayId);
-      if (d) return { week: w, day: d };
-    }
-    return null;
-  }, [tree.weeks, selectedDayId]);
-
-  // Wrap a server action: refresh on success, surface a friendly error otherwise.
-  const run = useCallback(
-    (fn: () => Promise<{ success: boolean; error?: string; id?: string }>, onOk?: (id?: string) => void) => {
-      setError(null);
-      startTransition(async () => {
-        try {
-          const res = await fn();
-          if (res.success) {
-            onOk?.(res.id);
-            router.refresh();
-          } else {
-            setError(res.error ?? 'Something went wrong.');
-          }
-        } catch {
-          setError('Something went wrong. Please try again.');
-        }
-      });
-    },
-    [router],
-  );
-
-  return (
-    <motion.div
-      className="space-y-5"
-      initial={prefersReducedMotion ? false : { opacity: 0, y: 6 }}
-      animate={{ opacity: 1, y: 0 }}
-      transition={{ duration: 0.2 }}
-    >
-      <ProgramHeader
-        tree={tree}
-        pending={pending}
-        onSave={(patch, onOk) => run(() => updateLiftProgram({ programId: tree.program.id, ...patch }), onOk)}
-        onSaveTemplate={(name) =>
-          run(
-            () => saveProgramAsTemplate({ programId: tree.program.id, name: name || null }),
-            () => setNotice('Saved a reusable template copy.'),
-          )
-        }
-      />
-
-      {error && (
-        <div role="alert" className="rounded-xl border border-red-200 bg-red-50 px-4 py-2 text-sm text-red-700">
-          {error}
-        </div>
-      )}
-      {notice && (
-        <div role="status" aria-live="polite" className="rounded-xl border border-primary-200 bg-primary-50 px-4 py-2 text-sm text-primary-700">
-          {notice}
-        </div>
-      )}
-
-      <div className="grid gap-5 lg:grid-cols-[20rem_1fr]">
-        {/* Macrocycle spine */}
-        <WeekRail
-          weeks={tree.weeks}
-          selectedDayId={selectedDayId}
-          pending={pending}
-          onSelectDay={setSelectedDayId}
-          onAddWeek={() =>
-            run(() =>
-              addLiftWeek({
-                programId: tree.program.id,
-                weekNumber: (tree.weeks.at(-1)?.week_number ?? 0) + 1,
-                name: `Week ${(tree.weeks.at(-1)?.week_number ?? 0) + 1}`,
-              }),
-            )
-          }
-          onDuplicateWeek={(weekId) => run(() => duplicateLiftWeek({ weekId }))}
-          onDeleteWeek={(weekId) => run(() => deleteLiftWeek({ id: weekId }))}
-          onAddDay={(week) =>
-            run(
-              () =>
-                addLiftDay({
-                  weekId: week.id,
-                  dayNumber: nextDayNumber(week),
-                  name: `Day ${nextDayNumber(week)}`,
-                }),
-              () => undefined,
-            )
-          }
-          onDuplicateDay={(dayId) => run(() => duplicateLiftDay({ dayId }), (id) => id && setSelectedDayId(id))}
-          onDeleteDay={(dayId) =>
-            run(() => deleteLiftDay({ id: dayId }), () => {
-              if (dayId === selectedDayId) setSelectedDayId(null);
-            })
-          }
-        />
-
-        {/* Day work surface */}
-        <div>
-          {selectedDay ? (
-            <DayEditor
-              key={selectedDay.day.id}
-              week={selectedDay.week}
-              day={selectedDay.day}
-              assign={assign}
-              programId={tree.program.id}
-              programName={tree.program.name}
-              pending={pending}
-              run={run}
-            />
-          ) : (
-            <Card>
-              <CardContent className="py-12">
-                <EmptyState
-                  icon={<IconClipboardList size={40} />}
-                  title={tree.weeks.length === 0 ? 'Add your first week' : 'Pick a day to edit'}
-                  description={
-                    tree.weeks.length === 0
-                      ? 'A program is built from weeks and lift days. Add a week to begin.'
-                      : 'Select a day from the left, or add a day to a week, to start building sections and exercises.'
-                  }
-                />
-              </CardContent>
-            </Card>
-          )}
-        </div>
-      </div>
-    </motion.div>
-  );
-}
-
-function nextDayNumber(week: LiftWeekNode): number {
-  const used = new Set(week.days.map((d) => d.day_number));
-  let n = 1;
-  while (used.has(n) && n < 7) n++;
-  return n;
-}
-
-// -----------------------------------------------------------------------------
-// Program header (editable meta + save-as-template)
-// -----------------------------------------------------------------------------
-
-function ProgramHeader({
-  tree, pending, onSave, onSaveTemplate,
-}: {
-  tree: LiftProgramTree;
-  pending: boolean;
-  onSave: (patch: Record<string, unknown>, onOk?: () => void) => void;
-  onSaveTemplate: (name: string) => void;
-}) {
-  const p = tree.program;
-  const [editing, setEditing] = useState(false);
-  const [name, setName] = useState(p.name);
-  const [description, setDescription] = useState(p.description ?? '');
-  const [phase, setPhase] = useState(p.phase);
-  const [goal, setGoal] = useState(p.goal);
-  const [status, setStatus] = useState(p.status);
-  const [tplOpen, setTplOpen] = useState(false);
-  const [tplName, setTplName] = useState(`${p.name} (template)`);
-
-  return (
-    <Card>
-      <CardContent className="space-y-3">
-        <nav aria-label="Breadcrumb" className="flex items-center gap-2 text-xs font-medium text-warm-400">
-          <Link href="/baseball/dashboard/performance" className="rounded transition-colors hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/40">Performance</Link>
-          <span aria-hidden>/</span>
-          <Link href="/baseball/dashboard/performance/programs" className="rounded transition-colors hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/40">Programs</Link>
-          <span aria-hidden>/</span>
-          <span className="text-warm-600" aria-current="page">{p.name}</span>
-        </nav>
-
-        {editing ? (
-          <div className="space-y-3">
-            <Input label="Program name" value={name} onChange={(e) => setName(e.target.value)} />
-            <Textarea label="Description" value={description} onChange={(e) => setDescription(e.target.value)} rows={2} />
-            <div className="grid grid-cols-3 gap-3">
-              <Select label="Phase" options={PHASE_OPTIONS} value={phase} onChange={(v) => setPhase(v as BaseballLiftProgramPhase)} />
-              <Select label="Goal" options={GOAL_OPTIONS} value={goal} onChange={(v) => setGoal(v as BaseballLiftProgramGoal)} />
-              <Select label="Status" options={STATUS_OPTIONS} value={status} onChange={(v) => setStatus(v as BaseballLiftProgramStatus)} />
-            </div>
-            <div className="flex justify-end gap-2">
-              <Button variant="ghost" onClick={() => setEditing(false)} disabled={pending}>Cancel</Button>
-              <Button
-                variant="primary"
-                isLoading={pending}
-                onClick={() =>
-                  onSave(
-                    { name: name.trim(), description: description.trim() || null, phase, goal, status },
-                    () => setEditing(false),
-                  )
-                }
-              >
-                Save
-              </Button>
-            </div>
-          </div>
-        ) : (
-          <div className="flex flex-wrap items-start justify-between gap-3">
-            <div>
-              <p className="text-eyebrow uppercase text-primary-700">Program</p>
-              <h1 className="mt-0.5 text-2xl font-semibold tracking-tight text-warm-900">{p.name}</h1>
-              {p.description && <p className="mt-0.5 max-w-xl text-sm text-warm-500">{p.description}</p>}
-              <div className="mt-2 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-warm-500">
-                <span className="font-medium text-warm-700">{PHASE_OPTIONS.find((o) => o.value === p.phase)?.label}</span>
-                <span aria-hidden>·</span>
-                <span>{GOAL_OPTIONS.find((o) => o.value === p.goal)?.label}</span>
-                <span aria-hidden>·</span>
-                <span className="capitalize">{p.status}</span>
-                {p.is_template && (
-                  <span className="rounded-full border border-amber-200 bg-amber-50 px-2 py-0.5 text-eyebrow font-medium text-amber-700">
-                    Template
-                  </span>
-                )}
-              </div>
-            </div>
-            <div className="flex gap-2">
-              <Button variant="secondary" onClick={() => setTplOpen(true)} disabled={pending}>
-                Save as template
-              </Button>
-              <Button variant="outline" onClick={() => setEditing(true)} disabled={pending}>
-                Edit details
-              </Button>
-            </div>
-          </div>
-        )}
-      </CardContent>
-
-      <Modal isOpen={tplOpen} onClose={() => setTplOpen(false)} title="Save as template">
-        <div className="space-y-4">
-          <p className="text-sm text-warm-500">
-            Creates a reusable copy of this program (all weeks, days, sections, and exercises) flagged as a template. The original is unchanged.
-          </p>
-          <Input label="Template name" value={tplName} onChange={(e) => setTplName(e.target.value)} />
-          <div className="flex justify-end gap-2">
-            <Button variant="ghost" onClick={() => setTplOpen(false)} disabled={pending}>Cancel</Button>
-            <Button variant="primary" isLoading={pending} onClick={() => { onSaveTemplate(tplName.trim()); setTplOpen(false); }}>
-              Save template
-            </Button>
-          </div>
-        </div>
-      </Modal>
-    </Card>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// Week rail (macrocycle spine: weeks -> days)
-// -----------------------------------------------------------------------------
-
-function WeekRail({
-  weeks, selectedDayId, pending,
-  onSelectDay, onAddWeek, onDuplicateWeek, onDeleteWeek, onAddDay, onDuplicateDay, onDeleteDay,
-}: {
-  weeks: LiftWeekNode[];
-  selectedDayId: string | null;
-  pending: boolean;
-  onSelectDay: (id: string) => void;
-  onAddWeek: () => void;
-  onDuplicateWeek: (weekId: string) => void;
-  onDeleteWeek: (weekId: string) => void;
-  onAddDay: (week: LiftWeekNode) => void;
-  onDuplicateDay: (dayId: string) => void;
-  onDeleteDay: (dayId: string) => void;
-}) {
-  const [confirmWeek, setConfirmWeek] = useState<LiftWeekNode | null>(null);
-  const [confirmDay, setConfirmDay] = useState<LiftDayNode | null>(null);
-
-  return (
-    <Card className="h-fit">
-      <CardContent className="space-y-3">
-        <div className="flex items-center justify-between">
-          <h2 className="text-sm font-semibold uppercase tracking-wide text-warm-400">Macrocycle</h2>
-          <Button variant="ghost" size="sm" leftIcon={<IconPlus size={14} />} onClick={onAddWeek} disabled={pending}>
-            Week
-          </Button>
-        </div>
-
-        {weeks.length === 0 ? (
-          <p className="rounded-lg border border-dashed border-warm-200 px-3 py-4 text-center text-xs text-warm-400">
-            No weeks yet. Add a week to start building.
-          </p>
-        ) : (
-          <ul className="space-y-3">
-            {weeks.map((w) => (
-              <li key={w.id} className="rounded-xl border border-warm-100 glass-standard p-2">
-                <div className="flex items-center justify-between gap-1 px-1">
-                  <div className="min-w-0">
-                    <div className="truncate text-sm font-semibold text-warm-800">
-                      {w.name ?? `Week ${w.week_number}`}
-                      {w.deload && <span className="ml-1 text-eyebrow font-medium text-amber-600">deload</span>}
-                    </div>
-                    {w.theme && <div className="truncate text-eyebrow text-warm-400">{w.theme}</div>}
-                  </div>
-                  <div className="flex shrink-0">
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      title="Duplicate week"
-                      aria-label={`Duplicate ${w.name ?? `week ${w.week_number}`}`}
-                      className="rounded-md p-1 text-warm-400 transition-colors hover:bg-warm-50 hover:text-warm-700 focus-visible:ring-primary-500/40 disabled:opacity-50"
-                      onClick={() => onDuplicateWeek(w.id)}
-                      disabled={pending}
-                    >
-                      <IconCopy size={14} />
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      title="Delete week"
-                      aria-label={`Delete ${w.name ?? `week ${w.week_number}`}`}
-                      className="rounded-md p-1 text-warm-400 transition-colors hover:bg-red-50 hover:text-red-600 focus-visible:ring-red-500/40 disabled:opacity-50"
-                      onClick={() => setConfirmWeek(w)}
-                      disabled={pending}
-                    >
-                      <IconTrash size={14} />
-                    </Button>
-                  </div>
-                </div>
-
-                <ul className="mt-1 space-y-1">
-                  {w.days.map((d) => {
-                    const active = d.id === selectedDayId;
-                    return (
-                      <li key={d.id} className="group flex items-center gap-1">
-                        <Button
-                          type="button"
-                          variant="ghost"
-                          onClick={() => onSelectDay(d.id)}
-                          aria-current={active ? 'true' : undefined}
-                          className={`flex-1 truncate rounded-lg px-2 py-1.5 text-left text-sm transition-colors focus-visible:ring-primary-500/40 ${
-                            active
-                              ? 'bg-primary-50 font-medium text-primary-700'
-                              : 'text-warm-600 hover:bg-warm-50'
-                          }`}
-                        >
-                          {d.name ?? `Day ${d.day_number}`}
-                          <span className="ml-1 text-eyebrow text-warm-400">{DAY_TYPE_LABEL[d.day_type]}</span>
-                        </Button>
-                        <Button
-                          type="button"
-                          variant="ghost"
-                          title="Duplicate day"
-                          aria-label={`Duplicate ${d.name ?? `day ${d.day_number}`}`}
-                          className="rounded-md p-1 text-warm-300 opacity-0 transition-colors hover:bg-warm-50 hover:text-warm-700 focus-visible:opacity-100 focus-visible:ring-primary-500/40 group-hover:opacity-100 disabled:opacity-50"
-                          onClick={() => onDuplicateDay(d.id)}
-                          disabled={pending}
-                        >
-                          <IconCopy size={13} />
-                        </Button>
-                        <Button
-                          type="button"
-                          variant="ghost"
-                          title="Delete day"
-                          aria-label={`Delete ${d.name ?? `day ${d.day_number}`}`}
-                          className="rounded-md p-1 text-warm-300 opacity-0 transition-colors hover:bg-red-50 hover:text-red-600 focus-visible:opacity-100 focus-visible:ring-red-500/40 group-hover:opacity-100 disabled:opacity-50"
-                          onClick={() => setConfirmDay(d)}
-                          disabled={pending}
-                        >
-                          <IconTrash size={13} />
-                        </Button>
-                      </li>
-                    );
-                  })}
-                  <li>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      onClick={() => onAddDay(w)}
-                      disabled={pending || w.days.length >= 7}
-                      className="w-full rounded-lg border border-dashed border-warm-200 px-2 py-1.5 text-left text-xs font-medium text-warm-500 transition-colors hover:border-primary-200 hover:text-primary-700 focus-visible:ring-primary-500/40 disabled:opacity-50"
-                    >
-                      + Add day{w.days.length >= 7 ? ' (max 7)' : ''}
-                    </Button>
-                  </li>
-                </ul>
-              </li>
-            ))}
-          </ul>
-        )}
-      </CardContent>
-
-      <ConfirmDialog
-        open={confirmWeek !== null}
-        onCancel={() => setConfirmWeek(null)}
-        onConfirm={() => { if (confirmWeek) onDeleteWeek(confirmWeek.id); setConfirmWeek(null); }}
-        title="Delete week?"
-        message={`This removes ${confirmWeek?.name ?? 'this week'} and all of its days, sections, and exercises. Published sessions already on the board are not affected.`}
-        confirmLabel="Delete week"
-        variant="danger"
-      />
-      <ConfirmDialog
-        open={confirmDay !== null}
-        onCancel={() => setConfirmDay(null)}
-        onConfirm={() => { if (confirmDay) onDeleteDay(confirmDay.id); setConfirmDay(null); }}
-        title="Delete day?"
-        message={`This removes ${confirmDay?.name ?? 'this day'} and its sections and exercises. Published sessions already on the board are not affected.`}
-        confirmLabel="Delete day"
-        variant="danger"
-      />
-    </Card>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// Day editor (sections + prescriptions + assign/publish)
-// -----------------------------------------------------------------------------
-
-type RunFn = (
-  fn: () => Promise<{ success: boolean; error?: string; id?: string }>,
-  onOk?: (id?: string) => void,
-) => void;
-
-function DayEditor({
-  week, day, assign, programId, programName, pending, run,
-}: {
-  week: LiftWeekNode;
-  day: LiftDayNode;
-  assign: AssignContext;
-  programId: string;
-  programName: string;
-  pending: boolean;
-  run: RunFn;
-}) {
-  const [editingMeta, setEditingMeta] = useState(false);
-  const [name, setName] = useState(day.name ?? '');
-  const [dayType, setDayType] = useState(day.day_type);
-  const [ctx, setCtx] = useState<string>(day.baseball_context ?? '');
-  const [est, setEst] = useState<string>(day.estimated_minutes != null ? String(day.estimated_minutes) : '');
-  const [assignOpen, setAssignOpen] = useState(false);
-
-  // Section-level drag-to-reorder. We track the dragged section id in a ref so
-  // the onDrop handler can compute the new ordered array and call the server action.
-  const sectionDragId = useRef<string | null>(null);
-
-  function onDropSection(targetId: string) {
-    const ids = day.sections.map((s) => s.id);
-    const from = ids.indexOf(sectionDragId.current ?? '');
-    const to = ids.indexOf(targetId);
-    sectionDragId.current = null;
-    if (from < 0 || to < 0 || from === to) return;
-    const next = [...ids];
-    const [moved] = next.splice(from, 1);
-    if (moved === undefined) return;
-    next.splice(to, 0, moved);
-    // W5c: call the new update_program_block_order action from program-settings.ts.
-    run(() => updateProgramBlockOrder({ orderedIds: next }));
-  }
-
-  const totalExercises = day.sections.reduce((n, s) => n + s.prescriptions.length, 0);
-
-  return (
-    <div className="space-y-4">
-      {/* Day header */}
-      <Card>
-        <CardContent>
-          {editingMeta ? (
-            <div className="space-y-3">
-              <Input label="Day name" value={name} onChange={(e) => setName(e.target.value)} placeholder={`Day ${day.day_number}`} />
-              <div className="grid grid-cols-3 gap-3">
-                <Select label="Day type" options={DAY_TYPE_OPTIONS} value={dayType} onChange={(v) => setDayType(v as BaseballLiftDayType)} />
-                <Select label="Baseball context" options={BASEBALL_CONTEXT_OPTIONS} value={ctx} onChange={setCtx} />
-                <Input label="Est. minutes" type="number" inputMode="numeric" value={est} onChange={(e) => setEst(e.target.value)} placeholder="60" />
-              </div>
-              <div className="flex justify-end gap-2">
-                <Button variant="ghost" onClick={() => setEditingMeta(false)} disabled={pending}>Cancel</Button>
-                <Button
-                  variant="primary"
-                  isLoading={pending}
-                  onClick={() =>
-                    run(
-                      () =>
-                        updateLiftDay({
-                          dayId: day.id,
-                          name: name.trim() || null,
-                          dayType,
-                          baseballContext: (ctx || null) as BaseballLiftBaseballContext | null,
-                          estimatedMinutes: est.trim() === '' ? null : Number(est),
-                        }),
-                      () => setEditingMeta(false),
-                    )
-                  }
-                >
-                  Save
-                </Button>
-              </div>
-            </div>
-          ) : (
-            <div className="flex flex-wrap items-start justify-between gap-3">
-              <div>
-                <p className="text-xs font-medium text-warm-400">{week.name ?? `Week ${week.week_number}`}</p>
-                <h2 className="text-xl font-semibold text-warm-900">{day.name ?? `Day ${day.day_number}`}</h2>
-                <div className="mt-1 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-warm-500">
-                  <span className="font-medium text-warm-700">{DAY_TYPE_LABEL[day.day_type]}</span>
-                  {day.baseball_context && (
-                    <>
-                      <span aria-hidden>·</span>
-                      <span className="rounded-full bg-cream-100 px-2 py-0.5 text-eyebrow text-warm-600">
-                        {BASEBALL_CONTEXT_LABEL[day.baseball_context] ?? day.baseball_context}
-                      </span>
-                    </>
-                  )}
-                  {day.estimated_minutes != null && (
-                    <>
-                      <span aria-hidden>·</span>
-                      <span className="inline-flex items-center gap-1"><IconClock size={12} />{day.estimated_minutes} min</span>
-                    </>
-                  )}
-                  <span aria-hidden>·</span>
-                  <span className="tabular-nums">{totalExercises} exercise{totalExercises === 1 ? '' : 's'}</span>
-                </div>
-              </div>
-              <div className="flex gap-2">
-                <Button variant="outline" onClick={() => setEditingMeta(true)} disabled={pending}>Day settings</Button>
-                <Button
-                  variant="primary"
-                  onClick={() => setAssignOpen(true)}
-                  disabled={pending || totalExercises === 0}
-                  title={totalExercises === 0 ? 'Add at least one exercise before publishing' : undefined}
-                >
-                  Assign &amp; publish
-                </Button>
-              </div>
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      {/* Sections */}
-      {day.sections.length === 0 ? (
-        <Card>
-          <CardContent className="py-10">
-            <EmptyState
-              icon={<IconClipboardList size={40} />}
-              title="No sections yet"
-              description="A lift day is organized into sections (warmup, power, main strength, accessory, arm care…). Add a section, then add exercises to it."
-              action={{
-                label: 'Add a section',
-                onClick: () =>
-                  run(() => addLiftSection({ liftDayId: day.id, name: 'Main strength', sectionType: 'main_strength', sectionOrder: 0 })),
-              }}
-            />
-          </CardContent>
-        </Card>
-      ) : (
-        <ul className="space-y-3 list-none">
-          {day.sections.map((s, i) => (
-            <li
-              key={s.id}
-              draggable={!pending}
-              onDragStart={() => { sectionDragId.current = s.id; }}
-              onDragOver={(e) => e.preventDefault()}
-              onDrop={() => onDropSection(s.id)}
-              className="transition-opacity"
-            >
-              <SectionEditor
-                section={s}
-                index={i}
-                count={day.sections.length}
-                sectionsOrder={day.sections.map((x) => x.id)}
-                exercises={assign.exercises}
-                pending={pending}
-                run={run}
-              />
-            </li>
-          ))}
-        </ul>
-      )}
-
-      {day.sections.length > 0 && (
-        <Button
-          variant="secondary"
-          leftIcon={<IconPlus size={16} />}
-          onClick={() =>
-            run(() =>
-              addLiftSection({
-                liftDayId: day.id,
-                name: 'New section',
-                sectionType: 'accessory',
-                sectionOrder: day.sections.length,
-              }),
-            )
-          }
-          disabled={pending}
-        >
-          Add section
-        </Button>
-      )}
-
-      {assignOpen && (
-        <AssignPublishDialog
-          day={day}
-          programId={programId}
-          programName={programName}
-          assign={assign}
-          pending={pending}
-          onClose={() => setAssignOpen(false)}
-          run={run}
-        />
-      )}
-    </div>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// Section editor (header + reorder + prescriptions list w/ drag-drop)
-// -----------------------------------------------------------------------------
-
-function SectionEditor({
-  section, index, count, sectionsOrder, exercises, pending, run,
-}: {
-  section: LiftSectionNode;
-  index: number;
-  count: number;
-  sectionsOrder: string[];
-  exercises: AssignContext['exercises'];
-  pending: boolean;
-  run: RunFn;
-}) {
-  const [editing, setEditing] = useState(false);
-  const [name, setName] = useState(section.name);
-  const [type, setType] = useState(section.section_type);
-  const [confirmDelete, setConfirmDelete] = useState(false);
-  const [addOpen, setAddOpen] = useState(false);
-  const dragId = useRef<string | null>(null);
-
-  function moveSection(dir: -1 | 1) {
-    const j = index + dir;
-    if (j < 0 || j >= sectionsOrder.length) return;
-    run(() => reorderLiftSections({ orderedIds: swapped(sectionsOrder, index, j) }));
-  }
-
-  // Drag-drop for prescriptions inside this section.
-  function onDropPrescription(targetId: string) {
-    const ids = section.prescriptions.map((p) => p.id);
-    const from = ids.indexOf(dragId.current ?? '');
-    const to = ids.indexOf(targetId);
-    dragId.current = null;
-    if (from < 0 || to < 0 || from === to) return;
-    const next = [...ids];
-    const [moved] = next.splice(from, 1);
-    if (moved === undefined) return;
-    next.splice(to, 0, moved);
-    run(() => reorderLiftPrescriptions({ orderedIds: next }));
-  }
-
-  return (
-    <Card>
-      <CardContent className="space-y-3">
-        {editing ? (
-          <div className="space-y-3">
-            <div className="grid grid-cols-2 gap-3">
-              <Input label="Section name" value={name} onChange={(e) => setName(e.target.value)} />
-              <Select label="Type" options={SECTION_TYPE_OPTIONS} value={type} onChange={(v) => setType(v as BaseballLiftSectionType)} />
-            </div>
-            <div className="flex justify-end gap-2">
-              <Button variant="ghost" onClick={() => setEditing(false)} disabled={pending}>Cancel</Button>
-              <Button
-                variant="primary"
-                isLoading={pending}
-                onClick={() => run(() => updateLiftSection({ sectionId: section.id, name: name.trim(), sectionType: type }), () => setEditing(false))}
-              >
-                Save
-              </Button>
-            </div>
-          </div>
-        ) : (
-          <div className="flex items-center justify-between gap-2">
-            <div className="flex items-center gap-2">
-              <span className="rounded-full bg-warm-50 px-2 py-0.5 text-eyebrow font-medium uppercase tracking-wide text-warm-500">
-                {SECTION_TYPE_LABEL[section.section_type]}
-              </span>
-              <h3 className="text-base font-semibold text-warm-900">{section.name}</h3>
-            </div>
-            <div className="flex items-center gap-0.5">
-              <Button
-                type="button" variant="ghost" title="Move section up" aria-label="Move section up"
-                className="rounded-md p-1 text-warm-400 transition-colors hover:bg-warm-50 hover:text-warm-700 focus-visible:ring-primary-500/40 disabled:opacity-30"
-                onClick={() => moveSection(-1)} disabled={pending || index === 0}
-              >
-                <IconChevronUp size={15} />
-              </Button>
-              <Button
-                type="button" variant="ghost" title="Move section down" aria-label="Move section down"
-                className="rounded-md p-1 text-warm-400 transition-colors hover:bg-warm-50 hover:text-warm-700 focus-visible:ring-primary-500/40 disabled:opacity-30"
-                onClick={() => moveSection(1)} disabled={pending || index === count - 1}
-              >
-                <IconChevronDown size={15} />
-              </Button>
-              <Button
-                type="button" variant="ghost" title="Edit section" aria-label="Edit section"
-                className="rounded-md px-2 py-1 text-xs font-medium text-warm-500 transition-colors hover:bg-warm-50 hover:text-warm-700 focus-visible:ring-primary-500/40"
-                onClick={() => setEditing(true)} disabled={pending}
-              >
-                Edit
-              </Button>
-              <Button
-                type="button" variant="ghost" title="Delete section" aria-label="Delete section"
-                className="rounded-md p-1 text-warm-400 transition-colors hover:bg-red-50 hover:text-red-600 focus-visible:ring-red-500/40 disabled:opacity-50"
-                onClick={() => setConfirmDelete(true)} disabled={pending}
-              >
-                <IconTrash size={15} />
-              </Button>
-            </div>
-          </div>
-        )}
-
-        {section.instructions && <p className="text-xs text-warm-500">{section.instructions}</p>}
-
-        {/* Prescriptions */}
-        {section.prescriptions.length === 0 ? (
-          <p className="rounded-lg border border-dashed border-warm-200 px-3 py-3 text-center text-xs text-warm-400">
-            No exercises in this section yet.
-          </p>
-        ) : (
-          <ul className="space-y-1.5">
-            {section.prescriptions.map((p, pi) => (
-              <li
-                key={p.id}
-                draggable={!pending}
-                onDragStart={() => { dragId.current = p.id; }}
-                onDragOver={(e) => e.preventDefault()}
-                onDrop={() => onDropPrescription(p.id)}
-              >
-                <PrescriptionRow
-                  prescription={p}
-                  index={pi}
-                  count={section.prescriptions.length}
-                  orderedIds={section.prescriptions.map((x) => x.id)}
-                  exercises={exercises}
-                  pending={pending}
-                  run={run}
-                />
-              </li>
-            ))}
-          </ul>
-        )}
-
-        <Button variant="ghost" size="sm" leftIcon={<IconPlus size={14} />} onClick={() => setAddOpen(true)} disabled={pending}>
-          Add exercise
-        </Button>
-      </CardContent>
-
-      {addOpen && (
-        <PrescriptionDialog
-          mode="add"
-          sectionId={section.id}
-          nextOrder={section.prescriptions.length}
-          exercises={exercises}
-          pending={pending}
-          onClose={() => setAddOpen(false)}
-          run={run}
-        />
-      )}
-
-      <ConfirmDialog
-        open={confirmDelete}
-        onCancel={() => setConfirmDelete(false)}
-        onConfirm={() => { run(() => deleteLiftSection({ id: section.id })); setConfirmDelete(false); }}
-        title="Delete section?"
-        message={`This removes "${section.name}" and its ${section.prescriptions.length} exercise${section.prescriptions.length === 1 ? '' : 's'}.`}
-        confirmLabel="Delete section"
-        variant="danger"
-      />
-    </Card>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// Prescription row (read view + reorder + edit/delete)
-// -----------------------------------------------------------------------------
-
-function prescriptionSummary(p: LiftPrescriptionNode): string {
-  const parts: string[] = [];
-  if (p.sets != null && p.reps != null) parts.push(`${p.sets}×${p.reps}`);
-  else if (p.sets != null) parts.push(`${p.sets} sets`);
-  else if (p.reps != null) parts.push(`${p.reps} reps`);
-  switch (p.prescription_type) {
-    case 'percent_1rm': if (p.percent_1rm != null) parts.push(`${p.percent_1rm}% 1RM`); break;
-    case 'rpe': if (p.target_rpe != null) parts.push(`RPE ${p.target_rpe}`); break;
-    case 'velocity':
-      if (p.target_velocity_min != null || p.target_velocity_max != null)
-        parts.push(`${p.target_velocity_min ?? '?'}–${p.target_velocity_max ?? '?'} m/s`);
-      break;
-    case 'fixed': if (p.load_value != null) parts.push(`${p.load_value}${p.load_unit ?? 'lb'}`); break;
-    case 'coach_load': parts.push('coach load'); break;
-    case 'player_select': parts.push('player picks load'); break;
-  }
-  if (p.tempo) parts.push(`tempo ${p.tempo}`);
-  if (p.rest_seconds != null) parts.push(`${p.rest_seconds}s rest`);
-  return parts.join(' · ');
-}
-
-function PrescriptionRow({
-  prescription: p, index, count, orderedIds, exercises, pending, run,
-}: {
-  prescription: LiftPrescriptionNode;
-  index: number;
-  count: number;
-  orderedIds: string[];
-  exercises: AssignContext['exercises'];
-  pending: boolean;
-  run: RunFn;
-}) {
-  const [editOpen, setEditOpen] = useState(false);
-
-  function move(dir: -1 | 1) {
-    const j = index + dir;
-    if (j < 0 || j >= count) return;
-    run(() => reorderLiftPrescriptions({ orderedIds: swapped(orderedIds, index, j) }));
-  }
-
-  return (
-    <div className="flex items-center gap-2 rounded-lg border border-warm-100 glass-standard px-2 py-1.5">
-      <span className="cursor-grab" title="Drag to reorder"><GripDots /></span>
-      <div className="min-w-0 flex-1">
-        <div className="flex items-center gap-1.5">
-          <span className="truncate text-sm font-medium text-warm-800">
-            {p.exercise_name ?? 'Unassigned exercise'}
-          </span>
-        </div>
-        <div className="truncate text-xs text-warm-500">{prescriptionSummary(p) || '—'}</div>
-        {p.coaching_note && <div className="truncate text-eyebrow text-warm-400">"{p.coaching_note}"</div>}
-      </div>
-      <div className="flex shrink-0 items-center gap-0.5">
-        <Button type="button" variant="ghost" title="Move up" aria-label="Move exercise up"
-          className="rounded-md p-1 text-warm-400 transition-colors hover:bg-warm-50 focus-visible:ring-primary-500/40 disabled:opacity-30"
-          onClick={() => move(-1)} disabled={pending || index === 0}>
-          <IconChevronUp size={14} />
-        </Button>
-        <Button type="button" variant="ghost" title="Move down" aria-label="Move exercise down"
-          className="rounded-md p-1 text-warm-400 transition-colors hover:bg-warm-50 focus-visible:ring-primary-500/40 disabled:opacity-30"
-          onClick={() => move(1)} disabled={pending || index === count - 1}>
-          <IconChevronDown size={14} />
-        </Button>
-        <Button type="button" variant="ghost" aria-label="Edit exercise" className="rounded-md px-2 py-1 text-xs font-medium text-warm-500 transition-colors hover:bg-warm-50 hover:text-warm-700 focus-visible:ring-primary-500/40"
-          onClick={() => setEditOpen(true)} disabled={pending}>
-          Edit
-        </Button>
-        <Button type="button" variant="ghost" title="Delete exercise" aria-label="Delete exercise"
-          className="rounded-md p-1 text-warm-400 transition-colors hover:bg-red-50 hover:text-red-600 focus-visible:ring-red-500/40 disabled:opacity-50"
-          onClick={() => run(() => deleteLiftPrescription({ id: p.id }))} disabled={pending}>
-          <IconTrash size={14} />
-        </Button>
-      </div>
-
-      {editOpen && (
-        <PrescriptionDialog
-          mode="edit"
-          prescription={p}
-          exercises={exercises}
-          pending={pending}
-          onClose={() => setEditOpen(false)}
-          run={run}
-        />
-      )}
-    </div>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// Prescription add/edit dialog
-// -----------------------------------------------------------------------------
-
-interface PrescriptionDialogBase {
-  exercises: AssignContext['exercises'];
-  pending: boolean;
-  onClose: () => void;
-  run: RunFn;
-}
-type PrescriptionDialogProps =
-  | (PrescriptionDialogBase & { mode: 'add'; sectionId: string; nextOrder: number })
-  | (PrescriptionDialogBase & { mode: 'edit'; prescription: LiftPrescriptionNode });
-
-function PrescriptionDialog(props: PrescriptionDialogProps) {
-  const { exercises, pending, onClose, run } = props;
-  const existing = props.mode === 'edit' ? props.prescription : null;
-
-  const [exerciseId, setExerciseId] = useState<string>(existing?.exercise_id ?? '');
-  const [type, setType] = useState<BaseballLiftPrescriptionType>(existing?.prescription_type ?? 'fixed');
-  const [sets, setSets] = useState(existing?.sets != null ? String(existing.sets) : '');
-  const [reps, setReps] = useState(existing?.reps != null ? String(existing.reps) : '');
-  const [loadValue, setLoadValue] = useState(existing?.load_value != null ? String(existing.load_value) : '');
-  const [loadUnit, setLoadUnit] = useState(existing?.load_unit ?? 'lb');
-  const [percent, setPercent] = useState(existing?.percent_1rm != null ? String(existing.percent_1rm) : '');
-  const [rpe, setRpe] = useState(existing?.target_rpe != null ? String(existing.target_rpe) : '');
-  const [velMin, setVelMin] = useState(existing?.target_velocity_min != null ? String(existing.target_velocity_min) : '');
-  const [velMax, setVelMax] = useState(existing?.target_velocity_max != null ? String(existing.target_velocity_max) : '');
-  const [rest, setRest] = useState(existing?.rest_seconds != null ? String(existing.rest_seconds) : '');
-  const [tempo, setTempo] = useState(existing?.tempo ?? '');
-  const [note, setNote] = useState(existing?.coaching_note ?? '');
-
-  const exerciseOptions = useMemo(
-    () => [
-      { value: '', label: 'Unassigned (placeholder)' },
-      ...exercises.map((e) => ({ value: e.id, label: e.name })),
-    ],
-    [exercises],
-  );
-
-  const numOrNull = (v: string) => (v.trim() === '' ? null : Number(v));
-
-  function submit() {
-    const common = {
-      exerciseId: exerciseId || null,
-      prescriptionType: type,
-      sets: numOrNull(sets) as number | null,
-      reps: numOrNull(reps) as number | null,
-      loadValue: type === 'fixed' ? (numOrNull(loadValue) as number | null) : null,
-      loadUnit: loadUnit || null,
-      percent1rm: type === 'percent_1rm' ? (numOrNull(percent) as number | null) : null,
-      targetRpe: type === 'rpe' ? (numOrNull(rpe) as number | null) : null,
-      targetVelocityMin: type === 'velocity' ? (numOrNull(velMin) as number | null) : null,
-      targetVelocityMax: type === 'velocity' ? (numOrNull(velMax) as number | null) : null,
-      restSeconds: numOrNull(rest) as number | null,
-      tempo: tempo.trim() || null,
-      coachingNote: note.trim() || null,
-    };
-    if (props.mode === 'add') {
-      run(
-        () => addLiftPrescription({ sectionId: props.sectionId, orderIndex: props.nextOrder, ...common }),
-        () => onClose(),
-      );
-    } else {
-      run(
-        () => updateLiftPrescription({ prescriptionId: props.prescription.id, ...common }),
-        () => onClose(),
-      );
-    }
-  }
-
-  return (
-    <Modal isOpen onClose={onClose} title={props.mode === 'add' ? 'Add exercise' : 'Edit exercise'}>
-      <div className="space-y-4">
-        <Select label="Exercise" options={exerciseOptions} value={exerciseId} onChange={setExerciseId} searchable />
-        <Select
-          label="How is load prescribed?"
-          options={PRESCRIPTION_TYPE_OPTIONS}
-          value={type}
-          onChange={(v) => setType(v as BaseballLiftPrescriptionType)}
-        />
-
-        <div className="grid grid-cols-2 gap-3">
-          <Input label="Sets" type="number" inputMode="numeric" value={sets} onChange={(e) => setSets(e.target.value)} />
-          <Input label="Reps" type="number" inputMode="numeric" value={reps} onChange={(e) => setReps(e.target.value)} />
-        </div>
-
-        {/* Load fields are conditional on prescription_type (no contradictory inputs). */}
-        {type === 'fixed' && (
-          <div className="grid grid-cols-2 gap-3">
-            <Input label="Load" type="number" inputMode="decimal" value={loadValue} onChange={(e) => setLoadValue(e.target.value)} />
-            <Input label="Unit" value={loadUnit} onChange={(e) => setLoadUnit(e.target.value)} placeholder="lb" />
-          </div>
-        )}
-        {type === 'percent_1rm' && (
-          <Input label="% of 1RM" type="number" inputMode="decimal" value={percent} onChange={(e) => setPercent(e.target.value)} hint="Materialized against the athlete's training max at publish time." />
-        )}
-        {type === 'rpe' && (
-          <Input label="Target RPE (0–10)" type="number" inputMode="decimal" value={rpe} onChange={(e) => setRpe(e.target.value)} />
-        )}
-        {type === 'velocity' && (
-          <div className="grid grid-cols-2 gap-3">
-            <Input label="Velocity min (m/s)" type="number" inputMode="decimal" value={velMin} onChange={(e) => setVelMin(e.target.value)} />
-            <Input label="Velocity max (m/s)" type="number" inputMode="decimal" value={velMax} onChange={(e) => setVelMax(e.target.value)} />
-          </div>
-        )}
-
-        <div className="grid grid-cols-2 gap-3">
-          <Input label="Rest (seconds)" type="number" inputMode="numeric" value={rest} onChange={(e) => setRest(e.target.value)} />
-          <Input label="Tempo" value={tempo} onChange={(e) => setTempo(e.target.value)} placeholder="e.g. 31X1" />
-        </div>
-        <Textarea label="Coaching cue (optional)" value={note} onChange={(e) => setNote(e.target.value)} rows={2} placeholder="Brace, drive through the floor…" />
-
-        <div className="flex justify-end gap-2">
-          <Button variant="ghost" onClick={onClose} disabled={pending}>Cancel</Button>
-          <Button variant="primary" isLoading={pending} onClick={submit}>
-            {props.mode === 'add' ? 'Add to section' : 'Save'}
-          </Button>
-        </div>
-      </div>
-    </Modal>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// Assign + publish dialog (materializes sessions onto the weight-room board)
-// -----------------------------------------------------------------------------
-
-function AssignPublishDialog({
-  day, programId, programName, assign, pending, onClose, run,
-}: {
-  day: LiftDayNode;
-  programId: string;
-  programName: string;
-  assign: AssignContext;
-  pending: boolean;
-  onClose: () => void;
-  run: RunFn;
-}) {
-  const [target, setTarget] = useState<BaseballLiftAssignmentTargetType>(
-    assign.groups.length > 0 ? 'group' : 'team',
-  );
-  const [groupId, setGroupId] = useState<string>(assign.groups[0]?.id ?? '');
-  const [playerId, setPlayerId] = useState<string>(assign.roster[0]?.id ?? '');
-  const [date, setDate] = useState<string>(new Date().toISOString().slice(0, 10));
-  const [calendar, setCalendar] = useState(true);
-
-  // Resolve the player ids the publish will materialize for (preview before save).
-  const resolvedPlayerIds = useMemo<string[]>(() => {
-    if (target === 'team') return assign.roster.map((p) => p.id);
-    if (target === 'group') return assign.groups.find((g) => g.id === groupId)?.member_ids ?? [];
-    return playerId ? [playerId] : [];
-  }, [target, groupId, playerId, assign]);
-
-  const title = `${programName} — ${day.name ?? `Day ${day.day_number}`}`;
-  const canPublish = resolvedPlayerIds.length > 0;
-
-  function publish() {
-    run(
-      () =>
-        publishLiftDay({
-          programId,
-          liftDayId: day.id,
-          scheduledDate: date,
-          playerIds: resolvedPlayerIds,
-          assignmentType: target,
-          groupId: target === 'group' ? groupId : null,
-          createCalendarEvent: calendar,
-          title,
-        }),
-      () => onClose(),
-    );
-  }
-
-  return (
-    <Modal isOpen onClose={onClose} title="Assign & publish lift">
-      <div className="space-y-4">
-        <p className="text-sm text-warm-500">
-          Publishing materializes one session per athlete with a frozen snapshot of today&apos;s prescriptions, and puts them on the weight-room board for the selected date.
-        </p>
-
-        <Select
-          label="Assign to"
-          options={[
-            { value: 'team', label: 'Whole team' },
-            { value: 'group', label: 'Strength group', disabled: assign.groups.length === 0 },
-            { value: 'player', label: 'Individual athlete' },
-          ]}
-          value={target}
-          onChange={(v) => setTarget(v as BaseballLiftAssignmentTargetType)}
-        />
-
-        {target === 'group' && (
-          assign.groups.length === 0 ? (
-            <p className="rounded-lg border border-amber-200 bg-amber-50 px-3 py-2 text-xs text-amber-700">
-              No strength groups exist yet. Create one from Performance → Groups.
-            </p>
-          ) : (
-            <Select
-              label="Group"
-              options={assign.groups.map((g) => ({ value: g.id, label: `${g.name} (${g.member_ids.length})` }))}
-              value={groupId}
-              onChange={setGroupId}
-            />
-          )
-        )}
-        {target === 'player' && (
-          <Select
-            label="Athlete"
-            options={assign.roster.map((p) => ({ value: p.id, label: `${p.first_name ?? ''} ${p.last_name ?? ''}`.trim() || 'Player' }))}
-            value={playerId}
-            onChange={setPlayerId}
-            searchable
-          />
-        )}
-
-        <Input label="Scheduled date" type="date" value={date} onChange={(e) => setDate(e.target.value)} />
-
-        <Checkbox
-          checked={calendar}
-          onChange={(e) => setCalendar(e.target.checked)}
-          label="Add a Lift event to the team calendar"
-        />
-
-        <div className="rounded-lg border border-warm-100 bg-cream-100/50 px-3 py-2 text-xs text-warm-600">
-          {resolvedPlayerIds.length === 0
-            ? 'No athletes resolved for this target — nothing would be published.'
-            : `Will publish to ${resolvedPlayerIds.length} athlete${resolvedPlayerIds.length === 1 ? '' : 's'}.`}
-        </div>
-
-        <div className="flex justify-end gap-2">
-          <Button variant="ghost" onClick={onClose} disabled={pending}>Cancel</Button>
-          <Button variant="primary" isLoading={pending} onClick={publish} disabled={!canPublish}>
-            Publish lift
-          </Button>
-        </div>
-      </div>
-    </Modal>
-  );
-}
diff --git a/src/components/baseball/performance/ProgramListClient.tsx b/src/components/baseball/performance/ProgramListClient.tsx
deleted file mode 100644
index 8cbe76b5d..000000000
--- a/src/components/baseball/performance/ProgramListClient.tsx
+++ /dev/null
@@ -1,323 +0,0 @@
-'use client';
-
-// =============================================================================
-// src/components/baseball/performance/ProgramListClient.tsx
-//
-// V11 Program list (spec L25 + Packet E). Hand-composed for the strength coach's
-// primary task here: SCAN existing programs and START a new one. Not a generic
-// grid — programs are grouped by lifecycle (Active first, then Drafts, then
-// Templates, then Archived) so the coach's eye lands on what's live, and a single
-// prominent "New program" primary action sits in the header.
-//
-// Cream/green GolfHelm palette only — Card / Button / EmptyState verbatim; status
-// uses color PLUS label (spec L568). createLiftProgram is the orphaned action this
-// finally wires; on success we route into the editor.
-// =============================================================================
-
-import { useMemo, useState, useTransition } from 'react';
-import { useRouter } from 'next/navigation';
-import Link from 'next/link';
-import { motion, useReducedMotion } from 'framer-motion';
-
-import { Card, CardContent } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Select } from '@/components/ui/select';
-import { Textarea } from '@/components/ui/textarea';
-import { Modal } from '@/components/ui/modal';
-import { EmptyState } from '@/components/ui/empty-state';
-import { Skeleton } from '@/components/ui/skeleton';
-import { IconPlus, IconDumbbell } from '@/components/icons';
-import { createLiftProgram } from '@/app/baseball/actions/lifting-v11';
-import type { LiftProgramListItem } from '@/lib/baseball/read-models/lift-programs';
-import type {
-  BaseballLiftProgramPhase,
-  BaseballLiftProgramGoal,
-  BaseballLiftProgramStatus,
-} from '@/lib/types/baseball-lifting-v11';
-
-const PHASE_OPTIONS: Array<{ value: BaseballLiftProgramPhase; label: string }> = [
-  { value: 'fall', label: 'Fall' },
-  { value: 'winter', label: 'Winter' },
-  { value: 'preseason', label: 'Preseason' },
-  { value: 'in_season', label: 'In-season' },
-  { value: 'postseason', label: 'Postseason' },
-  { value: 'summer', label: 'Summer' },
-  { value: 'return_to_play', label: 'Return to play' },
-  { value: 'testing', label: 'Testing' },
-];
-const GOAL_OPTIONS: Array<{ value: BaseballLiftProgramGoal; label: string }> = [
-  { value: 'strength', label: 'Strength' },
-  { value: 'power', label: 'Power' },
-  { value: 'hypertrophy', label: 'Hypertrophy' },
-  { value: 'speed', label: 'Speed' },
-  { value: 'maintenance', label: 'Maintenance' },
-  { value: 'recovery', label: 'Recovery' },
-  { value: 'arm_care', label: 'Arm care' },
-  { value: 'testing', label: 'Testing' },
-];
-
-const PHASE_LABEL = Object.fromEntries(PHASE_OPTIONS.map((o) => [o.value, o.label]));
-const GOAL_LABEL = Object.fromEntries(GOAL_OPTIONS.map((o) => [o.value, o.label]));
-
-const STATUS_META: Record<BaseballLiftProgramStatus, { label: string; cls: string }> = {
-  active: { label: 'Active', cls: 'bg-primary-50 text-primary-700 border-primary-200' },
-  draft: { label: 'Draft', cls: 'bg-warm-50 text-warm-700 border-warm-200' },
-  archived: { label: 'Archived', cls: 'bg-warm-100 text-warm-500 border-warm-200' },
-};
-
-function StatusChip({ status, template }: { status: BaseballLiftProgramStatus; template: boolean }) {
-  const meta = STATUS_META[status];
-  return (
-    <span className="inline-flex items-center gap-1">
-      <span className={`inline-flex items-center rounded-full border px-2 py-0.5 text-eyebrow font-medium ${meta.cls}`}>
-        {meta.label}
-      </span>
-      {template && (
-        <span className="inline-flex items-center rounded-full border border-amber-200 bg-amber-50 px-2 py-0.5 text-eyebrow font-medium text-amber-700">
-          Template
-        </span>
-      )}
-    </span>
-  );
-}
-
-function ProgramCard({ program }: { program: LiftProgramListItem }) {
-  return (
-    <Link
-      href={`/baseball/dashboard/performance/programs/${program.id}`}
-      className="group block rounded-2xl border border-warm-100 glass-standard p-4 transition-all duration-200 hover:-translate-y-0.5 hover:border-primary-200 hover:bg-cream-50 hover:shadow-card-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/50 focus-visible:ring-offset-2 focus-visible:ring-offset-cream-50 motion-reduce:hover:translate-y-0"
-    >
-      <div className="flex items-start justify-between gap-2">
-        <h3 className="text-base font-semibold text-warm-900 group-hover:text-primary-700">
-          {program.name}
-        </h3>
-        <StatusChip status={program.status} template={program.is_template} />
-      </div>
-      {program.description && (
-        <p className="mt-1 line-clamp-2 text-sm text-warm-500">{program.description}</p>
-      )}
-      <div className="mt-3 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-warm-500">
-        <span className="font-medium text-warm-700">{PHASE_LABEL[program.phase] ?? program.phase}</span>
-        <span aria-hidden>·</span>
-        <span>{GOAL_LABEL[program.goal] ?? program.goal}</span>
-        <span aria-hidden>·</span>
-        <span className="tabular-nums">{program.week_count} {program.week_count === 1 ? 'week' : 'weeks'}</span>
-        <span aria-hidden>·</span>
-        <span className="tabular-nums">{program.day_count} {program.day_count === 1 ? 'day' : 'days'}</span>
-      </div>
-    </Link>
-  );
-}
-
-function Group({ title, items }: { title: string; items: LiftProgramListItem[] }) {
-  if (items.length === 0) return null;
-  return (
-    <section>
-      <h2 className="mb-2 text-xs font-semibold uppercase tracking-wide text-warm-400">
-        {title} <span className="tabular-nums text-warm-300">({items.length})</span>
-      </h2>
-      <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
-        {items.map((p) => <ProgramCard key={p.id} program={p} />)}
-      </div>
-    </section>
-  );
-}
-
-interface Props {
-  programs: LiftProgramListItem[];
-  isLoading?: boolean;
-}
-
-export function ProgramListClient({ programs, isLoading = false }: Props) {
-  const router = useRouter();
-  const [open, setOpen] = useState(false);
-  const [name, setName] = useState('');
-  const [description, setDescription] = useState('');
-  const [phase, setPhase] = useState<BaseballLiftProgramPhase>('in_season');
-  const [goal, setGoal] = useState<BaseballLiftProgramGoal>('strength');
-  const [error, setError] = useState<string | null>(null);
-  const [pending, startTransition] = useTransition();
-  const prefersReducedMotion = useReducedMotion();
-
-  const grouped = useMemo(() => {
-    const active = programs.filter((p) => p.status === 'active' && !p.is_template);
-    const drafts = programs.filter((p) => p.status === 'draft' && !p.is_template);
-    const templates = programs.filter((p) => p.is_template);
-    const archived = programs.filter((p) => p.status === 'archived' && !p.is_template);
-    return { active, drafts, templates, archived };
-  }, [programs]);
-
-  if (isLoading) {
-    return (
-      <div className="space-y-6" aria-busy="true" aria-label="Loading programs…">
-        {/* Header row skeleton */}
-        <div className="flex items-center justify-between">
-          <div className="space-y-1">
-            <Skeleton className="h-7 w-36" />
-            <Skeleton className="h-4 w-52" />
-          </div>
-          <Skeleton className="h-10 w-32 rounded-xl" />
-        </div>
-        {/* Active programs skeleton group */}
-        <div className="space-y-3">
-          <Skeleton className="h-4 w-16" />
-          {Array.from({ length: 2 }).map((_, i) => (
-            <div
-              key={i}
-              className="rounded-2xl border border-warm-100 glass-standard p-4 space-y-2"
-              style={{ animationDelay: `${i * 60}ms` }}
-            >
-              <div className="flex items-start justify-between">
-                <Skeleton className="h-5 w-48" />
-                <Skeleton className="h-5 w-16 rounded-full" />
-              </div>
-              <Skeleton className="h-4 w-64" />
-              <div className="flex gap-3 mt-1">
-                <Skeleton className="h-3 w-20" />
-                <Skeleton className="h-3 w-16" />
-                <Skeleton className="h-3 w-12" />
-              </div>
-            </div>
-          ))}
-        </div>
-        {/* Drafts skeleton group */}
-        <div className="space-y-3">
-          <Skeleton className="h-4 w-12" />
-          {Array.from({ length: 1 }).map((_, i) => (
-            <div
-              key={i}
-              className="rounded-2xl border border-warm-100 glass-standard p-4 space-y-2"
-              style={{ animationDelay: `${i * 60}ms` }}
-            >
-              <div className="flex items-start justify-between">
-                <Skeleton className="h-5 w-40" />
-                <Skeleton className="h-5 w-12 rounded-full" />
-              </div>
-              <div className="flex gap-3 mt-1">
-                <Skeleton className="h-3 w-16" />
-                <Skeleton className="h-3 w-20" />
-              </div>
-            </div>
-          ))}
-        </div>
-      </div>
-    );
-  }
-
-  function handleCreate() {
-    setError(null);
-    const trimmed = name.trim();
-    if (!trimmed) {
-      setError('Give the program a name.');
-      return;
-    }
-    startTransition(async () => {
-      try {
-        const res = await createLiftProgram({
-          name: trimmed,
-          description: description.trim() || null,
-          phase,
-          goal,
-        });
-        if (res.success && res.id) {
-          setOpen(false);
-          router.push(`/baseball/dashboard/performance/programs/${res.id}`);
-        } else {
-          setError(res.error ?? 'Could not create the program.');
-        }
-      } catch {
-        setError('Could not create the program. Please try again.');
-      }
-    });
-  }
-
-  return (
-    <motion.div
-      className="space-y-6"
-      initial={prefersReducedMotion ? false : { opacity: 0, y: 6 }}
-      animate={{ opacity: 1, y: 0 }}
-      transition={{ duration: 0.2 }}
-    >
-      <div className="flex flex-wrap items-end justify-between gap-3">
-        <div>
-          <nav aria-label="Breadcrumb" className="flex items-center gap-2 text-xs font-medium text-warm-400">
-            <Link href="/baseball/dashboard/performance" className="rounded transition-colors hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/40">
-              Performance
-            </Link>
-            <span aria-hidden>/</span>
-            <span className="text-warm-600" aria-current="page">Programs</span>
-          </nav>
-          <h1 className="mt-1 text-3xl font-semibold tracking-tight text-warm-900">Training programs</h1>
-          <p className="text-sm text-warm-500">
-            Build macrocycles, weeks, and lift days. Publish a day to materialize the weight-room board.
-          </p>
-        </div>
-        <Button variant="primary" leftIcon={<IconPlus size={16} />} onClick={() => setOpen(true)}>
-          New program
-        </Button>
-      </div>
-
-      {programs.length === 0 ? (
-        <Card>
-          <CardContent className="py-10">
-            <EmptyState
-              icon={<IconDumbbell size={40} />}
-              title="No programs yet"
-              description="Create your first training program, add weeks and lift days, then publish a day to put it on the weight-room board."
-              action={{ label: 'Create a program', onClick: () => setOpen(true) }}
-            />
-          </CardContent>
-        </Card>
-      ) : (
-        <div className="space-y-8">
-          <Group title="Active" items={grouped.active} />
-          <Group title="Drafts" items={grouped.drafts} />
-          <Group title="Templates" items={grouped.templates} />
-          <Group title="Archived" items={grouped.archived} />
-        </div>
-      )}
-
-      <Modal isOpen={open} onClose={() => setOpen(false)} title="New training program">
-        <div className="space-y-4">
-          <Input
-            label="Program name"
-            placeholder="e.g. Winter Strength Block"
-            value={name}
-            onChange={(e) => setName(e.target.value)}
-            error={error ?? undefined}
-          />
-          <Textarea
-            label="Description (optional)"
-            placeholder="Goal of this block, who it's for, key emphases…"
-            value={description}
-            onChange={(e) => setDescription(e.target.value)}
-            rows={3}
-          />
-          <div className="grid grid-cols-2 gap-3">
-            <Select
-              label="Phase"
-              options={PHASE_OPTIONS}
-              value={phase}
-              onChange={(v) => setPhase(v as BaseballLiftProgramPhase)}
-            />
-            <Select
-              label="Primary goal"
-              options={GOAL_OPTIONS}
-              value={goal}
-              onChange={(v) => setGoal(v as BaseballLiftProgramGoal)}
-            />
-          </div>
-          <div className="flex justify-end gap-2 pt-2">
-            <Button variant="ghost" onClick={() => setOpen(false)} disabled={pending}>
-              Cancel
-            </Button>
-            <Button variant="primary" onClick={handleCreate} isLoading={pending}>
-              Create &amp; open editor
-            </Button>
-          </div>
-        </div>
-      </Modal>
-    </motion.div>
-  );
-}
diff --git a/src/components/baseball/performance/StrengthGroupsClient.tsx b/src/components/baseball/performance/StrengthGroupsClient.tsx
deleted file mode 100644
index 2cd0c5560..000000000
--- a/src/components/baseball/performance/StrengthGroupsClient.tsx
+++ /dev/null
@@ -1,766 +0,0 @@
-'use client';
-
-// =============================================================================
-// src/components/baseball/performance/StrengthGroupsClient.tsx
-//
-// V11 Strength Groups builder (spec L151-198 + Packet C). Hand-composed for the
-// strength coach's ONE primary task here: segment the room. Three deliberate panes
-// (spec L191-197), not a generic grid:
-//
-//   LEFT   — group list with member counts + a status badge (static/dynamic/
-//            archived). The coach's index of the room; one prominent "New group".
-//   CENTER — the selected group's athlete table with a filter bar (position /
-//            class / availability) and quick add/remove per row (calls
-//            setGroupMembers). For a dynamic group it also shows the rule-matched
-//            set so manual pins vs rule members read clearly.
-//   RIGHT  — the rule builder + LIVE PREVIEW. Every edit re-evaluates SERVER-SIDE
-//            (previewDynamicGroup — one engine, no client re-implementation) and
-//            lists the EXACT included players before the coach saves. Save commits
-//            the rule (updateStrengthGroup) and recomputes membership
-//            (recomputeDynamicGroup), which writes the audit ledger (spec L198).
-//
-// Cream/green GolfHelm palette only; Card / Button / Input / Select / Modal /
-// Checkbox / EmptyState verbatim. Status uses color PLUS label. This wires the
-// previously-orphaned createStrengthGroup + setGroupMembers and the new dynamic
-// engine actions.
-// =============================================================================
-
-import { useCallback, useEffect, useMemo, useRef, useState, useTransition } from 'react';
-import Link from 'next/link';
-import { motion, useReducedMotion } from 'framer-motion';
-
-import { Card } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Select } from '@/components/ui/select';
-import { Textarea } from '@/components/ui/textarea';
-import { Modal } from '@/components/ui/modal';
-import { Checkbox } from '@/components/ui/checkbox';
-import { EmptyState } from '@/components/ui/empty-state';
-import { Skeleton } from '@/components/ui/skeleton';
-import {
-  IconPlus, IconUsers, IconUserPlus, IconUserX, IconFilter,
-  IconSparkles, IconTrash, IconCheck, IconBolt,
-} from '@/components/icons';
-import {
-  createStrengthGroup,
-  setGroupMembers,
-  updateStrengthGroup,
-  deleteStrengthGroup,
-  recomputeDynamicGroup,
-  previewDynamicGroup,
-  seedDefaultStrengthGroups,
-} from '@/app/baseball/actions/lifting-v11';
-import type { StrengthGroupListItem } from '@/lib/baseball/read-models/strength-groups';
-import type { PlayerRuleAttributes, RuleMatch } from '@/lib/baseball/lifting/strength-group-rules';
-import type {
-  BaseballStrengthGroupType,
-  BaseballStrengthGroupRules,
-  BaseballAvailabilityStatus,
-} from '@/lib/types/baseball-lifting-v11';
-
-// -----------------------------------------------------------------------------
-// Static option vocabularies
-// -----------------------------------------------------------------------------
-
-const TYPE_META: Record<BaseballStrengthGroupType, { label: string; cls: string }> = {
-  static: { label: 'Static', cls: 'bg-warm-50 text-warm-700 border-warm-200' },
-  dynamic: { label: 'Dynamic', cls: 'bg-primary-50 text-primary-700 border-primary-200' },
-  imported: { label: 'Imported', cls: 'bg-amber-50 text-amber-700 border-amber-200' },
-  temporary: { label: 'Temporary', cls: 'bg-warm-50 text-warm-700 border-warm-200' },
-};
-
-const POSITION_OPTIONS = ['P', 'C', '1B', '2B', '3B', 'SS', 'LF', 'CF', 'RF', 'DH', 'UTL'];
-const AVAILABILITY_OPTIONS: Array<{ value: BaseballAvailabilityStatus; label: string }> = [
-  { value: 'available', label: 'Available' },
-  { value: 'limited', label: 'Limited' },
-  { value: 'hold', label: 'Hold' },
-  { value: 'return_to_play', label: 'Return to play' },
-  { value: 'unavailable', label: 'Unavailable' },
-];
-
-function fullName(p: { first_name: string | null; last_name: string | null }): string {
-  return `${p.first_name ?? ''} ${p.last_name ?? ''}`.trim() || 'Unnamed';
-}
-
-// -----------------------------------------------------------------------------
-// Component
-// -----------------------------------------------------------------------------
-
-interface Props {
-  groups: StrengthGroupListItem[];
-  roster: PlayerRuleAttributes[];
-  defaultGroupsPresent: number;
-  isLoading?: boolean;
-}
-
-export function StrengthGroupsClient({ groups, roster, defaultGroupsPresent, isLoading = false }: Props) {
-  const activeGroups = useMemo(() => groups.filter((g) => g.is_active), [groups]);
-  const [selectedId, setSelectedId] = useState<string | null>(activeGroups[0]?.id ?? null);
-  const selected = useMemo(
-    () => activeGroups.find((g) => g.id === selectedId) ?? null,
-    [activeGroups, selectedId],
-  );
-  const prefersReducedMotion = useReducedMotion();
-
-  if (isLoading) {
-    return (
-      <div className="space-y-6" aria-busy="true" aria-label="Loading strength groups…">
-        {/* Header skeleton */}
-        <div className="flex items-center justify-between">
-          <div className="space-y-1">
-            <Skeleton className="h-6 w-40" />
-            <Skeleton className="h-4 w-56" />
-          </div>
-          <div className="flex gap-2">
-            <Skeleton className="h-9 w-28 rounded-xl" />
-            <Skeleton className="h-9 w-32 rounded-xl" />
-          </div>
-        </div>
-        {/* Three-pane layout skeleton */}
-        <div className="grid gap-5 lg:grid-cols-[16rem_1fr_18rem]">
-          {/* Left pane */}
-          <div className="rounded-2xl border border-warm-100 glass-standard p-3 space-y-2">
-            <Skeleton className="h-4 w-20 mb-3" />
-            {Array.from({ length: 4 }).map((_, i) => (
-              <div
-                key={i}
-                className="flex items-center gap-3 rounded-xl p-2.5"
-                style={{ animationDelay: `${i * 50}ms` }}
-              >
-                <Skeleton variant="circular" className="w-7 h-7 flex-shrink-0" />
-                <div className="flex-1 space-y-1">
-                  <Skeleton className="h-3.5 w-24" />
-                  <Skeleton className="h-3 w-16" />
-                </div>
-              </div>
-            ))}
-          </div>
-          {/* Center pane */}
-          <div className="rounded-2xl border border-warm-100 glass-standard p-4 space-y-3">
-            <Skeleton className="h-5 w-32" />
-            {Array.from({ length: 5 }).map((_, i) => (
-              <div key={i} className="flex items-center gap-3" style={{ animationDelay: `${i * 50}ms` }}>
-                <Skeleton variant="circular" className="w-8 h-8 flex-shrink-0" />
-                <div className="flex-1 space-y-1">
-                  <Skeleton className="h-4 w-36" />
-                  <Skeleton className="h-3 w-20" />
-                </div>
-                <Skeleton className="h-7 w-16 rounded-lg" />
-              </div>
-            ))}
-          </div>
-          {/* Right pane */}
-          <div className="rounded-2xl border border-warm-100 glass-standard p-4 space-y-3">
-            <Skeleton className="h-5 w-28" />
-            <Skeleton className="h-4 w-48" />
-            <div className="space-y-2">
-              {Array.from({ length: 3 }).map((_, i) => (
-                <div key={i} className="grid grid-cols-2 gap-2" style={{ animationDelay: `${i * 60}ms` }}>
-                  <Skeleton className="h-9 rounded-xl" />
-                  <Skeleton className="h-9 rounded-xl" />
-                </div>
-              ))}
-            </div>
-            <Skeleton className="h-9 w-full rounded-xl mt-2" />
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <motion.div
-      className="space-y-6"
-      initial={prefersReducedMotion ? false : { opacity: 0, y: 6 }}
-      animate={{ opacity: 1, y: 0 }}
-      transition={{ duration: 0.2 }}
-    >
-      <Header
-        groupCount={activeGroups.length}
-        defaultGroupsPresent={defaultGroupsPresent}
-        roster={roster}
-      />
-
-      {activeGroups.length === 0 ? (
-        <Card className="p-10">
-          <EmptyState
-            icon={<IconUsers size={40} />}
-            title="No groups yet"
-            description="Groups are how you organize the weight room — by position, role, readiness, or workload. Seed the 12 defaults or build your own."
-          />
-        </Card>
-      ) : (
-        <div className="grid gap-4 lg:grid-cols-[260px_minmax(0,1fr)_340px]">
-          <GroupListPane groups={activeGroups} selectedId={selectedId} onSelect={setSelectedId} />
-          {selected ? (
-            <>
-              <AthletePane key={`a-${selected.id}`} group={selected} roster={roster} />
-              <RulePane key={`r-${selected.id}`} group={selected} />
-            </>
-          ) : (
-            <Card className="p-8 lg:col-span-2">
-              <EmptyState
-                icon={<IconUsers size={36} />}
-                title="Select a group"
-                description="Pick a group on the left to manage its athletes and rule."
-              />
-            </Card>
-          )}
-        </div>
-      )}
-    </motion.div>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// Header — breadcrumb, title, seed CTA, new-group
-// -----------------------------------------------------------------------------
-
-function Header({
-  groupCount, defaultGroupsPresent, roster,
-}: { groupCount: number; defaultGroupsPresent: number; roster: PlayerRuleAttributes[] }) {
-  const [open, setOpen] = useState(false);
-  const [pending, startTransition] = useTransition();
-  const [seedErr, setSeedErr] = useState<string | null>(null);
-
-  function handleSeed() {
-    setSeedErr(null);
-    startTransition(async () => {
-      try {
-        const res = await seedDefaultStrengthGroups();
-        if (!res.success) setSeedErr(res.error ?? 'Could not seed default groups.');
-      } catch {
-        setSeedErr('Could not seed default groups. Please try again.');
-      }
-    });
-  }
-
-  return (
-    <div className="flex flex-wrap items-end justify-between gap-3">
-      <div>
-        <nav aria-label="Breadcrumb" className="flex items-center gap-2 text-xs font-medium text-warm-400">
-          <Link href="/baseball/dashboard/performance" className="rounded transition-colors hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/40">Performance</Link>
-          <span aria-hidden>/</span>
-          <span className="text-warm-600" aria-current="page">Groups</span>
-        </nav>
-        <h1 className="mt-1 text-3xl font-semibold tracking-tight text-warm-900">Strength groups</h1>
-        <p className="text-sm text-warm-500">
-          Segment the room by position, role, readiness, or workload — then publish lifts to a whole
-          group at once. {groupCount} active · {roster.length} athletes.
-        </p>
-        {seedErr && <p className="mt-1 text-sm text-red-600">{seedErr}</p>}
-      </div>
-      <div className="flex flex-wrap items-center gap-2">
-        {defaultGroupsPresent < 12 && (
-          <Button variant="outline" leftIcon={<IconSparkles size={16} />} onClick={handleSeed} isLoading={pending}>
-            Seed defaults ({12 - defaultGroupsPresent} left)
-          </Button>
-        )}
-        <Button variant="primary" leftIcon={<IconPlus size={16} />} onClick={() => setOpen(true)}>
-          New group
-        </Button>
-      </div>
-      <NewGroupModal open={open} onClose={() => setOpen(false)} />
-    </div>
-  );
-}
-
-function NewGroupModal({ open, onClose }: { open: boolean; onClose: () => void }) {
-  const [name, setName] = useState('');
-  const [description, setDescription] = useState('');
-  const [type, setType] = useState<BaseballStrengthGroupType>('static');
-  const [error, setError] = useState<string | null>(null);
-  const [pending, startTransition] = useTransition();
-
-  function reset() {
-    setName(''); setDescription(''); setType('static'); setError(null);
-  }
-  function handleCreate() {
-    setError(null);
-    const trimmed = name.trim();
-    if (!trimmed) { setError('Give the group a name.'); return; }
-    startTransition(async () => {
-      try {
-        const res = await createStrengthGroup({ name: trimmed, description: description.trim() || null, groupType: type, ruleJson: {} });
-        if (res.success) { reset(); onClose(); }
-        else setError(res.error ?? 'Could not create the group.');
-      } catch {
-        setError('Could not create the group. Please try again.');
-      }
-    });
-  }
-
-  return (
-    <Modal isOpen={open} onClose={onClose} title="New strength group">
-      <div className="space-y-4">
-        <Input label="Group name" placeholder="e.g. High Workload Watch" value={name} onChange={(e) => setName(e.target.value)} error={error ?? undefined} />
-        <Textarea label="Description (optional)" placeholder="Who is this group for, and why?" value={description} onChange={(e) => setDescription(e.target.value)} rows={2} />
-        <Select
-          label="Membership type"
-          options={[
-            { value: 'static', label: 'Static — you pick the athletes' },
-            { value: 'dynamic', label: 'Dynamic — membership follows a rule' },
-            { value: 'temporary', label: 'Temporary — for a week or event' },
-          ]}
-          value={type}
-          onChange={(v) => setType(v as BaseballStrengthGroupType)}
-        />
-        <p className="text-xs text-warm-400">
-          Dynamic groups stay in sync with your roster — set the rule after creating, then recompute.
-        </p>
-        <div className="flex justify-end gap-2 pt-2">
-          <Button variant="ghost" onClick={onClose} disabled={pending}>Cancel</Button>
-          <Button variant="primary" onClick={handleCreate} isLoading={pending}>Create group</Button>
-        </div>
-      </div>
-    </Modal>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// LEFT — group list with counts + status badge
-// -----------------------------------------------------------------------------
-
-function GroupListPane({
-  groups, selectedId, onSelect,
-}: { groups: StrengthGroupListItem[]; selectedId: string | null; onSelect: (id: string) => void }) {
-  return (
-    <Card className="h-fit overflow-hidden p-0">
-      <div className="border-b border-warm-100 px-3 py-2 text-xs font-semibold uppercase tracking-wide text-warm-400">
-        Groups <span className="tabular-nums text-warm-300">({groups.length})</span>
-      </div>
-      <ul className="divide-y divide-warm-50">
-        {groups.map((g) => {
-          const meta = TYPE_META[g.group_type];
-          const active = g.id === selectedId;
-          return (
-            <li key={g.id}>
-              <Button
-                type="button"
-                variant="ghost"
-                onClick={() => onSelect(g.id)}
-                className={`flex w-full items-center justify-between gap-2 px-3 py-2.5 text-left transition-colors focus-visible:ring-inset ${
-                  active ? 'bg-primary-50/60' : 'hover:bg-warm-50'
-                }`}
-                aria-current={active ? 'true' : undefined}
-              >
-                <div className="min-w-0">
-                  <div className={`truncate text-sm font-medium ${active ? 'text-primary-800' : 'text-warm-900'}`}>
-                    {g.name}
-                  </div>
-                  <span className={`mt-0.5 inline-flex items-center rounded-full border px-1.5 py-0.5 text-micro font-medium ${meta.cls}`}>
-                    {meta.label}
-                  </span>
-                </div>
-                <span className="shrink-0 rounded-full bg-warm-100 px-2 py-0.5 text-xs font-semibold tabular-nums text-warm-700">
-                  {g.member_count}
-                </span>
-              </Button>
-            </li>
-          );
-        })}
-      </ul>
-    </Card>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// CENTER — athlete table with filters + quick add/remove
-// -----------------------------------------------------------------------------
-
-function AthletePane({ group, roster }: { group: StrengthGroupListItem; roster: PlayerRuleAttributes[] }) {
-  // Optimistic membership set, seeded from the server snapshot.
-  const [memberIds, setMemberIds] = useState<Set<string>>(() => new Set(group.member_ids));
-  const [posFilter, setPosFilter] = useState('');
-  const [availFilter, setAvailFilter] = useState('');
-  const [search, setSearch] = useState('');
-  const [pending, startTransition] = useTransition();
-  const [error, setError] = useState<string | null>(null);
-  // Debounce the persist so rapid toggles coalesce into one write.
-  const persistTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  // Reset when the selected group changes (keyed remount also covers this).
-  useEffect(() => { setMemberIds(new Set(group.member_ids)); }, [group.id, group.member_ids]);
-
-  const persist = useCallback((next: Set<string>) => {
-    if (persistTimer.current) clearTimeout(persistTimer.current);
-    persistTimer.current = setTimeout(() => {
-      startTransition(async () => {
-        try {
-          const res = await setGroupMembers({ groupId: group.id, playerIds: Array.from(next), source: 'manual' });
-          if (!res.success) setError(res.error ?? 'Could not save membership.');
-          else setError(null);
-        } catch {
-          setError('Could not save membership. Please try again.');
-        }
-      });
-    }, 500);
-  }, [group.id]);
-
-  function toggle(pid: string) {
-    setMemberIds((prev) => {
-      const next = new Set(prev);
-      if (next.has(pid)) next.delete(pid); else next.add(pid);
-      persist(next);
-      return next;
-    });
-  }
-
-  const filtered = useMemo(() => {
-    const q = search.trim().toLowerCase();
-    return roster.filter((p) => {
-      if (posFilter && p.primary_position !== posFilter && p.secondary_position !== posFilter) return false;
-      if (availFilter && p.availability_status !== availFilter) return false;
-      if (q && !fullName(p).toLowerCase().includes(q)) return false;
-      return true;
-    });
-  }, [roster, posFilter, availFilter, search]);
-
-  return (
-    <Card className="overflow-hidden p-0">
-      <div className="flex flex-wrap items-center justify-between gap-2 border-b border-warm-100 px-4 py-3">
-        <div>
-          <h2 className="text-base font-semibold text-warm-900">{group.name}</h2>
-          <p className="text-xs text-warm-500" aria-live="polite">
-            <span className="tabular-nums">{memberIds.size}</span> in group · <span className="tabular-nums">{roster.length}</span> on roster
-            {pending && <span className="ml-2 text-primary-600">Saving…</span>}
-            {error && <span className="ml-2 text-red-600">{error}</span>}
-          </p>
-        </div>
-      </div>
-
-      {/* Filter bar (spec L194) */}
-      <div className="flex flex-wrap items-center gap-2 border-b border-warm-50 bg-cream-100/40 px-4 py-2">
-        <span className="inline-flex items-center gap-1 text-xs font-medium text-warm-400"><IconFilter size={14} /> Filter</span>
-        <Input className="h-8 w-40" placeholder="Search name…" value={search} onChange={(e) => setSearch(e.target.value)} />
-        <Select
-          className="w-32"
-          options={[{ value: '', label: 'Any position' }, ...POSITION_OPTIONS.map((p) => ({ value: p, label: p }))]}
-          value={posFilter}
-          onChange={setPosFilter}
-        />
-        <Select
-          className="w-40"
-          options={[{ value: '', label: 'Any availability' }, ...AVAILABILITY_OPTIONS]}
-          value={availFilter}
-          onChange={setAvailFilter}
-        />
-      </div>
-
-      {filtered.length === 0 ? (
-        <div className="px-4 py-10">
-          <EmptyState icon={<IconUsers size={32} />} title="No athletes match" description="Adjust the filters above to find athletes to add." />
-        </div>
-      ) : (
-        <div className="max-h-[28rem] overflow-y-auto">
-          <table className="w-full text-sm">
-            <thead className="sticky top-0 glass-standard backdrop-blur">
-              <tr className="border-b border-warm-100 text-left text-xs font-medium text-warm-400">
-                <th className="px-4 py-2">Athlete</th>
-                <th className="px-2 py-2">Pos</th>
-                <th className="px-2 py-2">Avail.</th>
-                <th className="px-2 py-2 text-right">BW</th>
-                <th className="px-4 py-2 text-right">In group</th>
-              </tr>
-            </thead>
-            <tbody>
-              {filtered.map((p) => {
-                const inGroup = memberIds.has(p.player_id);
-                return (
-                  <tr key={p.player_id} className={`border-b border-warm-50 ${inGroup ? 'bg-primary-50/30' : ''}`}>
-                    <td className="px-4 py-2 font-medium text-warm-900">{fullName(p)}</td>
-                    <td className="px-2 py-2 text-warm-600">{p.primary_position ?? '—'}</td>
-                    <td className="px-2 py-2 text-warm-600">{p.availability_status ?? '—'}</td>
-                    <td className="px-2 py-2 text-right tabular-nums text-warm-600">{p.bodyweight_lbs ?? '—'}</td>
-                    <td className="px-4 py-2 text-right">
-                      <Button
-                        variant={inGroup ? 'secondary' : 'outline'}
-                        size="sm"
-                        leftIcon={inGroup ? <IconUserX size={14} /> : <IconUserPlus size={14} />}
-                        onClick={() => toggle(p.player_id)}
-                      >
-                        {inGroup ? 'Remove' : 'Add'}
-                      </Button>
-                    </td>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </table>
-        </div>
-      )}
-    </Card>
-  );
-}
-
-// -----------------------------------------------------------------------------
-// RIGHT — rule builder + live preview
-// -----------------------------------------------------------------------------
-
-function emptyRule(): BaseballStrengthGroupRules {
-  return { match: 'all', lookback_days: 14 };
-}
-
-function RulePane({ group }: { group: StrengthGroupListItem }) {
-  const initial = useMemo<BaseballStrengthGroupRules>(
-    () => ({ ...emptyRule(), ...((group.rule_json as BaseballStrengthGroupRules) ?? {}) }),
-    [group.rule_json],
-  );
-  const [rule, setRule] = useState<BaseballStrengthGroupRules>(initial);
-  const [preview, setPreview] = useState<{ matches: RuleMatch[]; empty: boolean } | null>(null);
-  const [previewing, startPreview] = useTransition();
-  const [saving, startSave] = useTransition();
-  // Message carries a tone so a failure reads red and a success reads green —
-  // the old single string rendered every message (including errors) in green.
-  const [msg, setMsg] = useState<{ text: string; tone: 'success' | 'error' } | null>(null);
-  const ok = (text: string) => setMsg({ text, tone: 'success' });
-  const fail = (text: string) => setMsg({ text, tone: 'error' });
-  const [confirmDelete, setConfirmDelete] = useState(false);
-
-  const isDynamic = group.group_type === 'dynamic';
-
-  // Live preview: re-evaluate server-side (debounced) on every rule change.
-  useEffect(() => {
-    if (!isDynamic) return undefined;
-    const t = setTimeout(() => {
-      startPreview(async () => {
-        try {
-          const res = await previewDynamicGroup({ ruleJson: rule as Record<string, unknown>, lookbackDays: rule.lookback_days });
-          if (res.success) setPreview({ matches: res.matches ?? [], empty: Boolean(res.empty_rule) });
-        } catch { /* preview is best-effort; keep last result */ }
-      });
-    }, 400);
-    return () => clearTimeout(t);
-  }, [rule, isDynamic]);
-
-  function patch(p: Partial<BaseballStrengthGroupRules>) {
-    setRule((prev) => ({ ...prev, ...p }));
-  }
-  function toggleArray<K extends 'positions' | 'availability_statuses'>(key: K, value: string) {
-    setRule((prev) => {
-      const cur = (prev[key] as string[] | undefined) ?? [];
-      const next = cur.includes(value) ? cur.filter((v) => v !== value) : [...cur, value];
-      return { ...prev, [key]: next.length ? next : undefined };
-    });
-  }
-
-  function handleSave() {
-    setMsg(null);
-    startSave(async () => {
-      try {
-        const upd = await updateStrengthGroup({ groupId: group.id, ruleJson: rule as Record<string, unknown> });
-        if (!upd.success) { fail(upd.error ?? 'Could not save the rule.'); return; }
-        const rec = await recomputeDynamicGroup({ groupId: group.id });
-        if (!rec.success) { fail(rec.error ?? 'Saved rule, but recompute failed.'); return; }
-        ok(`Saved · ${rec.count ?? 0} athletes now match.`);
-      } catch {
-        fail('Could not save the rule. Please try again.');
-      }
-    });
-  }
-
-  function handleDelete() {
-    startSave(async () => {
-      try {
-        const res = await deleteStrengthGroup({ groupId: group.id });
-        if (!res.success) fail(res.error ?? 'Could not archive the group.');
-      } catch { fail('Could not archive the group.'); }
-    });
-  }
-
-  function switchToDynamic() {
-    startSave(async () => {
-      try {
-        const res = await updateStrengthGroup({ groupId: group.id, groupType: 'dynamic', ruleJson: rule as Record<string, unknown> });
-        if (!res.success) fail(res.error ?? 'Could not switch to dynamic.');
-        else ok('Now a dynamic group — set a rule and save to populate.');
-      } catch { fail('Could not switch to dynamic.'); }
-    });
-  }
-
-  return (
-    <Card className="flex h-fit flex-col gap-4 p-4">
-      <div className="flex items-center justify-between">
-        <h2 className="flex items-center gap-1.5 text-base font-semibold text-warm-900">
-          <IconBolt size={16} className="text-primary-600" /> Rule builder
-        </h2>
-        <span className={`inline-flex items-center rounded-full border px-2 py-0.5 text-eyebrow font-medium ${TYPE_META[group.group_type].cls}`}>
-          {TYPE_META[group.group_type].label}
-        </span>
-      </div>
-
-      {!isDynamic ? (
-        <div className="space-y-3">
-          <p className="text-sm text-warm-500">
-            This is a <strong>{TYPE_META[group.group_type].label.toLowerCase()}</strong> group — membership is
-            managed by hand in the athlete table. Switch it to dynamic to drive membership from a rule.
-          </p>
-          <Button variant="outline" leftIcon={<IconSparkles size={16} />} onClick={switchToDynamic} isLoading={saving}>
-            Make this group dynamic
-          </Button>
-        </div>
-      ) : (
-        <>
-          {/* Match mode */}
-          <Select
-            label="Match"
-            options={[{ value: 'all', label: 'Match ALL of the rules' }, { value: 'any', label: 'Match ANY of the rules' }]}
-            value={rule.match ?? 'all'}
-            onChange={(v) => patch({ match: v as 'all' | 'any' })}
-          />
-
-          {/* Positions */}
-          <fieldset>
-            <legend className="mb-1 text-xs font-medium text-warm-500">Position</legend>
-            <div className="flex flex-wrap gap-1.5">
-              {POSITION_OPTIONS.map((pos) => {
-                const on = rule.positions?.includes(pos);
-                return (
-                  <Button
-                    key={pos}
-                    type="button"
-                    variant="ghost"
-                    onClick={() => toggleArray('positions', pos)}
-                    aria-pressed={Boolean(on)}
-                    className={`rounded-full border px-2.5 py-1 text-xs font-medium transition-colors ${
-                      on ? 'border-primary-300 bg-primary-100 text-primary-800' : 'border-warm-200 bg-cream-50 text-warm-600 hover:bg-warm-50'
-                    }`}
-                  >
-                    {pos}
-                  </Button>
-                );
-              })}
-            </div>
-          </fieldset>
-
-          {/* Availability */}
-          <fieldset>
-            <legend className="mb-1 text-xs font-medium text-warm-500">Availability status</legend>
-            <div className="flex flex-wrap gap-1.5">
-              {AVAILABILITY_OPTIONS.map((opt) => {
-                const on = rule.availability_statuses?.includes(opt.value);
-                return (
-                  <Button
-                    key={opt.value}
-                    type="button"
-                    variant="ghost"
-                    onClick={() => toggleArray('availability_statuses', opt.value)}
-                    aria-pressed={Boolean(on)}
-                    className={`rounded-full border px-2.5 py-1 text-xs font-medium transition-colors ${
-                      on ? 'border-primary-300 bg-primary-100 text-primary-800' : 'border-warm-200 bg-cream-50 text-warm-600 hover:bg-warm-50'
-                    }`}
-                  >
-                    {opt.label}
-                  </Button>
-                );
-              })}
-            </div>
-          </fieldset>
-
-          {/* Numeric thresholds */}
-          <div className="grid grid-cols-2 gap-2">
-            <NumField label="Min recent pitches" value={rule.min_recent_pitch_count} onChange={(n) => patch({ min_recent_pitch_count: n })} />
-            <NumField label="Min recent starts" value={rule.min_recent_game_starts} onChange={(n) => patch({ min_recent_game_starts: n })} />
-            <NumField label="Min soreness (0-10)" value={rule.min_soreness_severity} onChange={(n) => patch({ min_soreness_severity: n })} />
-            <NumField label="Lookback (days)" value={rule.lookback_days} onChange={(n) => patch({ lookback_days: n ?? 14 })} />
-            <NumField label="Bodyweight min" value={rule.bodyweight_min} onChange={(n) => patch({ bodyweight_min: n })} />
-            <NumField label="Bodyweight max" value={rule.bodyweight_max} onChange={(n) => patch({ bodyweight_max: n })} />
-            <NumField label="Training age min" value={rule.training_age_min} onChange={(n) => patch({ training_age_min: n })} />
-            <NumField label="Training age max" value={rule.training_age_max} onChange={(n) => patch({ training_age_max: n })} />
-          </div>
-
-          {/* Class year */}
-          <Input
-            label="Class years (comma-sep grad years)"
-            placeholder="e.g. 2027, 2028"
-            value={(rule.grad_years ?? []).join(', ')}
-            onChange={(e) => {
-              const years = e.target.value.split(',').map((s) => parseInt(s.trim(), 10)).filter((n) => !Number.isNaN(n));
-              patch({ grad_years: years.length ? years : undefined });
-            }}
-          />
-
-          {/* Lift completion */}
-          <Checkbox
-            label="Only athletes with an incomplete lift in the window"
-            checked={rule.lift_completion === 'incomplete'}
-            onChange={(e) => patch({ lift_completion: (e.target as HTMLInputElement).checked ? 'incomplete' : undefined })}
-          />
-
-          {/* Live preview */}
-          <div className="rounded-xl border border-warm-100 bg-cream-100/50 p-3">
-            <div className="flex items-center justify-between">
-              <span className="text-xs font-semibold uppercase tracking-wide text-warm-400">Live preview</span>
-              <span className="text-xs font-medium text-warm-600">
-                {previewing ? 'Evaluating…' : preview ? `${preview.matches.length} match` : '—'}
-              </span>
-            </div>
-            {preview?.empty ? (
-              <p className="mt-2 text-xs text-warm-400">Add at least one rule to preview matched athletes.</p>
-            ) : preview && preview.matches.length > 0 ? (
-              <ul className="mt-2 max-h-40 space-y-1 overflow-y-auto">
-                {preview.matches.map((m) => (
-                  <li key={m.player_id} className="flex items-center gap-1.5 text-xs text-warm-700">
-                    <IconCheck size={13} className="shrink-0 text-primary-600" />
-                    <span className="truncate" title={m.reasons.join('; ')}>{m.reasons[0] ?? 'Matched'}</span>
-                  </li>
-                ))}
-              </ul>
-            ) : (
-              <p className="mt-2 text-xs text-warm-400">No athletes match this rule yet.</p>
-            )}
-          </div>
-
-          {msg && (
-            <p
-              role="status"
-              aria-live="polite"
-              className={`text-xs font-medium ${msg.tone === 'error' ? 'text-red-600' : 'text-primary-700'}`}
-            >
-              {msg.text}
-            </p>
-          )}
-
-          <div className="flex items-center justify-between gap-2 pt-1">
-            <Button variant="ghost" size="sm" leftIcon={<IconTrash size={14} />} onClick={() => setConfirmDelete(true)} disabled={saving}>
-              Archive
-            </Button>
-            <Button variant="primary" onClick={handleSave} isLoading={saving} disabled={Boolean(preview?.empty)}>
-              Save &amp; recompute
-            </Button>
-          </div>
-        </>
-      )}
-
-      <Modal isOpen={confirmDelete} onClose={() => setConfirmDelete(false)} title="Archive group?">
-        <div className="space-y-4">
-          <p className="text-sm text-warm-600">
-            Archiving <strong>{group.name}</strong> hides it from the room. Membership and history are kept —
-            nothing is deleted.
-          </p>
-          <div className="flex justify-end gap-2">
-            <Button variant="ghost" onClick={() => setConfirmDelete(false)} disabled={saving}>Cancel</Button>
-            <Button variant="danger" onClick={handleDelete} isLoading={saving}>Archive group</Button>
-          </div>
-        </div>
-      </Modal>
-    </Card>
-  );
-}
-
-function NumField({
-  label, value, onChange,
-}: { label: string; value: number | null | undefined; onChange: (n: number | undefined) => void }) {
-  return (
-    <Input
-      label={label}
-      type="number"
-      value={value ?? ''}
-      onChange={(e) => {
-        const v = e.target.value;
-        onChange(v === '' ? undefined : Number(v));
-      }}
-    />
-  );
-}
diff --git a/src/components/baseball/recruiting-philosophy/MatchScoreBadge.tsx b/src/components/baseball/recruiting-philosophy/MatchScoreBadge.tsx
deleted file mode 100644
index 232774bcb..000000000
--- a/src/components/baseball/recruiting-philosophy/MatchScoreBadge.tsx
+++ /dev/null
@@ -1,267 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { cn } from '@/lib/utils';
-import { getMatchScoreTier, formatMatchScore } from '@/lib/recruiting/match-calculator';
-import type { MatchScoreBreakdown } from '@/lib/types';
-import { RECRUITING_METRIC_LABELS } from '@/lib/types';
-import { IconChevronDown, IconTarget, IconAlertCircle } from '@/components/icons';
-import { Button } from '@/components/ui/button';
-import { Badge, type BadgeTone } from '@/components/ui/badge';
-
-// Match-score tier → canonical Badge tone (color-faithful). Tiers stay DISTINCT:
-// excellent=primary, good=emerald, average=amber, below_average=orange, poor=red.
-const TIER_TONE: Record<
-  'excellent' | 'good' | 'average' | 'below_average' | 'poor',
-  BadgeTone
-> = {
-  excellent: 'primary',
-  good: 'emerald',
-  average: 'amber',
-  below_average: 'orange',
-  poor: 'red',
-};
-
-interface MatchScoreBadgeProps {
-  score: number;
-  breakdown?: MatchScoreBreakdown;
-  meetsStandards?: boolean;
-  size?: 'sm' | 'md' | 'lg';
-  showBreakdown?: boolean;
-  className?: string;
-}
-
-export function MatchScoreBadge({
-  score,
-  breakdown,
-  meetsStandards = true,
-  size = 'md',
-  showBreakdown = false,
-  className,
-}: MatchScoreBadgeProps) {
-  const [isExpanded, setIsExpanded] = useState(false);
-  const tier = getMatchScoreTier(score);
-
-  const sizeClasses = {
-    sm: 'px-2 py-0.5 text-xs',
-    md: 'px-3 py-1 text-sm',
-    lg: 'px-4 py-1.5 text-base',
-  };
-
-  // excellent uses the stronger primary-100 tint (Badge primary-soft is -50).
-  const tierTintOverride: Record<typeof tier.tier, string> = {
-    excellent: 'bg-primary-100',
-    good: '',
-    average: '',
-    below_average: '',
-    poor: '',
-  };
-
-  // Expandable-button color recipe (keeps the original bg/text/border strings).
-  const tierColors = {
-    excellent: 'bg-primary-100 text-primary-700 border-primary-200',
-    good: 'bg-emerald-50 text-emerald-700 border-emerald-200',
-    average: 'bg-amber-50 text-amber-700 border-amber-200',
-    below_average: 'bg-orange-50 text-orange-700 border-orange-200',
-    poor: 'bg-red-50 text-red-700 border-red-200',
-  };
-
-  const tierBgGradient = {
-    excellent: 'from-primary-500 to-primary-600',
-    good: 'from-emerald-400 to-emerald-500',
-    average: 'from-amber-400 to-amber-500',
-    below_average: 'from-orange-400 to-orange-500',
-    poor: 'from-red-400 to-red-500',
-  };
-
-  // Compact badge for list view
-  if (!showBreakdown) {
-    return (
-      <Badge
-        tone={TIER_TONE[tier.tier]}
-        size="none"
-        icon={<IconTarget size={size === 'sm' ? 12 : 16} className="flex-shrink-0" />}
-        className={cn(
-          'font-semibold',
-          sizeClasses[size],
-          tierTintOverride[tier.tier],
-          !meetsStandards && 'opacity-60',
-          className
-        )}
-      >
-        <span className="tabular-nums">{formatMatchScore(score)}</span>
-        {!meetsStandards && (
-          <IconAlertCircle size={size === "sm" ? 12 : 16} className="flex-shrink-0" />
-        )}
-      </Badge>
-    );
-  }
-
-  // Expandable badge with breakdown
-  return (
-    <div className={cn('relative', className)}>
-      <Button variant="ghost"
-        onClick={() => setIsExpanded(!isExpanded)}
-        className={cn(
-          'flex items-center gap-2 rounded-xl font-semibold border transition-all',
-          sizeClasses[size],
-          tierColors[tier.tier],
-          isExpanded && 'rounded-b-none',
-          !meetsStandards && 'opacity-80'
-        )}
-      >
-        <IconTarget size={16} />
-        <span className="tabular-nums">{formatMatchScore(score)}</span>
-        <span className="text-xs font-normal opacity-75">{tier.label}</span>
-        {breakdown && (
-          <IconChevronDown size={16} className={cn("transition-transform", isExpanded && "rotate-180")} />
-        )}
-      </Button>
-
-      {/* Breakdown dropdown */}
-      {isExpanded && breakdown && (
-        <div className="absolute top-full left-0 right-0 z-10 glass-prominent rounded-b-xl border-t-0 shadow-lg overflow-hidden">
-          {/* Score bar */}
-          <div className="p-3 bg-warm-50">
-            <div className="h-3 bg-warm-200 rounded-full overflow-hidden">
-              <div
-                className={cn('h-full rounded-full bg-gradient-to-r', tierBgGradient[tier.tier])}
-                style={{ width: `${score}%` }}
-              />
-            </div>
-          </div>
-
-          {/* Breakdown items */}
-          <div className="divide-y divide-warm-100">
-            {Object.entries(breakdown).map(([key, detail]) => {
-              if (!detail) return null;
-              const label = RECRUITING_METRIC_LABELS[key as keyof typeof RECRUITING_METRIC_LABELS];
-              return (
-                <div key={key} className="flex items-center justify-between px-3 py-2">
-                  <div className="flex items-center gap-2">
-                    <span className="text-sm text-warm-600">{label}</span>
-                    <span className="text-xs text-warm-400">×{detail.weight}%</span>
-                  </div>
-                  <div className="flex items-center gap-2">
-                    <div className="w-16 h-1.5 bg-warm-200 rounded-full overflow-hidden">
-                      <div
-                        className="h-full bg-primary-500 rounded-full"
-                        style={{ width: `${detail.percentile}%` }}
-                      />
-                    </div>
-                    <span className="text-sm font-medium text-warm-700 tabular-nums w-10 text-right">
-                      {detail.percentile}%
-                    </span>
-                  </div>
-                </div>
-              );
-            })}
-          </div>
-
-          {/* Standards warning */}
-          {!meetsStandards && (
-            <div className="px-3 py-2 bg-amber-50 border-t border-amber-100">
-              <p className="text-xs text-amber-700 flex items-center gap-1.5">
-                <IconAlertCircle size={14} />
-                Below minimum standards
-              </p>
-            </div>
-          )}
-        </div>
-      )}
-    </div>
-  );
-}
-
-/**
- * Compact inline match score for player cards in list view.
- */
-export function MatchScoreInline({
-  score,
-  className,
-}: {
-  score: number;
-  className?: string;
-}) {
-  const tier = getMatchScoreTier(score);
-
-  return (
-    <div className={cn('flex items-center gap-1', className)}>
-      <div
-        className={cn(
-          'w-2 h-2 rounded-full',
-          tier.tier === 'excellent' && 'bg-primary-500',
-          tier.tier === 'good' && 'bg-primary-400',
-          tier.tier === 'average' && 'bg-amber-500',
-          tier.tier === 'below_average' && 'bg-orange-500',
-          tier.tier === 'poor' && 'bg-red-500'
-        )}
-      />
-      <span className={cn('text-sm font-semibold tabular-nums', tier.color)}>
-        {formatMatchScore(score)}
-      </span>
-    </div>
-  );
-}
-
-/**
- * Match score progress ring for larger displays.
- */
-export function MatchScoreRing({
-  score,
-  size = 64,
-  className,
-}: {
-  score: number;
-  size?: number;
-  className?: string;
-}) {
-  const tier = getMatchScoreTier(score);
-  const strokeWidth = size / 8;
-  const radius = (size - strokeWidth) / 2;
-  const circumference = radius * 2 * Math.PI;
-  const offset = circumference - (score / 100) * circumference;
-
-  const strokeColors = {
-    excellent: 'var(--color-primary-600)',
-    good: '#10b981',
-    average: '#f59e0b',
-    below_average: '#f97316',
-    poor: '#ef4444',
-  };
-
-  return (
-    <div className={cn('relative inline-flex items-center justify-center', className)}>
-      <svg width={size} height={size} className="transform -rotate-90">
-        {/* Background ring */}
-        <circle
-          cx={size / 2}
-          cy={size / 2}
-          r={radius}
-          fill="none"
-          stroke="#e7e5e4"
-          strokeWidth={strokeWidth}
-        />
-        {/* Progress ring */}
-        <circle
-          cx={size / 2}
-          cy={size / 2}
-          r={radius}
-          fill="none"
-          stroke={strokeColors[tier.tier]}
-          strokeWidth={strokeWidth}
-          strokeLinecap="round"
-          strokeDasharray={circumference}
-          strokeDashoffset={offset}
-          className="transition-all duration-500"
-        />
-      </svg>
-      {/* Center text */}
-      <div className="absolute inset-0 flex items-center justify-center">
-        <span className={cn('font-bold tabular-nums', tier.color)} style={{ fontSize: size / 4 }}>
-          {Math.round(score)}
-        </span>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/baseball/stats-center/StatsCenterClient.tsx b/src/components/baseball/stats-center/StatsCenterClient.tsx
index 61f6e408e..135f3ab23 100644
--- a/src/components/baseball/stats-center/StatsCenterClient.tsx
+++ b/src/components/baseball/stats-center/StatsCenterClient.tsx
@@ -28,7 +28,7 @@ import { useRouter, useSearchParams } from 'next/navigation';
 import { LazyMotion, domAnimation, m, useReducedMotion } from 'framer-motion';
 
 import { Button } from '@/components/ui/button';
-import { IconDownload, IconFilter, IconX } from '@/components/icons';
+import { IconDownload, IconFilter, IconUpload, IconX } from '@/components/icons';
 import { cn } from '@/lib/utils';
 import { loadStatsCenter } from '@/app/baseball/actions/games';
 // V10 stat-visual chart gallery (stat-visuals packet). Mounted at team scope; it
@@ -543,6 +543,27 @@ export function StatsCenterClient({ model: initialModel, initialFilters, statVis
   const mastheadActions = (
     <div className="flex flex-wrap items-center gap-2">
       <SegmentedControl options={GAME_SET_OPTIONS} value={gameSet} onChange={setGameSet} ariaLabel="Game set" />
+      {/* Ruling 2 (item 2): Upload + Import Center folded off the hub sub-nav
+          strip into persistent header-level actions here — Stats Center is
+          now the ONLY place they're reachable from the Stats & Performance
+          hub (the empty-state "Import a box score" CTA below stays too, for
+          the exact moment it's most useful). */}
+      <Button
+        variant="ghost"
+        size="md"
+        leftIcon={<IconUpload size={16} />}
+        onClick={() => router.push('/baseball/dashboard/stats/upload')}
+      >
+        Upload
+      </Button>
+      <Button
+        variant="ghost"
+        size="md"
+        leftIcon={<IconUpload size={16} />}
+        onClick={() => router.push('/baseball/dashboard/import')}
+      >
+        Import Center
+      </Button>
       <Button
         variant="secondary"
         size="md"
diff --git a/src/components/baseball/travel/TravelClient.tsx b/src/components/baseball/travel/TravelClient.tsx
index bfec7eba3..c72a70e9f 100644
--- a/src/components/baseball/travel/TravelClient.tsx
+++ b/src/components/baseball/travel/TravelClient.tsx
@@ -3,7 +3,6 @@
 import { useState, useCallback } from 'react';
 import { motion, AnimatePresence, useReducedMotion } from 'framer-motion';
 import { Button } from '@/components/ui/button';
-import { Card, CardContent } from '@/components/ui/card';
 import { Skeleton } from '@/components/ui/skeleton';
 import {
   IconPlus,
@@ -14,6 +13,7 @@ import {
   IconChevronDown,
   IconChevronUp,
 } from '@/components/icons';
+import { SectionMasthead, EmptyIssue } from '@/components/baseball/living-annual';
 import { CreateItineraryModal } from './CreateItineraryModal';
 import { ExpenseForm } from './ExpenseForm';
 import { ExpenseList } from './ExpenseList';
@@ -118,45 +118,40 @@ export function TravelClient({ itineraries: initialItineraries, teamId, isCoach
 
   return (
     <div className="p-4 md:p-6 max-w-5xl mx-auto space-y-8">
-      {/* Header */}
-      <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
-        <div>
-          <h1 className="text-xl md:text-2xl font-semibold tracking-tight text-warm-900">Travel</h1>
-          <p className="text-warm-500 mt-1 text-sm">
-            {itineraries.length > 0
-              ? `${itineraries.length} trip${itineraries.length !== 1 ? 's' : ''} planned`
-              : 'Manage team travel and expenses'}
-          </p>
-        </div>
-        {isCoach && (
-          <Button onClick={() => { setEditingItinerary(null); setShowCreateModal(true); }} className="gap-2">
-            <IconPlus size={18} />
-            Create Trip
-          </Button>
-        )}
-      </div>
+      <SectionMasthead
+        eyebrow="THE PRESSBOX · TRAVEL"
+        title="Travel"
+        ink="team"
+        actions={
+          isCoach ? (
+            <Button onClick={() => { setEditingItinerary(null); setShowCreateModal(true); }} className="gap-2">
+              <IconPlus size={18} />
+              Create Trip
+            </Button>
+          ) : undefined
+        }
+      >
+        <p className="max-w-prose font-annual text-body text-text-secondary">
+          {itineraries.length > 0
+            ? `${itineraries.length} trip${itineraries.length !== 1 ? 's' : ''} planned`
+            : 'Manage team travel and expenses'}
+        </p>
+      </SectionMasthead>
 
       {/* Empty State */}
       {itineraries.length === 0 && (
-        <Card variant="glass">
-          <CardContent className="py-12 text-center">
-            <div className="w-16 h-16 rounded-2xl bg-warm-100 flex items-center justify-center mx-auto mb-4">
-              <IconMapPin size={32} className="text-warm-300" />
-            </div>
-            <h3 className="text-lg font-medium text-warm-900 mb-2">No Trips Planned</h3>
-            <p className="text-warm-500 mb-6 max-w-md mx-auto">
-              {isCoach
-                ? 'Create a trip itinerary to track travel logistics and expenses for your team.'
-                : 'Your coach has not added any travel itineraries yet.'}
-            </p>
-            {isCoach && (
+        <EmptyIssue
+          variant="travel"
+          ink="team"
+          action={
+            isCoach ? (
               <Button onClick={() => setShowCreateModal(true)} className="gap-2">
                 <IconPlus size={18} />
                 Create First Trip
               </Button>
-            )}
-          </CardContent>
-        </Card>
+            ) : undefined
+          }
+        />
       )}
 
       {/* Upcoming Trips */}
diff --git a/src/components/layout/sidebar.tsx b/src/components/layout/sidebar.tsx
deleted file mode 100644
index 4bbd7f73d..000000000
--- a/src/components/layout/sidebar.tsx
+++ /dev/null
@@ -1,795 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-import Image from 'next/image';
-import { usePathname, useRouter } from 'next/navigation';
-import { cn } from '@/lib/utils';
-import { useAuth } from '@/hooks/use-auth';
-import {
-  IconHome,
-  IconUsers,
-  IconMessage,
-  IconSettings,
-  IconLogOut,
-  IconUser,
-  IconBuilding,
-  IconCalendar,
-  IconHelp,
-  IconGraduationCap,
-  IconChevronLeft,
-  IconChevronRight,
-  IconChartBar,
-  IconClipboardList,
-  IconMessageSquare,
-  IconMap,
-  IconFileText,
-  IconTarget,
-} from '@/components/icons';
-import {
-  COACH_TEAM_TABS,
-  COACH_STATS_TABS,
-  COACH_DEVELOPMENT_TABS,
-  COACH_MANAGEMENT_TABS,
-  COACH_ACADEMICS_TABS,
-  COACH_RECRUITING_TABS,
-  COACH_HUB_ORDER,
-  COACH_HUB_DEFS,
-  PLAYER_STATS_TABS,
-  PLAYER_DEVELOPMENT_TABS,
-  PLAYER_TEAM_TABS,
-  PLAYER_RECRUITING_TABS,
-} from '@/app/baseball/(dashboard)/_components/hub-definitions';
-import { TeamSwitcher } from './team-switcher';
-import { useTeams } from '@/hooks/use-teams';
-import { usePlayerTeams } from '@/hooks/use-player-teams';
-import { useUnreadCount } from '@/hooks/use-unread-count';
-import { useSidebar } from '@/contexts/sidebar-context';
-import { Button } from '@/components/ui/button';
-import {
-  getVisibleBaseballNav,
-  getBaseballTerminology,
-  BASEBALL_MESSAGES_NAV,
-  type BaseballNavContext,
-} from '@/lib/baseball/nav-registry';
-import {
-  filterHubTabsByCapabilities,
-  filterHubTabsByProgramType,
-} from '@/app/baseball/(dashboard)/_components/resolve-active-hub';
-
-// =============================================================================
-// GROUPED-HUBS NAVIGATION (approved 2026-06-24)
-//
-// The old flat 11–13 sidebar tabs are condensed into a handful of top-level HUBS.
-// Each hub is ONE sidebar item that lands on its first child route; the hub's own
-// sub-tab strip (rendered by BaseballDashboardShell via HubSubNav) then exposes
-// the leaf routes. `hubPrefixes` lists every route inside the hub so the sidebar
-// item lights active whenever ANY of the hub's leaves is the current page. The
-// hub tab lists themselves live in the single-source-of-truth hub-definitions.
-//
-// ADDITIVE: every existing leaf route still works; the hubs add a layer above
-// them. The sidebar's dark styling is unchanged — only the top-level item set is.
-// =============================================================================
-
-type SidebarHubItem = {
-  name: string;
-  href: string;
-  icon: React.ComponentType<React.SVGProps<SVGSVGElement> & { size?: number }>;
-  badge?: boolean;
-  /** Route prefixes that mark this hub item active (defaults to [href]). */
-  hubPrefixes?: string[];
-};
-
-/** Collect every route a hub owns (each tab's href + matchPrefixes). */
-function hubPrefixesFrom(
-  tabs: readonly { href: string; matchPrefixes?: readonly string[] }[],
-): string[] {
-  return tabs.flatMap((t) => [t.href, ...(t.matchPrefixes ?? [])]);
-}
-
-// --- Coach hub item builders (one shared set; landing differs by program mode) ---
-const COACH_TEAM_HUB: SidebarHubItem = {
-  name: 'Team',
-  href: COACH_TEAM_TABS[0]!.href,
-  icon: IconUsers,
-  hubPrefixes: hubPrefixesFrom(COACH_TEAM_TABS),
-};
-const COACH_STATS_HUB: SidebarHubItem = {
-  name: 'Stats',
-  href: COACH_STATS_TABS[0]!.href,
-  icon: IconChartBar,
-  hubPrefixes: hubPrefixesFrom(COACH_STATS_TABS),
-};
-const COACH_DEVELOPMENT_HUB: SidebarHubItem = {
-  name: 'Development',
-  href: COACH_DEVELOPMENT_TABS[0]!.href,
-  icon: IconTarget,
-  hubPrefixes: hubPrefixesFrom(COACH_DEVELOPMENT_TABS),
-};
-const COACH_MANAGEMENT_HUB: SidebarHubItem = {
-  name: 'Management',
-  href: COACH_MANAGEMENT_TABS[0]!.href,
-  icon: IconBuilding,
-  hubPrefixes: hubPrefixesFrom(COACH_MANAGEMENT_TABS),
-};
-const COACH_ACADEMICS_HUB: SidebarHubItem = {
-  name: 'Academics',
-  href: COACH_ACADEMICS_TABS[0]!.href,
-  icon: IconGraduationCap,
-  hubPrefixes: hubPrefixesFrom(COACH_ACADEMICS_TABS),
-};
-const COACH_RECRUITING_HUB: SidebarHubItem = {
-  name: 'Recruiting',
-  href: COACH_RECRUITING_TABS[0]!.href,
-  icon: COACH_HUB_DEFS.recruiting.icon,
-  hubPrefixes: hubPrefixesFrom(COACH_RECRUITING_TABS),
-};
-// Messages — persistent cross-cutting slot (golf-style), never a hub sub-tab.
-// Deliberately outside BASEBALL_NAV_REGISTRY (see nav-registry.ts), so every
-// nav consumer injects it explicitly; this is the shared literal both the
-// condensed (8-tab) nav and the legacy showcase org nav inject.
-const COACH_MESSAGES_ITEM: SidebarHubItem = {
-  name: BASEBALL_MESSAGES_NAV.label,
-  href: BASEBALL_MESSAGES_NAV.href,
-  icon: IconMessage,
-  badge: true,
-};
-
-// College Coach — grouped hubs. This fallback must mirror the navContext-driven
-// condensed builder closely enough that the shell never flashes the old IA while
-// navContext is resolving.
-const collegeTeamNav: SidebarHubItem[] = [
-  { name: 'Dashboard', href: '/baseball/dashboard/command-center', icon: IconHome },
-  COACH_MESSAGES_ITEM,
-  COACH_TEAM_HUB,
-  COACH_STATS_HUB,
-  COACH_DEVELOPMENT_HUB,
-  COACH_RECRUITING_HUB,
-  COACH_MANAGEMENT_HUB,
-];
-
-// HS Coach — same hubs, HS-specific dashboard landing.
-const hsCoachTeamNav: SidebarHubItem[] = [
-  { name: 'Dashboard', href: '/baseball/dashboard/command-center', icon: IconHome },
-  COACH_MESSAGES_ITEM,
-  COACH_TEAM_HUB,
-  COACH_STATS_HUB,
-  COACH_DEVELOPMENT_HUB,
-  COACH_MANAGEMENT_HUB,
-];
-
-// JUCO Coach — includes Recruiting + Academics.
-const jucoTeamNav: SidebarHubItem[] = [
-  { name: 'Dashboard', href: '/baseball/dashboard/command-center', icon: IconHome },
-  COACH_MESSAGES_ITEM,
-  COACH_TEAM_HUB,
-  COACH_STATS_HUB,
-  COACH_DEVELOPMENT_HUB,
-  COACH_RECRUITING_HUB,
-  COACH_ACADEMICS_HUB,
-  COACH_MANAGEMENT_HUB,
-];
-
-// Showcase Coach - Organization Mode (manages multiple teams). Showcase keeps its
-// org-level surfaces at the top level; the per-team hubs appear once a team is
-// selected (showcaseTeamNav below).
-const showcaseOrgNav: SidebarHubItem[] = [
-  { name: 'Dashboard', href: '/baseball/dashboard/organization', icon: IconHome },
-  { name: 'Teams', href: '/baseball/dashboard/teams', icon: IconUsers },
-  { name: 'Events', href: '/baseball/dashboard/events', icon: IconCalendar },
-  COACH_MESSAGES_ITEM,
-];
-
-// Showcase Coach - Team-specific hubs (shown when a team is selected).
-const showcaseTeamNav: SidebarHubItem[] = [
-  { name: 'Dashboard', href: '/baseball/dashboard/command-center', icon: IconHome },
-  COACH_MESSAGES_ITEM,
-  COACH_TEAM_HUB,
-  COACH_STATS_HUB,
-  COACH_DEVELOPMENT_HUB,
-];
-
-// Player — grouped hubs: Dashboard, My Profile, My Stats hub, Development hub,
-// Calendar, Messages, and a Team hub (Announcements / Tasks / Documents).
-const playerTeamNav: SidebarHubItem[] = [
-  { name: 'Dashboard', href: '/baseball/player/today', icon: IconHome },
-  { name: 'My Profile', href: '/baseball/dashboard/profile', icon: IconUser },
-  {
-    name: 'My Stats',
-    href: PLAYER_STATS_TABS[0]!.href,
-    icon: IconChartBar,
-    hubPrefixes: hubPrefixesFrom(PLAYER_STATS_TABS),
-  },
-  {
-    name: 'Development',
-    href: PLAYER_DEVELOPMENT_TABS[0]!.href,
-    icon: IconTarget,
-    hubPrefixes: hubPrefixesFrom(PLAYER_DEVELOPMENT_TABS),
-  },
-  { name: 'Calendar', href: '/baseball/dashboard/calendar', icon: IconCalendar },
-  { name: 'Messages', href: '/baseball/dashboard/messages', icon: IconMessage, badge: true },
-  {
-    name: 'Team',
-    href: PLAYER_TEAM_TABS[0]!.href,
-    icon: IconUsers,
-    hubPrefixes: hubPrefixesFrom(PLAYER_TEAM_TABS),
-  },
-  {
-    name: 'Recruiting',
-    href: PLAYER_RECRUITING_TABS[0]!.href,
-    icon: COACH_HUB_DEFS.recruiting.icon,
-    hubPrefixes: hubPrefixesFrom(PLAYER_RECRUITING_TABS),
-  },
-];
-
-// Golf Coach navigation (flat — golf keeps its own nav model; unchanged).
-const golfCoachNav: SidebarHubItem[] = [
-  { name: 'Dashboard', href: '/golf/dashboard', icon: IconHome },
-  { name: 'Roster', href: '/golf/dashboard/roster', icon: IconUsers },
-  { name: 'Rounds', href: '/golf/dashboard/rounds', icon: IconClipboardList },
-  { name: 'Stats', href: '/golf/dashboard/stats', icon: IconChartBar },
-  { name: 'Calendar', href: '/golf/dashboard/calendar', icon: IconCalendar },
-  { name: 'Documents', href: '/golf/dashboard/documents', icon: IconFileText },
-  { name: 'Messages', href: '/golf/dashboard/messages', icon: IconMessageSquare, badge: true },
-  { name: 'Travel', href: '/golf/dashboard/travel', icon: IconMap },
-];
-
-// Secondary navigation (coach) — Settings + Program now live in the Management
-// hub, so "More" carries only the always-available Help link for coaches.
-const coachSecondaryNav = [
-  { name: 'Help', href: '/help', icon: IconHelp },
-];
-
-// Secondary navigation (player) — players have no Management hub, so Settings
-// stays in the "More" group.
-const playerSecondaryNav = [
-  { name: 'Settings', href: '/baseball/dashboard/settings', icon: IconSettings },
-  { name: 'Help', href: '/help', icon: IconHelp },
-];
-
-/**
- * Dashboard / "home" hrefs that must match EXACTLY (never light via a startsWith
- * prefix, since every nested route starts with the dashboard root).
- */
-const EXACT_MATCH_HREFS = new Set<string>([
-  '/baseball/dashboard',
-  '/baseball/dashboard/command-center',
-  '/baseball/player/today',
-  '/baseball/dashboard/organization',
-  '/golf/dashboard',
-]);
-
-const RECRUITING_PROGRAM_TYPES = new Set(['college', 'juco', 'showcase', 'academy', 'club']);
-
-/**
- * The condensed 8-tab coach nav (COACH_NAV_8TAB_PROPOSAL.md, approved
- * 2026-07-01): Dashboard, Team, Messages, Stats & Performance, Development,
- * Recruiting, Academics, Management. GROUPED BY `entry.hub` (via
- * COACH_HUB_ORDER / COACH_HUB_DEFS in hub-definitions.ts, itself derived from
- * BASEBALL_NAV_REGISTRY) — this function never hand-lists a hub's member
- * routes, so a new registry entry tagged with an existing `hub` is picked up
- * automatically, with no risk of re-orphaning a feature from the sidebar.
- */
-function buildCondensedBaseballNavigation(ctx: BaseballNavContext): SidebarHubItem[] {
-  if (ctx.role === 'player') {
-    return [
-      { name: 'Today', href: '/baseball/player/today', icon: IconHome },
-      { name: 'Schedule', href: '/baseball/dashboard/calendar', icon: IconCalendar },
-      {
-        name: 'My Stats',
-        href: PLAYER_STATS_TABS[0]!.href,
-        icon: IconChartBar,
-        hubPrefixes: hubPrefixesFrom(PLAYER_STATS_TABS),
-      },
-      {
-        name: 'Development',
-        href: PLAYER_DEVELOPMENT_TABS[0]!.href,
-        icon: IconTarget,
-        hubPrefixes: hubPrefixesFrom(PLAYER_DEVELOPMENT_TABS),
-      },
-      {
-        name: 'Team',
-        href: PLAYER_TEAM_TABS[0]!.href,
-        icon: IconUsers,
-        hubPrefixes: hubPrefixesFrom(PLAYER_TEAM_TABS),
-      },
-      {
-        name: getBaseballTerminology(ctx).exposureNoun,
-        href: PLAYER_RECRUITING_TABS[0]!.href,
-        icon: COACH_HUB_DEFS.recruiting.icon,
-        hubPrefixes: hubPrefixesFrom(PLAYER_RECRUITING_TABS),
-      },
-      { name: 'Messages', href: '/baseball/dashboard/messages', icon: IconMessage, badge: true },
-      { name: 'My Profile', href: '/baseball/dashboard/profile', icon: IconUser },
-    ];
-  }
-
-  const items: SidebarHubItem[] = [];
-
-  for (const hubId of COACH_HUB_ORDER) {
-    const def = COACH_HUB_DEFS[hubId];
-
-    // Recruiting/Academics are MODE-gated (RECRUITING_PROGRAM_TYPES / JUCO-only),
-    // not just capability-gated — checked up front so a recruiting-ineligible
-    // program type never shows the hub, even if a member id happens to also be
-    // capability-visible.
-    if (hubId === 'recruiting' && !(ctx.programType && RECRUITING_PROGRAM_TYPES.has(ctx.programType))) {
-      continue;
-    }
-
-    // Every hub hides itself when NO tab is visible for this coach. Use the
-    // same filters as the shell-level HubSubNav resolver, not just registry
-    // ids: several important sub-tabs (Games, Season, settings supplements)
-    // are intentionally not registry entries but still own real routes.
-    const capFiltered = filterHubTabsByCapabilities(def.tabs, 'coach', ctx.capabilities);
-    const visibleTabs = filterHubTabsByProgramType(capFiltered, ctx.programType);
-    if (visibleTabs.length === 0) continue;
-
-    items.push({
-      name: hubId === 'recruiting' ? getBaseballTerminology(ctx).exposureNoun : def.label,
-      href: visibleTabs[0]!.href,
-      icon: def.icon,
-      hubPrefixes: visibleTabs.flatMap((t) => [t.href, ...(t.matchPrefixes ?? [])]),
-    });
-
-    // Messages: persistent cross-cutting slot (golf-style), injected right
-    // after Dashboard — never a hub sub-tab (nav-registry.ts: "messages lives
-    // outside this set").
-    if (hubId === 'dashboard') items.push(COACH_MESSAGES_ITEM);
-  }
-
-  return items;
-}
-
-/**
- * Whether a top-level (hub or flat) sidebar item is active for the current path.
- * A hub item lights when the pathname matches its href OR any route inside the
- * hub (`hubPrefixes`); home/dashboard items match exactly. Settings is excluded
- * from the Management hub's prefixes when it would collide with the secondary
- * Settings link (handled by the secondary nav's own active state).
- */
-function isHubItemActive(item: SidebarHubItem, pathname: string): boolean {
-  const prefixes = item.hubPrefixes ?? [item.href];
-  for (const p of prefixes) {
-    if (pathname === p) return true;
-    if (!EXACT_MATCH_HREFS.has(p) && pathname.startsWith(`${p}/`)) return true;
-  }
-  return false;
-}
-
-interface SidebarProps {
-  isMobile?: boolean;
-  navContext?: BaseballNavContext;
-}
-
-export function Sidebar({ isMobile = false, navContext }: SidebarProps) {
-  const pathname = usePathname();
-  const router = useRouter();
-  const { user, coach, player, signOut } = useAuth();
-  const { unreadCount } = useUnreadCount();
-  const { collapsed, setCollapsed, setMobileOpen } = useSidebar();
-
-  // Use appropriate teams hook based on user role
-  const coachTeams = useTeams();
-  const playerTeams = usePlayerTeams();
-  const { hasMultipleTeams, selectedTeam } = user?.role === 'coach' ? coachTeams : playerTeams;
-
-  // Determine sport-specific dashboard href based on pathname
-  const isGolf = pathname.startsWith('/golf');
-  const dashboardHref = isGolf ? '/golf/dashboard' : '/baseball/dashboard';
-
-  // Determine navigation based on role, coach type, and mode
-  // ARCHIVED: Recruiting mode branches removed — all users see team mode only
-  const getNavigation = (): SidebarHubItem[] => {
-    if (isGolf) {
-      return golfCoachNav;
-    }
-    if (navContext) {
-      return buildCondensedBaseballNavigation(navContext);
-    }
-    if (user?.role === 'coach') {
-      if (coach?.coach_type === 'college') {
-        return collegeTeamNav;
-      } else if (coach?.coach_type === 'juco') {
-        return jucoTeamNav;
-      } else if (coach?.coach_type === 'showcase') {
-        return showcaseOrgNav;
-      } else if (coach?.coach_type === 'high_school') {
-        return hsCoachTeamNav;
-      } else {
-        return hsCoachTeamNav;
-      }
-    } else if (user?.role === 'player') {
-      // ARCHIVED: All players now see team nav only — recruiting nav disabled
-      return playerTeamNav;
-    }
-    return collegeTeamNav;
-  };
-
-  const getTeamNavigation = () => {
-    if (coach?.coach_type === 'showcase' && selectedTeam) {
-      return showcaseTeamNav;
-    }
-    return [];
-  };
-
-  const navigation = getNavigation();
-  const teamNavigation = getTeamNavigation();
-  const secondaryNav = !isGolf && navContext
-    ? navContext.role === 'coach'
-      ? [{ name: 'Help', href: '/help', icon: IconHelp }]
-      : [
-          ...getVisibleBaseballNav(navContext)
-            .filter((entry) => entry.section === 'secondary')
-            .map((entry) => ({
-              name: entry.label,
-              href: entry.href,
-              icon: entry.icon,
-            })),
-          { name: 'Help', href: '/help', icon: IconHelp },
-        ]
-    : user?.role === 'coach' ? coachSecondaryNav : playerSecondaryNav;
-  const displayName = coach?.full_name || (player ? `${player.first_name} ${player.last_name}` : 'User');
-  const isShowcaseCoach = coach?.coach_type === 'showcase';
-  const subtitle = coach ? ((coach.organization as { name?: string })?.name || 'Coach') : (player ? `${player.primary_position} • ${player.grad_year}` : '');
-
-  const handleNavClick = () => {
-    if (isMobile) {
-      setMobileOpen(false);
-    }
-  };
-
-  const handleSignOut = async () => {
-    await signOut();
-    router.push('/baseball/login');
-  };
-
-  // For mobile, always show expanded; for desktop, use collapsed state
-  const isCollapsed = isMobile ? false : collapsed;
-
-  return (
-    <aside
-      className={cn(
-        // Dark sidebar per Batch 3 spec
-        'bg-[rgba(28,25,23,0.97)] backdrop-blur-xl',
-        'h-dvh flex flex-col relative',
-        'transition-[width] duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-        'will-change-[width]',
-        isCollapsed ? 'w-[72px]' : 'w-64',
-        !isMobile && 'fixed left-0 top-0 z-40'
-      )}
-    >
-      {/* Collapse Toggle Button (desktop only) */}
-      {!isMobile && (
-        <Button variant="ghost"
-          onClick={() => setCollapsed(!collapsed)}
-          aria-label={isCollapsed ? 'Expand sidebar' : 'Collapse sidebar'}
-          className={cn(
-            'absolute -right-5 top-6 z-50',
-            'w-10 h-10 rounded-full bg-[#1C1917] border border-white/20',
-            'flex items-center justify-center',
-            'shadow-lg hover:bg-warm-50/10 active:bg-warm-50/15 hover:border-warm-50/30',
-            'transition-colors duration-200',
-            'focus:outline-none focus:ring-2 focus:ring-primary-500/40'
-          )}
-        >
-          {isCollapsed ? (
-            <IconChevronRight size={14} className="text-white/70" aria-hidden="true" />
-          ) : (
-            <IconChevronLeft size={14} className="text-white/70" aria-hidden="true" />
-          )}
-        </Button>
-      )}
-      {/* Logo */}
-      <div className={cn(
-        'h-16 shrink-0 flex items-center border-b border-white/10',
-        'transition-[padding] duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-        isCollapsed ? 'px-3 justify-center' : 'px-5'
-      )}>
-        <Link
-          href={dashboardHref}
-          className="flex items-center gap-3"
-          onClick={handleNavClick}
-        >
-          <div className="relative h-10 flex items-center">
-            {/* Icon version (shown when collapsed) */}
-            <div
-              aria-hidden={!isCollapsed}
-              className={cn(
-                'w-10 h-10 flex items-center justify-center flex-shrink-0',
-                'transition-[opacity,transform] duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-                isCollapsed ? 'opacity-100 scale-100' : 'opacity-0 scale-75 absolute'
-              )}
-            >
-              <Image
-                src="/anim/helm-baseball-icon.png"
-                alt="BaseballHelm"
-                width={300}
-                height={300}
-                className="w-10 h-10 object-contain"
-                priority
-                unoptimized
-              />
-            </div>
-            {/* Full logo + text (shown when expanded) */}
-            <div
-              aria-hidden={isCollapsed}
-              className={cn(
-                'flex items-center gap-2 transition-[opacity,transform] duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-                isCollapsed ? 'opacity-0 scale-75 absolute' : 'opacity-100 scale-100'
-              )}
-            >
-              <div className="w-10 h-10 flex items-center justify-center flex-shrink-0">
-                <Image
-                  src="/anim/helm-baseball-icon.png"
-                  alt=""
-                  width={300}
-                  height={300}
-                  className="w-10 h-10 object-contain"
-                  priority
-                  unoptimized
-                />
-              </div>
-              <span className="text-lg font-bold leading-none tracking-tight text-white">
-                Baseball<span className="text-primary-400">Helm</span>
-              </span>
-            </div>
-          </div>
-        </Link>
-      </div>
-
-      {/* Navigation
-          `min-h-0` is required here: this is a flex child inside a
-          `flex flex-col h-dvh` column alongside the fixed-height logo header
-          and the non-growing bottom (Settings/Sign-out) block. Without an
-          explicit min-height, some WebKit builds (notably Capacitor's iOS
-          WKWebView) size this item to its content instead of the remaining
-          flex space, which pushes the bottom block off-screen and clips the
-          list's last item(s) behind it. `pb-8` (vs. the `pt-4` top inset)
-          gives the last item real breathing room at the scroll end instead
-          of ending flush against the bottom block's top border, and the
-          inline styles enable native momentum scrolling on touch devices
-          without letting an exhausted scroll chain up into the page. */}
-      <nav
-        className={cn(
-          'flex-1 min-h-0 pt-4 pb-8 overflow-y-auto overflow-x-hidden custom-scrollbar',
-          'transition-[padding] duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-          isCollapsed ? 'px-2' : 'px-3'
-        )}
-        style={{
-          WebkitOverflowScrolling: 'touch',
-          overscrollBehavior: 'contain',
-        }}
-      >
-        {/* ARCHIVED: Recruiting mode toggle hidden — re-enable when recruiting is ready */}
-        {/* {showModeToggle && !isCollapsed && (
-          <div className="mb-4 px-1 animate-fade-in">
-            <ModeToggle currentMode={currentMode} onModeChange={handleModeChange} />
-          </div>
-        )} */}
-
-        {/* Team Switcher */}
-        {(isShowcaseCoach || (user?.role === 'player' && hasMultipleTeams)) && hasMultipleTeams && (
-          <TeamSwitcher collapsed={isCollapsed} />
-        )}
-
-        {/* Section Label */}
-        {!isCollapsed && (
-          <p className="px-3 py-2 text-label font-semibold text-white/40 uppercase tracking-wider whitespace-nowrap">
-            {user?.role === 'coach'
-              ? (coach?.coach_type === 'showcase' ? 'Organization' : 'Team')
-              : 'Team'}
-          </p>
-        )}
-
-        <ul className="space-y-0.5">
-          {navigation.map((item) => {
-            const isActive = isHubItemActive(item, pathname);
-            return (
-              <li key={item.name}>
-                <Link
-                  href={item.href}
-                  onClick={handleNavClick}
-                  title={isCollapsed ? item.name : undefined}
-                  className={cn(
-                    'flex items-center gap-3 py-3 rounded-md text-body-sm font-medium min-h-[44px]',
-                    'transition-colors duration-150 ease-out will-change-transform',
-                    'active:scale-[0.98]',
-                    isActive
-                      ? 'bg-warm-50/10 text-primary-400 border-l-[3px] border-primary-500 nav-item-active'
-                      : 'text-white/60 hover:bg-warm-50/5 active:bg-warm-50/10 hover:text-white/90',
-                    isCollapsed ? 'justify-center px-2' : 'px-3'
-                  )}
-                >
-                  <item.icon
-                    size={18}
-                    aria-hidden="true"
-                    className={cn(
-                      'flex-shrink-0 transition-colors duration-150',
-                      isActive ? 'text-primary-400 nav-item-active-icon' : 'text-white/50'
-                    )}
-                  />
-                  {/* Text - animates out */}
-                  <span
-                    className={cn(
-                      'flex-1 whitespace-nowrap transition-opacity duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-                      isCollapsed ? 'opacity-0 w-0 overflow-hidden' : 'opacity-100'
-                    )}
-                  >
-                    {item.name}
-                  </span>
-                  {/* Badge */}
-                  {item.badge && unreadCount > 0 && (
-                    <span
-                      className={cn(
-                        'flex items-center justify-center text-micro font-semibold bg-primary-600 text-white rounded-full transition-opacity duration-300',
-                        isCollapsed
-                          ? 'absolute -top-1 -right-1 min-w-[16px] h-[16px] px-1'
-                          : 'ml-auto px-1.5 py-0.5'
-                      )}
-                    >
-                      {unreadCount > 99 ? '99+' : unreadCount}
-                    </span>
-                  )}
-                </Link>
-              </li>
-            );
-          })}
-        </ul>
-
-        {/* Team-specific navigation for Showcase Coaches */}
-        {isShowcaseCoach && selectedTeam && teamNavigation.length > 0 && (
-          <>
-            {/* Divider */}
-            <div className="my-4 mx-3 h-px bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            {!isCollapsed && (
-              <p className="px-3 py-2 text-label font-semibold text-white/40 uppercase tracking-wider whitespace-nowrap overflow-hidden">
-                {selectedTeam.name}
-              </p>
-            )}
-            <ul className="space-y-0.5">
-              {teamNavigation.map((item) => {
-                const isActive = isHubItemActive(item, pathname);
-                return (
-                  <li key={item.name}>
-                    <Link
-                      href={item.href}
-                      onClick={handleNavClick}
-                      title={isCollapsed ? item.name : undefined}
-                      className={cn(
-                        'flex items-center gap-3 py-3 rounded-md text-body-sm font-medium min-h-[44px]',
-                        'transition-colors duration-150 ease-out',
-                        isActive
-                          ? 'bg-warm-50/10 text-primary-400 border-l-[3px] border-primary-500 nav-item-active'
-                          : 'text-white/60 hover:bg-warm-50/5 active:bg-warm-50/10 hover:text-white/90',
-                        isCollapsed ? 'justify-center px-2' : 'px-3'
-                      )}
-                    >
-                      <item.icon
-                        size={18}
-                        aria-hidden="true"
-                        className={cn(
-                          'flex-shrink-0 transition-colors',
-                          isActive ? 'text-primary-400 nav-item-active-icon' : 'text-white/50'
-                        )}
-                      />
-                      <span
-                        className={cn(
-                          'whitespace-nowrap transition-opacity duration-300',
-                          isCollapsed ? 'opacity-0 w-0 overflow-hidden' : 'opacity-100'
-                        )}
-                      >
-                        {item.name}
-                      </span>
-                    </Link>
-                  </li>
-                );
-              })}
-            </ul>
-          </>
-        )}
-
-        {/* Divider */}
-        <div className="my-4 mx-3 h-px bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-
-        {/* Secondary Navigation */}
-        {!isCollapsed && (
-          <p className="px-3 py-2 text-label font-semibold text-white/40 uppercase tracking-wider whitespace-nowrap">
-            More
-          </p>
-        )}
-        <ul className="space-y-0.5">
-          {secondaryNav.map((item) => {
-            const isActive = pathname === item.href || pathname.startsWith(item.href + '/');
-            return (
-              <li key={item.name}>
-                <Link
-                  href={item.href}
-                  onClick={handleNavClick}
-                  title={isCollapsed ? item.name : undefined}
-                  className={cn(
-                    'flex items-center gap-3 py-3 rounded-md text-body-sm font-medium min-h-[44px]',
-                    'transition-colors duration-150 ease-out',
-                    isActive
-                      ? 'bg-warm-50/10 text-primary-400 nav-item-active'
-                      : 'text-white/60 hover:bg-warm-50/5 active:bg-warm-50/10 hover:text-white/90',
-                    isCollapsed ? 'justify-center px-2' : 'px-3'
-                  )}
-                >
-                  <item.icon size={18} className="flex-shrink-0 text-white/50" aria-hidden="true" />
-                  <span
-                    className={cn(
-                      'whitespace-nowrap transition-opacity duration-300',
-                      isCollapsed ? 'opacity-0 w-0 overflow-hidden' : 'opacity-100'
-                    )}
-                  >
-                    {item.name}
-                  </span>
-                </Link>
-              </li>
-            );
-          })}
-        </ul>
-      </nav>
-
-      {/* Bottom section (Settings / Sign-out) — pinned below the scrollable
-          nav by normal flex flow (not `position: sticky`); `shrink-0` keeps
-          it at its natural content height so it never gets compressed by
-          the flex layout on short viewports, which would otherwise let its
-          own content (or the nav list above it) overlap/clip. */}
-      <div className={cn(
-        'shrink-0 border-t border-white/10 space-y-0.5',
-        'transition-[padding] duration-300',
-        isCollapsed ? 'p-2' : 'p-3'
-      )}>
-        {/* Pro badge (only when expanded) */}
-        <div
-          className={cn(
-            'rounded-xl bg-warm-50/5 border border-warm-50/10 overflow-hidden',
-            'transition-opacity duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-            isCollapsed ? 'h-0 opacity-0 p-0 mb-0 border-0' : 'h-auto opacity-100 p-3 mb-3'
-          )}
-        >
-          <div className="flex items-center gap-2 mb-1">
-            <span className="text-sm font-medium text-white">Free Plan</span>
-            
-          </div>
-          <div className="text-xs text-white/50">Free for all teams</div>
-        </div>
-
-        {/* User info */}
-        <div
-          className={cn(
-            'rounded-xl bg-warm-50/5 overflow-hidden transition-opacity duration-300 [transition-timing-function:cubic-bezier(0.4,0,0.2,1)]',
-            isCollapsed ? 'h-0 opacity-0 p-0 mb-0' : 'h-auto opacity-100 px-3 py-2.5 mb-2'
-          )}
-        >
-          <p className="text-sm font-medium text-white truncate">{displayName}</p>
-          <p className="text-xs text-white/50 truncate">{subtitle}</p>
-        </div>
-
-        {/* Sign out */}
-        <Button variant="danger"
-          onClick={handleSignOut}
-          aria-label="Sign out"
-          title={isCollapsed ? 'Sign out' : undefined}
-          className={cn(
-            'w-full flex items-center gap-3 py-3 rounded-md text-body-sm font-medium min-h-[44px]',
-            'text-white/60 hover:bg-red-500/10 hover:text-red-400',
-            'transition-colors duration-150 ease-out active:scale-[0.98]',
-            isCollapsed ? 'justify-center px-2' : 'px-3'
-          )}
-        >
-          <IconLogOut size={18} className="flex-shrink-0 text-white/50" aria-hidden="true" />
-          <span
-            className={cn(
-              'whitespace-nowrap transition-opacity duration-300',
-              isCollapsed ? 'opacity-0 w-0 overflow-hidden' : 'opacity-100'
-            )}
-          >
-            Sign out
-          </span>
-        </Button>
-      </div>
-    </aside>
-  );
-}
diff --git a/src/components/layout/team-switcher.tsx b/src/components/layout/team-switcher.tsx
deleted file mode 100644
index d956f086a..000000000
--- a/src/components/layout/team-switcher.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-'use client';
-
-import { useState, useRef, useEffect } from 'react';
-import { useRouter } from 'next/navigation';
-import { cn } from '@/lib/utils';
-import { useTeamStore, type Team } from '@/stores/team-store';
-import { IconChevronDown, IconCheck, IconUsers } from '@/components/icons';
-import { Button } from '@/components/ui/button';
-
-interface TeamSwitcherProps {
-  collapsed?: boolean;
-}
-
-export function TeamSwitcher({ collapsed = false }: TeamSwitcherProps) {
-  const router = useRouter();
-  const { teams, selectedTeamId, setSelectedTeamId, getSelectedTeam } = useTeamStore();
-  const [isOpen, setIsOpen] = useState(false);
-  const dropdownRef = useRef<HTMLDivElement>(null);
-
-  const selectedTeam = getSelectedTeam();
-
-  // Close dropdown on outside click
-  useEffect(() => {
-    function handleClickOutside(event: MouseEvent) {
-      if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
-        setIsOpen(false);
-      }
-    }
-    document.addEventListener('mousedown', handleClickOutside);
-    return () => document.removeEventListener('mousedown', handleClickOutside);
-  }, []);
-
-  const handleTeamSelect = (team: Team) => {
-    setSelectedTeamId(team.id);
-    setIsOpen(false);
-    // Refresh the page to load new team data
-    router.refresh();
-  };
-
-  if (teams.length === 0) {
-    return null;
-  }
-
-  // Collapsed view - just show icon
-  if (collapsed) {
-    return (
-      <div className="relative" ref={dropdownRef}>
-        <Button variant="ghost"
-          onClick={() => setIsOpen(!isOpen)}
-          title={selectedTeam?.name || 'Select team'}
-          className="p-2 rounded-lg hover:bg-warm-100 active:bg-warm-200 transition-colors"
-        >
-          {selectedTeam?.logo_url ? (
-            <img
-              src={selectedTeam.logo_url}
-              alt={selectedTeam.name}
-              className="w-6 h-6 rounded-lg object-cover"
-            />
-          ) : (
-            <div
-              className="w-6 h-6 rounded-lg flex items-center justify-center text-white text-xs font-medium"
-              style={{ backgroundColor: selectedTeam?.primary_color || '#16A34A' }}
-            >
-              {selectedTeam?.name?.charAt(0) || 'T'}
-            </div>
-          )}
-        </Button>
-
-        {isOpen && (
-          <div className="absolute left-full ml-2 top-0 w-56 bg-cream-50 rounded-xl border border-warm-200 shadow-lg py-2 z-50">
-            <div className="px-3 py-2 border-b border-warm-100">
-              <p className="text-xs font-medium text-warm-400 uppercase tracking-wider">
-                Switch Team
-              </p>
-            </div>
-            <div className="py-1">
-              {teams.map((team) => (
-                <Button variant="primary"
-                  key={team.id}
-                  onClick={() => handleTeamSelect(team)}
-                  className={cn(
-                    'w-full px-3 py-2 flex items-center gap-3 hover:bg-warm-50 active:bg-warm-100 transition-colors',
-                    team.id === selectedTeamId && 'bg-primary-50'
-                  )}
-                >
-                  {team.logo_url ? (
-                    <img
-                      src={team.logo_url}
-                      alt={team.name}
-                      className="w-8 h-8 rounded-lg object-cover"
-                    />
-                  ) : (
-                    <div
-                      className="w-8 h-8 rounded-lg flex items-center justify-center text-white text-sm font-medium"
-                      style={{ backgroundColor: team.primary_color || '#16A34A' }}
-                    >
-                      {team.name?.charAt(0) || 'T'}
-                    </div>
-                  )}
-                  <div className="flex-1 text-left">
-                    <p className="text-sm font-medium text-warm-900 truncate">{team.name}</p>
-                    <p className="text-xs text-warm-500">{team.team_type}</p>
-                  </div>
-                  {team.id === selectedTeamId && (
-                    <IconCheck size={16} className="text-primary-600" />
-                  )}
-                </Button>
-              ))}
-            </div>
-          </div>
-        )}
-      </div>
-    );
-  }
-
-  // Expanded view
-  return (
-    <div className="relative mb-4 px-1" ref={dropdownRef}>
-      <Button variant="ghost"
-        onClick={() => setIsOpen(!isOpen)}
-        className={cn(
-          'w-full px-3 py-2.5 rounded-xl border transition-all duration-200',
-          'flex items-center gap-3 text-left',
-          isOpen
-            ? 'border-primary-500 ring-2 ring-primary-100 bg-cream-50'
-            : 'border-warm-200 bg-cream-50 hover:border-warm-300'
-        )}
-      >
-        {selectedTeam?.logo_url ? (
-          <img
-            src={selectedTeam.logo_url}
-            alt={selectedTeam.name}
-            className="w-8 h-8 rounded-lg object-cover"
-          />
-        ) : (
-          <div
-            className="w-8 h-8 rounded-lg flex items-center justify-center text-white text-sm font-medium"
-            style={{ backgroundColor: selectedTeam?.primary_color || '#16A34A' }}
-          >
-            {selectedTeam?.name?.charAt(0) || 'T'}
-          </div>
-        )}
-        <div className="flex-1 min-w-0">
-          <p className="text-sm font-medium text-warm-900 truncate">
-            {selectedTeam?.name || 'Select Team'}
-          </p>
-          <p className="text-xs text-warm-500 truncate">
-            {selectedTeam?.team_type || 'No team selected'}
-          </p>
-        </div>
-        <IconChevronDown
-          size={16}
-          className={cn(
-            'text-warm-400 transition-transform duration-200',
-            isOpen && 'rotate-180'
-          )}
-        />
-      </Button>
-
-      {isOpen && (
-        <div className="absolute left-0 right-0 mt-2 bg-cream-50 rounded-xl border border-warm-200 shadow-lg py-2 z-50">
-          <div className="px-3 py-2 border-b border-warm-100">
-            <p className="text-xs font-medium text-warm-400 uppercase tracking-wider">
-              Your Teams ({teams.length})
-            </p>
-          </div>
-          <div className="py-1 max-h-64 overflow-y-auto">
-            {teams.map((team) => (
-              <Button variant="primary"
-                key={team.id}
-                onClick={() => handleTeamSelect(team)}
-                className={cn(
-                  'w-full px-3 py-2.5 flex items-center gap-3 hover:bg-warm-50 active:bg-warm-100 transition-colors',
-                  team.id === selectedTeamId && 'bg-primary-50'
-                )}
-              >
-                {team.logo_url ? (
-                  <img
-                    src={team.logo_url}
-                    alt={team.name}
-                    className="w-8 h-8 rounded-lg object-cover"
-                  />
-                ) : (
-                  <div
-                    className="w-8 h-8 rounded-lg flex items-center justify-center text-white text-sm font-medium"
-                    style={{ backgroundColor: team.primary_color || '#16A34A' }}
-                  >
-                    {team.name?.charAt(0) || 'T'}
-                  </div>
-                )}
-                <div className="flex-1 text-left min-w-0">
-                  <p className="text-sm font-medium text-warm-900 truncate">{team.name}</p>
-                  <div className="flex items-center gap-2 text-xs text-warm-500">
-                    <span>{team.team_type}</span>
-                    {team.member_count !== undefined && (
-                      <>
-                        <span>•</span>
-                        <span className="flex items-center gap-1">
-                          <IconUsers size={12} />
-                          {team.member_count}
-                        </span>
-                      </>
-                    )}
-                  </div>
-                </div>
-                {team.id === selectedTeamId && (
-                  <IconCheck size={16} className="text-primary-600 flex-shrink-0" />
-                )}
-              </Button>
-            ))}
-          </div>
-          <div className="border-t border-warm-100 px-3 py-2 mt-1">
-            <Button variant="ghost"
-              onClick={() => {
-                setIsOpen(false);
-                router.push('/baseball/dashboard/teams');
-              }}
-              className="w-full text-sm text-primary-600 hover:text-primary-700 font-medium py-1.5"
-            >
-              Manage All Teams →
-            </Button>
-          </div>
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/src/components/lifting/groups/StrengthGroupsClient.tsx b/src/components/lifting/groups/StrengthGroupsClient.tsx
index 851b052d8..8168158d7 100644
--- a/src/components/lifting/groups/StrengthGroupsClient.tsx
+++ b/src/components/lifting/groups/StrengthGroupsClient.tsx
@@ -21,7 +21,8 @@ import { Modal } from '@/components/ui/modal';
 import { Checkbox } from '@/components/ui/checkbox';
 import { EmptyState } from '@/components/ui/empty-state';
 import { Skeleton } from '@/components/ui/skeleton';
-import { IconPlus, IconUsers, IconUserPlus, IconUserX, IconTrash } from '@/components/icons';
+import { Tooltip } from '@/components/ui/tooltip';
+import { IconPlus, IconUsers, IconUserPlus, IconUserX, IconTrash, IconLock } from '@/components/icons';
 import {
   createGroup,
   deleteGroup,
@@ -96,6 +97,75 @@ const TYPE_META: Record<HelmLiftingGroupType, { label: string; cls: string }> =
   temporary: { label: 'Temp',      cls: 'bg-warm-50 text-warm-500 border-warm-200' },
 };
 
+// Dynamic groups (group_type='dynamic') are rule-managed: their membership is
+// computed server-side from rule_json, not maintained by hand — no rename/
+// archive/add-remove-member UI exists for them yet (that's the "unified Lab"
+// rule editor, tracked separately). This client renders them read-only with
+// this explanation rather than silently letting a coach "remove" a member the
+// rule will just re-add on the next recompute.
+const DYNAMIC_GROUP_TOOLTIP = 'Rule-managed group — edited rules coming to the unified Lab.';
+
+/**
+ * Defensive, best-effort human summary of a dynamic group's rule_json.
+ *
+ * The unified helm_lifting_groups.rule_json is expected to follow the same
+ * predicate shape as the legacy baseball_strength_groups rule engine
+ * (positions / grad_years / availability_statuses / thresholds — see
+ * BaseballStrengthGroupRules in lib/types/baseball-lifting-v11.ts), but this
+ * client never assumes that shape holds for every row: rule_json is typed
+ * `Json` (any JSON value) at the DB layer, golf groups may shape it
+ * differently, and prod rows may be sparse or malformed. Every access below
+ * is a runtime type-check, not a cast — an unrecognized/empty/non-object
+ * shape degrades to a generic label instead of throwing or rendering
+ * "undefined".
+ */
+function summarizeRuleJson(rule: unknown): string {
+  if (!rule || typeof rule !== 'object' || Array.isArray(rule)) {
+    return 'Rule-managed group';
+  }
+  const r = rule as Record<string, unknown>;
+  const asStringArray = (v: unknown): string[] =>
+    Array.isArray(v) ? v.filter((x): x is string => typeof x === 'string') : [];
+  const asNumberArray = (v: unknown): number[] =>
+    Array.isArray(v) ? v.filter((x): x is number => typeof x === 'number') : [];
+
+  const parts: string[] = [];
+
+  const positions = asStringArray(r.positions);
+  if (positions.length > 0) parts.push(`Position: ${positions.join(', ')}`);
+
+  const gradYears = asNumberArray(r.grad_years);
+  if (gradYears.length > 0) parts.push(`Class: ${gradYears.join(', ')}`);
+
+  const availability = asStringArray(r.availability_statuses);
+  if (availability.length > 0) parts.push(`Availability: ${availability.join(', ')}`);
+
+  if (typeof r.min_recent_pitch_count === 'number') {
+    parts.push(`Pitch count ≥ ${r.min_recent_pitch_count}`);
+  }
+  if (typeof r.min_soreness_severity === 'number') {
+    parts.push(`Soreness ≥ ${r.min_soreness_severity}`);
+  }
+  if (typeof r.bodyweight_min === 'number' || typeof r.bodyweight_max === 'number') {
+    const lo = typeof r.bodyweight_min === 'number' ? r.bodyweight_min : '—';
+    const hi = typeof r.bodyweight_max === 'number' ? r.bodyweight_max : '—';
+    parts.push(`Bodyweight ${lo}–${hi} lb`);
+  }
+  if (typeof r.lift_completion === 'string') {
+    parts.push(`Lift status: ${r.lift_completion}`);
+  }
+
+  if (parts.length === 0) {
+    const keyCount = Object.keys(r).length;
+    return keyCount > 0
+      ? `Custom rule (${keyCount} condition${keyCount === 1 ? '' : 's'})`
+      : 'Rule-managed group';
+  }
+
+  const matchAny = r.match === 'any';
+  return `${matchAny ? 'Matches any — ' : ''}${parts.join(' · ')}`;
+}
+
 export function StrengthGroupsClient({ groups: initialGroups, athletes, orgId, canEdit, loading = false }: Props) {
   const prefersReducedMotion = useReducedMotion();
   const [isPending, startTransition] = useTransition();
@@ -116,6 +186,10 @@ export function StrengthGroupsClient({ groups: initialGroups, athletes, orgId, c
     [groups, selectedGroupId],
   );
 
+  // Dynamic groups are rule-managed — see DYNAMIC_GROUP_TOOLTIP above for why
+  // rename/archive/add-remove-member affordances are disabled for them.
+  const isSelectedDynamic = selectedGroup?.group_type === 'dynamic';
+
   const groupAthletes = useMemo(() => {
     if (!selectedGroup) return [];
     const ids = new Set(selectedGroup.member_athlete_ids);
@@ -287,6 +361,14 @@ export function StrengthGroupsClient({ groups: initialGroups, athletes, orgId, c
                       <p className="text-eyebrow text-warm-400 mt-0.5">
                         {group.member_count} member{group.member_count !== 1 ? 's' : ''}
                       </p>
+                      {group.group_type === 'dynamic' && (
+                        <p
+                          className="text-eyebrow text-primary-600/80 mt-0.5 truncate"
+                          title={summarizeRuleJson(group.rule_json)}
+                        >
+                          {summarizeRuleJson(group.rule_json)}
+                        </p>
+                      )}
                     </Button>
                   </motion.div>
                 );
@@ -308,22 +390,48 @@ export function StrengthGroupsClient({ groups: initialGroups, athletes, orgId, c
           <div className="space-y-4">
             <div className="flex items-start justify-between gap-4">
               <div>
-                <h2 className="text-xl font-semibold text-warm-900">{selectedGroup.name}</h2>
+                <div className="flex items-center gap-2">
+                  <h2 className="text-xl font-semibold text-warm-900">{selectedGroup.name}</h2>
+                  {isSelectedDynamic && (
+                    <span className="inline-flex items-center gap-1 shrink-0 rounded-full border border-primary-200 bg-primary-50 px-1.5 py-0.5 text-microbadge font-medium text-primary-700">
+                      <IconLock size={10} /> Dynamic
+                    </span>
+                  )}
+                </div>
                 {selectedGroup.description && (
                   <p className="text-sm text-warm-500 mt-0.5">{selectedGroup.description}</p>
                 )}
                 <p className="text-xs text-warm-400 mt-1">{selectedGroup.member_count} members</p>
+                {isSelectedDynamic && (
+                  <div className="mt-2 flex items-start gap-1.5 rounded-lg border border-primary-100 bg-primary-50/60 px-2.5 py-1.5 text-xs text-primary-700">
+                    <IconLock size={12} className="mt-0.5 shrink-0" />
+                    <span>{summarizeRuleJson(selectedGroup.rule_json)}</span>
+                  </div>
+                )}
               </div>
               {canEdit && (
-                <Button
-                  size="sm"
-                  variant="ghost"
-                  className="text-warm-400 hover:text-red-600"
-                  disabled={isPending}
-                  onClick={() => handleArchive(selectedGroup.id)}
-                >
-                  <IconTrash size={14} className="mr-1" /> Archive
-                </Button>
+                isSelectedDynamic ? (
+                  <Tooltip content={DYNAMIC_GROUP_TOOLTIP}>
+                    <Button
+                      size="sm"
+                      variant="ghost"
+                      className="text-warm-300"
+                      disabled
+                    >
+                      <IconTrash size={14} className="mr-1" /> Archive
+                    </Button>
+                  </Tooltip>
+                ) : (
+                  <Button
+                    size="sm"
+                    variant="ghost"
+                    className="text-warm-400 hover:text-red-600"
+                    disabled={isPending}
+                    onClick={() => handleArchive(selectedGroup.id)}
+                  >
+                    <IconTrash size={14} className="mr-1" /> Archive
+                  </Button>
+                )
               )}
             </div>
 
@@ -331,7 +439,13 @@ export function StrengthGroupsClient({ groups: initialGroups, athletes, orgId, c
             {groupAthletes.length === 0 ? (
               <EmptyState
                 title="No members"
-                description={canEdit ? 'Add athletes from the panel below.' : 'No members in this group.'}
+                description={
+                  isSelectedDynamic
+                    ? 'No athletes currently match this group’s rule.'
+                    : canEdit
+                      ? 'Add athletes from the panel below.'
+                      : 'No members in this group.'
+                }
               />
             ) : (
               <Card variant="flat">
@@ -351,15 +465,23 @@ export function StrengthGroupsClient({ groups: initialGroups, athletes, orgId, c
                           <td className="py-2.5 px-3 text-warm-500">{a.position ?? '—'}</td>
                           {canEdit && (
                             <td className="py-2.5 pr-4 text-right">
-                              <Button
-                                size="sm"
-                                variant="ghost"
-                                className="text-red-500 hover:text-red-700"
-                                disabled={isPending}
-                                onClick={() => handleRemoveMember(a.id)}
-                              >
-                                <IconUserX size={13} className="mr-1" /> Remove
-                              </Button>
+                              {isSelectedDynamic ? (
+                                <Tooltip content={DYNAMIC_GROUP_TOOLTIP}>
+                                  <Button size="sm" variant="ghost" className="text-warm-300" disabled>
+                                    <IconUserX size={13} className="mr-1" /> Remove
+                                  </Button>
+                                </Tooltip>
+                              ) : (
+                                <Button
+                                  size="sm"
+                                  variant="ghost"
+                                  className="text-red-500 hover:text-red-700"
+                                  disabled={isPending}
+                                  onClick={() => handleRemoveMember(a.id)}
+                                >
+                                  <IconUserX size={13} className="mr-1" /> Remove
+                                </Button>
+                              )}
                             </td>
                           )}
                         </tr>
@@ -372,38 +494,51 @@ export function StrengthGroupsClient({ groups: initialGroups, athletes, orgId, c
 
             {/* Add members */}
             {canEdit && athletes.length > 0 && (
-              <div>
-                <h3 className="text-xs font-semibold uppercase tracking-wider text-warm-400 mb-2">Add athletes</h3>
-                <div className="mb-2">
-                  <Input
-                    placeholder="Search athletes…"
-                    value={athleteSearch}
-                    onChange={(e) => setAthleteSearch(e.target.value)}
-                  />
-                </div>
-                <div className="space-y-1 max-h-52 overflow-y-auto">
-                  {nonMembers.slice(0, 30).map((a) => (
-                    <div
-                      key={a.id}
-                      className="flex items-center justify-between rounded-lg px-3 py-2 hover:bg-warm-50 transition-colors"
-                    >
-                      <span className="text-sm text-warm-700">{athleteName(a)}{a.position ? ` · ${a.position}` : ''}</span>
-                      <Button
-                        size="sm"
-                        variant="ghost"
-                        className="text-primary-600"
-                        disabled={isPending}
-                        onClick={() => handleAddMember(a.id)}
+              isSelectedDynamic ? (
+                <Tooltip content={DYNAMIC_GROUP_TOOLTIP}>
+                  <div className="rounded-xl border border-warm-100 bg-warm-50/50 px-3 py-2.5 cursor-not-allowed">
+                    <h3 className="flex items-center gap-1.5 text-xs font-semibold uppercase tracking-wider text-warm-400">
+                      <IconLock size={11} /> Add athletes
+                    </h3>
+                    <p className="text-xs text-warm-400 mt-1">
+                      Membership is computed from this group’s rule — manual add is disabled.
+                    </p>
+                  </div>
+                </Tooltip>
+              ) : (
+                <div>
+                  <h3 className="text-xs font-semibold uppercase tracking-wider text-warm-400 mb-2">Add athletes</h3>
+                  <div className="mb-2">
+                    <Input
+                      placeholder="Search athletes…"
+                      value={athleteSearch}
+                      onChange={(e) => setAthleteSearch(e.target.value)}
+                    />
+                  </div>
+                  <div className="space-y-1 max-h-52 overflow-y-auto">
+                    {nonMembers.slice(0, 30).map((a) => (
+                      <div
+                        key={a.id}
+                        className="flex items-center justify-between rounded-lg px-3 py-2 hover:bg-warm-50 transition-colors"
                       >
-                        <IconUserPlus size={13} /> Add
-                      </Button>
-                    </div>
-                  ))}
-                  {nonMembers.length === 0 && (
-                    <p className="text-sm text-warm-400 px-3 py-2 italic">All athletes are already members.</p>
-                  )}
+                        <span className="text-sm text-warm-700">{athleteName(a)}{a.position ? ` · ${a.position}` : ''}</span>
+                        <Button
+                          size="sm"
+                          variant="ghost"
+                          className="text-primary-600"
+                          disabled={isPending}
+                          onClick={() => handleAddMember(a.id)}
+                        >
+                          <IconUserPlus size={13} /> Add
+                        </Button>
+                      </div>
+                    ))}
+                    {nonMembers.length === 0 && (
+                      <p className="text-sm text-warm-400 px-3 py-2 italic">All athletes are already members.</p>
+                    )}
+                  </div>
                 </div>
-              </div>
+              )
             )}
           </div>
         )}
diff --git a/src/components/lifting/groups/__tests__/StrengthGroupsClient.dynamic.test.tsx b/src/components/lifting/groups/__tests__/StrengthGroupsClient.dynamic.test.tsx
new file mode 100644
index 000000000..9637cf139
--- /dev/null
+++ b/src/components/lifting/groups/__tests__/StrengthGroupsClient.dynamic.test.tsx
@@ -0,0 +1,168 @@
+// =============================================================================
+// src/components/lifting/groups/__tests__/StrengthGroupsClient.dynamic.test.tsx
+//
+// Lane D2 fix #4: prod has real helm_lifting_groups rows with
+// group_type='dynamic' + rule_json, but StrengthGroupsClient previously only
+// rendered the static-group management affordances (rename/archive/add/
+// remove member) with no awareness that a selected group's membership might
+// be rule-computed, not hand-maintained. This guards the read-only contract:
+// dynamic groups render a "Dynamic" indicator + a defensively-parsed rule
+// summary, and every mutating affordance (archive, remove member, add
+// member) is disabled for them rather than silently letting a coach "edit" a
+// membership the rule will just recompute out from under them.
+// =============================================================================
+
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+
+vi.mock('framer-motion', async () => {
+  const ReactMod = await import('react');
+  return {
+    useReducedMotion: () => true,
+    motion: new Proxy(
+      {},
+      {
+        get: (_target, prop) =>
+          ReactMod.forwardRef<HTMLElement, Record<string, unknown>>((props, ref) => {
+            const { children, initial: _i, animate: _a, exit: _e, transition: _t, whileTap: _w, ...rest } = props;
+            void _i; void _a; void _e; void _t; void _w;
+            return ReactMod.createElement(prop as string, { ...rest, ref }, children as React.ReactNode);
+          }),
+      },
+    ),
+    AnimatePresence: ({ children }: { children: React.ReactNode }) => children,
+  };
+});
+
+vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn() } }));
+
+vi.mock('@/app/lifting/actions/groups', () => ({
+  createGroup: vi.fn(),
+  deleteGroup: vi.fn(),
+  addGroupMember: vi.fn(),
+  removeGroupMember: vi.fn(),
+}));
+
+import { StrengthGroupsClient } from '../StrengthGroupsClient';
+
+const ATHLETE_ID = 'athlete-1';
+
+// The component's `GroupWithMembers` (HelmLiftingGroupRow + member_count +
+// member_athlete_ids) isn't exported — derive it from the component's own
+// prop type instead of re-declaring it, so this fixture can never drift from
+// what StrengthGroupsClient actually expects.
+type GroupProp = React.ComponentProps<typeof StrengthGroupsClient>['groups'][number];
+
+function groupFixture(overrides: Partial<GroupProp> = {}): GroupProp {
+  return {
+    id: 'group-1',
+    organization_id: 'org-1',
+    sport: 'baseball' as const,
+    team_id: null,
+    name: 'Pitchers',
+    description: null,
+    group_type: 'dynamic' as const,
+    rule_json: { positions: ['P'], grad_years: [2027] },
+    created_by_coach_id: null,
+    is_active: true,
+    legacy_baseball_id: null,
+    created_at: '2026-01-01T00:00:00Z',
+    updated_at: '2026-01-01T00:00:00Z',
+    member_count: 1,
+    member_athlete_ids: [ATHLETE_ID],
+    ...overrides,
+  };
+}
+
+const ATHLETES = [
+  { id: ATHLETE_ID, first_name: 'Alex', last_name: 'Kim', position: 'P', sport: 'baseball' as const },
+];
+
+describe('StrengthGroupsClient — dynamic groups render read-only', () => {
+  it('shows the Dynamic badge and a parsed rule summary for the selected group', () => {
+    render(
+      <StrengthGroupsClient
+        groups={[groupFixture()]}
+        athletes={ATHLETES}
+        orgId="org-1"
+        canEdit
+      />,
+    );
+
+    expect(screen.getAllByText('Dynamic').length).toBeGreaterThan(0);
+    // Defensively parsed from rule_json = { positions: ['P'], grad_years: [2027] }.
+    expect(screen.getAllByText(/Position: P/).length).toBeGreaterThan(0);
+    expect(screen.getAllByText(/Class: 2027/).length).toBeGreaterThan(0);
+  });
+
+  it('disables the Archive button for a dynamic group', () => {
+    render(
+      <StrengthGroupsClient
+        groups={[groupFixture()]}
+        athletes={ATHLETES}
+        orgId="org-1"
+        canEdit
+      />,
+    );
+
+    const archiveButton = screen.getByRole('button', { name: /Archive/i });
+    expect(archiveButton).toBeDisabled();
+  });
+
+  it('disables the Remove-member button for a dynamic group', () => {
+    render(
+      <StrengthGroupsClient
+        groups={[groupFixture()]}
+        athletes={ATHLETES}
+        orgId="org-1"
+        canEdit
+      />,
+    );
+
+    const removeButton = screen.getByRole('button', { name: /Remove/i });
+    expect(removeButton).toBeDisabled();
+  });
+
+  it('replaces the Add-athletes panel with a locked explanation for a dynamic group', () => {
+    render(
+      <StrengthGroupsClient
+        groups={[groupFixture({ member_athlete_ids: [], member_count: 0 })]}
+        athletes={ATHLETES}
+        orgId="org-1"
+        canEdit
+      />,
+    );
+
+    expect(screen.queryByPlaceholderText('Search athletes…')).not.toBeInTheDocument();
+    expect(screen.getByText(/manual add is disabled/i)).toBeInTheDocument();
+  });
+
+  it('degrades to a generic label for malformed rule_json instead of throwing', () => {
+    render(
+      <StrengthGroupsClient
+        groups={[groupFixture({ rule_json: 'not-an-object' })]}
+        athletes={ATHLETES}
+        orgId="org-1"
+        canEdit
+      />,
+    );
+
+    expect(screen.getAllByText('Rule-managed group').length).toBeGreaterThan(0);
+  });
+
+  it('leaves a static group fully editable (archive + remove-member enabled)', () => {
+    render(
+      <StrengthGroupsClient
+        groups={[groupFixture({ group_type: 'static', rule_json: {} })]}
+        athletes={ATHLETES}
+        orgId="org-1"
+        canEdit
+      />,
+    );
+
+    expect(screen.getByRole('button', { name: /Archive/i })).not.toBeDisabled();
+    expect(screen.getByRole('button', { name: /Remove/i })).not.toBeDisabled();
+    expect(screen.getByPlaceholderText('Search athletes…')).toBeInTheDocument();
+  });
+});
diff --git a/src/components/messages/EmptyChatState.tsx b/src/components/messages/EmptyChatState.tsx
index f8f801a52..f1e287343 100644
--- a/src/components/messages/EmptyChatState.tsx
+++ b/src/components/messages/EmptyChatState.tsx
@@ -2,32 +2,34 @@
 
 import { cn } from '@/lib/utils';
 import { Button } from '@/components/ui/button';
-import { IconMessage, IconPlus } from '@/components/icons';
+import { IconPlus } from '@/components/icons';
+import { EmptyIssue } from '@/components/baseball/living-annual';
 
 interface EmptyChatStateProps {
   onNewConversation: () => void;
   className?: string;
 }
 
+/**
+ * "No conversation selected" — the chat pane's resting state before a thread
+ * is picked (mirrors `EmptyIssue variant="messages"` already used by the
+ * sibling `messages/[id]` "thread not found" state, per the Living-Annual
+ * empty-state doctrine — no bespoke gradient-chip empty box).
+ */
 export function EmptyChatState({ onNewConversation, className }: EmptyChatStateProps) {
   return (
-    <div className={cn(
-      'flex flex-col items-center justify-center bg-warm-50/50',
-      className
-    )}>
-      <div className="w-20 h-20 rounded-2xl bg-gradient-to-br from-primary-50 to-primary-100 flex items-center justify-center mb-6">
-        <IconMessage size={36} className="text-primary-600" />
-      </div>
-      <h3 className="text-lg font-semibold text-warm-900 mb-2">
-        No conversation selected
-      </h3>
-      <p className="text-sm text-warm-500 text-center max-w-xs mb-6 leading-relaxed">
-        Select a conversation from the list to view messages, or start a new conversation to connect with coaches and players.
-      </p>
-      <Button onClick={onNewConversation} className="gap-2">
-        <IconPlus size={16} />
-        New Message
-      </Button>
+    <div className={cn('flex items-center justify-center p-6', className)}>
+      <EmptyIssue
+        variant="messages"
+        ink="team"
+        className="max-w-md"
+        action={
+          <Button onClick={onNewConversation} className="gap-2">
+            <IconPlus size={16} />
+            New Message
+          </Button>
+        }
+      />
     </div>
   );
 }
diff --git a/src/contracts/baseball/product-trust.contract.test.ts b/src/contracts/baseball/product-trust.contract.test.ts
index 26e4bc14d..9c1bc3a50 100644
--- a/src/contracts/baseball/product-trust.contract.test.ts
+++ b/src/contracts/baseball/product-trust.contract.test.ts
@@ -30,8 +30,14 @@ describe('Baseball product-trust surface contracts', () => {
   });
 
   it('Documents client keeps an explicit empty copy path', () => {
-    const src = read('src/app/baseball/(dashboard)/dashboard/documents/documents-client.tsx');
-    expect(src).toMatch(/No documents/i);
+    // The empty state moved into the Living-Annual kit (EmptyIssue variant
+    // "documents" — copy lives in molecules/EmptyIssue.tsx as "The file drawer
+    // is empty."). Assert the structural empty path in the client chrome, and
+    // the copy itself at its single source of truth in the kit.
+    const src = read('src/components/baseball/documents/DocumentsFairway.tsx');
+    expect(src).toMatch(/EmptyIssue[\s\S]*?variant="documents"/);
+    const kit = read('src/components/baseball/living-annual/molecules/EmptyIssue.tsx');
+    expect(kit).toMatch(/documents:\s*\{[\s\S]*?title:\s*'[^']+'/);
   });
 
   it('canonical read models expose authorized + error envelopes', () => {
diff --git a/src/hooks/__tests__/use-baseball-auth.test.tsx b/src/hooks/__tests__/use-baseball-auth.test.tsx
index 631d55bf2..6714db20a 100644
--- a/src/hooks/__tests__/use-baseball-auth.test.tsx
+++ b/src/hooks/__tests__/use-baseball-auth.test.tsx
@@ -4,7 +4,7 @@
  * Covers:
  *  - Dedup: (dashboard)/layout.tsx mounts this hook twice on the same hard
  *    navigation (once in DashboardSessionGuard, once again inside
- *    BaseballShellLayout, gated so the second only mounts after the first
+ *    BaseballFairwayShell, gated so the second only mounts after the first
  *    settles). Before the fix, each mount independently ran the full
  *    4-round-trip session verification, doubling the time-to-chrome for
  *    every dashboard page load. The short-lived module cache must collapse
@@ -97,7 +97,7 @@ describe('useBaseballAuth', () => {
     // to land on a fresh cache key instead of resetting module state.
   });
 
-  it('dedupes two back-to-back mounts (DashboardSessionGuard + BaseballShellLayout) into a single verifyServerSession round trip', async () => {
+  it('dedupes two back-to-back mounts (DashboardSessionGuard + BaseballFairwayShell) into a single verifyServerSession round trip', async () => {
     const first = renderHook(() => useBaseballAuth(null));
     await waitFor(() => expect(first.result.current.loading).toBe(false));
     expect(first.result.current.authorized).toBe(true);
@@ -106,7 +106,7 @@ describe('useBaseballAuth', () => {
     expect(callsAfterFirst).toBe(1);
 
     // Second mount, same requiredRole, immediately after the first settles —
-    // exactly the DashboardSessionGuard -> BaseballShellLayout sequence.
+    // exactly the DashboardSessionGuard -> BaseballFairwayShell sequence.
     const second = renderHook(() => useBaseballAuth(null));
     await waitFor(() => expect(second.result.current.loading).toBe(false));
     expect(second.result.current.authorized).toBe(true);
diff --git a/src/hooks/use-baseball-auth.ts b/src/hooks/use-baseball-auth.ts
index 129f638f2..121c761d2 100644
--- a/src/hooks/use-baseball-auth.ts
+++ b/src/hooks/use-baseball-auth.ts
@@ -31,7 +31,7 @@ type VerifyResult =
 //
 // (dashboard)/layout.tsx's DashboardSessionGuard calls useBaseballAuth(null)
 // to gate the team-context recovery redirect, then — only once that settles —
-// mounts BaseballShellLayout, which calls useBaseballAuth(requiredRole) AGAIN
+// mounts BaseballFairwayShell, which calls useBaseballAuth(requiredRole) AGAIN
 // to gate the shared shell chrome. Both calls run the full 4-round-trip
 // verifyServerSession() (auth.getUser() + 3 parallel profile queries)
 // independently, back-to-back (never concurrently, since the second mount is
diff --git a/src/hooks/useCalendarEvents.ts b/src/hooks/useCalendarEvents.ts
index 15252e40b..a6d49c8d2 100644
--- a/src/hooks/useCalendarEvents.ts
+++ b/src/hooks/useCalendarEvents.ts
@@ -39,6 +39,19 @@ interface UseCalendarEventsOptions {
   endDate: Date;
 }
 
+/**
+ * Display-only default for a missing `end_time` — mirrors the drag-reschedule
+ * fallback in PremiumCalendarClient ("Fallback: 1 hour duration") and the
+ * baseball calendar page's server-side mapping. NEVER written back to the
+ * DB; only the mapped `end_date` (display field) uses this — the raw
+ * `end_time` column value is passed through unchanged.
+ */
+function defaultEndTime(startIso: string): string {
+  const start = new Date(startIso);
+  if (Number.isNaN(start.getTime())) return startIso;
+  return new Date(start.getTime() + 60 * 60 * 1000).toISOString();
+}
+
 export function useCalendarEvents({ teamId, startDate, endDate }: UseCalendarEventsOptions) {
   const [events, setEvents] = useState<CalendarEvent[]>([]);
   const [loading, setLoading] = useState(true);
@@ -74,7 +87,11 @@ export function useCalendarEvents({ teamId, startDate, endDate }: UseCalendarEve
         // For all-day events, normalize dates to prevent timezone shift
         const mappedEvents = (data || []).map(event => {
           let startDateVal = event.start_time;
-          let endDateVal = event.end_time || event.start_time;
+          // NULL end_time previously collapsed to `event.start_time`,
+          // producing a zero-duration timed event. Default to start + 1h for
+          // display only (all-day events are normalized to midnight below
+          // regardless, so the fallback only matters for timed events).
+          let endDateVal = event.end_time || (event.all_day ? event.start_time : defaultEndTime(event.start_time));
           if (event.all_day) {
             const normalize = (d: string) => `${d.slice(0, 10)}T00:00:00`;
             startDateVal = normalize(startDateVal);
diff --git a/src/lib/baseball/__tests__/breadcrumbs.test.ts b/src/lib/baseball/__tests__/breadcrumbs.test.ts
new file mode 100644
index 000000000..7278f9b92
--- /dev/null
+++ b/src/lib/baseball/__tests__/breadcrumbs.test.ts
@@ -0,0 +1,122 @@
+import { describe, expect, it } from 'vitest';
+import {
+  buildBreadcrumbs,
+  isIdShapedSegment,
+  singularize,
+} from '@/app/baseball/(dashboard)/_components/breadcrumbs';
+import type { BaseballNavContext } from '@/lib/baseball/nav-registry';
+
+const HOME_HREF = '/baseball/dashboard/command-center';
+
+function coachCtx(overrides: Partial<BaseballNavContext> = {}): BaseballNavContext {
+  return { role: 'coach', capabilities: {}, programType: 'college', ...overrides };
+}
+
+describe('isIdShapedSegment (Ruling 4)', () => {
+  it('recognizes a UUID', () => {
+    expect(isIdShapedSegment('5e03752b-d7fe-5e31-ab39-f588ba3649d2')).toBe(true);
+  });
+
+  it('recognizes an upper-case UUID', () => {
+    expect(isIdShapedSegment('5E03752B-D7FE-5E31-AB39-F588BA3649D2')).toBe(true);
+  });
+
+  it('recognizes a purely-numeric id', () => {
+    expect(isIdShapedSegment('482910')).toBe(true);
+  });
+
+  it('does not flag ordinary route words', () => {
+    expect(isIdShapedSegment('stats')).toBe(false);
+    expect(isIdShapedSegment('dev-plans')).toBe(false);
+    expect(isIdShapedSegment('scout-packet')).toBe(false);
+  });
+});
+
+describe('singularize', () => {
+  it('strips a trailing s', () => {
+    expect(singularize('players')).toBe('player');
+    expect(singularize('games')).toBe('game');
+    expect(singularize('programs')).toBe('program');
+  });
+
+  it('never strips a trailing ss', () => {
+    expect(singularize('address')).toBe('address');
+  });
+
+  it('leaves words with no trailing s alone', () => {
+    expect(singularize('lift')).toBe('lift');
+  });
+});
+
+describe('buildBreadcrumbs — UUID/numeric-id segments never render raw (Ruling 4)', () => {
+  it('never title-cases a UUID last segment (the reported bug shape)', () => {
+    const pathname = '/baseball/dashboard/players/5e03752b-d7fe-5e31-ab39-f588ba3649d2';
+    const crumbs = buildBreadcrumbs(pathname, coachCtx(), HOME_HREF);
+    const last = crumbs[crumbs.length - 1]!.label;
+    expect(last).not.toMatch(/5e03752b|D7fe|Ab39|F588ba3649d2/i);
+    expect(last).not.toContain('-');
+  });
+
+  it('falls back to a singularized parent segment when no nav entry href prefix-matches (players → Player)', () => {
+    const pathname = '/baseball/dashboard/players/5e03752b-d7fe-5e31-ab39-f588ba3649d2';
+    const crumbs = buildBreadcrumbs(pathname, coachCtx(), HOME_HREF);
+    expect(crumbs).toEqual([
+      { label: 'Dashboard', href: HOME_HREF },
+      { label: 'Player' },
+    ]);
+  });
+
+  it('falls back to a singularized parent segment when no nav entry covers the route (stats/games → Game)', () => {
+    const pathname = '/baseball/dashboard/stats/games/482910';
+    const crumbs = buildBreadcrumbs(pathname, coachCtx(), HOME_HREF);
+    expect(crumbs).toEqual([
+      { label: 'Dashboard', href: HOME_HREF },
+      { label: 'Game' },
+    ]);
+  });
+
+  it('never title-cases a purely-numeric last segment either', () => {
+    const pathname = '/baseball/dashboard/stats/games/482910';
+    const crumbs = buildBreadcrumbs(pathname, coachCtx(), HOME_HREF);
+    expect(crumbs[crumbs.length - 1]!.label).not.toBe('482910');
+  });
+
+  it('an override label (real record name) wins over any fallback', () => {
+    const pathname = '/baseball/dashboard/players/5e03752b-d7fe-5e31-ab39-f588ba3649d2';
+    const crumbs = buildBreadcrumbs(pathname, coachCtx(), HOME_HREF, 'Jake Thompson');
+    expect(crumbs).toEqual([
+      { label: 'Dashboard', href: HOME_HREF },
+      { label: 'Jake Thompson' },
+    ]);
+  });
+
+  it('a dynamic dev-plan id resolves via its registry entry, and an override still wins', () => {
+    const pathname = '/baseball/dashboard/dev-plans/5e03752b-d7fe-5e31-ab39-f588ba3649d2';
+    const withoutOverride = buildBreadcrumbs(pathname, coachCtx(), HOME_HREF);
+    expect(withoutOverride[1]!.label).not.toMatch(/5e03752b/i);
+
+    const withOverride = buildBreadcrumbs(pathname, coachCtx(), HOME_HREF, 'Offseason Strength Plan');
+    expect(withOverride[1]!.label).toBe('Offseason Strength Plan');
+  });
+
+  it('leaves non-id last segments title-cased as before (no regression)', () => {
+    const pathname = '/baseball/dashboard/settings/imports';
+    const crumbs = buildBreadcrumbs(pathname, coachCtx(), HOME_HREF);
+    expect(crumbs[crumbs.length - 1]!.label).not.toBe('');
+    expect(crumbs[crumbs.length - 1]!.label).not.toMatch(/^[0-9a-f-]+$/i);
+  });
+
+  it('routes moved by the nav IA read sensibly: announcements → Messages hub label', () => {
+    const crumbs = buildBreadcrumbs('/baseball/dashboard/announcements', coachCtx(), HOME_HREF);
+    expect(crumbs[1]!.label).toBe('Announcements');
+  });
+
+  it('routes moved by the nav IA read sensibly: documents/travel keep their own labels', () => {
+    expect(buildBreadcrumbs('/baseball/dashboard/documents', coachCtx(), HOME_HREF)[1]!.label).toBe('Documents');
+    expect(buildBreadcrumbs('/baseball/dashboard/travel', coachCtx(), HOME_HREF)[1]!.label).toBe('Travel');
+  });
+
+  it('the dashboard home route renders a single "Dashboard" crumb with no href', () => {
+    expect(buildBreadcrumbs(HOME_HREF, coachCtx(), HOME_HREF)).toEqual([{ label: 'Dashboard' }]);
+  });
+});
diff --git a/src/lib/baseball/__tests__/nav-manifest.test.ts b/src/lib/baseball/__tests__/nav-manifest.test.ts
index 654f9c7b3..2bc36d0bf 100644
--- a/src/lib/baseball/__tests__/nav-manifest.test.ts
+++ b/src/lib/baseball/__tests__/nav-manifest.test.ts
@@ -22,7 +22,11 @@ import {
   type NavManifestEntry,
 } from '../nav-manifest';
 import { BASEBALL_NAV_REGISTRY, BASEBALL_MESSAGES_NAV, type BaseballNavHub } from '../nav-registry';
+import { BASEBALL_CAPABILITY_KEYS, type BaseballCapabilityMap } from '../capabilities';
+import type { BaseballProgramType } from '@/lib/types/baseball-settings';
 import {
+  COACH_HUB_ORDER,
+  COACH_HUB_DEFS,
   COACH_TEAM_TABS,
   COACH_STATS_TABS,
   COACH_DEVELOPMENT_TABS,
@@ -34,6 +38,12 @@ import {
   PLAYER_TEAM_TABS,
   PLAYER_RECRUITING_TABS,
 } from '@/app/baseball/(dashboard)/_components/hub-definitions';
+import type { HubSubNavTab } from '@/app/baseball/(dashboard)/_components/hub-sub-nav';
+import {
+  resolveActiveHub,
+  filterHubTabsByCapabilities,
+  filterHubTabsByProgramType,
+} from '@/app/baseball/(dashboard)/_components/resolve-active-hub';
 
 const REPO_ROOT = join(__dirname, '..', '..', '..', '..'); // → repo root
 const APP_DIR = join(REPO_ROOT, 'src', 'app');
@@ -243,6 +253,7 @@ describe('BASEBALL_NAV_MANIFEST', () => {
   describe('every coach/both registry entry declares exactly one hub', () => {
     const VALID_HUBS: readonly BaseballNavHub[] = [
       'dashboard',
+      'messages',
       'team',
       'stats-performance',
       'development',
@@ -258,12 +269,12 @@ describe('BASEBALL_NAV_MANIFEST', () => {
 
     it.each(
       BASEBALL_NAV_REGISTRY.filter((e) => e.role !== 'player').map((e) => [e.id] as const),
-    )('%s declares a hub from the 7-hub set', (id) => {
+    )('%s declares a hub from the 8-hub set', (id) => {
       const entry = BASEBALL_NAV_REGISTRY.find((e) => e.id === id)!;
       expect(entry.hub, `registry entry "${id}" (role: ${entry.role}) is missing a hub`).toBeTruthy();
       expect(
         VALID_HUBS.includes(entry.hub!),
-        `registry entry "${id}" declares hub "${entry.hub}", which is not one of the 7 grouped hubs`,
+        `registry entry "${id}" declares hub "${entry.hub}", which is not one of the 8 grouped hubs`,
       ).toBe(true);
     });
 
@@ -272,4 +283,98 @@ describe('BASEBALL_NAV_MANIFEST', () => {
       expect(playerEntriesWithHub.map((e) => e.id)).toEqual([]);
     });
   });
+
+  // ---------------------------------------------------------------------------
+  // COHERENCE_RULING_2026-07-08.md Ruling 2 — the permanent ≤3-subtabs-per-hub
+  // anti-regression lock (item 10 of the A2 task). Four assertions:
+  //   (a) every coach/both registry entry has exactly one hub — covered above.
+  //   (b) every coach hub renders ≤3 subtabs, for EVERY coach type.
+  //   (c) every player hub renders ≤3 subtabs.
+  //   (d) every folded (`foldedUnder`-marked) destination still resolves to a
+  //       hub via resolve-active-hub (command palette + deep links stay live
+  //       even though the destination lost its own hub-tab slot).
+  // ---------------------------------------------------------------------------
+  describe('Ruling 2 — ≤3 subtabs per hub (permanent anti-regression lock)', () => {
+    it('(b) every coach hub renders ≤3 subtabs in the RAW (unfiltered) array', () => {
+      // Raw arrays are the ceiling: capability + program-type filtering
+      // (filterHubTabsByCapabilities / filterHubTabsByProgramType) only ever
+      // REMOVES tabs for a given coach type, never adds — so asserting the
+      // unfiltered array proves the cap holds for every coach type at once.
+      for (const hubId of COACH_HUB_ORDER) {
+        const tabs = COACH_HUB_DEFS[hubId].tabs;
+        expect(
+          tabs.length,
+          `hub "${hubId}" renders ${tabs.length} subtabs (${tabs.map((t) => t.id).join(', ')}) — Ruling 2 caps every hub at 3`,
+        ).toBeLessThanOrEqual(3);
+      }
+    });
+
+    it('(b) every coach hub renders ≤3 subtabs for a fully-capable head coach in every program type', () => {
+      const PROGRAM_TYPES: readonly BaseballProgramType[] = [
+        'college',
+        'high_school',
+        'showcase',
+        'juco',
+        'academy',
+        'club',
+      ];
+      const allCaps = BASEBALL_CAPABILITY_KEYS.reduce((acc, key) => {
+        acc[key] = true;
+        return acc;
+      }, {} as BaseballCapabilityMap);
+
+      for (const programType of PROGRAM_TYPES) {
+        for (const hubId of COACH_HUB_ORDER) {
+          const capFiltered = filterHubTabsByCapabilities(COACH_HUB_DEFS[hubId].tabs, 'coach', allCaps);
+          const visible = filterHubTabsByProgramType(capFiltered, programType);
+          expect(
+            visible.length,
+            `hub "${hubId}" renders ${visible.length} subtabs for a head coach in "${programType}" — Ruling 2 caps every hub at 3`,
+          ).toBeLessThanOrEqual(3);
+        }
+      }
+    });
+
+    it('(c) every player hub renders ≤3 subtabs', () => {
+      const PLAYER_HUB_ARRAYS: readonly { id: string; tabs: readonly HubSubNavTab[] }[] = [
+        { id: 'player-stats', tabs: PLAYER_STATS_TABS },
+        { id: 'player-development', tabs: PLAYER_DEVELOPMENT_TABS },
+        { id: 'player-team', tabs: PLAYER_TEAM_TABS },
+        { id: 'player-recruiting', tabs: PLAYER_RECRUITING_TABS },
+      ];
+      for (const { id, tabs } of PLAYER_HUB_ARRAYS) {
+        expect(
+          tabs.length,
+          `player hub "${id}" renders ${tabs.length} subtabs (${tabs.map((t) => t.id).join(', ')}) — Ruling 2 caps every hub at 3`,
+        ).toBeLessThanOrEqual(3);
+      }
+    });
+
+    it('(d) every foldedUnder destination still resolves to its owning hub via resolve-active-hub', () => {
+      const folded = BASEBALL_NAV_REGISTRY.filter((e) => e.foldedUnder);
+      expect(folded.length, 'sanity: at least one entry should be folded').toBeGreaterThan(0);
+
+      const allCaps = BASEBALL_CAPABILITY_KEYS.reduce((acc, key) => {
+        acc[key] = true;
+        return acc;
+      }, {} as BaseballCapabilityMap);
+
+      for (const entry of folded) {
+        const resolved = resolveActiveHub({
+          pathname: entry.href,
+          role: 'coach',
+          // A head coach in every recruiting-eligible + showcase-org program
+          // type at once isn't a real user, but this test only needs to prove
+          // the ROUTE resolves to a hub somewhere — the per-mode ≤3 cap is
+          // already locked by the two tests above.
+          programType: 'showcase',
+          capabilities: allCaps,
+        });
+        expect(
+          resolved,
+          `folded destination "${entry.id}" (${entry.href}, foldedUnder: "${entry.foldedUnder}") does not resolve to any hub via resolveActiveHub`,
+        ).not.toBeNull();
+      }
+    });
+  });
 });
diff --git a/src/lib/baseball/__tests__/resolve-active-hub.test.ts b/src/lib/baseball/__tests__/resolve-active-hub.test.ts
index e67219d86..65bd3073d 100644
--- a/src/lib/baseball/__tests__/resolve-active-hub.test.ts
+++ b/src/lib/baseball/__tests__/resolve-active-hub.test.ts
@@ -4,37 +4,44 @@ import {
   resolveActiveHub,
 } from '@/app/baseball/(dashboard)/_components/resolve-active-hub';
 import {
+  COACH_DEVELOPMENT_TABS,
   COACH_MANAGEMENT_TABS,
+  COACH_MESSAGES_TABS,
   COACH_STATS_TABS,
 } from '@/app/baseball/(dashboard)/_components/hub-definitions';
 
 describe('resolveActiveHub — capability-filtered tabs (#370)', () => {
-  it('hides performance hub tabs when coach lacks lifting and readiness caps', () => {
-    const filtered = filterHubTabsByCapabilities(COACH_STATS_TABS, 'coach', {
+  it('hides the Training (performance) tab when coach lacks lifting and readiness caps', () => {
+    const filtered = filterHubTabsByCapabilities(COACH_DEVELOPMENT_TABS, 'coach', {
       can_manage_stats: true,
     });
-    const performanceIds = filtered
-      .filter((t) => t.id.startsWith('performance'))
-      .map((t) => t.id);
-    expect(performanceIds).toEqual([]);
+    expect(filtered.some((t) => t.id === 'performance')).toBe(false);
   });
 
-  it('shows performance overview when coach has can_view_readiness only', () => {
-    const filtered = filterHubTabsByCapabilities(COACH_STATS_TABS, 'coach', {
+  it('shows the Training (performance) tab when coach has can_view_readiness only', () => {
+    const filtered = filterHubTabsByCapabilities(COACH_DEVELOPMENT_TABS, 'coach', {
       can_view_readiness: true,
     });
     expect(filtered.some((t) => t.id === 'performance')).toBe(true);
-    expect(filtered.some((t) => t.id === 'performance-programs')).toBe(false);
   });
 
-  it('filters performance-programs from stats hub when coach lacks can_manage_lifting', () => {
+  it('Ruling 2: the Training tab reads "Training" in the hub strip (hubTabLabel override)', () => {
+    const performance = COACH_DEVELOPMENT_TABS.find((t) => t.id === 'performance');
+    expect(performance?.label).toBe('Training');
+  });
+
+  it('keeps /performance/programs (a Live Weight Room sub-route reached via in-page links, not its own tab) inside the Development hub', () => {
     const hub = resolveActiveHub({
       pathname: '/baseball/dashboard/performance/programs',
       role: 'coach',
       programType: 'college',
-      capabilities: { can_manage_stats: true },
+      capabilities: { can_manage_lifting: true },
     });
-    expect(hub?.id).toBe('stats');
+    expect(hub?.id).toBe('development');
+    // performance/programs is NOT its own hub-tab post-Ruling-2 (reached via
+    // the Performance page's own in-page masthead links) — it resolves to the
+    // Training (performance) tab via that entry's matchPrefixes.
+    expect(hub?.tabs.some((t) => t.id === 'performance')).toBe(true);
     expect(hub?.tabs.some((t) => t.id === 'performance-programs')).toBe(false);
   });
 
@@ -49,6 +56,23 @@ describe('resolveActiveHub — capability-filtered tabs (#370)', () => {
     expect(hub?.tabs.some((t) => t.id === 'games')).toBe(true);
   });
 
+  it('resolves Stats Center Upload + Import Center + Season into the Stats hub (Ruling 2: CTAs/view inside Stats Center, not their own tabs)', () => {
+    for (const pathname of [
+      '/baseball/dashboard/stats/upload',
+      '/baseball/dashboard/stats/season',
+      '/baseball/dashboard/import',
+    ]) {
+      const hub = resolveActiveHub({
+        pathname,
+        role: 'coach',
+        programType: 'college',
+        capabilities: { can_manage_stats: true, can_manage_imports: true },
+      });
+      expect(hub?.id, `${pathname} should resolve to the stats hub`).toBe('stats');
+      expect(hub?.tabs.some((t) => t.id === 'stats-center')).toBe(true);
+    }
+  });
+
   it('keeps coach dev-plan details inside the development hub', () => {
     const hub = resolveActiveHub({
       pathname: '/baseball/dashboard/dev-plans/demo-plan-id',
@@ -60,7 +84,41 @@ describe('resolveActiveHub — capability-filtered tabs (#370)', () => {
     expect(hub?.tabs.some((t) => t.id === 'dev-plans')).toBe(true);
   });
 
-  it('activates the management hub on nested settings routes', () => {
+  it('resolves Team>Operations folds (Documents/Travel/Practice Planner/Practice Effectiveness) into the Team hub, Operations subtab', () => {
+    for (const pathname of [
+      '/baseball/dashboard/documents',
+      '/baseball/dashboard/travel',
+      '/baseball/dashboard/practice',
+      '/baseball/dashboard/practice-effectiveness',
+    ]) {
+      const hub = resolveActiveHub({
+        pathname,
+        role: 'coach',
+        programType: 'college',
+        capabilities: { can_manage_practice: true },
+      });
+      expect(hub?.id, `${pathname} should resolve to the team hub`).toBe('team');
+      expect(hub?.tabs.some((t) => t.id === 'operations')).toBe(true);
+    }
+  });
+
+  it('resolves /dashboard/announcements to the Messages hub, Announcements subtab (Ruling 2: moved off Team)', () => {
+    const hub = resolveActiveHub({
+      pathname: '/baseball/dashboard/announcements',
+      role: 'coach',
+      programType: 'college',
+      capabilities: {},
+    });
+    expect(hub?.id).toBe('messages');
+    expect(hub?.tabs.map((t) => t.id)).toEqual(COACH_MESSAGES_TABS.map((t) => t.id));
+    expect(hub?.tabs.some((t) => t.id === 'announcements')).toBe(true);
+  });
+
+  it('the Messages hub renders exactly Messages + Announcements', () => {
+    expect(COACH_MESSAGES_TABS.map((t) => t.id)).toEqual(['messages', 'announcements']);
+  });
+
+  it('activates the management hub, Settings subtab on nested settings routes (Ruling 2: the 9-tab splice is gone)', () => {
     const hub = resolveActiveHub({
       pathname: '/baseball/dashboard/settings/imports',
       role: 'coach',
@@ -68,7 +126,10 @@ describe('resolveActiveHub — capability-filtered tabs (#370)', () => {
       capabilities: { can_manage_settings: true, can_manage_imports: true },
     });
     expect(hub?.id).toBe('management');
-    expect(hub?.tabs.some((t) => t.id === 'settings-imports')).toBe(true);
+    expect(hub?.tabs.some((t) => t.id === 'settings')).toBe(true);
+    // The old per-section hub-tab ids no longer exist — the whole
+    // /dashboard/settings/* tree resolves via the single "settings" tab.
+    expect(hub?.tabs.some((t) => t.id === 'settings-imports')).toBe(false);
   });
 
   it('activates the player recruiting hub on exposure routes', () => {
@@ -80,15 +141,30 @@ describe('resolveActiveHub — capability-filtered tabs (#370)', () => {
     expect(hub?.id).toBe('recruiting');
   });
 
-  it('includes settings home via program-settings href (ownedPrefixes, not duplicate matchPrefixes)', () => {
-    const hub = resolveActiveHub({
-      pathname: '/baseball/dashboard/settings',
-      role: 'coach',
-      programType: 'college',
-      capabilities: { can_manage_settings: true },
-    });
-    expect(hub?.id).toBe('management');
-    expect(hub?.tabs.some((t) => t.id === 'settings-home')).toBe(true);
+  it('resolves the Settings landing itself (and Program Info, a non-nested fold) into the management hub', () => {
+    for (const pathname of ['/baseball/dashboard/settings', '/baseball/dashboard/program']) {
+      const hub = resolveActiveHub({
+        pathname,
+        role: 'coach',
+        programType: 'college',
+        capabilities: { can_manage_settings: true },
+      });
+      expect(hub?.id, `${pathname} should resolve to the management hub`).toBe('management');
+      expect(hub?.tabs.some((t) => t.id === 'settings')).toBe(true);
+    }
+  });
+
+  it('resolves Teams/Events into the management hub, Organization subtab for showcase-type programs', () => {
+    for (const pathname of ['/baseball/dashboard/teams', '/baseball/dashboard/events']) {
+      const hub = resolveActiveHub({
+        pathname,
+        role: 'coach',
+        programType: 'showcase',
+        capabilities: { can_manage_settings: true },
+      });
+      expect(hub?.id, `${pathname} should resolve to the management hub`).toBe('management');
+      expect(hub?.tabs.some((t) => t.id === 'organization')).toBe(true);
+    }
   });
 
   it('activates academics for college coaches with the academics capability', () => {
@@ -101,11 +177,45 @@ describe('resolveActiveHub — capability-filtered tabs (#370)', () => {
     expect(hub?.id).toBe('academics');
     expect(hub?.tabs.map((t) => t.id)).toEqual(['academics']);
   });
+
+  it('resolves Recruiting>Scouting folds (Watchlist/Compare/Saved Comparisons/Scout Packets/Camps) into the Recruiting hub, Scouting subtab', () => {
+    for (const pathname of [
+      '/baseball/dashboard/watchlist',
+      '/baseball/dashboard/compare',
+      '/baseball/dashboard/comparisons',
+      '/baseball/dashboard/scout-packets',
+      '/baseball/dashboard/camps',
+    ]) {
+      const hub = resolveActiveHub({
+        pathname,
+        role: 'coach',
+        programType: 'showcase',
+        capabilities: { can_manage_roster: true, can_export_reports: true },
+      });
+      expect(hub?.id, `${pathname} should resolve to the recruiting hub`).toBe('recruiting');
+      expect(hub?.tabs.some((t) => t.id === 'scouting')).toBe(true);
+    }
+  });
+
+  it('resolves /dashboard/college-interest into the Recruiting hub, Pipeline subtab', () => {
+    const hub = resolveActiveHub({
+      pathname: '/baseball/dashboard/college-interest',
+      role: 'coach',
+      programType: 'college',
+      capabilities: {},
+    });
+    expect(hub?.id).toBe('recruiting');
+    expect(hub?.tabs.some((t) => t.id === 'pipeline')).toBe(true);
+  });
 });
 
-describe('COACH_MANAGEMENT_TABS — settings supplement anchor', () => {
-  it('includes the program-settings registry tab before settings supplements', () => {
-    expect(COACH_MANAGEMENT_TABS.some((t) => t.id === 'program-settings')).toBe(true);
-    expect(COACH_MANAGEMENT_TABS.some((t) => t.id === 'settings-home')).toBe(true);
+describe('every coach hub caps at 3 rendered subtabs (Ruling 2)', () => {
+  it.each([
+    ['stats-performance', COACH_STATS_TABS],
+    ['development', COACH_DEVELOPMENT_TABS],
+    ['management', COACH_MANAGEMENT_TABS],
+    ['messages', COACH_MESSAGES_TABS],
+  ] as const)('%s renders ≤3 tabs', (_hub, tabs) => {
+    expect(tabs.length).toBeLessThanOrEqual(3);
   });
 });
diff --git a/src/lib/baseball/nav-manifest.ts b/src/lib/baseball/nav-manifest.ts
index b46f2f942..de45c893c 100644
--- a/src/lib/baseball/nav-manifest.ts
+++ b/src/lib/baseball/nav-manifest.ts
@@ -52,6 +52,8 @@ import { BASEBALL_NAV_REGISTRY, BASEBALL_MESSAGES_NAV } from './nav-registry';
 import type { BaseballCapability } from './capabilities';
 import { BASEBALL_SETTINGS_ALIASES } from './settings-route-aliases';
 import {
+  COACH_DASHBOARD_TABS,
+  COACH_MESSAGES_TABS,
   COACH_TEAM_TABS,
   COACH_STATS_TABS,
   COACH_DEVELOPMENT_TABS,
@@ -140,6 +142,8 @@ registryEntries.push({
 // -----------------------------------------------------------------------------
 
 const ALL_HUB_TAB_ARRAYS: readonly (readonly HubSubNavTab[])[] = [
+  COACH_DASHBOARD_TABS,
+  COACH_MESSAGES_TABS,
   COACH_TEAM_TABS,
   COACH_STATS_TABS,
   COACH_DEVELOPMENT_TABS,
diff --git a/src/lib/baseball/nav-registry.ts b/src/lib/baseball/nav-registry.ts
index 75159711f..1923ffa43 100644
--- a/src/lib/baseball/nav-registry.ts
+++ b/src/lib/baseball/nav-registry.ts
@@ -68,6 +68,7 @@ import {
   IconBolt,
   IconFlag,
   IconMapPin,
+  IconEye,
 } from '@/components/icons';
 
 // -----------------------------------------------------------------------------
@@ -82,16 +83,22 @@ export type BaseballNavRole = ActiveBaseballRole | 'both';
 
 /**
  * The 8 top-level GROUPED HUBS the coach sidebar condenses ~32 destinations
- * into (COACH_NAV_8TAB_PROPOSAL.md, approved 2026-07-01). 'messages' is
- * deliberately absent — Messages lives outside the registry as a persistent
- * cross-cutting slot (see BASEBALL_MESSAGES_NAV below), so it is never a
- * grouping target here. Every coach/both registry entry below declares
- * exactly one of these (nav-manifest.test.ts asserts it), so hub-definitions.ts
- * can GROUP BY this field instead of hand-listing routes per hub.
+ * into (COACH_NAV_8TAB_PROPOSAL.md, approved 2026-07-01; hub/subtab caps
+ * finalized in COHERENCE_RULING_2026-07-08.md Ruling 2). 'messages' is a real
+ * grouping target — the persistent Messages surface itself is STILL declared
+ * outside the registry (see BASEBALL_MESSAGES_NAV below, the cross-cutting
+ * "Messages" tab every consumer prepends), but Announcements folds into this
+ * hub (moved off Team — comms belong with comms) so hub-definitions.ts can
+ * derive a real "Messages · Announcements" sub-nav instead of rendering
+ * Messages as a bare flat link with no sub-tab strip. Every coach/both
+ * registry entry below declares exactly one of these (nav-manifest.test.ts
+ * asserts it), so hub-definitions.ts can GROUP BY this field instead of
+ * hand-listing routes per hub.
  */
 export type BaseballNavHub =
   | 'dashboard'
   | 'team'
+  | 'messages'
   | 'stats-performance'
   | 'development'
   | 'recruiting'
@@ -144,7 +151,11 @@ export type BaseballNavId =
   | 'player-readiness'
   | 'teams'
   | 'player-activate'
-  | 'team';
+  | 'team'
+  // --- New hub-landing pages (COHERENCE_RULING_2026-07-08 Ruling 2) ---
+  | 'operations'
+  | 'scouting'
+  | 'settings';
 
 /**
  * Icon contract shared by sidebar (`<icon size={18} className=... />`) and
@@ -236,6 +247,29 @@ export interface BaseballNavEntry {
    * detail routes (e.g. /players/[id]) highlight the parent registry tab.
    */
   matchPrefixes?: readonly string[];
+  /**
+   * COHERENCE_RULING_2026-07-08 Ruling 2 — the "≤3 subtabs per hub" mechanism.
+   * When set, this entry is a FOLDED destination: hub-definitions.ts's
+   * `hubEntries()` excludes it from the hub's RENDERED sub-tab strip (so the
+   * hub never exceeds 3 tabs), but the entry keeps its own registry row —
+   * command palette, breadcrumbs, and deep links still resolve it normally.
+   * The value is the id of the sibling registry entry that acts as this
+   * entry's LANDING/parent tab (e.g. a Documents/Travel/Practice Planner row
+   * folds under the 'operations' landing). The parent entry's own
+   * `matchPrefixes` must list this entry's `href` so resolve-active-hub still
+   * highlights the right hub + subtab when a user is on the folded route
+   * (nav-manifest.test.ts asserts this pairing).
+   */
+  foldedUnder?: BaseballNavId;
+  /**
+   * Optional override for how this entry's label reads INSIDE a hub sub-nav
+   * strip specifically, when the canonical `label` (used everywhere else —
+   * breadcrumbs, command palette, mobile nav) reads better unchanged. Used by
+   * Ruling 2's Development hub, where the "Performance" feature is folded in
+   * as the hub's "Training" subtab without renaming the feature itself
+   * everywhere it's referenced.
+   */
+  hubTabLabel?: string;
 }
 
 /**
@@ -288,7 +322,13 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
   // --- Daily loops (no capability gate beyond role) ----------------------------
   {
     id: 'command-center',
-    label: 'Command Center',
+    // Ruling 2 (item 9): the top-level hub is already labeled "Dashboard" —
+    // a subtab/breadcrumb ALSO reading "Command Center" is drift the founder
+    // called out by name. The route/id/page masthead keep "Command Center"
+    // (the page's own distinctive editorial title); only the NAV-visible
+    // label (breadcrumbs, hub subtab strip, command palette, mobile nav)
+    // changes to "Overview" so "Dashboard" never has two names in the UI.
+    label: 'Overview',
     href: '/baseball/dashboard/command-center',
     icon: IconLayers,
     role: 'coach',
@@ -434,6 +474,14 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: null,
     section: 'primary',
     hub: 'stats-performance',
+    // Ruling 2: Season is a VIEW inside Stats Center (no longer its own
+    // subtab), and Upload + Import Center are CTAs on the Stats Center page
+    // header — so all three routes must still resolve to this hub + subtab.
+    matchPrefixes: [
+      '/baseball/dashboard/stats/season',
+      '/baseball/dashboard/stats/upload',
+      '/baseball/dashboard/import',
+    ],
   },
 
   // --- Coach feature verticals (capability-gated) ------------------------------
@@ -446,6 +494,8 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: 'can_manage_imports',
     section: 'primary',
     hub: 'stats-performance',
+    // Ruling 2: a CTA inside Stats Center, not its own subtab.
+    foldedUnder: 'stats-center',
   },
   {
     id: 'practice-planner',
@@ -458,7 +508,12 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     // Coaches need can_manage_practice to plan; players see the published plan.
     requiredCapability: null,
     section: 'primary',
-    hub: 'stats-performance',
+    // Ruling 2: Practice Planner + Practice Effectiveness moved OFF
+    // Stats & Performance (which caps at Stats Center/Games/Postgame) and
+    // fold into the Team hub's new Operations landing alongside
+    // Documents/Travel — all four are team-logistics surfaces, not stats.
+    hub: 'team',
+    foldedUnder: 'operations',
   },
   {
     id: 'practice-effectiveness',
@@ -471,7 +526,8 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     // so this is gated on can_manage_practice (the read model enforces it too).
     requiredCapability: 'can_manage_practice',
     section: 'primary',
-    hub: 'stats-performance',
+    hub: 'team',
+    foldedUnder: 'operations',
   },
   {
     id: 'postgame-review',
@@ -489,6 +545,12 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
   {
     id: 'performance',
     label: 'Performance',
+    // Ruling 2: Development hub reads "Dev Plans · Training · Videos" — this
+    // feature IS "Training" in that strip. The canonical label stays
+    // "Performance" everywhere else (breadcrumbs, command palette, the
+    // page's own masthead already titled "Performance") — only the hub
+    // sub-nav tab renders the reframed name.
+    hubTabLabel: 'Training',
     href: '/baseball/dashboard/performance',
     icon: IconDumbbell,
     role: 'coach',
@@ -496,7 +558,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: null,
     requiredAnyCapabilities: ['can_manage_lifting', 'can_view_readiness'],
     section: 'primary',
-    hub: 'stats-performance',
+    hub: 'development',
     matchPrefixes: ['/baseball/dashboard/performance'],
   },
   {
@@ -523,6 +585,10 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: 'can_invite_staff',
     section: 'secondary',
     hub: 'management',
+    // Ruling 2: folds into the Settings landing (card grid at
+    // /dashboard/settings already links here) — Management caps at
+    // Decision Room/Settings/Organization.
+    foldedUnder: 'settings',
   },
   {
     id: 'program-settings',
@@ -533,6 +599,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: 'can_manage_settings',
     section: 'secondary',
     hub: 'management',
+    foldedUnder: 'settings',
   },
 
   // -----------------------------------------------------------------------
@@ -559,6 +626,11 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: null,
     section: 'primary',
     hub: 'recruiting',
+    // Ruling 2: Interest is a coach-facing recruiting-funnel view — closest
+    // conceptual home is Pipeline (not explicitly named in the ruling's
+    // Recruiting row; smallest-safe-choice fold, still command-palette +
+    // deep-link reachable).
+    matchPrefixes: ['/baseball/dashboard/college-interest'],
   },
   {
     id: 'college-interest',
@@ -572,6 +644,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: null,
     section: 'primary',
     hub: 'recruiting',
+    foldedUnder: 'pipeline',
   },
   {
     id: 'discover',
@@ -595,6 +668,9 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: null,
     section: 'primary',
     hub: 'recruiting',
+    // Ruling 2: folds into the new Scouting landing (Recruiting caps at
+    // Pipeline/Discover/Scouting).
+    foldedUnder: 'scouting',
   },
   {
     id: 'compare',
@@ -607,6 +683,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: 'can_manage_roster',
     section: 'primary',
     hub: 'recruiting',
+    foldedUnder: 'scouting',
   },
   {
     id: 'comparisons',
@@ -618,6 +695,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: 'can_manage_roster',
     section: 'primary',
     hub: 'recruiting',
+    foldedUnder: 'scouting',
   },
   {
     id: 'scout-packets',
@@ -631,6 +709,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: 'can_export_reports',
     section: 'primary',
     hub: 'recruiting',
+    foldedUnder: 'scouting',
   },
   {
     id: 'dev-plans',
@@ -671,6 +750,29 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     section: 'primary',
     hub: 'recruiting',
     matchPrefixes: ['/baseball/dashboard/camps'],
+    foldedUnder: 'scouting',
+  },
+  {
+    // Ruling 2 (Recruiting hub): the new landing page that keeps Watchlist,
+    // Compare Players, Saved Comparisons, Scout Packets, and Camps reachable
+    // once Recruiting caps at 3 rendered subtabs (Pipeline · Discover ·
+    // Scouting). Card-grid landing (dashboard/scouting) — each card inherits
+    // its target's own registry gating, never re-declares it.
+    id: 'scouting',
+    label: 'Scouting',
+    href: '/baseball/dashboard/scouting',
+    icon: IconEye,
+    role: 'coach',
+    requiredCapability: null,
+    section: 'primary',
+    hub: 'recruiting',
+    matchPrefixes: [
+      '/baseball/dashboard/watchlist',
+      '/baseball/dashboard/compare',
+      '/baseball/dashboard/comparisons',
+      '/baseball/dashboard/scout-packets',
+      '/baseball/dashboard/camps',
+    ],
   },
   {
     id: 'organization',
@@ -685,6 +787,11 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     allowedProgramTypes: SHOWCASE_ORG_PROGRAM_TYPES,
     section: 'secondary',
     hub: 'management',
+    // Ruling 2: Organization is the rendered Management subtab; Teams +
+    // Events fold under it for Showcase-types (both already share this
+    // entry's allowedProgramTypes gate), so both routes still highlight the
+    // Organization subtab when visited directly.
+    matchPrefixes: ['/baseball/dashboard/teams', '/baseball/dashboard/events'],
   },
   {
     id: 'teams',
@@ -698,6 +805,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     allowedProgramTypes: SHOWCASE_ORG_PROGRAM_TYPES,
     section: 'secondary',
     hub: 'management',
+    foldedUnder: 'organization',
   },
   {
     id: 'program',
@@ -711,6 +819,29 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: 'can_manage_settings',
     section: 'secondary',
     hub: 'management',
+    foldedUnder: 'settings',
+  },
+  {
+    // Ruling 2 (Management hub): the existing card-grid landing at
+    // /dashboard/settings (KEPT, per the ruling — its own 13-tab strip is
+    // gone by design now that Management caps at 3 subtabs: Decision Room ·
+    // Settings · Organization). Program Info, Staff Settings, and Program
+    // Settings fold into this one Settings destination; the card grid
+    // already links every one of them (verified, nothing orphaned).
+    id: 'settings',
+    label: 'Settings',
+    href: '/baseball/dashboard/settings',
+    icon: IconSettings,
+    role: 'coach',
+    requiredCapability: null,
+    section: 'secondary',
+    hub: 'management',
+    // '/baseball/dashboard/settings/*' sub-routes (staff, program, season,
+    // philosophy, roles, permissions, imports, integrations, audit) resolve
+    // via this entry's own href as a natural route PREFIX — only the
+    // 'program' fold target needs an explicit prefix since its href is NOT
+    // nested under /settings/.
+    matchPrefixes: ['/baseball/dashboard/program'],
   },
 
   // --- Shared team surfaces (coach + player) --------------------------------
@@ -725,7 +856,9 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     role: 'both',
     requiredCapability: null,
     section: 'primary',
-    hub: 'team',
+    // Ruling 2: moved OFF Team — announcements are comms, so they fold into
+    // the Messages hub (Messages · Announcements) instead.
+    hub: 'messages',
   },
   {
     id: 'documents',
@@ -738,6 +871,9 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: null,
     section: 'primary',
     hub: 'team',
+    // Ruling 2: Team hub caps at Roster/Calendar/Operations — Documents folds
+    // into the new Operations landing.
+    foldedUnder: 'operations',
   },
   {
     id: 'travel',
@@ -750,6 +886,28 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     requiredCapability: null,
     section: 'primary',
     hub: 'team',
+    foldedUnder: 'operations',
+  },
+  {
+    // Ruling 2 (Team hub): the new landing page that keeps Documents, Travel,
+    // Practice Planner, and Practice Effectiveness reachable in ≤2 clicks
+    // once Team caps at 3 rendered subtabs (Roster · Calendar · Operations).
+    // Card-grid landing (src/app/baseball/(dashboard)/dashboard/operations) —
+    // each card inherits its target's own registry gating, never re-declares it.
+    id: 'operations',
+    label: 'Operations',
+    href: '/baseball/dashboard/operations',
+    icon: IconClipboardList,
+    role: 'coach',
+    requiredCapability: null,
+    section: 'primary',
+    hub: 'team',
+    matchPrefixes: [
+      '/baseball/dashboard/documents',
+      '/baseball/dashboard/travel',
+      '/baseball/dashboard/practice',
+      '/baseball/dashboard/practice-effectiveness',
+    ],
   },
   {
     id: 'videos',
@@ -776,6 +934,7 @@ export const BASEBALL_NAV_REGISTRY: readonly BaseballNavEntry[] = [
     allowedProgramTypes: SHOWCASE_ORG_PROGRAM_TYPES,
     section: 'primary',
     hub: 'management',
+    foldedUnder: 'organization',
   },
   {
     id: 'team',
diff --git a/src/lib/baseball/read-models/__tests__/command-center.test.ts b/src/lib/baseball/read-models/__tests__/command-center.test.ts
index 8f3986fe4..ee9e3410c 100644
--- a/src/lib/baseball/read-models/__tests__/command-center.test.ts
+++ b/src/lib/baseball/read-models/__tests__/command-center.test.ts
@@ -1,9 +1,20 @@
 // @vitest-environment node
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi } from 'vitest';
 
 import { assembleCommandCenterClientProps } from '@/lib/baseball/read-models/command-center-adapter';
 import type { CommandCenterReadModel } from '@/lib/baseball/read-models/command-center';
 import { resolveReadModelLoadState } from '@/lib/product-trust/read-model-state';
+import { createFakeSupabase, type FakeSupabase } from '@/test/fixtures/fake-supabase';
+
+let fake: FakeSupabase;
+
+vi.mock('@/lib/supabase/server', () => ({
+  createClient: vi.fn(async () => fake),
+}));
+
+// Imported AFTER the mock registration above so getCommandCenter resolves the
+// mocked createClient, not the real Supabase server client.
+const { getCommandCenter } = await import('@/lib/baseball/read-models/command-center');
 
 function model(overrides: Partial<CommandCenterReadModel>): CommandCenterReadModel {
   return {
@@ -103,6 +114,103 @@ describe('assembleCommandCenterClientProps', () => {
   });
 });
 
+describe('getCommandCenter — team-local week window (includeWeekEvents)', () => {
+  const TEAM_ID = 'team-tz-1';
+
+  function baseTables() {
+    return {
+      baseball_coaches: [{ id: 'coach-1', user_id: 'user-1' }],
+      baseball_team_coach_staff: [
+        { id: 'staff-1', team_id: TEAM_ID, coach_id: 'coach-1' },
+      ],
+      // PDT (UTC-7) in July — a non-UTC team, per the D2 bug being fixed:
+      // the old week window used the SERVER's wall-clock day/hours, not the
+      // team's, so events near team-local Sunday midnight landed in the
+      // wrong week for any non-UTC team.
+      baseball_teams: [{ id: TEAM_ID, timezone: 'America/Los_Angeles' }],
+      baseball_coach_insights: [] as Array<Record<string, unknown>>,
+      baseball_team_members: [] as Array<Record<string, unknown>>,
+      baseball_player_aggregates: [] as Array<Record<string, unknown>>,
+      baseball_events: [
+        // Saturday 23:59:59.999 PDT — the instant BEFORE team-local week
+        // start. Must be excluded.
+        {
+          id: 'ev-before',
+          team_id: TEAM_ID,
+          title: 'Before week',
+          event_type: 'practice',
+          start_time: '2026-07-05T06:59:59.999Z',
+          end_time: null,
+          location: null,
+          is_mandatory: false,
+        },
+        // Sunday 00:00:00 PDT — exactly team-local week start. Must be
+        // included.
+        {
+          id: 'ev-week-start',
+          team_id: TEAM_ID,
+          title: 'Week start boundary',
+          event_type: 'practice',
+          start_time: '2026-07-05T07:00:00.000Z',
+          end_time: null,
+          location: null,
+          is_mandatory: false,
+        },
+        // Saturday 23:59:59.999 PDT the following week — the last instant
+        // still inside the window. Must be included.
+        {
+          id: 'ev-week-end-inside',
+          team_id: TEAM_ID,
+          title: 'Last instant of the week',
+          event_type: 'game',
+          start_time: '2026-07-12T06:59:59.999Z',
+          end_time: null,
+          location: null,
+          is_mandatory: true,
+        },
+        // Next Sunday 00:00:00 PDT — the instant the window ends
+        // (exclusive). Must be excluded.
+        {
+          id: 'ev-after',
+          team_id: TEAM_ID,
+          title: 'After week',
+          event_type: 'practice',
+          start_time: '2026-07-12T07:00:00.000Z',
+          end_time: null,
+          location: null,
+          is_mandatory: false,
+        },
+      ] as Array<Record<string, unknown>>,
+    };
+  }
+
+  it('resolves Sunday–Saturday using the TEAM timezone, not the server clock', async () => {
+    fake = createFakeSupabase({ user: { id: 'user-1' }, tables: baseTables() });
+
+    // 2026-07-08 is a Wednesday: team-local week is Sun 2026-07-05 through
+    // Sat 2026-07-11 (America/Los_Angeles).
+    const result = await getCommandCenter(TEAM_ID, {
+      forDate: '2026-07-08',
+      includeWeekEvents: true,
+    });
+
+    expect(result.authorized).toBe(true);
+    expect(result.error).toBeNull();
+    expect(result.weekEvents.map((e) => e.id)).toEqual([
+      'ev-week-start',
+      'ev-week-end-inside',
+    ]);
+  });
+
+  it('omits weekEvents entirely when includeWeekEvents is false', async () => {
+    fake = createFakeSupabase({ user: { id: 'user-1' }, tables: baseTables() });
+
+    const result = await getCommandCenter(TEAM_ID, { forDate: '2026-07-08' });
+
+    expect(result.weekEvents).toEqual([]);
+  });
+});
+
 describe('resolveReadModelLoadState — command center contract', () => {
   it('never treats unauthorized as empty', () => {
     expect(
diff --git a/src/lib/baseball/read-models/command-center.ts b/src/lib/baseball/read-models/command-center.ts
index eafc697e0..ba2643ecc 100644
--- a/src/lib/baseball/read-models/command-center.ts
+++ b/src/lib/baseball/read-models/command-center.ts
@@ -38,6 +38,12 @@ import {
   normalizeConfidence,
   type SourceRef,
 } from '@/lib/baseball/source-record';
+import {
+  isoMinusDays,
+  localDayBoundsUtc,
+  resolveTeamTimezone,
+  todayIsoInTz,
+} from '@/lib/baseball/daily-contract/contract-day';
 
 // -----------------------------------------------------------------------------
 // Public shapes
@@ -230,22 +236,32 @@ export async function getCommandCenter(
     return base(false, null); // not staff — honest unauthorized envelope
   }
 
-  // Day window for "today" (UTC day; callers can pass forDate to override).
-  const day = forDate ?? new Date().toISOString().slice(0, 10);
-  const dayStart = `${day}T00:00:00.000Z`;
-  const dayEnd = `${day}T23:59:59.999Z`;
+  // Day window for "today" — TEAM-LOCAL (mirrors player-today.ts / contract-day.ts),
+  // never the server's UTC day: a 9pm-local coach otherwise saw "today" roll to
+  // tomorrow's UTC date. `dayStart`/`dayEnd` filter `baseball_events.start_time`
+  // (a timestamptz column), so the boundary itself must be team-local midnight
+  // expressed in UTC, not a literal `${day}T00:00:00.000Z`.
+  const teamTz = await resolveTeamTimezone(supabase, teamId);
+  const day = forDate ?? todayIsoInTz(teamTz);
+  const { startUtcIso: dayStart, endUtcIso: dayEnd } = localDayBoundsUtc(day, teamTz);
 
   let weekStartIso: string | null = null;
   let weekEndIso: string | null = null;
   if (includeWeekEvents) {
-    const now = new Date();
-    const weekStart = new Date(now);
-    weekStart.setDate(now.getDate() - now.getDay());
-    weekStart.setHours(0, 0, 0, 0);
-    const weekEnd = new Date(weekStart);
-    weekEnd.setDate(weekStart.getDate() + 7);
-    weekStartIso = weekStart.toISOString();
-    weekEndIso = weekEnd.toISOString();
+    // Team-local Sunday–Saturday week window anchored on the same team-local
+    // "today" (`day`) computed above. The previous server-local `new Date()` +
+    // `.getDay()`/`.setDate()` computed the week boundary from the server's
+    // wall clock (effectively UTC in prod), drifting the week start by a day
+    // for non-UTC teams near local midnight — same bug the day window above
+    // was fixed for. Bare calendar-date arithmetic (`getUTCDay`/`isoMinusDays`)
+    // is tz-independent (Sunday is Sunday regardless of clock), then
+    // `localDayBoundsUtc` anchors the actual UTC instant boundaries in
+    // team-local time, mirroring the day-window pattern above.
+    const dayOfWeek = new Date(`${day}T00:00:00.000Z`).getUTCDay(); // 0=Sun..6=Sat
+    const weekStartDateIso = isoMinusDays(day, dayOfWeek);
+    const weekEndDateIso = isoMinusDays(weekStartDateIso, -7);
+    weekStartIso = localDayBoundsUtc(weekStartDateIso, teamTz).startUtcIso;
+    weekEndIso = localDayBoundsUtc(weekEndDateIso, teamTz).startUtcIso;
   }
 
   // NOTE: baseball_player_aggregates has FKs to baseball_players and
diff --git a/src/lib/baseball/read-models/player-snapshot-cards.ts b/src/lib/baseball/read-models/player-snapshot-cards.ts
index 736e09560..ec936e61a 100644
--- a/src/lib/baseball/read-models/player-snapshot-cards.ts
+++ b/src/lib/baseball/read-models/player-snapshot-cards.ts
@@ -604,7 +604,7 @@ export async function getPlayerSnapshotCards(
       .eq('player_id', playerId).eq('team_id', teamId).eq('season_year', seasonYear)
       .maybeSingle(),
     db.from('baseball_player_aggregates')
-      .select('career_avg, game_avg, practice_avg, last_5_avg, recent_trend, pressure_gap, total_sessions, updated_at')
+      .select('career_avg, career_obp, career_slg, career_ops, game_avg, practice_avg, last_5_avg, recent_trend, pressure_gap, total_sessions, updated_at')
       .eq('player_id', playerId).eq('team_id', teamId).maybeSingle(),
     supabase.from('baseball_events')
       .select('id, title, event_type, start_time, location')
@@ -692,7 +692,8 @@ export async function getPlayerSnapshotCards(
   if (seasonRes?.error) note('Season stats could not be loaded.');
 
   const agg = (aggRes?.error ? null : aggRes?.data ?? null) as null | {
-    career_avg: number | null; game_avg: number | null; practice_avg: number | null;
+    career_avg: number | null; career_obp: number | null; career_slg: number | null;
+    career_ops: number | null; game_avg: number | null; practice_avg: number | null;
     last_5_avg: number | null; recent_trend: 'improving' | 'declining' | 'stable' | null;
     pressure_gap: number | null; total_sessions: number | null; updated_at: string | null;
   };
@@ -708,9 +709,9 @@ export async function getPlayerSnapshotCards(
       trust: trustForSource(null, 'Season stats'),
       asOf: season?.last_updated ?? agg?.updated_at ?? null,
       avg: season?.avg ?? agg?.career_avg ?? null,
-      obp: season?.obp ?? null,
-      slg: season?.slg ?? null,
-      ops: season?.ops ?? null,
+      obp: season?.obp ?? agg?.career_obp ?? null,
+      slg: season?.slg ?? agg?.career_slg ?? null,
+      ops: season?.ops ?? agg?.career_ops ?? null,
       hr: season?.hr ?? 0,
       rbi: season?.rbi ?? 0,
       ab: season?.ab ?? 0,
diff --git a/src/lib/baseball/route-contract.ts b/src/lib/baseball/route-contract.ts
index d5f8de066..69d84e4f6 100644
--- a/src/lib/baseball/route-contract.ts
+++ b/src/lib/baseball/route-contract.ts
@@ -32,6 +32,8 @@ import {
 } from './nav-registry';
 import type { BaseballCapability } from './capabilities';
 import {
+  COACH_DASHBOARD_TABS,
+  COACH_MESSAGES_TABS,
   COACH_TEAM_TABS,
   COACH_STATS_TABS,
   COACH_DEVELOPMENT_TABS,
@@ -51,6 +53,8 @@ import type { HubSubNavTab } from '@/app/baseball/(dashboard)/_components/hub-su
 
 /** Which hub a tab-origin declared href came from. */
 export type HubName =
+  | 'coach-dashboard'
+  | 'coach-messages'
   | 'coach-team'
   | 'coach-stats'
   | 'coach-development'
@@ -89,6 +93,8 @@ const HUB_TAB_SOURCES: ReadonlyArray<{
   role: 'coach' | 'player';
   tabs: readonly HubSubNavTab[];
 }> = [
+  { hub: 'coach-dashboard', role: 'coach', tabs: COACH_DASHBOARD_TABS },
+  { hub: 'coach-messages', role: 'coach', tabs: COACH_MESSAGES_TABS },
   { hub: 'coach-team', role: 'coach', tabs: COACH_TEAM_TABS },
   { hub: 'coach-stats', role: 'coach', tabs: COACH_STATS_TABS },
   { hub: 'coach-development', role: 'coach', tabs: COACH_DEVELOPMENT_TABS },
diff --git a/src/lib/baseball/stat-layer-manifest.ts b/src/lib/baseball/stat-layer-manifest.ts
index 1c083a000..40ed7b6f9 100644
--- a/src/lib/baseball/stat-layer-manifest.ts
+++ b/src/lib/baseball/stat-layer-manifest.ts
@@ -268,6 +268,12 @@ export const GRANDFATHERED_CONSUMERS: GrandfatheredStatLayerConsumer[] = [
   },
 
   // --- Tests / contract fixtures ----------------------------------------------
+  {
+    path: 'src/lib/baseball/read-models/__tests__/command-center.test.ts',
+    group: 'test',
+    status: 'pending migration',
+    note: 'Fake-supabase fixture mirrors command-center.ts (itself grandfathered above) including its baseball_player_aggregates join; migrates when the read-model does.',
+  },
   {
     path: 'src/lib/baseball/__tests__/action-baseline.test.ts',
     group: 'test',
diff --git a/src/lib/recruiting/match-calculator.ts b/src/lib/recruiting/match-calculator.ts
deleted file mode 100644
index 8aaa54120..000000000
--- a/src/lib/recruiting/match-calculator.ts
+++ /dev/null
@@ -1,330 +0,0 @@
-/**
- * Match Calculator for Coach Recruiting Philosophy
- *
- * Calculates how well a player matches a coach's recruiting preferences
- * based on percentile rankings within grad year cohorts.
- */
-
-import type {
-  CoachRecruitingPhilosophy,
-  PlayerPercentiles,
-  PlayerMatchScore,
-  MatchScoreBreakdown,
-  Player,
-  RecruitingMetricWeights,
-} from '@/lib/types';
-
-/**
- * Metric keys that can be weighted
- */
-type MetricKey = keyof RecruitingMetricWeights;
-
-/**
- * Mapping of metric keys to their weight field names in philosophy
- */
-const WEIGHT_FIELDS: Record<MetricKey, keyof CoachRecruitingPhilosophy> = {
-  exit_velocity: 'weight_exit_velocity',
-  pitch_velocity: 'weight_pitch_velocity',
-  sixty_time: 'weight_sixty_time',
-  gpa: 'weight_gpa',
-  height: 'weight_height',
-  weight: 'weight_weight',
-  arm_strength: 'weight_arm_strength',
-};
-
-/**
- * Mapping of metric keys to their percentile field names
- */
-const PERCENTILE_FIELDS: Record<MetricKey, keyof PlayerPercentiles> = {
-  exit_velocity: 'percentile_exit_velocity',
-  pitch_velocity: 'percentile_pitch_velocity',
-  sixty_time: 'percentile_sixty_time',
-  gpa: 'percentile_gpa',
-  height: 'percentile_height',
-  weight: 'percentile_weight',
-  arm_strength: 'percentile_arm_strength',
-};
-
-/**
- * Calculate the match score for a player against a coach's philosophy.
- *
- * The algorithm:
- * 1. For each metric the coach cares about (weight > 0):
- *    - Get the player's percentile for that metric
- *    - Multiply by the weight
- * 2. Sum all weighted percentiles and divide by total weight
- * 3. Apply position priority bonus (0-10 points)
- * 4. Apply geographic bonus (0-5 points)
- * 5. Check if player meets minimum standards
- *
- * @param player - Player data (for position, location checks)
- * @param percentiles - Player's percentile rankings
- * @param philosophy - Coach's recruiting philosophy
- * @returns Match score result with breakdown
- */
-export function calculateMatchScore(
-  player: Pick<Player, 'id' | 'primary_position' | 'secondary_position' | 'state' | 'gpa' | 'exit_velo' | 'pitch_velo' | 'sixty_time'>,
-  percentiles: PlayerPercentiles | null,
-  philosophy: CoachRecruitingPhilosophy
-): PlayerMatchScore {
-  // If no percentiles, return neutral score
-  if (!percentiles) {
-    return {
-      player_id: player.id,
-      match_score: 50,
-      breakdown: {},
-      meets_standards: true,
-      position_bonus: 0,
-      geographic_bonus: 0,
-    };
-  }
-
-  // Calculate weighted score
-  const { score: baseScore, breakdown } = calculateWeightedScore(percentiles, philosophy);
-
-  // Calculate position bonus
-  const positionBonus = calculatePositionBonus(
-    player.primary_position,
-    player.secondary_position,
-    philosophy.position_priorities
-  );
-
-  // Calculate geographic bonus
-  const geographicBonus = calculateGeographicBonus(
-    player.state,
-    philosophy.preferred_states
-  );
-
-  // Check minimum standards
-  const meetsStandards = checkMinimumStandards(player, philosophy);
-
-  // Final score: base + bonuses (capped at 100)
-  // If doesn't meet standards, cap at 40
-  let finalScore = baseScore + positionBonus + geographicBonus;
-
-  if (!meetsStandards) {
-    finalScore = Math.min(finalScore, 40);
-  }
-
-  finalScore = Math.min(100, Math.max(0, Math.round(finalScore)));
-
-  return {
-    player_id: player.id,
-    match_score: finalScore,
-    breakdown,
-    meets_standards: meetsStandards,
-    position_bonus: positionBonus,
-    geographic_bonus: geographicBonus,
-  };
-}
-
-/**
- * Calculate the weighted score from percentiles and weights.
- */
-function calculateWeightedScore(
-  percentiles: PlayerPercentiles,
-  philosophy: CoachRecruitingPhilosophy
-): { score: number; breakdown: MatchScoreBreakdown } {
-  let totalWeight = 0;
-  let weightedSum = 0;
-  const breakdown: MatchScoreBreakdown = {};
-
-  const metricKeys: MetricKey[] = [
-    'exit_velocity',
-    'pitch_velocity',
-    'sixty_time',
-    'gpa',
-    'height',
-    'weight',
-    'arm_strength',
-  ];
-
-  for (const metric of metricKeys) {
-    const weightField = WEIGHT_FIELDS[metric];
-    const percentileField = PERCENTILE_FIELDS[metric];
-
-    const weight = philosophy[weightField] as number;
-    const percentile = percentiles[percentileField] as number | null;
-
-    // Skip if no weight or no percentile data
-    if (weight <= 0 || percentile === null) {
-      continue;
-    }
-
-    const contribution = (percentile * weight) / 100; // Normalize contribution
-    weightedSum += percentile * weight;
-    totalWeight += weight;
-
-    breakdown[metric] = {
-      percentile,
-      weight,
-      contribution: Math.round(contribution * 10) / 10,
-    };
-  }
-
-  // Calculate final weighted average
-  const score = totalWeight > 0 ? weightedSum / totalWeight : 50;
-
-  return {
-    score: Math.round(score),
-    breakdown,
-  };
-}
-
-/**
- * Calculate bonus points for position priority.
- *
- * Position bonus scale:
- * - #1 priority: +10 points
- * - #2 priority: +8 points
- * - #3 priority: +6 points
- * - #4 priority: +4 points
- * - #5 priority: +2 points
- * - Not in priorities: 0 points
- *
- * Secondary position gets half the bonus.
- */
-function calculatePositionBonus(
-  primaryPosition: string | null | undefined,
-  secondaryPosition: string | null | undefined,
-  positionPriorities: string[]
-): number {
-  if (!positionPriorities || positionPriorities.length === 0) {
-    return 0;
-  }
-
-  const bonusScale = [10, 8, 6, 4, 2];
-
-  let bonus = 0;
-
-  // Check primary position
-  if (primaryPosition) {
-    const primaryIndex = positionPriorities.indexOf(primaryPosition);
-    if (primaryIndex !== -1 && primaryIndex < bonusScale.length) {
-      bonus += bonusScale[primaryIndex] ?? 0;
-    }
-  }
-
-  // Check secondary position (half bonus)
-  if (secondaryPosition) {
-    const secondaryIndex = positionPriorities.indexOf(secondaryPosition);
-    if (secondaryIndex !== -1 && secondaryIndex < bonusScale.length) {
-      bonus += Math.floor((bonusScale[secondaryIndex] ?? 0) / 2);
-    }
-  }
-
-  return bonus;
-}
-
-/**
- * Calculate bonus points for geographic preference.
- *
- * Geographic bonus:
- * - In preferred states: +5 points
- * - Not in preferred states: 0 points
- */
-function calculateGeographicBonus(
-  playerState: string | null | undefined,
-  preferredStates: string[]
-): number {
-  if (!preferredStates || preferredStates.length === 0 || !playerState) {
-    return 0;
-  }
-
-  return preferredStates.includes(playerState) ? 5 : 0;
-}
-
-/**
- * Check if player meets minimum standards.
- */
-function checkMinimumStandards(
-  player: Pick<Player, 'gpa' | 'exit_velo' | 'pitch_velo' | 'sixty_time'>,
-  philosophy: CoachRecruitingPhilosophy
-): boolean {
-  // Check GPA minimum
-  if (philosophy.min_gpa !== null && player.gpa !== null) {
-    const playerGpa = typeof player.gpa === 'string' ? parseFloat(player.gpa) : player.gpa;
-    if (playerGpa < philosophy.min_gpa) {
-      return false;
-    }
-  }
-
-  // Check exit velocity minimum
-  if (philosophy.min_exit_velocity !== null && player.exit_velo !== null) {
-    const exitVelo = typeof player.exit_velo === 'string' ? parseFloat(player.exit_velo) : player.exit_velo;
-    if (exitVelo < philosophy.min_exit_velocity) {
-      return false;
-    }
-  }
-
-  // Check pitch velocity minimum
-  if (philosophy.min_pitch_velocity !== null && player.pitch_velo !== null) {
-    const pitchVelo = typeof player.pitch_velo === 'string' ? parseFloat(player.pitch_velo) : player.pitch_velo;
-    if (pitchVelo < philosophy.min_pitch_velocity) {
-      return false;
-    }
-  }
-
-  // Check 60-yard time maximum (lower is better)
-  if (philosophy.max_sixty_time !== null && player.sixty_time !== null) {
-    const sixtyTime = typeof player.sixty_time === 'string' ? parseFloat(player.sixty_time) : player.sixty_time;
-    if (sixtyTime > philosophy.max_sixty_time) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-/**
- * Get match score tier for UI display.
- */
-export function getMatchScoreTier(score: number): {
-  tier: 'excellent' | 'good' | 'average' | 'below_average' | 'poor';
-  label: string;
-  color: string;
-} {
-  if (score >= 85) {
-    return { tier: 'excellent', label: 'Excellent Match', color: 'text-green-600' };
-  }
-  if (score >= 70) {
-    return { tier: 'good', label: 'Good Match', color: 'text-emerald-600' };
-  }
-  if (score >= 50) {
-    return { tier: 'average', label: 'Average Match', color: 'text-amber-600' };
-  }
-  if (score >= 30) {
-    return { tier: 'below_average', label: 'Below Average', color: 'text-orange-600' };
-  }
-  return { tier: 'poor', label: 'Poor Match', color: 'text-red-600' };
-}
-
-/**
- * Format match score for display.
- */
-export function formatMatchScore(score: number): string {
-  return `${Math.round(score)}%`;
-}
-
-/**
- * Calculate percentile from raw value within a dataset.
- * Used when recalculating percentiles on the fly.
- */
-export function calculatePercentile(
-  value: number,
-  allValues: number[],
-  higherIsBetter: boolean = true
-): number {
-  if (allValues.length === 0) return 50;
-
-  const sortedValues = [...allValues].sort((a, b) => a - b);
-  let rank = sortedValues.filter((v) => v < value).length;
-
-  if (!higherIsBetter) {
-    rank = sortedValues.length - rank - 1;
-  }
-
-  const percentile = (rank / (sortedValues.length - 1)) * 100;
-  return Math.round(Math.max(0, Math.min(100, percentile)));
-}
-
diff --git a/src/lib/types/database.ts b/src/lib/types/database.ts
index be14ea249..9f394a7b0 100644
--- a/src/lib/types/database.ts
+++ b/src/lib/types/database.ts
@@ -5158,6 +5158,7 @@ export type Database = {
           earned_runs: number | null
           errors: number | null
           exit_velocity: number | null
+          hit_by_pitch: number
           hits: number | null
           hits_allowed: number | null
           home_runs: number | null
@@ -5169,6 +5170,7 @@ export type Database = {
           player_id: string
           putouts: number | null
           rbis: number | null
+          sacrifice_flies: number
           session_date: string
           session_name: string | null
           source: string | null
@@ -5196,6 +5198,7 @@ export type Database = {
           earned_runs?: number | null
           errors?: number | null
           exit_velocity?: number | null
+          hit_by_pitch?: number
           hits?: number | null
           hits_allowed?: number | null
           home_runs?: number | null
@@ -5207,6 +5210,7 @@ export type Database = {
           player_id: string
           putouts?: number | null
           rbis?: number | null
+          sacrifice_flies?: number
           session_date: string
           session_name?: string | null
           source?: string | null
@@ -5234,6 +5238,7 @@ export type Database = {
           earned_runs?: number | null
           errors?: number | null
           exit_velocity?: number | null
+          hit_by_pitch?: number
           hits?: number | null
           hits_allowed?: number | null
           home_runs?: number | null
@@ -5245,6 +5250,7 @@ export type Database = {
           player_id?: string
           putouts?: number | null
           rbis?: number | null
+          sacrifice_flies?: number
           session_date?: string
           session_name?: string | null
           source?: string | null
diff --git a/src/test/helpers/baseball-route-inventory.ts b/src/test/helpers/baseball-route-inventory.ts
index 09d3a34dd..72b059c02 100644
--- a/src/test/helpers/baseball-route-inventory.ts
+++ b/src/test/helpers/baseball-route-inventory.ts
@@ -218,11 +218,6 @@ export const DYNAMIC_ROUTE_SAMPLES: DynamicRouteSample[] = [
     sampleParams: { id: 'demo-player' },
     reason: 'Player passport view reached from the player profile.',
   },
-  {
-    template: '/baseball/dashboard/players/[id]/profile',
-    sampleParams: { id: 'demo-player' },
-    reason: 'Player profile sub-view reached from Roster.',
-  },
   {
     template: '/baseball/dashboard/players/[id]/scout-packet',
     sampleParams: { id: 'demo-player' },
diff --git a/supabase/migrations/20260708010000_bridge_baseball_coach_lifting_edit.sql b/supabase/migrations/20260708010000_bridge_baseball_coach_lifting_edit.sql
new file mode 100644
index 000000000..2c07ab234
--- /dev/null
+++ b/supabase/migrations/20260708010000_bridge_baseball_coach_lifting_edit.sql
@@ -0,0 +1,36 @@
+-- Bridge: baseball coaches get Lifting Lab edit access for their org (sport='baseball').
+-- Parity with the legacy baseball_lift_* editor (any baseball coach could author programs),
+-- required after repointing baseball performance routes at the canonical helm_lifting_* stack,
+-- whose RLS (helm_lifting_can_edit_org) requires a lifting-coach or org-viewer(can_edit) row.
+-- Applied to prod 2026-07-08 via MCP apply_migration (same content).
+
+INSERT INTO public.helm_lifting_org_viewers (organization_id, user_id, sport, can_edit, granted_by)
+SELECT bc.organization_id, bc.user_id, 'baseball', true, 'migration:baseball-coach-lifting-bridge'
+FROM public.baseball_coaches bc
+WHERE bc.organization_id IS NOT NULL AND bc.user_id IS NOT NULL
+ON CONFLICT (organization_id, user_id, sport)
+DO UPDATE SET can_edit = true;
+
+CREATE OR REPLACE FUNCTION public.bridge_baseball_coach_lifting_access()
+RETURNS trigger
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path TO 'public', 'pg_temp'
+AS $$
+BEGIN
+  IF NEW.organization_id IS NOT NULL AND NEW.user_id IS NOT NULL THEN
+    INSERT INTO public.helm_lifting_org_viewers (organization_id, user_id, sport, can_edit, granted_by)
+    VALUES (NEW.organization_id, NEW.user_id, 'baseball', true, 'trigger:baseball-coach-lifting-bridge')
+    ON CONFLICT (organization_id, user_id, sport)
+    DO UPDATE SET can_edit = true;
+  END IF;
+  RETURN NEW;
+END;
+$$;
+
+REVOKE EXECUTE ON FUNCTION public.bridge_baseball_coach_lifting_access() FROM PUBLIC, anon, authenticated;
+
+DROP TRIGGER IF EXISTS trg_bridge_baseball_coach_lifting ON public.baseball_coaches;
+CREATE TRIGGER trg_bridge_baseball_coach_lifting
+AFTER INSERT OR UPDATE OF organization_id, user_id ON public.baseball_coaches
+FOR EACH ROW EXECUTE FUNCTION public.bridge_baseball_coach_lifting_access();
diff --git a/supabase/migrations/20260708011000_baseball_player_stats_drift_columns.sql b/supabase/migrations/20260708011000_baseball_player_stats_drift_columns.sql
new file mode 100644
index 000000000..3d6c68ee5
--- /dev/null
+++ b/supabase/migrations/20260708011000_baseball_player_stats_drift_columns.sql
@@ -0,0 +1,6 @@
+-- Schema drift repair: BaseballPlayerStats TS type (and computeCareerSlashLine's row Pick)
+-- declare hit_by_pitch / sacrifice_flies, but the live table never got them — an explicit
+-- PostgREST select naming them 400s. Additive, default 0, matches app fallback behavior.
+-- Applied to prod 2026-07-08 via MCP apply_migration (same content).
+ALTER TABLE public.baseball_player_stats ADD COLUMN IF NOT EXISTS hit_by_pitch integer NOT NULL DEFAULT 0;
+ALTER TABLE public.baseball_player_stats ADD COLUMN IF NOT EXISTS sacrifice_flies integer NOT NULL DEFAULT 0;