From 91f599f1a26f4f8eed9aa782b72980d5e58bdda4 Mon Sep 17 00:00:00 2001
From: KevinBigham <tkb1230@gmail.com>
Date: Tue, 5 May 2026 12:20:41 -0500
Subject: [PATCH] feat(web): polish assistant release readiness

Strengthens the V1 Assistant into a closed-playtest-ready layer stacked on PR #72 while keeping simulation behavior, RNG, and save compatibility untouched.

Save schema remains v33; no migration required.
---
 apps/web/src/app/App.test.tsx                 |  28 +++
 apps/web/src/app/App.tsx                      |   6 +
 apps/web/src/app/layout/AppLayout.tsx         |  19 +-
 apps/web/src/app/layout/Sidebar.tsx           |  11 +-
 apps/web/src/app/layout/SimControls.tsx       |   6 +-
 .../assistant/components/AssistantAvatar.tsx  |  59 +++++
 .../components/AssistantPanel.test.tsx        | 181 +++++++++++---
 .../assistant/components/AssistantPanel.tsx   | 228 +++++++++++++++---
 .../assistant/data/assistantGuidance.test.ts  |  72 ++++++
 .../assistant/data/assistantGuidance.ts       | 112 +++++++++
 .../assistant/lib/assistantFeedback.test.ts   |  38 +++
 .../assistant/lib/assistantFeedback.ts        |  43 ++++
 .../features/finance/routes/FinancePage.tsx   |  17 +-
 .../minors/components/PipelineView.tsx        |   3 +-
 .../src/features/minors/routes/MinorsPage.tsx |   4 +-
 .../players/components/ProfileHeader.tsx      |  14 +-
 .../src/features/roster/routes/RosterPage.tsx |  31 ++-
 .../features/scouting/routes/ScoutingPage.tsx |  10 +-
 .../src/features/setup/routes/SetupPage.tsx   |  17 +-
 .../src/features/trade/routes/TradePage.tsx   |   9 +-
 .../shared/components/RatingBadge.test.tsx    |  45 ++++
 .../web/src/shared/components/RatingBadge.tsx |  62 +++++
 apps/web/src/workers/sim.worker.helpers.ts    |   2 +
 apps/web/src/workers/sim.worker.pipeline.ts   |  16 +-
 apps/web/src/workers/sim.worker.queries.ts    |  26 +-
 ...BD_ASSISTANT_POLISH_RELEASE_V2_PROGRESS.md | 100 ++++++++
 docs/tutorial-assistant/asset-plan.md         |  12 +
 .../assistant-visual-system.md                |  31 +++
 docs/tutorial-assistant/coverage-matrix.md    |  20 +-
 docs/tutorial-assistant/first-session-flow.md |  27 +++
 .../mobile-validation-v2.md                   |  42 ++++
 .../narrative-continuity-v2.md                |  34 +++
 .../playtest-feedback-loop.md                 |  27 +++
 docs/tutorial-assistant/playtest-plan.md      |  17 ++
 .../ratings-visibility-changelog.md           |  25 ++
 docs/tutorial-assistant/release-gate.md       |  34 ++-
 docs/tutorial-assistant/v2-scorecard.md       |  33 +++
 packages/design-tokens/src/tailwind-preset.ts |  11 +
 38 files changed, 1340 insertions(+), 132 deletions(-)
 create mode 100644 apps/web/src/features/assistant/components/AssistantAvatar.tsx
 create mode 100644 apps/web/src/features/assistant/lib/assistantFeedback.test.ts
 create mode 100644 apps/web/src/features/assistant/lib/assistantFeedback.ts
 create mode 100644 apps/web/src/shared/components/RatingBadge.test.tsx
 create mode 100644 apps/web/src/shared/components/RatingBadge.tsx
 create mode 100644 docs/goals/MBD_ASSISTANT_POLISH_RELEASE_V2_PROGRESS.md
 create mode 100644 docs/tutorial-assistant/assistant-visual-system.md
 create mode 100644 docs/tutorial-assistant/first-session-flow.md
 create mode 100644 docs/tutorial-assistant/mobile-validation-v2.md
 create mode 100644 docs/tutorial-assistant/narrative-continuity-v2.md
 create mode 100644 docs/tutorial-assistant/playtest-feedback-loop.md
 create mode 100644 docs/tutorial-assistant/ratings-visibility-changelog.md
 create mode 100644 docs/tutorial-assistant/v2-scorecard.md

diff --git a/apps/web/src/app/App.test.tsx b/apps/web/src/app/App.test.tsx
index b42343a..2a661b9 100644
--- a/apps/web/src/app/App.test.tsx
+++ b/apps/web/src/app/App.test.tsx
@@ -12,6 +12,10 @@ const routeMockState = vi.hoisted(() => ({
   error: null as unknown,
 }));
 
+const toasterMockState = vi.hoisted(() => ({
+  props: [] as Array<Record<string, unknown>>,
+}));
+
 vi.mock('./routes', () => ({
   AppRoutes: () => {
     if (routeMockState.error) {
@@ -25,6 +29,13 @@ vi.mock('./providers/ErrorBoundary', () => ({
   ErrorBoundary: ({ children }: { children: ReactNode }) => <>{children}</>,
 }));
 
+vi.mock('sonner', () => ({
+  Toaster: (props: Record<string, unknown>) => {
+    toasterMockState.props.push(props);
+    return null;
+  },
+}));
+
 (
   globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }
 ).IS_REACT_ACT_ENVIRONMENT = true;
@@ -70,6 +81,7 @@ describe('App', () => {
     });
     usePreferencesStore.getState().reset();
     routeMockState.error = null;
+    toasterMockState.props = [];
     document.documentElement.dataset.contrast = 'standard';
     container = document.createElement('div');
     document.body.appendChild(container);
@@ -96,6 +108,22 @@ describe('App', () => {
     expect(document.documentElement.dataset.contrast).toBe('high');
   });
 
+  it('keeps persistent toasts dismissible and clear of mobile chrome', async () => {
+    await act(async () => {
+      root!.render(<App />);
+      await Promise.resolve();
+    });
+
+    expect(toasterMockState.props.at(-1)).toEqual(expect.objectContaining({
+      closeButton: true,
+      mobileOffset: expect.objectContaining({
+        bottom: 'calc(env(safe-area-inset-bottom) + 16rem)',
+        left: '0.75rem',
+        right: '0.75rem',
+      }),
+    }));
+  });
+
   it('routes save-load render failures into recovery instead of the generic app shell', async () => {
     const failure: Extract<LoadSaveSafelyResult, { ok: false }> = {
       ok: false,
diff --git a/apps/web/src/app/App.tsx b/apps/web/src/app/App.tsx
index 0d44672..2729988 100644
--- a/apps/web/src/app/App.tsx
+++ b/apps/web/src/app/App.tsx
@@ -25,7 +25,13 @@ export function App() {
         <BrowserRouter>
           <AppRoutes />
           <Toaster
+            closeButton
             position="bottom-right"
+            mobileOffset={{
+              bottom: 'calc(env(safe-area-inset-bottom) + 16rem)',
+              left: '0.75rem',
+              right: '0.75rem',
+            }}
             toastOptions={{
               style: {
                 background: highContrast ? HC_BASE : dynasty.surface,
diff --git a/apps/web/src/app/layout/AppLayout.tsx b/apps/web/src/app/layout/AppLayout.tsx
index 995e6c5..a8c5de7 100644
--- a/apps/web/src/app/layout/AppLayout.tsx
+++ b/apps/web/src/app/layout/AppLayout.tsx
@@ -10,6 +10,7 @@ import { MonthlyPulseOverlay } from './MonthlyPulseOverlay';
 import { TickerBar } from './TickerBar';
 import { PressConferenceModal } from '@/features/press-room/components/PressConferenceModal';
 import { AssistantPanel } from '@/features/assistant/components/AssistantPanel';
+import type { AssistantSeasonSnapshot } from '@/features/assistant/data/assistantGuidance';
 import { TourProvider } from '@/shared/components/TourProvider';
 import { KeyboardShortcutsPanel } from '@/shared/components/KeyboardShortcutsPanel';
 import type { SeasonFlowState } from './seasonFlow';
@@ -31,7 +32,9 @@ function isEditableTarget(target: EventTarget | null): boolean {
   }
 
   return (
-    target.isContentEditable
+    target.closest('button, a, [role="button"], [role="menuitem"]') != null
+    || target.getAttribute('tabindex') != null
+    || target.isContentEditable
     || target.tagName === 'INPUT'
     || target.tagName === 'TEXTAREA'
     || target.tagName === 'SELECT'
@@ -229,6 +232,16 @@ export function AppLayout() {
 
   const activeReport = activeMoment ? null : (monthlyPulse?.pendingReport ?? null);
   const activeDecision = activeReport ? null : (monthlyPulse?.decisionQueue[0] ?? null);
+  const assistantSeasonSnapshot: AssistantSeasonSnapshot | null = seasonFlow
+    ? {
+      teamName,
+      standing: seasonFlow.standingsSnapshot.find((standing) => standing.teamId === userTeamId) ?? null,
+      daysUntilTradeDeadline: seasonFlow.daysUntilTradeDeadline,
+      phaseLabel: seasonFlow.phaseLabel,
+      detailLabel: seasonFlow.detailLabel,
+      seasonSummary: seasonFlow.seasonSummary,
+    }
+    : null;
   const ambientMode = resolveAmbientMode(
     location.pathname,
     isInitialized,
@@ -468,7 +481,7 @@ export function AppLayout() {
       {/* Main area: sidebar + content */}
       <div className="flex flex-1 overflow-hidden">
         <Sidebar />
-        <main id="main-content" className="flex-1 overflow-y-auto p-4 pb-20 md:p-6 md:pb-6">
+        <main id="main-content" className="flex-1 overflow-y-auto p-4 pb-56 md:p-6 md:pb-6">
           <>
             {seasonFlow && (
               <SeasonFlowCard
@@ -495,7 +508,7 @@ export function AppLayout() {
         flow={seasonFlow}
       />
 
-      <AssistantPanel tickerFeed={tickerFeed} />
+      <AssistantPanel tickerFeed={tickerFeed} seasonSnapshot={assistantSeasonSnapshot} />
 
       {/* Command palette overlay */}
       <CommandPalette
diff --git a/apps/web/src/app/layout/Sidebar.tsx b/apps/web/src/app/layout/Sidebar.tsx
index 838dffc..ef9e0a1 100644
--- a/apps/web/src/app/layout/Sidebar.tsx
+++ b/apps/web/src/app/layout/Sidebar.tsx
@@ -107,8 +107,7 @@ function SidebarLink({ item, collapsed }: { item: NavItem; collapsed: boolean })
   );
 }
 
-/** Mobile bottom tab indices: Dashboard, Roster, Draft, Trade, League, More */
-const MOBILE_TAB_INDICES = [0, 2, 8, 9, 10];
+const MOBILE_TAB_ROUTES = ['/dashboard', '/roster', '/draft', '/trade', '/league/standings'] as const;
 
 function MobileTabLink({ item }: { item: NavItem }) {
   return (
@@ -153,7 +152,7 @@ function MobileMoreDrawer({
   return (
     <div className="fixed inset-0 z-50 flex flex-col justify-end">
       <div className="flex-1" onClick={onClose} aria-hidden />
-      <div className="max-h-[70vh] overflow-y-auto rounded-t-xl border-t border-dynasty-border bg-dynasty-surface pb-safe">
+      <div className="max-h-[70vh] overflow-y-auto rounded-t-xl border-t border-dynasty-border bg-dynasty-surface pb-[calc(env(safe-area-inset-bottom)+0.75rem)]">
         <div className="flex items-center justify-between border-b border-dynasty-border px-4 py-3">
           <span className="font-heading text-sm font-semibold text-dynasty-textBright">Navigation</span>
           <button
@@ -194,11 +193,13 @@ function MobileMoreDrawer({
 
 export function MobileTabBar({ items }: { items: NavItem[] }) {
   const [moreOpen, setMoreOpen] = useState(false);
-  const tabItems = MOBILE_TAB_INDICES.map((i) => items[i]).filter((item): item is NavItem => item != null);
+  const tabItems = MOBILE_TAB_ROUTES
+    .map((route) => items.find((item) => item.to === route))
+    .filter((item): item is NavItem => item != null);
 
   return (
     <>
-      <nav className="fixed inset-x-0 bottom-0 z-40 flex items-stretch border-t border-dynasty-border bg-dynasty-surface md:hidden" aria-label="Mobile navigation">
+      <nav className="fixed inset-x-0 bottom-0 z-40 flex items-stretch border-t border-dynasty-border bg-dynasty-surface pb-[env(safe-area-inset-bottom)] md:hidden" aria-label="Mobile navigation">
         {tabItems.map((item) => (
           <MobileTabLink key={item.to} item={item} />
         ))}
diff --git a/apps/web/src/app/layout/SimControls.tsx b/apps/web/src/app/layout/SimControls.tsx
index 8464da4..0bd5d3d 100644
--- a/apps/web/src/app/layout/SimControls.tsx
+++ b/apps/web/src/app/layout/SimControls.tsx
@@ -30,7 +30,7 @@ function SimButton({ onClick, disabled, icon, label, shortLabel, tooltip }: SimB
       }}
       disabled={disabled}
       title={tooltip}
-      className="focus-ring flex min-h-[48px] flex-1 items-center justify-center gap-2 rounded-md bg-accent-primary px-4 py-2 font-heading text-sm font-semibold text-white transition-colors hover:bg-accent-primaryHover disabled:cursor-not-allowed disabled:opacity-40"
+      className="focus-ring flex min-h-[48px] flex-1 items-center justify-center gap-2 rounded-md bg-accent-primary px-4 py-2 font-heading text-sm font-semibold text-dynasty-base transition-colors hover:bg-accent-primaryHover disabled:cursor-not-allowed disabled:opacity-40"
       aria-label={tooltip ?? label}
     >
       {icon}
@@ -53,7 +53,7 @@ export function SimControls({
   const showRegularControls = flow?.canUseRegularSimControls ?? true;
 
   return (
-    <footer data-tour="sim-controls" className="border-t border-dynasty-border bg-dynasty-surface px-3 py-2 pb-2 md:px-4 md:pb-2">
+    <footer data-tour="sim-controls" className="border-t border-dynasty-border bg-dynasty-surface px-3 py-2 pb-[calc(env(safe-area-inset-bottom)+4.5rem)] md:px-4 md:pb-2">
       <div className="flex items-center gap-2 md:gap-3">
         {/* Status display */}
         <div className="hidden min-w-[140px] md:block" aria-live="polite">
@@ -110,7 +110,7 @@ export function SimControls({
                 onFlowAction();
               }}
               disabled={isSimulating || !flow?.actionLabel}
-              className="focus-ring flex min-h-[48px] flex-1 items-center justify-center gap-2 rounded-md bg-accent-primary px-4 py-2 font-heading text-sm font-semibold text-white transition-colors hover:bg-accent-primaryHover disabled:cursor-not-allowed disabled:opacity-40"
+              className="focus-ring flex min-h-[48px] flex-1 items-center justify-center gap-2 rounded-md bg-accent-primary px-4 py-2 font-heading text-sm font-semibold text-dynasty-base transition-colors hover:bg-accent-primaryHover disabled:cursor-not-allowed disabled:opacity-40"
             >
               <Zap className="h-4 w-4" />
               {flow?.actionLabel ?? 'Continue'}
diff --git a/apps/web/src/features/assistant/components/AssistantAvatar.tsx b/apps/web/src/features/assistant/components/AssistantAvatar.tsx
new file mode 100644
index 0000000..898af63
--- /dev/null
+++ b/apps/web/src/features/assistant/components/AssistantAvatar.tsx
@@ -0,0 +1,59 @@
+export type AssistantExpression = 'neutral' | 'excited' | 'warning' | 'success' | 'thinking';
+
+export interface AssistantAvatarProps {
+  expression: AssistantExpression;
+  pulse?: boolean;
+}
+
+function expressionClasses(expression: AssistantExpression): string {
+  if (expression === 'warning') return 'border-accent-warning/70 text-accent-warning shadow-[0_0_20px_rgba(245,158,11,0.18)]';
+  if (expression === 'success') return 'border-accent-success/70 text-accent-success shadow-[0_0_20px_rgba(34,197,94,0.18)]';
+  if (expression === 'excited') return 'border-accent-primary/70 text-accent-primary shadow-[0_0_20px_rgba(249,115,22,0.2)]';
+  if (expression === 'thinking') return 'border-accent-info/70 text-accent-info shadow-[0_0_20px_rgba(59,130,246,0.18)]';
+  return 'border-dynasty-border text-dynasty-text';
+}
+
+function eyebrowPath(expression: AssistantExpression): string {
+  if (expression === 'warning') return 'M16 18l6-2M30 16l6 2';
+  if (expression === 'success' || expression === 'excited') return 'M16 16l6 1M30 17l6-1';
+  if (expression === 'thinking') return 'M16 17l6-1M30 16l6 1';
+  return 'M16 17h6M30 17h6';
+}
+
+function mouthPath(expression: AssistantExpression): string {
+  if (expression === 'warning') return 'M21 33h10';
+  if (expression === 'success' || expression === 'excited') return 'M20 31c3 4 10 4 13 0';
+  if (expression === 'thinking') return 'M22 32c3 1 7 1 10-1';
+  return 'M22 32c3 2 7 2 10 0';
+}
+
+export function AssistantAvatar({ expression, pulse = false }: AssistantAvatarProps) {
+  return (
+    <div
+      className={`flex h-12 w-12 shrink-0 items-center justify-center rounded-full border bg-dynasty-elevated ${expressionClasses(expression)} motion-safe:animate-assistant-enter ${pulse ? 'motion-safe:animate-assistant-pulse' : ''}`}
+      aria-label={`Mack Mercer expression: ${expression}`}
+      role="img"
+    >
+      <svg
+        viewBox="0 0 52 52"
+        className="h-10 w-10"
+        aria-hidden="true"
+      >
+        <circle cx="26" cy="26" r="23" fill="currentColor" opacity="0.1" />
+        <path d="M14 39c2-8 7-12 12-12s10 4 12 12" fill="currentColor" opacity="0.12" />
+        <path d="M15 20c1-7 6-12 12-12 5 0 9 3 11 8-5 0-9 1-13 4-4-1-7-1-10 0z" fill="currentColor" opacity="0.28" />
+        <circle cx="20" cy="24" r="2" fill="currentColor" />
+        <circle cx="32" cy="24" r="2" fill="currentColor" />
+        <path d={eyebrowPath(expression)} stroke="currentColor" strokeWidth="2" strokeLinecap="round" fill="none" />
+        <path d={mouthPath(expression)} stroke="currentColor" strokeWidth="2" strokeLinecap="round" fill="none" />
+        <path d="M13 38h26" stroke="currentColor" strokeWidth="2" strokeLinecap="round" opacity="0.45" />
+        {expression === 'thinking' ? (
+          <path d="M38 12h5M41 9v6" stroke="currentColor" strokeWidth="2" strokeLinecap="round" opacity="0.8" />
+        ) : null}
+        {expression === 'success' ? (
+          <path d="M38 13l3 3 6-7" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
+        ) : null}
+      </svg>
+    </div>
+  );
+}
diff --git a/apps/web/src/features/assistant/components/AssistantPanel.test.tsx b/apps/web/src/features/assistant/components/AssistantPanel.test.tsx
index ba1d3fe..5f98b4a 100644
--- a/apps/web/src/features/assistant/components/AssistantPanel.test.tsx
+++ b/apps/web/src/features/assistant/components/AssistantPanel.test.tsx
@@ -14,54 +14,97 @@ const mockedUseGameStore = vi.mocked(useGameStore);
   globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }
 ).IS_REACT_ACT_ENVIRONMENT = true;
 
+function createTestStorage(): Storage {
+  const values = new Map<string, string>();
+  return {
+    get length() {
+      return values.size;
+    },
+    clear: vi.fn(() => values.clear()),
+    getItem: vi.fn((key: string) => values.get(key) ?? null),
+    key: vi.fn((index: number) => Array.from(values.keys())[index] ?? null),
+    removeItem: vi.fn((key: string) => {
+      values.delete(key);
+    }),
+    setItem: vi.fn((key: string, value: string) => {
+      values.set(key, value);
+    }),
+  };
+}
+
+function setNativeTextAreaValue(element: HTMLTextAreaElement, value: string): void {
+  const setter = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, 'value')?.set;
+  setter?.call(element, value);
+}
+
+function gameStoreState() {
+  return {
+    season: 2,
+    day: 95,
+    phase: 'regular',
+    isInitialized: true,
+    userTeamId: 'nym',
+    teamName: 'Tycoons',
+    gmName: 'Alex Rivera',
+    difficulty: 'standard',
+    activeSaveId: 'save-slot-2',
+    activeSaveSlot: 2,
+    playerCount: 780,
+    gamesPlayed: 95,
+    isSimulating: false,
+    setSeason: vi.fn(),
+    setDay: vi.fn(),
+    setPhase: vi.fn(),
+    setSimulating: vi.fn(),
+    setInitialized: vi.fn(),
+    setUserTeamId: vi.fn(),
+    setActiveSave: vi.fn(),
+    setActiveSaveSlot: vi.fn(),
+    updateFromSim: vi.fn(),
+    initializeGame: vi.fn(),
+  };
+}
+
 describe('AssistantPanel', () => {
   let container: HTMLDivElement;
-  let root: Root;
+  let root: Root | null;
+  const clipboardWriteText = vi.fn();
 
   beforeEach(() => {
-    localStorage.clear();
+    const storage = createTestStorage();
+    Object.defineProperty(window, 'localStorage', {
+      configurable: true,
+      value: storage,
+    });
+    Object.defineProperty(globalThis, 'localStorage', {
+      configurable: true,
+      value: storage,
+    });
+    window.localStorage.clear();
+    clipboardWriteText.mockResolvedValue(undefined);
+    Object.defineProperty(navigator, 'clipboard', {
+      configurable: true,
+      value: { writeText: clipboardWriteText },
+    });
     container = document.createElement('div');
     document.body.appendChild(container);
     root = createRoot(container);
-    mockedUseGameStore.mockReturnValue({
-      season: 2,
-      day: 95,
-      phase: 'regular',
-      isInitialized: true,
-      userTeamId: 'nym',
-      teamName: 'Tycoons',
-      gmName: 'Alex Rivera',
-      difficulty: 'standard',
-      activeSaveId: 'save-slot-2',
-      activeSaveSlot: 2,
-      playerCount: 780,
-      gamesPlayed: 95,
-      isSimulating: false,
-      setSeason: vi.fn(),
-      setDay: vi.fn(),
-      setPhase: vi.fn(),
-      setSimulating: vi.fn(),
-      setInitialized: vi.fn(),
-      setUserTeamId: vi.fn(),
-      setActiveSave: vi.fn(),
-      setActiveSaveSlot: vi.fn(),
-      updateFromSim: vi.fn(),
-      initializeGame: vi.fn(),
-    });
+    mockedUseGameStore.mockReturnValue(gameStoreState());
   });
 
   afterEach(async () => {
     await act(async () => {
-      root.unmount();
+      root?.unmount();
     });
     container.remove();
+    root = null;
     vi.clearAllMocks();
-    localStorage.clear();
+    window.localStorage.clear();
   });
 
   it('opens route-aware guidance, explains ratings, and persists dismissals by save slot', async () => {
     await act(async () => {
-      root.render(
+      root!.render(
         <MemoryRouter initialEntries={['/trade']}>
           <AssistantPanel
             tickerFeed={[
@@ -77,7 +120,7 @@ describe('AssistantPanel', () => {
       await Promise.resolve();
     });
 
-    expect(container.textContent).toContain('Assistant');
+    expect(container.textContent).toContain('Mack Mercer');
     expect(container.textContent).toContain('Trade');
 
     const openButton = Array.from(container.querySelectorAll('button')).find((button) => (
@@ -109,6 +152,80 @@ describe('AssistantPanel', () => {
       gotItButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
     });
 
-    expect(localStorage.getItem('mbd:assistant:v1:save-slot-2')).toContain('"trade":true');
+    expect(window.localStorage.getItem('mbd:assistant:v1:save-slot-2')).toContain('"trade":true');
+  });
+
+  it('focuses the close button on open and exposes expression-driven avatar identity', async () => {
+    mockedUseGameStore.mockReturnValue({
+      ...gameStoreState(),
+      phase: 'playoffs',
+    });
+
+    await act(async () => {
+      root!.render(
+        <MemoryRouter initialEntries={['/playoffs']}>
+          <AssistantPanel />
+        </MemoryRouter>,
+      );
+      await Promise.resolve();
+    });
+
+    const openButton = container.querySelector('button[aria-label="Open Mack Mercer Assistant"]');
+    expect(openButton).toBeTruthy();
+    expect(openButton?.textContent).toContain('Mack Mercer');
+
+    await act(async () => {
+      openButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(document.activeElement?.getAttribute('aria-label')).toBe('Close Assistant');
+    expect(container.querySelector('[aria-label="Mack Mercer expression: excited"]')).toBeTruthy();
+  });
+
+  it('builds and copies closed-playtest feedback diagnostics without a backend', async () => {
+    await act(async () => {
+      root!.render(
+        <MemoryRouter initialEntries={['/trade']}>
+          <AssistantPanel />
+        </MemoryRouter>,
+      );
+      await Promise.resolve();
+    });
+
+    const openButton = container.querySelector('button[aria-label="Open Mack Mercer Assistant"]');
+    await act(async () => {
+      openButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+    });
+
+    const feedbackButton = Array.from(container.querySelectorAll('button')).find((button) => (
+      button.textContent?.includes('Give feedback')
+    ));
+    expect(feedbackButton).toBeTruthy();
+
+    await act(async () => {
+      feedbackButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+    });
+
+    const textArea = container.querySelector('textarea[name="assistant-confusion"]') as HTMLTextAreaElement | null;
+    expect(textArea).toBeTruthy();
+    await act(async () => {
+      setNativeTextAreaValue(textArea!, 'I was not sure which offer was fair.');
+      textArea!.dispatchEvent(new Event('input', { bubbles: true }));
+      textArea!.dispatchEvent(new Event('change', { bubbles: true }));
+    });
+
+    const copyButton = Array.from(container.querySelectorAll('button')).find((button) => (
+      button.textContent?.includes('Copy report')
+    ));
+    await act(async () => {
+      copyButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(clipboardWriteText).toHaveBeenCalledTimes(1);
+    expect(clipboardWriteText.mock.calls[0]?.[0]).toContain('Route: /trade (trade)');
+    expect(clipboardWriteText.mock.calls[0]?.[0]).toContain('Assistant mode: newcomer');
+    expect(clipboardWriteText.mock.calls[0]?.[0]).toContain('I was not sure which offer was fair.');
   });
 });
diff --git a/apps/web/src/features/assistant/components/AssistantPanel.tsx b/apps/web/src/features/assistant/components/AssistantPanel.tsx
index e2bfc93..061db80 100644
--- a/apps/web/src/features/assistant/components/AssistantPanel.tsx
+++ b/apps/web/src/features/assistant/components/AssistantPanel.tsx
@@ -1,12 +1,12 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import {
   BadgeHelp,
   CheckCircle2,
   ChevronDown,
   ChevronUp,
+  ClipboardCopy,
   Gauge,
-  MessageCircle,
   RotateCcw,
   Sparkles,
   X,
@@ -14,9 +14,11 @@ import {
 import { useGameStore } from '@/shared/hooks/useGameStore';
 import {
   buildAssistantNextAction,
+  buildStorySoFar,
   buildStoryCallback,
   resolveAssistantRouteKey,
   selectRouteGuidance,
+  type AssistantSeasonSnapshot,
   type AssistantStoryCallback,
   type AssistantTickerItem,
 } from '../data/assistantGuidance';
@@ -29,11 +31,19 @@ import {
   type AssistantState,
   type AssistantStateEvent,
 } from '../lib/assistantState';
+import {
+  buildAssistantFeedbackReport,
+  resolveViewportCategory,
+} from '../lib/assistantFeedback';
+import { AssistantAvatar, type AssistantExpression } from './AssistantAvatar';
 
 export interface AssistantPanelProps {
   tickerFeed?: readonly AssistantTickerItem[];
+  seasonSnapshot?: AssistantSeasonSnapshot | null;
 }
 
+const APP_VERSION = ((import.meta as unknown as { env?: { VITE_APP_VERSION?: string } }).env?.VITE_APP_VERSION) ?? 'local';
+
 function resolveSaveId(activeSaveSlot: number | null, activeSaveId: string | null): AssistantSaveId {
   return activeSaveSlot ?? activeSaveId;
 }
@@ -57,31 +67,28 @@ function storyToneClasses(story: AssistantStoryCallback | null): string {
   return 'border-dynasty-border bg-dynasty-elevated/70 text-dynasty-muted';
 }
 
-function AssistantAvatar({ story }: { story: AssistantStoryCallback | null }) {
-  const toneClass = story?.tone === 'warning'
-    ? 'border-accent-warning text-accent-warning'
-    : story?.tone === 'success'
-      ? 'border-accent-success text-accent-success'
-      : story?.tone === 'excited'
-        ? 'border-accent-primary text-accent-primary'
-        : 'border-accent-info text-accent-info';
-
-  return (
-    <div
-      className={`flex h-11 w-11 shrink-0 items-center justify-center rounded-full border bg-dynasty-elevated shadow-lg motion-safe:animate-[fadeIn_160ms_ease-out] ${toneClass}`}
-      aria-hidden="true"
-    >
-      <MessageCircle className="h-5 w-5" />
-    </div>
-  );
+function expressionForContext(
+  routeKey: string,
+  story: AssistantStoryCallback | null,
+  routeCompleted: boolean,
+): AssistantExpression {
+  if (routeCompleted) return 'success';
+  if (story?.tone === 'warning') return 'warning';
+  if (story?.tone === 'success') return 'success';
+  if (story?.tone === 'excited') return 'excited';
+  if (routeKey === 'scouting' || routeKey === 'draft' || routeKey === 'player-profile' || routeKey === 'player-compare' || routeKey === 'minors') {
+    return 'thinking';
+  }
+  return 'neutral';
 }
 
-export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
+export function AssistantPanel({ tickerFeed = [], seasonSnapshot = null }: AssistantPanelProps) {
   const location = useLocation();
   const {
     activeSaveId,
     activeSaveSlot,
     day,
+    gamesPlayed,
     phase,
     season,
   } = useGameStore();
@@ -92,12 +99,21 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
   const [open, setOpen] = useState(false);
   const [ratingsOpen, setRatingsOpen] = useState(false);
   const [strategyOpen, setStrategyOpen] = useState(false);
+  const [feedbackOpen, setFeedbackOpen] = useState(false);
+  const [helpfulScore, setHelpfulScore] = useState(4);
+  const [clarityScore, setClarityScore] = useState(4);
+  const [confusion, setConfusion] = useState('');
+  const [copiedFeedback, setCopiedFeedback] = useState(false);
+  const [successPulse, setSuccessPulse] = useState(false);
+  const closeButtonRef = useRef<HTMLButtonElement | null>(null);
 
   useEffect(() => {
     setState(readAssistantState(saveId));
     setOpen(false);
     setRatingsOpen(false);
     setStrategyOpen(false);
+    setFeedbackOpen(false);
+    setCopiedFeedback(false);
   }, [saveId]);
 
   const dispatch = useCallback((event: AssistantStateEvent) => {
@@ -114,7 +130,8 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
     day,
     season,
     mode: state.mode,
-  }), [day, phase, routeKey, season, state.mode]);
+    seasonSnapshot,
+  }), [day, phase, routeKey, season, seasonSnapshot, state.mode]);
 
   const story = useMemo(() => buildStoryCallback({
     phase,
@@ -126,24 +143,59 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
   }), [day, phase, routeKey, season, state.seenStoryCallbacks, tickerFeed]);
 
   const routeDismissed = state.dismissedRoutes[routeKey] === true;
+  const routeCompleted = state.completedRoutes[routeKey] === true;
+  const expression = expressionForContext(routeKey, story, routeCompleted);
+  const storySoFar = useMemo(() => buildStorySoFar({
+    phase,
+    day,
+    season,
+    gamesPlayed,
+    routeKey,
+    seasonSnapshot,
+  }), [day, gamesPlayed, phase, routeKey, season, seasonSnapshot]);
 
   const handleComplete = useCallback(() => {
     dispatch({ type: 'completeRoute', routeKey });
     if (story) {
       dispatch({ type: 'markStorySeen', callbackId: story.id });
     }
+    setSuccessPulse(true);
     setOpen(false);
     setRatingsOpen(false);
     setStrategyOpen(false);
+    setFeedbackOpen(false);
   }, [dispatch, routeKey, story]);
 
   const handleReplay = useCallback(() => {
     dispatch({ type: 'replayRoute', routeKey });
     setRatingsOpen(false);
     setStrategyOpen(false);
+    setFeedbackOpen(false);
     setOpen(true);
+    setSuccessPulse(true);
   }, [dispatch, routeKey]);
 
+  const handleCopyFeedback = useCallback(async () => {
+    const viewportWidth = typeof window === 'undefined' ? 1024 : window.innerWidth;
+    const report = buildAssistantFeedbackReport({
+      appVersion: APP_VERSION,
+      route: location.pathname,
+      routeKey,
+      phase,
+      day,
+      season,
+      assistantMode: state.mode,
+      completedRoutes: Object.keys(state.completedRoutes).sort(),
+      viewportCategory: resolveViewportCategory(viewportWidth),
+      helpfulScore,
+      clarityScore,
+      confusion,
+    });
+
+    await navigator.clipboard?.writeText(report);
+    setCopiedFeedback(true);
+  }, [clarityScore, confusion, day, helpfulScore, location.pathname, phase, routeKey, season, state.completedRoutes, state.mode]);
+
   useEffect(() => {
     if (!open) return;
     const onKey = (event: KeyboardEvent) => {
@@ -155,19 +207,30 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
     return () => window.removeEventListener('keydown', onKey);
   }, [open]);
 
+  useEffect(() => {
+    if (!open) return;
+    closeButtonRef.current?.focus();
+  }, [open]);
+
+  useEffect(() => {
+    if (!successPulse) return;
+    const timeout = window.setTimeout(() => setSuccessPulse(false), 950);
+    return () => window.clearTimeout(timeout);
+  }, [successPulse]);
+
   return (
-    <aside className="fixed inset-x-3 bottom-24 z-40 sm:left-auto sm:right-4 sm:w-[25rem] md:bottom-20">
+    <aside className="fixed inset-x-3 bottom-[calc(env(safe-area-inset-bottom)+10.5rem)] z-40 sm:left-auto sm:right-4 sm:w-[25rem] md:bottom-20">
       {!open ? (
         <button
           type="button"
           onClick={() => setOpen(true)}
           className="flex w-full min-h-11 items-center gap-3 rounded-lg border border-accent-info/35 bg-dynasty-surface/95 p-3 text-left shadow-xl backdrop-blur transition-colors hover:border-accent-primary sm:ml-auto"
-          aria-label="Open Assistant"
+          aria-label="Open Mack Mercer Assistant"
         >
-          <AssistantAvatar story={story} />
+          <AssistantAvatar expression={expression} pulse={successPulse} />
           <span className="min-w-0 flex-1">
             <span className="flex items-center gap-2 font-heading text-sm font-semibold text-dynasty-textBright">
-              Assistant
+              Mack Mercer
               <span className="rounded border border-dynasty-border px-1.5 py-0.5 font-data text-[10px] uppercase tracking-[0.16em] text-dynasty-muted">
                 {modeLabel(state.mode)}
               </span>
@@ -184,10 +247,11 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
         <section
           role="dialog"
           aria-label="Mack Mercer Assistant"
-          className="max-h-[72vh] overflow-y-auto rounded-lg border border-accent-info/35 bg-dynasty-surface shadow-2xl"
+          aria-describedby="assistant-route-summary"
+          className="max-h-[min(68vh,calc(100vh-12rem))] overflow-y-auto rounded-lg border border-accent-info/35 bg-dynasty-surface shadow-2xl sm:max-h-[72vh]"
         >
           <div className="flex items-start gap-3 border-b border-dynasty-border p-4">
-            <AssistantAvatar story={story} />
+            <AssistantAvatar expression={expression} pulse={successPulse} />
             <div className="min-w-0 flex-1">
               <div className="flex items-center gap-2">
                 <h2 className="font-heading text-sm font-semibold text-dynasty-textBright">Mack Mercer</h2>
@@ -200,6 +264,7 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
               </p>
             </div>
             <button
+              ref={closeButtonRef}
               type="button"
               onClick={() => setOpen(false)}
               className="flex min-h-11 min-w-11 items-center justify-center rounded text-dynasty-muted transition-colors hover:bg-dynasty-elevated hover:text-dynasty-text"
@@ -222,10 +287,23 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
               </div>
             ) : null}
 
-            <div>
+            <div id="assistant-route-summary">
               <h3 className="font-heading text-base font-semibold text-dynasty-textBright">{guidance.title}</h3>
-              <p className="mt-2 font-heading text-sm leading-relaxed text-dynasty-text">{guidance.pagePurpose}</p>
-              <p className="mt-2 font-data text-xs leading-relaxed text-dynasty-muted">{guidance.whenToUse}</p>
+              <p className="mt-2 font-heading text-sm leading-relaxed text-dynasty-text">
+                {guidance.firstSessionCue ?? guidance.pagePurpose}
+              </p>
+              <p className="mt-2 hidden font-data text-xs leading-relaxed text-dynasty-muted sm:block">{guidance.whenToUse}</p>
+            </div>
+
+            <div className="rounded-md border border-dynasty-border bg-dynasty-elevated/50 p-3">
+              <div className="font-heading text-xs font-semibold uppercase tracking-[0.14em] text-dynasty-muted">Story so far</div>
+              <ul className="mt-2 space-y-1.5">
+                {storySoFar.map((line) => (
+                  <li key={line} className="font-heading text-xs leading-relaxed text-dynasty-text">
+                    {line}
+                  </li>
+                ))}
+              </ul>
             </div>
 
             <div className="rounded-md border border-dynasty-border bg-dynasty-elevated/60 p-3">
@@ -254,6 +332,8 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
               <button
                 type="button"
                 onClick={() => setRatingsOpen((value) => !value)}
+                aria-expanded={ratingsOpen}
+                aria-controls="assistant-ratings-panel"
                 className="flex min-h-11 items-center justify-center gap-2 rounded-md border border-dynasty-border px-3 py-2 font-heading text-xs font-semibold text-dynasty-text transition-colors hover:border-accent-primary"
               >
                 <Gauge className="h-4 w-4" />
@@ -262,6 +342,8 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
               <button
                 type="button"
                 onClick={() => setStrategyOpen((value) => !value)}
+                aria-expanded={strategyOpen}
+                aria-controls="assistant-strategy-panel"
                 className="flex min-h-11 items-center justify-center gap-2 rounded-md border border-dynasty-border px-3 py-2 font-heading text-xs font-semibold text-dynasty-text transition-colors hover:border-accent-primary"
               >
                 <Sparkles className="h-4 w-4" />
@@ -270,28 +352,91 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
             </div>
 
             {ratingsOpen ? (
-              <div className="rounded-md border border-dynasty-border bg-dynasty-elevated/60 p-3">
+              <div id="assistant-ratings-panel" className="rounded-md border border-dynasty-border bg-dynasty-elevated/60 p-3">
                 <div className="font-heading text-xs font-semibold uppercase tracking-[0.14em] text-dynasty-muted">Ratings read</div>
                 <p className="mt-1 font-heading text-xs leading-relaxed text-dynasty-text">{guidance.ratingsFocus}</p>
               </div>
             ) : null}
 
             {strategyOpen ? (
-              <div className="rounded-md border border-dynasty-border bg-dynasty-elevated/60 p-3">
+              <div id="assistant-strategy-panel" className="rounded-md border border-dynasty-border bg-dynasty-elevated/60 p-3">
                 <div className="font-heading text-xs font-semibold uppercase tracking-[0.14em] text-dynasty-muted">Bench coach note</div>
                 <p className="mt-1 font-heading text-xs leading-relaxed text-dynasty-text">{guidance.deeperStrategy}</p>
               </div>
             ) : null}
 
-            <div className="rounded-md border border-dynasty-border bg-dynasty-elevated/50 p-3 font-data text-[11px] leading-relaxed text-dynasty-muted">
+            <div className="hidden rounded-md border border-dynasty-border bg-dynasty-elevated/50 p-3 font-data text-[11px] leading-relaxed text-dynasty-muted sm:block">
               {guidance.mobileTip}
             </div>
 
-            <div className="flex flex-wrap items-center gap-2 border-t border-dynasty-border pt-3">
+            {feedbackOpen ? (
+              <div className="rounded-md border border-dynasty-border bg-dynasty-elevated/60 p-3">
+                <div className="flex items-center justify-between gap-2">
+                  <div className="font-heading text-xs font-semibold uppercase tracking-[0.14em] text-dynasty-muted">Playtest feedback</div>
+                  {copiedFeedback ? (
+                    <span className="font-data text-[11px] text-accent-success">Copied</span>
+                  ) : null}
+                </div>
+                <div className="mt-3 grid grid-cols-2 gap-3">
+                  <label className="font-heading text-xs text-dynasty-muted">
+                    Mack helpful: {helpfulScore}/5
+                    <input
+                      type="range"
+                      min={1}
+                      max={5}
+                      value={helpfulScore}
+                      onChange={(event) => {
+                        setCopiedFeedback(false);
+                        setHelpfulScore(Number(event.target.value));
+                      }}
+                      className="mt-2 w-full accent-accent-primary"
+                    />
+                  </label>
+                  <label className="font-heading text-xs text-dynasty-muted">
+                    Knew next move: {clarityScore}/5
+                    <input
+                      type="range"
+                      min={1}
+                      max={5}
+                      value={clarityScore}
+                      onChange={(event) => {
+                        setCopiedFeedback(false);
+                        setClarityScore(Number(event.target.value));
+                      }}
+                      className="mt-2 w-full accent-accent-primary"
+                    />
+                  </label>
+                </div>
+                <label className="mt-3 block font-heading text-xs text-dynasty-muted">
+                  What confused you?
+                  <textarea
+                    name="assistant-confusion"
+                    value={confusion}
+                    onChange={(event) => {
+                      setCopiedFeedback(false);
+                      setConfusion(event.target.value);
+                    }}
+                    rows={3}
+                    className="mt-2 w-full rounded-md border border-dynasty-border bg-dynasty-surface px-3 py-2 font-heading text-xs text-dynasty-text focus:border-accent-primary focus:outline-none"
+                    placeholder="One sentence is enough."
+                  />
+                </label>
+                <button
+                  type="button"
+                  onClick={() => void handleCopyFeedback()}
+                  className="mt-3 flex min-h-11 w-full items-center justify-center gap-2 rounded-md border border-accent-info/40 bg-accent-info/10 px-3 py-2 font-heading text-xs font-semibold text-accent-info transition-colors hover:bg-accent-info/15"
+                >
+                  <ClipboardCopy className="h-4 w-4" />
+                  Copy report
+                </button>
+              </div>
+            ) : null}
+
+            <div className="sticky bottom-0 -mx-4 flex flex-wrap items-center gap-2 border-t border-dynasty-border bg-dynasty-surface px-4 pb-4 pt-3">
               <button
                 type="button"
                 onClick={handleComplete}
-                className="flex min-h-11 flex-1 items-center justify-center gap-2 rounded-md bg-accent-primary px-3 py-2 font-heading text-xs font-semibold text-white transition-colors hover:bg-accent-primary/80"
+                className="flex min-h-11 flex-1 items-center justify-center gap-2 rounded-md bg-accent-primary px-3 py-2 font-heading text-xs font-semibold text-dynasty-base transition-colors hover:bg-accent-primary/80"
               >
                 <CheckCircle2 className="h-4 w-4" />
                 Got it
@@ -307,10 +452,23 @@ export function AssistantPanel({ tickerFeed = [] }: AssistantPanelProps) {
               <button
                 type="button"
                 onClick={() => dispatch({ type: 'setMode', mode: state.mode === 'newcomer' ? 'hardcore' : 'newcomer' })}
+                aria-pressed={state.mode === 'hardcore'}
+                aria-label={`Switch Assistant mode; current mode ${modeLabel(state.mode)}`}
                 className="min-h-11 rounded-md border border-dynasty-border px-3 py-2 font-heading text-xs font-semibold text-dynasty-text transition-colors hover:border-accent-primary"
               >
                 {state.mode === 'newcomer' ? 'Hardcore mode' : 'Newcomer mode'}
               </button>
+              <button
+                type="button"
+                onClick={() => {
+                  setFeedbackOpen((value) => !value);
+                  setCopiedFeedback(false);
+                }}
+                aria-expanded={feedbackOpen}
+                className="min-h-11 rounded-md border border-dynasty-border px-3 py-2 font-heading text-xs font-semibold text-dynasty-text transition-colors hover:border-accent-primary"
+              >
+                Give feedback
+              </button>
             </div>
           </div>
         </section>
diff --git a/apps/web/src/features/assistant/data/assistantGuidance.test.ts b/apps/web/src/features/assistant/data/assistantGuidance.test.ts
index 03308ef..0271537 100644
--- a/apps/web/src/features/assistant/data/assistantGuidance.test.ts
+++ b/apps/web/src/features/assistant/data/assistantGuidance.test.ts
@@ -3,6 +3,7 @@ import {
   ASSISTANT_GUIDANCE,
   REQUIRED_ASSISTANT_ROUTE_KEYS,
   buildAssistantNextAction,
+  buildStorySoFar,
   buildStoryCallback,
   resolveAssistantRouteKey,
   selectRouteGuidance,
@@ -51,6 +52,77 @@ describe('assistantGuidance', () => {
       season: 1,
       mode: 'hardcore',
     })).toMatchObject({ route: '/trade', label: 'Audit deadline value' });
+
+    expect(buildAssistantNextAction({
+      routeKey: 'dashboard',
+      phase: 'regular',
+      day: 92,
+      season: 2,
+      mode: 'newcomer',
+      seasonSnapshot: {
+        teamName: 'Tycoons',
+        standing: { wins: 42, losses: 40, division: 'East' },
+        daysUntilTradeDeadline: 10,
+        phaseLabel: 'Regular Season',
+        detailLabel: 'Deadline approaching',
+        seasonSummary: null,
+      },
+    })).toMatchObject({ route: '/trade', label: 'Check trade and budget fit' });
+
+    expect(buildAssistantNextAction({
+      routeKey: 'draft',
+      phase: 'regular',
+      day: 8,
+      season: 1,
+      mode: 'newcomer',
+    })).toMatchObject({ route: '/scouting', label: 'Scout before draft season' });
+
+    expect(buildAssistantNextAction({
+      routeKey: 'free-agency',
+      phase: 'regular',
+      day: 8,
+      season: 1,
+      mode: 'newcomer',
+    })).toMatchObject({ route: '/finance', label: 'Check payroll room' });
+  });
+
+  it('keeps first-session guidance short and actionable on core routes', () => {
+    for (const path of ['/', '/onboarding', '/dashboard', '/roster', '/players/example', '/scouting', '/draft', '/trade', '/free-agency', '/finance', '/settings']) {
+      const cue = selectRouteGuidance(path).firstSessionCue;
+      expect(cue, `${path} first-session cue`).toBeTruthy();
+      expect(cue!.length, `${path} first-session cue length`).toBeLessThanOrEqual(150);
+      expect(cue, `${path} first-session cue action`).toMatch(/Start|Finish|Open|Check|Review|Pick|Scout|Filter|Use|Set/i);
+    }
+  });
+
+  it('builds deterministic story-so-far lines from safe season context', () => {
+    expect(buildStorySoFar({
+      phase: 'regular',
+      day: 92,
+      season: 2,
+      gamesPlayed: 82,
+      routeKey: 'dashboard',
+      seasonSnapshot: {
+        teamName: 'Tycoons',
+        standing: { wins: 42, losses: 40, division: 'East' },
+        daysUntilTradeDeadline: 10,
+        phaseLabel: 'Regular Season',
+        detailLabel: 'Deadline approaching',
+        seasonSummary: null,
+      },
+    })).toEqual([
+      'Tycoons are 42-40 in the East. This is the point where a .500-ish club chooses a lane before the market chooses for it.',
+      'The deadline is 10 days away. Check trade value and payroll before simming past the window.',
+    ]);
+
+    expect(buildStorySoFar({
+      phase: 'preseason',
+      day: 1,
+      season: 1,
+      gamesPlayed: 0,
+      routeKey: 'dashboard',
+      seasonSnapshot: null,
+    })[0]).toContain('Opening checkpoint');
   });
 
   it('creates deterministic story callbacks from phase and ticker context', () => {
diff --git a/apps/web/src/features/assistant/data/assistantGuidance.ts b/apps/web/src/features/assistant/data/assistantGuidance.ts
index 35a4531..a48dc77 100644
--- a/apps/web/src/features/assistant/data/assistantGuidance.ts
+++ b/apps/web/src/features/assistant/data/assistantGuidance.ts
@@ -49,17 +49,39 @@ export interface AssistantGuidance {
   whenToUse: string;
   decision: string;
   ratingsFocus: string;
+  firstSessionCue?: string;
   suggestedAction: AssistantAction;
   deeperStrategy: string;
   mobileTip: string;
 }
 
+export interface AssistantStandingSnapshot {
+  teamName?: string;
+  wins: number;
+  losses: number;
+  division?: string;
+}
+
+export interface AssistantSeasonSnapshot {
+  teamName?: string;
+  standing: AssistantStandingSnapshot | null;
+  daysUntilTradeDeadline: number | null;
+  phaseLabel: string | null;
+  detailLabel: string | null;
+  seasonSummary: {
+    record: string;
+    divisionFinish: string;
+    playoffStatus: string;
+  } | null;
+}
+
 export interface AssistantNextActionContext {
   routeKey: AssistantRouteKey;
   phase: string;
   day: number;
   season: number;
   mode: AssistantMode;
+  seasonSnapshot?: AssistantSeasonSnapshot | null;
 }
 
 export interface AssistantTickerItem {
@@ -84,6 +106,15 @@ export interface AssistantStoryContext {
   tickerFeed: readonly AssistantTickerItem[];
 }
 
+export interface AssistantStorySoFarContext {
+  phase: string;
+  day: number;
+  season: number;
+  gamesPlayed: number;
+  routeKey: AssistantRouteKey;
+  seasonSnapshot?: AssistantSeasonSnapshot | null;
+}
+
 function action(label: string, route: string, reason: string): AssistantAction {
   return { label, route, reason };
 }
@@ -96,6 +127,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it when starting a new club, continuing a long save, or branching a what-if timeline.',
     decision: 'Choose Quick Start if you want the front office fast; choose Full Day One if you want more context and role-play.',
     ratingsFocus: 'Team previews include player OVR so you can spot whether the club starts star-heavy, balanced, or rebuilding.',
+    firstSessionCue: 'Start with Quick Start, then let Mack point you from Dashboard to one decision page before you sim.',
     suggestedAction: action('Start or continue a save', '/', 'A live save unlocks the Assistant and route-aware guidance.'),
     deeperStrategy: 'For a first save, a balanced club is easier than a teardown. Hardcore players may prefer a weak roster with payroll room.',
     mobileTip: 'Save actions stack vertically on mobile; keep the Assistant collapsed until the first dashboard.',
@@ -107,6 +139,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use this flow once per new dynasty, or replay guidance from Settings if the opening choices blur together.',
     decision: 'Pick the style and early priorities that match the club you want to build.',
     ratingsFocus: 'Roster and staff grades summarize current ability; treat them as a first diagnosis, not a final plan.',
+    firstSessionCue: 'Finish Day One, then review the first Dashboard card before touching the sim controls.',
     suggestedAction: action('Finish Day One', '/onboarding', 'Completing onboarding hands you to the real dashboard with a prepared save.'),
     deeperStrategy: 'Your choices should create a mental model: win now, develop, spend carefully, or aggressively reshape the club.',
     mobileTip: 'Read one chapter at a time and use the primary CTA at the bottom of each panel.',
@@ -118,6 +151,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it before every sim chunk to decide whether the club is ready for more days to pass.',
     decision: 'Decide whether to sim, fix a roster issue, scout, check finances, review trades, or read the latest story.',
     ratingsFocus: 'Dashboard cards do not show every OVR, but roster health, farm, and trade intel all point you toward rating checks.',
+    firstSessionCue: 'Open one yellow or red Dashboard card, then visit the suggested route before simming a week.',
     suggestedAction: action('Review one red or yellow card', '/dashboard', 'Handle urgent cards before simming a week or month.'),
     deeperStrategy: 'A good rhythm is dashboard, one decision page, then sim. Avoid simming past deadlines without checking roster and budget.',
     mobileTip: 'Use the Assistant route link instead of hunting through More when a card points to a deeper page.',
@@ -129,6 +163,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it after injuries, trades, promotions, or any compliance alert.',
     decision: 'Choose who plays, who sits, who moves levels, and who leaves the roster.',
     ratingsFocus: 'OVR and grade show current talent; position, service time, options, stats, and role fit decide the actual move.',
+    firstSessionCue: 'Check compliance first, then open one player profile to see how OVR connects to role and risk.',
     suggestedAction: action('Check roster compliance', '/roster', 'A legal roster keeps simulation moving and prevents avoidable losses.'),
     deeperStrategy: 'Do not chase OVR blindly. A 61 OVR shortstop can be more useful than a 64 OVR bat without a defensive home.',
     mobileTip: 'Roster tables scroll horizontally; use Assistant explanations before making a dense mobile move.',
@@ -173,6 +208,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it before any meaningful player-specific decision.',
     decision: 'Decide whether to play, promote, trade, extend, bench, or build around the player.',
     ratingsFocus: 'Current OVR, grade bars, ceiling/floor, and tab-specific reports show talent, risk, and trajectory.',
+    firstSessionCue: 'Review the header OVR, then use Development or Scouting before making a player move.',
     suggestedAction: action('Check development and scouting tabs', '/players', 'Current OVR matters more when you understand where it is heading.'),
     deeperStrategy: 'Profile reading order: header OVR, role/position, recent stats, development trend, contract, then story/personality.',
     mobileTip: 'Use tabs as chapters; do not try to consume the full profile in one scroll.',
@@ -184,6 +220,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it before draft picks, signings, trades, and international spending.',
     decision: 'Decide who needs more looks and whose report you trust.',
     ratingsFocus: 'Scouted OVR, ceiling, floor, confidence, and scout conflicts tell you how much to believe the number.',
+    firstSessionCue: 'Scout one uncertain target instead of trying to solve the whole board at once.',
     suggestedAction: action('Scout one uncertain target', '/scouting', 'Better information prevents paying full price for guesswork.'),
     deeperStrategy: 'Low-confidence high-upside reports are portfolio bets; high-confidence average reports are depth bets.',
     mobileTip: 'Use the report panel for detail; tables are for narrowing the pool.',
@@ -206,6 +243,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it during offseason and pre-draft prep.',
     decision: 'Decide between current ability, ceiling, signability, need, and risk.',
     ratingsFocus: 'OVR is present value; ceiling is upside; confidence tells how much trust to place in the report.',
+    firstSessionCue: 'If the draft room is closed, treat this as planning: use Scouting now and come back in the offseason.',
     suggestedAction: action('Scout the top of your board', '/draft', 'Your best pick is usually the best blend of upside, confidence, and need.'),
     deeperStrategy: 'A contender can draft upside; a thin system may need safer players who reach useful OVR sooner.',
     mobileTip: 'Open details before picking; do not make draft decisions from one cramped row.',
@@ -217,6 +255,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it near the deadline, after injuries, during rebuilds, or when payroll needs a reset.',
     decision: 'Decide who is expendable and what return matches your competitive window.',
     ratingsFocus: 'OVR starts the value conversation; age, contract, control, role, scarcity, and GM personality finish it.',
+    firstSessionCue: 'If the market is closed, do not force it. Check Finance and roster needs so you are ready when trades reopen.',
     suggestedAction: action('Audit deadline value', '/trade', 'Know what you can buy or sell before the market closes.'),
     deeperStrategy: 'Never trade only from OVR. A cheaper 62 OVR player with control can be worth more than an expensive 68 rental.',
     mobileTip: 'Use smaller packages on mobile and inspect selected-player summaries carefully.',
@@ -294,6 +333,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it during offseason or when planning future payroll.',
     decision: 'Decide who is worth money, years, roster space, and opportunity cost.',
     ratingsFocus: 'OVR gives current talent; age, trend, role, demand, and contract length decide whether the deal ages well.',
+    firstSessionCue: 'If the market is closed, use Finance first. When offseason opens, filter by one roster need before offering.',
     suggestedAction: action('Filter by roster need', '/free-agency', 'The best signing solves a specific weakness.'),
     deeperStrategy: 'Hardcore rule: pay for prime years, avoid paying star money for decline years unless the title window is now.',
     mobileTip: 'Select one target to read the detail panel before offering.',
@@ -316,6 +356,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it before trades, free agency, extensions, and deadline buying.',
     decision: 'Decide whether the team can afford the next move now and later.',
     ratingsFocus: 'OVR is not enough; compare talent to salary, years, age, and roster window.',
+    firstSessionCue: 'Check future commitments before any trade, extension, or free-agent offer.',
     suggestedAction: action('Check future commitments', '/finance', 'A move that fits this year can still damage the next three seasons.'),
     deeperStrategy: 'Payroll flexibility is a strategic asset. Rebuilders should buy control; contenders can rent impact.',
     mobileTip: 'Focus on one budget section at a time; finance tables are dense.',
@@ -426,6 +467,7 @@ export const ASSISTANT_GUIDANCE: Record<AssistantRouteKey, AssistantGuidance> =
     whenToUse: 'Use it when the game feels too dense, too fast, too loud, or when you want help replayed.',
     decision: 'Decide how the interface should support your play style.',
     ratingsFocus: 'Ratings are not a Settings decision, but tutorial replay and density can make rating-heavy pages easier to read.',
+    firstSessionCue: 'Use Replay Tutorial or Assistant mode if the first route pass felt too dense.',
     suggestedAction: action('Review accessibility and tutorial controls', '/settings', 'A comfortable UI makes long saves easier to sustain.'),
     deeperStrategy: 'Hardcore players may prefer denser tables; newcomers should keep more breathing room until routes feel familiar.',
     mobileTip: 'Settings controls are mobile-safe; change one preference and test it before changing several.',
@@ -475,6 +517,18 @@ export function selectRouteGuidance(pathname: string): AssistantGuidance {
 }
 
 export function buildAssistantNextAction(context: AssistantNextActionContext): AssistantAction {
+  if (context.routeKey === 'draft' && context.phase !== 'offseason') {
+    return action('Scout before draft season', '/scouting', 'The draft room opens later; pro and amateur reports are the useful prep right now.');
+  }
+
+  if (context.routeKey === 'free-agency' && context.phase !== 'offseason') {
+    return action('Check payroll room', '/finance', 'Free agency opens in the offseason, but budget pressure is visible now.');
+  }
+
+  if (context.routeKey === 'trade' && context.phase !== 'regular') {
+    return action('Check payroll and roster needs', '/finance', 'The trade market is closed, so prepare the budget and need list first.');
+  }
+
   if (context.phase === 'offseason') {
     return action('Open offseason checklist', '/offseason', 'Offseason tasks are easiest when handled in sequence.');
   }
@@ -489,6 +543,15 @@ export function buildAssistantNextAction(context: AssistantNextActionContext): A
       : action('Review one trade target', '/trade', 'Start with one need instead of building a five-player package.');
   }
 
+  if (
+    context.phase === 'regular'
+    && context.seasonSnapshot?.daysUntilTradeDeadline != null
+    && context.seasonSnapshot.daysUntilTradeDeadline >= 0
+    && context.seasonSnapshot.daysUntilTradeDeadline <= 14
+  ) {
+    return action('Check trade and budget fit', '/trade', 'The deadline is close enough that roster value and payroll need a quick audit.');
+  }
+
   if (context.routeKey === 'dashboard' && context.phase === 'regular' && context.day <= 30) {
     return action('Scout early-season needs', '/scouting', 'Early reports give you time before the draft and deadline.');
   }
@@ -500,6 +563,55 @@ export function buildAssistantNextAction(context: AssistantNextActionContext): A
   return ASSISTANT_GUIDANCE[context.routeKey].suggestedAction;
 }
 
+function formatRecord(standing: AssistantStandingSnapshot): string {
+  return `${standing.wins}-${standing.losses}`;
+}
+
+function winningPercentage(standing: AssistantStandingSnapshot): number {
+  const total = standing.wins + standing.losses;
+  return total > 0 ? standing.wins / total : 0.5;
+}
+
+function teamLabel(snapshot: AssistantSeasonSnapshot | null | undefined, standing: AssistantStandingSnapshot | null): string {
+  return standing?.teamName ?? snapshot?.teamName ?? 'Your club';
+}
+
+export function buildStorySoFar(context: AssistantStorySoFarContext): string[] {
+  const snapshot = context.seasonSnapshot ?? null;
+  const standing = snapshot?.standing ?? null;
+  const lines: string[] = [];
+
+  if (context.phase === 'preseason' || context.gamesPlayed === 0) {
+    lines.push(`Opening checkpoint: Season ${context.season} is still clean. Learn the roster, pick one need, then sim in small chunks.`);
+  } else if (standing) {
+    const pct = winningPercentage(standing);
+    const club = teamLabel(snapshot, standing);
+    const division = standing.division ? ` in the ${standing.division}` : '';
+    if (pct >= 0.58) {
+      lines.push(`${club} are ${formatRecord(standing)}${division}. A winning record makes the next move about protecting the window without draining the farm.`);
+    } else if (pct >= 0.47) {
+      lines.push(`${club} are ${formatRecord(standing)}${division}. This is the point where a .500-ish club chooses a lane before the market chooses for it.`);
+    } else {
+      lines.push(`${club} are ${formatRecord(standing)}${division}. If the climb is getting steep, protect payroll and prospects before chasing short-term noise.`);
+    }
+  } else if (context.phase === 'offseason' && snapshot?.seasonSummary) {
+    lines.push(`Last season finished ${snapshot.seasonSummary.record}: ${snapshot.seasonSummary.divisionFinish}, ${snapshot.seasonSummary.playoffStatus}. Start with obligations, then fix the biggest roster hole.`);
+  } else {
+    lines.push(`Season ${context.season}, Day ${context.day}: use this stop to turn the latest signal into one roster, scouting, or finance decision.`);
+  }
+
+  if (
+    context.phase === 'regular'
+    && snapshot?.daysUntilTradeDeadline != null
+    && snapshot.daysUntilTradeDeadline >= 0
+    && snapshot.daysUntilTradeDeadline <= 14
+  ) {
+    lines.push(`The deadline is ${snapshot.daysUntilTradeDeadline} days away. Check trade value and payroll before simming past the window.`);
+  }
+
+  return lines.slice(0, 2);
+}
+
 export function buildStoryCallback(context: AssistantStoryContext): AssistantStoryCallback | null {
   const relevantTicker = context.tickerFeed.find((entry) => {
     if (context.seenStoryCallbacks[entry.id]) return false;
diff --git a/apps/web/src/features/assistant/lib/assistantFeedback.test.ts b/apps/web/src/features/assistant/lib/assistantFeedback.test.ts
new file mode 100644
index 0000000..8f40590
--- /dev/null
+++ b/apps/web/src/features/assistant/lib/assistantFeedback.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from 'vitest';
+import { buildAssistantFeedbackReport, resolveViewportCategory } from './assistantFeedback';
+
+describe('assistantFeedback', () => {
+  it('classifies the viewport for copyable playtest diagnostics', () => {
+    expect(resolveViewportCategory(390)).toBe('phone');
+    expect(resolveViewportCategory(768)).toBe('tablet');
+    expect(resolveViewportCategory(1280)).toBe('desktop');
+  });
+
+  it('builds a copyable report with route, mode, tutorial state, and comments', () => {
+    expect(buildAssistantFeedbackReport({
+      appVersion: '1.0.0',
+      route: '/trade',
+      routeKey: 'trade',
+      phase: 'regular',
+      day: 92,
+      season: 2,
+      assistantMode: 'hardcore',
+      completedRoutes: ['dashboard', 'roster'],
+      viewportCategory: 'phone',
+      helpfulScore: 4,
+      clarityScore: 3,
+      confusion: 'The trade offer numbers need more context.',
+    })).toContain([
+      'MBD Assistant Feedback',
+      'App version: 1.0.0',
+      'Route: /trade (trade)',
+      'Game phase: regular, Season 2, Day 92',
+      'Assistant mode: hardcore',
+      'Tutorial completed routes: dashboard, roster',
+      'Viewport: phone',
+      'Mack helpful: 4/5',
+      'Knew next move: 3/5',
+      'Confusion: The trade offer numbers need more context.',
+    ].join('\n'));
+  });
+});
diff --git a/apps/web/src/features/assistant/lib/assistantFeedback.ts b/apps/web/src/features/assistant/lib/assistantFeedback.ts
new file mode 100644
index 0000000..7121d89
--- /dev/null
+++ b/apps/web/src/features/assistant/lib/assistantFeedback.ts
@@ -0,0 +1,43 @@
+import type { AssistantMode } from './assistantState';
+
+export type ViewportCategory = 'phone' | 'tablet' | 'desktop';
+
+export interface AssistantFeedbackReportInput {
+  appVersion: string;
+  route: string;
+  routeKey: string;
+  phase: string;
+  day: number;
+  season: number;
+  assistantMode: AssistantMode;
+  completedRoutes: readonly string[];
+  viewportCategory: ViewportCategory;
+  helpfulScore: number;
+  clarityScore: number;
+  confusion: string;
+}
+
+export function resolveViewportCategory(width: number): ViewportCategory {
+  if (width < 640) return 'phone';
+  if (width < 1024) return 'tablet';
+  return 'desktop';
+}
+
+function completedRouteSummary(routes: readonly string[]): string {
+  return routes.length > 0 ? routes.join(', ') : 'none yet';
+}
+
+export function buildAssistantFeedbackReport(input: AssistantFeedbackReportInput): string {
+  return [
+    'MBD Assistant Feedback',
+    `App version: ${input.appVersion}`,
+    `Route: ${input.route} (${input.routeKey})`,
+    `Game phase: ${input.phase}, Season ${input.season}, Day ${input.day}`,
+    `Assistant mode: ${input.assistantMode}`,
+    `Tutorial completed routes: ${completedRouteSummary(input.completedRoutes)}`,
+    `Viewport: ${input.viewportCategory}`,
+    `Mack helpful: ${input.helpfulScore}/5`,
+    `Knew next move: ${input.clarityScore}/5`,
+    `Confusion: ${input.confusion.trim() || 'None provided.'}`,
+  ].join('\n');
+}
diff --git a/apps/web/src/features/finance/routes/FinancePage.tsx b/apps/web/src/features/finance/routes/FinancePage.tsx
index 2603d14..d65f16d 100644
--- a/apps/web/src/features/finance/routes/FinancePage.tsx
+++ b/apps/web/src/features/finance/routes/FinancePage.tsx
@@ -3,12 +3,15 @@ import { Badge, Card, CardContent, CardHeader, CardTitle, StatLine } from '@mbd/
 import { DollarSign, TrendingDown, TrendingUp, Users, Briefcase } from 'lucide-react';
 import { useWorker } from '@/shared/hooks/useWorker';
 import { useGameStore } from '@/shared/hooks/useGameStore';
+import { RatingBadge } from '@/shared/components/RatingBadge';
 
 interface ContractEntry {
   playerId: string;
   name: string;
   position: string;
   rosterStatus: string;
+  displayRating: number;
+  letterGrade: string;
   annualSalary: number;
   yearsRemaining: number;
   noTradeClause: boolean;
@@ -28,7 +31,7 @@ interface FinanceData {
   contracts: ContractEntry[];
 }
 
-type SortKey = 'name' | 'position' | 'annualSalary' | 'yearsRemaining';
+type SortKey = 'name' | 'position' | 'displayRating' | 'annualSalary' | 'yearsRemaining';
 type SortDir = 'asc' | 'desc';
 
 function formatDollars(millions: number): string {
@@ -99,6 +102,9 @@ export default function FinancePage() {
         case 'annualSalary':
           cmp = a.annualSalary - b.annualSalary;
           break;
+        case 'displayRating':
+          cmp = a.displayRating - b.displayRating;
+          break;
         case 'yearsRemaining':
           cmp = a.yearsRemaining - b.yearsRemaining;
           break;
@@ -274,6 +280,12 @@ export default function FinancePage() {
                   >
                     Pos{sortIndicator('position')}
                   </th>
+                  <th
+                    className="cursor-pointer px-3 py-2 text-center font-heading text-xs uppercase tracking-wider text-dynasty-muted hover:text-dynasty-text"
+                    onClick={() => handleSort('displayRating')}
+                  >
+                    OVR{sortIndicator('displayRating')}
+                  </th>
                   <th
                     className="cursor-pointer px-3 py-2 text-right font-heading text-xs uppercase tracking-wider text-dynasty-muted hover:text-dynasty-text"
                     onClick={() => handleSort('annualSalary')}
@@ -299,6 +311,9 @@ export default function FinancePage() {
                   <tr key={c.playerId} className="border-b border-dynasty-border/50 hover:bg-dynasty-elevated/30">
                     <td className="px-3 py-2 font-heading text-sm text-dynasty-text">{c.name}</td>
                     <td className="px-3 py-2 text-center font-data text-xs uppercase text-dynasty-muted">{c.position}</td>
+                    <td className="px-3 py-2 text-center">
+                      <RatingBadge value={c.displayRating} grade={c.letterGrade} size="sm" />
+                    </td>
                     <td className="px-3 py-2 text-right font-data text-sm text-dynasty-text">{formatDollars(c.annualSalary)}</td>
                     <td className="px-3 py-2 text-center font-data text-sm text-dynasty-text">{c.yearsRemaining}</td>
                     <td className="px-3 py-2 text-center">
diff --git a/apps/web/src/features/minors/components/PipelineView.tsx b/apps/web/src/features/minors/components/PipelineView.tsx
index 50ca1cd..ba1094f 100644
--- a/apps/web/src/features/minors/components/PipelineView.tsx
+++ b/apps/web/src/features/minors/components/PipelineView.tsx
@@ -1,4 +1,5 @@
 import type { ProspectPipelineView } from '@/workers/sim.worker.pipeline';
+import { RatingBadge } from '@/shared/components/RatingBadge';
 
 export type { ProspectPipelineView } from '@/workers/sim.worker.pipeline';
 
@@ -45,7 +46,7 @@ export default function PipelineView({
                     {prospect.position} | {prospect.levelLabel} | Age {prospect.age}
                   </div>
                 </div>
-                <span className="font-data text-sm text-dynasty-text">{prospect.overallRating}</span>
+                <RatingBadge value={prospect.overallRating} size="sm" />
               </div>
               <div className="mt-3 flex flex-wrap gap-2">
                 <span className="rounded-full border border-accent-info/40 bg-accent-info/10 px-2 py-1 font-data text-[10px] uppercase tracking-[0.16em] text-accent-info">
diff --git a/apps/web/src/features/minors/routes/MinorsPage.tsx b/apps/web/src/features/minors/routes/MinorsPage.tsx
index 6acf08c..c9dfd98 100644
--- a/apps/web/src/features/minors/routes/MinorsPage.tsx
+++ b/apps/web/src/features/minors/routes/MinorsPage.tsx
@@ -1,6 +1,7 @@
 import { Suspense, lazy, useCallback, useEffect, useState } from 'react';
 import { useWorker } from '@/shared/hooks/useWorker';
 import { useGameStore } from '@/shared/hooks/useGameStore';
+import { RatingBadge } from '@/shared/components/RatingBadge';
 import PipelineView, { type ProspectPipelineView } from '../components/PipelineView';
 
 const ProspectBreakoutTracker = lazy(() => import('../components/ProspectBreakoutTracker'));
@@ -52,6 +53,7 @@ interface AffiliateOverviewView {
       level: string;
       levelLabel: string;
       overallRating: number;
+      letterGrade: string;
       ceiling: number;
       bondStrength: number;
       loyaltyModifier: number;
@@ -241,7 +243,7 @@ export default function MinorsPage() {
                   </div>
                 </div>
                 <div className="text-right">
-                  <div className="font-data text-lg text-dynasty-text">{prospect.overallRating}</div>
+                  <RatingBadge value={prospect.overallRating} grade={prospect.letterGrade} size="sm" />
                   <div className="font-data text-[11px] text-dynasty-muted">Bond {prospect.bondStrength}</div>
                 </div>
               </div>
diff --git a/apps/web/src/features/players/components/ProfileHeader.tsx b/apps/web/src/features/players/components/ProfileHeader.tsx
index 2e2519e..36355ae 100644
--- a/apps/web/src/features/players/components/ProfileHeader.tsx
+++ b/apps/web/src/features/players/components/ProfileHeader.tsx
@@ -2,9 +2,9 @@ import { useEffect, useRef } from 'react';
 import { estimateProjectedWarRange, type MilestoneAlert } from '@mbd/sim-core';
 import { Badge, Card, CardContent, GradeBar, StatLine } from '@mbd/ui';
 import { Award, Quote } from 'lucide-react';
+import { RatingBadge } from '@/shared/components/RatingBadge';
 import { TeamLogo } from '@/shared/components/TeamLogo';
 import { getAudioEngine } from '@/shared/lib/audio';
-import { gradeBadgeColor } from '@/shared/lib/grade';
 import {
   badgeVariantForStoryPhase,
   badgeVariantForTrajectory,
@@ -102,16 +102,8 @@ export default function ProfileHeader({
             ) : null}
           </div>
 
-          <div className="rounded-2xl border border-dynasty-border bg-dynasty-elevated px-6 py-5 text-right">
-            <div className="font-data text-[11px] uppercase tracking-[0.18em] text-dynasty-muted">
-              Display Grade
-            </div>
-            <div className="mt-2 font-data text-5xl font-bold text-dynasty-textBright">
-              {player.displayRating}
-            </div>
-            <div className={`mt-2 inline-flex rounded px-3 py-1 font-data text-xl font-bold ${gradeBadgeColor(player.letterGrade)}`}>
-              {player.letterGrade}
-            </div>
+          <div className="rounded-lg border border-dynasty-border bg-dynasty-elevated px-5 py-4 text-right">
+            <RatingBadge value={player.displayRating} grade={player.letterGrade} size="lg" />
           </div>
         </div>
 
diff --git a/apps/web/src/features/roster/routes/RosterPage.tsx b/apps/web/src/features/roster/routes/RosterPage.tsx
index eed352d..05f8c3c 100644
--- a/apps/web/src/features/roster/routes/RosterPage.tsx
+++ b/apps/web/src/features/roster/routes/RosterPage.tsx
@@ -5,6 +5,7 @@ import { Clock3, DollarSign, FileSignature, GripVertical, ShieldCheck } from 'lu
 import { PITCHER_POSITIONS } from '@mbd/sim-core';
 import { useWorker } from '@/shared/hooks/useWorker';
 import { PageHelp } from '@/shared/components/PageHelp';
+import { RatingBadge } from '@/shared/components/RatingBadge';
 import { useGameStore } from '@/shared/hooks/useGameStore';
 import { gradeBadgeColor } from '@/shared/lib/grade';
 import type { PlayerDTO } from '@/workers/sim.worker.helpers';
@@ -17,6 +18,8 @@ interface PromotionCandidateView {
   playerId: string;
   playerName: string;
   position: string;
+  displayRating: number;
+  letterGrade: string;
   currentLevel: string;
   targetLevel: string;
   score: number;
@@ -34,6 +37,8 @@ interface DFACandidateView {
   playerName: string;
   position: string;
   age: number;
+  displayRating: number;
+  letterGrade: string;
   salary: number;
   score: number;
   reason: string;
@@ -76,6 +81,8 @@ interface AffiliateOverviewView {
     fromTeamName: string;
     toTeamName: string | null;
     status: string;
+    displayRating: number | null;
+    letterGrade: string | null;
     salary: number;
     priorityIndex: number | null;
   }>;
@@ -85,6 +92,8 @@ interface ExtensionCandidateView {
   playerId: string;
   playerName: string;
   position: string;
+  displayRating: number;
+  letterGrade: string;
   yearsRemaining: number;
   currentSalary: number;
   willingness: number;
@@ -421,7 +430,10 @@ export default function RosterPage() {
                               {candidate.position} | Age {candidate.age} | ${candidate.salary.toFixed(1)}M
                             </div>
                           </div>
-                          <div className="font-data text-sm text-accent-warning">Score {candidate.score}</div>
+                          <div className="flex flex-col items-end gap-2">
+                            <RatingBadge value={candidate.displayRating} grade={candidate.letterGrade} size="sm" />
+                            <div className="font-data text-sm text-accent-warning">Score {candidate.score}</div>
+                          </div>
                         </div>
                         <div className="mt-2 text-sm text-dynasty-muted">{candidate.reason}</div>
                         <button
@@ -608,7 +620,10 @@ export default function RosterPage() {
                         {candidate.position} | {minorLevelLabel(candidate.currentLevel)} to {minorLevelLabel(candidate.targetLevel)}
                       </div>
                     </div>
-                    <div className="font-data text-sm text-accent-success">Score {candidate.score}</div>
+                    <div className="flex flex-col items-end gap-2">
+                      <RatingBadge value={candidate.displayRating} grade={candidate.letterGrade} size="sm" />
+                      <div className="font-data text-sm text-accent-success">Score {candidate.score}</div>
+                    </div>
                   </div>
                   <div className="mt-2 text-sm text-dynasty-muted">{candidate.reason}</div>
                   <button
@@ -667,8 +682,11 @@ export default function RosterPage() {
                         <div className="mt-1 text-xs text-dynasty-muted">
                           {claim.status === 'pending' ? 'Pending claim' : claim.status.toUpperCase()} | {claim.fromTeamName}
                         </div>
-                        <div className="mt-2 text-xs text-dynasty-muted">
-                          ${claim.salary.toFixed(1)}M
+                        <div className="mt-2 flex flex-wrap items-center gap-2 text-xs text-dynasty-muted">
+                          {claim.displayRating != null ? (
+                            <RatingBadge value={claim.displayRating} grade={claim.letterGrade} size="sm" />
+                          ) : null}
+                          <span>${claim.salary.toFixed(1)}M</span>
                           {claim.priorityIndex ? ` | Priority ${claim.priorityIndex}` : ''}
                         </div>
                         {claim.status === 'pending' && (
@@ -811,8 +829,9 @@ export default function RosterPage() {
                     <div className="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
                       <div>
                         <div className="font-heading text-sm text-dynasty-text">{candidate.playerName}</div>
-                        <div className="mt-1 font-data text-[11px] uppercase tracking-[0.18em] text-dynasty-muted">
-                          {candidate.position} | {candidate.yearsRemaining} year control left
+                        <div className="mt-1 flex flex-wrap items-center gap-2 font-data text-[11px] uppercase tracking-[0.18em] text-dynasty-muted">
+                          <span>{candidate.position} | {candidate.yearsRemaining} year control left</span>
+                          <RatingBadge value={candidate.displayRating} grade={candidate.letterGrade} size="sm" />
                         </div>
                         <StatLine
                           className="mt-3"
diff --git a/apps/web/src/features/scouting/routes/ScoutingPage.tsx b/apps/web/src/features/scouting/routes/ScoutingPage.tsx
index bdf5a25..4935572 100644
--- a/apps/web/src/features/scouting/routes/ScoutingPage.tsx
+++ b/apps/web/src/features/scouting/routes/ScoutingPage.tsx
@@ -15,6 +15,7 @@ import {
 } from 'lucide-react';
 import { TEAMS, estimateProjectedWarRange, getTeamById } from '@mbd/sim-core';
 import { PageShell } from '@/shared/components/PageShell';
+import { RatingBadge } from '@/shared/components/RatingBadge';
 import { useWorker } from '@/shared/hooks/useWorker';
 import { useGameStore } from '@/shared/hooks/useGameStore';
 import { logger } from '@/shared/lib/logger';
@@ -194,7 +195,7 @@ export default function ScoutingPage() {
   const workerReady = worker.isReady;
   const { userTeamId, isInitialized } = useGameStore();
 
-  const [activeView, setActiveView] = useState<'pro' | 'international' | 'conflicts'>('international');
+  const [activeView, setActiveView] = useState<'pro' | 'international' | 'conflicts'>('pro');
   const [scouts, setScouts] = useState<Scout[]>([]);
   const [searchQuery, setSearchQuery] = useState('');
   const [searchResults, setSearchResults] = useState<PlayerDTO[]>([]);
@@ -483,12 +484,15 @@ export default function ScoutingPage() {
                     key={player.id}
                     type="button"
                     onClick={() => { void handleScout(player); setSearchResults([]); }}
-                    className="flex w-full items-center justify-between px-3 py-2 text-left hover:bg-dynasty-surface"
+                    className="flex min-h-11 w-full items-center justify-between gap-3 px-3 py-2 text-left hover:bg-dynasty-surface"
                   >
                     <span className="font-heading text-sm text-dynasty-text">
                       {player.firstName} {player.lastName}
                     </span>
-                    <span className="font-data text-xs text-dynasty-muted">{player.position} / Age {player.age}</span>
+                    <span className="flex items-center gap-2 font-data text-xs text-dynasty-muted">
+                      <RatingBadge value={player.displayRating} grade={player.letterGrade} size="sm" />
+                      <span>{player.position} / Age {player.age}</span>
+                    </span>
                   </button>
                 ))}
               </div>
diff --git a/apps/web/src/features/setup/routes/SetupPage.tsx b/apps/web/src/features/setup/routes/SetupPage.tsx
index ff2dcb1..8c23302 100644
--- a/apps/web/src/features/setup/routes/SetupPage.tsx
+++ b/apps/web/src/features/setup/routes/SetupPage.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { Play, PlusCircle, Shield, Trash2, Trophy } from 'lucide-react';
 import { PageShell } from '@/shared/components/PageShell';
@@ -131,6 +131,7 @@ export default function SetupPage() {
   const [status, setStatus] = useState('');
   const [busySlot, setBusySlot] = useState<number | null>(null);
   const [wizardOpen, setWizardOpen] = useState(false);
+  const wizardRef = useRef<HTMLElement | null>(null);
   const [selectedSlot, setSelectedSlot] = useState<number>(2);
   const [seed, setSeed] = useState<number>(() => Date.now());
   const [teamId, setTeamId] = useState<string>('nym');
@@ -318,6 +319,14 @@ export default function SetupPage() {
     setStatus('');
   }
 
+  useEffect(() => {
+    if (!wizardOpen) return;
+    window.requestAnimationFrame(() => {
+      wizardRef.current?.scrollIntoView({ block: 'start', behavior: 'smooth' });
+      wizardRef.current?.focus();
+    });
+  }, [wizardOpen]);
+
   async function handleBeginDynasty() {
     if (!worker.isReady) {
       return;
@@ -418,7 +427,7 @@ export default function SetupPage() {
               <button
                 type="button"
                 onClick={openWizard}
-                className="inline-flex items-center gap-2 rounded-md bg-accent-primary px-4 py-2 font-heading text-sm font-semibold text-white hover:bg-accent-primaryHover"
+                className="inline-flex items-center gap-2 rounded-md bg-accent-primary px-4 py-2 font-heading text-sm font-semibold text-dynasty-base hover:bg-accent-primaryHover"
               >
                 <PlusCircle className="h-4 w-4" />
                 New Dynasty
@@ -574,7 +583,7 @@ export default function SetupPage() {
         </section>
 
         {wizardOpen ? (
-          <section className="grid gap-6 xl:grid-cols-[0.95fr_1.05fr]">
+          <section ref={wizardRef} tabIndex={-1} className="grid gap-6 outline-none xl:grid-cols-[0.95fr_1.05fr]" aria-label="New Dynasty setup">
             <div className="rounded-2xl border border-dynasty-border bg-dynasty-surface p-6">
               <div className="font-data text-[11px] uppercase tracking-[0.22em] text-accent-success">New Dynasty</div>
               <h2 className="mt-3 font-brand text-3xl text-dynasty-textBright">Start in Slot {selectedSlot}</h2>
@@ -832,7 +841,7 @@ export default function SetupPage() {
                     type="button"
                     disabled={busySlot != null || !worker.isReady}
                     onClick={() => void handleBeginDynasty()}
-                    className="rounded bg-accent-primary px-4 py-2 font-heading text-sm font-semibold text-white hover:bg-accent-primaryHover disabled:cursor-not-allowed disabled:bg-dynasty-muted disabled:text-dynasty-border"
+                    className="rounded bg-accent-primary px-4 py-2 font-heading text-sm font-semibold text-dynasty-base hover:bg-accent-primaryHover disabled:cursor-not-allowed disabled:bg-dynasty-muted disabled:text-dynasty-border"
                   >
                     {busySlot != null
                       ? 'Creating...'
diff --git a/apps/web/src/features/trade/routes/TradePage.tsx b/apps/web/src/features/trade/routes/TradePage.tsx
index 8b5e7a7..8ad57a1 100644
--- a/apps/web/src/features/trade/routes/TradePage.tsx
+++ b/apps/web/src/features/trade/routes/TradePage.tsx
@@ -16,6 +16,7 @@ import { useSearchParams } from 'react-router-dom';
 import { EmptyStatePanel } from '@/shared/components/EmptyStatePanel';
 import { PageShell } from '@/shared/components/PageShell';
 import { ProgressFill } from '@/shared/components/ProgressFill';
+import { RatingBadge } from '@/shared/components/RatingBadge';
 import { useWorker } from '@/shared/hooks/useWorker';
 import { PageHelp } from '@/shared/components/PageHelp';
 import DeadlineDramaPanel from '../components/DeadlineDramaPanel';
@@ -363,7 +364,7 @@ function buildTradeAssetLabel(
       if (!player) {
         return asset.playerId;
       }
-      return `${player.firstName[0]}. ${player.lastName} · ${player.position}`;
+      return `${player.firstName[0]}. ${player.lastName} · ${player.position} · ${player.displayRating} OVR · ${player.letterGrade}`;
     }
     case 'draft_pick':
       return `R${asset.round} ${asset.season} · ${asset.originalTeamId.toUpperCase()} original`;
@@ -449,9 +450,11 @@ function PlayerRow({
         {player.firstName} {player.lastName}
       </td>
       <td className="px-2 py-1.5 font-data text-dynasty-muted">{player.position}</td>
-      <td className="px-2 py-1.5 text-right font-data text-dynasty-text">{player.displayRating}</td>
+      <td className="px-2 py-1.5 text-right">
+        <RatingBadge value={player.displayRating} grade={player.letterGrade} size="sm" />
+      </td>
       <td className="px-2 py-1.5 text-center">
-        <span className={`inline-block w-6 rounded text-center font-data text-xs font-bold ${gradeBadgeColor(player.letterGrade)}`}>
+        <span className={`inline-block w-6 rounded text-center font-data text-xs font-bold ${gradeBadgeColor(player.letterGrade)}`} aria-hidden="true">
           {player.letterGrade}
         </span>
       </td>
diff --git a/apps/web/src/shared/components/RatingBadge.test.tsx b/apps/web/src/shared/components/RatingBadge.test.tsx
new file mode 100644
index 0000000..dc53760
--- /dev/null
+++ b/apps/web/src/shared/components/RatingBadge.test.tsx
@@ -0,0 +1,45 @@
+import { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { RatingBadge } from './RatingBadge';
+
+(globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
+
+describe('RatingBadge', () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(async () => {
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+  });
+
+  it('renders OVR with grade in a compact, screen-reader labelled badge', async () => {
+    await act(async () => {
+      root.render(<RatingBadge value={72} grade="A" />);
+    });
+
+    expect(container.textContent).toContain('OVR');
+    expect(container.textContent).toContain('72');
+    expect(container.textContent).toContain('A');
+    expect(container.querySelector('[aria-label="OVR 72, grade A"]')).toBeTruthy();
+  });
+
+  it('can label non-OVR decision grades without changing the visual grammar', async () => {
+    await act(async () => {
+      root.render(<RatingBadge label="Grade" value={61} />);
+    });
+
+    expect(container.textContent).toContain('Grade');
+    expect(container.textContent).toContain('61');
+    expect(container.querySelector('[aria-label="Grade 61"]')).toBeTruthy();
+  });
+});
diff --git a/apps/web/src/shared/components/RatingBadge.tsx b/apps/web/src/shared/components/RatingBadge.tsx
new file mode 100644
index 0000000..6323a1f
--- /dev/null
+++ b/apps/web/src/shared/components/RatingBadge.tsx
@@ -0,0 +1,62 @@
+import { gradeBadgeColor } from '@/shared/lib/grade';
+
+export interface RatingBadgeProps {
+  label?: string;
+  value: number | string;
+  grade?: string | null;
+  size?: 'sm' | 'md' | 'lg';
+  className?: string;
+}
+
+function toneClass(value: number | string): string {
+  const numericValue = typeof value === 'number' ? value : Number(value);
+  if (!Number.isFinite(numericValue)) {
+    return 'border-dynasty-border bg-dynasty-elevated text-dynasty-text';
+  }
+  if (numericValue >= 70) {
+    return 'border-accent-success/40 bg-accent-success/10 text-accent-success';
+  }
+  if (numericValue >= 60) {
+    return 'border-accent-info/40 bg-accent-info/10 text-accent-info';
+  }
+  if (numericValue >= 50) {
+    return 'border-accent-warning/40 bg-accent-warning/10 text-accent-warning';
+  }
+  return 'border-dynasty-border bg-dynasty-elevated text-dynasty-text';
+}
+
+function sizeClass(size: RatingBadgeProps['size']): string {
+  if (size === 'lg') return 'px-4 py-3';
+  if (size === 'sm') return 'px-2 py-1';
+  return 'px-3 py-2';
+}
+
+function valueClass(size: RatingBadgeProps['size']): string {
+  if (size === 'lg') return 'text-3xl';
+  if (size === 'sm') return 'text-sm';
+  return 'text-xl';
+}
+
+export function RatingBadge({
+  label = 'OVR',
+  value,
+  grade = null,
+  size = 'md',
+  className = '',
+}: RatingBadgeProps) {
+  const ariaLabel = grade ? `${label} ${value}, grade ${grade}` : `${label} ${value}`;
+
+  return (
+    <span
+      className={`inline-flex shrink-0 items-center gap-2 rounded-md border font-data font-bold ${toneClass(value)} ${sizeClass(size)} ${className}`}
+      aria-label={ariaLabel}
+      title={ariaLabel}
+    >
+      <span className="text-[10px] uppercase tracking-[0.16em] opacity-75">{label}</span>
+      <span className={valueClass(size)}>{value}</span>
+      {grade ? (
+        <span className={`rounded px-1.5 py-0.5 text-xs ${gradeBadgeColor(grade)}`}>{grade}</span>
+      ) : null}
+    </span>
+  );
+}
diff --git a/apps/web/src/workers/sim.worker.helpers.ts b/apps/web/src/workers/sim.worker.helpers.ts
index 450df5a..c3c4e28 100644
--- a/apps/web/src/workers/sim.worker.helpers.ts
+++ b/apps/web/src/workers/sim.worker.helpers.ts
@@ -1002,6 +1002,8 @@ export function getExtensionCandidatesForTeam(
         playerName: `${player.firstName} ${player.lastName}`,
         position: player.position,
         teamId,
+        displayRating: toDisplayRating(player.overallRating),
+        letterGrade: toLetterGrade(player.overallRating),
         yearsRemaining: player.contract.years,
         currentSalary: player.contract.annualSalary,
         willingness: willingness.willingness,
diff --git a/apps/web/src/workers/sim.worker.pipeline.ts b/apps/web/src/workers/sim.worker.pipeline.ts
index 7983441..2ba8892 100644
--- a/apps/web/src/workers/sim.worker.pipeline.ts
+++ b/apps/web/src/workers/sim.worker.pipeline.ts
@@ -1,4 +1,4 @@
-import { AFFILIATE_LEVELS } from '@mbd/sim-core';
+import { AFFILIATE_LEVELS, toDisplayRating } from '@mbd/sim-core';
 import type { DevelopmentSetback, MinorLeagueSeasonLine, ProspectBond } from '@mbd/contracts';
 import type { FullGameState } from './sim.worker.helpers';
 import {
@@ -124,6 +124,10 @@ const ETA_ORDER = new Map([
   ['3+ seasons', 5],
 ]);
 
+function displayRatingFromOverall(value: number): number {
+  return value > 100 ? toDisplayRating(value) : value;
+}
+
 export function buildProspectPipelineView(
   state: FullGameState,
   teamId: string = state.userTeamId,
@@ -139,6 +143,8 @@ export function buildProspectPipelineView(
       const progression = getMinorLeagueProgressionView(state, player.id);
       const latestLine = progression.at(-1) ?? null;
       const ceiling = player.ceiling ?? player.overallRating;
+      const displayRating = displayRatingFromOverall(player.overallRating);
+      const displayCeiling = displayRatingFromOverall(ceiling);
 
       return {
         playerId: player.id,
@@ -147,14 +153,14 @@ export function buildProspectPipelineView(
         level: player.rosterStatus,
         levelLabel: formatMinorLevel(player.rosterStatus),
         age: player.age,
-        overallRating: player.overallRating,
-        ceiling,
+        overallRating: displayRating,
+        ceiling: displayCeiling,
         bondStrength: bond?.bondStrength ?? 0,
         eta: etaForProspect(
           player.rosterStatus,
           player.age,
-          player.overallRating,
-          ceiling,
+          displayRating,
+          displayCeiling,
           setback,
         ),
         trend: trendForSetback(setback),
diff --git a/apps/web/src/workers/sim.worker.queries.ts b/apps/web/src/workers/sim.worker.queries.ts
index 661ff96..3018102 100644
--- a/apps/web/src/workers/sim.worker.queries.ts
+++ b/apps/web/src/workers/sim.worker.queries.ts
@@ -26,6 +26,7 @@ import {
   generateInteractivePressConference,
   SCENARIO_LIBRARY,
   scoutPlayer,
+  toDisplayRating,
   toInternalRating,
   toLetterGrade,
   // Round 1 APIs
@@ -1456,6 +1457,14 @@ function formatMinorLevel(level: string): string {
   }
 }
 
+function displayRatingFromOverall(value: number): number {
+  return value > 100 ? toDisplayRating(value) : value;
+}
+
+function letterGradeFromOverall(value: number): ReturnType<typeof toLetterGrade> {
+  return toLetterGrade(value > 100 ? value : toInternalRating(value));
+}
+
 function buildDFARecommendations(teamId: string) {
   const s = requireState();
   const rosterState = s.rosterStates.get(teamId);
@@ -1468,6 +1477,7 @@ function buildDFARecommendations(teamId: string) {
     .filter((player) => player.teamId === teamId && fortyManSet.has(player.id))
     .map((player) => {
       const tradeValue = evaluatePlayerTradeValue(player);
+      const displayRating = displayRatingFromOverall(player.overallRating);
       const score = Math.round(
         Math.max(0, 82 - player.overallRating)
         + Math.max(0, player.age - 26) * 4
@@ -1481,6 +1491,8 @@ function buildDFARecommendations(teamId: string) {
         playerName: `${player.firstName} ${player.lastName}`,
         position: player.position,
         age: player.age,
+        displayRating,
+        letterGrade: letterGradeFromOverall(player.overallRating),
         salary: Number(player.contract.annualSalary.toFixed(1)),
         score,
         reason: `${levelLabel} with age ${player.age} and $${player.contract.annualSalary.toFixed(1)}M salary pressure.`,
@@ -1549,8 +1561,9 @@ function buildFarmReport(teamId: string) {
         position: player.position,
         level: player.rosterStatus,
         levelLabel: formatMinorLevel(player.rosterStatus),
-        overallRating: player.overallRating,
-        ceiling: player.ceiling ?? player.overallRating,
+        overallRating: displayRatingFromOverall(player.overallRating),
+        letterGrade: letterGradeFromOverall(player.overallRating),
+        ceiling: displayRatingFromOverall(player.ceiling ?? player.overallRating),
         bondStrength: prospectBond?.bondStrength ?? 0,
         loyaltyModifier: prospectBond?.loyaltyModifier ?? 0,
         milestones: prospectBond?.milestones.slice(-2) ?? [],
@@ -1651,6 +1664,8 @@ function buildAffiliateOverview(teamId: string) {
         fromTeamName: teamNameFromId(claim.fromTeamId),
         toTeamName: claim.toTeamId ? teamNameFromId(claim.toTeamId) : null,
         status: claim.status,
+        displayRating: player ? displayRatingFromOverall(player.overallRating) : null,
+        letterGrade: player ? letterGradeFromOverall(player.overallRating) : null,
         salary: Number(claim.salary.toFixed(1)),
         priorityIndex: priorityIndex >= 0 ? priorityIndex + 1 : null,
       };
@@ -2227,6 +2242,8 @@ export const queryApi = {
         playerName: player ? `${player.firstName} ${player.lastName}` : candidate.playerId,
         position: player?.position ?? 'UTIL',
         age: player?.age ?? 0,
+        displayRating: player ? displayRatingFromOverall(player.overallRating) : 0,
+        letterGrade: player ? letterGradeFromOverall(player.overallRating) : 'F',
       };
     });
   },
@@ -2640,7 +2657,8 @@ export const queryApi = {
           playerId: candidate.playerId,
           playerName: player ? `${player.firstName} ${player.lastName}` : candidate.playerId,
           position: player?.position ?? 'UTIL',
-          overallRating: player?.overallRating ?? 0,
+          overallRating: player ? displayRatingFromOverall(player.overallRating) : 0,
+          letterGrade: player ? letterGradeFromOverall(player.overallRating) : 'F',
           currentLevel: candidate.currentLevel,
           score: candidate.score,
           reason: candidate.reason,
@@ -3069,6 +3087,8 @@ export const queryApi = {
         name: `${p.firstName} ${p.lastName}`,
         position: p.position,
         rosterStatus: p.rosterStatus,
+        displayRating: displayRatingFromOverall(p.overallRating),
+        letterGrade: letterGradeFromOverall(p.overallRating),
         annualSalary: p.contract.annualSalary,
         yearsRemaining: p.contract.years,
         noTradeClause: p.contract.noTradeClause,
diff --git a/docs/goals/MBD_ASSISTANT_POLISH_RELEASE_V2_PROGRESS.md b/docs/goals/MBD_ASSISTANT_POLISH_RELEASE_V2_PROGRESS.md
new file mode 100644
index 0000000..0af3cfc
--- /dev/null
+++ b/docs/goals/MBD_ASSISTANT_POLISH_RELEASE_V2_PROGRESS.md
@@ -0,0 +1,100 @@
+# MBD Assistant Polish Release V2 Progress
+
+Date: 2026-05-05
+Branch: `goal/assistant-polish-release-v2`
+Base: `origin/goal/tutorial-assistant-v1` because PR #72 is open.
+Working repo: `/Users/tkevinbigham/Documents/GitHub/MBD-fresh`
+
+## Current Phase
+
+Phase 7 - verified and ready for git handoff.
+
+## Preflight
+
+- Supplied AGENTS.md instructions read.
+- No filesystem `AGENTS.md` files present in the clean clone.
+- Original `/Users/tkevinbigham/Documents/GitHub/MBD` checkout was not used because basic commands hung, matching the known corrupt packfile warning.
+- `MBD-fresh` passed `git fsck --no-dangling`.
+- PR #72 is open, not merged, so this branch was created from `origin/goal/tutorial-assistant-v1`.
+- Package scripts confirmed: `@mbd/web` has `typecheck`, `test`, `build`; root has `verify:determinism`.
+
+## Completed Work
+
+- Added V2 baseline/final scorecard.
+- Tightened first-session route cues and documented the golden path.
+- Added Mack Mercer SVG/CSS avatar component with expression states: neutral, excited, warning, success, thinking.
+- Added Assistant focus-on-open, expanded-section ARIA state, mode button state, success/replay pulse, and mobile drawer/footer hardening.
+- Added deterministic "Story so far" lines from safe app-shell context without save schema or sim mutation.
+- Added copy-to-clipboard closed-playtest feedback report.
+- Added shared `RatingBadge` component and applied it to player profile, roster action cards, trade assets, finance contracts, scouting search, minors farm/pipeline surfaces.
+- Converted worker-facing minors/finance display OVR values to display-scale values at UI DTO boundaries while preserving sim/save logic.
+- Added setup wizard scroll/focus handoff and defaulted Scouting to Pro Reports.
+- Made closed-market Assistant next actions phase-aware for Draft, Trade, and Free Agency.
+- Hardened mobile bottom offsets for Assistant, SimControls, and main content.
+- Moved the PWA update toast above mobile controls and made it dismissible so it does not block bottom navigation during playtest smoke.
+- Fixed global Space shortcut suppression for focused buttons/links.
+
+## Changed Files
+
+- `apps/web/src/app/layout/AppLayout.tsx`
+- `apps/web/src/app/App.tsx`
+- `apps/web/src/app/App.test.tsx`
+- `apps/web/src/app/layout/Sidebar.tsx`
+- `apps/web/src/app/layout/SimControls.tsx`
+- `apps/web/src/features/assistant/components/AssistantAvatar.tsx`
+- `apps/web/src/features/assistant/components/AssistantPanel.tsx`
+- `apps/web/src/features/assistant/components/AssistantPanel.test.tsx`
+- `apps/web/src/features/assistant/data/assistantGuidance.ts`
+- `apps/web/src/features/assistant/data/assistantGuidance.test.ts`
+- `apps/web/src/features/assistant/lib/assistantFeedback.ts`
+- `apps/web/src/features/assistant/lib/assistantFeedback.test.ts`
+- `apps/web/src/features/finance/routes/FinancePage.tsx`
+- `apps/web/src/features/minors/components/PipelineView.tsx`
+- `apps/web/src/features/minors/routes/MinorsPage.tsx`
+- `apps/web/src/features/players/components/ProfileHeader.tsx`
+- `apps/web/src/features/roster/routes/RosterPage.tsx`
+- `apps/web/src/features/scouting/routes/ScoutingPage.tsx`
+- `apps/web/src/features/setup/routes/SetupPage.tsx`
+- `apps/web/src/features/trade/routes/TradePage.tsx`
+- `apps/web/src/shared/components/RatingBadge.tsx`
+- `apps/web/src/shared/components/RatingBadge.test.tsx`
+- `apps/web/src/workers/sim.worker.helpers.ts`
+- `apps/web/src/workers/sim.worker.pipeline.ts`
+- `apps/web/src/workers/sim.worker.queries.ts`
+- `packages/design-tokens/src/tailwind-preset.ts`
+- V2 docs under `docs/tutorial-assistant/`
+
+## Tests / Checks Run
+
+- `git fsck --no-dangling`: passed in `MBD-fresh`.
+- `gh pr view 72 --json number,state,mergedAt,headRefName,baseRefName,url`: PR #72 open.
+- `npx --yes pnpm@9.15.4 --filter @mbd/web test -- src/features/assistant src/shared/components/RatingBadge.test.tsx`: passed, 17 tests.
+- `npx --yes pnpm@9.15.4 --filter @mbd/web typecheck`: passed.
+- `npx --yes pnpm@9.15.4 --filter @mbd/web test -- src/features/assistant src/shared/components/RatingBadge.test.tsx src/workers/sim.worker.test.ts -t "prospect pipeline"`: passed focused worker pipeline guard.
+- `npx --yes pnpm@9.15.4 --filter @mbd/web test -- src/workers/sim.worker.test.ts`: passed, 103 tests.
+- `npx --yes pnpm@9.15.4 --filter @mbd/web test -- src/app/App.test.tsx`: passed, 4 tests.
+- `npx --yes pnpm@9.15.4 --filter @mbd/web test -- src/features/assistant src/app/routes/index.test.tsx src/app/layout/AppLayout.test.tsx src/app/App.test.tsx src/shared/components/RatingBadge.test.tsx`: passed, 33 tests.
+- `npx --yes pnpm@9.15.4 --filter @mbd/web build`: passed.
+- `npx --yes pnpm@9.15.4 --filter @mbd/contracts test`: passed, 18 tests.
+- `npx --yes pnpm@9.15.4 run verify:determinism`: passed, 3 tests.
+- `git diff --check`: passed.
+- Playwright CLI mobile smoke at 390x844 passed after clearing the test service worker/cache and reloading fresh preview assets. Verified Setup, Dashboard, Roster, Player Profile, Draft, Trade, Scouting, Finance, Free Agency, Settings, mobile bottom tabs, dismissible update toast, and the Assistant feedback form.
+
+## Known Issues
+
+- Closed playtest with humans is still required before public release.
+- Incoming trade offers still depend on reduced worker-side labels; current V2 improves locally built package labels first.
+- Broader first-session issues noted by audit, including Day One legal-roster handoff and older tutorial/nudge overlap, should get a dedicated V3 pass if playtest confusion remains.
+
+## Next Highest-Impact Task
+
+Closed-playtest the first 10 minutes with real testers and decide whether V3 should suppress older helper layers while Mack is open.
+
+## Scorecard Status
+
+Baseline: 72/100.
+Current V2 score: 91/100 after final browser verification.
+
+## Sprint Status
+
+Implementation and verification complete. Branch is ready for review once pushed.
diff --git a/docs/tutorial-assistant/asset-plan.md b/docs/tutorial-assistant/asset-plan.md
index 37d0cab..639c9ed 100644
--- a/docs/tutorial-assistant/asset-plan.md
+++ b/docs/tutorial-assistant/asset-plan.md
@@ -4,6 +4,18 @@
 
 Ship with a production-safe CSS/SVG-style avatar first, then replace with generated raster assets when available.
 
+## V2 Shipped Asset Hook
+
+`apps/web/src/features/assistant/components/AssistantAvatar.tsx` now provides a production-safe inline SVG avatar with five expression states:
+
+- neutral
+- excited
+- warning
+- success
+- thinking / scouting
+
+The component is intentionally small, in-repo, and free of external image paths. Future portrait assets should replace the SVG behind the same expression enum.
+
 ## Placeholder Requirements
 
 - Small avatar for compact chip.
diff --git a/docs/tutorial-assistant/assistant-visual-system.md b/docs/tutorial-assistant/assistant-visual-system.md
new file mode 100644
index 0000000..70ca309
--- /dev/null
+++ b/docs/tutorial-assistant/assistant-visual-system.md
@@ -0,0 +1,31 @@
+# Assistant Visual System V2
+
+## Shipped
+
+- `AssistantAvatar` is an in-repo SVG/CSS component, not an external image.
+- Expression states: neutral, excited, warning, success, thinking.
+- Expression mapping:
+  - warning: market/trade story signals
+  - success: completed route guidance
+  - excited: playoff/major moment guidance
+  - thinking: scouting, draft, minors, player profile, player compare
+  - neutral: default route help
+- Motion:
+  - subtle entrance animation
+  - one-shot success/replay pulse
+  - all animation uses `motion-safe` so reduced-motion users get static UI
+- Accessibility:
+  - avatar exposes `Mack Mercer expression: <state>`
+  - the chip says Mack Mercer instead of generic Assistant
+
+## Future Asset Replacement
+
+The current SVG can be replaced by raster or richer vector files without changing Assistant state:
+
+- neutral portrait
+- excited portrait
+- warning portrait
+- success portrait
+- thinking/scouting portrait
+
+Keep the same expression enum and never ship external/broken asset URLs.
diff --git a/docs/tutorial-assistant/coverage-matrix.md b/docs/tutorial-assistant/coverage-matrix.md
index b5b1d2d..ed41df7 100644
--- a/docs/tutorial-assistant/coverage-matrix.md
+++ b/docs/tutorial-assistant/coverage-matrix.md
@@ -2,20 +2,22 @@
 
 Date: 2026-05-05
 
+V2 update: Mack Mercer now has first-session cues, phase-aware closed-market next actions, story-so-far context, feedback capture, and shared OVR badge grammar on the highest-impact decision surfaces.
+
 | Route | Page | Assistant Guidance | OVR/Ratings Visible When Relevant | Mobile Status | Notes |
 | --- | --- | --- | --- | --- | --- |
 | `/` | Setup / Save Hub | Implemented | Partial | Existing LC-3 pass | Assistant covers first-save guidance |
 | `/onboarding` | Onboarding | Implemented | Partial | Existing LC-3 pass | Existing AGM and guided-start nudge systems |
 | `/dashboard` | Dashboard | Implemented | Indirect | Existing LC-3 pass | Existing GameAdvisor, global Assistant mounted |
-| `/roster` | Roster | Implemented | Yes | Existing LC-3 pass | PageHelp exists; OVR and grades in tables |
-| `/minors` | Minors | Implemented | Yes | Existing LC-3 pass | Assistant explains promotion and development |
+| `/roster` | Roster | Implemented + V2 cue | Yes + action-card badges | V2 hardened | PageHelp exists; OVR/grades in tables plus DFA/promotion/waiver/extension cards |
+| `/minors` | Minors | Implemented + V2 cue | Yes + display-scale badges | V2 hardened | Assistant explains promotion and development |
 | `/players` | Players | Implemented | Yes | Existing LC-3 pass | OVR and grade in directory |
 | `/players/compare` | Player Compare | Implemented | Yes | Existing LC-3 pass | Assistant explains compare decisions |
-| `/players/:playerId` | Player Profile | Implemented | Yes | Existing LC-3 pass | Header and tabs expose ratings |
-| `/scouting` | Scouting | Implemented | Yes | Existing LC-3 pass | Assistant explains confidence and bias |
+| `/players/:playerId` | Player Profile | Implemented + V2 cue | Yes + shared header badge | V2 hardened | Header and tabs expose ratings |
+| `/scouting` | Scouting | Implemented + V2 cue | Yes + pro-search badges | V2 hardened | Defaults to Pro Reports for first-session clarity |
 | `/staff` | Staff | Implemented | Yes | Existing LC-3 pass | Coach grades are rating-like |
-| `/draft` | Draft | Implemented | Yes | Existing LC-3 pass | PageHelp and guided-start nudge exist |
-| `/trade` | Trade | Implemented | Yes | Existing LC-3 pass | PageHelp exists; needs value model help |
+| `/draft` | Draft | Implemented + phase-aware V2 action | Yes | Existing LC-3 pass | Closed-market guidance redirects to Scouting |
+| `/trade` | Trade | Implemented + phase-aware V2 action | Yes + package labels | V2 hardened | Local trade package labels now include OVR/grade |
 | `/standings` | Standings alias | Implemented | N/A | Existing LC-3 pass | Alias route |
 | `/league/standings` | Standings | Implemented | N/A | Existing LC-3 pass | PageHelp exists |
 | `/leaders` | Leaders alias | Implemented | Yes | Existing LC-3 pass | Alias route |
@@ -24,9 +26,9 @@ Date: 2026-05-05
 | `/games/:gameIndex` | Box Score | Implemented | N/A | Existing LC-3 pass | Assistant explains result reading |
 | `/press-room` | Press Room | Implemented | N/A | Existing LC-3 pass | Existing press narratives |
 | `/playoffs` | Playoffs | Implemented | N/A | Existing LC-3 pass | Assistant explains postseason flow |
-| `/free-agency` | Free Agency | Implemented | Yes | Existing LC-3 pass | OVR visible in market table |
+| `/free-agency` | Free Agency | Implemented + phase-aware V2 action | Yes | Existing LC-3 pass | Closed-market guidance redirects to Finance |
 | `/offseason` | Offseason | Implemented | Yes | Existing LC-3 pass | OVR visible in candidates/Rule 5 surfaces |
-| `/finance` | Finance | Implemented | Indirect | Existing LC-3 pass | Assistant explains talent-to-payroll decisions |
+| `/finance` | Finance | Implemented + V2 cue | Yes in contracts | V2 hardened | Contract table now includes sortable OVR/grade |
 | `/career` | GM Career | Implemented | N/A | Existing LC-3 pass | Assistant explains career stakes |
 | `/history` | History | Implemented | Historical | Existing LC-3 pass | Peak/current OVR in some history surfaces |
 | `/achievements` | Achievements | Implemented | N/A | Existing LC-3 pass | Optional goal guidance |
@@ -36,4 +38,4 @@ Date: 2026-05-05
 | `/scenarios` | Challenges | Implemented | Varies | Existing LC-3 pass | Scenario-specific goals |
 | `/stats` | Stats Encyclopedia | Implemented | Explanatory | Existing LC-3 pass | Best home for deeper rating/stat definitions |
 | `/records` | Record Watch | Implemented | Historical | Existing LC-3 pass | Legacy guidance |
-| `/settings` | Settings | Implemented | N/A | Existing LC-3 pass | Assistant explains replay and accessibility controls |
+| `/settings` | Settings | Implemented + V2 cue | N/A | Existing LC-3 pass | Assistant explains replay/accessibility; feedback loop lives in Assistant |
diff --git a/docs/tutorial-assistant/first-session-flow.md b/docs/tutorial-assistant/first-session-flow.md
new file mode 100644
index 0000000..00b85e9
--- /dev/null
+++ b/docs/tutorial-assistant/first-session-flow.md
@@ -0,0 +1,27 @@
+# Assistant V2 First-Session Flow
+
+## Golden Path
+
+1. Save Hub: choose New Dynasty and land focus on the setup wizard.
+2. Day One: finish or quick-start onboarding.
+3. Dashboard: read one urgent card before simming.
+4. Roster: make the roster legal and inspect OVR before any move.
+5. Player Profile: use OVR, floor/current/ceiling, Development, and Scouting before deciding.
+6. Scouting: start with Pro Reports in the first session.
+7. Finance: check commitments before trades or free-agent offers.
+8. Sim: advance in small chunks after one concrete issue is handled.
+
+Draft, Trade, and Free Agency are still explained, but V2 now redirects closed-market first-session actions toward Scouting or Finance until the phase opens.
+
+## Copy Rules
+
+- Default panel copy shows one short first-session cue.
+- Deeper strategy remains behind an explicit button.
+- Hardcore mode stays available for denser trade/market reading.
+- Guidance remains replayable and non-blocking.
+
+## Remaining Playtest Questions
+
+- Does the Day One roster handoff still feel inconsistent if the roster opens illegal?
+- Do legacy guided-start nudges compete with Mack on the first dashboard?
+- Does mobile setup focus feel obvious after tapping New Dynasty?
diff --git a/docs/tutorial-assistant/mobile-validation-v2.md b/docs/tutorial-assistant/mobile-validation-v2.md
new file mode 100644
index 0000000..638bae5
--- /dev/null
+++ b/docs/tutorial-assistant/mobile-validation-v2.md
@@ -0,0 +1,42 @@
+# Mobile Validation V2
+
+## Implemented Hardening
+
+- Assistant chip moved above mobile nav, ticker, and sim controls using safe-area-aware offset.
+- Assistant panel max height reduced on phone-size screens.
+- Assistant footer actions are sticky inside the panel.
+- Main content has larger mobile bottom padding.
+- Sim controls reserve mobile bottom-nav space.
+- Mobile nav now uses explicit routes instead of brittle numeric indices and includes Trade/League.
+- More drawer safe-area padding is explicit.
+- Primary orange buttons in touched surfaces use dark text for contrast.
+- PWA update toast is dismissible and offset above mobile controls so it does not block bottom navigation.
+- Focus moves to Close Assistant on open.
+- Escape closes the Assistant panel.
+- Expandable Assistant sections expose `aria-expanded` and `aria-controls`.
+- Global Space sim shortcut no longer fires from focused buttons, links, or role buttons.
+
+## Routes Covered By Audit
+
+- Setup
+- Onboarding
+- Dashboard
+- Roster
+- Player Profile
+- Scouting
+- Draft
+- Trade
+- Free Agency
+- Finance
+- Settings
+
+## Browser Smoke Status
+
+Passed at 390x844 on the production preview after clearing the local test service worker/cache and reloading fresh assets.
+
+Verified Setup, Dashboard, Roster, Player Profile, Draft, Trade, Scouting, Finance, Free Agency, Settings, corrected mobile bottom tabs, dismissible update toast, Assistant open/close focus, and the copyable feedback form.
+
+## Known Remaining Risks
+
+- Legacy guided-start nudge and Assistant can still coexist; closed playtest should confirm whether this feels noisy.
+- Several deep decision tables still use dense desktop table markup on mobile, though key V2 rating surfaces now have compact badges.
diff --git a/docs/tutorial-assistant/narrative-continuity-v2.md b/docs/tutorial-assistant/narrative-continuity-v2.md
new file mode 100644
index 0000000..e9f8963
--- /dev/null
+++ b/docs/tutorial-assistant/narrative-continuity-v2.md
@@ -0,0 +1,34 @@
+# Narrative Continuity V2
+
+## Shipped
+
+The Assistant now renders a safe "Story so far" section based on app-shell context:
+
+- phase
+- season/day
+- games played
+- user team standing when available
+- days until trade deadline when available
+- prior season summary when available
+
+The lines are deterministic pure functions in `assistantGuidance.ts`.
+
+## Save Safety
+
+- No `GameSnapshot` fields changed.
+- No save schema version bump.
+- No migration needed.
+- No RNG or `Math.random`.
+- Cooldowns remain in existing Assistant localStorage only.
+
+## Behavior
+
+- Preseason / empty saves: explains the clean opening checkpoint.
+- Around .500: frames buy/sell/hold decisions.
+- Winning teams: frames window protection.
+- Struggling teams: frames payroll/prospect protection.
+- Deadline window: adds a second line pointing to trade/payroll prep.
+
+## Remaining Gap
+
+Roster weakness and payroll-specific story lines are intentionally deferred until a deeper safe snapshot selector exists.
diff --git a/docs/tutorial-assistant/playtest-feedback-loop.md b/docs/tutorial-assistant/playtest-feedback-loop.md
new file mode 100644
index 0000000..8b8d829
--- /dev/null
+++ b/docs/tutorial-assistant/playtest-feedback-loop.md
@@ -0,0 +1,27 @@
+# Closed Playtest Feedback Loop V2
+
+## Shipped
+
+Mack Mercer now includes a `Give feedback` action inside the expanded Assistant panel.
+
+The form asks:
+
+- Was Mack helpful? 1-5
+- Did you know what to do next? 1-5
+- What confused you?
+
+The `Copy report` action writes a backend-free diagnostic text report to the clipboard.
+
+## Report Fields
+
+- app version when provided by `VITE_APP_VERSION`, otherwise `local`
+- route and normalized Assistant route key
+- phase, season, day
+- Assistant mode
+- completed Assistant route keys
+- viewport category
+- tester scores and comment
+
+## Backend
+
+No backend or external service is required. Closed testers can paste the copied report into Slack, email, GitHub, or a playtest doc.
diff --git a/docs/tutorial-assistant/playtest-plan.md b/docs/tutorial-assistant/playtest-plan.md
index 84fcd1c..f04448a 100644
--- a/docs/tutorial-assistant/playtest-plan.md
+++ b/docs/tutorial-assistant/playtest-plan.md
@@ -34,6 +34,10 @@ Viewport target: 360x640 or 375x667.
 
 ## Feedback Capture
 
+Use Mack Mercer > `Give feedback` > `Copy report`, then ask testers to paste the report with any extra notes.
+
+The copied report includes route, phase, Assistant mode, tutorial completion state, viewport category, scores, and the tester's confusion note.
+
 Ask testers to answer:
 
 - Did you always know the next thing to try?
@@ -44,6 +48,19 @@ Ask testers to answer:
 - Did anything cover controls on mobile?
 - Which Assistant line felt too long, too vague, or too repetitive?
 
+## V2 First-Session Script
+
+1. Clear site storage.
+2. Start at Save Hub and tap New Dynasty.
+3. Confirm the setup wizard scrolls/focuses into view.
+4. Complete Day One.
+5. On Dashboard, follow only the Assistant's suggested route.
+6. Make the roster legal or identify the first compliance issue.
+7. Open one Player Profile and inspect the OVR/floor/current/ceiling area.
+8. Visit Scouting and confirm Pro Reports appears first.
+9. Visit Draft, Trade, and Free Agency out of phase and confirm Mack redirects planning to Scouting/Finance instead of asking for closed-market actions.
+10. Copy one feedback report from Mack.
+
 ## Low-Risk Share/Social Suggestion
 
 If a follow-up slice is available, add a copyable "Dynasty status card" from History or Dashboard:
diff --git a/docs/tutorial-assistant/ratings-visibility-changelog.md b/docs/tutorial-assistant/ratings-visibility-changelog.md
new file mode 100644
index 0000000..4496490
--- /dev/null
+++ b/docs/tutorial-assistant/ratings-visibility-changelog.md
@@ -0,0 +1,25 @@
+# Ratings Visibility Changelog V2
+
+## Added / Improved
+
+- Shared `RatingBadge` component for compact OVR/grade display.
+- Player Profile header now uses the shared OVR badge.
+- Roster DFA, promotion, waiver, and extension decision cards now surface OVR/grade where available.
+- Finance contract table now includes sortable OVR/grade.
+- Trade selected-package labels now include position, OVR, and grade.
+- Trade asset rows use the shared badge in OVR cells.
+- Scouting pro-search rows now show OVR/grade before ordering a report.
+- Minors farm report and Pipeline View use display-scale OVR badges.
+- Worker DTOs for minors/finance/action-card views now normalize display OVR at UI boundaries.
+
+## Guardrails
+
+- No save schema changes.
+- No simulation logic changes.
+- Internal 0-550 ratings remain internal; player-facing V2 surfaces use display-scale 20-80 where possible.
+
+## Remaining Gaps
+
+- Incoming AI trade offers still use reduced worker-side labels.
+- Player Compare picker could use OVR in search/selection chips in a follow-up.
+- Free Agency market intelligence cards can show OVR beside projected value in a follow-up.
diff --git a/docs/tutorial-assistant/release-gate.md b/docs/tutorial-assistant/release-gate.md
index 4f8832d..836b5ea 100644
--- a/docs/tutorial-assistant/release-gate.md
+++ b/docs/tutorial-assistant/release-gate.md
@@ -26,6 +26,15 @@ Date: 2026-05-05
 - [x] Mobile browser check verified Setup and Dashboard Assistant behavior at 390x844.
 - [x] Focus/Escape behavior exists for the expanded panel.
 - [x] Save schema remains v33.
+- [x] V2 scorecard exists.
+- [x] V2 first-session flow exists.
+- [x] Mack Mercer has expression-state avatar hooks.
+- [x] Assistant feedback loop exists without backend dependency.
+- [x] Story-so-far guidance is deterministic and save-safe.
+- [x] Highest-impact OVR/rating decision surfaces have visible badges or one-tap rating explanation.
+- [x] Closed-market Draft/Trade/Free Agency guidance is phase-aware.
+- [x] V2 full validation gauntlet is complete.
+- [x] V2 390x844 browser smoke is complete.
 
 ## Verification
 
@@ -38,19 +47,30 @@ Date: 2026-05-05
 - `PATH=/Users/tkevinbigham/.cache/codex-runtimes/codex-primary-runtime/dependencies/node/bin:$PATH npx --yes pnpm@9.15.4 --filter @mbd/contracts test`: passed, 18 tests.
 - `PATH=/Users/tkevinbigham/.cache/codex-runtimes/codex-primary-runtime/dependencies/node/bin:$PATH npx --yes pnpm@9.15.4 run verify:determinism`: passed, 3 tests.
 - Playwright mobile browser check at 390x844 on a static preview of `apps/web/dist`: passed. Verified Setup Assistant chip/panel, ratings explanation, quick-start save creation, Dashboard Assistant chip/panel after skipping the existing legacy tutorial modal, and route-aware Dashboard guidance.
+- V2 final `npx --yes pnpm@9.15.4 --filter @mbd/web typecheck`: passed.
+- V2 final `npx --yes pnpm@9.15.4 --filter @mbd/web test -- src/features/assistant src/app/routes/index.test.tsx src/app/layout/AppLayout.test.tsx src/app/App.test.tsx src/shared/components/RatingBadge.test.tsx`: passed, 33 tests.
+- V2 final `npx --yes pnpm@9.15.4 --filter @mbd/web test -- src/workers/sim.worker.test.ts`: passed, 103 tests.
+- V2 final `npx --yes pnpm@9.15.4 --filter @mbd/web build`: passed.
+- V2 final `npx --yes pnpm@9.15.4 --filter @mbd/contracts test`: passed, 18 tests.
+- V2 final `npx --yes pnpm@9.15.4 run verify:determinism`: passed, 3 tests.
+- V2 final `git diff --check`: passed.
+- V2 Playwright mobile browser smoke at 390x844 passed after clearing the local test service worker/cache. Verified Setup, Dashboard, Roster, Player Profile, Draft, Trade, Scouting, Finance, Free Agency, Settings, the corrected mobile bottom tabs, dismissible update toast, and the Assistant feedback form.
 
-## Remaining Blockers
+## Remaining Release Risks
 
-- **P0 — Repo health.** `.git/objects/pack/pack-0e3dc6...pack` is corrupt: `file` reports it as empty and `git verify-pack` reports `early EOF, pack is bad`. All in-pack history (~5,901 objects) is unreadable from this clone. Symptoms: `git status`, `git diff`, `git fsck` hang; `git rev-parse main HEAD` returns the same SHA so the branch is currently identical to `main`. **Fix before any commit / merge / PR**: re-clone fresh from `git@github.com:KevinBigham/MBD.git`, then copy the working-tree files for the Assistant feature and docs over the fresh checkout. Do NOT run destructive git commands (`git gc`, `git repack`, `rm -rf .git/objects/pack/`) without first preserving the working tree.
-- **P0 — Work is uncommitted.** Every file listed under "Changed Files" in `docs/goals/MBD_TUTORIAL_ASSISTANT_V1_PROGRESS.md` is untracked relative to `main`. Once the repo is healthy, stage with explicit paths (`git add apps/web/src/features/assistant docs/goals/MBD_TUTORIAL_ASSISTANT_V1_*.md docs/tutorial-assistant apps/web/src/app/layout/AppLayout.tsx apps/web/src/app/layout/AppLayout.test.tsx apps/web/src/app/routes/index.tsx apps/web/src/app/routes/index.test.tsx`) — never `git add -A`.
 - Manual closed-tester playtest is still recommended before public launch handoff.
-- The Assistant uses a CSS/icon avatar placeholder; generated bitmap portraits are deferred.
-- The Assistant explains OVR/ratings through guidance instead of adding new rating columns to already-dense tables. Future slices can add visual rating badges where playtest shows hunting/confusion.
-- Root typecheck/build under the default Node path hung before using the bundled Codex Node runtime. Use the bundled Node command form above on this machine.
-- During independent review on 2026-05-05, vitest and `vite build` hung when invoked from this shell with both bundled and Homebrew Node, while `tsc --noEmit` exited cleanly. The previously generated `apps/web/dist/` already contains the Assistant bundle, so the build is known to pass — but a clean re-run on a healthy repo is part of the merge gate.
+- Generated bitmap portraits are deferred; V2 ships a production-safe inline SVG/CSS avatar with expression hooks.
+- Incoming AI-generated trade offer labels still use reduced worker-side asset text in some contexts. V2 improves locally built trade packages and visible decision tables first.
+- Legacy guided-start, PageHelp, and Assistant can still coexist. Closed playtest should decide whether a V3 pacing pass should suppress older helper layers once Mack is open.
+
+## Historical V1 Recovery Note
+
+- The original `/Users/tkevinbigham/Documents/GitHub/MBD` checkout previously had a corrupt `.git` packfile and hung on basic git operations. V2 work moved to `/Users/tkevinbigham/Documents/GitHub/MBD-fresh`, which passed `git fsck --no-dangling` before edits.
+- PR #72 is still open, so V2 is intentionally stacked on `origin/goal/tutorial-assistant-v1` rather than `main`.
 
 ## Launch-Readiness Notes
 
 - V1 is shippable as a guidance layer: it is global, route-aware, persistent, dismissible, replayable, mobile-shaped, and save-safe.
 - It deliberately keeps existing TourProvider, PageHelp, ContextualHelp, GameAdvisor, and guided-start nudges intact.
 - No sim logic, save schema, RNG, or migration code was changed.
+- V2 adds product polish in the healthy `MBD-fresh` branch: expression avatar, story so far, first-session cues, display-scale rating badges, mobile/accessibility hardening, and copyable playtest feedback.
diff --git a/docs/tutorial-assistant/v2-scorecard.md b/docs/tutorial-assistant/v2-scorecard.md
new file mode 100644
index 0000000..b252db2
--- /dev/null
+++ b/docs/tutorial-assistant/v2-scorecard.md
@@ -0,0 +1,33 @@
+# Assistant Polish Release V2 Scorecard
+
+Date: 2026-05-05
+
+## Baseline Score: 72 / 100
+
+- First-session clarity: 14 / 20
+- Assistant usefulness / "What now?": 11 / 15
+- OVR/ratings visibility in decisions: 10 / 15
+- Mobile tutorial UX: 10 / 15
+- Accessibility: 7 / 10
+- Visual polish / Assistant character identity: 5 / 10
+- Narrative continuity / save-aware flavor: 7 / 10
+- Playtest readiness / feedback loop: 0 / 5
+
+Baseline read: V1 was route-aware and useful, but Mack still looked generic, closed-market guidance could send players to unavailable actions, several decision cards lacked visible OVR, and testers had no in-game feedback capture.
+
+## V2 Score: 91 / 100
+
+- First-session clarity: 18 / 20
+- Assistant usefulness / "What now?": 14 / 15
+- OVR/ratings visibility in decisions: 14 / 15
+- Mobile tutorial UX: 14 / 15
+- Accessibility: 9 / 10
+- Visual polish / Assistant character identity: 9 / 10
+- Narrative continuity / save-aware flavor: 8 / 10
+- Playtest readiness / feedback loop: 5 / 5
+
+## Why Not Higher
+
+- Incoming AI trade-offer labels still use reduced worker-side asset text.
+- Closed playtest may still find onboarding/tour/nudge overlap in the first 10 minutes.
+- "Story so far" uses safe app-shell summaries, not deeper roster weakness or payroll analytics.
diff --git a/packages/design-tokens/src/tailwind-preset.ts b/packages/design-tokens/src/tailwind-preset.ts
index b6c66aa..edbfc50 100644
--- a/packages/design-tokens/src/tailwind-preset.ts
+++ b/packages/design-tokens/src/tailwind-preset.ts
@@ -42,6 +42,8 @@ const mbdPreset = {
         'ceremony-glow': 'ceremonyGlow 2s ease-in-out infinite',
         'ceremony-slide-up': 'ceremonySlideUp 0.4s ease-out forwards',
         'stat-tick': 'statTick 0.3s ease-out',
+        'assistant-enter': 'assistantEnter 0.18s ease-out',
+        'assistant-pulse': 'assistantPulse 0.9s ease-out 1',
       },
       keyframes: {
         ceremonyFadeIn: {
@@ -64,6 +66,15 @@ const mbdPreset = {
           '0%': { transform: 'scale(1.15)', color: 'rgba(249, 115, 22, 1)' },
           '100%': { transform: 'scale(1)', color: 'inherit' },
         },
+        assistantEnter: {
+          '0%': { transform: 'translateY(4px) scale(0.96)', opacity: '0' },
+          '100%': { transform: 'translateY(0) scale(1)', opacity: '1' },
+        },
+        assistantPulse: {
+          '0%': { transform: 'scale(1)', boxShadow: '0 0 0 0 rgba(34, 197, 94, 0.28)' },
+          '45%': { transform: 'scale(1.04)', boxShadow: '0 0 0 8px rgba(34, 197, 94, 0.12)' },
+          '100%': { transform: 'scale(1)', boxShadow: '0 0 0 0 rgba(34, 197, 94, 0)' },
+        },
         shimmer: {
           '0%': { transform: 'translateX(-100%)' },
           '100%': { transform: 'translateX(300%)' },