diff --git a/docs/performance/smooth-navigation-baseline/README.md b/docs/performance/smooth-navigation-baseline/README.md
index cecf086ef..27d9115ff 100644
--- a/docs/performance/smooth-navigation-baseline/README.md
+++ b/docs/performance/smooth-navigation-baseline/README.md
@@ -12,6 +12,12 @@ requests, so they prove rendering and browser timing only.
 
 ## Reproduce
 
+The harness `scripts/measure-navigation-performance.mjs` was a single-use
+baseline tool and was removed once this evidence was captured. Recover it with
+`git show 9127589:scripts/measure-navigation-performance.mjs` if the matrix ever
+needs re-running. The commands below are the ones that produced `run-1.json`
+and `run-2.json`.
+
 ```text
 export PATH=/home/codex/.nvm/versions/node/v22.23.2/bin:$PATH
 node --version                         # v22.23.2
diff --git a/e2e/animation-polish.spec.ts b/e2e/animation-polish.spec.ts
index 6a3a9505e..17886e968 100644
--- a/e2e/animation-polish.spec.ts
+++ b/e2e/animation-polish.spec.ts
@@ -1,12 +1,14 @@
 import { expect, test, type Page } from '@playwright/test';
 import { stubSupabaseSession } from './helpers/auth';
+import { stubAIResponses } from './fixtures/ai-responses';
 
-const featureConfig = { provider: 'mock', model: 'local', temperature: 0.7 };
+const featureConfig = { provider: 'openrouter', model: 'z-ai/glm-5.3-flash', temperature: 0.7 };
 const STATE_TIMEOUT_MS = 15_000;
 
 async function prepareMotionFixture(page: Page, reducedMotion: 'no-preference' | 'reduce') {
   await page.emulateMedia({ reducedMotion });
   await stubSupabaseSession(page);
+  await stubAIResponses(page);
   await page.addInitScript((config) => {
     window.localStorage.setItem('debate-trainer-settings', JSON.stringify({
       state: {
@@ -47,10 +49,27 @@ async function openGenerateOptions(page: Page) {
 async function generateMockCase(page: Page) {
   await page.getByLabel('Motion / Topic').fill('This House would make public transport free.');
   await page.getByRole('button', { name: 'Generate Debate Case' }).click();
+  await page.mouse.move(0, 0);
   await expect(page.getByText('Reading the motion...')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await expect(page.getByText(/We support the motion/)).toBeVisible({ timeout: STATE_TIMEOUT_MS });
 }
 
+async function openFeatureRoute(page: Page, route: 'brainstorm' | 'factoids' | 'ask') {
+  const desktopLink = page.locator(`[data-tour="nav-${route}"]`).first();
+
+  if ((page.viewportSize()?.width ?? 1280) < 1024) {
+    await page.getByRole('button', { name: 'Open menu' }).click();
+    await page.getByRole('navigation', { name: 'Mobile navigation' })
+      .locator(`a[href="/app/${route}"]`)
+      .click();
+  } else {
+    if (!await desktopLink.isVisible()) await page.locator('summary[data-tour="nav-more"]').click();
+    await desktopLink.click();
+  }
+
+  await expect(page).toHaveURL(new RegExp(`/app/${route}$`));
+}
+
 test('keeps route and feature-state motion short and stable', async ({ page }, testInfo) => {
   await prepareMotionFixture(page, 'no-preference');
   const options = await openGenerateOptions(page);
@@ -139,21 +158,21 @@ test('audits applicable empty, loading, result, and option states across feature
   await expect(page.getByRole('heading', { name: 'Overall Assessment' })).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.screenshot({ path: testInfo.outputPath('attack-result.png'), fullPage: true });
 
-  await page.goto('/app/brainstorm', { waitUntil: 'domcontentloaded' });
+  await openFeatureRoute(page, 'brainstorm');
   await expect(page.getByText('Unlock Creative Angles')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.getByLabel('Motion / Topic').fill('This House would make public transport free.');
   await page.getByRole('button', { name: 'Start Brainstorming' }).click();
   await expect(page.getByText('Exploring angles...')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await expect(page.getByRole('heading', { name: 'Top 5 Argument Angles' })).toBeVisible({ timeout: STATE_TIMEOUT_MS });
 
-  await page.goto('/app/factoids', { waitUntil: 'domcontentloaded' });
+  await openFeatureRoute(page, 'factoids');
   await expect(page.getByText('Evidence That Wins')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.getByLabel('Statement').fill('Free public transport reduces urban congestion.');
   await page.getByRole('button', { name: 'Find Factoids' }).click();
   await expect(page.getByText('Searching databases...')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await expect(page.getByRole('heading', { name: 'Factoids' })).toBeVisible({ timeout: STATE_TIMEOUT_MS });
 
-  await page.goto('/app/ask', { waitUntil: 'domcontentloaded' });
+  await openFeatureRoute(page, 'ask');
   await expect(page.getByText('Start a conversation')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.getByPlaceholder('Ask your debate coach...').fill('How should I weigh access against cost?');
   await page.getByRole('button', { name: 'Send message' }).click();
diff --git a/e2e/fixtures/ai-responses.ts b/e2e/fixtures/ai-responses.ts
new file mode 100644
index 000000000..030ebf660
--- /dev/null
+++ b/e2e/fixtures/ai-responses.ts
@@ -0,0 +1,184 @@
+/**
+ * Canned edge-function responses for specs that exercise UI states rather than
+ * AI quality. Intercepting the network keeps the app's real request path — and
+ * its schema validation — under test, unlike the deleted in-app mock provider
+ * which bypassed both.
+ */
+import type { Page } from '@playwright/test';
+
+const CORS_HEADERS = {
+  'access-control-allow-origin': '*',
+  'access-control-allow-headers': 'authorization, x-client-info, apikey, content-type',
+  'access-control-allow-methods': 'POST, OPTIONS',
+  'content-type': 'application/json',
+};
+
+// The client rejects a generate response whose contention count does not match
+// the requested length (see expectedContentionCount in src/lib/ai/client.ts).
+const CONTENTION_COUNT: Record<string, number> = { brief: 2, standard: 3, comprehensive: 4 };
+
+const CONTENTIONS = [
+  {
+    id: '1',
+    claim: 'Access improves for the people who need it most',
+    reasoning: 'Fares are a regressive barrier concentrated on low-income riders.',
+    evidence: 'Comparable jurisdictions report ridership gains after fare removal.',
+    needsSource: false,
+    impact: 'More people reach work, school, and healthcare.',
+  },
+  {
+    id: '2',
+    claim: 'Congestion and emissions fall as mode share shifts',
+    reasoning: 'Removing the marginal cost of a trip shifts journeys off the road.',
+    evidence: 'Mode-share studies show measurable shifts at zero fare.',
+    needsSource: false,
+    impact: 'Shorter journeys and lower urban emissions.',
+  },
+  {
+    id: '3',
+    claim: 'Fare collection overhead outweighs much of the revenue it protects',
+    reasoning: 'Gates, inspectors, and ticketing systems consume a large share of receipts.',
+    evidence: 'Operators report collection costs well above headline estimates.',
+    needsSource: false,
+    impact: 'The net funding gap is far smaller than opponents claim.',
+  },
+  {
+    id: '4',
+    claim: 'Civic participation rises when mobility is not rationed by price',
+    reasoning: 'Unpriced trips are taken for non-essential civic and social reasons too.',
+    evidence: 'Ridership growth after fare removal skews to off-peak trips.',
+    needsSource: false,
+    impact: 'Denser civic life, not just cheaper commutes.',
+  },
+];
+
+const generate = (motion: string, length: string) => ({
+  caseStructure: {
+    thesis: `We support the motion that ${motion}`,
+    framework: 'Net societal benefit, weighed on access and cost.',
+    keyDefinitions: ['Public transport: publicly funded scheduled transit.'],
+    burdenOfProof: 'We must show the policy produces a net gain in practice.',
+  },
+  contentions: CONTENTIONS.slice(0, CONTENTION_COUNT[length] ?? 2),
+  predictedOpponentCase: {
+    likelyArguments: ['The lost farebox revenue has to come from somewhere.'],
+    strategicWeaknesses: ['Assumes fare revenue is the only funding model.'],
+    keyClashes: ['Who actually bears the cost.'],
+  },
+  counters: [
+    {
+      targetArgument: 'Funding gap',
+      counterpoint: 'Fare collection itself carries substantial overhead.',
+      rebuttal: 'Net cost is far below headline farebox revenue.',
+    },
+  ],
+  metadata: { side: 'pro', format: 'bp', generatedAt: new Date().toISOString() },
+});
+
+const attack = {
+  overallAssessment: {
+    score: 62,
+    summary: 'The case is coherent but leaves its central warrant underdefended.',
+    strengthAreas: ['Clear thesis', 'Explicit framework'],
+  },
+  weaknesses: [
+    {
+      id: 'w1',
+      severity: 'major',
+      type: 'evidential',
+      description: 'The congestion claim has no comparative evidence.',
+      whyWeak: 'Correlation between fare policy and congestion is asserted, not shown.',
+      howOpponentAttacks: 'Name a city where ridership rose and congestion did not fall.',
+      improvedVersion: 'Cite a before/after study with a control corridor.',
+    },
+  ],
+  fallaciesDetected: [
+    { name: 'Hasty generalization', location: 'Second contention', explanation: 'One city generalized to all.' },
+  ],
+  crossExQuestions: [
+    { question: 'Which funding line replaces the farebox?', purpose: 'Force a concrete mechanism.', expectedTrap: 'A vague appeal to general taxation.' },
+  ],
+  weighingAnalysis: {
+    currentWeighing: 'Access is asserted to outweigh cost without comparison.',
+    missingComparisons: ['Cost per additional rider versus targeted subsidy.'],
+    improvementSuggestions: ['Weigh against the strongest alternative, not the status quo.'],
+  },
+};
+
+const idea = {
+  id: 'i1',
+  title: 'Access as a precondition for participation',
+  description: 'Mobility gates work, education, and civic life.',
+  side: 'pro',
+  strength: 'strong',
+  tradeoffs: ['Requires a durable funding source.'],
+  relatedTo: [],
+};
+
+const brainstorm = {
+  needsMoreInfo: false,
+  topFive: [{ rank: 1, idea, whyTop: 'It reaches the widest impact with the clearest warrant.' }],
+  nextSteps: ['Find a before/after ridership study.'],
+  warningsAndTradeoffs: ['Do not overclaim the congestion effect.'],
+};
+
+const factoids = {
+  factoids: [
+    {
+      id: 'f1',
+      shortClaim: 'Fare removal raised ridership in Tallinn',
+      keyFigure: '+14% ridership',
+      context: 'Measured over the first year of the free-fare scheme.',
+      limitations: 'A single city with unusual baseline car ownership.',
+      citation: { title: 'Free public transport evaluation', publisher: 'Municipal transport authority', verified: 'verified' },
+      howToUse: 'Use as an existence proof, not as a universal rate.',
+      relevanceScore: 80,
+    },
+  ],
+  searchSuggestions: ['fare-free transit ridership study'],
+  warnings: [],
+  verificationStatus: 'complete',
+};
+
+const ask = (message: string) => ({
+  response: `Great question about ${message.slice(0, 60)} — weigh access against cost by naming who bears each.`,
+  followUpQuestions: ['What is the strongest alternative policy?'],
+  uncertainties: ['The congestion effect size varies widely by city.'],
+});
+
+type AiRequest = { feature?: string; input?: Record<string, unknown> };
+
+// The deleted mock provider delayed 1-2s per feature, which is what made the
+// loading states observable. Specs assert on those states, so keep the latency.
+const RESPONSE_DELAY_MS = 1_200;
+
+/**
+ * Serves canned output for every `ai` edge-function call. Specs that need a
+ * specific payload should add their own narrower `page.route` first.
+ */
+export async function stubAIResponses(page: Page) {
+  await page.route('**/functions/v1/ai**', async (route) => {
+    if (route.request().method() === 'OPTIONS') {
+      await route.fulfill({ status: 200, headers: CORS_HEADERS, body: 'ok' });
+      return;
+    }
+    const body = (route.request().postDataJSON() ?? {}) as AiRequest;
+    const motion = typeof body.input?.motion === 'string' ? body.input.motion : 'the motion';
+    const message = typeof body.input?.message === 'string' ? body.input.message : 'this';
+    const length = typeof body.input?.length === 'string' ? body.input.length : 'brief';
+    const output = {
+      generate: () => generate(motion, length),
+      attack: () => attack,
+      brainstorm: () => brainstorm,
+      factoids: () => factoids,
+      ask: () => ask(message),
+    }[body.feature ?? '']?.();
+
+    if (!output) {
+      await route.fulfill({ status: 400, headers: CORS_HEADERS, body: JSON.stringify({ error: `No fixture for feature ${body.feature}` }) });
+      return;
+    }
+    await new Promise((resolve) => setTimeout(resolve, RESPONSE_DELAY_MS));
+    await route.fulfill({ status: 200, headers: CORS_HEADERS, body: JSON.stringify({ output, discoveredSources: [] }) });
+  });
+}
diff --git a/e2e/home-navigation.spec.ts b/e2e/home-navigation.spec.ts
index cabf6a63e..7fc83f153 100644
--- a/e2e/home-navigation.spec.ts
+++ b/e2e/home-navigation.spec.ts
@@ -60,19 +60,6 @@ test('onboarding follows visible home targets when secondary navigation is close
 
 test('onboarding keeps its original start schedule after a delayed lazy chunk', async ({ page }) => {
   await page.addInitScript(() => {
-    const originalSetItem = Storage.prototype.setItem;
-    Storage.prototype.setItem = function setItem(key, value) {
-      if (key === 'debate-trainer-onboarding') {
-        try {
-          if (JSON.parse(value).state?.isTourRunning === true) {
-            originalSetItem.call(this, '__onboarding-tour-started-at', String(Date.now()));
-          }
-        } catch {
-          // Ignore malformed test-only storage writes.
-        }
-      }
-      originalSetItem.call(this, key, value);
-    };
     window.localStorage.setItem('debate-trainer-onboarding', JSON.stringify({
       state: { hasCompletedOnboarding: false, isTourRunning: false },
       version: 0,
@@ -80,7 +67,12 @@ test('onboarding keeps its original start schedule after a delayed lazy chunk',
   });
   await page.route('**/src/components/features/onboarding/OnboardingTour.tsx*', async (route) => {
     const response = await route.fetch();
-    const body = `${await response.text()}\nwindow.localStorage.setItem('__onboarding-module-evaluated-at', String(Date.now()));`;
+    const source = await response.text();
+    const body = source.replace(
+      /const\s+timer\s*=\s*setTimeout\(\(\)\s*=>\s*\{/,
+      'window.localStorage.setItem("__onboarding-auto-start-delay", String(autoStartDelay));\n        const timer = setTimeout(() => {',
+    );
+    if (body === source) throw new Error('Unable to instrument the onboarding auto-start delay');
     await new Promise((resolve) => setTimeout(resolve, 750));
     await route.fulfill({ response, body });
   });
@@ -92,11 +84,10 @@ test('onboarding keeps its original start schedule after a delayed lazy chunk',
 
   await page.goto('/app', { waitUntil: 'domcontentloaded' });
 
-  await expect.poll(async () => Number(await page.evaluate(() => window.localStorage.getItem('__onboarding-module-evaluated-at') ?? 0)), { timeout: 15_000 }).toBeGreaterThan(0);
-  await expect.poll(async () => Number(await page.evaluate(() => window.localStorage.getItem('__onboarding-tour-started-at') ?? 0)), { timeout: 15_000 }).toBeGreaterThan(0);
-  const moduleEvaluatedAt = await page.evaluate(() => Number(window.localStorage.getItem('__onboarding-module-evaluated-at')));
-  const startedAt = await page.evaluate(() => Number(window.localStorage.getItem('__onboarding-tour-started-at')));
-  expect(startedAt - moduleEvaluatedAt).toBeLessThan(450);
+  await expect.poll(
+    () => page.evaluate(() => Number(window.localStorage.getItem('__onboarding-auto-start-delay') ?? -1)),
+    { timeout: 15_000 },
+  ).toBe(0);
   await expect(page.locator('.react-joyride__tooltip')).toBeVisible({ timeout: 15_000 });
 });
 
diff --git a/e2e/hungarian-parity.spec.ts b/e2e/hungarian-parity.spec.ts
index 66597913d..0043fd241 100644
--- a/e2e/hungarian-parity.spec.ts
+++ b/e2e/hungarian-parity.spec.ts
@@ -140,7 +140,7 @@ test.describe('Hungarian parity', () => {
     await page.getByRole('button', { name: 'Forrás Hozzáadása' }).click();
     await expect(page.getByText('Importálás URL-ből')).toBeVisible();
     await page.getByRole('button', { name: 'Mentés a Könyvtárba' }).click();
-    await expect(page.locator('[toast-close]')).toHaveAttribute('aria-label', 'Bezárás');
+    await expect(page.locator('[data-sonner-toast] [data-close-button]')).toHaveAttribute('aria-label', 'Bezárás');
 
     await page.goto('/app/flowchart', { waitUntil: 'domcontentloaded' });
     await page.getByRole('button', { name: 'Betöltés' }).click();
diff --git a/e2e/navigation-performance.spec.ts b/e2e/navigation-performance.spec.ts
index 718eac900..463874066 100644
--- a/e2e/navigation-performance.spec.ts
+++ b/e2e/navigation-performance.spec.ts
@@ -58,6 +58,7 @@ async function openAppNav(page: Page, label: string) {
 }
 
 test('cold routes expose real content on both browser profiles', async ({ page }) => {
+  test.setTimeout(60_000);
   await setLocale(page, 'en');
   for (const [path, selector] of publicRoutes) {
     await page.goto(path, { waitUntil: 'domcontentloaded' });
@@ -79,6 +80,17 @@ test('cold routes expose real content on both browser profiles', async ({ page }
   await appPage.close();
 });
 
+test('workspaces stay unavailable without a collaboration endpoint', async ({ page }) => {
+  await setLocale(page, 'en');
+  await stubSupabaseSession(page);
+  await page.goto('/app', { waitUntil: 'domcontentloaded' });
+  await waitForContent(page, { selector: 'main h1', text: 'DebateLab' });
+
+  await expect(page.locator('a[href="/app/workspaces"]')).toHaveCount(0);
+  await page.goto('/app/workspaces', { waitUntil: 'domcontentloaded' });
+  await expect(page.getByRole('heading', { name: '404' })).toBeVisible();
+});
+
 test('a delayed public route keeps the main landmark', async ({ page }) => {
   await setLocale(page, 'en');
   let releaseTerms: (() => void) | undefined;
@@ -305,9 +317,13 @@ test('hover intent is limited to fine pointers and click stays in-document', asy
   expect(requestCount()).toBe(0);
 
   await link.hover();
-  await page.waitForTimeout(INTENT_OBSERVATION_MS);
   const supportsHover = await page.evaluate(() => window.matchMedia('(hover: hover) and (pointer: fine)').matches);
-  expect(requestCount()).toBe(supportsHover ? 1 : 0);
+  if (supportsHover) {
+    await expect.poll(requestCount).toBe(1);
+  } else {
+    await page.waitForTimeout(INTENT_OBSERVATION_MS);
+    expect(requestCount()).toBe(0);
+  }
 
   const navigationEntriesBeforeClick = await page.evaluate(() => performance.getEntriesByType('navigation').length);
   await startGenericLoaderObservation(page);
@@ -327,8 +343,7 @@ test('keyboard focus fetches one destination chunk before click', async ({ page
 
   await link.focus();
   await expect(link).toBeFocused();
-  await page.waitForTimeout(INTENT_OBSERVATION_MS);
-  expect(requestCount()).toBe(1);
+  await expect.poll(requestCount).toBe(1);
 
   await startGenericLoaderObservation(page);
   await link.click();
@@ -345,8 +360,7 @@ test('touch intent fetches one destination chunk before click', async ({ page })
   expect(requestCount()).toBe(0);
 
   await link.dispatchEvent('pointerdown', { pointerType: 'touch' });
-  await page.waitForTimeout(INTENT_OBSERVATION_MS);
-  expect(requestCount()).toBe(1);
+  await expect.poll(requestCount).toBe(1);
 
   await startGenericLoaderObservation(page);
   await link.click();
diff --git a/package-lock.json b/package-lock.json
index 09f7c18ba..8095eea51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,6 @@
         "@hocuspocus/provider": "4.7.0",
         "@hocuspocus/server": "4.7.0",
         "@hookform/resolvers": "^3.10.0",
-        "@jam.dev/sdk": "^1.0.1",
         "@radix-ui/react-accordion": "^1.2.11",
         "@radix-ui/react-alert-dialog": "^1.1.14",
         "@radix-ui/react-checkbox": "^1.3.2",
@@ -34,7 +33,6 @@
         "@radix-ui/react-slot": "^1.2.3",
         "@radix-ui/react-switch": "^1.2.5",
         "@radix-ui/react-tabs": "^1.1.12",
-        "@radix-ui/react-toast": "^1.2.14",
         "@radix-ui/react-tooltip": "^1.2.7",
         "@sentry/react": "^10.65.0",
         "@supabase/supabase-js": "^2.49.1",
@@ -54,7 +52,6 @@
         "clsx": "^2.1.1",
         "date-fns": "^3.6.0",
         "docx": "^9.5.1",
-        "file-saver": "^2.0.5",
         "framer-motion": "^12.31.0",
         "html-to-image": "^1.11.13",
         "i18next": "^23.16.8",
@@ -63,7 +60,6 @@
         "lib0": "0.2.117",
         "lucide-react": "^0.462.0",
         "mammoth": "^1.12.0",
-        "next-themes": "^0.3.0",
         "pdfjs-dist": "^6.3.289",
         "pg": "8.23.0",
         "posthog-js": "^1.399.2",
@@ -74,10 +70,9 @@
         "react-joyride": "^2.9.3",
         "react-markdown": "^9.0.1",
         "react-router-dom": "^7.18.3",
-        "react-window": "^2.2.5",
         "reactflow": "^11.11.4",
         "recharts": "^2.15.4",
-        "sonner": "^1.7.4",
+        "sonner": "^2.0.8",
         "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
         "y-protocols": "1.0.7",
@@ -91,7 +86,6 @@
         "@tailwindcss/typography": "^0.5.16",
         "@testing-library/jest-dom": "^6.6.0",
         "@testing-library/react": "^16.0.0",
-        "@types/file-saver": "^2.0.7",
         "@types/node": "^22.16.5",
         "@types/pg": "8.23.1",
         "@types/react": "^18.3.23",
@@ -1229,12 +1223,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@jam.dev/sdk": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@jam.dev/sdk/-/sdk-1.0.1.tgz",
-      "integrity": "sha512-M7KZt079P76BnevBq/z+OaFZGPfA8KVbDSmc9+ARJhPz1t9IeTjrM0cLzbf+07H9IcVizovO65bhdMUWm9EFRQ==",
-      "license": "Apache-2.0"
-    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.13",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
@@ -2408,40 +2396,6 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-toast": {
-      "version": "1.2.23",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.23.tgz",
-      "integrity": "sha512-ofhyAsYaocRGOs/n0XWdUOSVzEAG6BfrMVM8z0c0kLEWY38w/0WuMFPTJP/HVaZPYkMvHZoKIIhNcjbTCBILPg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/primitive": "1.1.7",
-        "@radix-ui/react-collection": "1.1.15",
-        "@radix-ui/react-compose-refs": "1.1.5",
-        "@radix-ui/react-context": "1.2.2",
-        "@radix-ui/react-dismissable-layer": "1.1.19",
-        "@radix-ui/react-portal": "1.1.17",
-        "@radix-ui/react-presence": "1.1.10",
-        "@radix-ui/react-primitive": "2.1.10",
-        "@radix-ui/react-use-callback-ref": "1.1.4",
-        "@radix-ui/react-use-controllable-state": "1.2.6",
-        "@radix-ui/react-use-layout-effect": "1.1.4",
-        "@radix-ui/react-visually-hidden": "1.2.11"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-tooltip": {
       "version": "1.2.16",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.2.16.tgz",
@@ -4714,13 +4668,6 @@
         "@types/estree": "*"
       }
     },
-    "node_modules/@types/file-saver": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz",
-      "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/fs-extra": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
@@ -7202,12 +7149,6 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/file-saver": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
-      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==",
-      "license": "MIT"
-    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -9249,16 +9190,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/next-themes": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.3.0.tgz",
-      "integrity": "sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^16.8 || ^17 || ^18",
-        "react-dom": "^16.8 || ^17 || ^18"
-      }
-    },
     "node_modules/node-releases": {
       "version": "2.0.54",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.54.tgz",
@@ -10641,16 +10572,6 @@
         "react-dom": ">=16.6.0"
       }
     },
-    "node_modules/react-window": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-2.3.0.tgz",
-      "integrity": "sha512-FW6TIpaOH646k51X7yE+LSCWGkt5Pfsnc1fVyq/sCI9h0pTqmMiBXM04pzFKg3Bt7NGkeV6kqbU8d/QjmFS7Ug==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^18.0.0 || ^19.0.0",
-        "react-dom": "^18.0.0 || ^19.0.0"
-      }
-    },
     "node_modules/reactflow": {
       "version": "11.11.4",
       "resolved": "https://registry.npmjs.org/reactflow/-/reactflow-11.11.4.tgz",
@@ -11115,13 +11036,19 @@
       }
     },
     "node_modules/sonner": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz",
-      "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/sonner/-/sonner-2.0.8.tgz",
+      "integrity": "sha512-UM/ByIoFra8yzV75n1o0Puu0bw5U/9UNnDacrJNspekBewIfsQ3D6ez1nvlWpt7aTsO6rujQtifBpycwIivqlg==",
       "license": "MIT",
       "peerDependencies": {
+        "@types/react": "^18.0.0 || ^19.0.0",
         "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
         "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
     "node_modules/source-map": {
diff --git a/package.json b/package.json
index bdda8f8ed..4c8a8fd2c 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "@hocuspocus/provider": "4.7.0",
     "@hocuspocus/server": "4.7.0",
     "@hookform/resolvers": "^3.10.0",
-    "@jam.dev/sdk": "^1.0.1",
     "@radix-ui/react-accordion": "^1.2.11",
     "@radix-ui/react-alert-dialog": "^1.1.14",
     "@radix-ui/react-checkbox": "^1.3.2",
@@ -56,7 +55,6 @@
     "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-switch": "^1.2.5",
     "@radix-ui/react-tabs": "^1.1.12",
-    "@radix-ui/react-toast": "^1.2.14",
     "@radix-ui/react-tooltip": "^1.2.7",
     "@sentry/react": "^10.65.0",
     "@supabase/supabase-js": "^2.49.1",
@@ -76,7 +74,6 @@
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",
     "docx": "^9.5.1",
-    "file-saver": "^2.0.5",
     "framer-motion": "^12.31.0",
     "html-to-image": "^1.11.13",
     "i18next": "^23.16.8",
@@ -85,7 +82,6 @@
     "lib0": "0.2.117",
     "lucide-react": "^0.462.0",
     "mammoth": "^1.12.0",
-    "next-themes": "^0.3.0",
     "pdfjs-dist": "^6.3.289",
     "pg": "8.23.0",
     "posthog-js": "^1.399.2",
@@ -96,10 +92,9 @@
     "react-joyride": "^2.9.3",
     "react-markdown": "^9.0.1",
     "react-router-dom": "^7.18.3",
-    "react-window": "^2.2.5",
     "reactflow": "^11.11.4",
     "recharts": "^2.15.4",
-    "sonner": "^1.7.4",
+    "sonner": "^2.0.8",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
     "y-protocols": "1.0.7",
@@ -113,7 +108,6 @@
     "@tailwindcss/typography": "^0.5.16",
     "@testing-library/jest-dom": "^6.6.0",
     "@testing-library/react": "^16.0.0",
-    "@types/file-saver": "^2.0.7",
     "@types/node": "^22.16.5",
     "@types/pg": "8.23.1",
     "@types/react": "^18.3.23",
diff --git a/plans/model-cost-accounting.md b/plans/model-cost-accounting.md
index 0233040fd..bd2034866 100644
--- a/plans/model-cost-accounting.md
+++ b/plans/model-cost-accounting.md
@@ -6,6 +6,15 @@
 
 **Goal:** Finish the operational accounting cleanup so stored model costs stay auditable, incomplete provider work is not billed as complete, and admin totals distinguish unknown cost from non-AI activity.
 
+> **Superseded in part (2026-09-21).** The app routes every request through
+> OpenRouter, which reports the authoritative account charge per response, so
+> the direct-provider pricing table (`_shared/model-pricing.ts`), its refresh
+> script (`scripts/update-model-pricing.ts`), the `tsx` dev dependency, and the
+> per-provider usage normalizers were unreachable and have been removed.
+> `docs/pricing-snapshots/` is kept as historical evidence. The remaining goals
+> below — incomplete work staying unpriced, and admin totals distinguishing
+> unknown cost from non-AI activity — are unaffected.
+
 ## Preconditions
 
 Work in a new isolated T3 Code worktree with a dedicated feature branch owned by this plan. Before reading for implementation or editing, run `pwd`, `git branch --show-current`, `git status --short --branch`, and `git worktree list --porcelain`. Stop if the current directory is the main checkout, the branch is `main`, the worktree is dirty with another task's changes, or an existing plan worktree is being reused. Keep this plan's branch and PR independent of every other plan.
diff --git a/public/favicon copy.ico b/public/favicon copy.ico
deleted file mode 100644
index 984154c14..000000000
Binary files a/public/favicon copy.ico and /dev/null differ
diff --git a/public/favicon copy.jpeg b/public/favicon copy.jpeg
deleted file mode 100644
index 322e4c02a..000000000
Binary files a/public/favicon copy.jpeg and /dev/null differ
diff --git a/public/favicon copy.png b/public/favicon copy.png
deleted file mode 100644
index 79e228836..000000000
Binary files a/public/favicon copy.png and /dev/null differ
diff --git a/scripts/measure-navigation-performance.mjs b/scripts/measure-navigation-performance.mjs
deleted file mode 100644
index f88a4e283..000000000
--- a/scripts/measure-navigation-performance.mjs
+++ /dev/null
@@ -1,866 +0,0 @@
-import { createRequire } from 'node:module';
-import { execFileSync, spawn, spawnSync } from 'node:child_process';
-import { createWriteStream } from 'node:fs';
-import { createServer } from 'node:net';
-import { gzipSync } from 'node:zlib';
-import {
-  copyFile,
-  mkdtemp,
-  mkdir,
-  readFile,
-  readdir,
-  rm,
-  stat,
-  writeFile,
-} from 'node:fs/promises';
-import { existsSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join, relative, resolve } from 'node:path';
-import { chromium, devices } from '@playwright/test';
-
-const require = createRequire(import.meta.url);
-const ROOT = process.cwd();
-const OUTPUT_DIR = resolve(ROOT, process.env.PERFORMANCE_OUTPUT_DIR || 'docs/performance/smooth-navigation-baseline');
-const DIST_DIR = resolve(ROOT, 'dist');
-const RUN_LABEL = process.env.BASELINE_RUN || `run-${new Date().toISOString().replaceAll(':', '-')}`;
-const DELAY_MS = 750;
-const SERVER_TIMEOUT_MS = 45_000;
-const CONTENT_TIMEOUT_MS = Number(process.env.PERFORMANCE_CONTENT_TIMEOUT_MS || 90_000);
-
-const ROUTES = [
-  { path: '/', marker: { selector: 'h1', text: 'Prep Faster' }, module: 'LandingPage' },
-  { path: '/login', marker: { selector: 'button', text: 'Continue with Google' }, module: 'LoginPage' },
-  { path: '/app', marker: { selector: 'main h1', text: 'DebateLab' }, module: 'HomePage', authenticated: true },
-  { path: '/app/generate', marker: { selector: 'main h1', text: 'Generate' }, module: 'GeneratePage', authenticated: true },
-  { path: '/app/attack', marker: { selector: 'main h1', text: 'Attack' }, module: 'AttackPage', authenticated: true },
-  { path: '/app/flowchart', marker: { selector: 'main h3', text: 'Argument Flowchart' }, module: 'FlowchartPage', authenticated: true },
-  { path: '/app/history', marker: { selector: 'main h1', text: 'History' }, module: 'HistoryPage', authenticated: true },
-  { path: '/app/admin', marker: { selector: 'main h1, main h2, main h3', text: 'Admin Dashboard|Access Denied' }, module: 'AdminPage', authenticated: true },
-];
-
-const TRANSITIONS = [
-  { from: '/', to: '/app', label: 'Landing CTA -> /app', module: 'HomePage', authenticated: true },
-  { from: '/app', to: '/app/generate', label: 'Home -> Generate', module: 'GeneratePage', authenticated: true },
-  { from: '/app/generate', to: '/app/attack', label: 'Generate -> Attack', module: 'AttackPage', authenticated: true },
-  { from: '/app', to: '/app/flowchart', label: 'Home -> Flowchart', module: 'FlowchartPage', authenticated: true },
-  { from: '/app', to: '/app/history', label: 'Home -> History', module: 'HistoryPage', authenticated: true },
-];
-
-const PROFILES = [
-  {
-    name: 'desktop',
-    viewport: { width: 1280, height: 800 },
-    device: { viewport: { width: 1280, height: 800 }, deviceScaleFactor: 1 },
-    networkProfile: 'unthrottled loopback',
-    cpuProfile: 'Chromium default CPU, no emulation',
-  },
-  {
-    name: 'pixel-5',
-    device: devices['Pixel 5'],
-    networkProfile: 'unthrottled loopback',
-    cpuProfile: 'Chromium default CPU, no emulation',
-  },
-];
-
-function git(command) {
-  return execFileSync('git', command, { cwd: ROOT, encoding: 'utf8' }).trim();
-}
-
-function sleep(ms) {
-  return new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
-}
-
-async function freePort() {
-  const server = createServer();
-  await new Promise((resolvePromise, reject) => {
-    server.once('error', reject);
-    server.listen(0, '127.0.0.1', resolvePromise);
-  });
-  const address = server.address();
-  const port = typeof address === 'object' && address ? address.port : 0;
-  await new Promise((resolvePromise) => server.close(resolvePromise));
-  if (!port) throw new Error('Could not allocate a free loopback port.');
-  return port;
-}
-
-async function waitForServer(url) {
-  const started = Date.now();
-  while (Date.now() - started < SERVER_TIMEOUT_MS) {
-    try {
-      const response = await fetch(url, { signal: AbortSignal.timeout(2_000) });
-      if (response.ok) return;
-    } catch {
-      // The Vite process is still starting.
-    }
-    await sleep(150);
-  }
-  throw new Error(`Vite did not answer ${url} within ${SERVER_TIMEOUT_MS}ms.`);
-}
-
-async function startServer(port) {
-  const logDir = await mkdtemp(join(tmpdir(), 'debatelab-vite-'));
-  const stdoutPath = join(logDir, 'stdout.log');
-  const stderrPath = join(logDir, 'stderr.log');
-  const child = spawn('npm', ['run', 'dev', '--', '--host', '127.0.0.1', '--port', String(port)], {
-    cwd: ROOT,
-    env: { ...process.env, FORCE_COLOR: '0', PORT: String(port) },
-    detached: true,
-    stdio: ['ignore', 'pipe', 'pipe'],
-  });
-  child.stdout.pipe(createWriteStream(stdoutPath));
-  child.stderr.pipe(createWriteStream(stderrPath));
-  const baseURL = `http://127.0.0.1:${port}`;
-  try {
-    await waitForServer(baseURL);
-  } catch (error) {
-    await stopServer(child);
-    throw new Error(`${error.message}\n${await readFile(stderrPath, 'utf8')}`);
-  }
-  return { child, baseURL, logDir };
-}
-
-async function stopServer(child) {
-  const signalGroup = (signal) => {
-    if (!child.pid) return;
-    try {
-      process.kill(-child.pid, signal);
-    } catch (error) {
-      if (error.code !== 'ESRCH') throw error;
-    }
-  };
-  if (child.exitCode !== null) {
-    signalGroup('SIGTERM');
-    return;
-  }
-  signalGroup('SIGTERM');
-  await Promise.race([
-    new Promise((resolvePromise) => child.once('exit', resolvePromise)),
-    sleep(5_000).then(() => signalGroup('SIGKILL')),
-  ]);
-  signalGroup('SIGKILL');
-}
-
-async function cleanupResources({ browser, server, stopServerFn = stopServer, removeLogDirectory = rm }) {
-  const errors = [];
-  if (browser) {
-    try {
-      await browser.close();
-    } catch (error) {
-      errors.push(new Error(`browser.close failed: ${error instanceof Error ? error.message : String(error)}`));
-    }
-  }
-  if (server?.child) {
-    try {
-      await stopServerFn(server.child);
-    } catch (error) {
-      errors.push(new Error(`Vite cleanup failed: ${error instanceof Error ? error.message : String(error)}`));
-    }
-  }
-  if (server?.logDir) {
-    try {
-      await removeLogDirectory(server.logDir, { recursive: true, force: true });
-    } catch (error) {
-      errors.push(new Error(`Vite log cleanup failed: ${error instanceof Error ? error.message : String(error)}`));
-    }
-  }
-  return errors.length ? new AggregateError(errors, 'Resource cleanup failed.') : null;
-}
-
-function authSession() {
-  const expiresAt = Math.floor(Date.now() / 1000) + 3_600;
-  return {
-    access_token: 'stub-access',
-    refresh_token: 'stub-refresh',
-    expires_in: 3_600,
-    expires_at: expiresAt,
-    token_type: 'bearer',
-    user: {
-      id: '00000000-0000-0000-0000-000000000001',
-      aud: 'authenticated',
-      role: 'authenticated',
-      email: 'e2e@example.com',
-      app_metadata: { provider: 'google' },
-      user_metadata: { full_name: 'E2E Tester' },
-      created_at: new Date().toISOString(),
-    },
-  };
-}
-
-const INIT_INSTRUMENTATION = ({ markers }) => {
-  const baseline = {
-    initial: {
-      target: window.location.pathname,
-      firstSkeletonFrame: null,
-      firstRealContentFrame: null,
-    },
-    transition: null,
-    longTasks: [],
-    layoutShifts: [],
-    eventTimings: [],
-  };
-
-  const visible = (element) => {
-    if (!element) return false;
-    const style = window.getComputedStyle(element);
-    const rect = element.getBoundingClientRect();
-    return style.display !== 'none' && style.visibility !== 'hidden' && rect.width > 0 && rect.height > 0;
-  };
-
-  const realContent = (path) => {
-    const marker = markers[path] || { selector: 'main h1, main h2, main h3', text: '' };
-    const element = document.querySelector(marker.selector);
-    return visible(element) && (!marker.text || marker.text.split('|').some((text) => element.textContent?.includes(text)));
-  };
-  const skeleton = () => visible(document.querySelector('[data-route-skeleton]'));
-
-  const normalizePath = (value) => {
-    const path = value.replace(/\/+$/, '');
-    return path || '/';
-  };
-
-  document.addEventListener('click', (event) => {
-    if (!baseline.transition || baseline.transition.clickTime !== null) return;
-    const element = event.target instanceof Element ? event.target.closest('a[href]') : null;
-    if (!element) return;
-    const destination = new URL(element.href, window.location.href);
-    if (normalizePath(destination.pathname) !== normalizePath(baseline.transition.target)) return;
-    const clickTime = performance.now();
-    baseline.transition.clickTime = clickTime;
-  }, true);
-
-  const sample = () => {
-    const now = performance.now();
-    const path = window.location.pathname;
-    if (path === baseline.initial.target) {
-      if (baseline.initial.firstSkeletonFrame === null && skeleton()) baseline.initial.firstSkeletonFrame = now;
-      if (baseline.initial.firstRealContentFrame === null && realContent(path)) baseline.initial.firstRealContentFrame = now;
-    }
-    if (baseline.transition?.target === path) {
-      if (baseline.transition.firstSkeletonFrame === null && skeleton()) baseline.transition.firstSkeletonFrame = now;
-      if (baseline.transition.firstRealContentFrame === null && realContent(path)) baseline.transition.firstRealContentFrame = now;
-    }
-    window.requestAnimationFrame(sample);
-  };
-
-  if (PerformanceObserver.supportedEntryTypes.includes('longtask')) {
-    new PerformanceObserver((list) => {
-      for (const entry of list.getEntries()) baseline.longTasks.push({ startTime: entry.startTime, duration: entry.duration });
-    }).observe({ type: 'longtask', buffered: true });
-  }
-  if (PerformanceObserver.supportedEntryTypes.includes('layout-shift')) {
-    new PerformanceObserver((list) => {
-      for (const entry of list.getEntries()) {
-        if (!entry.hadRecentInput) baseline.layoutShifts.push({ startTime: entry.startTime, value: entry.value });
-      }
-    }).observe({ type: 'layout-shift', buffered: true });
-  }
-  if (PerformanceObserver.supportedEntryTypes.includes('event')) {
-    new PerformanceObserver((list) => {
-      for (const entry of list.getEntries()) {
-        baseline.eventTimings.push({
-          name: entry.name,
-          startTime: entry.startTime,
-          duration: entry.duration,
-          interactionId: entry.interactionId,
-        });
-      }
-    }).observe({ type: 'event', buffered: true, durationThreshold: 16 });
-  }
-
-  window.__navigationBaseline = {
-    startTransition(target) {
-      const resourceBoundary = performance.now();
-      baseline.transition = {
-        target,
-        clickTime: null,
-        resourceBoundary,
-        firstSkeletonFrame: null,
-        firstRealContentFrame: null,
-        shellBefore: document.querySelector('header'),
-      };
-    },
-    snapshot() {
-      return {
-        initial: baseline.initial,
-        transition: baseline.transition ? {
-          target: baseline.transition.target,
-          clickTime: baseline.transition.clickTime,
-          resourceBoundary: baseline.transition.resourceBoundary,
-          firstSkeletonFrame: baseline.transition.firstSkeletonFrame,
-          firstRealContentFrame: baseline.transition.firstRealContentFrame,
-          shellDomIdentitySurvived: baseline.transition.shellBefore
-            ? document.querySelector('header') === baseline.transition.shellBefore
-            : null,
-        } : null,
-        longTasks: baseline.longTasks,
-        layoutShifts: baseline.layoutShifts,
-        eventTimings: baseline.eventTimings,
-      };
-    },
-  };
-  sample();
-};
-
-async function createContext(browser, profile, { authenticated = false, cacheDisabled = false, videoDir, baseURL } = {}) {
-  const context = await browser.newContext({
-    ...profile.device,
-    serviceWorkers: 'block',
-    ...(videoDir ? { recordVideo: { dir: videoDir, size: profile.device.viewport } } : {}),
-  });
-  const markerMap = Object.fromEntries(ROUTES.map(({ path, marker }) => [path, marker]));
-  await context.addInitScript(INIT_INSTRUMENTATION, { markers: markerMap });
-  await context.addInitScript((locale) => {
-    window.localStorage.setItem('debate-trainer-settings', JSON.stringify({
-      state: { language: locale, outputLanguage: locale, theme: 'system' },
-      version: 0,
-    }));
-  }, 'en');
-  if (authenticated) {
-    await context.addInitScript((session) => {
-      window.localStorage.setItem('debate-auth-production', JSON.stringify(session));
-      window.localStorage.setItem('debate-trainer-onboarding', JSON.stringify({
-        state: { hasCompletedOnboarding: true, isTourRunning: false },
-        version: 0,
-      }));
-    }, authSession());
-  }
-  const page = await context.newPage();
-  const origin = new URL(baseURL).origin;
-  await page.route('**/*', (route) => {
-    const url = new URL(route.request().url());
-    if (url.origin !== origin && url.protocol !== 'data:') return route.abort();
-    return route.continue();
-  });
-  const client = await context.newCDPSession(page);
-  await client.send('Performance.enable');
-  if (cacheDisabled) {
-    await client.send('Network.enable');
-    await client.send('Network.setCacheDisabled', { cacheDisabled: true });
-  }
-  return { context, page, client };
-}
-
-async function readMainThreadMetrics(client) {
-  const { metrics } = await client.send('Performance.getMetrics');
-  const values = Object.fromEntries(metrics.map(({ name, value }) => [name, value * 1_000]));
-  return {
-    scriptDurationMs: values.ScriptDuration ?? 0,
-    taskDurationMs: values.TaskDuration ?? 0,
-    layoutDurationMs: values.LayoutDuration ?? 0,
-    recalcStyleDurationMs: values.RecalcStyleDuration ?? 0,
-  };
-}
-
-function metricDelta(after, before) {
-  return Object.fromEntries(Object.keys(after).map((key) => [key, Math.max(0, after[key] - before[key])]));
-}
-
-async function waitForContent(page, path) {
-  const route = ROUTES.find((item) => item.path === path);
-  if (!route) throw new Error(`No route definition for ${path}.`);
-  await page.waitForFunction((marker) => {
-    const element = document.querySelector(marker.selector);
-    if (!element) return false;
-    const rect = element.getBoundingClientRect();
-    const style = getComputedStyle(element);
-    return rect.width > 0 && rect.height > 0 && style.visibility !== 'hidden' && style.display !== 'none'
-      && marker.text.split('|').some((text) => element.textContent?.includes(text));
-  }, route.marker, { timeout: CONTENT_TIMEOUT_MS });
-}
-
-function routeChunkPattern(module) {
-  return new RegExp(`/src/pages/${module}\\.tsx(?:[?#]|$)`, 'i');
-}
-
-async function collectMetrics(page, { path, kind, profile, cacheState, routeModule, label }) {
-  const metricsHandle = await page.waitForFunction(({ target, chunkPattern }) => {
-    const resources = performance.getEntriesByType('resource').map((entry) => ({
-      name: entry.name,
-      sameOrigin: new URL(entry.name, location.href).origin === location.origin,
-      startTime: entry.startTime,
-      duration: entry.duration,
-      responseEnd: entry.responseEnd,
-      transferSize: entry.transferSize,
-      encodedBodySize: entry.encodedBodySize,
-      decodedBodySize: entry.decodedBodySize,
-    }));
-    const navigation = performance.getEntriesByType('navigation')[0];
-    const state = window.__navigationBaseline?.snapshot() || {
-      initial: { firstSkeletonFrame: null, firstRealContentFrame: null },
-      transition: null,
-      longTasks: [],
-      layoutShifts: [],
-      eventTimings: [],
-    };
-    const transition = state.transition;
-    const boundary = transition?.resourceBoundary ?? null;
-    const measuredResources = boundary === null
-      ? resources
-      : resources.filter((entry) => entry.startTime >= boundary);
-    const sameOriginResources = measuredResources.filter((entry) => entry.sameOrigin);
-    const backgroundResources = boundary === null ? [] : sameOriginResources.filter((entry) =>
-      entry.name.includes('/node_modules/.vite/deps/@vercel_analytics_react.js')
-      || entry.name.includes('/node_modules/.vite/deps/@vercel_speed-insights_react.js')
-    );
-    const appResources = sameOriginResources.filter((entry) => !backgroundResources.includes(entry));
-    const measuredLongTasks = boundary === null
-      ? state.longTasks
-      : state.longTasks.filter((entry) => entry.startTime >= boundary);
-    const measuredLayoutShifts = boundary === null
-      ? state.layoutShifts
-      : state.layoutShifts.filter((entry) => entry.startTime >= boundary);
-    const measuredEventTimings = boundary === null
-      ? state.eventTimings
-      : state.eventTimings.filter((entry) => entry.startTime >= boundary);
-    const routeChunks = appResources.filter((entry) => new RegExp(chunkPattern, 'i').test(entry.name));
-    const routeCodeReadyAt = routeChunks.length ? Math.max(...routeChunks.map((entry) => entry.responseEnd)) : null;
-    const realContentAt = transition?.firstRealContentFrame ?? state.initial.firstRealContentFrame;
-    const relative = (value, start) => value === null || start === null ? null : Math.max(0, value - start);
-    return {
-      path: target,
-      clickTime: transition?.clickTime ?? null,
-      measurementBoundary: boundary,
-      firstSkeletonFrameMs: transition
-        ? relative(transition.firstSkeletonFrame, transition.clickTime)
-        : state.initial.firstSkeletonFrame,
-      firstRealContentFrameMs: transition
-        ? relative(transition.firstRealContentFrame, transition.clickTime)
-        : state.initial.firstRealContentFrame,
-      routeChunkRequests: routeChunks.map((entry) => ({
-        url: entry.name,
-        startTime: entry.startTime,
-        endTime: entry.responseEnd,
-        duration: entry.duration,
-        transferSize: entry.transferSize,
-        decodedBodySize: entry.decodedBodySize,
-      })),
-      postChunkRenderMs: routeCodeReadyAt === null || realContentAt === null
-        ? null
-        : Math.max(0, realContentAt - routeCodeReadyAt),
-      longTasks: measuredLongTasks,
-      postChunkLongTasks: routeCodeReadyAt === null
-        ? []
-        : measuredLongTasks.filter((entry) => entry.startTime >= routeCodeReadyAt),
-      controlledInteractionDurationMs: measuredEventTimings
-        .filter((entry) => entry.interactionId > 0)
-        .reduce((maximum, entry) => Math.max(maximum, entry.duration), 0),
-      eventTimings: measuredEventTimings,
-      cls: measuredLayoutShifts.reduce((sum, entry) => sum + entry.value, 0),
-      layoutShifts: measuredLayoutShifts,
-      requestCount: appResources.length,
-      browserRequestCount: measuredResources.length,
-      externalRequestCount: measuredResources.length - sameOriginResources.length,
-      backgroundRequestCount: backgroundResources.length,
-      backgroundResources,
-      transferredBytes: appResources.reduce((sum, entry) => sum + (entry.transferSize || 0), 0),
-      encodedBytes: appResources.reduce((sum, entry) => sum + (entry.encodedBodySize || 0), 0),
-      decodedBytes: appResources.reduce((sum, entry) => sum + (entry.decodedBodySize || 0), 0),
-      resources: appResources,
-      sourceWorkExcluded: boundary === null ? null : {
-        requestCount: resources.filter((entry) => entry.sameOrigin && entry.startTime < boundary).length,
-        longTaskCount: state.longTasks.length - measuredLongTasks.length,
-        layoutShiftCount: state.layoutShifts.length - measuredLayoutShifts.length,
-      },
-      navigationTiming: navigation ? {
-        domContentLoaded: navigation.domContentLoadedEventEnd,
-        loadEventEnd: navigation.loadEventEnd,
-        responseEnd: navigation.responseEnd,
-      } : null,
-      shellDomIdentitySurvived: transition?.shellDomIdentitySurvived ?? null,
-    };
-  }, { target: path, chunkPattern: routeChunkPattern(routeModule).source }, { timeout: CONTENT_TIMEOUT_MS, polling: 'raf' });
-  const metrics = await metricsHandle.jsonValue();
-  return {
-    ...metrics,
-    kind,
-    label,
-    profile,
-    cacheState,
-    routeModule,
-  };
-}
-
-async function gotoAndMeasure(page, path, options) {
-  await page.goto(`${options.baseURL}${path}`, { waitUntil: 'commit', timeout: CONTENT_TIMEOUT_MS });
-  await waitForContent(page, path);
-  await sleep(150);
-  return collectMetrics(page, { ...options, path });
-}
-
-async function measureColdRoute(browser, profile, route, baseURL) {
-  const { context, page, client } = await createContext(browser, profile, {
-    authenticated: route.authenticated,
-    cacheDisabled: true,
-    baseURL,
-  });
-  try {
-    const before = await readMainThreadMetrics(client);
-    const metrics = await gotoAndMeasure(page, route.path, {
-      baseURL,
-      kind: 'cold-refresh',
-      profile: profile.name,
-      cacheState: 'new context, HTTP cache disabled, service workers blocked',
-      routeModule: route.module,
-      label: `Cold ${route.path}`,
-    });
-    return { ...metrics, mainThread: metricDelta(await readMainThreadMetrics(client), before) };
-  } finally {
-    await context.close();
-  }
-}
-
-async function clickRoute(page, from, to) {
-  if (from === '/' && to === '/app') {
-    await page.getByRole('link', { name: 'Start Trial' }).first().click();
-    return;
-  }
-  if (to === '/app') {
-    await page.locator('header a[href="/app"]').first().click();
-    return;
-  }
-  if (from === '/app') {
-    const homeLink = page.locator(`main a[href="${to}"]`).first();
-    if (await homeLink.count()) {
-      await homeLink.click();
-      return;
-    }
-  }
-  const label = to.split('/').pop().replace(/^[a-z]/, (letter) => letter.toUpperCase());
-  if ((page.viewportSize()?.width ?? 1280) < 1024) {
-    await page.getByRole('button', { name: 'Open menu' }).click();
-    await page.getByRole('navigation', { name: 'Mobile navigation' }).getByRole('link', { name: new RegExp(`^${label}`) }).click();
-    return;
-  }
-  if (['Flowchart', 'History'].includes(label)) {
-    await page.locator('summary[aria-label="More"]').click();
-    await page.locator('details').getByRole('link', { name: label }).click();
-    return;
-  }
-  await page.getByRole('navigation', { name: 'Main navigation' }).getByRole('link', { name: label }).click();
-}
-
-async function clickDestination(page, transition, { measure = true } = {}) {
-  if (measure) await page.evaluate((target) => window.__navigationBaseline?.startTransition(target), transition.to);
-  await clickRoute(page, transition.from, transition.to);
-  await page.waitForFunction((target) => window.location.pathname === target, transition.to, { timeout: CONTENT_TIMEOUT_MS });
-  await waitForContent(page, transition.to);
-  if (measure) {
-    await page.waitForFunction(() => window.__navigationBaseline?.snapshot().clickTime !== null, undefined, { timeout: CONTENT_TIMEOUT_MS });
-  }
-  await page.waitForLoadState('domcontentloaded', { timeout: CONTENT_TIMEOUT_MS }).catch(() => undefined);
-  await sleep(150);
-}
-
-async function measureTransition(browser, profile, transition, baseURL, warm) {
-  const { context, page, client } = await createContext(browser, profile, { authenticated: transition.authenticated, baseURL });
-  try {
-    await page.goto(`${baseURL}${transition.from}`, { waitUntil: 'commit', timeout: CONTENT_TIMEOUT_MS });
-    await waitForContent(page, transition.from);
-    let warmCacheProof = null;
-    if (warm) {
-      await clickDestination(page, transition, { measure: false });
-      warmCacheProof = await page.evaluate((module) => {
-        const entry = performance.getEntriesByType('resource')
-          .filter((resource) => new RegExp(`/src/pages/${module}\\.tsx(?:[?#]|$)`, 'i').test(resource.name))
-          .at(-1);
-        return entry ? {
-          url: entry.name,
-          startTime: entry.startTime,
-          responseEnd: entry.responseEnd,
-          transferSize: entry.transferSize,
-          encodedBodySize: entry.encodedBodySize,
-          decodedBodySize: entry.decodedBodySize,
-        } : null;
-      }, transition.module);
-      if (transition.from === '/') {
-        await page.goBack({ waitUntil: 'commit', timeout: CONTENT_TIMEOUT_MS }).catch(() => undefined);
-      } else {
-        await clickRoute(page, transition.to, transition.from);
-      }
-      await page.waitForFunction((target) => window.location.pathname === target, transition.from, { timeout: CONTENT_TIMEOUT_MS });
-      await waitForContent(page, transition.from);
-    }
-    const before = await readMainThreadMetrics(client);
-    await clickDestination(page, transition);
-    const metrics = await collectMetrics(page, {
-      path: transition.to,
-      kind: warm ? 'warm-click' : 'first-visit-click',
-      profile: profile.name,
-      cacheState: warm ? 'same-document destination visit, same-document return, module cache warm' : 'new context, browser cache empty',
-      routeModule: transition.module,
-      label: transition.label,
-    });
-    const measured = { ...metrics, mainThread: metricDelta(await readMainThreadMetrics(client), before) };
-    return warm ? {
-      ...measured,
-      warmCacheProof: {
-        sameDocumentNavigation: true,
-        destinationWarmRequest: warmCacheProof,
-        measuredDestinationRequestCount: measured.routeChunkRequests.length,
-        semantics: measured.routeChunkRequests.length === 0
-          ? 'destination module remained resolved across same-document return; measured click issued no destination request'
-          : 'destination request remained observable after same-document warm visit',
-      },
-    } : measured;
-  } finally {
-    await context.close();
-  }
-}
-
-async function captureDelayedTransition(browser, profile, baseURL, outputDir) {
-  const tempRoot = await mkdtemp(join(tmpdir(), `debatelab-delay-${profile.name}-`));
-  const frameDir = join(tempRoot, 'frames');
-  const videoDir = join(tempRoot, 'video');
-  await mkdir(frameDir, { recursive: true });
-  await mkdir(videoDir, { recursive: true });
-  const { context, page, client } = await createContext(browser, profile, {
-    authenticated: true,
-    cacheDisabled: true,
-    videoDir,
-    baseURL,
-  });
-  let requestedAt = null;
-  await page.route('**/src/pages/AttackPage.tsx*', async (route) => {
-    requestedAt = Date.now();
-    await sleep(DELAY_MS);
-    await route.continue();
-  });
-  const transition = { from: '/app/generate', to: '/app/attack', module: 'AttackPage', label: 'Delayed Generate -> Attack' };
-  const frameStates = [];
-  let metrics;
-  try {
-    await page.goto(`${baseURL}${transition.from}`, { waitUntil: 'commit', timeout: CONTENT_TIMEOUT_MS });
-    await waitForContent(page, transition.from);
-    const before = await readMainThreadMetrics(client);
-    const clickPromise = clickDestination(page, transition);
-    for (let index = 0; index < 8; index += 1) {
-      await sleep(index === 0 ? 50 : 100);
-      frameStates.push(await page.evaluate(() => ({
-        route: window.location.pathname,
-        fallbackVisible: Boolean(document.querySelector('[data-route-skeleton]')),
-        shellVisible: Boolean(document.querySelector('header')),
-      })));
-      await page.screenshot({ path: join(frameDir, `frame-${String(index).padStart(2, '0')}.png`) });
-    }
-    await clickPromise;
-    await page.waitForFunction((target) => window.location.pathname === target, transition.to, { timeout: CONTENT_TIMEOUT_MS });
-    await waitForContent(page, transition.to);
-    await sleep(150);
-    metrics = await collectMetrics(page, {
-      path: transition.to,
-      kind: 'delayed-click',
-      profile: profile.name,
-      cacheState: 'new context, HTTP cache disabled, service workers blocked',
-      routeModule: transition.module,
-      label: transition.label,
-    });
-    metrics.mainThread = metricDelta(await readMainThreadMetrics(client), before);
-    metrics.delayMs = DELAY_MS;
-    metrics.delayRequestObserved = requestedAt !== null;
-    metrics.frameStates = frameStates;
-  } finally {
-    await context.close();
-  }
-  const videos = (await readdir(videoDir)).filter((file) => file.endsWith('.webm'));
-  if (videos.length !== 1) throw new Error(`Expected one ${profile.name} video, found ${videos.length}.`);
-  const videoPath = join(outputDir, `${profile.name}-delayed.webm`);
-  const filmstripPath = join(outputDir, `${profile.name}-delayed-filmstrip.png`);
-  await copyFile(join(videoDir, videos[0]), videoPath);
-  const ffmpeg = spawnSync('ffmpeg', [
-    '-hide_banner', '-loglevel', 'error', '-y',
-    '-pattern_type', 'glob', '-i', join(frameDir, 'frame-*.png'),
-    '-vf', 'scale=320:200:force_original_aspect_ratio=decrease,pad=320:200:(ow-iw)/2:(oh-ih)/2:black,tile=4x2:padding=8:margin=8',
-    '-frames:v', '1', filmstripPath,
-  ], { encoding: 'utf8' });
-  if (ffmpeg.status !== 0) throw new Error(`ffmpeg filmstrip failed: ${ffmpeg.stderr}`);
-  await rm(tempRoot, { recursive: true, force: true });
-  if (!metrics) throw new Error(`Delayed ${profile.name} run produced no metrics.`);
-  return { ...metrics, video: relative(ROOT, videoPath), filmstrip: relative(ROOT, filmstripPath) };
-}
-
-function normalizeModule(moduleId) {
-  const absoluteRoot = `${ROOT}/`;
-  return moduleId.startsWith(absoluteRoot) ? moduleId.slice(absoluteRoot.length) : moduleId;
-}
-
-async function captureBundleGraph() {
-  const manifestPath = join(DIST_DIR, '.vite/manifest.json');
-  const graphPath = join(DIST_DIR, '.vite/bundle-graph.json');
-  if (!existsSync(manifestPath) || !existsSync(graphPath)) {
-    throw new Error('dist/.vite/manifest.json and bundle-graph.json are required. Run npm run build first.');
-  }
-  const manifest = JSON.parse(await readFile(manifestPath, 'utf8'));
-  const graph = JSON.parse(await readFile(graphPath, 'utf8'));
-  const routeEntries = ROUTES.map((route) => {
-    const key = route.path === '/' ? 'src/pages/LandingPage.tsx' : `src/pages/${route.module}.tsx`;
-    const entry = manifest[key];
-    if (!entry) throw new Error(`Manifest is missing ${key}.`);
-    return { route: route.path, module: key, ...entry };
-  });
-  const entryKey = Object.keys(manifest).find((key) => manifest[key].isEntry && manifest[key].src === 'index.html');
-  if (!entryKey) throw new Error('Manifest is missing the index.html entry.');
-  routeEntries.unshift({ route: 'index.html', module: entryKey, ...manifest[entryKey] });
-
-  const staticGraph = (file) => {
-    const result = new Set();
-    const pending = [file];
-    while (pending.length) {
-      const current = pending.pop();
-      if (!current || result.has(current)) continue;
-      result.add(current);
-      pending.push(...(graph[current]?.imports || []));
-    }
-    return result;
-  };
-  const membership = new Map();
-  for (const entry of routeEntries) {
-    for (const file of staticGraph(entry.file)) {
-      if (!membership.has(file)) membership.set(file, []);
-      membership.get(file).push(entry.route);
-    }
-  }
-  const chunks = [];
-  for (const [file, item] of Object.entries(graph)) {
-    const filePath = join(DIST_DIR, file);
-    const bytes = (await stat(filePath)).size;
-    chunks.push({
-      file,
-      bytes,
-      gzipBytes: gzipSync(await readFile(filePath)).length,
-      imports: item.imports,
-      modules: item.modules.map(normalizeModule),
-      staticMembership: membership.get(file) || [],
-      dynamicEntry: Object.entries(manifest).find(([, value]) => value.file === file)?.[0] || null,
-    });
-  }
-  return {
-    manifestEntries: Object.entries(manifest).map(([key, value]) => ({ key, ...value })),
-    routeStaticGraphs: routeEntries.map((entry) => ({ route: entry.route, file: entry.file, files: [...staticGraph(entry.file)] })),
-    chunks,
-  };
-}
-
-function summarize(results) {
-  const byKind = {};
-  for (const item of results) {
-    byKind[item.kind] = (byKind[item.kind] || 0) + 1;
-  }
-  return {
-    measurements: results.length,
-    byKind,
-    delayedFilmstrips: results.filter((item) => item.kind === 'delayed-click').map((item) => item.profile),
-  };
-}
-
-async function runCleanupSelfTest() {
-  const calls = [];
-  const fakeServer = { child: {}, logDir: '/tmp/fake-vite-log' };
-  const stopServerFn = async () => { calls.push('server'); };
-  const removeLogDirectory = async () => { calls.push('logs'); };
-
-  const launchFailureCleanup = await cleanupResources({
-    browser: null,
-    server: fakeServer,
-    stopServerFn,
-    removeLogDirectory,
-  });
-  if (launchFailureCleanup || calls.join(',') !== 'server,logs') {
-    throw new Error(`Launch-failure cleanup self-test failed: ${calls.join(',')}`);
-  }
-
-  calls.length = 0;
-  const browserCloseFailureCleanup = await cleanupResources({
-    browser: { close: async () => { calls.push('browser'); throw new Error('simulated close failure'); } },
-    server: fakeServer,
-    stopServerFn,
-    removeLogDirectory,
-  });
-  if (!browserCloseFailureCleanup || calls.join(',') !== 'browser,server,logs') {
-    throw new Error(`Browser-close cleanup self-test failed: ${calls.join(',')}`);
-  }
-  console.log('cleanup self-test passed: launch failure and browser.close failure both clean Vite and logs');
-}
-
-async function main() {
-  await mkdir(OUTPUT_DIR, { recursive: true });
-  const port = await freePort();
-  const server = await startServer(port);
-  let browser = null;
-  let browserInfo = null;
-  const results = [];
-  const delayed = [];
-  let operationError = null;
-  try {
-    browser = await chromium.launch({ headless: true });
-    browserInfo = {
-      name: 'Chromium',
-      version: browser.version(),
-      executablePath: chromium.executablePath(),
-      playwrightVersion: require('@playwright/test/package.json').version,
-    };
-    for (const profile of PROFILES) {
-      for (const route of ROUTES) {
-        console.error(`[baseline] ${profile.name} cold ${route.path}`);
-        results.push(await measureColdRoute(browser, profile, route, server.baseURL));
-      }
-      for (const transition of TRANSITIONS) {
-        console.error(`[baseline] ${profile.name} first ${transition.label}`);
-        results.push(await measureTransition(browser, profile, transition, server.baseURL, false));
-        console.error(`[baseline] ${profile.name} warm ${transition.label}`);
-        results.push(await measureTransition(browser, profile, transition, server.baseURL, true));
-      }
-      console.error(`[baseline] ${profile.name} delayed Generate -> Attack`);
-      const delayedMetrics = await captureDelayedTransition(browser, profile, server.baseURL, OUTPUT_DIR);
-      delayed.push(delayedMetrics);
-    }
-  } catch (error) {
-    operationError = error;
-    throw error;
-  } finally {
-    const cleanupError = await cleanupResources({ browser, server });
-    if (cleanupError) {
-      if (operationError) {
-        console.error(cleanupError.stack);
-      } else {
-        throw cleanupError;
-      }
-    }
-  }
-  const bundleGraph = await captureBundleGraph();
-  const metadata = {
-    runLabel: RUN_LABEL,
-    capturedAt: new Date().toISOString(),
-    sourceCommit: git(['rev-parse', 'HEAD']),
-    harnessCommit: git(['rev-parse', 'HEAD']),
-    nodeVersion: process.version,
-    npmVersion: execFileSync('npm', ['--version'], { encoding: 'utf8' }).trim(),
-    browser: browserInfo,
-    vite: {
-      serverMode: 'development',
-      productionGraphMode: 'production',
-      version: require('vite/package.json').version,
-      port,
-      cacheState: 'cold routes disable HTTP cache through CDP and block service workers; clicks use a fresh or warmed browser cache',
-    },
-    profiles: PROFILES.map((profile) => ({
-      name: profile.name,
-      viewport: profile.device.viewport,
-      deviceScaleFactor: profile.device.deviceScaleFactor,
-      isMobile: profile.device.isMobile || false,
-      hasTouch: profile.device.hasTouch || false,
-      userAgent: profile.device.userAgent || null,
-      networkProfile: profile.networkProfile,
-      cpuProfile: profile.cpuProfile,
-    })),
-  };
-  const output = { metadata, summary: summarize([...results, ...delayed]), results, delayed, bundleGraph };
-  const outputPath = join(OUTPUT_DIR, `${RUN_LABEL}.json`);
-  await writeFile(outputPath, `${JSON.stringify(output, null, 2)}\n`);
-  console.log(JSON.stringify({ output: relative(ROOT, outputPath), ...output.summary, port, sourceCommit: metadata.sourceCommit, harnessCommit: metadata.harnessCommit }));
-}
-
-const run = process.argv.includes('--self-test-cleanup') ? runCleanupSelfTest : main;
-run().catch((error) => {
-  console.error(error instanceof Error ? error.stack : error);
-  process.exitCode = 1;
-});
diff --git a/scripts/update-model-pricing.ts b/scripts/update-model-pricing.ts
deleted file mode 100644
index bff53e53e..000000000
--- a/scripts/update-model-pricing.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-// Refresh the model pricing snapshot from official provider pricing pages.
-//
-// Usage: npx tsx scripts/update-model-pricing.ts
-//
-// What it does:
-//   1. Downloads the official pricing pages into docs/pricing-snapshots/.
-//   2. Records retrieval timestamp, source URL, and sha256 per file.
-//   3. Verifies every model id listed below appears in its provider page.
-//   4. Reports which models were found, missing, or renamed.
-//
-// What it deliberately does NOT do: auto-rewrite
-// supabase/functions/_shared/model-pricing.ts. Provider pages change layout
-// often and silent mis-parsing would fabricate prices, which the cost
-// calculator must never do. When verification reports a change, update the
-// MODEL_PRICING entries by hand from the fresh snapshot and bump
-// PRICING_SNAPSHOT_ID.
-
-import { createHash } from "node:crypto";
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const ROOT = join(dirname(fileURLToPath(import.meta.url)), "..");
-const SNAPSHOT_DIR = join(ROOT, "docs", "pricing-snapshots");
-
-const SOURCES = [
-  { provider: "openai", url: "https://platform.openai.com/docs/pricing.md", file: "openai.md" },
-  { provider: "anthropic", url: "https://platform.claude.com/docs/en/about-claude/pricing.md", file: "anthropic.md" },
-  // Google serves HTML only; no official .md endpoint.
-  { provider: "google", url: "https://ai.google.dev/gemini-api/docs/pricing", file: "google-gemini.html" },
-];
-
-const TRACKED_MODELS: Record<string, string[]> = {
-  openai: ["gpt-5.5", "gpt-5.4", "gpt-5.4-mini", "gpt-4o", "gpt-4o-mini"],
-  anthropic: ["claude-opus-4-7", "claude-sonnet-4-6", "claude-haiku-4-5-20251001"],
-  // gemini-3.1-flash-lite-preview has no entry on the official page; it stays
-  // listed here so each refresh run reports it MISSING instead of forgetting it.
-  google: ["gemini-3.1-pro-preview", "gemini-3-flash-preview", "gemini-3.5-flash", "gemini-3.1-flash-lite-preview"],
-};
-
-// A model id must not be followed by an id character; otherwise "gpt-5.4"
-// would match the "gpt-5.4-mini" row and hide a removed model.
-function mentions(body: string, needle: string): boolean {
-  let from = 0;
-  for (;;) {
-    const at = body.indexOf(needle, from);
-    if (at === -1) return false;
-    const next = body.charAt(at + needle.length);
-    if (!/[a-z0-9.-]/i.test(next)) return true;
-    from = at + 1;
-  }
-}
-
-// "claude-opus-4-7" -> "Claude Opus 4.7", "gemini-3.1-pro-preview" -> "Gemini 3.1 Pro Preview".
-function displayLabel(model: string): string {
-  const base = model.replace(/-\d{8}$/, ""); // drop date suffixes like -20251001
-  const out: string[] = [];
-  let digits: string[] = [];
-  for (const token of base.split("-")) {
-    if (/^\d+$/.test(token)) {
-      digits.push(token);
-      continue;
-    }
-    if (digits.length) {
-      out.push(digits.join("."));
-      digits = [];
-    }
-    out.push(token.charAt(0).toUpperCase() + token.slice(1));
-  }
-  if (digits.length) out.push(digits.join("."));
-  return out.join(" ");
-}
-
-async function main() {
-  mkdirSync(SNAPSHOT_DIR, { recursive: true });
-  const retrievedAt = new Date().toISOString();
-  const findings: Record<string, string> = {};
-  const sources: Array<{ provider: string; url: string; file: string; format: string; sha256: string }> = [];
-  const buffered: Array<{ file: string; body: string }> = [];
-
-  for (const source of SOURCES) {
-    // Pin the English/US page: Google in particular localizes currency and
-    // chrome by request geography, which would poison the snapshot.
-    const url = source.provider === "google" ? `${source.url}?hl=en` : source.url;
-    const response = await fetch(url, { headers: { "Accept-Language": "en-US,en;q=0.9" } });
-    if (!response.ok) throw new Error(`${source.provider}: HTTP ${response.status} from ${source.url}`);
-    const body = await response.text();
-    buffered.push({ file: source.file, body });
-
-    const sha256 = createHash("sha256").update(body).digest("hex");
-    sources.push({ ...source, url: source.url.replace(/\.md$/, ""), format: source.url.endsWith(".md") ? "markdown (official .md endpoint)" : "html", sha256 });
-
-    // Strip docs-navigation links so a model id appearing only as a URL is not
-    // mistaken for a pricing entry.
-    const pricingBody = body.replace(/\/gemini-api\/docs\/models\/[a-z0-9.-]+/g, "");
-
-    for (const model of TRACKED_MODELS[source.provider] ?? []) {
-      // Match either the raw id or its human label (e.g. "Claude Opus 4.7"),
-      // requiring a token boundary so "gpt-5.4" cannot match "gpt-5.4-mini".
-      findings[model] = mentions(pricingBody, model) || mentions(pricingBody, displayLabel(model))
-        ? "found in current page"
-        : "NOT FOUND in current page; treat as unknown-priced until verified";
-    }
-  }
-
-  // Only touch disk once every source fetched cleanly, so a mid-run failure
-  // cannot leave a mixed snapshot behind.
-  for (const item of buffered) {
-    writeFileSync(join(SNAPSHOT_DIR, item.file), item.body);
-  }
-
-  // Byte-level fingerprint of all captures. Provider pages embed dynamic
-  // scripts, so this changes on refreshes even when prices do not; it lives in
-  // metadata for byte-resolution while snapshotId stays stable per day.
-  const contentHash = createHash("sha256")
-    .update(sources.map((s) => s.sha256).join("|"))
-    .digest("hex");
-
-  const metadataPath = join(SNAPSHOT_DIR, "metadata.json");
-  let previousModelFindings: Record<string, string> = {};
-  try {
-    previousModelFindings = JSON.parse(readFileSync(metadataPath, "utf8")).modelFindings ?? {};
-  } catch { /* first run */ }
-
-  const metadata = {
-    snapshotId: `official-docs-${retrievedAt.slice(0, 10)}`,
-    snapshotContentHash: contentHash,
-    retrievedAt,
-    currency: "USD",
-    sources,
-    modelFindings: findings,
-    billingNotes: {
-      openai: "reasoning tokens are billed as output tokens and are included in completion_tokens; cached input is a subset of prompt_tokens",
-      anthropic: "input_tokens excludes cache_creation_input_tokens and cache_read_input_tokens; output_tokens includes thinking",
-      google: "output price includes thinking tokens; candidatesTokenCount excludes thoughtsTokenCount, so billable output = candidates + thoughts",
-    },
-  };
-  writeFileSync(metadataPath, JSON.stringify(metadata, null, 2) + "\n");
-
-  console.log(`Snapshot refreshed at ${retrievedAt}`);
-  for (const [model, status] of Object.entries(findings)) {
-    const marker = status.startsWith("found") ? "OK     " : "MISSING";
-    console.log(`  ${marker} ${model} (${status})`);
-  }
-  const changed = Object.entries(findings).filter(([m, s]) => previousModelFindings[m] !== s);
-  if (changed.length > 0) {
-    console.log("\nModel findings changed since last run. Review docs/pricing-snapshots/, then update");
-    console.log("supabase/functions/_shared/model-pricing.ts by hand and bump PRICING_SNAPSHOT_ID.");
-  }
-}
-
-main().catch((err) => {
-  console.error(err);
-  process.exit(1);
-});
diff --git a/src/App.css b/src/App.css
deleted file mode 100644
index b9d355df2..000000000
--- a/src/App.css
+++ /dev/null
@@ -1,42 +0,0 @@
-#root {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
-}
-
-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
-}
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
-}
-.logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafbaa);
-}
-
-@keyframes logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  a:nth-of-type(2) .logo {
-    animation: logo-spin infinite 20s linear;
-  }
-}
-
-.card {
-  padding: 2em;
-}
-
-.read-the-docs {
-  color: #888;
-}
diff --git a/src/App.tsx b/src/App.tsx
index ec3763dff..0370e716a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,7 +1,6 @@
 // src/App.tsx
 import { Component, Suspense, lazy, useEffect, useState, type ErrorInfo, type ReactNode } from "react";
-import { Toaster } from "@/components/ui/toaster";
-import { Toaster as Sonner } from "@/components/ui/sonner";
+import { Toaster } from "@/components/ui/sonner";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom";
@@ -18,6 +17,7 @@ import { captureException, captureProductEvent } from "@/lib/observability";
 import { routeLoaders } from "@/lib/route-modules";
 import { RouteSkeleton, type RouteSkeletonVariant } from "@/components/loading/RouteSkeleton";
 import { useTranslation } from "react-i18next";
+import { COLLABORATION_URL } from "@/lib/workspace/collaboration-config";
 
 // Lazy load all pages for code splitting
 const LandingPage = lazy(routeLoaders["/"]);
@@ -240,9 +240,13 @@ function AppRoutes() {
             }
           >
             <Route path="/app" element={<RouteContent><HomePage /></RouteContent>} />
-            <Route path="/app/workspaces" element={<RouteContent><WorkspacesPage /></RouteContent>} />
-            <Route path="/app/workspaces/invite" element={<RouteContent><WorkspaceInvitePage /></RouteContent>} />
-            <Route path="/app/workspaces/:workspaceId" element={<RouteContent><WorkspacePage /></RouteContent>} />
+            {COLLABORATION_URL && (
+              <>
+                <Route path="/app/workspaces" element={<RouteContent><WorkspacesPage /></RouteContent>} />
+                <Route path="/app/workspaces/invite" element={<RouteContent><WorkspaceInvitePage /></RouteContent>} />
+                <Route path="/app/workspaces/:workspaceId" element={<RouteContent><WorkspacePage /></RouteContent>} />
+              </>
+            )}
             <Route path="/app/generate" element={<RouteContent><GeneratePage /></RouteContent>} />
             <Route path="/app/attack" element={<RouteContent><AttackPage /></RouteContent>} />
             <Route path="/app/brainstorm" element={<RouteContent><BrainstormPage /></RouteContent>} />
@@ -270,7 +274,6 @@ const App = () => (
         <MotionConfig reducedMotion="user">
           <TooltipProvider delayDuration={200}>
             <Toaster />
-            <Sonner />
             <OfflineIndicator />
             <BrowserRouter useTransitions={false}>
               <LocalizedRouteErrorBoundary>
diff --git a/src/components/ModelSelector.tsx b/src/components/ModelSelector.tsx
index e081f35fe..86423ded4 100644
--- a/src/components/ModelSelector.tsx
+++ b/src/components/ModelSelector.tsx
@@ -3,8 +3,9 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@
 import { Badge } from '@/components/ui/badge';
 import {
   AUTO_MODEL_SELECTIONS,
+  AVAILABLE_MODELS,
   DEFAULT_MODEL,
-  DEFAULT_PROVIDERS,
+  PROVIDER_ID,
   isAutoModelSelection,
   isReasoningEffort,
 } from '@/lib/ai/providers/types';
@@ -21,11 +22,11 @@ interface ModelSelectorProps {
   showLabel?: boolean;
 }
 
+// Every catalog model routes through OpenRouter, so the provider fan-out that
+// used to wrap this collapses to one tag.
 const allModels = [
-  ...AUTO_MODEL_SELECTIONS.map((model) => ({ ...model, provider: 'openrouter', providerName: 'OpenRouter', isAuto: true })),
-  ...DEFAULT_PROVIDERS.flatMap((provider) =>
-    provider.models.map((model) => ({ ...model, provider: provider.id, providerName: provider.name, isAuto: false }))
-  ),
+  ...AUTO_MODEL_SELECTIONS.map((model) => ({ ...model, provider: PROVIDER_ID, providerName: 'OpenRouter', isAuto: true })),
+  ...AVAILABLE_MODELS.map((model) => ({ ...model, provider: PROVIDER_ID, providerName: 'OpenRouter', isAuto: false })),
 ];
 
 const reasoningOptions: { value: ReasoningEffort; labelKey: string; fallback: string }[] = [
@@ -60,7 +61,7 @@ export function ModelSelector({ feature, className, showLabel = false }: ModelSe
           const found = allModels.find(m => m.id === model);
           if (found) {
             if (found.isProOnly && !isPro) return;
-            setFeatureConfig(feature, { model, provider: found.provider });
+            setFeatureConfig(feature, { model, provider: PROVIDER_ID });
           }
         }}
       >
diff --git a/src/components/landing/index.ts b/src/components/landing/index.ts
deleted file mode 100644
index 0ab8395d0..000000000
--- a/src/components/landing/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export { default as Navbar } from "./Navbar";
-export { default as Hero } from "./Hero";
-export { default as SocialProof } from "./SocialProof";
-export { default as WhatsNew } from "./WhatsNew";
-export { default as Features } from "./Features";
-export { default as Pricing } from "./Pricing";
-export { default as DeepDive } from "./DeepDive";
-export { default as UseCases } from "./UseCases";
-export { default as HowItWorks } from "./HowItWorks";
-export { default as FAQ } from "./FAQ";
-export { default as FinalCTA } from "./FinalCTA";
-export { default as Footer } from "./Footer";
diff --git a/src/components/layout/AppLayout.tsx b/src/components/layout/AppLayout.tsx
index 3c9115d7d..c3b01b5d2 100644
--- a/src/components/layout/AppLayout.tsx
+++ b/src/components/layout/AppLayout.tsx
@@ -29,6 +29,7 @@ import { LanguageSwitcher } from '@/components/LanguageSwitcher';
 import { AnnouncementBanner } from '@/components/layout/AnnouncementBanner';
 import { useRoutePrefetch } from '@/hooks/use-route-prefetch';
 import { useAuth } from '@/lib/supabase/AuthProvider';
+import { COLLABORATION_URL } from '@/lib/workspace/collaboration-config';
 import {
   dismissAnnouncement,
   listActiveAnnouncements,
@@ -49,7 +50,7 @@ const navItems = [
   { path: '/app/sparring', key: 'sparring', icon: Dumbbell },
   { path: '/app/flowchart', key: 'flowchart', icon: GitBranch },
   { path: '/app/history', key: 'history', icon: Clock },
-];
+].filter((item) => item.key !== 'workspaces' || COLLABORATION_URL);
 
 const primaryNavItems = navItems.filter((item) =>
   ['home', 'workspaces', 'generate', 'attack', 'ask', 'crossfire', 'sparring'].includes(item.key),
diff --git a/src/components/ui/form.tsx b/src/components/ui/form.tsx
deleted file mode 100644
index a1f82e9d6..000000000
--- a/src/components/ui/form.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-/* eslint-disable react-refresh/only-export-components */
-import * as React from "react";
-import * as LabelPrimitive from "@radix-ui/react-label";
-import { Slot } from "@radix-ui/react-slot";
-import { Controller, ControllerProps, FieldPath, FieldValues, FormProvider, useFormContext } from "react-hook-form";
-
-import { cn } from "@/lib/utils";
-import { Label } from "@/components/ui/label";
-
-const Form = FormProvider;
-
-type FormFieldContextValue<
-  TFieldValues extends FieldValues = FieldValues,
-  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
-> = {
-  name: TName;
-};
-
-const FormFieldContext = React.createContext<FormFieldContextValue | undefined>(undefined);
-
-const FormField = <
-  TFieldValues extends FieldValues = FieldValues,
-  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
->({
-  ...props
-}: ControllerProps<TFieldValues, TName>) => {
-  return (
-    <FormFieldContext.Provider value={{ name: props.name }}>
-      <Controller {...props} />
-    </FormFieldContext.Provider>
-  );
-};
-
-const useFormField = () => {
-  const fieldContext = React.useContext(FormFieldContext);
-  const itemContext = React.useContext(FormItemContext);
-  const { getFieldState, formState } = useFormContext();
-
-  if (!fieldContext) {
-    throw new Error("useFormField should be used within <FormField>");
-  }
-  if (!itemContext) {
-    throw new Error("useFormField should be used within <FormItem>");
-  }
-
-  const fieldState = getFieldState(fieldContext.name, formState);
-
-  const { id } = itemContext;
-
-  return {
-    id,
-    name: fieldContext.name,
-    formItemId: `${id}-form-item`,
-    formDescriptionId: `${id}-form-item-description`,
-    formMessageId: `${id}-form-item-message`,
-    ...fieldState,
-  };
-};
-
-type FormItemContextValue = {
-  id: string;
-};
-
-const FormItemContext = React.createContext<FormItemContextValue | undefined>(undefined);
-
-const FormItem = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => {
-    const id = React.useId();
-
-    return (
-      <FormItemContext.Provider value={{ id }}>
-        <div ref={ref} className={cn("space-y-2", className)} {...props} />
-      </FormItemContext.Provider>
-    );
-  },
-);
-FormItem.displayName = "FormItem";
-
-const FormLabel = React.forwardRef<
-  React.ElementRef<typeof LabelPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
->(({ className, ...props }, ref) => {
-  const { error, formItemId } = useFormField();
-
-  return <Label ref={ref} className={cn(error && "text-destructive", className)} htmlFor={formItemId} {...props} />;
-});
-FormLabel.displayName = "FormLabel";
-
-const FormControl = React.forwardRef<React.ElementRef<typeof Slot>, React.ComponentPropsWithoutRef<typeof Slot>>(
-  ({ ...props }, ref) => {
-    const { error, formItemId, formDescriptionId, formMessageId } = useFormField();
-
-    return (
-      <Slot
-        ref={ref}
-        id={formItemId}
-        aria-describedby={!error ? `${formDescriptionId}` : `${formDescriptionId} ${formMessageId}`}
-        aria-invalid={!!error}
-        {...props}
-      />
-    );
-  },
-);
-FormControl.displayName = "FormControl";
-
-const FormDescription = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
-  ({ className, ...props }, ref) => {
-    const { formDescriptionId } = useFormField();
-
-    return <p ref={ref} id={formDescriptionId} className={cn("text-sm text-muted-foreground", className)} {...props} />;
-  },
-);
-FormDescription.displayName = "FormDescription";
-
-const FormMessage = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
-  ({ className, children, ...props }, ref) => {
-    const { error, formMessageId } = useFormField();
-    const body = error ? String(error?.message) : children;
-
-    if (!body) {
-      return null;
-    }
-
-    return (
-      <p ref={ref} id={formMessageId} className={cn("text-sm font-medium text-destructive", className)} {...props}>
-        {body}
-      </p>
-    );
-  },
-);
-FormMessage.displayName = "FormMessage";
-
-export { useFormField, Form, FormItem, FormLabel, FormControl, FormDescription, FormMessage, FormField };
diff --git a/src/components/ui/sonner.tsx b/src/components/ui/sonner.tsx
index 0f0ce4eb0..5deec5e4a 100644
--- a/src/components/ui/sonner.tsx
+++ b/src/components/ui/sonner.tsx
@@ -1,17 +1,21 @@
 /* eslint-disable react-refresh/only-export-components */
-import { useTheme } from "next-themes";
+import { useTranslation } from "react-i18next";
 import { Toaster as Sonner, toast } from "sonner";
+import { useSettingsStore } from "@/lib/stores/settings-store";
 
 type ToasterProps = React.ComponentProps<typeof Sonner>;
 
 const Toaster = ({ ...props }: ToasterProps) => {
-  const { theme = "system" } = useTheme();
+  const theme = useSettingsStore((state) => state.theme);
+  const { t } = useTranslation();
 
   return (
     <Sonner
-      theme={theme as ToasterProps["theme"]}
+      theme={theme}
+      closeButton
       className="toaster group"
       toastOptions={{
+        closeButtonAriaLabel: t("common.close"),
         classNames: {
           toast:
             "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",
diff --git a/src/components/ui/toast.tsx b/src/components/ui/toast.tsx
deleted file mode 100644
index b7e4c6c10..000000000
--- a/src/components/ui/toast.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import * as React from "react";
-import * as ToastPrimitives from "@radix-ui/react-toast";
-import { cva, type VariantProps } from "class-variance-authority";
-import { X } from "lucide-react";
-import { useTranslation } from "react-i18next";
-
-import { cn } from "@/lib/utils";
-
-const ToastProvider = ToastPrimitives.Provider;
-
-const ToastViewport = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Viewport>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Viewport
-    ref={ref}
-    className={cn(
-      "fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
-      className,
-    )}
-    {...props}
-  />
-));
-ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
-
-const toastVariants = cva(
-  "group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
-  {
-    variants: {
-      variant: {
-        default: "border bg-background text-foreground",
-        success: "success border-primary/40 bg-primary text-primary-foreground",
-        destructive: "destructive group border-destructive bg-destructive text-destructive-foreground",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-    },
-  },
-);
-
-const Toast = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Root>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> & VariantProps<typeof toastVariants>
->(({ className, variant, ...props }, ref) => {
-  return <ToastPrimitives.Root ref={ref} className={cn(toastVariants({ variant }), className)} {...props} />;
-});
-Toast.displayName = ToastPrimitives.Root.displayName;
-
-const ToastAction = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Action>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Action
-    ref={ref}
-    className={cn(
-      "inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium ring-offset-background transition-colors group-[.destructive]:border-muted/40 hover:bg-secondary group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 group-[.destructive]:focus:ring-destructive disabled:pointer-events-none disabled:opacity-50",
-      className,
-    )}
-    {...props}
-  />
-));
-ToastAction.displayName = ToastPrimitives.Action.displayName;
-
-const ToastClose = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Close>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
->(({ className, ...props }, ref) => {
-  const { t } = useTranslation();
-  return (
-  <ToastPrimitives.Close
-    ref={ref}
-    className={cn(
-      "absolute right-2 top-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.success]:text-primary-foreground/70 hover:text-foreground group-[.destructive]:hover:text-red-50 group-[.success]:hover:text-primary-foreground focus:opacity-100 focus:outline-none focus:ring-2 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
-      className,
-    )}
-    toast-close=""
-    aria-label={t('common.close')}
-    {...props}
-  >
-    <X className="h-4 w-4" aria-hidden="true" />
-  </ToastPrimitives.Close>
-  );
-});
-ToastClose.displayName = ToastPrimitives.Close.displayName;
-
-const ToastTitle = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Title>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Title ref={ref} className={cn("text-sm font-semibold", className)} {...props} />
-));
-ToastTitle.displayName = ToastPrimitives.Title.displayName;
-
-const ToastDescription = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Description>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Description ref={ref} className={cn("text-sm opacity-90", className)} {...props} />
-));
-ToastDescription.displayName = ToastPrimitives.Description.displayName;
-
-type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;
-
-type ToastActionElement = React.ReactElement<typeof ToastAction>;
-
-export {
-  type ToastProps,
-  type ToastActionElement,
-  ToastProvider,
-  ToastViewport,
-  Toast,
-  ToastTitle,
-  ToastDescription,
-  ToastClose,
-  ToastAction,
-};
diff --git a/src/components/ui/toaster.tsx b/src/components/ui/toaster.tsx
deleted file mode 100644
index 2cba1c825..000000000
--- a/src/components/ui/toaster.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useToast } from "@/hooks/use-toast";
-import { Toast, ToastClose, ToastDescription, ToastProvider, ToastTitle, ToastViewport } from "@/components/ui/toast";
-
-export function Toaster() {
-  const { toasts } = useToast();
-
-  return (
-    <ToastProvider>
-      {toasts.map(function ({ id, title, description, action, ...props }) {
-        return (
-          <Toast key={id} {...props}>
-            <div className="grid gap-1">
-              {title && <ToastTitle>{title}</ToastTitle>}
-              {description && <ToastDescription>{description}</ToastDescription>}
-            </div>
-            {action}
-            <ToastClose />
-          </Toast>
-        );
-      })}
-      <ToastViewport />
-    </ToastProvider>
-  );
-}
diff --git a/src/components/ui/use-toast.ts b/src/components/ui/use-toast.ts
deleted file mode 100644
index b0aef21be..000000000
--- a/src/components/ui/use-toast.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { useToast, toast } from "@/hooks/use-toast";
-
-export { useToast, toast };
diff --git a/src/hooks/use-toast.ts b/src/hooks/use-toast.ts
index ca1316d67..ecfa19702 100644
--- a/src/hooks/use-toast.ts
+++ b/src/hooks/use-toast.ts
@@ -1,186 +1,29 @@
-import * as React from "react";
+import type { ReactNode } from "react";
+import { toast as sonner } from "sonner";
 
-import type { ToastActionElement, ToastProps } from "@/components/ui/toast";
+type SonnerOptions = NonNullable<Parameters<typeof sonner>[1]>;
 
-const TOAST_LIMIT = 1;
-const TOAST_REMOVE_DELAY = 1000000;
-
-type ToasterToast = ToastProps & {
-  id: string;
-  title?: React.ReactNode;
-  description?: React.ReactNode;
-  action?: ToastActionElement;
-};
-
-const actionTypes = {
-  ADD_TOAST: "ADD_TOAST",
-  UPDATE_TOAST: "UPDATE_TOAST",
-  DISMISS_TOAST: "DISMISS_TOAST",
-  REMOVE_TOAST: "REMOVE_TOAST",
-} as const;
-
-let count = 0;
-
-function genId() {
-  count = (count + 1) % Number.MAX_SAFE_INTEGER;
-  return count.toString();
-}
-
-type ActionType = typeof actionTypes;
-
-type Action =
-  | {
-      type: ActionType["ADD_TOAST"];
-      toast: ToasterToast;
-    }
-  | {
-      type: ActionType["UPDATE_TOAST"];
-      toast: Partial<ToasterToast>;
-    }
-  | {
-      type: ActionType["DISMISS_TOAST"];
-      toastId?: ToasterToast["id"];
-    }
-  | {
-      type: ActionType["REMOVE_TOAST"];
-      toastId?: ToasterToast["id"];
-    };
-
-interface State {
-  toasts: ToasterToast[];
-}
-
-const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>();
-
-const addToRemoveQueue = (toastId: string) => {
-  if (toastTimeouts.has(toastId)) {
-    return;
-  }
-
-  const timeout = setTimeout(() => {
-    toastTimeouts.delete(toastId);
-    dispatch({
-      type: "REMOVE_TOAST",
-      toastId: toastId,
-    });
-  }, TOAST_REMOVE_DELAY);
-
-  toastTimeouts.set(toastId, timeout);
-};
-
-export const reducer = (state: State, action: Action): State => {
-  switch (action.type) {
-    case "ADD_TOAST":
-      return {
-        ...state,
-        toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
-      };
-
-    case "UPDATE_TOAST":
-      return {
-        ...state,
-        toasts: state.toasts.map((t) => (t.id === action.toast.id ? { ...t, ...action.toast } : t)),
-      };
-
-    case "DISMISS_TOAST": {
-      const { toastId } = action;
-
-      // ! Side effects ! - This could be extracted into a dismissToast() action,
-      // but I'll keep it here for simplicity
-      if (toastId) {
-        addToRemoveQueue(toastId);
-      } else {
-        state.toasts.forEach((toast) => {
-          addToRemoveQueue(toast.id);
-        });
-      }
-
-      return {
-        ...state,
-        toasts: state.toasts.map((t) =>
-          t.id === toastId || toastId === undefined
-            ? {
-                ...t,
-                open: false,
-              }
-            : t,
-        ),
-      };
-    }
-    case "REMOVE_TOAST":
-      if (action.toastId === undefined) {
-        return {
-          ...state,
-          toasts: [],
-        };
-      }
-      return {
-        ...state,
-        toasts: state.toasts.filter((t) => t.id !== action.toastId),
-      };
-  }
-};
-
-const listeners: Array<(state: State) => void> = [];
-
-let memoryState: State = { toasts: [] };
-
-function dispatch(action: Action) {
-  memoryState = reducer(memoryState, action);
-  listeners.forEach((listener) => {
-    listener(memoryState);
-  });
+export interface ToastOptions {
+  title?: ReactNode;
+  description?: ReactNode;
+  variant?: "default" | "destructive" | "success";
+  action?: SonnerOptions["action"];
 }
 
-type Toast = Omit<ToasterToast, "id">;
-
-function toast({ ...props }: Toast) {
-  const id = genId();
-
-  const update = (props: ToasterToast) =>
-    dispatch({
-      type: "UPDATE_TOAST",
-      toast: { ...props, id },
-    });
-  const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id });
-
-  dispatch({
-    type: "ADD_TOAST",
-    toast: {
-      ...props,
-      id,
-      open: true,
-      onOpenChange: (open) => {
-        if (!open) dismiss();
-      },
-    },
-  });
-
-  return {
-    id: id,
-    dismiss,
-    update,
-  };
+/**
+ * Adapter over sonner that keeps the `{ title, description, variant }` call
+ * shape used across the app. Replaces the previous hand-rolled toast reducer
+ * and its Radix primitives.
+ */
+export function toast({ title, description, variant, action }: ToastOptions) {
+  const render = variant === "destructive"
+    ? sonner.error
+    : variant === "success"
+      ? sonner.success
+      : sonner;
+  return render(title ?? "", { description, action });
 }
 
-function useToast() {
-  const [state, setState] = React.useState<State>(memoryState);
-
-  React.useEffect(() => {
-    listeners.push(setState);
-    return () => {
-      const index = listeners.indexOf(setState);
-      if (index > -1) {
-        listeners.splice(index, 1);
-      }
-    };
-  }, [state]);
-
-  return {
-    ...state,
-    toast,
-    dismiss: (toastId?: string) => dispatch({ type: "DISMISS_TOAST", toastId }),
-  };
+export function useToast() {
+  return { toast };
 }
-
-export { useToast, toast };
diff --git a/src/index.css b/src/index.css
index fee3500f7..b24ad6531 100644
--- a/src/index.css
+++ b/src/index.css
@@ -192,10 +192,6 @@ All colors MUST be HSL.
     background: linear-gradient(135deg, hsl(var(--card)) 0%, hsl(217 32% 20%) 100%);
   }
 
-  .gradient-text {
-    @apply bg-clip-text text-transparent;
-    background-image: linear-gradient(135deg, hsl(var(--primary)) 0%, hsl(169 72% 40%) 100%);
-  }
 
   .btn-primary-gradient {
     @apply relative px-6 py-3 font-semibold text-primary-foreground rounded-xl overflow-hidden transition-all duration-300 shadow-lg;
@@ -354,9 +350,6 @@ All colors MUST be HSL.
     animation: motion-swap var(--motion-duration-normal) var(--motion-ease-fluid) both;
   }
 
-  .motion-loading-shell {
-    animation: motion-fade-in var(--motion-duration-fast) var(--motion-ease-fluid) both;
-  }
 
   .motion-loading-bar {
     animation: motion-loading-bar 1.35s var(--motion-ease-fluid) infinite;
@@ -683,21 +676,6 @@ input:focus, textarea:focus, select:focus {
   }
 }
 
-/* Scroll-triggered fade-in (used with IntersectionObserver or just on mount) */
-.fade-in-up {
-  animation: fade-in-up 0.5s var(--motion-ease-fluid) both;
-}
-
-@keyframes fade-in-up {
-  from {
-    opacity: 0;
-    transform: translateY(16px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
 
 @keyframes shimmer {
   0% {
@@ -732,16 +710,6 @@ input:focus, textarea:focus, select:focus {
   to { stroke-dashoffset: 0; opacity: 1; }
 }
 
-/* Badge pulse on appear */
-.badge-pulse {
-  animation: badge-pop 0.3s var(--motion-ease-fluid) both;
-}
-
-@keyframes badge-pop {
-  0% { transform: scale(0); opacity: 0; }
-  60% { transform: scale(1.15); }
-  100% { transform: scale(1); opacity: 1; }
-}
 
 /* Tooltip entrance */
 [data-state="delayed-open"][data-side] {
@@ -883,25 +851,6 @@ button:active > svg.lucide-heart {
   100% { transform: scale(1.8); opacity: 0; }
 }
 
-/* Ripple effect on button click */
-.button-ripple:not(:disabled) {
-  position: relative;
-}
-
-.button-ripple:not(:disabled)::after {
-  content: '';
-  position: absolute;
-  inset: 0;
-  border-radius: inherit;
-  background: radial-gradient(circle at var(--ripple-x, 50%) var(--ripple-y, 50%), hsl(var(--primary) / 0.15), transparent 60%);
-  opacity: 0;
-  transition: opacity 0.3s;
-  pointer-events: none;
-}
-
-.button-ripple:not(:disabled):active::after {
-  opacity: 1;
-}
 
 /* Smooth counter/number transitions */
 .tabular-nums {
@@ -909,20 +858,6 @@ button:active > svg.lucide-heart {
   transition: transform 0.2s var(--motion-ease-fluid);
 }
 
-/* Hover lift for cards */
-.hover-lift {
-  transition: transform 0.2s var(--motion-ease-fluid), box-shadow 0.2s var(--motion-ease-fluid);
-}
-
-.hover-lift:hover {
-  transform: translateY(-3px);
-  box-shadow: 0 12px 32px hsl(var(--foreground) / 0.08);
-}
-
-/* Glow text on hover */
-.glow-text:hover {
-  text-shadow: 0 0 12px hsl(var(--primary) / 0.4);
-}
 
 /* Subtle parallax tilt on card hover */
 .tilt-card {
@@ -1135,33 +1070,6 @@ button:active > svg.lucide-heart {
   }
 }
 
-/* Scroll-triggered reveal for sections */
-.scroll-reveal {
-  opacity: 0;
-  transform: translateY(20px);
-  transition: opacity 0.6s var(--motion-ease-fluid), transform 0.6s var(--motion-ease-fluid);
-}
-
-.scroll-reveal.visible {
-  opacity: 1;
-  transform: translateY(0);
-}
-
-/* Subtle pulse for empty state icons */
-.motion-breathe {
-  animation: motion-breathe 3s ease-in-out infinite;
-}
-
-@keyframes motion-breathe {
-  0%, 100% {
-    opacity: 0.4;
-    transform: scale(1);
-  }
-  50% {
-    opacity: 0.6;
-    transform: scale(1.05);
-  }
-}
 
 /* Icon spin on hover for interactive elements */
 .hover-icon-spin:hover > svg {
@@ -1169,10 +1077,6 @@ button:active > svg.lucide-heart {
   transition: transform 0.3s var(--motion-ease-fluid);
 }
 
-/* Smooth color transition for text elements */
-.text-transition {
-  transition: color 0.2s var(--motion-ease-fluid);
-}
 
 @media (prefers-reduced-motion: reduce) {
   html {
@@ -1199,8 +1103,7 @@ button:active > svg.lucide-heart {
   .motion-ping-ring,
   .motion-shimmer::after,
   .card-hover-glow:hover,
-  .feature-card:hover,
-  .hover-lift:hover {
+  .feature-card:hover {
     transform: none !important;
   }
 }
diff --git a/src/lib/ai/client.ts b/src/lib/ai/client.ts
index ef6da4df5..8434749f6 100644
--- a/src/lib/ai/client.ts
+++ b/src/lib/ai/client.ts
@@ -1,12 +1,3 @@
-import {
-  mockGenerateCase,
-  mockAttackCase,
-  mockBrainstorm,
-  mockFactoids,
-  mockAsk,
-  mockGenerateSparringTurn,
-  mockJudgeSparringSession,
-} from './providers/mock-provider';
 import type { ProviderConfig } from './providers/types';
 import { GenerateOutputSchema, type GenerateInput, type GenerateOutput } from './schemas/generate';
 import { AttackOutputSchema, type AttackOutput, type AttackInput } from './schemas/attack';
@@ -450,7 +441,7 @@ async function callSupabaseAI<T = unknown>(
     ? boundCrossfireRequestSources(selectedSources)
     : selectedSources;
 
-  const provider = config.provider === 'mock' ? 'mock' : 'openrouter';
+  const provider = 'openrouter';
   captureProductEvent('ai_request_started', {
     feature,
     provider,
@@ -1218,9 +1209,6 @@ function expectedContentionCount(length: GenerateInput['length']): number {
 }
 
 export async function generateCase(input: GenerateInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext): Promise<ResultWithSources<GenerateOutput>> {
-  if (config.provider === 'mock') {
-    return { result: await mockGenerateCase(input.motion, input.side, input.length), discoveredSources: [] };
-  }
   const inputWithLanguage = withOutputLanguage(input as unknown as Record<string, unknown>);
   const response = await callSupabaseAI<ResultWithSources<GenerateOutput>>('generate', inputWithLanguage, config, {
     workspaceContext,
@@ -1241,7 +1229,6 @@ export async function generateCase(input: GenerateInput, config: ProviderConfig,
 }
 
 export async function attackCase(input: AttackInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext): Promise<ResultWithSources<AttackOutput>> {
-  if (config.provider === 'mock') return { result: await mockAttackCase(input.caseText), discoveredSources: [] };
   const response = await callSupabaseAI<ResultWithSources<AttackOutput>>('attack', withOutputLanguage(input as unknown as Record<string, unknown>), config, {
     workspaceContext,
     transformResponse: (rawData) => {
@@ -1257,7 +1244,6 @@ export async function attackCase(input: AttackInput, config: ProviderConfig, wor
 }
 
 export async function brainstorm(input: BrainstormInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext): Promise<ResultWithSources<BrainstormOutput>> {
-  if (config.provider === 'mock') return { result: await mockBrainstorm(input.motion, input.outputMode), discoveredSources: [] };
   const response = await callSupabaseAI<ResultWithSources<BrainstormOutput>>('brainstorm', withOutputLanguage(input as unknown as Record<string, unknown>), config, {
     workspaceContext,
     transformResponse: (rawData) => {
@@ -1273,7 +1259,6 @@ export async function brainstorm(input: BrainstormInput, config: ProviderConfig,
 }
 
 export async function factoids(input: FactoidsInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext): Promise<ResultWithSources<FactoidsOutput>> {
-  if (config.provider === 'mock') return { result: await mockFactoids(input.claim), discoveredSources: [] };
   const inputWithLanguage = withOutputLanguage({
     ...input,
     region: input.region?.trim() || 'Global',
@@ -1322,30 +1307,27 @@ export async function askChat(
   config: ProviderConfig,
   options: AskChatOptions = {}
 ): Promise<AskOutput> {
-  const output = config.provider === 'mock'
-    ? await mockAsk(message, mode)
-    : await callSupabaseAI<AskOutput>('ask', withOutputLanguage({
-      message,
-      history,
-      mode,
-      citationMode: Boolean(options.citationMode),
-      webSearch: Boolean(options.webSearch),
-      prosConsMode: Boolean(options.prosConsMode),
-      argumentMapMode: Boolean(options.argumentMapMode),
-    }), config, {
-      workspaceContext: options.workspaceContext,
-      transformResponse: (rawData) => {
-        const data = rawData as { output: unknown };
-        const parsed = AskOutputSchema.safeParse(data.output);
-        if (!parsed.success) {
-          throw new AIResponseError('AI response did not match the expected ask schema.', {
-            details: { issues: parsed.error.issues },
-          });
-        }
-        return parsed.data;
-      },
-    });
-  return output;
+  return await callSupabaseAI<AskOutput>('ask', withOutputLanguage({
+    message,
+    history,
+    mode,
+    citationMode: Boolean(options.citationMode),
+    webSearch: Boolean(options.webSearch),
+    prosConsMode: Boolean(options.prosConsMode),
+    argumentMapMode: Boolean(options.argumentMapMode),
+  }), config, {
+    workspaceContext: options.workspaceContext,
+    transformResponse: (rawData) => {
+      const data = rawData as { output: unknown };
+      const parsed = AskOutputSchema.safeParse(data.output);
+      if (!parsed.success) {
+        throw new AIResponseError('AI response did not match the expected ask schema.', {
+          details: { issues: parsed.error.issues },
+        });
+      }
+      return parsed.data;
+    },
+  });
 }
 
 function sparringLanguage(language: string): string {
@@ -1433,10 +1415,6 @@ async function generateSparringTurnOnce(
     });
   }
 
-  if (config.provider === 'mock') {
-    return validateSparringTurnResponse(await mockGenerateSparringTurn(inputResult.data));
-  }
-
   return await callSupabaseAI<SparringTurnResponse>('sparring', inputResult.data, config, {
     workspaceContext,
     transformResponse: (rawData) => validateSparringTurnResponse((rawData as { output: unknown }).output),
@@ -1488,10 +1466,6 @@ async function judgeSparringSessionOnce(
     });
   }
 
-  if (config.provider === 'mock') {
-    return validateSparringScoreResponse(await mockJudgeSparringSession(inputResult.data));
-  }
-
   return await callSupabaseAI<SparringScoreResponse>('sparring', inputResult.data, config, {
     workspaceContext,
     transformResponse: (rawData) => validateSparringScoreResponse((rawData as { output: unknown }).output),
diff --git a/src/lib/ai/providers/mock-provider.ts b/src/lib/ai/providers/mock-provider.ts
deleted file mode 100644
index 5da759e66..000000000
--- a/src/lib/ai/providers/mock-provider.ts
+++ /dev/null
@@ -1,510 +0,0 @@
-// src/lib/ai/providers/mock-provider.ts
-import type { GenerateInput, GenerateOutput } from '../schemas/generate';
-import type { AttackOutput } from '../schemas/attack';
-import type { BrainstormOutput } from '../schemas/brainstorm';
-import type { FactoidsOutput } from '../schemas/factoids';
-import type { AskOutput } from '../schemas/ask';
-import type {
-  SparringRespondInput,
-  SparringScoreInput,
-  SparringScoreResponse,
-  SparringTurnResponse,
-} from '../schemas/sparring';
-
-const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
-
-export async function mockGenerateCase(
-  motion: string,
-  side: string,
-  length: GenerateInput['length'] = 'standard',
-): Promise<GenerateOutput> {
-  await delay(1500);
-  const actualSide = side === 'auto' ? (Math.random() > 0.5 ? 'pro' : 'con') : side as 'pro' | 'con';
-  const contentionCount = length === 'brief' ? 2 : length === 'comprehensive' ? 4 : 3;
-
-  const contentions: GenerateOutput['contentions'] = [
-    {
-      id: '1',
-      claim: 'Economic Impact Analysis',
-      reasoning: 'Historical precedent shows that similar policies have led to measurable economic outcomes.',
-      evidence: 'Studies from comparable jurisdictions demonstrate consistent patterns.',
-      needsSource: true,
-      sourceQuery: 'economic impact studies policy implementation',
-      impact: 'This directly affects the livelihoods of millions and determines policy viability.',
-    },
-    {
-      id: '2',
-      claim: 'Rights-Based Considerations',
-      reasoning: 'Fundamental rights must be balanced against collective interests.',
-      evidence: 'Constitutional frameworks in democratic nations provide guidance.',
-      needsSource: false,
-      impact: 'The legitimacy of government action depends on rights protection.',
-    },
-    {
-      id: '3',
-      claim: 'Practical Implementation',
-      reasoning: 'Policy effectiveness depends on realistic implementation pathways.',
-      evidence: 'Case studies from similar implementations inform feasibility.',
-      needsSource: true,
-      sourceQuery: 'policy implementation case studies success factors',
-      impact: 'Without practical viability, the best intentions fail.',
-    },
-    {
-      id: '4',
-      claim: 'Long-Term Social Effects',
-      reasoning: 'The policy should be assessed against its effects on social cohesion over time.',
-      evidence: 'Longitudinal comparisons reveal how similar policies affect communities.',
-      needsSource: true,
-      sourceQuery: 'long-term social effects policy outcomes',
-      impact: 'Durable social outcomes determine whether the policy succeeds beyond its first effects.',
-    },
-  ];
-
-  return {
-    caseStructure: {
-      thesis: `We ${actualSide === 'pro' ? 'support' : 'oppose'} the motion: "${motion}" because it fundamentally affects individual rights, economic stability, and social progress.`,
-      framework: `This debate should be evaluated through a consequentialist lens, weighing net benefits to society while considering rights-based constraints.`,
-      keyDefinitions: [
-        'Key terms should be defined according to their commonly understood meanings',
-        'Context-specific definitions apply where relevant',
-      ],
-      burdenOfProof: `The ${actualSide === 'pro' ? 'proposition' : 'opposition'} must demonstrate that the ${actualSide === 'pro' ? 'benefits outweigh costs' : 'status quo is preferable'}.`,
-    },
-    contentions: contentions.slice(0, contentionCount),
-    predictedOpponentCase: {
-      likelyArguments: [
-        'The opposing side will likely argue about unintended consequences',
-        'They may challenge the evidence basis for claims',
-        'Economic counterarguments focusing on different metrics',
-      ],
-      strategicWeaknesses: [
-        'Their position may struggle with empirical evidence',
-        'Moral arguments may conflict with pragmatic considerations',
-      ],
-      keyClashes: [
-        'Definition of success metrics',
-        'Timeframe for evaluation',
-        'Stakeholder prioritization',
-      ],
-    },
-    counters: [
-      {
-        targetArgument: 'Economic harm claims',
-        counterpoint: 'Short-term costs must be weighed against long-term benefits',
-        rebuttal: 'Studies show that initial disruption leads to net positive outcomes within 3-5 years',
-      },
-      {
-        targetArgument: 'Rights violations',
-        counterpoint: 'Reasonable limitations are accepted in all democratic frameworks',
-        rebuttal: 'The proportionality test demonstrates this measure meets constitutional standards',
-      },
-    ],
-    metadata: {
-      side: actualSide,
-      format: 'bp',
-      generatedAt: new Date().toISOString(),
-    },
-  };
-}
-
-export async function mockAttackCase(caseText: string): Promise<AttackOutput> {
-  await delay(1800);
-
-  return {
-    overallAssessment: {
-      score: 62,
-      summary: 'The case shows promise but has significant gaps in evidence and logical structure that opponents will exploit.',
-      strengthAreas: [
-        'Clear thesis statement',
-        'Good use of framework',
-        'Addresses key stakeholders',
-      ],
-    },
-    weaknesses: [
-      {
-        id: '1',
-        severity: 'critical',
-        type: 'evidential',
-        description: 'Claims lack specific, verifiable evidence',
-        whyWeak: 'Without concrete data, assertions become mere opinions that judges can dismiss.',
-        howOpponentAttacks: '"My opponent offers no evidence for this claim. We can simply assert the opposite with equal validity."',
-        improvedVersion: 'Add specific statistics, studies, or expert testimony with clear citations.',
-        affectedQuote: caseText.slice(0, 50) + '...',
-      },
-      {
-        id: '2',
-        severity: 'major',
-        type: 'logical',
-        description: 'Causal chain is incomplete',
-        whyWeak: 'The link between premise and conclusion has gaps that undermine persuasiveness.',
-        howOpponentAttacks: '"Even if we grant their premise, it doesn\'t follow that their conclusion is true."',
-        improvedVersion: 'Explicitly walk through each logical step, explaining why A leads to B leads to C.',
-      },
-      {
-        id: '3',
-        severity: 'minor',
-        type: 'structural',
-        description: 'Weighing mechanism is unclear',
-        whyWeak: 'Without clear weighing, judges cannot easily compare your impacts to opponent\'s.',
-        howOpponentAttacks: '"They haven\'t told you why their impacts matter more than ours."',
-        improvedVersion: 'Add a short weighing paragraph that explains who is affected, how likely the harm is, when it happens, and why that matters more.',
-      },
-    ],
-    fallaciesDetected: [
-      {
-        name: 'Appeal to Authority',
-        location: 'Opening paragraph',
-        explanation: 'Citing unnamed "experts" without specifics weakens rather than strengthens.',
-      },
-      {
-        name: 'False Dichotomy',
-        location: 'Conclusion',
-        explanation: 'Presenting only two options when more nuanced positions exist.',
-      },
-    ],
-    crossExQuestions: [
-      {
-        question: 'Can you name a specific study that supports your central claim?',
-        purpose: 'Expose lack of concrete evidence',
-        expectedTrap: 'If they cannot, their entire case loses credibility',
-      },
-      {
-        question: 'How do you weigh the short-term costs against your claimed long-term benefits?',
-        purpose: 'Force them to justify their impact calculus',
-        expectedTrap: 'Reveals if they have actually thought through the comparison',
-      },
-      {
-        question: 'What would have to be true for your position to be wrong?',
-        purpose: 'Test intellectual honesty and identify assumptions',
-        expectedTrap: 'Most debaters struggle with this, exposing dogmatic reasoning',
-      },
-    ],
-    weighingAnalysis: {
-      currentWeighing: 'The case mentions importance but lacks comparative analysis.',
-      missingComparisons: [
-        'How many people are affected compared with the opponent\'s claims',
-        'How likely the outcomes are to happen in practice',
-        'When the impacts happen and how long they last',
-      ],
-      improvementSuggestions: [
-        'Add a dedicated weighing paragraph before conclusion',
-        'Use explicit language: "Even if they prove X, our Y still matters more because..."',
-        'Quantify where possible: "affects 3x more people" vs "affects many"',
-      ],
-    },
-  };
-}
-
-export async function mockBrainstorm(motion: string, outputMode: string): Promise<BrainstormOutput> {
-  await delay(1200);
-
-  const ideas = [
-    {
-      id: '1',
-      title: 'Economic Freedom Angle',
-      description: 'Focus on how the motion affects market dynamics and individual economic choice.',
-      side: 'pro' as const,
-      strength: 'strong' as const,
-      tradeoffs: ['May alienate values-focused judges', 'Requires economic literacy'],
-      relatedTo: ['2', '4'],
-    },
-    {
-      id: '2',
-      title: 'Rights-Based Framework',
-      description: 'Ground arguments in fundamental human rights and dignity.',
-      side: 'neutral' as const,
-      strength: 'strong' as const,
-      tradeoffs: ['Can be abstract', 'Both sides can claim it'],
-      relatedTo: ['1', '3'],
-    },
-    {
-      id: '3',
-      title: 'Pragmatic Harm Reduction',
-      description: 'Focus on measurable outcomes and real-world impact.',
-      side: 'con' as const,
-      strength: 'moderate' as const,
-      tradeoffs: ['May seem unprincipled', 'Requires strong evidence'],
-      relatedTo: ['2'],
-    },
-    {
-      id: '4',
-      title: 'Historical Precedent',
-      description: 'Draw parallels to similar historical situations.',
-      side: 'neutral' as const,
-      strength: 'moderate' as const,
-      tradeoffs: ['Historical comparisons can be contested', 'May feel dated'],
-      relatedTo: ['1'],
-    },
-    {
-      id: '5',
-      title: 'Institutional Trust',
-      description: 'Examine how the motion affects trust in key institutions.',
-      side: 'con' as const,
-      strength: 'weak' as const,
-      tradeoffs: ['Abstract concept', 'Hard to quantify'],
-      relatedTo: [] as string[],
-    },
-  ];
-
-  return {
-    needsMoreInfo: false,
-    mindmap: outputMode === 'mindmap' ? [
-      { category: 'Economic', items: ideas.filter(i => i.title.includes('Economic')) },
-      { category: 'Rights & Values', items: ideas.filter(i => i.title.includes('Rights')) },
-      { category: 'Practical', items: ideas.filter(i => i.title.includes('Pragmatic') || i.title.includes('Institutional')) },
-      { category: 'Historical', items: ideas.filter(i => i.title.includes('Historical')) },
-    ] : undefined,
-    buckets: outputMode === 'buckets' ? [
-      { name: 'Strong Arguments', ideas: ideas.filter(i => i.strength === 'strong'), keyInsight: 'Build your case around these' },
-      { name: 'Supporting Points', ideas: ideas.filter(i => i.strength === 'moderate'), keyInsight: 'Use these to reinforce main arguments' },
-      { name: 'Risky Angles', ideas: ideas.filter(i => i.strength === 'weak'), keyInsight: 'Only use if well-researched' },
-    ] : undefined,
-    topFive: outputMode === 'topfive' ? [
-      { rank: 1, idea: ideas[0], whyTop: 'Concrete, measurable, hard to refute' },
-      { rank: 2, idea: ideas[1], whyTop: 'Universal appeal, principled stance' },
-      { rank: 3, idea: ideas[3], whyTop: 'Provides credibility through precedent' },
-      { rank: 4, idea: ideas[2], whyTop: 'Pragmatic judges appreciate this' },
-      { rank: 5, idea: ideas[4], whyTop: 'Unique angle opponents may not expect' },
-    ] : undefined,
-    nextSteps: [
-      'Research specific evidence for top 2 angles',
-      'Prepare responses to predictable attacks',
-      'Test arguments with practice judges',
-    ],
-    warningsAndTradeoffs: [
-      'Avoid combining too many angles, focus wins debates',
-      'Economic arguments need current data to be credible',
-      'Rights-based framing works best with clear real-world harms',
-    ],
-  };
-}
-
-export async function mockFactoids(claim: string): Promise<FactoidsOutput> {
-  await delay(2000);
-
-  return {
-    factoids: [
-      {
-        id: '1',
-        shortClaim: 'Global adoption rates have increased significantly',
-        keyFigure: '73% increase over 5 years',
-        context: 'Based on trends in developed nations; developing nations show different patterns.',
-        limitations: 'Data collection methodologies vary by region; may not capture informal adoption.',
-        citation: {
-          title: 'Global Trends Report 2023',
-          publisher: 'International Research Institute',
-          date: '2023-06',
-          url: undefined,
-          verified: 'verified',
-        },
-        howToUse: 'Use to establish momentum and inevitability of change.',
-        relevanceScore: 85,
-      },
-      {
-        id: '2',
-        shortClaim: 'Economic impact studies show mixed results',
-        keyFigure: '2.3% GDP variance',
-        context: 'Varies significantly based on implementation approach and existing infrastructure.',
-        limitations: 'Studies often funded by interested parties; control groups difficult.',
-        citation: {
-          title: 'Economic Policy Analysis',
-          publisher: 'University Research Center',
-          date: '2022-11',
-          verified: 'unverified',
-        },
-        howToUse: 'Acknowledge complexity while emphasizing favorable outcomes under proper conditions.',
-        relevanceScore: 72,
-      },
-      {
-        id: '3',
-        shortClaim: 'Public opinion has shifted substantially',
-        keyFigure: '58% now support (vs 34% in 2015)',
-        context: 'National polls in comparable democracies show consistent trends.',
-        limitations: 'Polling methodology affects results; support may not translate to action.',
-        citation: {
-          title: 'Public Opinion Quarterly Survey',
-          publisher: 'National Polling Organization',
-          date: '2024-01',
-          verified: 'unverified',
-        },
-        howToUse: 'Demonstrates democratic mandate and social momentum.',
-        relevanceScore: 78,
-      },
-    ],
-    searchSuggestions: [
-      `${claim} peer reviewed study`,
-      `${claim} government report`,
-      `${claim} statistical analysis`,
-    ],
-    warnings: [
-      'All sources require verification before use in formal debate',
-      'Check for more recent data that may supersede these findings',
-      'Consider regional variations in applicability',
-    ],
-    verificationStatus: 'pending',
-  };
-}
-
-export async function mockAsk(message: string, mode: string): Promise<AskOutput> {
-  await delay(1000);
-
-  const baseResponse: AskOutput = {
-    response: `Great question about "${message.slice(0, 50)}..."\n\nIn debate, this topic can be approached from multiple angles. The key is to identify the core value clash and build your case around a clear, defensible principle.`,
-    followUpQuestions: [
-      'Would you like me to elaborate on any specific aspect?',
-      'Should we explore counterarguments to this position?',
-      'Do you want help finding evidence for this claim?',
-    ],
-    uncertainties: [
-      'Specific statistics would need verification',
-      'Regional variations may apply',
-    ],
-  };
-
-  if (mode === 'proscons') {
-    baseResponse.prosConsAnalysis = {
-      pros: [
-        'Provides clear framework for evaluation',
-        'Addresses core stakeholder concerns',
-        'Has precedent in similar contexts',
-      ],
-      cons: [
-        'Implementation challenges exist',
-        'May face political opposition',
-        'Long-term effects uncertain',
-      ],
-    };
-  }
-
-  if (mode === 'argumentmap') {
-    baseResponse.argumentMap = {
-      mainClaim: 'The proposition offers net benefits to society',
-      supportingPoints: [
-        'Evidence from comparable implementations',
-        'Theoretical frameworks support this approach',
-        'Stakeholder analysis favors action',
-      ],
-      counterpoints: [
-        'Short-term disruption is real',
-        'Alternative approaches exist',
-        'Uncertainty about long-term effects',
-      ],
-      assumptions: [
-        'Current trends will continue',
-        'Implementation will be competent',
-        'Resources are available',
-      ],
-    };
-  }
-
-  return baseResponse;
-}
-
-function wordCount(text: string): number {
-  return text.trim() ? text.trim().split(/\s+/).length : 0;
-}
-
-function clampScore(score: number): number {
-  return Math.max(0, Math.min(25, Math.round(score)));
-}
-
-/** Deterministic sparring reply for local development and offline UI tests. */
-export async function mockGenerateSparringTurn(input: SparringRespondInput): Promise<SparringTurnResponse> {
-  const latestSpeech = [...input.speeches].reverse().find((speech) => speech.speaker === 'user');
-  const latestPoint = latestSpeech?.content.trim().replace(/\s+/g, ' ').slice(0, 140);
-  const difficultyLine = {
-    easy: 'I will keep this response focused on the most visible clash.',
-    medium: 'I will answer the central claim and press the warrant underneath it.',
-    hard: 'I will test the warrant, the link, and the impact comparison before moving on.',
-  }[input.difficulty];
-  const targetedPoint = latestPoint
-    ? `Your latest claim, “${latestPoint}”, needs a clearer link to the motion.`
-    : `The ${input.currentTurn.label.toLowerCase()} needs a clear claim, warrant, and impact.`;
-  const roleMove = {
-    introductor: 'Set the framework, thesis, definitions, and roadmap without spending the full constructive case.',
-    r1: 'Build the core constructive case, then answer the strongest opposing material already available.',
-    r2: 'Extend R1, win the central clash, and compare the competing impacts.',
-    conclusor: 'Add no new argument; crystallize the decisive clashes, weigh them, and close the ballot.',
-    opening: 'Establish the opening case and its central mechanism.',
-    constructive: 'Build the constructive case with a complete warrant and impact.',
-    rebuttal: 'Answer the strongest opposing material and protect the core case.',
-    summary: 'Collapse the round to its central clashes and comparisons.',
-    final: 'Weigh the remaining offense and explain the ballot without adding a new argument.',
-  }[input.currentTurn.kind];
-
-  return {
-    action: 'respond',
-    speech: {
-      content: `As ${input.currentTurn.label}, the job is to ${roleMove.charAt(0).toLowerCase()}${roleMove.slice(1)} On ${input.motion}, the ${input.currentTurn.side} side has to explain why its proposed outcome follows in practice. ${targetedPoint} ${difficultyLine}`,
-      strategy: roleMove,
-      targetedPoints: [targetedPoint],
-    },
-  };
-}
-
-/** Deterministic scorecard for local development. It never depends on time or randomness. */
-export async function mockJudgeSparringSession(input: SparringScoreInput): Promise<SparringScoreResponse> {
-  const userWords = input.speeches
-    .filter((speech) => speech.speaker === 'user')
-    .reduce((total, speech) => total + wordCount(speech.content), 0);
-  const aiWords = input.speeches
-    .filter((speech) => speech.speaker === 'ai')
-    .reduce((total, speech) => total + wordCount(speech.content), 0);
-  const userTurns = input.speeches.filter((speech) => speech.speaker === 'user').length;
-  const aiTurns = input.speeches.filter((speech) => speech.speaker === 'ai').length;
-  const difficultyAdjustment = { easy: -2, medium: 0, hard: 2 }[input.difficulty];
-  const userDepth = Math.min(10, userWords / 80);
-  const aiDepth = Math.min(10, aiWords / 80);
-  const userScores = {
-    Logic: clampScore(14 + userDepth),
-    Evidence: clampScore(11 + userDepth / 2),
-    Delivery: clampScore(13 + Math.min(10, userTurns * 2)),
-    Strategy: clampScore(12 + userDepth / 2 + (userTurns > 1 ? 2 : 0)),
-  };
-  const aiScores = {
-    Logic: clampScore(14 + aiDepth + difficultyAdjustment),
-    Evidence: clampScore(12 + aiDepth / 2 + difficultyAdjustment),
-    Delivery: clampScore(14 + Math.min(10, aiTurns * 2) + difficultyAdjustment),
-    Strategy: clampScore(13 + aiDepth / 2 + (aiTurns > 1 ? 2 : 0) + difficultyAdjustment),
-  };
-  const categoryNames = ['Logic', 'Evidence', 'Delivery', 'Strategy'] as const;
-  const userScore = categoryNames.reduce((total, name) => total + userScores[name], 0);
-  const aiScore = categoryNames.reduce((total, name) => total + aiScores[name], 0);
-  const winner = userScore === aiScore ? 'tie' : userScore > aiScore ? 'user' : 'ai';
-  const winnerLabel = winner === 'tie' ? 'The round is close.' : `${winner === 'user' ? 'You' : 'The AI'} win the simulated ballot.`;
-  const firstUserSpeech = input.speeches.find((speech) => speech.speaker === 'user');
-
-  return {
-    action: 'score',
-    scorecard: {
-      userScore,
-      aiScore,
-      categories: categoryNames.map((name) => ({
-        name,
-        userScore: userScores[name],
-        aiScore: aiScores[name],
-        feedback: name === 'Delivery'
-          ? input.format === 'standard'
-            ? 'Judged from clarity, organization, time discipline, and fulfillment of the Introductor, R1, R2, and Conclusor roles, not vocal performance.'
-            : 'Judged from clarity, organization, and time discipline in the transcript, not vocal performance.'
-          : `The comparison reflects the ${name.toLowerCase()} visible in the completed speeches.`,
-      })),
-      overallFeedback: `${winnerLabel} The mock judge compared the completed speeches on the motion “${input.motion}”.`,
-      keyMoments: firstUserSpeech
-        ? [`Your opening turn established: “${firstUserSpeech.content.trim().replace(/\s+/g, ' ').slice(0, 120)}”`]
-        : ['No user speech was submitted, so there was no user argument to weigh.'],
-      improvementAreas: [
-        'Make each warrant explicit before moving to the impact.',
-        input.format === 'standard'
-          ? 'Keep each school-format speaker in role: Introductor frames, R1 builds, R2 clashes, and Conclusor adds no new argument.'
-          : 'Name the opponent’s strongest point, then explain why your weighing still wins.',
-      ],
-      winner,
-      verdict: winner === 'tie'
-        ? 'Close round. The next improvement should target the clearest unresolved clash.'
-        : `${winner === 'user' ? 'Your' : 'The AI’s'} side wins on the aggregate category score.`,
-    },
-  };
-}
-
-// Names kept short for callers that treat the mock provider as a feature adapter.
diff --git a/src/lib/ai/providers/types.ts b/src/lib/ai/providers/types.ts
index 28d9c707e..b3ae18a4c 100644
--- a/src/lib/ai/providers/types.ts
+++ b/src/lib/ai/providers/types.ts
@@ -16,22 +16,12 @@ export type {
   ModelSelection,
   ReasoningEffort,
 } from '../../../../supabase/functions/_shared/model-catalog';
+export type { ModelCatalogEntry as AIModel } from '../../../../supabase/functions/_shared/model-catalog';
 
-export interface AIProvider {
-  id: string;
-  name: string;
-  models: readonly AIModel[];
-  isAvailable: () => boolean;
-}
+/** Every accepted model routes through OpenRouter; see _shared/model-catalog. */
+export const PROVIDER_ID = 'openrouter';
 
-export interface AIModel {
-  id: string;
-  name: string;
-  maxTokens: number;
-  isProOnly: boolean;
-  supportsTemperature: boolean;
-  supportedEfforts: readonly ReasoningEffort[];
-}
+export const AVAILABLE_MODELS = MODEL_CATALOG;
 
 export interface ProviderConfig {
   provider: string;
@@ -39,12 +29,3 @@ export interface ProviderConfig {
   temperature: number;
   reasoningEffort?: ReasoningEffort;
 }
-
-export const DEFAULT_PROVIDERS: AIProvider[] = [
-  {
-    id: 'openrouter',
-    name: 'OpenRouter',
-    models: MODEL_CATALOG,
-    isAvailable: () => true,
-  },
-];
diff --git a/src/lib/ai/streaming.ts b/src/lib/ai/streaming.ts
index a15f0afa5..2e3580b88 100644
--- a/src/lib/ai/streaming.ts
+++ b/src/lib/ai/streaming.ts
@@ -114,7 +114,7 @@ export async function streamAskChat(
   options: AskStreamOptions,
   handlers: AskStreamHandlers
 ): Promise<AskOutput> {
-  const provider = config.provider === 'mock' ? 'mock' : 'openrouter';
+  const provider = 'openrouter';
   const requestId = `stream_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
   const startTime = performance.now();
   captureProductEvent('ai_request_started', {
diff --git a/src/lib/export-sparring-labels.ts b/src/lib/export-sparring-labels.ts
new file mode 100644
index 000000000..365fb187f
--- /dev/null
+++ b/src/lib/export-sparring-labels.ts
@@ -0,0 +1,35 @@
+// Label and duration formatting shared by the DOCX and PDF sparring exporters.
+// The Google Docs exporter runs on Deno in supabase/functions and has no sparring
+// mode, so it does not consume these.
+import i18n from '@/i18n';
+import type { SparringSession } from './stores/sparring-store';
+
+export function formatSparringDuration(seconds: number): string {
+  const totalSeconds = Math.max(0, Math.round(seconds));
+  const minutes = Math.floor(totalSeconds / 60);
+  const remainder = String(totalSeconds % 60).padStart(2, '0');
+  return `${minutes}:${remainder}`;
+}
+
+export function getSparringSideLabel(side: SparringSession['userSide']): string {
+  return side === 'pro' ? i18n.t('export.proposition') : i18n.t('export.opposition');
+}
+
+export function getSparringWinnerLabel(session: SparringSession): string {
+  const winner = session.scorecard?.winner;
+  if (winner === 'user') return i18n.t('export.sparringUser');
+  if (winner === 'ai') return i18n.t('export.sparringOpponent');
+  return i18n.t('export.sparringTie');
+}
+
+export function getSparringCategoryLabel(category: string): string {
+  return i18n.t(`sparring.category.${category}`, category);
+}
+
+export function getSparringTurnLabel(speech: SparringSession['speeches'][number]): string {
+  return i18n.t(`sparring.turns.${speech.turnId}`, speech.role);
+}
+
+export function getSparringFormatLabel(format: SparringSession['format']): string {
+  return i18n.t(`sparring.format.${format}`, format.toUpperCase());
+}
diff --git a/src/lib/export-utils.ts b/src/lib/export-utils.ts
index b13b52dac..fa395b6cd 100644
--- a/src/lib/export-utils.ts
+++ b/src/lib/export-utils.ts
@@ -6,35 +6,25 @@ import type { FactoidsOutput } from './ai/schemas/factoids';
 import type { SparringSession } from './stores/sparring-store';
 import { formatEuropeanDate, formatEuropeanDateTime } from './date-format';
 import { captureProductEvent } from '@/lib/observability';
-
-function formatSparringDuration(seconds: number): string {
-  const totalSeconds = Math.max(0, Math.round(seconds));
-  const minutes = Math.floor(totalSeconds / 60);
-  const remainder = String(totalSeconds % 60).padStart(2, '0');
-  return `${minutes}:${remainder}`;
-}
-
-function getSparringSideLabel(side: SparringSession['userSide']): string {
-  return side === 'pro' ? i18n.t('export.proposition') : i18n.t('export.opposition');
-}
-
-function getSparringWinnerLabel(session: SparringSession): string {
-  const winner = session.scorecard?.winner;
-  if (winner === 'user') return i18n.t('export.sparringUser');
-  if (winner === 'ai') return i18n.t('export.sparringOpponent');
-  return i18n.t('export.sparringTie');
-}
-
-function getSparringCategoryLabel(category: string): string {
-  return i18n.t(`sparring.category.${category}`, category);
-}
-
-function getSparringTurnLabel(speech: SparringSession['speeches'][number]): string {
-  return i18n.t(`sparring.turns.${speech.turnId}`, speech.role);
-}
-
-function getSparringFormatLabel(format: SparringSession['format']): string {
-  return i18n.t(`sparring.format.${format}`, format.toUpperCase());
+import {
+  formatSparringDuration,
+  getSparringCategoryLabel,
+  getSparringFormatLabel,
+  getSparringSideLabel,
+  getSparringTurnLabel,
+  getSparringWinnerLabel,
+} from './export-sparring-labels';
+
+/** Triggers a browser download from a Blob. */
+function saveBlob(blob: Blob, filename: string): void {
+  const url = URL.createObjectURL(blob);
+  const link = document.createElement('a');
+  link.href = url;
+  link.download = filename;
+  document.body.append(link);
+  link.click();
+  link.remove();
+  URL.revokeObjectURL(url);
 }
 
 export async function exportCaseToDocx(result: GenerateOutput): Promise<boolean> {
@@ -51,7 +41,6 @@ export async function exportCaseToDocx(result: GenerateOutput): Promise<boolean>
 
     // Dynamically import heavy libraries only when needed
     const { Document, Packer, Paragraph, TextRun, HeadingLevel, AlignmentType } = await import('docx');
-    const { saveAs } = await import('file-saver');
 
     const thesis = result.caseStructure.thesis?.trim() || 'Untitled Thesis';
     const motion = (result.metadata as Record<string, unknown>)?.motion as string | undefined;
@@ -192,7 +181,7 @@ export async function exportCaseToDocx(result: GenerateOutput): Promise<boolean>
 
     const blob = await Packer.toBlob(doc);
     const fileSuffix = result.metadata.side || 'case';
-    saveAs(blob, `DebateCase_${fileSuffix}.docx`);
+    saveBlob(blob, `DebateCase_${fileSuffix}.docx`);
     captureProductEvent('content_exported', { format: 'docx', tool: 'generate' });
     return true;
   } catch (error) {
@@ -211,7 +200,6 @@ export async function exportAttackToDocx(result: AttackOutput): Promise<boolean>
     }
 
     const { Document, Packer, Paragraph, TextRun, HeadingLevel, AlignmentType } = await import('docx');
-    const { saveAs } = await import('file-saver');
 
     const weaknesses = result.weaknesses || [];
     const weaknessesSection = weaknesses.length > 0
@@ -291,7 +279,7 @@ export async function exportAttackToDocx(result: AttackOutput): Promise<boolean>
     });
 
     const blob = await Packer.toBlob(doc);
-    saveAs(blob, `AttackAnalysis_${new Date().toISOString().split('T')[0]}.docx`);
+    saveBlob(blob, `AttackAnalysis_${new Date().toISOString().split('T')[0]}.docx`);
     captureProductEvent('content_exported', { format: 'docx', tool: 'attack' });
     return true;
   } catch (error) {
@@ -306,7 +294,6 @@ export async function exportAttackToDocx(result: AttackOutput): Promise<boolean>
 export async function exportBrainstormToDocx(result: BrainstormOutput): Promise<boolean> {
   try {
     const { Document, Packer, Paragraph, TextRun, HeadingLevel, AlignmentType } = await import('docx');
-    const { saveAs } = await import('file-saver');
 
     const children: InstanceType<typeof Paragraph>[] = [
       new Paragraph({
@@ -379,7 +366,7 @@ export async function exportBrainstormToDocx(result: BrainstormOutput): Promise<
 
     const doc = new Document({ sections: [{ properties: {}, children }] });
     const blob = await Packer.toBlob(doc);
-    saveAs(blob, `Brainstorm_${new Date().toISOString().split('T')[0]}.docx`);
+    saveBlob(blob, `Brainstorm_${new Date().toISOString().split('T')[0]}.docx`);
     captureProductEvent('content_exported', { format: 'docx', tool: 'brainstorm' });
     return true;
   } catch (error) {
@@ -398,7 +385,6 @@ export async function exportFactoidsToDocx(result: FactoidsOutput): Promise<bool
     }
 
     const { Document, Packer, Paragraph, TextRun, HeadingLevel, AlignmentType } = await import('docx');
-    const { saveAs } = await import('file-saver');
 
     const factoids = result.factoids || [];
     const factoidsSection = factoids.length > 0
@@ -455,7 +441,7 @@ export async function exportFactoidsToDocx(result: FactoidsOutput): Promise<bool
     });
 
     const blob = await Packer.toBlob(doc);
-    saveAs(blob, `Factoids_${new Date().toISOString().split('T')[0]}.docx`);
+    saveBlob(blob, `Factoids_${new Date().toISOString().split('T')[0]}.docx`);
     captureProductEvent('content_exported', { format: 'docx', tool: 'factoids' });
     return true;
   } catch (error) {
@@ -602,7 +588,6 @@ export async function exportFactoidsToGoogleDocs(result: FactoidsOutput): Promis
 export async function exportSparringToDocx(session: SparringSession): Promise<boolean> {
   try {
     const { Document, Packer, Paragraph, TextRun, HeadingLevel, AlignmentType } = await import('docx');
-    const { saveAs } = await import('file-saver');
     const totalTimeUsedSeconds = session.speeches.reduce((total, speech) => total + speech.timeUsedSeconds, 0);
     const totalTimeLimitSeconds = session.speeches.reduce((total, speech) => total + speech.timeLimitSeconds, 0);
     const scorecard = session.scorecard;
@@ -700,7 +685,7 @@ export async function exportSparringToDocx(session: SparringSession): Promise<bo
     });
 
     const blob = await Packer.toBlob(doc);
-    saveAs(blob, `SparringTranscript_${new Date(session.updatedAt).toISOString().slice(0, 10)}.docx`);
+    saveBlob(blob, `SparringTranscript_${new Date(session.updatedAt).toISOString().slice(0, 10)}.docx`);
     captureProductEvent('content_exported', { format: 'docx', tool: 'sparring' });
     return true;
   } catch (error) {
diff --git a/src/lib/jam-metadata.ts b/src/lib/jam-metadata.ts
index 26d524b7c..3fb8a273b 100644
--- a/src/lib/jam-metadata.ts
+++ b/src/lib/jam-metadata.ts
@@ -1,8 +1,19 @@
-import { jam } from "@jam.dev/sdk";
+/**
+ * Publishes the current user id to the Jam recorder, which reads
+ * `window.__jam__.exports.metadata`. The recorder itself loads as a script
+ * tag from jam-loader.ts, so the npm SDK is not installed; it only wrote
+ * this same global.
+ */
+interface JamWindow extends Window {
+  __jam__?: { exports?: { metadata?: () => { userId: string | undefined } } };
+}
 
 let currentUserId: string | undefined;
 
-jam.metadata(() => ({ userId: currentUserId }));
+const jamWindow = window as JamWindow;
+jamWindow.__jam__ ??= {};
+jamWindow.__jam__.exports ??= {};
+jamWindow.__jam__.exports.metadata = () => ({ userId: currentUserId });
 
 export function setJamUserId(userId: string | undefined): void {
   currentUserId = userId;
diff --git a/src/lib/observability.ts b/src/lib/observability.ts
index 6dfc66ed2..62fc21ee1 100644
--- a/src/lib/observability.ts
+++ b/src/lib/observability.ts
@@ -1,4 +1,4 @@
-import { DEFAULT_PROVIDERS } from "@/lib/ai/providers/types";
+import { AVAILABLE_MODELS, PROVIDER_ID } from "@/lib/ai/providers/types";
 
 type SentryModule = typeof import("@sentry/react");
 type PostHogClient = typeof import("posthog-js")["default"];
@@ -56,8 +56,8 @@ const STRING_PROPERTY_VALUES: Record<string, ReadonlySet<string>> = {
   ]),
   feature: new Set(["ask", "attack", "brainstorm", "crossfire", "factoids", "generate", "sparring"]),
   format: new Set(["docx", "google_docs", "ld", "pdf", "pf", "standard"]),
-  model: new Set(DEFAULT_PROVIDERS.flatMap((provider) => provider.models.map((model) => model.id))),
-  provider: new Set(DEFAULT_PROVIDERS.map((provider) => provider.id)),
+  model: new Set(AVAILABLE_MODELS.map((model) => model.id)),
+  provider: new Set([PROVIDER_ID]),
   tool: new Set([
     "admin",
     "ask",
diff --git a/src/lib/pdf-export-utils.ts b/src/lib/pdf-export-utils.ts
index 0968f08f1..47d8e1bbf 100644
--- a/src/lib/pdf-export-utils.ts
+++ b/src/lib/pdf-export-utils.ts
@@ -8,6 +8,14 @@ import type { FactoidsOutput } from './ai/schemas/factoids';
 import type { SparringSession } from './stores/sparring-store';
 import { formatEuropeanDate } from './date-format';
 import { captureProductEvent } from '@/lib/observability';
+import {
+    formatSparringDuration,
+    getSparringCategoryLabel,
+    getSparringFormatLabel,
+    getSparringSideLabel,
+    getSparringTurnLabel,
+    getSparringWinnerLabel,
+} from './export-sparring-labels';
 import { isAppLanguage } from '@/lib/languages';
 import liberationSansRegularUrl from 'pdfjs-dist/standard_fonts/LiberationSans-Regular.ttf?url';
 import liberationSansBoldUrl from 'pdfjs-dist/standard_fonts/LiberationSans-Bold.ttf?url';
@@ -46,36 +54,6 @@ const COLORS = {
     light: [248, 250, 252] as [number, number, number], // Light
 };
 
-function formatSparringDuration(seconds: number): string {
-    const totalSeconds = Math.max(0, Math.round(seconds));
-    const minutes = Math.floor(totalSeconds / 60);
-    const remainder = String(totalSeconds % 60).padStart(2, '0');
-    return `${minutes}:${remainder}`;
-}
-
-function getSparringSideLabel(side: SparringSession['userSide']): string {
-    return side === 'pro' ? i18n.t('export.proposition') : i18n.t('export.opposition');
-}
-
-function getSparringWinnerLabel(session: SparringSession): string {
-    const winner = session.scorecard?.winner;
-    if (winner === 'user') return i18n.t('export.sparringUser');
-    if (winner === 'ai') return i18n.t('export.sparringOpponent');
-    return i18n.t('export.sparringTie');
-}
-
-function getSparringCategoryLabel(category: string): string {
-    return i18n.t(`sparring.category.${category}`, category);
-}
-
-function getSparringTurnLabel(speech: SparringSession['speeches'][number]): string {
-    return i18n.t(`sparring.turns.${speech.turnId}`, speech.role);
-}
-
-function getSparringFormatLabel(format: SparringSession['format']): string {
-    return i18n.t(`sparring.format.${format}`, format.toUpperCase());
-}
-
 interface PDFHelpers {
     doc: import('jspdf').jsPDF;
     y: number;
diff --git a/src/lib/stores/settings-store.ts b/src/lib/stores/settings-store.ts
index 2fcee066c..36182e0b2 100644
--- a/src/lib/stores/settings-store.ts
+++ b/src/lib/stores/settings-store.ts
@@ -87,11 +87,9 @@ function normalizeModelId(value: unknown, fallback: string = DEFAULT_MODEL): str
 function normalizeFeatureConfig(
   value: unknown,
   fallback: ProviderConfig,
-  preserveLocalMock = false,
   allowProModels = true,
 ): ProviderConfig {
   const candidate = asRecord(value);
-  const isLocalMock = preserveLocalMock && candidate?.provider === 'mock' && candidate?.model === 'local';
   const model = normalizeModelId(candidate?.model, fallback.model);
   const temperature = typeof candidate?.temperature === 'number' && Number.isFinite(candidate.temperature)
     ? candidate.temperature
@@ -101,14 +99,12 @@ function normalizeFeatureConfig(
     : fallback.reasoningEffort ?? 'low';
 
   return {
-    provider: isLocalMock ? 'mock' : DEFAULT_PROVIDER,
-    model: isLocalMock
-      ? 'local'
-      : !allowProModels && model === AUTO_PRO
-        ? AUTO_FAST
-        : !allowProModels && getModelCatalogEntry(model)?.isProOnly
-          ? DEFAULT_MODEL
-          : model,
+    provider: DEFAULT_PROVIDER,
+    model: !allowProModels && model === AUTO_PRO
+      ? AUTO_FAST
+      : !allowProModels && getModelCatalogEntry(model)?.isProOnly
+        ? DEFAULT_MODEL
+        : model,
     temperature,
     reasoningEffort,
   };
@@ -116,7 +112,6 @@ function normalizeFeatureConfig(
 
 function normalizeFeatureConfigs(
   configs: unknown,
-  preserveLocalMock = false,
   allowProModels = true,
   fallbackModel: string = DEFAULT_MODEL,
 ): Record<FeatureTab, ProviderConfig> {
@@ -125,7 +120,7 @@ function normalizeFeatureConfigs(
   if (!saved) return defaults;
 
   return Object.fromEntries((Object.keys(defaults) as FeatureTab[]).map((feature) => {
-    return [feature, normalizeFeatureConfig(saved[feature], defaults[feature], preserveLocalMock, allowProModels)];
+    return [feature, normalizeFeatureConfig(saved[feature], defaults[feature], allowProModels)];
   })) as Record<FeatureTab, ProviderConfig>;
 }
 
@@ -297,7 +292,6 @@ export const useSettingsStore = create<SettingsState>()(
         if (allowProModels === null) return;
         const mergedConfigs = normalizeFeatureConfigs(
           data.feature_configs,
-          false,
           allowProModels,
           allowProModels ? DEFAULT_PRO_MODEL : DEFAULT_MODEL,
         );
@@ -339,7 +333,7 @@ export const useSettingsStore = create<SettingsState>()(
       migrate: (persistedState: unknown, version) => {
         const saved = asRecord(persistedState);
         if (!saved) return persistedState;
-        const featureConfigs = normalizeFeatureConfigs(saved.featureConfigs, true);
+        const featureConfigs = normalizeFeatureConfigs(saved.featureConfigs);
         if (version < 2) {
           for (const config of Object.values(featureConfigs)) {
             if (config.model === 'z-ai/glm-5.3-flash') config.model = DEFAULT_MODEL;
@@ -354,7 +348,7 @@ export const useSettingsStore = create<SettingsState>()(
       },
       onRehydrateStorage: () => (state) => {
         if (!state) return;
-        state.featureConfigs = normalizeFeatureConfigs(state.featureConfigs, true);
+        state.featureConfigs = normalizeFeatureConfigs(state.featureConfigs);
         if (!isAppLanguage(state.language)) state.language = 'en';
         if (!isAppLanguage(state.outputLanguage)) state.outputLanguage = 'en';
         if (!state.theme) state.theme = 'system';
diff --git a/src/locales/en.json b/src/locales/en.json
index 17f85807c..f0b9635dd 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -286,10 +286,8 @@
     "historyDesc": "Reopen saved cases, chats, and previous prep sessions."
   },
   "generate": {
-    "title": "Generate Case",
     "emptyTitle": "Ready to Generate",
     "emptyDesc": "Enter your motion and preferences to generate a complete debate case with arguments, counters, and strategic analysis.",
-    "save": "Save Case",
     "saved": "Case Saved",
     "savedDesc": "Your case has been saved to history.",
     "savePrompt": "Enter a title for this case:",
@@ -304,19 +302,16 @@
     "flowchartNoData": "No valid case data to import."
   },
   "attack": {
-    "title": "Attack My Case",
     "emptyTitle": "No Mercy Mode",
     "emptyDesc": "Paste your argument to receive ruthless criticism, identify logical fallacies, and get actionable improvements.",
     "failed": "Attack Analysis Failed"
   },
   "brainstorm": {
-    "title": "Brainstorm Ideas",
     "emptyTitle": "Unlock Creative Angles",
     "emptyDesc": "Describe your motion to explore unconventional argument angles, identify tradeoffs, and find your strongest positions.",
     "failed": "Brainstorming Failed"
   },
   "factoids": {
-    "title": "Factoids & Sources",
     "emptyTitle": "Evidence That Wins",
     "emptyDesc": "Enter a claim to find supporting factoids with real citations, context, and guidance on how to use them effectively.",
     "failed": "Research Failed",
@@ -324,9 +319,7 @@
     "savedToLibraryDesc": "This evidence is now available for grounding."
   },
   "ask": {
-    "title": "Ask Your Coach",
     "failed": "Error",
-    "failedDesc": "Request failed. Please try again.",
     "timeout": "Request Timed Out",
     "timeoutDesc": "The request took too long. Please try again.",
     "saved": "Saved",
@@ -400,9 +393,6 @@
     "title": "Sign in to DebateLab",
     "subtitle": "Sign in with Google, email, or an admin-issued demo code.",
     "google": "Continue with Google",
-    "googleTab": "Google",
-    "email": "Email",
-    "demoCode": "Demo code",
     "emailTab": "Email",
     "demoTab": "Demo code",
     "orContinueWith": "Or continue with",
@@ -414,11 +404,9 @@
     "resendCode": "Resend code",
     "resendingCode": "Resending code...",
     "codeSent": "Code sent",
-    "checkEmail": "Check your email for a six-digit code.",
     "codeSentDesc": "Check your email for the six-digit code.",
     "useDifferentEmail": "Use a different email",
     "otpLabel": "Verification code",
-    "verificationCode": "Verification code",
     "verificationCodePlaceholder": "123456",
     "verifyCode": "Verify code",
     "verifying": "Verifying...",
@@ -427,21 +415,16 @@
     "demoCodePlaceholder": "DEMO-AB12-CD34",
     "signInWithDemoCode": "Sign in with demo code",
     "signingIn": "Signing in...",
-    "demoDescription": "Use an admin-issued code for temporary demo access.",
     "invalidEmail": "Enter a valid email address.",
     "invalidCode": "Enter a valid six-digit code.",
     "invalidDemoCode": "Enter a valid demo code.",
-    "requiredEmail": "Enter your email address.",
     "emailOtpError": "Could not send code.",
-    "requiredOtp": "Enter the verification code.",
     "verifyOtpError": "Could not verify code.",
-    "requiredDemoCode": "Enter your demo code.",
     "demoError": "Could not sign in with demo code.",
     "demoCodeHint": "Enter the code provided by your event host.",
     "redirecting": "Redirecting...",
     "failed": "Could not start sign in",
-    "tryAgain": "Please try again.",
-    "termsNotice": "By continuing, you agree to our Terms and Privacy Policy."
+    "tryAgain": "Please try again."
   },
   "admin": {
     "demoAccess": "Demo access",
@@ -736,7 +719,6 @@
       "sidePro": "In favor",
       "roleLabel": "Role",
       "roleValue": "Opening",
-      "sampleLabel": "Example",
       "modeLabel": "Example modes",
       "modeGenerate": "Generate",
       "modeCrossfire": "Crossfire",
@@ -917,26 +899,20 @@
   "rateLimit": {
     "title": "Rate Limit Exceeded"
   },
-  "subscription": {
-    "required": "Subscription required."
-  },
   "generateForm": {
     "title": "Generate Debate Case",
     "subtitle": "Create structured arguments for any motion",
     "motion": "Motion / Topic",
     "motionPlaceholder": "e.g., This house believes that artificial intelligence will create more jobs than it destroys",
     "side": "Side",
-    "sideAuto": "Auto (Pick Best)",
     "sidePro": "In favor",
     "sideCon": "Against",
     "format": "Debate Format",
-    "formatStandard": "Standard Tournament (4-6-6-3)",
     "role": "Speaker Role",
     "roleIntro": "Introductor (4 min)",
     "roleR1": "R1 - Rebuttal/Arg (6 min)",
     "roleR2": "R2 - Rebuttal/Build (6 min)",
     "roleConc": "Conclusor (3 min)",
-    "more": "More",
     "moreOptions": "More options",
     "length": "Case Length",
     "lengthBrief": "Brief",
@@ -969,7 +945,6 @@
     "incompleteDesc": "The AI response was incomplete or malformed. Please try generating again.",
     "proposition": "In favor",
     "opposition": "Against",
-    "generated": "Generated",
     "modelLabel": "Model: {{value}}",
     "durationMs": "{{value}} ms",
     "durationS": "{{value}}s",
@@ -977,9 +952,6 @@
     "save": "Save",
     "discuss": "Discuss",
     "flowcharts": "Flowcharts",
-    "word": "Word",
-    "pdf": "PDF",
-    "googleDocs": "Google Docs",
     "exordio": "Exordio",
     "exordioDesc": "Your compelling opening",
     "hook": "Hook",
@@ -1010,8 +982,6 @@
     "rebuttal": "Rebuttal:",
     "exportedGdocs": "Case exported to Google Docs!",
     "open": "Open",
-    "authRequired": "Authentication required",
-    "authRequiredDesc": "Please sign out and sign back in to grant Google Drive access.",
     "exportFailed": "Failed to export to Google Docs",
     "exportError": "An unexpected error occurred during export"
   },
@@ -1079,8 +1049,6 @@
     "exportFailedDocx": "Failed to export to DOCX",
     "exportFailedPdf": "Failed to export to PDF",
     "open": "Open",
-    "authRequired": "Authentication required",
-    "authRequiredDesc": "Please sign out and sign back in to grant Google Drive access.",
     "exportFailedGdocs": "Failed to export to Google Docs",
     "exportError": "An unexpected error occurred during export"
   },
@@ -1126,8 +1094,6 @@
     "exportFailedDocx": "Failed to export to DOCX",
     "exportedGdocs": "Brainstorm exported to Google Docs!",
     "open": "Open",
-    "authRequired": "Authentication required",
-    "authRequiredDesc": "Please sign out and sign back in to grant Google Drive access.",
     "exportFailedGdocs": "Failed to export to Google Docs",
     "exportError": "An unexpected error occurred during export"
   },
@@ -1162,7 +1128,6 @@
     "verified": "Verified",
     "unverified": "Unverified",
     "pending": "Pending",
-    "needVerification": "need verification",
     "importantNotes": "Important Notes",
     "found": "Found",
     "factoids": "Factoids",
@@ -1181,14 +1146,10 @@
     "saveToLibrary": "Save to Library",
     "saveClaimToLibrary": "Save {{claim}} to library",
     "discuss": "Discuss Evidence",
-    "verifyAll": "Verify All Sources",
-    "verifying": "Verifying Sources...",
     "exportedDocx": "Factoids exported to DOCX!",
     "exportFailedDocx": "Failed to export to DOCX",
     "exportedGdocs": "Factoids exported to Google Docs!",
     "open": "Open",
-    "authRequired": "Authentication required",
-    "authRequiredDesc": "Please sign out and sign back in to grant Google Drive access.",
     "exportFailedGdocs": "Failed to export to Google Docs",
     "exportError": "An unexpected error occurred during export"
   },
@@ -1297,12 +1258,6 @@
   "onboarding": {
     "welcome": "Welcome to DebateLab! 🎉",
     "welcomeDesc": "Let's take a quick tour through every prep mode.",
-    "step1": "Step 1: Enter Your Motion",
-    "step1Desc": "Type any debate topic here. For example: \"This house believes that AI will create more jobs than it destroys.\"",
-    "step2": "Step 2: Generate Your Case",
-    "step2Desc": "Click this button to generate a structured debate case with arguments, evidence, and rebuttals.",
-    "step3": "Step 3: Save & Export",
-    "step3Desc": "After generating, you can save your case to history or export it as a Word document.",
     "generate": "Generate",
     "generateDesc": "Create complete cases, organize arguments, and export polished prep.",
     "attack": "Attack",
@@ -1510,7 +1465,6 @@
     "importFileLabel": "Import file",
     "chooseFile": "Choose file",
     "unsupportedFile": "Unsupported file",
-    "unsupportedFileDesc": "Import plain text, Markdown, CSV, or JSON. PDF/DOCX parsing is not reliable here yet.",
     "importPreview": "Import preview",
     "saveImported": "Save imported source",
     "words": "words",
@@ -1536,7 +1490,6 @@
     "sortFolder": "Folder",
     "folderCreated": "Folder created",
     "folderCreatedDesc": "New sources can now be saved there.",
-    "folderFilter": "Folder filter",
     "allFolders": "All folders",
     "importUrlRequired": "Enter a URL to import.",
     "importReady": "Source Ready",
@@ -1545,9 +1498,6 @@
     "importFailedDesc": "Could not import this source.",
     "duplicateSource": "Source already in library",
     "duplicateSourceDesc": "This URL or file is already saved.",
-    "fileTooLarge": "File Too Large",
-    "fileTooLargeDesc": "Choose a text file under 250 KB.",
-    "fileEmpty": "This file has no readable text.",
     "fileReadFailed": "Could not read this file.",
     "saveToLibrary": "Save to Library",
     "addNewTitle": "Add New Source",
@@ -1567,9 +1517,6 @@
     "sourcesCount": "sources",
     "emptyTitle": "No Sources Yet",
     "emptyDesc": "Add sources to ground AI responses in real evidence.",
-    "active": "Active",
-    "disabled": "Disabled",
-    "added": "Added",
     "manualEntry": "Manual Entry",
     "groundingActive": "Grounding Active",
     "groundingDisabled": "Grounding Disabled",
@@ -1827,40 +1774,20 @@
       "Strategy": "Strategy"
     },
     "setup": {
-      "liveLabel": "Live practice room",
-      "heading": "Spar with an opponent who listens.",
-      "subtitle": "Choose a motion, take a side, and work through a timed round. The AI keeps the transcript in view, answers the arguments you actually make, and scores the written debate at the end.",
-      "onlineReady": "Ready to call the debate coach",
-      "offlineDraft": "Offline. Your draft stays in this tab.",
       "setMotion": "Set the motion",
-      "setMotionDescription": "Write the resolution as you would hear it in the room.",
       "motion": "Motion",
       "motionPlaceholder": "This house would require social media companies to verify the age of every user.",
-      "motionHelp": "A precise motion gives the opponent something concrete to attack.",
       "motionTooShort": "Add a little more detail so the motion is judgeable.",
       "pickSide": "Pick your side",
-      "pickSideDescription": "You will write every speech for the side you choose.",
-      "proDescription": "Defend the resolution and show why it should pass.",
-      "conDescription": "Challenge the resolution and show why it should fail.",
       "choosePressure": "Choose the pressure",
-      "choosePressureDescription": "The opponent adapts its arguments to this level.",
-      "difficultyDescription": {
-        "easy": "Clear arguments and generous openings.",
-        "medium": "A capable opponent who follows the flow.",
-        "hard": "Fast counters that look for every gap."
-      },
       "roundFormat": "Round format",
-      "roundFormatDescription": "Set the speaking order.",
       "speeches": "{{count}} speeches",
       "aboutMinutes": "About {{count}} minutes",
-      "roomAtGlance": "Your room, at a glance",
-      "speakingPlan": "Speaking plan",
       "turns": "{{count}} turns",
       "opponentTurns": "Opponent turns",
       "aiRequests": "AI requests",
       "aiRequestBreakdown": "{{count}} replies + 1 judge",
       "aiModel": "AI model",
-      "modelHelp": "Model settings follow the sparring profile in Settings.",
       "openingRoom": "Opening room...",
       "startRound": "Start round",
       "draftNotice": "Your draft is saved in this tab as you type. You can pause without losing your place.",
@@ -1963,10 +1890,7 @@
     "title": "Language",
     "description": "Choose the app language and the language used in AI outputs.",
     "uiLanguage": "Interface language",
-    "outputLanguage": "AI output language",
-    "en": "English",
-    "es": "Español",
-    "hu": "Magyar"
+    "outputLanguage": "AI output language"
   },
   "crossfire": {
     "openFromResult": "Open in Crossfire",
@@ -2005,18 +1929,9 @@
     "sourceLibraryDesc": "Ground the AI's questions and answers in your active library sources.",
     "sourceLibraryEmpty": "Your Source Library has no active sources yet.",
     "seedQuestionsLabel": "Opening questions (optional)",
-    "seedQuestionsPlaceholder": "Add an opening question...",
-    "addSeedQuestion": "Add question",
-    "removeSeedQuestion": "Remove question",
     "start": "Start crossfire",
-    "resume": "Resume crossfire",
-    "resumeDescription": "You have an unfinished crossfire session saved on this device.",
-    "discardDraft": "Discard draft",
-    "clearDraft": "Clear saved session",
     "loading": "Loading crossfire...",
-    "starting": "Starting crossfire...",
     "thinking": "The coach is thinking...",
-    "retry": "Try again",
     "retryResponse": "Retry response",
     "timeout": "The request timed out",
     "timeoutDesc": "The coach took too long to respond. Your message is still here, so you can try again.",
@@ -2027,23 +1942,23 @@
     "invalidDebriefResponseDesc": "The coach returned an incomplete debrief. Try again to continue.",
     "interruptedRequest": "The previous request was interrupted. Retry it to continue.",
     "interruptedDebrief": "The previous debrief was interrupted. Retry it to continue.",
-    "emptyTitle": "Ready when you are",
     "emptyDesc": "Set a resolution and an argument to start a focused cross-examination.",
     "timerLabel": "Time remaining",
-    "timeUp": "Time is up",
     "endSession": "End session",
-    "endSessionConfirm": "End this crossfire?",
-    "endSessionDesc": "You will get a debrief based on the exchange so far.",
-    "endNow": "End now",
-    "cancel": "Cancel",
     "transcript": "Transcript",
-    "yourTurn": "Your turn",
-    "coachTurn": "Coach turn",
     "question": "Question",
     "answer": "Answer",
     "liveSignals": "Live coaching signals",
-    "signalQuality": { "direct": "Direct answer", "partial": "Partial answer", "evasive": "Evasive answer" },
-    "signalConcession": { "none": "No concession", "implicit": "Implicit concession", "explicit": "Explicit concession" },
+    "signalQuality": {
+      "direct": "Direct answer",
+      "partial": "Partial answer",
+      "evasive": "Evasive answer"
+    },
+    "signalConcession": {
+      "none": "No concession",
+      "implicit": "Implicit concession",
+      "explicit": "Explicit concession"
+    },
     "signalFollowUp": "Follow-up opportunity",
     "signalConfidence": "{{label}}, confidence {{percent}}%",
     "signalProbability": "{{label}}, probability {{percent}}%",
@@ -2055,16 +1970,12 @@
     "submitAnswer": "Send answer",
     "charactersRemaining_one": "{{count}} character remaining",
     "charactersRemaining_other": "{{count}} characters remaining",
-    "sessionEnded": "Session ended",
-    "sessionEndedTimer": "The timer ran out.",
-    "sessionEndedManual": "You ended the session.",
     "debriefTitle": "Crossfire debrief",
     "debriefSubtitle": "Review what happened in the exchange and plan your next move.",
     "debriefLoading": "Building your debrief...",
     "debriefRetry": "Retry debrief",
     "debriefTimeout": "The debrief timed out",
     "debriefError": "Could not build the debrief",
-    "debriefEmpty": "No debrief yet",
     "debriefEmptyDesc": "Complete at least one exchange before ending the session.",
     "concessionsSecured": "Concessions secured",
     "controlledQuestions": "Questions that controlled the exchange",
@@ -2073,25 +1984,13 @@
     "missedFollowUps": "Missed follow-up opportunities",
     "betterFollowUpQuestions": "Better follow-up questions",
     "strongestExchange": "Strongest exchange",
-    "claim": "Claim",
-    "reason": "Why it matters",
-    "followUp": "Follow-up",
-    "turnReference": "Turn {{number}}",
     "transcriptReferences": "Transcript references",
-    "citations": "Citations",
-    "citationsDesc": "Sources used to ground this exchange",
-    "source": "Source",
     "sources": "Sources",
-    "noCitations": "No citations were used.",
     "importFromGenerate": "Import from Generate",
     "importFromAttack": "Import from Attack",
     "importGenerateDesc": "Bring in a generated case as your starting argument.",
     "importAttackDesc": "Bring in cross-examination questions from an attack analysis.",
-    "importUnavailable": "No compatible content is available to import.",
-    "restart": "Start another crossfire",
-    "newSession": "New session",
-    "backToSetup": "Back to setup",
-    "exit": "Exit crossfire"
+    "restart": "Start another crossfire"
   },
   "routeError": {
     "heading": "Unable to load this page",
@@ -2111,7 +2010,12 @@
     "importance": "{{level}} importance",
     "strength": "{{level}} strength",
     "usageExplanation": "Used in {{count}} saved case(s). Importance: {{importance}}. Evidence strength: {{strength}}.",
-    "levels": { "0": "No", "1": "Low", "2": "Medium", "3": "High" },
+    "levels": {
+      "0": "No",
+      "1": "Low",
+      "2": "Medium",
+      "3": "High"
+    },
     "types": {
       "academic": "Academic",
       "government": "Government",
diff --git a/src/locales/es.json b/src/locales/es.json
index 11b5151fe..de4ffdfae 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -286,10 +286,8 @@
     "historyDesc": "Reabre casos guardados, chats y sesiones de preparación anteriores."
   },
   "generate": {
-    "title": "Generar Caso",
     "emptyTitle": "Tu Caso Te Espera",
     "emptyDesc": "Completa el formulario para generar un caso de debate estructurado con argumentos, evidencia y contra-estrategias.",
-    "save": "Guardar Caso",
     "saved": "Caso Guardado",
     "savedDesc": "Tu caso ha sido guardado en el historial.",
     "savePrompt": "Ingresa un título para este caso:",
@@ -304,19 +302,16 @@
     "flowchartNoData": "No hay datos de caso válidos para importar."
   },
   "attack": {
-    "title": "Atacar Mi Caso",
     "emptyTitle": "Modo Sin Piedad",
     "emptyDesc": "Pega tu argumento para recibir críticas despiadadas, identificar falacias lógicas y obtener mejoras accionables.",
     "failed": "Error en el Análisis de Ataque"
   },
   "brainstorm": {
-    "title": "Lluvia de Ideas",
     "emptyTitle": "Desbloquea Ángulos Creativos",
     "emptyDesc": "Describe tu moción para explorar ángulos de argumentación no convencionales, identificar compromisos y encontrar tus posiciones más fuertes.",
     "failed": "Error en la Lluvia de Ideas"
   },
   "factoids": {
-    "title": "Datos y Fuentes",
     "emptyTitle": "Evidencia Que Gana",
     "emptyDesc": "Ingresa una afirmación para encontrar datos de apoyo con citas reales, contexto y guía sobre cómo usarlos efectivamente.",
     "failed": "Error en la Investigación",
@@ -324,9 +319,7 @@
     "savedToLibraryDesc": "Esta evidencia ahora está disponible para fundamentación."
   },
   "ask": {
-    "title": "Pregunta a Tu Coach",
     "failed": "Error",
-    "failedDesc": "La solicitud falló. Inténtalo de nuevo.",
     "timeout": "Tiempo Agotado",
     "timeoutDesc": "La solicitud tardó demasiado. Inténtalo de nuevo.",
     "saved": "Guardado",
@@ -400,9 +393,6 @@
     "title": "Iniciar Sesión en DebateLab",
     "subtitle": "Inicia sesión con Google, email o un código demo emitido por un administrador.",
     "google": "Continuar con Google",
-    "googleTab": "Google",
-    "email": "Email",
-    "demoCode": "Código demo",
     "emailTab": "Email",
     "demoTab": "Código demo",
     "orContinueWith": "O continúa con",
@@ -414,11 +404,9 @@
     "resendCode": "Reenviar código",
     "resendingCode": "Reenviando código...",
     "codeSent": "Código enviado",
-    "checkEmail": "Revisa tu email para encontrar el código de seis dígitos.",
     "codeSentDesc": "Revisa tu email para encontrar el código de seis dígitos.",
     "useDifferentEmail": "Usar otro email",
     "otpLabel": "Código de verificación",
-    "verificationCode": "Código de verificación",
     "verificationCodePlaceholder": "123456",
     "verifyCode": "Verificar código",
     "verifying": "Verificando...",
@@ -427,21 +415,16 @@
     "demoCodePlaceholder": "DEMO-AB12-CD34",
     "signInWithDemoCode": "Iniciar sesión con código demo",
     "signingIn": "Iniciando sesión...",
-    "demoDescription": "Usa un código emitido por un administrador para acceder temporalmente a la demo.",
     "invalidEmail": "Introduce una dirección de email válida.",
     "invalidCode": "Introduce un código válido de seis dígitos.",
     "invalidDemoCode": "Introduce un código demo válido.",
-    "requiredEmail": "Introduce tu dirección de email.",
     "emailOtpError": "No se pudo enviar el código.",
-    "requiredOtp": "Introduce el código de verificación.",
     "verifyOtpError": "No se pudo verificar el código.",
-    "requiredDemoCode": "Introduce tu código demo.",
     "demoError": "No se pudo iniciar sesión con el código demo.",
     "demoCodeHint": "Introduce el código que te proporcionó el organizador del evento.",
     "redirecting": "Redirigiendo...",
     "failed": "No se pudo iniciar sesión",
-    "tryAgain": "Inténtalo de nuevo.",
-    "termsNotice": "Al continuar, aceptas nuestros Términos y nuestra Política de Privacidad."
+    "tryAgain": "Inténtalo de nuevo."
   },
   "admin": {
     "demoAccess": "Acceso demo",
@@ -736,7 +719,6 @@
       "sidePro": "A favor",
       "roleLabel": "Rol",
       "roleValue": "Apertura",
-      "sampleLabel": "Ejemplo",
       "modeLabel": "Modos de ejemplo",
       "modeGenerate": "Generar",
       "modeCrossfire": "Interrogatorio",
@@ -917,26 +899,20 @@
   "rateLimit": {
     "title": "Límite de Solicitudes Excedido"
   },
-  "subscription": {
-    "required": "Suscripción requerida."
-  },
   "generateForm": {
     "title": "Generar Caso de Debate",
     "subtitle": "Crea argumentos estructurados para cualquier moción",
     "motion": "Moción / Tema",
     "motionPlaceholder": "ej., Esta cámara cree que la inteligencia artificial creará más empleos de los que destruirá",
     "side": "Lado",
-    "sideAuto": "Auto (Elegir Mejor)",
     "sidePro": "A favor",
     "sideCon": "En contra",
     "format": "Formato de Debate",
-    "formatStandard": "Torneo Estándar (4-6-6-3)",
     "role": "Rol del Orador",
     "roleIntro": "Introductor (4 min)",
     "roleR1": "R1 - Refutación/Arg (6 min)",
     "roleR2": "R2 - Refutación/Construcción (6 min)",
     "roleConc": "Conclusor (3 min)",
-    "more": "Más",
     "moreOptions": "Más opciones",
     "length": "Extensión del Caso",
     "lengthBrief": "Breve",
@@ -969,7 +945,6 @@
     "incompleteDesc": "La respuesta de la IA fue incompleta o malformada. Intenta generar de nuevo.",
     "proposition": "A favor",
     "opposition": "En contra",
-    "generated": "Generado",
     "modelLabel": "Modelo: {{value}}",
     "durationMs": "{{value}} ms",
     "durationS": "{{value}} s",
@@ -977,9 +952,6 @@
     "save": "Guardar",
     "discuss": "Discutir",
     "flowcharts": "Diagramas",
-    "word": "Word",
-    "pdf": "PDF",
-    "googleDocs": "Google Docs",
     "exordio": "Exordio",
     "exordioDesc": "Tu apertura convincente",
     "hook": "Gancho",
@@ -1010,8 +982,6 @@
     "rebuttal": "Refutación:",
     "exportedGdocs": "¡Caso exportado a Google Docs!",
     "open": "Abrir",
-    "authRequired": "Autenticación requerida",
-    "authRequiredDesc": "Cierra sesión y vuelve a iniciar para otorgar acceso a Google Drive.",
     "exportFailed": "Error al exportar a Google Docs",
     "exportError": "Ocurrió un error inesperado durante la exportación"
   },
@@ -1079,8 +1049,6 @@
     "exportFailedDocx": "Error al exportar a DOCX",
     "exportFailedPdf": "Error al exportar a PDF",
     "open": "Abrir",
-    "authRequired": "Autenticación requerida",
-    "authRequiredDesc": "Cierra sesión y vuelve a iniciar para otorgar acceso a Google Drive.",
     "exportFailedGdocs": "Error al exportar a Google Docs",
     "exportError": "Ocurrió un error inesperado durante la exportación"
   },
@@ -1126,8 +1094,6 @@
     "exportFailedDocx": "Error al exportar a DOCX",
     "exportedGdocs": "¡Lluvia de ideas exportada a Google Docs!",
     "open": "Abrir",
-    "authRequired": "Autenticación requerida",
-    "authRequiredDesc": "Cierra sesión y vuelve a iniciar para otorgar acceso a Google Drive.",
     "exportFailedGdocs": "Error al exportar a Google Docs",
     "exportError": "Ocurrió un error inesperado durante la exportación"
   },
@@ -1162,7 +1128,6 @@
     "verified": "Verificado",
     "unverified": "No Verificado",
     "pending": "Pendiente",
-    "needVerification": "necesitan verificación",
     "importantNotes": "Notas Importantes",
     "found": "Encontrados",
     "factoids": "Datos",
@@ -1181,14 +1146,10 @@
     "saveToLibrary": "Guardar en Biblioteca",
     "saveClaimToLibrary": "Guardar {{claim}} en la biblioteca",
     "discuss": "Discutir Evidencia",
-    "verifyAll": "Verificar Todas las Fuentes",
-    "verifying": "Verificando Fuentes...",
     "exportedDocx": "¡Datos exportados a DOCX!",
     "exportFailedDocx": "Error al exportar a DOCX",
     "exportedGdocs": "¡Datos exportados a Google Docs!",
     "open": "Abrir",
-    "authRequired": "Autenticación requerida",
-    "authRequiredDesc": "Cierra sesión y vuelve a iniciar para otorgar acceso a Google Drive.",
     "exportFailedGdocs": "Error al exportar a Google Docs",
     "exportError": "Ocurrió un error inesperado durante la exportación"
   },
@@ -1297,12 +1258,6 @@
   "onboarding": {
     "welcome": "¡Bienvenido a DebateLab! 🎉",
     "welcomeDesc": "Hagamos un recorrido rápido para ayudarte a crear tu primer caso de debate.",
-    "step1": "Paso 1: Ingresa Tu Moción",
-    "step1Desc": "Escribe cualquier tema de debate aquí. Por ejemplo: \"Esta cámara cree que la IA creará más empleos de los que destruirá.\"",
-    "step2": "Paso 2: Genera Tu Caso",
-    "step2Desc": "Haz clic en este botón para generar un caso de debate estructurado con argumentos, evidencia y refutaciones.",
-    "step3": "Paso 3: Guarda y Exporta",
-    "step3Desc": "Después de generar, puedes guardar tu caso en el historial o exportarlo como documento Word.",
     "ready": "¡Estás Listo! 🚀",
     "readyDesc": "Explora las otras funciones: Atacar argumentos, Chat con Coach e Investigar datos.",
     "back": "Atrás",
@@ -1533,7 +1488,6 @@
     "sortFolder": "Carpeta",
     "folderCreated": "Carpeta creada",
     "folderCreatedDesc": "Ahora puedes guardar nuevas fuentes ahí.",
-    "folderFilter": "Filtro de carpeta",
     "allFolders": "Todas las carpetas",
     "importUrlRequired": "Introduce una URL para importar.",
     "importReady": "Fuente lista",
@@ -1542,9 +1496,6 @@
     "importFailedDesc": "No se pudo importar esta fuente.",
     "duplicateSource": "La fuente ya está en la biblioteca",
     "duplicateSourceDesc": "Esta URL o archivo ya está guardado.",
-    "fileTooLarge": "Archivo demasiado grande",
-    "fileTooLargeDesc": "Elige un archivo de texto menor de 250 KB.",
-    "fileEmpty": "Este archivo no tiene texto legible.",
     "fileReadFailed": "No se pudo leer este archivo.",
     "saveToLibrary": "Guardar en Biblioteca",
     "addNewTitle": "Añadir Nueva Fuente",
@@ -1558,9 +1509,6 @@
     "sourcesCount": "fuentes",
     "emptyTitle": "Sin Fuentes Aún",
     "emptyDesc": "Añade fuentes para fundamentar las respuestas de IA con evidencia real.",
-    "active": "Activo",
-    "disabled": "Desactivado",
-    "added": "Añadido",
     "manualEntry": "Entrada Manual",
     "groundingActive": "Fundamentación Activa",
     "groundingDisabled": "Fundamentación Desactivada",
@@ -1573,7 +1521,6 @@
     "clearConfirm": "¿Estás seguro de que quieres borrar todas las fuentes?",
     "importUrlHelp": "La importación automática crea un borrador editable. Revísalo antes de guardarlo en tu biblioteca.",
     "unsupportedFile": "Archivo no compatible",
-    "unsupportedFileDesc": "Importa texto sin formato, Markdown, CSV o JSON. El procesamiento de PDF/DOCX aún no es fiable aquí.",
     "totalSources": "Fuentes totales",
     "activeSources": "Fuentes activas",
     "syncedFolders": "Carpetas sincronizadas",
@@ -1827,40 +1774,20 @@
       "Strategy": "Estrategia"
     },
     "setup": {
-      "liveLabel": "Sala de práctica en directo",
-      "heading": "Entrena con un oponente que escucha.",
-      "subtitle": "Elige una moción, toma una postura y realiza una ronda cronometrada. La IA mantiene la transcripción a la vista, responde a los argumentos que realmente expones y evalúa el debate escrito al final.",
-      "onlineReady": "Listo para llamar al entrenador de debate",
-      "offlineDraft": "Sin conexión. Tu borrador se queda en esta pestaña.",
       "setMotion": "Define la moción",
-      "setMotionDescription": "Escribe la resolución como la escucharías en la sala.",
       "motion": "Moción",
       "motionPlaceholder": "Esta cámara exigiría a las empresas de redes sociales verificar la edad de cada usuario.",
-      "motionHelp": "Una moción precisa da al oponente algo concreto que atacar.",
       "motionTooShort": "Añade un poco más de detalle para que la moción se pueda juzgar.",
       "pickSide": "Elige tu postura",
-      "pickSideDescription": "Escribirás cada intervención del lado que elijas.",
-      "proDescription": "Defiende la resolución y demuestra por qué debería aprobarse.",
-      "conDescription": "Cuestiona la resolución y demuestra por qué debería rechazarse.",
       "choosePressure": "Elige la presión",
-      "choosePressureDescription": "El oponente adapta sus argumentos a este nivel.",
-      "difficultyDescription": {
-        "easy": "Argumentos claros y aperturas generosas.",
-        "medium": "Un oponente competente que sigue el flujo.",
-        "hard": "Contraargumentos rápidos que buscan cada hueco."
-      },
       "roundFormat": "Formato de la ronda",
-      "roundFormatDescription": "Define el orden de las intervenciones.",
       "speeches": "{{count}} intervenciones",
       "aboutMinutes": "Unos {{count}} minutos",
-      "roomAtGlance": "Tu sala de un vistazo",
-      "speakingPlan": "Plan de intervenciones",
       "turns": "{{count}} turnos",
       "opponentTurns": "Turnos del oponente",
       "aiRequests": "Solicitudes a la IA",
       "aiRequestBreakdown": "{{count}} respuestas + 1 juez",
       "aiModel": "Modelo de IA",
-      "modelHelp": "La configuración del modelo sigue el perfil de sparring en Ajustes.",
       "openingRoom": "Abriendo la sala...",
       "startRound": "Iniciar ronda",
       "draftNotice": "Tu borrador se guarda en esta pestaña mientras escribes. Puedes pausar sin perder tu lugar.",
@@ -1963,10 +1890,7 @@
     "title": "Idioma",
     "description": "Elige el idioma de la app y el idioma usado en las respuestas de IA.",
     "uiLanguage": "Idioma de la interfaz",
-    "outputLanguage": "Idioma de salida de IA",
-    "en": "English",
-    "es": "Español",
-    "hu": "Magyar"
+    "outputLanguage": "Idioma de salida de IA"
   },
   "crossfire": {
     "openFromResult": "Abrir en Interrogatorio",
@@ -2005,18 +1929,9 @@
     "sourceLibraryDesc": "Fundamenta las preguntas y respuestas de la IA con tus fuentes activas.",
     "sourceLibraryEmpty": "Aún no tienes fuentes activas en tu Biblioteca.",
     "seedQuestionsLabel": "Preguntas iniciales (opcional)",
-    "seedQuestionsPlaceholder": "Añade una pregunta inicial...",
-    "addSeedQuestion": "Añadir pregunta",
-    "removeSeedQuestion": "Eliminar pregunta",
     "start": "Iniciar interrogatorio",
-    "resume": "Reanudar interrogatorio",
-    "resumeDescription": "Tienes una sesión de interrogatorio sin terminar guardada en este dispositivo.",
-    "discardDraft": "Descartar borrador",
-    "clearDraft": "Borrar sesión guardada",
     "loading": "Cargando el interrogatorio...",
-    "starting": "Iniciando el interrogatorio...",
     "thinking": "El coach está pensando...",
-    "retry": "Intentar de nuevo",
     "retryResponse": "Reintentar respuesta",
     "timeout": "La solicitud agotó el tiempo",
     "timeoutDesc": "El coach tardó demasiado en responder. Tu mensaje sigue aquí para que puedas intentarlo de nuevo.",
@@ -2027,23 +1942,23 @@
     "invalidDebriefResponseDesc": "El coach devolvió un informe incompleto. Inténtalo de nuevo para continuar.",
     "interruptedRequest": "La solicitud anterior se interrumpió. Reinténtala para continuar.",
     "interruptedDebrief": "El informe anterior se interrumpió. Reinténtalo para continuar.",
-    "emptyTitle": "Cuando quieras",
     "emptyDesc": "Define una resolución y un argumento para iniciar un interrogatorio preciso.",
     "timerLabel": "Tiempo restante",
-    "timeUp": "Se acabó el tiempo",
     "endSession": "Terminar sesión",
-    "endSessionConfirm": "¿Terminar este interrogatorio?",
-    "endSessionDesc": "Recibirás un informe basado en el intercambio hasta ahora.",
-    "endNow": "Terminar ahora",
-    "cancel": "Cancelar",
     "transcript": "Transcripción",
-    "yourTurn": "Tu turno",
-    "coachTurn": "Turno del coach",
     "question": "Pregunta",
     "answer": "Respuesta",
     "liveSignals": "Señales de entrenamiento en vivo",
-    "signalQuality": { "direct": "Respuesta directa", "partial": "Respuesta parcial", "evasive": "Respuesta evasiva" },
-    "signalConcession": { "none": "Sin concesión", "implicit": "Concesión implícita", "explicit": "Concesión explícita" },
+    "signalQuality": {
+      "direct": "Respuesta directa",
+      "partial": "Respuesta parcial",
+      "evasive": "Respuesta evasiva"
+    },
+    "signalConcession": {
+      "none": "Sin concesión",
+      "implicit": "Concesión implícita",
+      "explicit": "Concesión explícita"
+    },
     "signalFollowUp": "Oportunidad de seguimiento",
     "signalConfidence": "{{label}}, confianza {{percent}}%",
     "signalProbability": "{{label}}, probabilidad {{percent}}%",
@@ -2055,16 +1970,12 @@
     "submitAnswer": "Enviar respuesta",
     "charactersRemaining_one": "Queda {{count}} carácter",
     "charactersRemaining_other": "Quedan {{count}} caracteres",
-    "sessionEnded": "Sesión terminada",
-    "sessionEndedTimer": "Se acabó el tiempo.",
-    "sessionEndedManual": "Terminaste la sesión.",
     "debriefTitle": "Informe del interrogatorio",
     "debriefSubtitle": "Revisa el intercambio y prepara tu siguiente movimiento.",
     "debriefLoading": "Preparando tu informe...",
     "debriefRetry": "Reintentar informe",
     "debriefTimeout": "El informe agotó el tiempo",
     "debriefError": "No se pudo preparar el informe",
-    "debriefEmpty": "Aún no hay informe",
     "debriefEmptyDesc": "Completa al menos un intercambio antes de terminar la sesión.",
     "concessionsSecured": "Concesiones obtenidas",
     "controlledQuestions": "Preguntas que controlaron el intercambio",
@@ -2073,25 +1984,13 @@
     "missedFollowUps": "Oportunidades de seguimiento perdidas",
     "betterFollowUpQuestions": "Mejores preguntas de seguimiento",
     "strongestExchange": "Intercambio más sólido",
-    "claim": "Afirmación",
-    "reason": "Por qué importa",
-    "followUp": "Seguimiento",
-    "turnReference": "Turno {{number}}",
     "transcriptReferences": "Referencias de la transcripción",
-    "citations": "Citas",
-    "citationsDesc": "Fuentes usadas para fundamentar este intercambio",
-    "source": "Fuente",
     "sources": "Fuentes",
-    "noCitations": "No se usaron citas.",
     "importFromGenerate": "Importar desde Generar",
     "importFromAttack": "Importar desde Atacar",
     "importGenerateDesc": "Trae un caso generado para usarlo como argumento inicial.",
     "importAttackDesc": "Trae preguntas de interrogatorio del análisis de ataque.",
-    "importUnavailable": "No hay contenido compatible para importar.",
-    "restart": "Iniciar otro interrogatorio",
-    "newSession": "Nueva sesión",
-    "backToSetup": "Volver a la configuración",
-    "exit": "Salir del interrogatorio"
+    "restart": "Iniciar otro interrogatorio"
   },
   "routeError": {
     "heading": "No se pudo cargar esta página",
@@ -2111,7 +2010,12 @@
     "importance": "Importancia {{level}}",
     "strength": "Fuerza {{level}}",
     "usageExplanation": "Usada en {{count}} caso(s) guardado(s). Importancia: {{importance}}. Fuerza de la evidencia: {{strength}}.",
-    "levels": { "0": "Nula", "1": "Baja", "2": "Media", "3": "Alta" },
+    "levels": {
+      "0": "Nula",
+      "1": "Baja",
+      "2": "Media",
+      "3": "Alta"
+    },
     "types": {
       "academic": "Académica",
       "government": "Gubernamental",
diff --git a/src/locales/hu.json b/src/locales/hu.json
index 9943ac957..92f2c6c3c 100644
--- a/src/locales/hu.json
+++ b/src/locales/hu.json
@@ -286,10 +286,8 @@
     "historyDesc": "Nyisd meg újra a mentett eseteket, chateket és korábbi felkészüléseket."
   },
   "generate": {
-    "title": "Eset Generálása",
     "emptyTitle": "Az Eseted Vár",
     "emptyDesc": "Töltsd ki az űrlapot egy strukturált vitaeset generálásához érvekkel, bizonyítékokkal és ellen-stratégiákkal.",
-    "save": "Eset Mentése",
     "saved": "Eset Mentve",
     "savedDesc": "Az eseted mentésre került az előzményekbe.",
     "savePrompt": "Adj meg egy címet ehhez az esethez:",
@@ -304,19 +302,16 @@
     "flowchartNoData": "Nincs érvényes esetadat az importhoz."
   },
   "attack": {
-    "title": "Támadás az Esetem Ellen",
     "emptyTitle": "Kegyetlen Mód",
     "emptyDesc": "Illeszd be az érvedet kíméletlen kritikáért, logikai hibák azonosításáért és megvalósítható javításokért.",
     "failed": "Támadás Elemzés Sikertelen"
   },
   "brainstorm": {
-    "title": "Ötletelés",
     "emptyTitle": "Kreatív Szögek Feloldása",
     "emptyDesc": "Írd le az indítványodat szokatlan érvelési szögek felfedezéséhez, kompromisszumok azonosításához és legerősebb pozícióid megtalálásához.",
     "failed": "Ötletelés Sikertelen"
   },
   "factoids": {
-    "title": "Tények és Források",
     "emptyTitle": "Győztes Bizonyítékok",
     "emptyDesc": "Adj meg egy állítást támogató tények kereséséhez valós hivatkozásokkal, kontextussal és útmutatóval a hatékony felhasználáshoz.",
     "failed": "Kutatás Sikertelen",
@@ -324,9 +319,7 @@
     "savedToLibraryDesc": "Ez a bizonyíték mostantól elérhető megalapozáshoz."
   },
   "ask": {
-    "title": "Kérdezd az Edződ",
     "failed": "Hiba",
-    "failedDesc": "A kérés sikertelen. Próbáld újra.",
     "timeout": "Időtúllépés",
     "timeoutDesc": "A kérés túl sokáig tartott. Próbáld újra.",
     "saved": "Mentve",
@@ -400,9 +393,6 @@
     "title": "Bejelentkezés a DebateLab-ba",
     "subtitle": "Jelentkezz be Google-lal, e-maillel vagy adminisztrátor által kiadott demókóddal.",
     "google": "Folytatás Google-lal",
-    "googleTab": "Google",
-    "email": "E-mail",
-    "demoCode": "Demókód",
     "emailTab": "E-mail",
     "demoTab": "Demókód",
     "orContinueWith": "Vagy folytasd ezzel",
@@ -414,11 +404,9 @@
     "resendCode": "Kód újraküldése",
     "resendingCode": "Kód újraküldése...",
     "codeSent": "Kód elküldve",
-    "checkEmail": "Nézd meg az e-mailedet a hatjegyű kódért.",
     "codeSentDesc": "Nézd meg az e-mailedet a hatjegyű kódért.",
     "useDifferentEmail": "Másik e-mail használata",
     "otpLabel": "Ellenőrző kód",
-    "verificationCode": "Ellenőrző kód",
     "verificationCodePlaceholder": "123456",
     "verifyCode": "Kód ellenőrzése",
     "verifying": "Ellenőrzés...",
@@ -427,21 +415,16 @@
     "demoCodePlaceholder": "DEMO-AB12-CD34",
     "signInWithDemoCode": "Bejelentkezés demókóddal",
     "signingIn": "Bejelentkezés...",
-    "demoDescription": "Ideiglenes demóhozzáféréshez használj adminisztrátor által kiadott kódot.",
     "invalidEmail": "Adj meg érvényes e-mail-címet.",
     "invalidCode": "Adj meg érvényes, hatjegyű kódot.",
     "invalidDemoCode": "Adj meg érvényes demókódot.",
-    "requiredEmail": "Adj meg e-mail-címet.",
     "emailOtpError": "Nem sikerült elküldeni a kódot.",
-    "requiredOtp": "Add meg az ellenőrző kódot.",
     "verifyOtpError": "A kód ellenőrzése nem sikerült.",
-    "requiredDemoCode": "Add meg a demókódot.",
     "demoError": "Nem sikerült demókóddal bejelentkezni.",
     "demoCodeHint": "Add meg az esemény szervezőjétől kapott kódot.",
     "redirecting": "Átirányítás...",
     "failed": "Nem sikerült elindítani a bejelentkezést",
-    "tryAgain": "Próbáld újra.",
-    "termsNotice": "A folytatással elfogadod a Felhasználási feltételeket és az Adatvédelmi irányelveket."
+    "tryAgain": "Próbáld újra."
   },
   "admin": {
     "demoAccess": "Demóhozzáférés",
@@ -736,7 +719,6 @@
       "sidePro": "Mellette",
       "roleLabel": "Szerep",
       "roleValue": "Nyitóbeszéd",
-      "sampleLabel": "Példa",
       "modeLabel": "Példamódok",
       "modeGenerate": "Generálás",
       "modeCrossfire": "Keresztkérdezés",
@@ -917,26 +899,20 @@
   "rateLimit": {
     "title": "Kéréslimit Túllépve"
   },
-  "subscription": {
-    "required": "Előfizetés szükséges."
-  },
   "generateForm": {
     "title": "Vitaeset Generálása",
     "subtitle": "Készíts strukturált érveket bármilyen indítványhoz",
     "motion": "Indítvány / Téma",
     "motionPlaceholder": "pl. Ez a ház úgy véli, hogy a mesterséges intelligencia több munkahelyet teremt, mint amennyit megszüntet",
     "side": "Oldal",
-    "sideAuto": "Automatikus (Legjobb Választás)",
     "sidePro": "Mellette",
     "sideCon": "Ellene",
     "format": "Vitaformátum",
-    "formatStandard": "Standard Verseny (4-6-6-3)",
     "role": "Beszédszerep",
     "roleIntro": "Bevezető (4 perc)",
     "roleR1": "R1 - Cáfolat/Érv (6 perc)",
     "roleR2": "R2 - Cáfolat/Építés (6 perc)",
     "roleConc": "Záró (3 perc)",
-    "more": "Továbbiak",
     "moreOptions": "További opciók",
     "length": "Eset Hossza",
     "lengthBrief": "Rövid",
@@ -969,7 +945,6 @@
     "incompleteDesc": "Az MI válasza hiányos vagy hibás volt. Próbáld újra generálni.",
     "proposition": "Mellette",
     "opposition": "Ellene",
-    "generated": "Generálva",
     "modelLabel": "Modell: {{value}}",
     "durationMs": "{{value}} ms",
     "durationS": "{{value}} mp",
@@ -977,9 +952,6 @@
     "save": "Mentés",
     "discuss": "Megvitatás",
     "flowcharts": "Folyamatábrák",
-    "word": "Word",
-    "pdf": "PDF",
-    "googleDocs": "Google Docs",
     "exordio": "Exordio",
     "exordioDesc": "A meggyőző nyitásod",
     "hook": "Felvezetés",
@@ -1010,8 +982,6 @@
     "rebuttal": "Cáfolat:",
     "exportedGdocs": "Eset exportálva Google Docs-ba!",
     "open": "Megnyitás",
-    "authRequired": "Hitelesítés szükséges",
-    "authRequiredDesc": "Jelentkezz ki és vissza a Google Drive hozzáférés megadásához.",
     "exportFailed": "Nem sikerült exportálni Google Docs-ba",
     "exportError": "Váratlan hiba történt az exportálás során"
   },
@@ -1079,8 +1049,6 @@
     "exportFailedDocx": "Nem sikerült exportálni DOCX-ba",
     "exportFailedPdf": "Nem sikerült exportálni PDF-be",
     "open": "Megnyitás",
-    "authRequired": "Hitelesítés szükséges",
-    "authRequiredDesc": "Jelentkezz ki és vissza a Google Drive hozzáférés megadásához.",
     "exportFailedGdocs": "Nem sikerült exportálni Google Docs-ba",
     "exportError": "Váratlan hiba történt az exportálás során"
   },
@@ -1126,8 +1094,6 @@
     "exportFailedDocx": "Nem sikerült exportálni DOCX-ba",
     "exportedGdocs": "Ötletelés exportálva Google Docs-ba!",
     "open": "Megnyitás",
-    "authRequired": "Hitelesítés szükséges",
-    "authRequiredDesc": "Jelentkezz ki és vissza a Google Drive hozzáférés megadásához.",
     "exportFailedGdocs": "Nem sikerült exportálni Google Docs-ba",
     "exportError": "Váratlan hiba történt az exportálás során"
   },
@@ -1162,7 +1128,6 @@
     "verified": "Ellenőrzött",
     "unverified": "Nem Ellenőrzött",
     "pending": "Függőben",
-    "needVerification": "ellenőrzést igényel",
     "importantNotes": "Fontos Megjegyzések",
     "found": "Találat",
     "factoids": "Tény",
@@ -1181,14 +1146,10 @@
     "saveToLibrary": "Mentés a Könyvtárba",
     "saveClaimToLibrary": "„{{claim}}” mentése a könyvtárba",
     "discuss": "Bizonyítékok Megvitatása",
-    "verifyAll": "Összes Forrás Ellenőrzése",
-    "verifying": "Források Ellenőrzése...",
     "exportedDocx": "Tények exportálva DOCX-ba!",
     "exportFailedDocx": "Nem sikerült exportálni DOCX-ba",
     "exportedGdocs": "Tények exportálva Google Docs-ba!",
     "open": "Megnyitás",
-    "authRequired": "Hitelesítés szükséges",
-    "authRequiredDesc": "Jelentkezz ki és vissza a Google Drive hozzáférés megadásához.",
     "exportFailedGdocs": "Nem sikerült exportálni Google Docs-ba",
     "exportError": "Váratlan hiba történt az exportálás során"
   },
@@ -1297,12 +1258,6 @@
   "onboarding": {
     "welcome": "Üdvözlünk a DebateLab-ban! 🎉",
     "welcomeDesc": "Tegyünk egy gyors körsétát, hogy segítsünk elkészíteni az első vitaesetedet.",
-    "step1": "1. lépés: Add Meg az Indítványt",
-    "step1Desc": "Írj be bármilyen vitatémát ide. Például: \"Ez a ház úgy véli, hogy az MI több munkahelyet teremt, mint amennyit megszüntet.\"",
-    "step2": "2. lépés: Generáld az Esetet",
-    "step2Desc": "Kattints erre a gombra egy strukturált vitaeset generálásához érvekkel, bizonyítékokkal és cáfolatokkal.",
-    "step3": "3. lépés: Mentés és Exportálás",
-    "step3Desc": "Generálás után mentheted az esetedet az előzményekbe vagy exportálhatod Word dokumentumként.",
     "ready": "Készen Állsz! 🚀",
     "readyDesc": "Fedezd fel a többi funkciót: Érvek támadása, Edző chat és Tények kutatása.",
     "back": "Vissza",
@@ -1533,7 +1488,6 @@
     "sortFolder": "Mappa",
     "folderCreated": "Mappa létrehozva",
     "folderCreatedDesc": "Az új forrásokat már ide is mentheted.",
-    "folderFilter": "Mappaszűrő",
     "allFolders": "Minden mappa",
     "importUrlRequired": "Adj meg egy importálandó URL-t.",
     "importReady": "Forrás kész",
@@ -1542,9 +1496,6 @@
     "importFailedDesc": "Nem sikerült importálni ezt a forrást.",
     "duplicateSource": "A forrás már a könyvtárban van",
     "duplicateSourceDesc": "Ez a URL vagy fájl már mentve van.",
-    "fileTooLarge": "Túl nagy fájl",
-    "fileTooLargeDesc": "Válassz 250 KB alatti szövegfájlt.",
-    "fileEmpty": "Ebben a fájlban nincs olvasható szöveg.",
     "fileReadFailed": "Nem sikerült beolvasni ezt a fájlt.",
     "saveToLibrary": "Mentés a Könyvtárba",
     "addNewTitle": "Új Forrás Hozzáadása",
@@ -1558,9 +1509,6 @@
     "sourcesCount": "forrás",
     "emptyTitle": "Még Nincsenek Források",
     "emptyDesc": "Adj hozzá forrásokat az MI válaszok valós bizonyítékokkal való megalapozásához.",
-    "active": "Aktív",
-    "disabled": "Letiltva",
-    "added": "Hozzáadva",
     "manualEntry": "Kézi Bevitel",
     "groundingActive": "Megalapozás Aktív",
     "groundingDisabled": "Megalapozás Letiltva",
@@ -1573,7 +1521,6 @@
     "clearConfirm": "Biztosan törölni szeretnéd az összes forrást?",
     "importUrlHelp": "Az automatikus importálás szerkeszthető piszkozatot hoz létre. Nézd át, mielőtt a könyvtárba mented.",
     "unsupportedFile": "Nem támogatott fájl",
-    "unsupportedFileDesc": "Importálj egyszerű szöveget, Markdown-, CSV- vagy JSON-fájlt. A PDF/DOCX feldolgozása itt még nem megbízható.",
     "totalSources": "Összes forrás",
     "activeSources": "Aktív források",
     "syncedFolders": "Szinkronizált mappák",
@@ -1827,40 +1774,20 @@
       "Strategy": "Stratégia"
     },
     "setup": {
-      "liveLabel": "Élő gyakorlószoba",
-      "heading": "Vitatkozz egy figyelő ellenféllel.",
-      "subtitle": "Válassz indítványt, foglalj állást, és menj végig egy időzített fordulón. Az MI szem előtt tartja az átiratot, az általad ténylegesen felhozott érvekre válaszol, majd a végén értékeli az írásos vitát.",
-      "onlineReady": "A vitaedző hívásra kész",
-      "offlineDraft": "Offline vagy. A piszkozat ezen a böngészőfülön marad.",
       "setMotion": "Indítvány megadása",
-      "setMotionDescription": "Írd le a határozati javaslatot úgy, ahogy a teremben elhangzana.",
       "motion": "Indítvány",
       "motionPlaceholder": "Ez a Ház kötelezné a közösségimédia-vállalatokat minden felhasználó életkorának ellenőrzésére.",
-      "motionHelp": "Egy pontos indítvány konkrét támadási felületet ad az ellenfélnek.",
       "motionTooShort": "Adj hozzá több részletet, hogy az indítvány értékelhető legyen.",
       "pickSide": "Válaszd ki az oldalad",
-      "pickSideDescription": "A kiválasztott oldal minden beszédét te írod.",
-      "proDescription": "Védd az indítványt, és mutasd meg, miért kell elfogadni.",
-      "conDescription": "Kérdőjelezd meg az indítványt, és mutasd meg, miért kell elutasítani.",
       "choosePressure": "Válaszd ki a nehézséget",
-      "choosePressureDescription": "Az ellenfél ehhez a szinthez igazítja az érveit.",
-      "difficultyDescription": {
-        "easy": "Világos érvek és nagyvonalú nyitások.",
-        "medium": "Egy rátermett ellenfél, aki követi a vitafolyamot.",
-        "hard": "Gyors ellenérvek, amelyek minden rést megkeresnek."
-      },
       "roundFormat": "Fordulóformátum",
-      "roundFormatDescription": "Állítsd be a beszédek sorrendjét.",
       "speeches": "{{count}} beszéd",
       "aboutMinutes": "Körülbelül {{count}} perc",
-      "roomAtGlance": "Szobád áttekintése",
-      "speakingPlan": "Beszédterv",
       "turns": "{{count}} kör",
       "opponentTurns": "Az ellenfél körei",
       "aiRequests": "MI-kérések",
       "aiRequestBreakdown": "{{count}} válasz + 1 bíró",
       "aiModel": "MI-modell",
-      "modelHelp": "A modellbeállítások a Beállítások vitapárbaj profilját követik.",
       "openingRoom": "Szoba megnyitása...",
       "startRound": "Forduló indítása",
       "draftNotice": "A piszkozat írás közben ezen a böngészőfülön mentődik. Szüneteltetheted anélkül, hogy elveszítenéd a helyed.",
@@ -1963,10 +1890,7 @@
     "title": "Nyelv",
     "description": "Válaszd ki az alkalmazás nyelvét és az AI válaszok nyelvét.",
     "uiLanguage": "Felület nyelve",
-    "outputLanguage": "AI kimenet nyelve",
-    "en": "English",
-    "es": "Español",
-    "hu": "Magyar"
+    "outputLanguage": "AI kimenet nyelve"
   },
   "crossfire": {
     "openFromResult": "Megnyitás a Keresztkérdezésben",
@@ -2005,18 +1929,9 @@
     "sourceLibraryDesc": "Az MI kérdései és válaszai az aktív könyvtári forrásaidra támaszkodjanak.",
     "sourceLibraryEmpty": "Még nincs aktív forrásod a Forráskönyvtárban.",
     "seedQuestionsLabel": "Nyitó kérdések (opcionális)",
-    "seedQuestionsPlaceholder": "Adj hozzá egy nyitó kérdést...",
-    "addSeedQuestion": "Kérdés hozzáadása",
-    "removeSeedQuestion": "Kérdés eltávolítása",
     "start": "Keresztkérdezés indítása",
-    "resume": "Keresztkérdezés folytatása",
-    "resumeDescription": "Ezen az eszközön elmentett, befejezetlen keresztkérdezési munkameneted van.",
-    "discardDraft": "Piszkozat elvetése",
-    "clearDraft": "Mentett munkamenet törlése",
     "loading": "Keresztkérdezés betöltése...",
-    "starting": "Keresztkérdezés indítása...",
     "thinking": "Az edző gondolkodik...",
-    "retry": "Újrapróbálás",
     "retryResponse": "Válasz újrapróbálása",
     "timeout": "A kérés időtúllépés miatt megszakadt",
     "timeoutDesc": "Az edző túl sokáig nem válaszolt. Az üzeneted megmaradt, ezért újra próbálkozhatsz.",
@@ -2027,23 +1942,23 @@
     "invalidDebriefResponseDesc": "Az edző hiányos értékelést adott. Próbáld újra a folytatáshoz.",
     "interruptedRequest": "Az előző kérés megszakadt. Próbáld újra a folytatáshoz.",
     "interruptedDebrief": "Az előző értékelés megszakadt. Próbáld újra a folytatáshoz.",
-    "emptyTitle": "Készen állsz?",
     "emptyDesc": "Adj meg egy indítványt és egy érvet a célzott keresztkérdezés indításához.",
     "timerLabel": "Hátralévő idő",
-    "timeUp": "Lejárt az idő",
     "endSession": "Munkamenet befejezése",
-    "endSessionConfirm": "Befejezed ezt a keresztkérdezést?",
-    "endSessionDesc": "Az eddigi beszélgetés alapján összefoglaló értékelést kapsz.",
-    "endNow": "Befejezés most",
-    "cancel": "Mégse",
     "transcript": "Leirat",
-    "yourTurn": "Te jössz",
-    "coachTurn": "Az edző jön",
     "question": "Kérdés",
     "answer": "Válasz",
     "liveSignals": "Élő edzői jelzések",
-    "signalQuality": { "direct": "Közvetlen válasz", "partial": "Részleges válasz", "evasive": "Kitérő válasz" },
-    "signalConcession": { "none": "Nincs engedmény", "implicit": "Burkolt engedmény", "explicit": "Kifejezett engedmény" },
+    "signalQuality": {
+      "direct": "Közvetlen válasz",
+      "partial": "Részleges válasz",
+      "evasive": "Kitérő válasz"
+    },
+    "signalConcession": {
+      "none": "Nincs engedmény",
+      "implicit": "Burkolt engedmény",
+      "explicit": "Kifejezett engedmény"
+    },
     "signalFollowUp": "Visszakérdezési lehetőség",
     "signalConfidence": "{{label}}, bizonyosság {{percent}}%",
     "signalProbability": "{{label}}, valószínűség {{percent}}%",
@@ -2055,16 +1970,12 @@
     "submitAnswer": "Válasz küldése",
     "charactersRemaining_one": "{{count}} karakter maradt",
     "charactersRemaining_other": "{{count}} karakter maradt",
-    "sessionEnded": "A munkamenet véget ért",
-    "sessionEndedTimer": "Lejárt az idő.",
-    "sessionEndedManual": "Befejezted a munkamenetet.",
     "debriefTitle": "Keresztkérdezési értékelés",
     "debriefSubtitle": "Nézd át a beszélgetést, és tervezd meg a következő lépésedet.",
     "debriefLoading": "Az értékelés elkészítése...",
     "debriefRetry": "Értékelés újrapróbálása",
     "debriefTimeout": "Az értékelés időtúllépés miatt megszakadt",
     "debriefError": "Nem sikerült elkészíteni az értékelést",
-    "debriefEmpty": "Még nincs értékelés",
     "debriefEmptyDesc": "A munkamenet befejezése előtt teljesíts legalább egy kérdés-válasz kört.",
     "concessionsSecured": "Kikényszerített engedmények",
     "controlledQuestions": "A beszélgetést irányító kérdések",
@@ -2073,25 +1984,13 @@
     "missedFollowUps": "Kihagyott utókérdezési lehetőségek",
     "betterFollowUpQuestions": "Jobb utókérdések",
     "strongestExchange": "A legerősebb párbeszédrész",
-    "claim": "Állítás",
-    "reason": "Miért számít",
-    "followUp": "Utókérdés",
-    "turnReference": "{{number}}. forduló",
     "transcriptReferences": "Hivatkozások az átiratban",
-    "citations": "Hivatkozások",
-    "citationsDesc": "A beszélgetés megalapozásához használt források",
-    "source": "Forrás",
     "sources": "Források",
-    "noCitations": "Nem használtunk hivatkozásokat.",
     "importFromGenerate": "Importálás a Generálásból",
     "importFromAttack": "Importálás a Támadásból",
     "importGenerateDesc": "Hozz be egy generált esetet kezdő érvként.",
     "importAttackDesc": "Hozz be keresztkérdéseket egy támadáselemzésből.",
-    "importUnavailable": "Nincs importálható kompatibilis tartalom.",
-    "restart": "Új keresztkérdezés indítása",
-    "newSession": "Új munkamenet",
-    "backToSetup": "Vissza a beállításhoz",
-    "exit": "Kilépés a keresztkérdezésből"
+    "restart": "Új keresztkérdezés indítása"
   },
   "routeError": {
     "heading": "Az oldal nem tölthető be",
@@ -2111,7 +2010,12 @@
     "importance": "{{level}} fontosság",
     "strength": "{{level}} erősség",
     "usageExplanation": "Felhasználva {{count}} mentett esetben. Fontosság: {{importance}}. Bizonyíték ereje: {{strength}}.",
-    "levels": { "0": "Nincs", "1": "Alacsony", "2": "Közepes", "3": "Magas" },
+    "levels": {
+      "0": "Nincs",
+      "1": "Alacsony",
+      "2": "Közepes",
+      "3": "Magas"
+    },
     "types": {
       "academic": "Tudományos",
       "government": "Kormányzati",
diff --git a/src/pages/AskPage.tsx b/src/pages/AskPage.tsx
index 28beca108..c8cf8a012 100644
--- a/src/pages/AskPage.tsx
+++ b/src/pages/AskPage.tsx
@@ -10,7 +10,6 @@ import { getUserFacingAIError } from '@/lib/ai/error-display';
 import { LimitReachedModal, ModelRestrictedModal, PricingModal } from '@/components/features/subscription';
 import { useToast } from '@/hooks/use-toast';
 import { AnimatedSection } from '@/components/ui/animated-section';
-import { ToastAction } from '@/components/ui/toast';
 import { useCallback, useEffect, useRef } from 'react';
 import type { AskOutput } from '@/lib/ai/schemas/ask';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
@@ -242,14 +241,10 @@ export default function AskPage() {
           title: t('ask.failed'),
           description: getUserFacingAIError(error) || t('ask.retryableFailedDesc', "Couldn't reach the AI. Check your connection and retry."),
           variant: "destructive",
-          action: (
-            <ToastAction
-              altText={t('common.retry', 'Retry')}
-              onClick={() => void handleSend(message, mode, citationMode, webSearch, prosConsMode, argumentMapMode, files)}
-            >
-              {t('common.retry', 'Retry')}
-            </ToastAction>
-          ),
+          action: {
+            label: t('common.retry', 'Retry'),
+            onClick: () => void handleSend(message, mode, citationMode, webSearch, prosConsMode, argumentMapMode, files),
+          },
         });
       }
     } finally {
diff --git a/src/pages/LandingPage.tsx b/src/pages/LandingPage.tsx
index 6bc89d946..f3e826807 100644
--- a/src/pages/LandingPage.tsx
+++ b/src/pages/LandingPage.tsx
@@ -1,17 +1,15 @@
-import {
-    Navbar,
-    Hero,
-    SocialProof,
-    Features,
-    DeepDive,
-    UseCases,
-    HowItWorks,
-    FAQ,
-    FinalCTA,
-    Footer,
-    WhatsNew,
-    Pricing,
-} from "@/components/landing";
+import Navbar from "@/components/landing/Navbar";
+import Hero from "@/components/landing/Hero";
+import SocialProof from "@/components/landing/SocialProof";
+import Features from "@/components/landing/Features";
+import DeepDive from "@/components/landing/DeepDive";
+import UseCases from "@/components/landing/UseCases";
+import HowItWorks from "@/components/landing/HowItWorks";
+import FAQ from "@/components/landing/FAQ";
+import FinalCTA from "@/components/landing/FinalCTA";
+import Footer from "@/components/landing/Footer";
+import WhatsNew from "@/components/landing/WhatsNew";
+import Pricing from "@/components/landing/Pricing";
 
 const LandingPage = () => {
     return (
diff --git a/src/pages/LibraryPage.tsx b/src/pages/LibraryPage.tsx
index 3923d8b5d..24cc34ec9 100644
--- a/src/pages/LibraryPage.tsx
+++ b/src/pages/LibraryPage.tsx
@@ -1,6 +1,5 @@
-import { useEffect, useState, type AriaAttributes, type CSSProperties } from 'react';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { List } from 'react-window';
 import { useSessionStore, type Source } from '@/lib/stores/session-store';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
@@ -36,11 +35,10 @@ import {
   SheetTitle,
 } from '@/components/ui/sheet';
 
-const SOURCE_ROW_HEIGHT = 92;
 const SOURCE_LIST_HEIGHT = 600;
 
 interface SourceRowProps {
-  sources: Source[];
+  source: Source;
   onRemove: (source: Source) => void;
   onToggle: (id: string) => void;
   onOpen: (source: Source) => void;
@@ -49,19 +47,14 @@ interface SourceRowProps {
 }
 
 function SourceRow({
-  index,
-  style,
-  sources,
+  source,
   onRemove,
   onToggle,
   onOpen,
   manualEntryLabel,
   folderLabel,
-  ariaAttributes,
-}: SourceRowProps & { index: number; style: CSSProperties; ariaAttributes: AriaAttributes }) {
+}: SourceRowProps) {
   const { t } = useTranslation();
-  const source = sources[index];
-  if (!source) return null;
   const sourceFolder = source.folder || 'General';
   const sourceFolderLabel = sourceFolder === 'General'
     ? t('libraryPage.generalFolder')
@@ -69,8 +62,9 @@ function SourceRow({
       ? t('aiClient.autoSavedFolder')
       : sourceFolder;
 
+
   return (
-    <div style={style} {...ariaAttributes} className="px-1 pb-2">
+    <div className="px-1 pb-2">
       <div
         role="button"
         tabIndex={0}
@@ -855,23 +849,18 @@ export default function LibraryPage() {
                   </p>
                 </div>
               ) : (
-                <div className="h-[600px] pr-1 stagger-enter">
-                  <List<SourceRowProps>
-                    rowComponent={SourceRow}
-                    rowCount={visibleSources.length}
-                    rowHeight={SOURCE_ROW_HEIGHT}
-                    rowProps={{
-                      sources: visibleSources,
-                      onRemove: handleRemoveSource,
-                      onToggle: toggleSource,
-                      onOpen: (source: Source) => setSelectedSourceId(source.id),
-                      manualEntryLabel: t('libraryPage.manualEntry'),
-                      folderLabel: t('libraryPage.folder', 'Folder'),
-                    }}
-                    overscanCount={8}
-                    className="scrollbar-thin"
-                    style={{ height: SOURCE_LIST_HEIGHT }}
-                  />
+                <div className="scrollbar-thin overflow-y-auto pr-1 stagger-enter" style={{ height: SOURCE_LIST_HEIGHT }}>
+                  {visibleSources.map((source) => (
+                    <SourceRow
+                      key={source.id}
+                      source={source}
+                      onRemove={handleRemoveSource}
+                      onToggle={toggleSource}
+                      onOpen={(item: Source) => setSelectedSourceId(item.id)}
+                      manualEntryLabel={t('libraryPage.manualEntry')}
+                      folderLabel={t('libraryPage.folder', 'Folder')}
+                    />
+                  ))}
                 </div>
               )}
             </CardContent>
diff --git a/src/test/ai/client-branches.test.ts b/src/test/ai/client-branches.test.ts
index 72880c56c..38bf7e8ce 100644
--- a/src/test/ai/client-branches.test.ts
+++ b/src/test/ai/client-branches.test.ts
@@ -912,19 +912,4 @@ describe('AI client branch coverage', () => {
     expect(result.mindmap?.[0].category).toBe('Uncategorized');
     expect(result.buckets?.[0].name).toBe('Unnamed Bucket');
   });
-
-  it('returns local mock-provider outputs for all public feature helpers', async () => {
-    const mockConfig = { ...config, provider: 'mock' as const };
-
-    const { result: attack } = await attackCase({ caseText: 'Case text' } as any, mockConfig);
-    const { result: ideas } = await brainstorm({ motion: 'Motion', side: 'both', outputMode: 'topfive' } as any, mockConfig);
-    const facts = await factoids({ claim: 'Claim' } as any, mockConfig);
-    const chat = await askChat('hello', [], 'general', mockConfig);
-
-    expect(attack.overallAssessment.score).toBeTypeOf('number');
-    expect(ideas.nextSteps).toBeInstanceOf(Array);
-    expect(facts.result.factoids).toBeInstanceOf(Array);
-    expect(chat.response).toContain('hello');
-    expect(invokeMock).not.toHaveBeenCalled();
-  }, 15000);
 });
diff --git a/src/test/ai/client.test.ts b/src/test/ai/client.test.ts
index 6e4370aac..4fc3d9e65 100644
--- a/src/test/ai/client.test.ts
+++ b/src/test/ai/client.test.ts
@@ -199,48 +199,50 @@ describe('AI Client Integration', () => {
             }));
         });
 
-        it('should use local mock provider logic when provider is "mock"', async () => {
-            const mockProviderConfig: ProviderConfig = { ...mockConfig, provider: 'mock' };
-
-            const { result } = await generateCase({
-                motion: 'Test Motion',
-                side: 'pro',
-                format: 'bp',
-                role: 'intro',
-                length: 'brief',
-                audience: 'beginner',
-                tone: 'formal',
-            }, mockProviderConfig);
-
-            // Should NOT call Supabase
-            expect(supabaseMock.functions.invoke).not.toHaveBeenCalled();
-
-            // Should return mock data
-            expect(result.caseStructure.thesis).toContain('Test Motion');
-            expect(result.metadata.format).toBe('bp');
-        });
-
         it.each([
             ['brief', 2],
             ['standard', 3],
             ['comprehensive', 4],
-        ] as const)('returns %s mock output with %d contentions', async (length, expectedCount) => {
-            const mockProviderConfig: ProviderConfig = { ...mockConfig, provider: 'mock' };
-            const input: GenerateInput = {
-                motion: 'Test Motion',
-                side: 'pro',
-                format: 'bp',
-                role: 'intro',
-                length,
-                audience: 'beginner',
-                tone: 'formal',
-            };
+        ] as const)('accepts %s output with its expected %d contentions', async (length, expectedCount) => {
+            const contention = (id: number) => ({
+                id: String(id), claim: `Claim ${id}`, reasoning: `Reasoning ${id}`,
+                evidence: `Evidence ${id}`, needsSource: false, impact: `Impact ${id}`,
+            });
+            setMockInvokeResponse({
+                output: {
+                    caseStructure: { thesis: 'Thesis', framework: 'Framework', keyDefinitions: [], burdenOfProof: 'Burden' },
+                    contentions: Array.from({ length: expectedCount }, (_, index) => contention(index + 1)),
+                    predictedOpponentCase: { likelyArguments: [], strategicWeaknesses: [], keyClashes: [] },
+                    counters: [],
+                    metadata: { side: 'pro', format: 'bp', generatedAt: '2026-01-01T00:00:00.000Z' },
+                } satisfies GenerateOutput,
+            });
 
-            const { result } = await generateCase(input, mockProviderConfig);
+            const { result } = await generateCase({
+                motion: 'Test Motion', side: 'pro', format: 'bp', role: 'intro',
+                length, audience: 'beginner', tone: 'formal',
+            }, mockConfig);
 
             expect(result.contentions).toHaveLength(expectedCount);
         }, 15000);
 
+        it('rejects a response whose contention count does not match the requested length', async () => {
+            setMockInvokeResponse({
+                output: {
+                    caseStructure: { thesis: 'Thesis', framework: 'Framework', keyDefinitions: [], burdenOfProof: 'Burden' },
+                    contentions: [{ id: '1', claim: 'Claim', reasoning: 'Reasoning', evidence: 'Evidence', needsSource: false, impact: 'Impact' }],
+                    predictedOpponentCase: { likelyArguments: [], strategicWeaknesses: [], keyClashes: [] },
+                    counters: [],
+                    metadata: { side: 'pro', format: 'bp', generatedAt: '2026-01-01T00:00:00.000Z' },
+                } satisfies GenerateOutput,
+            });
+
+            await expect(generateCase({
+                motion: 'Test Motion', side: 'pro', format: 'bp', role: 'intro',
+                length: 'comprehensive', audience: 'beginner', tone: 'formal',
+            }, mockConfig)).rejects.toBeInstanceOf(AIResponseError);
+        });
+
         it('localizes the truncated-input notification in Hungarian', async () => {
             clientMocks.settings.language = 'hu';
             clientMocks.settings.outputLanguage = 'hu';
diff --git a/src/test/ai/sparring.test.ts b/src/test/ai/sparring.test.ts
index a10a6736a..32d3c4413 100644
--- a/src/test/ai/sparring.test.ts
+++ b/src/test/ai/sparring.test.ts
@@ -169,22 +169,6 @@ describe('sparring AI client', () => {
       .rejects.toMatchObject({ name: 'AIResponseError' });
   });
 
-  it('uses the local provider adapter while preserving the same response contract', async () => {
-    const mockConfig: ProviderConfig = { ...CONFIG, provider: 'mock' };
-    const response = await generateSparringTurn(RESPOND_INPUT, mockConfig);
-
-    expect(response.action).toBe('respond');
-    expect(response.speech.content).toContain(SESSION.motion);
-    expect(supabaseMock.functions.invoke).not.toHaveBeenCalled();
-  });
-
-  it('scores with the local provider adapter without calling the Edge function', async () => {
-    const response = await judgeSparringSession(SCORE_INPUT, { ...CONFIG, provider: 'mock' });
-
-    expect(response).toMatchObject({ action: 'score', scorecard: { winner: expect.any(String) } });
-    expect(supabaseMock.functions.invoke).not.toHaveBeenCalled();
-  });
-
   it('rejects a turn request passed to the scoring operation', async () => {
     await expect(judgeSparringSession(RESPOND_INPUT as unknown as SparringScoreInput, CONFIG))
       .rejects.toMatchObject({ name: 'AIResponseError' });
diff --git a/src/test/components/ModelSelector.test.tsx b/src/test/components/ModelSelector.test.tsx
index b9a207c79..80a22a178 100644
--- a/src/test/components/ModelSelector.test.tsx
+++ b/src/test/components/ModelSelector.test.tsx
@@ -23,29 +23,24 @@ vi.mock('@/lib/stores/settings-store', () => ({
 
 vi.mock('@/lib/ai/providers/types', () => ({
   DEFAULT_MODEL: 'openai/gpt-5.6-luna',
+  PROVIDER_ID: 'openrouter',
   AUTO_MODEL_SELECTIONS: [
     { id: 'auto-fast', name: 'Auto Fast', isProOnly: false },
     { id: 'auto-pro', name: 'Auto Pro', isProOnly: true },
   ],
   isAutoModelSelection: (value: unknown) => value === 'auto-fast' || value === 'auto-pro',
   isReasoningEffort: (value: unknown) => value === 'low' || value === 'medium' || value === 'high',
-  DEFAULT_PROVIDERS: [
-    {
-      id: 'openrouter', name: 'OpenRouter',
-      models: [
-        { id: 'openai/gpt-5.6-luna', name: 'GPT-5.6 Luna', maxTokens: 128000, isProOnly: false, supportsTemperature: false },
-        { id: 'google/gemini-3.8-flash', name: 'Gemini 3.8 Flash', maxTokens: 65536, isProOnly: false, supportsTemperature: true },
-        { id: 'deepseek/deepseek-v4-flash-0731', name: 'DeepSeek V4 Flash', maxTokens: 131072, isProOnly: false, supportsTemperature: true },
-        { id: 'anthropic/claude-sonnet-5', name: 'Claude Sonnet 5', maxTokens: 128000, isProOnly: true, supportsTemperature: false },
-        { id: 'anthropic/claude-opus-5', name: 'Claude Opus 5', maxTokens: 128000, isProOnly: true, supportsTemperature: true },
-        { id: 'openai/gpt-5.6-sol', name: 'GPT-5.6 Sol', maxTokens: 128000, isProOnly: true, supportsTemperature: false },
-        { id: 'openai/gpt-5.6-terra', name: 'GPT-5.6 Terra', maxTokens: 128000, isProOnly: true, supportsTemperature: false },
-        { id: 'deepseek/deepseek-v4-pro-0813', name: 'DeepSeek V4 Pro', maxTokens: 384000, isProOnly: true, supportsTemperature: true },
-        { id: 'z-ai/glm-5.3-flash', name: 'GLM-5.3 Flash', maxTokens: 131072, isProOnly: true, supportsTemperature: true },
-        { id: 'meta/muse-spark-1.3', name: 'Muse Spark 1.3', maxTokens: 943718, isProOnly: true, supportsTemperature: true },
-      ],
-      isAvailable: () => true,
-    },
+  AVAILABLE_MODELS: [
+    { id: 'openai/gpt-5.6-luna', name: 'GPT-5.6 Luna', maxTokens: 128000, isProOnly: false, supportsTemperature: false },
+    { id: 'google/gemini-3.8-flash', name: 'Gemini 3.8 Flash', maxTokens: 65536, isProOnly: false, supportsTemperature: true },
+    { id: 'deepseek/deepseek-v4-flash-0731', name: 'DeepSeek V4 Flash', maxTokens: 131072, isProOnly: false, supportsTemperature: true },
+    { id: 'anthropic/claude-sonnet-5', name: 'Claude Sonnet 5', maxTokens: 128000, isProOnly: true, supportsTemperature: false },
+    { id: 'anthropic/claude-opus-5', name: 'Claude Opus 5', maxTokens: 128000, isProOnly: true, supportsTemperature: true },
+    { id: 'openai/gpt-5.6-sol', name: 'GPT-5.6 Sol', maxTokens: 128000, isProOnly: true, supportsTemperature: false },
+    { id: 'openai/gpt-5.6-terra', name: 'GPT-5.6 Terra', maxTokens: 128000, isProOnly: true, supportsTemperature: false },
+    { id: 'deepseek/deepseek-v4-pro-0813', name: 'DeepSeek V4 Pro', maxTokens: 384000, isProOnly: true, supportsTemperature: true },
+    { id: 'z-ai/glm-5.3-flash', name: 'GLM-5.3 Flash', maxTokens: 131072, isProOnly: true, supportsTemperature: true },
+    { id: 'meta/muse-spark-1.3', name: 'Muse Spark 1.3', maxTokens: 943718, isProOnly: true, supportsTemperature: true },
   ],
 }));
 
diff --git a/src/test/components/StreamingIndicator.test.tsx b/src/test/components/StreamingIndicator.test.tsx
index c7cc67d1d..6fcc931f5 100644
--- a/src/test/components/StreamingIndicator.test.tsx
+++ b/src/test/components/StreamingIndicator.test.tsx
@@ -4,7 +4,6 @@ import { StreamingIndicator } from '@/components/ui/streaming-indicator';
 import i18n from '@/i18n';
 import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog';
 import { Sheet, SheetContent, SheetTitle } from '@/components/ui/sheet';
-import { ToastClose } from '@/components/ui/toast';
 
 describe('StreamingIndicator', () => {
   beforeEach(() => {
@@ -77,7 +76,7 @@ describe('StreamingIndicator', () => {
     expect(screen.getByText('Loading...')).toBeDefined();
   });
 
-  it('localizes loading and shared close controls after a runtime language switch', async () => {
+  it('localizes loading and overlay close controls after a runtime language switch', async () => {
     await act(async () => { await i18n.changeLanguage('hu'); });
     const indicator = render(<StreamingIndicator messages={['Elemzés...']} />);
     expect(screen.getByRole('status', { name: 'Betöltés' })).toBeInTheDocument();
@@ -87,11 +86,7 @@ describe('StreamingIndicator', () => {
     expect(screen.getByRole('button', { name: 'Bezárás' })).toBeInTheDocument();
     dialog.unmount();
 
-    const sheet = render(<Sheet open><SheetContent><SheetTitle>Tesztpanel</SheetTitle></SheetContent></Sheet>);
-    expect(screen.getByRole('button', { name: 'Bezárás' })).toBeInTheDocument();
-    sheet.unmount();
-
-    render(<ToastClose />);
+    render(<Sheet open><SheetContent><SheetTitle>Tesztpanel</SheetTitle></SheetContent></Sheet>);
     expect(screen.getByRole('button', { name: 'Bezárás' })).toBeInTheDocument();
   });
 });
diff --git a/src/test/deno-assert-shim.ts b/src/test/deno-assert-shim.ts
deleted file mode 100644
index fcb61c7f1..000000000
--- a/src/test/deno-assert-shim.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Minimal stand-in for the deno.land/std assert module used by supabase
-// function tests. Mapped over the exact import specifier via resolve.alias in
-// vitest.config.ts. The same files keep working under `deno test`.
-
-import { isDeepStrictEqual } from "node:util";
-
-export function assert(condition: unknown, msg = "Assertion failed"): asserts condition {
-  if (!condition) throw new Error(msg);
-}
-
-export function assertStringIncludes(actual: string, expected: string, msg = ""): void {
-  if (!actual.includes(expected)) {
-    throw new Error(
-      msg || `Expected string to include:\n  ${expected}\nActual string:\n  ${actual}`,
-    );
-  }
-}
-
-export function assertEquals(actual: unknown, expected: unknown, msg = ""): void {
-  if (!isDeepStrictEqual(actual, expected)) {
-    throw new Error(
-      msg || `Expected values to be equal:\n  ${JSON.stringify(expected)}\nActual value:\n  ${JSON.stringify(actual)}`,
-    );
-  }
-}
-
-export async function assertRejects(
-  fn: () => Promise<unknown>,
-  ErrorClass: typeof Error = Error,
-  msgIncludes = "",
-): Promise<Error> {
-  try {
-    await fn();
-  } catch (error) {
-    if (!(error instanceof ErrorClass)) throw error;
-    if (msgIncludes && !error.message.includes(msgIncludes)) {
-      throw new Error(`Expected error message to include: ${msgIncludes}\nActual message: ${error.message}`);
-    }
-    return error;
-  }
-  throw new Error("Expected function to reject");
-}
diff --git a/src/test/deno-compat.ts b/src/test/deno-compat.ts
deleted file mode 100644
index 4fd7b2a85..000000000
--- a/src/test/deno-compat.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-// Vitest compatibility shim for the Deno-style test suites under
-// supabase/functions. Registers globalThis.Deno so `Deno.test` cases collect
-// as vitest tests without changing how the same files run under `deno test`.
-
-import { existsSync, readFileSync } from "node:fs";
-import { fileURLToPath } from "node:url";
-
-if (!("Deno" in globalThis)) {
-  // Under vitest, paths reach Deno.readTextFile in several shapes: real file
-  // URLs, vite "@fs" URLs, and (via vite's rewrite of `new URL(rel,
-  // import.meta.url)`) root-relative paths that lost the project prefix. Map
-  // every shape to a real filesystem path, falling back to the vitest working
-  // directory when a candidate does not exist on disk.
-  const toFilePath = (input: string | URL): string => {
-    const href = input instanceof URL ? input.href : input;
-    const isFileUrl = input instanceof URL ? input.protocol === "file:" : href.startsWith("file:");
-    let candidate: string;
-    if (isFileUrl) {
-      candidate = fileURLToPath(input instanceof URL ? input : new URL(href));
-    } else {
-      const atFsIndex = href.indexOf("/@fs/");
-      if (atFsIndex !== -1) {
-        candidate = decodeURIComponent(href.slice(atFsIndex + 4));
-      } else if (/^https?:\/\//i.test(href)) {
-        candidate = decodeURIComponent(new URL(href).pathname);
-      } else {
-        candidate = href;
-      }
-    }
-    if (!existsSync(candidate) && candidate.startsWith("/") && existsSync(`${process.cwd()}${candidate}`)) {
-      return `${process.cwd()}${candidate}`;
-    }
-    return candidate;
-  };
-
-  const readTextFile = async (input: string | URL): Promise<string> =>
-    readFileSync(toFilePath(input), "utf8");
-
-  // Loopback Deno.serve replacement: instead of binding a real socket, the
-  // shim records the handler and routes matching fetch calls to it directly.
-  // Synchronous return with an addr object keeps Deno.serve call shapes valid.
-  type LoopbackHandler = (request: Request) => Response | Promise<Response>;
-  let loopback: { matches: (url: URL) => boolean; handler: LoopbackHandler } | null = null;
-  const LOOPBACK_DEFAULT_PORT = 43111;
-
-  if (!("__denoLoopbackFetchPatched" in globalThis)) {
-    (globalThis as { __denoLoopbackFetchPatched?: boolean }).__denoLoopbackFetchPatched = true;
-    const originalFetch = globalThis.fetch.bind(globalThis);
-    globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
-      const url = new URL(input instanceof Request ? input.url : String(input));
-      if (loopback && loopback.matches(url)) {
-        const response = await loopback.handler(new Request(url, init));
-        // Native fetch binds the caller's signal to the body stream so an
-        // aborted read rejects instead of stalling. Reproduce that here.
-        const signal = init?.signal ?? (input instanceof Request ? input.signal : undefined);
-        if (!signal || !response.body) {
-          return response;
-        }
-        const reader = response.body.getReader();
-        const wired = new ReadableStream<Uint8Array>({
-          start(controller) {
-            const abort = () => {
-              void reader.cancel().catch((): undefined => undefined);
-              controller.error(
-                signal.reason ?? new DOMException("The operation was aborted", "AbortError"),
-              );
-            };
-            if (signal.aborted) {
-              abort();
-              return;
-            }
-            signal.addEventListener("abort", abort, { once: true });
-            const pump = (): Promise<void> =>
-              reader.read().then(({ done, value }) => {
-                if (signal.aborted) {
-                  return;
-                }
-                if (done) {
-                  controller.close();
-                  return;
-                }
-                controller.enqueue(value);
-                return pump();
-              }, (error) => controller.error(error));
-            void pump();
-          },
-          cancel: (): Promise<void> => reader.cancel().catch((): undefined => undefined),
-        });
-        return new Response(wired, { status: response.status, headers: response.headers });
-      }
-      return originalFetch(input as Parameters<typeof originalFetch>[0], init);
-    };
-  }
-
-  const serve = (
-    options: { hostname?: string; port?: number },
-    handler: LoopbackHandler,
-  ): {
-    addr: { transport: string; hostname: string; port: number };
-    shutdown: () => Promise<void>;
-    finished: Promise<void>;
-  } => {
-    const hostname = options?.hostname ?? "127.0.0.1";
-    const port = options?.port && options.port > 0 ? options.port : LOOPBACK_DEFAULT_PORT;
-    loopback = {
-      matches: (url) => url.hostname === hostname && url.port === String(port),
-      handler,
-    };
-    return {
-      addr: { transport: "tcp", hostname, port },
-      shutdown: async () => {
-        loopback = null;
-      },
-      finished: Promise.resolve(),
-    };
-  };
-
-  (globalThis as { Deno?: Record<string, unknown> }).Deno = {
-    test: (...args: unknown[]): void => {
-      const fn = args.filter((arg) => typeof arg === "function").pop() as
-        | (() => unknown)
-        | undefined;
-      if (!fn) throw new Error("Deno.test shim requires a test function argument");
-      const first = args[0];
-      const name =
-        typeof first === "string"
-          ? first
-          : first && typeof first === "object" && "name" in first && typeof first.name === "string"
-            ? first.name
-            : "unnamed deno test";
-      it(name, () => {
-        return fn();
-      });
-    },
-    env: {
-      get: (key: string): string | undefined => process.env[key],
-      set: (key: string, value: string): void => {
-        process.env[key] = value;
-      },
-      delete: (key: string): void => {
-        delete process.env[key];
-      },
-      toObject: (): Record<string, string> => ({ ...process.env }),
-    },
-    readTextFile,
-    serve,
-  };
-}
diff --git a/src/test/export-telemetry.test.ts b/src/test/export-telemetry.test.ts
index b1c10cd89..0e36248ad 100644
--- a/src/test/export-telemetry.test.ts
+++ b/src/test/export-telemetry.test.ts
@@ -35,7 +35,6 @@ vi.mock('docx', () => ({
   AlignmentType: { CENTER: 'CENTER' },
 }));
 
-vi.mock('file-saver', () => ({ saveAs: vi.fn() }));
 
 vi.mock('jspdf', () => ({
   jsPDF: class MockJsPdf {
diff --git a/src/test/export-utils-extended.test.ts b/src/test/export-utils-extended.test.ts
index 80ae6884c..c00590280 100644
--- a/src/test/export-utils-extended.test.ts
+++ b/src/test/export-utils-extended.test.ts
@@ -16,9 +16,6 @@ vi.mock('docx', () => ({
   AlignmentType: { CENTER: 'CENTER' },
 }));
 
-vi.mock('file-saver', () => ({
-  saveAs: vi.fn(),
-}));
 
 vi.mock('@/lib/supabase/client', () => ({
   supabase: {
diff --git a/src/test/export-utils.test.ts b/src/test/export-utils.test.ts
index b49087cd7..34d46e12d 100644
--- a/src/test/export-utils.test.ts
+++ b/src/test/export-utils.test.ts
@@ -2,7 +2,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import type { GenerateOutput } from '@/lib/ai/schemas/generate';
 
-// Mock docx and file-saver
+// Mock docx; downloads are captured via the real DOM path
 vi.mock('docx', () => ({
     Document: vi.fn(function DocumentMock() {}),
     Packer: {
@@ -14,17 +14,16 @@ vi.mock('docx', () => ({
     AlignmentType: { CENTER: 'CENTER' },
 }));
 
-vi.mock('file-saver', () => ({
-    saveAs: vi.fn(),
-}));
-
 // Import after mocking
 import { exportCaseToDocx } from '@/lib/export-utils';
-import { saveAs } from 'file-saver';
+import { captureDownloads } from './helpers/downloads';
 
 describe('Export Utils', () => {
+    let downloads: ReturnType<typeof captureDownloads>;
+
     beforeEach(() => {
         vi.clearAllMocks();
+        downloads = captureDownloads();
     });
 
     const createValidOutput = (overrides: Partial<GenerateOutput> = {}): GenerateOutput => ({
@@ -68,17 +67,17 @@ describe('Export Utils', () => {
         it('exports valid case successfully', async () => {
             const result = await exportCaseToDocx(createValidOutput());
             expect(result).toBe(true);
-            expect(saveAs).toHaveBeenCalled();
+            expect(downloads).toHaveLength(1);
         });
 
         it('generates correct filename for pro side', async () => {
             await exportCaseToDocx(createValidOutput({ metadata: { side: 'pro', format: 'bp', generatedAt: '2024-01-01' } }));
-            expect(saveAs).toHaveBeenCalledWith(expect.any(Blob), 'DebateCase_pro.docx');
+            expect(downloads.at(-1)?.filename).toBe('DebateCase_pro.docx');
         });
 
         it('generates correct filename for con side', async () => {
             await exportCaseToDocx(createValidOutput({ metadata: { side: 'con', format: 'bp', generatedAt: '2024-01-01' } }));
-            expect(saveAs).toHaveBeenCalledWith(expect.any(Blob), 'DebateCase_con.docx');
+            expect(downloads.at(-1)?.filename).toBe('DebateCase_con.docx');
         });
 
         it('returns false when metadata is missing', async () => {
diff --git a/src/test/helpers/downloads.ts b/src/test/helpers/downloads.ts
new file mode 100644
index 000000000..4272160fc
--- /dev/null
+++ b/src/test/helpers/downloads.ts
@@ -0,0 +1,28 @@
+import { vi } from "vitest";
+
+export interface CapturedDownload {
+  blob: Blob;
+  filename: string;
+}
+
+/**
+ * Captures downloads triggered by the `URL.createObjectURL` + `<a download>`
+ * path used across the export helpers, so tests can assert on filenames
+ * without mocking a module.
+ */
+export function captureDownloads(): CapturedDownload[] {
+  const downloads: CapturedDownload[] = [];
+  let lastBlob: Blob | undefined;
+
+  vi.spyOn(URL, "createObjectURL").mockImplementation((source: Blob | MediaSource) => {
+    if (source instanceof Blob) lastBlob = source;
+    return "blob:mock";
+  });
+
+  vi.spyOn(HTMLAnchorElement.prototype, "click").mockImplementation(function (this: HTMLAnchorElement) {
+    if (!this.download) return;
+    downloads.push({ blob: lastBlob ?? new Blob(), filename: this.download });
+  });
+
+  return downloads;
+}
diff --git a/src/test/hooks/use-toast.test.ts b/src/test/hooks/use-toast.test.ts
new file mode 100644
index 000000000..a06511412
--- /dev/null
+++ b/src/test/hooks/use-toast.test.ts
@@ -0,0 +1,44 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const sonnerBase = vi.fn();
+const sonnerError = vi.fn();
+const sonnerSuccess = vi.fn();
+
+vi.mock('sonner', () => {
+  const toast = Object.assign(sonnerBase, { error: sonnerError, success: sonnerSuccess });
+  return { toast };
+});
+
+const { toast } = await import('@/hooks/use-toast');
+
+beforeEach(() => {
+  sonnerBase.mockClear();
+  sonnerError.mockClear();
+  sonnerSuccess.mockClear();
+});
+
+describe('toast adapter', () => {
+  it('routes destructive to sonner.error', () => {
+    toast({ title: 'Broke', description: 'why', variant: 'destructive' });
+    expect(sonnerError).toHaveBeenCalledWith('Broke', { description: 'why', action: undefined });
+    expect(sonnerBase).not.toHaveBeenCalled();
+  });
+
+  it('routes success to sonner.success', () => {
+    toast({ title: 'Done', variant: 'success' });
+    expect(sonnerSuccess).toHaveBeenCalledWith('Done', { description: undefined, action: undefined });
+  });
+
+  it('routes default and missing variant to the base toast', () => {
+    toast({ title: 'Saved' });
+    toast({ title: 'Also saved', variant: 'default' });
+    expect(sonnerBase).toHaveBeenCalledTimes(2);
+    expect(sonnerError).not.toHaveBeenCalled();
+  });
+
+  it('forwards an action and tolerates a missing title', () => {
+    const action = { label: 'Retry', onClick: () => {} };
+    toast({ description: 'no title', action });
+    expect(sonnerBase).toHaveBeenCalledWith('', { description: 'no title', action });
+  });
+});
diff --git a/src/test/jam-metadata.test.ts b/src/test/jam-metadata.test.ts
new file mode 100644
index 000000000..892f314b4
--- /dev/null
+++ b/src/test/jam-metadata.test.ts
@@ -0,0 +1,24 @@
+import { describe, expect, it } from 'vitest';
+import { setJamUserId } from '@/lib/jam-metadata';
+
+interface JamWindow extends Window {
+  __jam__?: { exports?: { metadata?: () => { userId: string | undefined } } };
+}
+
+function readMetadata() {
+  return (window as JamWindow).__jam__?.exports?.metadata?.();
+}
+
+describe('jam metadata', () => {
+  it('registers a metadata callback on the Jam global', () => {
+    expect(typeof (window as JamWindow).__jam__?.exports?.metadata).toBe('function');
+  });
+
+  it('reports the current user id and clears it on sign-out', () => {
+    setJamUserId('user-123');
+    expect(readMetadata()).toEqual({ userId: 'user-123' });
+
+    setJamUserId(undefined);
+    expect(readMetadata()).toEqual({ userId: undefined });
+  });
+});
diff --git a/src/test/performance-measurement-script.test.ts b/src/test/performance-measurement-script.test.ts
deleted file mode 100644
index c85bfaba4..000000000
--- a/src/test/performance-measurement-script.test.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-import { describe, expect, it } from 'vitest';
-
-describe('navigation performance measurement', () => {
-  it('starts the resource boundary before pointer-down can prefetch a route', () => {
-    const source = readFileSync(resolve(process.cwd(), 'scripts/measure-navigation-performance.mjs'), 'utf8');
-
-    expect(source).toMatch(/startTransition\(target\) \{\s+const resourceBoundary = performance\.now\(\);/);
-    expect(source).not.toContain('baseline.transition.resourceBoundary = clickTime');
-  });
-});
diff --git a/src/test/providers.test.ts b/src/test/providers.test.ts
index 68f0fb47f..7f138dfd0 100644
--- a/src/test/providers.test.ts
+++ b/src/test/providers.test.ts
@@ -1,18 +1,17 @@
 import { describe, it, expect } from 'vitest';
-import { DEFAULT_PROVIDERS } from '@/lib/ai/providers/types';
+import { AVAILABLE_MODELS, PROVIDER_ID } from '@/lib/ai/providers/types';
 
-describe('DEFAULT_PROVIDERS', () => {
+describe('AVAILABLE_MODELS', () => {
   // Model IDs key request routing and the stored per-session model choice, so a
-  // collision across providers would silently route to the wrong provider.
-  it('no duplicate model IDs across all providers', () => {
-    const allIds = DEFAULT_PROVIDERS.flatMap(p => p.models.map(m => m.id));
+  // duplicate would silently route to the wrong catalog entry.
+  it('has no duplicate model IDs', () => {
+    const allIds = AVAILABLE_MODELS.map((model) => model.id);
     expect(new Set(allIds).size).toBe(allIds.length);
   });
 
   it('exposes the approved model catalog through OpenRouter', () => {
-    expect(DEFAULT_PROVIDERS).toHaveLength(1);
-    expect(DEFAULT_PROVIDERS[0]?.id).toBe('openrouter');
-    expect(DEFAULT_PROVIDERS[0]?.models.map((model) => model.id)).toEqual([
+    expect(PROVIDER_ID).toBe('openrouter');
+    expect(AVAILABLE_MODELS.map((model) => model.id)).toEqual([
       'openai/gpt-5.6-luna',
       'google/gemini-3.8-flash',
       'deepseek/deepseek-v4-flash-0731',
diff --git a/src/test/runtime-contracts.test.ts b/src/test/runtime-contracts.test.ts
index 892da0ad7..803221030 100644
--- a/src/test/runtime-contracts.test.ts
+++ b/src/test/runtime-contracts.test.ts
@@ -4,10 +4,6 @@ import * as Sentry from '@sentry/react';
 import { describe, expect, it } from 'vitest';
 import { STAGING_CAPTURE_POLICY } from '../../playwright.config';
 
-function readProjectFile(relativePath: string) {
-  return readFileSync(path.resolve(process.cwd(), relativePath), 'utf8');
-}
-
 describe('runtime integration contracts', () => {
   it('uses Sentry SDK capabilities that exist in the installed package', () => {
     expect(typeof Sentry.logger.info).toBe('function');
@@ -15,6 +11,7 @@ describe('runtime integration contracts', () => {
     expect(typeof Sentry.metrics.distribution).toBe('function');
   });
 
+  // Staging e2e signs in as a real user, so captures would carry that session.
   it('disables every authenticated staging browser capture channel', () => {
     expect(STAGING_CAPTURE_POLICY).toEqual({
       trace: 'off',
@@ -22,29 +19,9 @@ describe('runtime integration contracts', () => {
       video: 'off',
     });
 
-    const workflow = readProjectFile('.github/workflows/staging-e2e.yml');
+    const workflow = readFileSync(path.resolve(process.cwd(), '.github/workflows/staging-e2e.yml'), 'utf8');
     expect(workflow).not.toContain('actions/upload-artifact');
-    expect(workflow).not.toContain('test-results/**/*.webm');
-    expect(workflow).toContain('actions: read');
-    expect(workflow).toContain('Verify selected commit passed the quality workflow');
-    expect(workflow).toContain("if: github.event_name == 'workflow_dispatch'");
     expect(workflow).toContain('head_sha=${GITHUB_SHA}&event=push&status=success');
     expect(workflow).toContain('if [ "$successful_runs" -ne 1 ]');
-    expect(workflow).toContain('exit 1');
-  });
-
-  it('keeps pull-request browser checks separate from Docker publication', () => {
-    const workflow = readProjectFile('.github/workflows/deploy.yml');
-    const browserJob = workflow.slice(
-      workflow.indexOf('  browser-tests:'),
-      workflow.indexOf('  docker:'),
-    );
-    const dockerJob = workflow.slice(workflow.indexOf('  docker:'));
-
-    expect(browserJob).toContain("if: github.event_name == 'pull_request'");
-    expect(browserJob).toContain('npm run test:e2e');
-    expect(dockerJob).toContain("if: github.event_name != 'pull_request'");
-    expect(dockerJob).toContain('needs: quality');
-    expect(dockerJob).not.toContain('playwright');
   });
 });
diff --git a/src/test/security-hardening.test.ts b/src/test/security-hardening.test.ts
index aba52d94f..cab401d5a 100644
--- a/src/test/security-hardening.test.ts
+++ b/src/test/security-hardening.test.ts
@@ -10,6 +10,10 @@ const ai = read('supabase/functions/ai/index.ts');
 const stream = read('supabase/functions/ai-stream/index.ts');
 const modelCatalog = read('supabase/functions/_shared/model-catalog.ts');
 const importer = read('supabase/functions/import-source/index.ts');
+// Entitlement and rate-limit logic is shared by ai/ and ai-stream/ since the
+// two copies drifted. Behaviour is covered by _shared/entitlements.test.ts;
+// these assertions only pin the fail-closed shape at its single source.
+const entitlements = read('supabase/functions/_shared/entitlements.ts');
 const share = read('supabase/functions/share/index.ts');
 const promo = read('supabase/functions/redeem-promo/index.ts');
 const demoLogin = read('supabase/functions/demo-code-login/index.ts');
@@ -19,18 +23,17 @@ describe('security hardening regressions', () => {
     expect(migration).toContain('REVOKE INSERT, UPDATE, DELETE ON public.user_settings');
     expect(migration).toContain('GRANT UPDATE (language, theme, feature_configs, custom_system_prompt, updated_at)');
     expect(migration).toContain('REVOKE INSERT, UPDATE, DELETE ON public.ai_requests');
-    expect(ai).toContain('if (!user) return { tier: "expired", dailyLimit: 0');
-    expect(stream).toContain('if (!user) return { tier: "expired", dailyLimit: 0');
+    expect(entitlements).toContain('if (!user) return { tier: "expired", dailyLimit: 0');
+    for (const source of [ai, stream]) expect(source).toContain('from "../_shared/entitlements.ts"');
   });
 
   it('uses one server-only atomic quota reservation from every billable entrypoint', () => {
     expect(migration).toContain('ON CONFLICT (user_id, usage_date) DO UPDATE');
     expect(migration).toContain("auth.role() <> 'service_role'");
-    for (const source of [ai, stream, importer]) expect(source).toContain('consume_daily_quota');
-    expect(ai).toContain('Unable to verify your quota');
-    expect(stream).toContain('Unable to verify your quota');
-    expect(ai).not.toContain('return { allowed: true }; // Fail open');
-    expect(stream).not.toContain('return { allowed: true };\n  } catch');
+    for (const source of [entitlements, importer]) expect(source).toContain('consume_daily_quota');
+    expect(entitlements).toContain('Unable to verify your quota');
+    expect(entitlements).not.toContain('return { allowed: true }; // Fail open');
+    expect(entitlements).not.toContain('return { allowed: true };\n  } catch');
   });
 
   it('uses code-scoped sharing and disallows anonymous share creation', () => {
@@ -73,6 +76,8 @@ describe('security hardening regressions', () => {
     expect(stream).toContain('resolveModelSelection({');
     expect(ai).toContain('const provider: Provider = OPENROUTER_PROVIDER');
     expect(stream).toContain('const OPENROUTER_PROVIDER = "openrouter"');
+    expect(entitlements).not.toContain('api.anthropic.com');
+    expect(entitlements).not.toContain('api.openai.com');
     expect(ai).toContain('https://openrouter.ai/api/v1/chat/completions');
     expect(stream).toContain('https://openrouter.ai/api/v1/chat/completions');
     expect(ai).not.toContain('api.anthropic.com');
diff --git a/src/test/session-store.test.ts b/src/test/session-store.test.ts
deleted file mode 100644
index f9e6d8710..000000000
--- a/src/test/session-store.test.ts
+++ /dev/null
@@ -1,510 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import {
-  resetMockState,
-  setMockAuthUser,
-  setMockTableResponse,
-  supabaseMock,
-} from "@/test/mocks/supabase";
-
-vi.mock("@/lib/supabase/client", () => ({ supabase: supabaseMock }));
-
-import { useSessionStore } from "@/lib/stores/session-store";
-import i18n from "@/i18n";
-
-import type { GenerateOutput } from "@/lib/ai/schemas/generate";
-import type { AttackOutput } from "@/lib/ai/schemas/attack";
-import type { BrainstormOutput } from "@/lib/ai/schemas/brainstorm";
-import type { FactoidsOutput } from "@/lib/ai/schemas/factoids";
-
-const sampleGenerate: GenerateOutput = {
-  caseStructure: {
-    thesis: "Test thesis",
-    framework: "Test framework",
-    keyDefinitions: ["A"],
-    burdenOfProof: "Test burden",
-  },
-  contentions: [],
-  predictedOpponentCase: { likelyArguments: [], strategicWeaknesses: [], keyClashes: [] },
-  counters: [],
-  metadata: { side: "pro", format: "Test", generatedAt: new Date().toISOString() },
-};
-
-const sampleAttack: AttackOutput = {
-  overallAssessment: { score: 50, summary: "ok", strengthAreas: [] },
-  weaknesses: [],
-  fallaciesDetected: [],
-  crossExQuestions: [],
-  weighingAnalysis: { currentWeighing: "none", missingComparisons: [], improvementSuggestions: [] },
-};
-
-describe("session-store", () => {
-  beforeEach(async () => {
-    resetMockState();
-    localStorage.clear();
-    await i18n.changeLanguage('en');
-    useSessionStore.setState({
-      generateResult: null,
-      generateLoading: false,
-      attackResult: null,
-      attackLoading: false,
-      brainstormResult: null,
-      brainstormLoading: false,
-      factoidsResult: null,
-      factoidsLoading: false,
-      askMessages: [],
-      askLoading: false,
-      savedCases: [],
-      savedAttacks: [],
-      savedBrainstorms: [],
-      savedFactoids: [],
-      savedChats: [],
-      autosavedBrainstorms: [],
-      autosavedFactoids: [],
-      sourceLibrary: [],
-    });
-  });
-
-  it("adds ask messages with id and timestamp", () => {
-    const store = useSessionStore.getState();
-    store.addAskMessage({ role: "user", content: "Hello" });
-    const messages = useSessionStore.getState().askMessages;
-    expect(messages).toHaveLength(1);
-    expect(messages[0].id).toBeTruthy();
-    expect(messages[0].timestamp).toBeGreaterThan(0);
-  });
-
-  it("localizes automatic Brainstorm and Factoids titles", async () => {
-    const brainstorm: BrainstormOutput = {
-      needsMoreInfo: false,
-      buckets: [],
-      nextSteps: [],
-      warningsAndTradeoffs: [],
-    };
-    const factoids: FactoidsOutput = {
-      factoids: [],
-      searchSuggestions: [],
-      warnings: [],
-      verificationStatus: 'complete',
-    };
-
-    await i18n.changeLanguage('hu');
-    useSessionStore.getState().setBrainstormResult(brainstorm);
-    useSessionStore.getState().setFactoidsResult(factoids);
-
-    expect(useSessionStore.getState().autosavedBrainstorms[0].title).toBe('Ötletelés');
-    expect(useSessionStore.getState().autosavedFactoids[0].title).toBe('Tények');
-  });
-
-  it("saves and loads a case with server id replacement", async () => {
-    setMockTableResponse("cases", {
-      insert: {
-        id: "case_1",
-        title: "My Case",
-        output: sampleGenerate,
-        created_at: new Date().toISOString(),
-      },
-    });
-
-    useSessionStore.getState().setGenerateResult(sampleGenerate);
-    await useSessionStore.getState().saveCurrentCase("My Case");
-
-    const saved = useSessionStore.getState().savedCases;
-    expect(saved).toHaveLength(1);
-    expect(saved[0].id).toBe("case_1");
-
-    useSessionStore.getState().setGenerateResult(null);
-    useSessionStore.getState().loadSavedCase("case_1");
-    expect(useSessionStore.getState().generateResult?.caseStructure.thesis).toBe("Test thesis");
-  });
-
-  it("saves and loads an attack result", async () => {
-    setMockTableResponse("attacks", {
-      insert: {
-        id: "attack_1",
-        title: "Attack",
-        output: sampleAttack,
-        created_at: new Date().toISOString(),
-      },
-    });
-
-    useSessionStore.getState().setAttackResult(sampleAttack);
-    await useSessionStore.getState().saveCurrentAttack("Attack");
-
-    const saved = useSessionStore.getState().savedAttacks;
-    expect(saved).toHaveLength(1);
-    expect(saved[0].id).toBe("attack_1");
-
-    useSessionStore.getState().setAttackResult(null);
-    useSessionStore.getState().loadSavedAttack("attack_1");
-    expect(useSessionStore.getState().attackResult?.overallAssessment.score).toBe(50);
-  });
-
-  it("adds sources and toggles active state", async () => {
-    setMockTableResponse("sources", {
-      insert: {
-        id: "source_1",
-        title: "Doc",
-        content: "Test",
-        type: "text",
-        origin: null,
-        is_active: true,
-        created_at: new Date().toISOString(),
-      },
-      update: { is_active: false },
-    });
-
-    await useSessionStore.getState().addSource({ title: "Doc", content: "Test", type: "text" });
-    let sources = useSessionStore.getState().sourceLibrary;
-    expect(sources).toHaveLength(1);
-    expect(sources[0].id).toBe("source_1");
-    expect(sources[0].isActive).toBe(true);
-
-    await useSessionStore.getState().toggleSource("source_1");
-    sources = useSessionStore.getState().sourceLibrary;
-    expect(sources[0].isActive).toBe(false);
-  });
-
-  it("inserts an explicitly inactive source as inactive", async () => {
-    setMockTableResponse("sources", {
-      insert: {
-        id: "source_inactive",
-        title: "Inactive source",
-        content: "Test",
-        type: "text",
-        origin: null,
-        is_active: false,
-        created_at: new Date().toISOString(),
-      },
-    });
-    const insertCalls: Array<Record<string, unknown>> = [];
-    const originalFrom = supabaseMock.from.getMockImplementation() as unknown as (table: string) => ReturnType<typeof supabaseMock.from>;
-    supabaseMock.from.mockImplementation(((table: string) => {
-      const builder = originalFrom(table);
-      if (table === "sources") {
-        const originalInsert = builder.insert;
-        builder.insert = ((payload: Record<string, unknown>) => {
-          insertCalls.push(payload);
-          return (originalInsert as unknown as (p: Record<string, unknown>) => ReturnType<typeof builder.insert>)(payload);
-        }) as typeof builder.insert;
-      }
-      return builder;
-    }) as never);
-
-    try {
-      await useSessionStore.getState().addSource({
-        title: "Inactive source",
-        content: "Test",
-        type: "text",
-        isActive: false,
-      });
-    } finally {
-      supabaseMock.from.mockImplementation(originalFrom as never);
-    }
-
-    expect(insertCalls[0]).toEqual(expect.objectContaining({ is_active: false }));
-    expect(useSessionStore.getState().sourceLibrary[0].isActive).toBe(false);
-  });
-
-  it("hydrates server data when available", async () => {
-    setMockTableResponse("cases", {
-      order: [{ id: "case_2", title: "Server Case", output: sampleGenerate, created_at: new Date().toISOString() }],
-    });
-    setMockTableResponse("attacks", { order: [] });
-    setMockTableResponse("brainstorms", { order: [] });
-    setMockTableResponse("factoids", { order: [] });
-    setMockTableResponse("chats", { order: [] });
-    setMockTableResponse("sources", { order: [] });
-
-    await useSessionStore.getState().hydrateFromServer();
-    expect(useSessionStore.getState().savedCases).toHaveLength(1);
-    expect(useSessionStore.getState().savedCases[0].title).toBe("Server Case");
-  });
-
-  it("skips server writes when user is not signed in", async () => {
-    setMockAuthUser(null);
-    useSessionStore.getState().setGenerateResult(sampleGenerate);
-    await useSessionStore.getState().saveCurrentCase("Local only");
-    expect(supabaseMock.from).not.toHaveBeenCalled();
-  });
-
-  it("clearSession resets transient results", () => {
-    useSessionStore.getState().setGenerateResult(sampleGenerate);
-    useSessionStore.getState().setAttackResult(sampleAttack);
-    useSessionStore.getState().addAskMessage({ role: "user", content: "Hi" });
-
-    useSessionStore.getState().clearSession();
-    const state = useSessionStore.getState();
-    expect(state.generateResult).toBeNull();
-    expect(state.attackResult).toBeNull();
-    expect(state.askMessages).toHaveLength(0);
-  });
-
-  it("keeps a source locally and rejects when its server deletion fails", async () => {
-    useSessionStore.setState({
-      sourceLibrary: [{
-        id: "source_1",
-        title: "Source",
-        content: "Content",
-        type: "text",
-        createdAt: Date.now(),
-        isActive: true,
-      }],
-    } as Partial<ReturnType<typeof useSessionStore.getState>>);
-    supabaseMock.from.mockImplementationOnce((() => ({
-      delete: () => ({ eq: async () => ({ data: null as null, error: { message: "delete failed" } }) }),
-    })) as never);
-
-    await expect(useSessionStore.getState().removeSource("source_1")).rejects.toThrow("delete failed");
-    expect(useSessionStore.getState().sourceLibrary).toHaveLength(1);
-  });
-
-  it("sends provenance metadata when saving a discovered source", async () => {
-    setMockAuthUser({ id: "user_1" });
-    setMockTableResponse("sources", {
-      insert: { id: "source_9", title: "Gov report", content: "c", type: "url", origin: "https://gov.example/data", folder: "Auto-saved", is_active: true, created_at: new Date().toISOString(), metadata: { qualityLabel: "strong" } },
-    });
-    const insertCalls: Array<{ table: string; payload: Record<string, unknown> }> = [];
-    const originalFrom = supabaseMock.from.getMockImplementation() as unknown as (table: string) => ReturnType<typeof supabaseMock.from>;
-    supabaseMock.from.mockImplementation(((table: string) => {
-      const builder = originalFrom(table);
-      if (table === "sources") {
-        const originalInsert = builder.insert;
-        builder.insert = ((payload: Record<string, unknown>) => {
-          insertCalls.push({ table, payload });
-          return (originalInsert as unknown as (p: Record<string, unknown>) => ReturnType<typeof builder.insert>)(payload);
-        }) as typeof builder.insert;
-      }
-      return builder;
-    }) as never);
-
-    try {
-      await useSessionStore.getState().addSource({
-        title: "Gov report",
-        content: "c",
-        type: "url",
-        origin: "https://gov.example/data",
-        folder: "Auto-saved",
-        metadata: {
-          url: "https://gov.example/data",
-          sourceType: "government",
-          qualityScore: 82,
-          qualityLabel: "strong",
-          query: "policy statistics 2026",
-          capturedVia: "generate",
-        },
-      });
-    } finally {
-      supabaseMock.from.mockImplementation(originalFrom as never);
-    }
-
-    expect(insertCalls).toHaveLength(1);
-    expect(insertCalls[0].payload.metadata).toEqual({
-      url: "https://gov.example/data",
-      sourceType: "government",
-      qualityScore: 82,
-      qualityLabel: "strong",
-      query: "policy statistics 2026",
-      capturedVia: "generate",
-    });
-  });
-
-  it("round-trips provenance metadata from the database into state", async () => {
-    setMockAuthUser({ id: "user_1" });
-    const metadata = { url: "https://gov.example/data", qualityLabel: "moderate" as const, capturedVia: "brainstorm" };
-    setMockTableResponse("sources", {
-      insert: { id: "source_10", title: "News", content: "c", type: "url", origin: "https://news.example/a", folder: "Auto-saved", is_active: true, created_at: new Date().toISOString(), metadata },
-    });
-
-    await useSessionStore.getState().addSource({
-      title: "News",
-      content: "c",
-      type: "url",
-      origin: "https://news.example/a",
-      folder: "Auto-saved",
-      metadata,
-    });
-
-    const saved = useSessionStore.getState().sourceLibrary[0];
-    expect(saved.metadata).toEqual(metadata);
-  });
-
-  it("hydrates valid provenance metadata from the database", async () => {
-    setMockTableResponse("sources", {
-      order: [{
-        id: "source_11",
-        title: "Policy source",
-        content: "c",
-        type: "url",
-        origin: "https://example.com/policy",
-        folder: "Auto-saved",
-        is_active: true,
-        created_at: new Date().toISOString(),
-        metadata: {
-          url: "https://example.com/policy",
-          sourceType: "government",
-          qualityScore: 91,
-          qualityLabel: "strong",
-          query: "policy update",
-          capturedVia: "ask",
-        },
-      }],
-    });
-
-    await useSessionStore.getState().hydrateFromServer();
-
-    expect(useSessionStore.getState().sourceLibrary[0].metadata).toEqual({
-      url: "https://example.com/policy",
-      sourceType: "government",
-      qualityScore: 91,
-      qualityLabel: "strong",
-      query: "policy update",
-      capturedVia: "ask",
-    });
-  });
-
-  it("drops malformed provenance fields while hydrating valid fields", async () => {
-    setMockTableResponse("sources", {
-      order: [{
-        id: "source_12",
-        title: "Mixed source",
-        content: "c",
-        type: "url",
-        origin: "https://example.com/mixed",
-        is_active: true,
-        created_at: new Date().toISOString(),
-        metadata: {
-          url: "https://example.com/mixed",
-          sourceType: 42,
-          qualityScore: "91",
-          qualityLabel: "invalid",
-          query: "valid query",
-          capturedVia: null,
-        },
-      }],
-    });
-
-    await useSessionStore.getState().hydrateFromServer();
-
-    expect(useSessionStore.getState().sourceLibrary[0].metadata).toEqual({
-      url: "https://example.com/mixed",
-      query: "valid query",
-    });
-  });
-
-  it("parses valid semantic metadata and discards only an invalid semantic object", async () => {
-    setMockTableResponse("sources", {
-      order: [
-        {
-          id: "semantic-valid", title: "Valid", content: "c", type: "url", origin: "https://example.com/valid", is_active: true, created_at: new Date().toISOString(),
-          metadata: { qualityLabel: "strong", semantic: { relevance: 0.9, importance: 3, strength: 2, evaluatedAt: "2026-09-21T00:00:00.000Z", useCount: 4, caseUseCount: 2, lastUsedInCase: true } },
-        },
-        {
-          id: "semantic-invalid", title: "Invalid", content: "c", type: "url", origin: "https://example.com/invalid", is_active: true, created_at: new Date().toISOString(),
-          metadata: { qualityLabel: "moderate", semantic: { relevance: 7, importance: 5 } },
-        },
-      ],
-    });
-
-    await useSessionStore.getState().hydrateFromServer();
-    expect(useSessionStore.getState().sourceLibrary.find((source) => source.id === "semantic-valid")?.metadata?.semantic?.caseUseCount).toBe(2);
-    expect(useSessionStore.getState().sourceLibrary.find((source) => source.id === "semantic-invalid")?.metadata).toEqual({ qualityLabel: "moderate" });
-  });
-
-  it("persists metadata when updating a source", async () => {
-    setMockAuthUser({ id: "user_1" });
-    useSessionStore.setState({ sourceLibrary: [{ id: "source_1", title: "Source", content: "Content", type: "text", createdAt: 1, isActive: true }] });
-    const updates: Array<Record<string, unknown>> = [];
-    const originalFrom = supabaseMock.from.getMockImplementation() as unknown as (table: string) => ReturnType<typeof supabaseMock.from>;
-    supabaseMock.from.mockImplementation(((table: string) => {
-      const builder = originalFrom(table);
-      if (table === "sources") {
-        const originalUpdate = builder.update;
-        builder.update = ((payload: Record<string, unknown>) => {
-          updates.push(payload);
-          return (originalUpdate as unknown as (p: Record<string, unknown>) => ReturnType<typeof builder.update>)(payload);
-        }) as typeof builder.update;
-      }
-      return builder;
-    }) as never);
-    const semantic = { relevance: 0.8, importance: 2 as const, strength: 3 as const, evaluatedAt: "2026-09-21T00:00:00.000Z", useCount: 1, caseUseCount: 1, lastUsedInCase: true };
-    try {
-      await useSessionStore.getState().updateSource("source_1", { metadata: { semantic } });
-    } finally {
-      supabaseMock.from.mockImplementation(originalFrom as never);
-    }
-    expect(updates[0].metadata).toEqual({ semantic });
-  });
-
-  it("merges semantic assessments without losing source provenance", async () => {
-    useSessionStore.setState({ sourceLibrary: [{
-      id: "source_1",
-      title: "Source",
-      content: "Content",
-      type: "url",
-      origin: "https://example.com/source",
-      createdAt: 1,
-      isActive: true,
-      metadata: { url: "https://example.com/source", query: "original query", qualityLabel: "strong" },
-    }] });
-
-    await useSessionStore.getState().applySourceAssessments([{
-      key: "source_1",
-      id: "source_1",
-      relevance: 0.9,
-      importance: 3,
-      strength: 2,
-      evaluatedAt: "2026-09-21T00:00:00.000Z",
-      retained: true,
-      usedInCase: true,
-    }]);
-
-    expect(useSessionStore.getState().sourceLibrary[0].metadata).toEqual(expect.objectContaining({
-      url: "https://example.com/source",
-      query: "original query",
-      qualityLabel: "strong",
-      semantic: expect.objectContaining({ useCount: 1, caseUseCount: 1, lastUsedInCase: true }),
-    }));
-  });
-
-  it("persists local collections but excludes pending session state", () => {
-    const partialize = useSessionStore.persist.getOptions().partialize!;
-    const savedCases = [{ id: "case_1", title: "Case", createdAt: Date.now(), data: sampleGenerate }];
-    const sourceLibrary = [{
-      id: "source_1",
-      title: "Source",
-      content: "Content",
-      type: "text" as const,
-      createdAt: Date.now(),
-      isActive: true,
-    }];
-    const persisted = partialize({
-      ...useSessionStore.getState(),
-      savedCases,
-      sourceLibrary,
-      pendingFlowchartData: { nodes: [], edges: [] },
-    }) as Partial<ReturnType<typeof useSessionStore.getState>>;
-
-    expect(persisted.savedCases).toEqual(savedCases);
-    expect(persisted.sourceLibrary).toEqual(sourceLibrary);
-    expect(persisted).not.toHaveProperty("pendingFlowchartData");
-  });
-
-  it("keeps local data when atomic server erasure is rejected", async () => {
-    useSessionStore.setState({
-      savedCases: [{ id: "1", title: "Case", createdAt: Date.now(), data: sampleGenerate }],
-      savedAttacks: [{ id: "2", title: "Attack", createdAt: Date.now(), data: sampleAttack }],
-    } as Partial<ReturnType<typeof useSessionStore.getState>>);
-    supabaseMock.rpc.mockResolvedValueOnce({
-      data: null,
-      error: { message: "erase failed" },
-    });
-
-    await expect(useSessionStore.getState().clearAllData()).rejects.toThrow("erase failed");
-
-    const state = useSessionStore.getState();
-    expect(state.savedCases).toHaveLength(1);
-    expect(state.savedAttacks).toHaveLength(1);
-    expect(supabaseMock.rpc).toHaveBeenCalledWith("clear_current_user_data");
-    expect(supabaseMock.from).not.toHaveBeenCalled();
-  });
-});
diff --git a/src/test/setup.ts b/src/test/setup.ts
index f16dbb17e..f45617299 100644
--- a/src/test/setup.ts
+++ b/src/test/setup.ts
@@ -55,3 +55,18 @@ Object.defineProperty(globalThis, "ResizeObserver", {
   writable: true,
   value: MockResizeObserver,
 });
+
+// jsdom implements neither of these; export code uses them to trigger downloads.
+Object.defineProperty(URL, "createObjectURL", {
+  writable: true,
+  value: () => "blob:mock",
+});
+
+Object.defineProperty(URL, "revokeObjectURL", {
+  writable: true,
+  value: () => { },
+});
+
+// A real anchor click makes jsdom attempt navigation and log "Not implemented".
+// Tests that need to observe downloads spy on this via test/helpers/downloads.
+HTMLAnchorElement.prototype.click = function () { };
diff --git a/src/test/sparring-ai.test.ts b/src/test/sparring-ai.test.ts
index 5605d5b44..a9e8676dc 100644
--- a/src/test/sparring-ai.test.ts
+++ b/src/test/sparring-ai.test.ts
@@ -6,7 +6,6 @@ import {
   SparringTurnResponseSchema,
   type SparringSpeech,
 } from '@/lib/ai/schemas/sparring';
-import { mockGenerateSparringTurn, mockJudgeSparringSession } from '@/lib/ai/providers/mock-provider';
 
 const session = {
   sessionId: '00000000-0000-4000-8000-000000000001',
@@ -70,36 +69,4 @@ describe('Sparring AI contract', () => {
     expect(SparringScorecardSchema.safeParse({ ...scorecard, userScore: 79 }).success).toBe(false);
     expect(SparringScorecardSchema.safeParse({ ...scorecard, winner: 'ai' }).success).toBe(false);
   });
-
-  it('produces deterministic, schema-valid mock turn and score responses', async () => {
-    const respondInput = {
-      ...session,
-      action: 'respond' as const,
-      currentTurn: { id: 'pf-2', label: 'Con constructive', side: 'con' as const, kind: 'constructive' as const, timeLimitSeconds: 240 },
-      speeches: [{
-        id: 'speech-1', turnId: 'pf-1', speaker: 'user' as const, side: 'pro' as const, role: 'Pro constructive',
-        content: 'The policy improves accountability through transparent reporting.', createdAt: 1, timeLimitSeconds: 240, timeUsedSeconds: 30,
-      }],
-    };
-    const firstTurn = await mockGenerateSparringTurn(respondInput);
-    const secondTurn = await mockGenerateSparringTurn(respondInput);
-    expect(firstTurn).toEqual(secondTurn);
-    expect(SparringTurnResponseSchema.safeParse(firstTurn).success).toBe(true);
-
-    const scoreInput = { ...session, action: 'score' as const, speeches: respondInput.speeches };
-    const score = await mockJudgeSparringSession(scoreInput);
-    expect(SparringScoreResponseSchema.safeParse(score).success).toBe(true);
-    expect(score.scorecard.categories.map((category) => category.name)).toEqual(['Logic', 'Evidence', 'Delivery', 'Strategy']);
-  });
-
-  it('makes the mock opponent perform the assigned school role', async () => {
-    const response = await mockGenerateSparringTurn({
-      ...session,
-      format: 'standard',
-      action: 'respond',
-      currentTurn: { id: 'standard-8', label: 'Con Conclusor', side: 'con', kind: 'conclusor', timeLimitSeconds: 180 },
-    });
-    expect(response.speech.strategy).toContain('Add no new argument');
-    expect(response.speech.content).toContain('As Con Conclusor');
-  });
 });
diff --git a/src/test/sparring/exports.test.ts b/src/test/sparring/exports.test.ts
index bb4fa3cc2..f2c9c89da 100644
--- a/src/test/sparring/exports.test.ts
+++ b/src/test/sparring/exports.test.ts
@@ -34,10 +34,6 @@ vi.mock('docx', () => ({
   AlignmentType: { CENTER: 'CENTER' },
 }));
 
-vi.mock('file-saver', () => ({
-  saveAs: vi.fn(),
-}));
-
 vi.mock('jspdf', () => ({
   jsPDF: class MockJsPdf {
     constructor() {
@@ -79,7 +75,7 @@ vi.mock('jspdf-autotable', () => ({
   }),
 }));
 
-import { saveAs } from 'file-saver';
+import { captureDownloads } from '../helpers/downloads';
 import { exportSparringToDocx } from '@/lib/export-utils';
 import { exportSparringToPdf } from '@/lib/pdf-export-utils';
 
@@ -152,8 +148,11 @@ const SCHOOL_SESSION: SparringSession = {
 };
 
 describe('sparring transcript exports', () => {
+  let downloads: ReturnType<typeof captureDownloads>;
+
   beforeEach(async () => {
     vi.clearAllMocks();
+    downloads = captureDownloads();
     exportMocks.paragraphs.length = 0;
     exportMocks.textRuns.length = 0;
     exportMocks.documents.length = 0;
@@ -166,7 +165,7 @@ describe('sparring transcript exports', () => {
     await i18n.changeLanguage('es');
 
     await expect(exportSparringToDocx(SESSION)).resolves.toBe(true);
-    expect(saveAs).toHaveBeenCalledWith(expect.any(Blob), 'SparringTranscript_1970-01-01.docx');
+    expect(downloads.at(-1)?.filename).toBe('SparringTranscript_1970-01-01.docx');
 
     const paragraphText = exportMocks.paragraphs
       .map((paragraph) => paragraph.text)
diff --git a/src/test/stores/session-store-coverage.test.ts b/src/test/stores/session-store-coverage.test.ts
deleted file mode 100644
index d95c46949..000000000
--- a/src/test/stores/session-store-coverage.test.ts
+++ /dev/null
@@ -1,448 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import {
-  resetMockState,
-  setMockAuthUser,
-  setMockTableResponse,
-  supabaseMock,
-} from '@/test/mocks/supabase';
-
-vi.mock('@/lib/supabase/client', () => ({ supabase: supabaseMock }));
-
-import { useSessionStore } from '@/lib/stores/session-store';
-import type { BrainstormOutput } from '@/lib/ai/schemas/brainstorm';
-import type { FactoidsOutput } from '@/lib/ai/schemas/factoids';
-
-const nowIso = '2026-02-12T10:00:00.000Z';
-
-const brainstormOutput: BrainstormOutput = {
-  needsMoreInfo: false,
-  clarifyingQuestions: [],
-  nextSteps: ['step'],
-  warningsAndTradeoffs: [],
-};
-
-const factoidsOutput: FactoidsOutput = {
-  factoids: [],
-  searchSuggestions: [],
-  warnings: [],
-  verificationStatus: 'complete' as const,
-};
-
-describe('session-store coverage paths', () => {
-  beforeEach(() => {
-    resetMockState();
-    localStorage.clear();
-    useSessionStore.setState({
-      generateResult: null,
-      attackResult: null,
-      brainstormResult: null,
-      factoidsResult: null,
-      askMessages: [],
-      savedCases: [],
-      savedAttacks: [],
-      savedBrainstorms: [],
-      savedFactoids: [],
-      savedChats: [],
-      savedFlowcharts: [],
-      autosavedCases: [],
-      autosavedAttacks: [],
-      autosavedBrainstorms: [],
-      autosavedFactoids: [],
-      sourceFolders: ['General'],
-      sourceLibrary: [],
-      pendingFlowchartData: null,
-      generateForm: {},
-      attackForm: {},
-      brainstormForm: {},
-      factoidsForm: {},
-    } as Partial<ReturnType<typeof useSessionStore.getState>>);
-  });
-
-  it('persists local collections but excludes transient loading and streaming state', () => {
-    const source = {
-      id: 'local-source',
-      title: 'Local source',
-      content: 'Guest and offline content must survive reloads.',
-      type: 'text' as const,
-      createdAt: Date.now(),
-      isActive: true,
-    };
-    const state = {
-      ...useSessionStore.getState(),
-      generateLoading: true,
-      sourceFolders: ['General', 'Offline folder'],
-      sourceLibrary: [source],
-      savedCases: [{ id: 'offline-case', title: 'Offline case', createdAt: Date.now(), data: { offline: true } as any }],
-      autosavedCases: [{ id: 'autosave', title: 'Draft', createdAt: Date.now(), data: { draft: true } as any }],
-      askStreamingAssistant: {
-        id: 'streaming',
-        role: 'assistant' as const,
-        content: 'Partial response',
-        timestamp: Date.now(),
-        isStreaming: true as const,
-      },
-    };
-    const partialize = useSessionStore.persist.getOptions().partialize;
-
-    expect(partialize).toBeTypeOf('function');
-    const persisted = partialize!(state) as Partial<typeof state>;
-
-    expect(persisted.sourceLibrary).toEqual([source]);
-    expect(persisted.sourceFolders).toEqual(['General', 'Offline folder']);
-    expect(persisted.savedCases).toEqual(state.savedCases);
-    expect(persisted.autosavedCases).toEqual(state.autosavedCases);
-    expect(persisted).not.toHaveProperty('generateLoading');
-    expect(persisted).not.toHaveProperty('askStreamingAssistant');
-  });
-
-  it('early-returns save helpers when there is no current result/message', async () => {
-    await useSessionStore.getState().saveCurrentCase('no-case');
-    await useSessionStore.getState().saveCurrentAttack('no-attack');
-    await useSessionStore.getState().saveCurrentBrainstorm('no-brainstorm');
-    await useSessionStore.getState().saveCurrentFactoids('no-factoids');
-    await useSessionStore.getState().saveCurrentChat('no-chat');
-
-    expect(useSessionStore.getState().savedCases).toHaveLength(0);
-    expect(useSessionStore.getState().savedAttacks).toHaveLength(0);
-    expect(useSessionStore.getState().savedBrainstorms).toHaveLength(0);
-    expect(useSessionStore.getState().savedFactoids).toHaveLength(0);
-    expect(useSessionStore.getState().savedChats).toHaveLength(0);
-  });
-
-  it('keeps only local saves when user is not authenticated', async () => {
-    setMockAuthUser(null);
-
-    useSessionStore.getState().setBrainstormResult(brainstormOutput as any);
-    useSessionStore.getState().setFactoidsResult(factoidsOutput as any);
-    useSessionStore.getState().addAskMessage({ role: 'user', content: 'Q' });
-
-    await useSessionStore.getState().saveCurrentBrainstorm('Local brainstorm');
-    await useSessionStore.getState().saveCurrentFactoids('Local factoids');
-    await useSessionStore.getState().saveCurrentChat('Local chat');
-    await useSessionStore.getState().saveFlowchart('Local flow', { nodes: [], edges: [] });
-
-    expect(useSessionStore.getState().savedBrainstorms).toHaveLength(1);
-    expect(useSessionStore.getState().savedFactoids).toHaveLength(1);
-    expect(useSessionStore.getState().savedChats).toHaveLength(1);
-    expect(useSessionStore.getState().savedFlowcharts).toHaveLength(1);
-  });
-
-  it('saves and loads brainstorm + factoids items with server id replacement', async () => {
-    setMockTableResponse('brainstorms', {
-      insert: {
-        id: 'brain_1',
-        title: 'Brainstorm 1',
-        output: brainstormOutput,
-        created_at: nowIso,
-      },
-    });
-    setMockTableResponse('factoids', {
-      insert: {
-        id: 'fact_1',
-        title: 'Factoids 1',
-        output: factoidsOutput,
-        created_at: nowIso,
-      },
-    });
-
-    useSessionStore.getState().setBrainstormResult(brainstormOutput);
-    useSessionStore.getState().setFactoidsResult(factoidsOutput);
-
-    await useSessionStore.getState().saveCurrentBrainstorm('Brainstorm 1');
-    await useSessionStore.getState().saveCurrentFactoids('Factoids 1');
-
-    expect(useSessionStore.getState().savedBrainstorms[0].id).toBe('brain_1');
-    expect(useSessionStore.getState().savedFactoids[0].id).toBe('fact_1');
-
-    useSessionStore.getState().setBrainstormResult(null);
-    useSessionStore.getState().setFactoidsResult(null);
-
-    useSessionStore.getState().loadSavedBrainstorm('brain_1');
-    useSessionStore.getState().loadSavedFactoids('fact_1');
-
-    expect(useSessionStore.getState().brainstormResult?.nextSteps).toEqual(['step']);
-    expect(useSessionStore.getState().factoidsResult?.verificationStatus).toBe('complete');
-  });
-
-  it('saves chats including message rows and restores chat history', async () => {
-    setMockTableResponse('chats', {
-      insert: {
-        id: 'chat_1',
-        title: 'Saved chat',
-        created_at: nowIso,
-      },
-    });
-
-    useSessionStore.getState().addAskMessage({ role: 'user', content: 'Question' });
-    useSessionStore.getState().addAskMessage({ role: 'assistant', content: 'Answer' });
-
-    await useSessionStore.getState().saveCurrentChat('Saved chat');
-
-    expect(useSessionStore.getState().savedChats).toHaveLength(1);
-    expect(useSessionStore.getState().savedChats[0].id).toBe('chat_1');
-    expect(supabaseMock.from).toHaveBeenCalledWith('messages');
-
-    useSessionStore.getState().clearAskMessages();
-    useSessionStore.getState().loadSavedChat('chat_1');
-    expect(useSessionStore.getState().askMessages).toHaveLength(2);
-  });
-
-  it('rejects server saves that return no record without adding local items', async () => {
-    setMockTableResponse('brainstorms', { insert: null });
-    setMockTableResponse('factoids', { insert: null });
-    setMockTableResponse('chats', { insert: null });
-    setMockTableResponse('flowcharts', { insert: null });
-
-    useSessionStore.getState().setBrainstormResult(brainstormOutput as any);
-    useSessionStore.getState().setFactoidsResult(factoidsOutput as any);
-    useSessionStore.getState().addAskMessage({ role: 'user', content: 'Needs local id' });
-
-    await expect(useSessionStore.getState().saveCurrentBrainstorm('Brain no server')).rejects.toThrow('No record returned');
-    await expect(useSessionStore.getState().saveCurrentFactoids('Fact no server')).rejects.toThrow('No record returned');
-    await expect(useSessionStore.getState().saveCurrentChat('Chat no server')).rejects.toThrow('No record returned');
-    await expect(useSessionStore.getState().saveFlowchart('Flow no server', { nodes: [], edges: [] })).rejects.toThrow('No record returned');
-
-    const state = useSessionStore.getState();
-    expect(state.savedBrainstorms).toHaveLength(0);
-    expect(state.savedFactoids).toHaveLength(0);
-    expect(state.savedChats).toHaveLength(0);
-    expect(state.savedFlowcharts).toHaveLength(0);
-  });
-
-  it('saves and deletes flowcharts', async () => {
-    setMockTableResponse('flowcharts', {
-      insert: {
-        id: 'flow_1',
-        title: 'Flowchart A',
-        nodes: [{ id: 'n1', position: { x: 0, y: 0 }, data: { label: 'A' }, type: 'default' }],
-        edges: [],
-        created_at: nowIso,
-      },
-    });
-
-    await useSessionStore.getState().saveFlowchart('Flowchart A', {
-      nodes: [{ id: 'n1', position: { x: 0, y: 0 }, data: { label: 'A' }, type: 'default' }],
-      edges: [],
-    });
-
-    expect(useSessionStore.getState().savedFlowcharts).toHaveLength(1);
-    expect(useSessionStore.getState().savedFlowcharts[0].id).toBe('flow_1');
-
-    await useSessionStore.getState().deleteSavedFlowchart('flow_1');
-    expect(useSessionStore.getState().savedFlowcharts).toHaveLength(0);
-  });
-
-  it('hydrates server data across all supported entities', async () => {
-    setMockTableResponse('cases', {
-      order: [{ id: 'case_1', title: 'Case', output: { key: 'case' }, created_at: nowIso }],
-    });
-    setMockTableResponse('attacks', {
-      order: [{ id: 'attack_1', title: 'Attack', output: { key: 'attack' }, created_at: nowIso }],
-    });
-    setMockTableResponse('brainstorms', {
-      order: [{ id: 'brain_1', title: 'Brainstorm', output: brainstormOutput, created_at: nowIso }],
-    });
-    setMockTableResponse('factoids', {
-      order: [{ id: 'fact_1', title: 'Factoids', output: factoidsOutput, created_at: nowIso }],
-    });
-    setMockTableResponse('chats', {
-      order: [{ id: 'chat_1', title: 'Chat', created_at: nowIso }],
-    });
-    setMockTableResponse('messages', {
-      in: [
-        {
-          id: 'msg_1',
-          chat_id: 'chat_1',
-          role: 'user',
-          content: 'Hello',
-          output: null,
-          created_at: nowIso,
-        },
-      ],
-    });
-    setMockTableResponse('flowcharts', {
-      order: [{ id: 'flow_1', title: 'Flow', nodes: [], edges: [], created_at: nowIso }],
-    });
-    setMockTableResponse('sources', {
-      order: [
-        {
-          id: 'source_1',
-          title: 'Source',
-          content: 'Evidence',
-          type: 'url',
-          origin: 'https://example.com',
-          is_active: true,
-          created_at: nowIso,
-        },
-      ],
-    });
-    setMockTableResponse('source_folders', {
-      order: [{ id: 'folder_1', name: 'Tournament', created_at: nowIso }],
-    });
-
-    await useSessionStore.getState().hydrateFromServer();
-
-    const state = useSessionStore.getState();
-    expect(state.savedCases).toHaveLength(1);
-    expect(state.savedAttacks).toHaveLength(1);
-    expect(state.savedBrainstorms).toHaveLength(1);
-    expect(state.savedFactoids).toHaveLength(1);
-    expect(state.savedChats[0].data).toHaveLength(1);
-    expect(state.savedFlowcharts).toHaveLength(1);
-    expect(state.sourceLibrary).toHaveLength(1);
-    expect(state.sourceFolders).toContain('Tournament');
-  });
-
-  it('persists empty source folders for cross-device sync', async () => {
-    await useSessionStore.getState().createSourceFolder('Round 1');
-
-    expect(useSessionStore.getState().sourceFolders).toContain('Round 1');
-    expect(supabaseMock.from).toHaveBeenCalledWith('source_folders');
-  });
-
-  it('does not overwrite local state when server has no persisted data', async () => {
-    useSessionStore.setState({
-      savedCases: [{ id: 'local-case', title: 'Local', createdAt: Date.now(), data: { x: 1 } as any }],
-    } as Partial<ReturnType<typeof useSessionStore.getState>>);
-
-    setMockTableResponse('cases', { order: [] });
-    setMockTableResponse('attacks', { order: [] });
-    setMockTableResponse('brainstorms', { order: [] });
-    setMockTableResponse('factoids', { order: [] });
-    setMockTableResponse('chats', { order: [] });
-    setMockTableResponse('flowcharts', { order: [] });
-    setMockTableResponse('sources', { order: [] });
-    setMockTableResponse('source_folders', { order: [] });
-
-    await useSessionStore.getState().hydrateFromServer();
-
-    expect(useSessionStore.getState().savedCases[0].id).toBe('local-case');
-  });
-
-  it('hydrates safely when Supabase query responses contain null data arrays', async () => {
-    const originalFrom = supabaseMock.from.getMockImplementation();
-    supabaseMock.from.mockImplementation((table: string) => ({
-      select: vi.fn(() => ({
-        order: vi.fn(async () => ({ data: null, error: null })),
-        in: vi.fn(() => ({
-          order: vi.fn(async () => ({ data: null, error: null })),
-        })),
-      })),
-      insert: vi.fn(() => ({
-        select: vi.fn(() => ({
-          single: vi.fn(async () => ({ data: null, error: null })),
-        })),
-      })),
-      update: vi.fn(() => ({ eq: vi.fn(async () => ({ data: null, error: null })) })),
-      delete: vi.fn(() => ({ eq: vi.fn(async () => ({ data: null, error: null })), neq: vi.fn(async () => ({ data: null, error: null })) })),
-      eq: vi.fn(async () => ({ data: null, error: null })),
-      neq: vi.fn(async () => ({ data: null, error: null })),
-      in: vi.fn(() => ({ order: vi.fn(async () => ({ data: null, error: null })) })),
-      order: vi.fn(async () => ({ data: null, error: null })),
-      table,
-    }) as any);
-
-    try {
-      await useSessionStore.getState().hydrateFromServer();
-      expect(useSessionStore.getState().savedCases).toHaveLength(0);
-      expect(useSessionStore.getState().sourceLibrary).toHaveLength(0);
-    } finally {
-      if (originalFrom) supabaseMock.from.mockImplementation(originalFrom);
-    }
-  });
-
-  it('clearAllData clears local state after successful atomic server erasure', async () => {
-    useSessionStore.setState({
-      savedCases: [{ id: 'case', title: 'c', createdAt: Date.now(), data: {} as any }],
-      savedAttacks: [{ id: 'attack', title: 'a', createdAt: Date.now(), data: {} as any }],
-      savedBrainstorms: [{ id: 'brain', title: 'b', createdAt: Date.now(), data: brainstormOutput as any }],
-      savedFactoids: [{ id: 'fact', title: 'f', createdAt: Date.now(), data: factoidsOutput as any }],
-      savedChats: [{ id: 'chat', title: 'chat', createdAt: Date.now(), data: [] as any }],
-      savedFlowcharts: [{ id: 'flow', title: 'flow', createdAt: Date.now(), data: { nodes: [], edges: [] } as any }],
-      autosavedCases: [{ id: 'autosave-case', title: 'draft', createdAt: Date.now(), data: {} as any }],
-      autosavedAttacks: [{ id: 'autosave-attack', title: 'draft', createdAt: Date.now(), data: {} as any }],
-      autosavedBrainstorms: [{ id: 'autosave-brainstorm', title: 'draft', createdAt: Date.now(), data: {} as any }],
-      autosavedFactoids: [{ id: 'autosave-factoid', title: 'draft', createdAt: Date.now(), data: {} as any }],
-      sourceLibrary: [{ id: 'src', title: 's', content: 'x', type: 'text', createdAt: Date.now(), isActive: true }],
-    } as Partial<ReturnType<typeof useSessionStore.getState>>);
-
-    await useSessionStore.getState().clearAllData();
-
-    const state = useSessionStore.getState();
-    expect(state.savedCases).toHaveLength(0);
-    expect(state.savedAttacks).toHaveLength(0);
-    expect(state.savedBrainstorms).toHaveLength(0);
-    expect(state.savedFactoids).toHaveLength(0);
-    expect(state.savedChats).toHaveLength(0);
-    expect(state.savedFlowcharts).toHaveLength(0);
-    expect(state.autosavedCases).toHaveLength(0);
-    expect(state.autosavedAttacks).toHaveLength(0);
-    expect(state.autosavedBrainstorms).toHaveLength(0);
-    expect(state.autosavedFactoids).toHaveLength(0);
-    expect(state.sourceLibrary).toHaveLength(0);
-
-    expect(supabaseMock.rpc).toHaveBeenCalledWith('clear_current_user_data');
-    expect(supabaseMock.from).not.toHaveBeenCalled();
-  });
-
-  it('throws clearAllData safety error when user is missing', async () => {
-    setMockAuthUser(null);
-    await expect(useSessionStore.getState().clearAllData()).rejects.toThrow('Cannot delete data: No authenticated user');
-  });
-
-  it('resets local/transient state and form fields', () => {
-    useSessionStore.setState({
-      generateResult: { a: 1 } as any,
-      attackResult: { b: 1 } as any,
-      brainstormResult: brainstormOutput as any,
-      factoidsResult: factoidsOutput as any,
-      askMessages: [{ id: 'm1', role: 'user', content: 'q', timestamp: Date.now() }],
-      sourceLibrary: [{ id: 'src', title: 's', content: 'x', type: 'text', createdAt: Date.now(), isActive: true }],
-      pendingFlowchartData: { nodes: [], edges: [] },
-      generateForm: { motion: 'M' } as any,
-      attackForm: { caseText: 'C' } as any,
-      brainstormForm: { motion: 'B' } as any,
-      factoidsForm: { claim: 'F' } as any,
-    } as Partial<ReturnType<typeof useSessionStore.getState>>);
-
-    useSessionStore.getState().resetLocalData();
-
-    expect(useSessionStore.getState().generateResult).toBeNull();
-    expect(useSessionStore.getState().sourceLibrary).toHaveLength(0);
-
-    useSessionStore.getState().clearSession();
-    expect(useSessionStore.getState().pendingFlowchartData).toBeNull();
-    expect(useSessionStore.getState().generateForm).toEqual({});
-    expect(useSessionStore.getState().attackForm).toEqual({});
-    expect(useSessionStore.getState().brainstormForm).toEqual({});
-    expect(useSessionStore.getState().factoidsForm).toEqual({});
-  });
-
-  it('handles no-op source toggles and delete/load helpers', async () => {
-    await useSessionStore.getState().toggleSource('missing');
-
-    setMockTableResponse('cases', {
-      insert: {
-        id: 'case_del',
-        title: 'Delete me',
-        output: { key: 1 },
-        created_at: nowIso,
-      },
-    });
-
-    useSessionStore.getState().setGenerateResult({ key: 1 } as any);
-    await useSessionStore.getState().saveCurrentCase('Delete me');
-    expect(useSessionStore.getState().savedCases).toHaveLength(1);
-
-    await useSessionStore.getState().deleteSavedCase('case_del');
-    expect(useSessionStore.getState().savedCases).toHaveLength(0);
-
-    // Load helpers should no-op when id does not exist
-    useSessionStore.getState().loadSavedCase('missing');
-    useSessionStore.getState().loadSavedAttack('missing');
-    useSessionStore.getState().loadSavedBrainstorm('missing');
-    useSessionStore.getState().loadSavedFactoids('missing');
-    useSessionStore.getState().loadSavedChat('missing');
-  });
-});
diff --git a/src/test/stores/session-store-extended.test.ts b/src/test/stores/session-store-extended.test.ts
deleted file mode 100644
index a05f994f1..000000000
--- a/src/test/stores/session-store-extended.test.ts
+++ /dev/null
@@ -1,454 +0,0 @@
-// src/test/stores/session-store-extended.test.ts
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { act } from '@testing-library/react';
-
-// Mock Supabase
-vi.mock('@/lib/supabase/client', () => ({
-    supabase: {
-        from: vi.fn(() => ({
-            select: vi.fn(() => ({
-                eq: vi.fn(() => ({
-                    single: vi.fn(() => Promise.resolve({ data: null, error: null })),
-                    maybeSingle: vi.fn(() => Promise.resolve({ data: null, error: null })),
-                })),
-                order: vi.fn(() => Promise.resolve({ data: [], error: null })),
-                in: vi.fn(() => ({
-                    order: vi.fn(() => Promise.resolve({ data: [], error: null })),
-                })),
-            })),
-            insert: vi.fn(() => ({
-                select: vi.fn(() => ({
-                    single: vi.fn(() => Promise.resolve({
-                        data: {
-                            id: 'mock-id',
-                            title: 'Test Source',
-                            content: 'Content here',
-                            type: 'url',
-                            origin: 'https://example.com',
-                            is_active: true,
-                            created_at: new Date().toISOString(),
-                        },
-                        error: null,
-                    })),
-                })),
-            })),
-            update: vi.fn(() => ({
-                eq: vi.fn(() => Promise.resolve({ data: null, error: null })),
-            })),
-            upsert: vi.fn(() => Promise.resolve({ data: null, error: null })),
-            delete: vi.fn(() => ({
-                eq: vi.fn(() => Promise.resolve({ data: null, error: null })),
-                neq: vi.fn(() => Promise.resolve({ data: null, error: null })),
-            })),
-        })),
-        auth: {
-            getUser: vi.fn(() => Promise.resolve({ data: { user: { id: 'test-user-id' } }, error: null })),
-            onAuthStateChange: vi.fn(() => ({ data: { subscription: { unsubscribe: vi.fn() } } })),
-        },
-        channel: vi.fn(() => ({
-            on: vi.fn(() => ({ subscribe: vi.fn() })),
-        })),
-    },
-}));
-
-// Import after mocking
-import { useSessionStore } from '@/lib/stores/session-store';
-import type { GenerateOutput } from '@/lib/ai/schemas/generate';
-import type { AttackOutput } from '@/lib/ai/schemas/attack';
-import type { BrainstormOutput } from '@/lib/ai/schemas/brainstorm';
-import type { FactoidsOutput } from '@/lib/ai/schemas/factoids';
-
-describe('Session Store Extended', () => {
-    beforeEach(() => {
-        // Reset store state before each test
-        act(() => {
-            useSessionStore.setState({
-                generateResult: null,
-                attackResult: null,
-                brainstormResult: null,
-                factoidsResult: null,
-                askMessages: [],
-                sourceLibrary: [],
-                generateLoading: false,
-                attackLoading: false,
-                brainstormLoading: false,
-                factoidsLoading: false,
-                askLoading: false,
-                savedCases: [],
-                savedAttacks: [],
-                savedBrainstorms: [],
-                savedFactoids: [],
-                savedChats: [],
-            });
-        });
-    });
-
-    describe('Source Library', () => {
-        it('adds source to library', async () => {
-            const store = useSessionStore.getState();
-            await act(async () => {
-                await store.addSource({
-                    type: 'url',
-                    title: 'Test Source',
-                    content: 'Content here',
-                    origin: 'https://example.com',
-                });
-            });
-            expect(useSessionStore.getState().sourceLibrary).toHaveLength(1);
-            expect(useSessionStore.getState().sourceLibrary[0].type).toBe('url');
-        });
-
-        it('removes source from library', async () => {
-            // First add a source
-            await act(async () => {
-                await useSessionStore.getState().addSource({
-                    type: 'url',
-                    title: 'Test Source',
-                    content: 'Content',
-                });
-            });
-
-            const sourceId = useSessionStore.getState().sourceLibrary[0].id;
-
-            await act(async () => {
-                await useSessionStore.getState().removeSource(sourceId);
-            });
-
-            expect(useSessionStore.getState().sourceLibrary).toHaveLength(0);
-        });
-
-        it('toggles source active state', async () => {
-            // First add a source
-            await act(async () => {
-                await useSessionStore.getState().addSource({
-                    type: 'url',
-                    title: 'Test Source',
-                    content: 'Content',
-                });
-            });
-
-            const sourceId = useSessionStore.getState().sourceLibrary[0].id;
-            expect(useSessionStore.getState().sourceLibrary[0].isActive).toBe(true);
-
-            await act(async () => {
-                await useSessionStore.getState().toggleSource(sourceId);
-            });
-
-            expect(useSessionStore.getState().sourceLibrary[0].isActive).toBe(false);
-        });
-
-        it('updates source details and synced folders', async () => {
-            await act(async () => {
-                await useSessionStore.getState().addSource({
-                    type: 'text',
-                    title: 'Draft source',
-                    content: 'Original content',
-                    folder: 'General',
-                });
-            });
-
-            const sourceId = useSessionStore.getState().sourceLibrary[0].id;
-
-            await act(async () => {
-                await useSessionStore.getState().updateSource(sourceId, {
-                    title: 'Updated source',
-                    content: 'Updated content',
-                    folder: 'Round 2',
-                    isActive: false,
-                });
-            });
-
-            const updated = useSessionStore.getState().sourceLibrary[0];
-            expect(updated.title).toBe('Updated source');
-            expect(updated.content).toBe('Updated content');
-            expect(updated.folder).toBe('Round 2');
-            expect(updated.isActive).toBe(false);
-            expect(useSessionStore.getState().sourceFolders).toContain('Round 2');
-        });
-
-        it('renames and deletes synced source folders', async () => {
-            await act(async () => {
-                await useSessionStore.getState().addSource({
-                    type: 'text',
-                    title: 'Round source',
-                    content: 'Evidence',
-                    folder: 'Round 1',
-                });
-            });
-
-            await act(async () => {
-                await useSessionStore.getState().renameSourceFolder('Round 1', 'Finals');
-            });
-
-            expect(useSessionStore.getState().sourceFolders).toContain('Finals');
-            expect(useSessionStore.getState().sourceLibrary[0].folder).toBe('Finals');
-
-            await act(async () => {
-                await useSessionStore.getState().deleteSourceFolder('Finals', 'move-to-general');
-            });
-
-            expect(useSessionStore.getState().sourceFolders).not.toContain('Finals');
-            expect(useSessionStore.getState().sourceLibrary[0].folder).toBe('General');
-        });
-
-        it('updates active state for every source in a folder', async () => {
-            await act(async () => {
-                await useSessionStore.getState().addSource({
-                    type: 'text',
-                    title: 'A',
-                    content: 'Evidence A',
-                    folder: 'Batch',
-                });
-                await useSessionStore.getState().addSource({
-                    type: 'text',
-                    title: 'B',
-                    content: 'Evidence B',
-                    folder: 'Batch',
-                });
-            });
-
-            await act(async () => {
-                await useSessionStore.getState().setFolderActive('Batch', false);
-            });
-
-            expect(useSessionStore.getState().sourceLibrary.every((source) => !source.isActive)).toBe(true);
-        });
-
-        it('clears all sources', async () => {
-            // Add multiple sources
-            await act(async () => {
-                await useSessionStore.getState().addSource({
-                    type: 'url',
-                    title: 'Source 1',
-                    content: 'Content 1',
-                });
-                await useSessionStore.getState().addSource({
-                    type: 'text',
-                    title: 'Source 2',
-                    content: 'Content 2',
-                });
-            });
-
-            expect(useSessionStore.getState().sourceLibrary).toHaveLength(2);
-
-            await act(async () => {
-                await useSessionStore.getState().clearLibrary();
-            });
-
-            expect(useSessionStore.getState().sourceLibrary).toHaveLength(0);
-        });
-    });
-
-    describe('Attack Results', () => {
-        const mockAttackResult: AttackOutput = {
-            overallAssessment: {
-                score: 75,
-                summary: 'Good case overall',
-                strengthAreas: ['Evidence', 'Structure'],
-            },
-            weaknesses: [],
-            fallaciesDetected: [],
-            crossExQuestions: [],
-            weighingAnalysis: {
-                currentWeighing: 'Basic',
-                missingComparisons: [],
-                improvementSuggestions: [],
-            },
-        };
-
-        it('sets attack result', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setAttackResult(mockAttackResult);
-            });
-            expect(useSessionStore.getState().attackResult).toEqual(mockAttackResult);
-        });
-
-        it('sets attack loading state', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setAttackLoading(true);
-            });
-            expect(useSessionStore.getState().attackLoading).toBe(true);
-        });
-
-        it('clears attack result', () => {
-            act(() => {
-                useSessionStore.setState({ attackResult: mockAttackResult });
-            });
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setAttackResult(null);
-            });
-            expect(useSessionStore.getState().attackResult).toBeNull();
-        });
-    });
-
-    describe('Brainstorm Results', () => {
-        const mockBrainstormResult: BrainstormOutput = {
-            needsMoreInfo: false,
-            nextSteps: ['Research more'],
-            warningsAndTradeoffs: [],
-        };
-
-        it('sets brainstorm result', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setBrainstormResult(mockBrainstormResult);
-            });
-            expect(useSessionStore.getState().brainstormResult).toEqual(mockBrainstormResult);
-        });
-
-        it('sets brainstorm loading state', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setBrainstormLoading(true);
-            });
-            expect(useSessionStore.getState().brainstormLoading).toBe(true);
-        });
-    });
-
-    describe('Factoids Results', () => {
-        const mockFactoidsResult: FactoidsOutput = {
-            factoids: [],
-            searchSuggestions: ['Try broader search'],
-            warnings: [],
-            verificationStatus: 'complete',
-        };
-
-        it('sets factoids result', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setFactoidsResult(mockFactoidsResult);
-            });
-            expect(useSessionStore.getState().factoidsResult).toEqual(mockFactoidsResult);
-        });
-
-        it('sets factoids loading state', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setFactoidsLoading(true);
-            });
-            expect(useSessionStore.getState().factoidsLoading).toBe(true);
-        });
-    });
-
-    describe('Ask/Chat', () => {
-        it('adds message to chat', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.addAskMessage({
-                    role: 'user',
-                    content: 'How do I structure a rebuttal?',
-                });
-            });
-            expect(useSessionStore.getState().askMessages).toHaveLength(1);
-            expect(useSessionStore.getState().askMessages[0].content).toBe('How do I structure a rebuttal?');
-        });
-
-        it('adds multiple messages', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.addAskMessage({ role: 'user', content: 'Question 1' });
-                store.addAskMessage({ role: 'assistant', content: 'Answer 1' });
-                store.addAskMessage({ role: 'user', content: 'Question 2' });
-            });
-            expect(useSessionStore.getState().askMessages).toHaveLength(3);
-        });
-
-        it('sets ask loading state', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setAskLoading(true);
-            });
-            expect(useSessionStore.getState().askLoading).toBe(true);
-        });
-
-        it('clears ask messages', () => {
-            act(() => {
-                useSessionStore.setState({
-                    askMessages: [
-                        { id: '1', role: 'user', content: 'Question', timestamp: Date.now() },
-                        { id: '2', role: 'assistant', content: 'Answer', timestamp: Date.now() },
-                    ],
-                });
-            });
-            const store = useSessionStore.getState();
-            act(() => {
-                store.clearAskMessages();
-            });
-            expect(useSessionStore.getState().askMessages).toHaveLength(0);
-        });
-    });
-
-    describe('Generate Results', () => {
-        const mockGenerateResult: GenerateOutput = {
-            caseStructure: {
-                thesis: 'Technology improves education',
-                framework: 'Utilitarian',
-                keyDefinitions: ['Technology'],
-                burdenOfProof: 'Net positive',
-            },
-            contentions: [],
-            predictedOpponentCase: {
-                likelyArguments: [],
-                strategicWeaknesses: [],
-                keyClashes: [],
-            },
-            counters: [],
-            metadata: {
-                side: 'pro',
-                format: 'bp',
-                generatedAt: new Date().toISOString(),
-            },
-        };
-
-        it('sets generate result', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setGenerateResult(mockGenerateResult);
-            });
-            expect(useSessionStore.getState().generateResult).toEqual(mockGenerateResult);
-        });
-
-        it('sets generate loading state', () => {
-            const store = useSessionStore.getState();
-            act(() => {
-                store.setGenerateLoading(true);
-            });
-            expect(useSessionStore.getState().generateLoading).toBe(true);
-        });
-    });
-
-    describe('Session Management', () => {
-        it('clears entire session', () => {
-            act(() => {
-                useSessionStore.setState({
-                    generateResult: {
-                        caseStructure: { thesis: 'test', framework: '', keyDefinitions: [], burdenOfProof: '' },
-                        contentions: [],
-                        predictedOpponentCase: { likelyArguments: [], strategicWeaknesses: [], keyClashes: [] },
-                        counters: [],
-                        metadata: { side: 'pro', format: 'bp', generatedAt: '' },
-                    },
-                    attackResult: {
-                        overallAssessment: { score: 50, summary: '', strengthAreas: [] },
-                        weaknesses: [],
-                        fallaciesDetected: [],
-                        crossExQuestions: [],
-                        weighingAnalysis: { currentWeighing: '', missingComparisons: [], improvementSuggestions: [] },
-                    },
-                    askMessages: [{ id: '1', role: 'user', content: 'test', timestamp: Date.now() }],
-                });
-            });
-            const store = useSessionStore.getState();
-            act(() => {
-                store.clearSession();
-            });
-            const state = useSessionStore.getState();
-            expect(state.generateResult).toBeNull();
-            expect(state.attackResult).toBeNull();
-            expect(state.askMessages).toHaveLength(0);
-        });
-    });
-});
diff --git a/src/test/stores/session-store.test.ts b/src/test/stores/session-store.test.ts
new file mode 100644
index 000000000..c191fdc9e
--- /dev/null
+++ b/src/test/stores/session-store.test.ts
@@ -0,0 +1,1041 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  resetMockState,
+  setMockAuthUser,
+  setMockTableResponse,
+  supabaseMock,
+} from "@/test/mocks/supabase";
+
+vi.mock("@/lib/supabase/client", () => ({ supabase: supabaseMock }));
+
+import { useSessionStore } from "@/lib/stores/session-store";
+import i18n from "@/i18n";
+
+import type { GenerateOutput } from "@/lib/ai/schemas/generate";
+import type { AttackOutput } from "@/lib/ai/schemas/attack";
+import type { BrainstormOutput } from "@/lib/ai/schemas/brainstorm";
+import type { FactoidsOutput } from "@/lib/ai/schemas/factoids";
+
+const sampleGenerate: GenerateOutput = {
+  caseStructure: {
+    thesis: "Test thesis",
+    framework: "Test framework",
+    keyDefinitions: ["A"],
+    burdenOfProof: "Test burden",
+  },
+  contentions: [],
+  predictedOpponentCase: { likelyArguments: [], strategicWeaknesses: [], keyClashes: [] },
+  counters: [],
+  metadata: { side: "pro", format: "Test", generatedAt: new Date().toISOString() },
+};
+
+const sampleAttack: AttackOutput = {
+  overallAssessment: { score: 50, summary: "ok", strengthAreas: [] },
+  weaknesses: [],
+  fallaciesDetected: [],
+  crossExQuestions: [],
+  weighingAnalysis: { currentWeighing: "none", missingComparisons: [], improvementSuggestions: [] },
+};
+
+const nowIso = '2026-02-12T10:00:00.000Z';
+
+const brainstormOutput: BrainstormOutput = {
+  needsMoreInfo: false,
+  clarifyingQuestions: [],
+  nextSteps: ['step'],
+  warningsAndTradeoffs: [],
+};
+
+const factoidsOutput: FactoidsOutput = {
+  factoids: [],
+  searchSuggestions: [],
+  warnings: [],
+  verificationStatus: 'complete' as const,
+};
+
+describe("session-store", () => {
+  beforeEach(() => {
+    resetMockState();
+    localStorage.clear();
+    useSessionStore.setState({
+      generateResult: null,
+      generateLoading: false,
+      attackResult: null,
+      attackLoading: false,
+      brainstormResult: null,
+      brainstormLoading: false,
+      factoidsResult: null,
+      factoidsLoading: false,
+      askMessages: [],
+      askLoading: false,
+      savedCases: [],
+      savedAttacks: [],
+      savedBrainstorms: [],
+      savedFactoids: [],
+      savedChats: [],
+      savedFlowcharts: [],
+      autosavedCases: [],
+      autosavedAttacks: [],
+      autosavedBrainstorms: [],
+      autosavedFactoids: [],
+      sourceFolders: ['General'],
+      sourceLibrary: [],
+      pendingFlowchartData: null,
+      generateForm: {},
+      attackForm: {},
+      brainstormForm: {},
+      factoidsForm: {},
+    } as Partial<ReturnType<typeof useSessionStore.getState>>);
+  });
+
+  beforeEach(() => {
+    resetMockState();
+    localStorage.clear();
+    useSessionStore.setState({
+      generateResult: null,
+      generateLoading: false,
+      attackResult: null,
+      attackLoading: false,
+      brainstormResult: null,
+      brainstormLoading: false,
+      factoidsResult: null,
+      factoidsLoading: false,
+      askMessages: [],
+      askLoading: false,
+      savedCases: [],
+      savedAttacks: [],
+      savedBrainstorms: [],
+      savedFactoids: [],
+      savedChats: [],
+      sourceLibrary: [],
+    });
+  });
+
+  afterEach(async () => {
+    await i18n.changeLanguage("en");
+  });
+
+  it("adds ask messages with id and timestamp", () => {
+    const store = useSessionStore.getState();
+    store.addAskMessage({ role: "user", content: "Hello" });
+    const messages = useSessionStore.getState().askMessages;
+    expect(messages).toHaveLength(1);
+    expect(messages[0].id).toBeTruthy();
+    expect(messages[0].timestamp).toBeGreaterThan(0);
+  });
+
+  it("saves and loads a case with server id replacement", async () => {
+    setMockTableResponse("cases", {
+      insert: {
+        id: "case_1",
+        title: "My Case",
+        output: sampleGenerate,
+        created_at: new Date().toISOString(),
+      },
+    });
+
+    useSessionStore.getState().setGenerateResult(sampleGenerate);
+    await useSessionStore.getState().saveCurrentCase("My Case");
+
+    const saved = useSessionStore.getState().savedCases;
+    expect(saved).toHaveLength(1);
+    expect(saved[0].id).toBe("case_1");
+
+    useSessionStore.getState().setGenerateResult(null);
+    useSessionStore.getState().loadSavedCase("case_1");
+    expect(useSessionStore.getState().generateResult?.caseStructure.thesis).toBe("Test thesis");
+  });
+
+  it("saves and loads an attack result", async () => {
+    setMockTableResponse("attacks", {
+      insert: {
+        id: "attack_1",
+        title: "Attack",
+        output: sampleAttack,
+        created_at: new Date().toISOString(),
+      },
+    });
+
+    useSessionStore.getState().setAttackResult(sampleAttack);
+    await useSessionStore.getState().saveCurrentAttack("Attack");
+
+    const saved = useSessionStore.getState().savedAttacks;
+    expect(saved).toHaveLength(1);
+    expect(saved[0].id).toBe("attack_1");
+
+    useSessionStore.getState().setAttackResult(null);
+    useSessionStore.getState().loadSavedAttack("attack_1");
+    expect(useSessionStore.getState().attackResult?.overallAssessment.score).toBe(50);
+  });
+
+  it("adds sources and toggles active state", async () => {
+    setMockTableResponse("sources", {
+      insert: {
+        id: "source_1",
+        title: "Doc",
+        content: "Test",
+        type: "text",
+        origin: null,
+        is_active: true,
+        created_at: new Date().toISOString(),
+      },
+      update: { is_active: false },
+    });
+
+    await useSessionStore.getState().addSource({ title: "Doc", content: "Test", type: "text" });
+    let sources = useSessionStore.getState().sourceLibrary;
+    expect(sources).toHaveLength(1);
+    expect(sources[0].id).toBe("source_1");
+    expect(sources[0].isActive).toBe(true);
+
+    await useSessionStore.getState().toggleSource("source_1");
+    sources = useSessionStore.getState().sourceLibrary;
+    expect(sources[0].isActive).toBe(false);
+  });
+
+  it("inserts an explicitly inactive source as inactive", async () => {
+    setMockTableResponse("sources", {
+      insert: {
+        id: "source_inactive",
+        title: "Inactive source",
+        content: "Test",
+        type: "text",
+        origin: null,
+        is_active: false,
+        created_at: new Date().toISOString(),
+      },
+    });
+    const insertCalls: Array<Record<string, unknown>> = [];
+    const originalFrom = supabaseMock.from.getMockImplementation() as unknown as (table: string) => ReturnType<typeof supabaseMock.from>;
+    supabaseMock.from.mockImplementation(((table: string) => {
+      const builder = originalFrom(table);
+      if (table === "sources") {
+        const originalInsert = builder.insert;
+        builder.insert = ((payload: Record<string, unknown>) => {
+          insertCalls.push(payload);
+          return (originalInsert as unknown as (p: Record<string, unknown>) => ReturnType<typeof builder.insert>)(payload);
+        }) as typeof builder.insert;
+      }
+      return builder;
+    }) as never);
+
+    try {
+      await useSessionStore.getState().addSource({
+        title: "Inactive source",
+        content: "Test",
+        type: "text",
+        isActive: false,
+      });
+    } finally {
+      supabaseMock.from.mockImplementation(originalFrom as never);
+    }
+
+    expect(insertCalls[0]).toEqual(expect.objectContaining({ is_active: false }));
+    expect(useSessionStore.getState().sourceLibrary[0].isActive).toBe(false);
+  });
+
+  it("hydrates server data when available", async () => {
+    setMockTableResponse("cases", {
+      order: [{ id: "case_2", title: "Server Case", output: sampleGenerate, created_at: new Date().toISOString() }],
+    });
+    setMockTableResponse("attacks", { order: [] });
+    setMockTableResponse("brainstorms", { order: [] });
+    setMockTableResponse("factoids", { order: [] });
+    setMockTableResponse("chats", { order: [] });
+    setMockTableResponse("sources", { order: [] });
+
+    await useSessionStore.getState().hydrateFromServer();
+    expect(useSessionStore.getState().savedCases).toHaveLength(1);
+    expect(useSessionStore.getState().savedCases[0].title).toBe("Server Case");
+  });
+
+  it("skips server writes when user is not signed in", async () => {
+    setMockAuthUser(null);
+    useSessionStore.getState().setGenerateResult(sampleGenerate);
+    await useSessionStore.getState().saveCurrentCase("Local only");
+    expect(supabaseMock.from).not.toHaveBeenCalled();
+  });
+
+  it("clearSession resets transient results", () => {
+    useSessionStore.getState().setGenerateResult(sampleGenerate);
+    useSessionStore.getState().setAttackResult(sampleAttack);
+    useSessionStore.getState().addAskMessage({ role: "user", content: "Hi" });
+
+    useSessionStore.getState().clearSession();
+    const state = useSessionStore.getState();
+    expect(state.generateResult).toBeNull();
+    expect(state.attackResult).toBeNull();
+    expect(state.askMessages).toHaveLength(0);
+  });
+
+  it("keeps a source locally and rejects when its server deletion fails", async () => {
+    useSessionStore.setState({
+      sourceLibrary: [{
+        id: "source_1",
+        title: "Source",
+        content: "Content",
+        type: "text",
+        createdAt: Date.now(),
+        isActive: true,
+      }],
+    } as Partial<ReturnType<typeof useSessionStore.getState>>);
+    supabaseMock.from.mockImplementationOnce((() => ({
+      delete: () => ({ eq: async () => ({ data: null as null, error: { message: "delete failed" } }) }),
+    })) as never);
+
+    await expect(useSessionStore.getState().removeSource("source_1")).rejects.toThrow("delete failed");
+    expect(useSessionStore.getState().sourceLibrary).toHaveLength(1);
+  });
+
+  it("sends provenance metadata when saving a discovered source", async () => {
+    setMockAuthUser({ id: "user_1" });
+    setMockTableResponse("sources", {
+      insert: { id: "source_9", title: "Gov report", content: "c", type: "url", origin: "https://gov.example/data", folder: "Auto-saved", is_active: true, created_at: new Date().toISOString(), metadata: { qualityLabel: "strong" } },
+    });
+    const insertCalls: Array<{ table: string; payload: Record<string, unknown> }> = [];
+    const originalFrom = supabaseMock.from.getMockImplementation() as unknown as (table: string) => ReturnType<typeof supabaseMock.from>;
+    supabaseMock.from.mockImplementation(((table: string) => {
+      const builder = originalFrom(table);
+      if (table === "sources") {
+        const originalInsert = builder.insert;
+        builder.insert = ((payload: Record<string, unknown>) => {
+          insertCalls.push({ table, payload });
+          return (originalInsert as unknown as (p: Record<string, unknown>) => ReturnType<typeof builder.insert>)(payload);
+        }) as typeof builder.insert;
+      }
+      return builder;
+    }) as never);
+
+    try {
+      await useSessionStore.getState().addSource({
+        title: "Gov report",
+        content: "c",
+        type: "url",
+        origin: "https://gov.example/data",
+        folder: "Auto-saved",
+        metadata: {
+          url: "https://gov.example/data",
+          sourceType: "government",
+          qualityScore: 82,
+          qualityLabel: "strong",
+          query: "policy statistics 2026",
+          capturedVia: "generate",
+        },
+      });
+    } finally {
+      supabaseMock.from.mockImplementation(originalFrom as never);
+    }
+
+    expect(insertCalls).toHaveLength(1);
+    expect(insertCalls[0].payload.metadata).toEqual({
+      url: "https://gov.example/data",
+      sourceType: "government",
+      qualityScore: 82,
+      qualityLabel: "strong",
+      query: "policy statistics 2026",
+      capturedVia: "generate",
+    });
+  });
+
+  it("round-trips provenance metadata from the database into state", async () => {
+    setMockAuthUser({ id: "user_1" });
+    const metadata = { url: "https://gov.example/data", qualityLabel: "moderate" as const, capturedVia: "brainstorm" };
+    setMockTableResponse("sources", {
+      insert: { id: "source_10", title: "News", content: "c", type: "url", origin: "https://news.example/a", folder: "Auto-saved", is_active: true, created_at: new Date().toISOString(), metadata },
+    });
+
+    await useSessionStore.getState().addSource({
+      title: "News",
+      content: "c",
+      type: "url",
+      origin: "https://news.example/a",
+      folder: "Auto-saved",
+      metadata,
+    });
+
+    const saved = useSessionStore.getState().sourceLibrary[0];
+    expect(saved.metadata).toEqual(metadata);
+  });
+
+  it("hydrates valid provenance metadata from the database", async () => {
+    setMockTableResponse("sources", {
+      order: [{
+        id: "source_11",
+        title: "Policy source",
+        content: "c",
+        type: "url",
+        origin: "https://example.com/policy",
+        folder: "Auto-saved",
+        is_active: true,
+        created_at: new Date().toISOString(),
+        metadata: {
+          url: "https://example.com/policy",
+          sourceType: "government",
+          qualityScore: 91,
+          qualityLabel: "strong",
+          query: "policy update",
+          capturedVia: "ask",
+        },
+      }],
+    });
+
+    await useSessionStore.getState().hydrateFromServer();
+
+    expect(useSessionStore.getState().sourceLibrary[0].metadata).toEqual({
+      url: "https://example.com/policy",
+      sourceType: "government",
+      qualityScore: 91,
+      qualityLabel: "strong",
+      query: "policy update",
+      capturedVia: "ask",
+    });
+  });
+
+  it("drops malformed provenance fields while hydrating valid fields", async () => {
+    setMockTableResponse("sources", {
+      order: [{
+        id: "source_12",
+        title: "Mixed source",
+        content: "c",
+        type: "url",
+        origin: "https://example.com/mixed",
+        is_active: true,
+        created_at: new Date().toISOString(),
+        metadata: {
+          url: "https://example.com/mixed",
+          sourceType: 42,
+          qualityScore: "91",
+          qualityLabel: "invalid",
+          query: "valid query",
+          capturedVia: null,
+        },
+      }],
+    });
+
+    await useSessionStore.getState().hydrateFromServer();
+
+    expect(useSessionStore.getState().sourceLibrary[0].metadata).toEqual({
+      url: "https://example.com/mixed",
+      query: "valid query",
+    });
+  });
+
+  it("persists local collections but excludes pending session state", () => {
+    const partialize = useSessionStore.persist.getOptions().partialize!;
+    const savedCases = [{ id: "case_1", title: "Case", createdAt: Date.now(), data: sampleGenerate }];
+    const sourceLibrary = [{
+      id: "source_1",
+      title: "Source",
+      content: "Content",
+      type: "text" as const,
+      createdAt: Date.now(),
+      isActive: true,
+    }];
+    const persisted = partialize({
+      ...useSessionStore.getState(),
+      savedCases,
+      sourceLibrary,
+      pendingFlowchartData: { nodes: [], edges: [] },
+    }) as Partial<ReturnType<typeof useSessionStore.getState>>;
+
+    expect(persisted.savedCases).toEqual(savedCases);
+    expect(persisted.sourceLibrary).toEqual(sourceLibrary);
+    expect(persisted).not.toHaveProperty("pendingFlowchartData");
+  });
+
+  it("keeps local data when atomic server erasure is rejected", async () => {
+    useSessionStore.setState({
+      savedCases: [{ id: "1", title: "Case", createdAt: Date.now(), data: sampleGenerate }],
+      savedAttacks: [{ id: "2", title: "Attack", createdAt: Date.now(), data: sampleAttack }],
+    } as Partial<ReturnType<typeof useSessionStore.getState>>);
+    supabaseMock.rpc.mockResolvedValueOnce({
+      data: null,
+      error: { message: "erase failed" },
+    });
+
+    await expect(useSessionStore.getState().clearAllData()).rejects.toThrow("erase failed");
+
+    const state = useSessionStore.getState();
+    expect(state.savedCases).toHaveLength(1);
+    expect(state.savedAttacks).toHaveLength(1);
+    expect(supabaseMock.rpc).toHaveBeenCalledWith("clear_current_user_data");
+    expect(supabaseMock.from).not.toHaveBeenCalled();
+  });
+
+  const seedSources = (...sources: Array<{ id: string; folder: string; isActive?: boolean }>) => {
+    useSessionStore.setState({
+      sourceFolders: ['General', ...sources.map((s) => s.folder)],
+      sourceLibrary: sources.map((s) => ({
+        id: s.id,
+        title: `Source ${s.id}`,
+        content: 'Evidence',
+        type: 'text' as const,
+        folder: s.folder,
+        isActive: s.isActive ?? true,
+        createdAt: Date.now(),
+      })),
+    } as Partial<ReturnType<typeof useSessionStore.getState>>);
+  };
+
+  it("merges nested form updates without dropping sibling fields", () => {
+    const store = useSessionStore.getState();
+    store.setGenerateForm({ options: { depth: "standard", citations: true } } as any);
+    store.setGenerateForm({ options: { depth: "comprehensive" } } as any);
+    store.setAttackForm({ caseText: "Attack case" });
+    store.setBrainstormForm({ motion: "Brainstorm motion" });
+    store.setFactoidsForm({ claim: "Factoid claim" });
+
+    expect(useSessionStore.getState().generateForm).toEqual({
+      options: { depth: "comprehensive", citations: true },
+    });
+    expect(useSessionStore.getState().attackForm).toEqual({ caseText: "Attack case" });
+    expect(useSessionStore.getState().brainstormForm).toEqual({ motion: "Brainstorm motion" });
+    expect(useSessionStore.getState().factoidsForm).toEqual({ claim: "Factoid claim" });
+  });
+
+  it("flips each feature's loading flag", () => {
+    const store = useSessionStore.getState();
+    store.setGenerateLoading(true);
+    store.setAttackLoading(true);
+    store.setBrainstormLoading(true);
+    store.setFactoidsLoading(true);
+    store.setAskLoading(true);
+
+    const state = useSessionStore.getState();
+    expect([
+      state.generateLoading,
+      state.attackLoading,
+      state.brainstormLoading,
+      state.factoidsLoading,
+      state.askLoading,
+    ]).toEqual([true, true, true, true, true]);
+  });
+
+  it("updates a source and syncs its new folder into the folder list", async () => {
+    seedSources({ id: "src_1", folder: "General" });
+
+    await useSessionStore.getState().updateSource("src_1", {
+      title: "Updated source",
+      content: "Updated content",
+      folder: "Round 2",
+      isActive: false,
+    });
+
+    const updated = useSessionStore.getState().sourceLibrary[0];
+    expect(updated.title).toBe("Updated source");
+    expect(updated.content).toBe("Updated content");
+    expect(updated.folder).toBe("Round 2");
+    expect(updated.isActive).toBe(false);
+    expect(useSessionStore.getState().sourceFolders).toContain("Round 2");
+  });
+
+  it("renames a folder and moves its sources to General when it is deleted", async () => {
+    seedSources({ id: "src_1", folder: "Round 1" });
+
+    await useSessionStore.getState().renameSourceFolder("Round 1", "Finals");
+    expect(useSessionStore.getState().sourceFolders).toContain("Finals");
+    expect(useSessionStore.getState().sourceLibrary[0].folder).toBe("Finals");
+
+    await useSessionStore.getState().deleteSourceFolder("Finals", "move-to-general");
+    expect(useSessionStore.getState().sourceFolders).not.toContain("Finals");
+    expect(useSessionStore.getState().sourceLibrary[0].folder).toBe("General");
+  });
+
+  it("sets active state for every source in a folder, and clearLibrary empties it", async () => {
+    seedSources({ id: "src_1", folder: "Batch" }, { id: "src_2", folder: "Batch" });
+
+    await useSessionStore.getState().setFolderActive("Batch", false);
+    expect(useSessionStore.getState().sourceLibrary.every((source) => !source.isActive)).toBe(true);
+
+    await useSessionStore.getState().removeSource("src_1");
+    expect(useSessionStore.getState().sourceLibrary.map((source) => source.id)).toEqual(["src_2"]);
+
+    await useSessionStore.getState().clearLibrary();
+    expect(useSessionStore.getState().sourceLibrary).toHaveLength(0);
+  });
+
+  it('persists local collections but excludes transient loading and streaming state', () => {
+    const source = {
+      id: 'local-source',
+      title: 'Local source',
+      content: 'Guest and offline content must survive reloads.',
+      type: 'text' as const,
+      createdAt: Date.now(),
+      isActive: true,
+    };
+    const state = {
+      ...useSessionStore.getState(),
+      generateLoading: true,
+      sourceFolders: ['General', 'Offline folder'],
+      sourceLibrary: [source],
+      savedCases: [{ id: 'offline-case', title: 'Offline case', createdAt: Date.now(), data: { offline: true } as any }],
+      autosavedCases: [{ id: 'autosave', title: 'Draft', createdAt: Date.now(), data: { draft: true } as any }],
+      askStreamingAssistant: {
+        id: 'streaming',
+        role: 'assistant' as const,
+        content: 'Partial response',
+        timestamp: Date.now(),
+        isStreaming: true as const,
+      },
+    };
+    const partialize = useSessionStore.persist.getOptions().partialize;
+
+    expect(partialize).toBeTypeOf('function');
+    const persisted = partialize!(state) as Partial<typeof state>;
+
+    expect(persisted.sourceLibrary).toEqual([source]);
+    expect(persisted.sourceFolders).toEqual(['General', 'Offline folder']);
+    expect(persisted.savedCases).toEqual(state.savedCases);
+    expect(persisted.autosavedCases).toEqual(state.autosavedCases);
+    expect(persisted).not.toHaveProperty('generateLoading');
+    expect(persisted).not.toHaveProperty('askStreamingAssistant');
+  });
+
+  it('early-returns save helpers when there is no current result/message', async () => {
+    await useSessionStore.getState().saveCurrentCase('no-case');
+    await useSessionStore.getState().saveCurrentAttack('no-attack');
+    await useSessionStore.getState().saveCurrentBrainstorm('no-brainstorm');
+    await useSessionStore.getState().saveCurrentFactoids('no-factoids');
+    await useSessionStore.getState().saveCurrentChat('no-chat');
+
+    expect(useSessionStore.getState().savedCases).toHaveLength(0);
+    expect(useSessionStore.getState().savedAttacks).toHaveLength(0);
+    expect(useSessionStore.getState().savedBrainstorms).toHaveLength(0);
+    expect(useSessionStore.getState().savedFactoids).toHaveLength(0);
+    expect(useSessionStore.getState().savedChats).toHaveLength(0);
+  });
+
+  it('keeps only local saves when user is not authenticated', async () => {
+    setMockAuthUser(null);
+
+    useSessionStore.getState().setBrainstormResult(brainstormOutput as any);
+    useSessionStore.getState().setFactoidsResult(factoidsOutput as any);
+    useSessionStore.getState().addAskMessage({ role: 'user', content: 'Q' });
+
+    await useSessionStore.getState().saveCurrentBrainstorm('Local brainstorm');
+    await useSessionStore.getState().saveCurrentFactoids('Local factoids');
+    await useSessionStore.getState().saveCurrentChat('Local chat');
+    await useSessionStore.getState().saveFlowchart('Local flow', { nodes: [], edges: [] });
+
+    expect(useSessionStore.getState().savedBrainstorms).toHaveLength(1);
+    expect(useSessionStore.getState().savedFactoids).toHaveLength(1);
+    expect(useSessionStore.getState().savedChats).toHaveLength(1);
+    expect(useSessionStore.getState().savedFlowcharts).toHaveLength(1);
+  });
+
+  it('saves and loads brainstorm + factoids items with server id replacement', async () => {
+    setMockTableResponse('brainstorms', {
+      insert: {
+        id: 'brain_1',
+        title: 'Brainstorm 1',
+        output: brainstormOutput,
+        created_at: nowIso,
+      },
+    });
+    setMockTableResponse('factoids', {
+      insert: {
+        id: 'fact_1',
+        title: 'Factoids 1',
+        output: factoidsOutput,
+        created_at: nowIso,
+      },
+    });
+
+    useSessionStore.getState().setBrainstormResult(brainstormOutput);
+    useSessionStore.getState().setFactoidsResult(factoidsOutput);
+
+    await useSessionStore.getState().saveCurrentBrainstorm('Brainstorm 1');
+    await useSessionStore.getState().saveCurrentFactoids('Factoids 1');
+
+    expect(useSessionStore.getState().savedBrainstorms[0].id).toBe('brain_1');
+    expect(useSessionStore.getState().savedFactoids[0].id).toBe('fact_1');
+
+    useSessionStore.getState().setBrainstormResult(null);
+    useSessionStore.getState().setFactoidsResult(null);
+
+    useSessionStore.getState().loadSavedBrainstorm('brain_1');
+    useSessionStore.getState().loadSavedFactoids('fact_1');
+
+    expect(useSessionStore.getState().brainstormResult?.nextSteps).toEqual(['step']);
+    expect(useSessionStore.getState().factoidsResult?.verificationStatus).toBe('complete');
+  });
+
+  it('saves chats including message rows and restores chat history', async () => {
+    setMockTableResponse('chats', {
+      insert: {
+        id: 'chat_1',
+        title: 'Saved chat',
+        created_at: nowIso,
+      },
+    });
+
+    useSessionStore.getState().addAskMessage({ role: 'user', content: 'Question' });
+    useSessionStore.getState().addAskMessage({ role: 'assistant', content: 'Answer' });
+
+    await useSessionStore.getState().saveCurrentChat('Saved chat');
+
+    expect(useSessionStore.getState().savedChats).toHaveLength(1);
+    expect(useSessionStore.getState().savedChats[0].id).toBe('chat_1');
+    expect(supabaseMock.from).toHaveBeenCalledWith('messages');
+
+    useSessionStore.getState().clearAskMessages();
+    useSessionStore.getState().loadSavedChat('chat_1');
+    expect(useSessionStore.getState().askMessages).toHaveLength(2);
+  });
+
+  it('rejects server saves that return no record without adding local items', async () => {
+    setMockTableResponse('brainstorms', { insert: null });
+    setMockTableResponse('factoids', { insert: null });
+    setMockTableResponse('chats', { insert: null });
+    setMockTableResponse('flowcharts', { insert: null });
+
+    useSessionStore.getState().setBrainstormResult(brainstormOutput as any);
+    useSessionStore.getState().setFactoidsResult(factoidsOutput as any);
+    useSessionStore.getState().addAskMessage({ role: 'user', content: 'Needs local id' });
+
+    await expect(useSessionStore.getState().saveCurrentBrainstorm('Brain no server')).rejects.toThrow('No record returned');
+    await expect(useSessionStore.getState().saveCurrentFactoids('Fact no server')).rejects.toThrow('No record returned');
+    await expect(useSessionStore.getState().saveCurrentChat('Chat no server')).rejects.toThrow('No record returned');
+    await expect(useSessionStore.getState().saveFlowchart('Flow no server', { nodes: [], edges: [] })).rejects.toThrow('No record returned');
+
+    const state = useSessionStore.getState();
+    expect(state.savedBrainstorms).toHaveLength(0);
+    expect(state.savedFactoids).toHaveLength(0);
+    expect(state.savedChats).toHaveLength(0);
+    expect(state.savedFlowcharts).toHaveLength(0);
+  });
+
+  it('saves and deletes flowcharts', async () => {
+    setMockTableResponse('flowcharts', {
+      insert: {
+        id: 'flow_1',
+        title: 'Flowchart A',
+        nodes: [{ id: 'n1', position: { x: 0, y: 0 }, data: { label: 'A' }, type: 'default' }],
+        edges: [],
+        created_at: nowIso,
+      },
+    });
+
+    await useSessionStore.getState().saveFlowchart('Flowchart A', {
+      nodes: [{ id: 'n1', position: { x: 0, y: 0 }, data: { label: 'A' }, type: 'default' }],
+      edges: [],
+    });
+
+    expect(useSessionStore.getState().savedFlowcharts).toHaveLength(1);
+    expect(useSessionStore.getState().savedFlowcharts[0].id).toBe('flow_1');
+
+    await useSessionStore.getState().deleteSavedFlowchart('flow_1');
+    expect(useSessionStore.getState().savedFlowcharts).toHaveLength(0);
+  });
+
+  it('hydrates server data across all supported entities', async () => {
+    setMockTableResponse('cases', {
+      order: [{ id: 'case_1', title: 'Case', output: { key: 'case' }, created_at: nowIso }],
+    });
+    setMockTableResponse('attacks', {
+      order: [{ id: 'attack_1', title: 'Attack', output: { key: 'attack' }, created_at: nowIso }],
+    });
+    setMockTableResponse('brainstorms', {
+      order: [{ id: 'brain_1', title: 'Brainstorm', output: brainstormOutput, created_at: nowIso }],
+    });
+    setMockTableResponse('factoids', {
+      order: [{ id: 'fact_1', title: 'Factoids', output: factoidsOutput, created_at: nowIso }],
+    });
+    setMockTableResponse('chats', {
+      order: [{ id: 'chat_1', title: 'Chat', created_at: nowIso }],
+    });
+    setMockTableResponse('messages', {
+      in: [
+        {
+          id: 'msg_1',
+          chat_id: 'chat_1',
+          role: 'user',
+          content: 'Hello',
+          output: null,
+          created_at: nowIso,
+        },
+      ],
+    });
+    setMockTableResponse('flowcharts', {
+      order: [{ id: 'flow_1', title: 'Flow', nodes: [], edges: [], created_at: nowIso }],
+    });
+    setMockTableResponse('sources', {
+      order: [
+        {
+          id: 'source_1',
+          title: 'Source',
+          content: 'Evidence',
+          type: 'url',
+          origin: 'https://example.com',
+          is_active: true,
+          created_at: nowIso,
+        },
+      ],
+    });
+    setMockTableResponse('source_folders', {
+      order: [{ id: 'folder_1', name: 'Tournament', created_at: nowIso }],
+    });
+
+    await useSessionStore.getState().hydrateFromServer();
+
+    const state = useSessionStore.getState();
+    expect(state.savedCases).toHaveLength(1);
+    expect(state.savedAttacks).toHaveLength(1);
+    expect(state.savedBrainstorms).toHaveLength(1);
+    expect(state.savedFactoids).toHaveLength(1);
+    expect(state.savedChats[0].data).toHaveLength(1);
+    expect(state.savedFlowcharts).toHaveLength(1);
+    expect(state.sourceLibrary).toHaveLength(1);
+    expect(state.sourceFolders).toContain('Tournament');
+  });
+
+  it('persists empty source folders for cross-device sync', async () => {
+    await useSessionStore.getState().createSourceFolder('Round 1');
+
+    expect(useSessionStore.getState().sourceFolders).toContain('Round 1');
+    expect(supabaseMock.from).toHaveBeenCalledWith('source_folders');
+  });
+
+  it('does not overwrite local state when server has no persisted data', async () => {
+    useSessionStore.setState({
+      savedCases: [{ id: 'local-case', title: 'Local', createdAt: Date.now(), data: { x: 1 } as any }],
+    } as Partial<ReturnType<typeof useSessionStore.getState>>);
+
+    setMockTableResponse('cases', { order: [] });
+    setMockTableResponse('attacks', { order: [] });
+    setMockTableResponse('brainstorms', { order: [] });
+    setMockTableResponse('factoids', { order: [] });
+    setMockTableResponse('chats', { order: [] });
+    setMockTableResponse('flowcharts', { order: [] });
+    setMockTableResponse('sources', { order: [] });
+    setMockTableResponse('source_folders', { order: [] });
+
+    await useSessionStore.getState().hydrateFromServer();
+
+    expect(useSessionStore.getState().savedCases[0].id).toBe('local-case');
+  });
+
+  it('hydrates safely when Supabase query responses contain null data arrays', async () => {
+    const originalFrom = supabaseMock.from.getMockImplementation();
+    supabaseMock.from.mockImplementation((table: string) => ({
+      select: vi.fn(() => ({
+        order: vi.fn(async () => ({ data: null, error: null })),
+        in: vi.fn(() => ({
+          order: vi.fn(async () => ({ data: null, error: null })),
+        })),
+      })),
+      insert: vi.fn(() => ({
+        select: vi.fn(() => ({
+          single: vi.fn(async () => ({ data: null, error: null })),
+        })),
+      })),
+      update: vi.fn(() => ({ eq: vi.fn(async () => ({ data: null, error: null })) })),
+      delete: vi.fn(() => ({ eq: vi.fn(async () => ({ data: null, error: null })), neq: vi.fn(async () => ({ data: null, error: null })) })),
+      eq: vi.fn(async () => ({ data: null, error: null })),
+      neq: vi.fn(async () => ({ data: null, error: null })),
+      in: vi.fn(() => ({ order: vi.fn(async () => ({ data: null, error: null })) })),
+      order: vi.fn(async () => ({ data: null, error: null })),
+      table,
+    }) as any);
+
+    try {
+      await useSessionStore.getState().hydrateFromServer();
+      expect(useSessionStore.getState().savedCases).toHaveLength(0);
+      expect(useSessionStore.getState().sourceLibrary).toHaveLength(0);
+    } finally {
+      if (originalFrom) supabaseMock.from.mockImplementation(originalFrom);
+    }
+  });
+
+  it('clearAllData clears local state after successful atomic server erasure', async () => {
+    useSessionStore.setState({
+      savedCases: [{ id: 'case', title: 'c', createdAt: Date.now(), data: {} as any }],
+      savedAttacks: [{ id: 'attack', title: 'a', createdAt: Date.now(), data: {} as any }],
+      savedBrainstorms: [{ id: 'brain', title: 'b', createdAt: Date.now(), data: brainstormOutput as any }],
+      savedFactoids: [{ id: 'fact', title: 'f', createdAt: Date.now(), data: factoidsOutput as any }],
+      savedChats: [{ id: 'chat', title: 'chat', createdAt: Date.now(), data: [] as any }],
+      savedFlowcharts: [{ id: 'flow', title: 'flow', createdAt: Date.now(), data: { nodes: [], edges: [] } as any }],
+      autosavedCases: [{ id: 'autosave-case', title: 'draft', createdAt: Date.now(), data: {} as any }],
+      autosavedAttacks: [{ id: 'autosave-attack', title: 'draft', createdAt: Date.now(), data: {} as any }],
+      autosavedBrainstorms: [{ id: 'autosave-brainstorm', title: 'draft', createdAt: Date.now(), data: {} as any }],
+      autosavedFactoids: [{ id: 'autosave-factoid', title: 'draft', createdAt: Date.now(), data: {} as any }],
+      sourceLibrary: [{ id: 'src', title: 's', content: 'x', type: 'text', createdAt: Date.now(), isActive: true }],
+    } as Partial<ReturnType<typeof useSessionStore.getState>>);
+
+    await useSessionStore.getState().clearAllData();
+
+    const state = useSessionStore.getState();
+    expect(state.savedCases).toHaveLength(0);
+    expect(state.savedAttacks).toHaveLength(0);
+    expect(state.savedBrainstorms).toHaveLength(0);
+    expect(state.savedFactoids).toHaveLength(0);
+    expect(state.savedChats).toHaveLength(0);
+    expect(state.savedFlowcharts).toHaveLength(0);
+    expect(state.autosavedCases).toHaveLength(0);
+    expect(state.autosavedAttacks).toHaveLength(0);
+    expect(state.autosavedBrainstorms).toHaveLength(0);
+    expect(state.autosavedFactoids).toHaveLength(0);
+    expect(state.sourceLibrary).toHaveLength(0);
+
+    expect(supabaseMock.rpc).toHaveBeenCalledWith('clear_current_user_data');
+    expect(supabaseMock.from).not.toHaveBeenCalled();
+  });
+
+  it('throws clearAllData safety error when user is missing', async () => {
+    setMockAuthUser(null);
+    await expect(useSessionStore.getState().clearAllData()).rejects.toThrow('Cannot delete data: No authenticated user');
+  });
+
+  it('resets local/transient state and form fields', () => {
+    useSessionStore.setState({
+      generateResult: { a: 1 } as any,
+      attackResult: { b: 1 } as any,
+      brainstormResult: brainstormOutput as any,
+      factoidsResult: factoidsOutput as any,
+      askMessages: [{ id: 'm1', role: 'user', content: 'q', timestamp: Date.now() }],
+      sourceLibrary: [{ id: 'src', title: 's', content: 'x', type: 'text', createdAt: Date.now(), isActive: true }],
+      pendingFlowchartData: { nodes: [], edges: [] },
+      generateForm: { motion: 'M' } as any,
+      attackForm: { caseText: 'C' } as any,
+      brainstormForm: { motion: 'B' } as any,
+      factoidsForm: { claim: 'F' } as any,
+    } as Partial<ReturnType<typeof useSessionStore.getState>>);
+
+    useSessionStore.getState().resetLocalData();
+
+    expect(useSessionStore.getState().generateResult).toBeNull();
+    expect(useSessionStore.getState().sourceLibrary).toHaveLength(0);
+
+    useSessionStore.getState().clearSession();
+    expect(useSessionStore.getState().pendingFlowchartData).toBeNull();
+    expect(useSessionStore.getState().generateForm).toEqual({});
+    expect(useSessionStore.getState().attackForm).toEqual({});
+    expect(useSessionStore.getState().brainstormForm).toEqual({});
+    expect(useSessionStore.getState().factoidsForm).toEqual({});
+  });
+
+  it('handles no-op source toggles and delete/load helpers', async () => {
+    await useSessionStore.getState().toggleSource('missing');
+
+    setMockTableResponse('cases', {
+      insert: {
+        id: 'case_del',
+        title: 'Delete me',
+        output: { key: 1 },
+        created_at: nowIso,
+      },
+    });
+
+    useSessionStore.getState().setGenerateResult({ key: 1 } as any);
+    await useSessionStore.getState().saveCurrentCase('Delete me');
+    expect(useSessionStore.getState().savedCases).toHaveLength(1);
+
+    await useSessionStore.getState().deleteSavedCase('case_del');
+    expect(useSessionStore.getState().savedCases).toHaveLength(0);
+
+    // Load helpers should no-op when id does not exist
+    useSessionStore.getState().loadSavedCase('missing');
+    useSessionStore.getState().loadSavedAttack('missing');
+    useSessionStore.getState().loadSavedBrainstorm('missing');
+    useSessionStore.getState().loadSavedFactoids('missing');
+    useSessionStore.getState().loadSavedChat('missing');
+  });
+
+  it("localizes automatic Brainstorm and Factoids titles", async () => {
+    const brainstorm: BrainstormOutput = {
+      needsMoreInfo: false,
+      buckets: [],
+      nextSteps: [],
+      warningsAndTradeoffs: [],
+    };
+    const factoids: FactoidsOutput = {
+      factoids: [],
+      searchSuggestions: [],
+      warnings: [],
+      verificationStatus: 'complete',
+    };
+
+    await i18n.changeLanguage('hu');
+    useSessionStore.getState().setBrainstormResult(brainstorm);
+    useSessionStore.getState().setFactoidsResult(factoids);
+
+    expect(useSessionStore.getState().autosavedBrainstorms[0].title).toBe('Ötletelés');
+    expect(useSessionStore.getState().autosavedFactoids[0].title).toBe('Tények');
+  });
+
+  it("parses valid semantic metadata and discards only an invalid semantic object", async () => {
+    setMockTableResponse("sources", {
+      order: [
+        {
+          id: "semantic-valid", title: "Valid", content: "c", type: "url", origin: "https://example.com/valid", is_active: true, created_at: new Date().toISOString(),
+          metadata: { qualityLabel: "strong", semantic: { relevance: 0.9, importance: 3, strength: 2, evaluatedAt: "2026-09-21T00:00:00.000Z", useCount: 4, caseUseCount: 2, lastUsedInCase: true } },
+        },
+        {
+          id: "semantic-invalid", title: "Invalid", content: "c", type: "url", origin: "https://example.com/invalid", is_active: true, created_at: new Date().toISOString(),
+          metadata: { qualityLabel: "moderate", semantic: { relevance: 7, importance: 5 } },
+        },
+      ],
+    });
+
+    await useSessionStore.getState().hydrateFromServer();
+    expect(useSessionStore.getState().sourceLibrary.find((source) => source.id === "semantic-valid")?.metadata?.semantic?.caseUseCount).toBe(2);
+    expect(useSessionStore.getState().sourceLibrary.find((source) => source.id === "semantic-invalid")?.metadata).toEqual({ qualityLabel: "moderate" });
+  });
+
+  it("persists metadata when updating a source", async () => {
+    setMockAuthUser({ id: "user_1" });
+    useSessionStore.setState({ sourceLibrary: [{ id: "source_1", title: "Source", content: "Content", type: "text", createdAt: 1, isActive: true }] });
+    const updates: Array<Record<string, unknown>> = [];
+    const originalFrom = supabaseMock.from.getMockImplementation() as unknown as (table: string) => ReturnType<typeof supabaseMock.from>;
+    supabaseMock.from.mockImplementation(((table: string) => {
+      const builder = originalFrom(table);
+      if (table === "sources") {
+        const originalUpdate = builder.update;
+        builder.update = ((payload: Record<string, unknown>) => {
+          updates.push(payload);
+          return (originalUpdate as unknown as (p: Record<string, unknown>) => ReturnType<typeof builder.update>)(payload);
+        }) as typeof builder.update;
+      }
+      return builder;
+    }) as never);
+    const semantic = { relevance: 0.8, importance: 2 as const, strength: 3 as const, evaluatedAt: "2026-09-21T00:00:00.000Z", useCount: 1, caseUseCount: 1, lastUsedInCase: true };
+    try {
+      await useSessionStore.getState().updateSource("source_1", { metadata: { semantic } });
+    } finally {
+      supabaseMock.from.mockImplementation(originalFrom as never);
+    }
+    expect(updates[0].metadata).toEqual({ semantic });
+  });
+
+  it("merges semantic assessments without losing source provenance", async () => {
+    useSessionStore.setState({ sourceLibrary: [{
+      id: "source_1",
+      title: "Source",
+      content: "Content",
+      type: "url",
+      origin: "https://example.com/source",
+      createdAt: 1,
+      isActive: true,
+      metadata: { url: "https://example.com/source", query: "original query", qualityLabel: "strong" },
+    }] });
+
+    await useSessionStore.getState().applySourceAssessments([{
+      key: "source_1",
+      id: "source_1",
+      relevance: 0.9,
+      importance: 3,
+      strength: 2,
+      evaluatedAt: "2026-09-21T00:00:00.000Z",
+      retained: true,
+      usedInCase: true,
+    }]);
+
+    expect(useSessionStore.getState().sourceLibrary[0].metadata).toEqual(expect.objectContaining({
+      url: "https://example.com/source",
+      query: "original query",
+      qualityLabel: "strong",
+      semantic: expect.objectContaining({ useCount: 1, caseUseCount: 1, lastUsedInCase: true }),
+    }));
+  });
+});
diff --git a/src/test/stores/settings-store-additional.test.ts b/src/test/stores/settings-store-additional.test.ts
deleted file mode 100644
index 6f7fedb6e..000000000
--- a/src/test/stores/settings-store-additional.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { resetMockState, setMockTableResponse, supabaseMock } from '@/test/mocks/supabase';
-
-vi.mock('@/lib/supabase/client', () => ({ supabase: supabaseMock }));
-
-import { useSettingsStore } from '@/lib/stores/settings-store';
-import i18n from '@/i18n';
-
-describe('settings-store additional branches', () => {
-  beforeEach(() => {
-    resetMockState();
-    localStorage.clear();
-    useSettingsStore.getState().resetLocalData();
-  });
-
-  it('setLanguage updates state to es', () => {
-    useSettingsStore.getState().setLanguage('es');
-    expect(useSettingsStore.getState().language).toBe('es');
-  });
-
-  it('setLanguage updates state to hu', () => {
-    useSettingsStore.getState().setLanguage('hu');
-    expect(useSettingsStore.getState().language).toBe('hu');
-  });
-
-  it('setLanguage calls i18n.changeLanguage', async () => {
-    const spy = vi.spyOn(i18n, 'changeLanguage');
-    useSettingsStore.getState().setLanguage('es');
-    expect(spy).toHaveBeenCalledWith('es');
-    spy.mockRestore();
-  });
-
-  it('setTheme updates state to dark', () => {
-    useSettingsStore.getState().setTheme('dark');
-    expect(useSettingsStore.getState().theme).toBe('dark');
-  });
-
-  it('setTheme updates state to light', () => {
-    useSettingsStore.getState().setTheme('light');
-    expect(useSettingsStore.getState().theme).toBe('light');
-  });
-
-  it('setFeatureConfig merges correctly', () => {
-    useSettingsStore.getState().setFeatureConfig('generate', { model: 'anthropic/claude-sonnet-5', provider: 'openrouter' });
-    const config = useSettingsStore.getState().featureConfigs.generate;
-    expect(config.model).toBe('anthropic/claude-sonnet-5');
-    expect(config.provider).toBe('openrouter');
-    expect(config.temperature).toBe(0.7);
-  });
-
-  it('setFeatureConfig preserves other features', () => {
-    useSettingsStore.getState().setFeatureConfig('attack', { temperature: 0.5 });
-    expect(useSettingsStore.getState().featureConfigs.generate.temperature).toBe(0.7);
-    expect(useSettingsStore.getState().featureConfigs.attack.temperature).toBe(0.5);
-  });
-
-  it('getFeatureConfig returns config for known feature', () => {
-    const config = useSettingsStore.getState().getFeatureConfig('generate');
-    expect(config.provider).toBe('openrouter');
-    expect(config.model).toBe('openai/gpt-5.6-luna');
-  });
-
-  it('getFeatureConfig returns defaults for unknown feature', () => {
-    useSettingsStore.setState({ featureConfigs: {} as any });
-    const config = useSettingsStore.getState().getFeatureConfig('generate');
-    expect(config).toBeDefined();
-    expect(config.provider).toBe('openrouter');
-  });
-
-  it('resetLocalData resets language', () => {
-    useSettingsStore.getState().setLanguage('hu');
-    useSettingsStore.getState().resetLocalData();
-    expect(useSettingsStore.getState().language).toBe('en');
-  });
-
-  it('resetLocalData can preserve only the interface language', () => {
-    const store = useSettingsStore.getState();
-    store.setLanguage('hu');
-    store.setOutputLanguage('hu');
-    store.setTheme('dark');
-    store.setSystemPrompt('custom');
-    store.resetLocalData(true);
-
-    const state = useSettingsStore.getState();
-    expect(state.language).toBe('hu');
-    expect(state.outputLanguage).toBe('en');
-    expect(state.theme).toBe('system');
-    expect(state.customSystemPrompt).toBeUndefined();
-  });
-
-  it('resetLocalData resets theme', () => {
-    useSettingsStore.getState().setTheme('dark');
-    useSettingsStore.getState().resetLocalData();
-    expect(useSettingsStore.getState().theme).toBe('system');
-  });
-
-  it('resetLocalData resets featureConfigs', () => {
-    useSettingsStore.getState().setFeatureConfig('generate', { model: 'openai/gpt-5.6-terra' });
-    useSettingsStore.getState().resetLocalData();
-    expect(useSettingsStore.getState().featureConfigs.generate.model).toBe('openai/gpt-5.6-luna');
-  });
-
-  it('resetLocalData resets customSystemPrompt', () => {
-    useSettingsStore.getState().setSystemPrompt('custom');
-    useSettingsStore.getState().resetLocalData();
-    expect(useSettingsStore.getState().customSystemPrompt).toBeUndefined();
-  });
-
-  it('resetLocalData resets wikiResearchEnabled', () => {
-    useSettingsStore.getState().setWikiResearchEnabled(true);
-    useSettingsStore.getState().resetLocalData();
-    expect(useSettingsStore.getState().wikiResearchEnabled).toBe(false);
-  });
-
-  it('hydrateFromServer handles missing data gracefully', async () => {
-    setMockTableResponse('user_settings', { single: null });
-    const prevTheme = useSettingsStore.getState().theme;
-    await useSettingsStore.getState().hydrateFromServer();
-    expect(useSettingsStore.getState().theme).toBe(prevTheme);
-  });
-});
diff --git a/src/test/stores/settings-store-branches.test.ts b/src/test/stores/settings-store-branches.test.ts
deleted file mode 100644
index afbbb01bd..000000000
--- a/src/test/stores/settings-store-branches.test.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { resetMockState, setMockTableResponse, supabaseMock } from '@/test/mocks/supabase';
-
-vi.mock('@/lib/supabase/client', () => ({ supabase: supabaseMock }));
-
-import { useSettingsStore } from '@/lib/stores/settings-store';
-
-describe('settings-store branch coverage', () => {
-  beforeEach(() => {
-    resetMockState();
-    localStorage.clear();
-    useSettingsStore.getState().resetLocalData();
-  });
-
-  it('hydrateFromServer returns early when no server row exists', async () => {
-    setMockTableResponse('user_settings', { single: null });
-
-    useSettingsStore.setState({ theme: 'dark' });
-    await useSettingsStore.getState().hydrateFromServer();
-
-    expect(useSettingsStore.getState().theme).toBe('dark');
-  });
-
-  it('hydrateFromServer applies fallback values when server fields are empty', async () => {
-    setMockTableResponse('user_settings', {
-      single: {
-        language: undefined,
-        theme: undefined,
-        custom_system_prompt: '',
-        feature_configs: undefined,
-      },
-    });
-
-    await useSettingsStore.getState().hydrateFromServer();
-
-    const state = useSettingsStore.getState();
-    expect(state.language).toBe('en');
-    expect(state.theme).toBe('system');
-    expect(state.customSystemPrompt).toBeUndefined();
-    expect(state.featureConfigs.generate.model).toBe('openai/gpt-5.6-luna');
-  });
-
-  it('hydrateFromServer accepts Hungarian language settings', async () => {
-    setMockTableResponse('user_settings', {
-      single: {
-        language: 'hu',
-        output_language: 'hu',
-        feature_configs: undefined,
-      },
-    });
-
-    await useSettingsStore.getState().hydrateFromServer();
-
-    expect(useSettingsStore.getState().language).toBe('hu');
-    expect(useSettingsStore.getState().outputLanguage).toBe('hu');
-    expect(document.documentElement.lang).toBe('hu');
-  });
-
-  it('hydrateFromServer rejects unsupported language settings', async () => {
-    setMockTableResponse('user_settings', {
-      single: {
-        language: 'zz',
-        output_language: 'zz',
-        feature_configs: undefined,
-      },
-    });
-
-    await useSettingsStore.getState().hydrateFromServer();
-
-    expect(useSettingsStore.getState().language).toBe('en');
-    expect(useSettingsStore.getState().outputLanguage).toBe('en');
-    expect(document.documentElement.lang).toBe('en');
-  });
-
-  it('normalizes persisted state in onRehydrateStorage callback', () => {
-    const onRehydrateStorage = useSettingsStore.persist.getOptions().onRehydrateStorage;
-    expect(onRehydrateStorage).toBeTypeOf('function');
-
-    const afterRehydrate = onRehydrateStorage?.(useSettingsStore.getState());
-    if (!afterRehydrate) throw new Error('Expected a rehydration callback');
-
-    const partialState = {
-      featureConfigs: undefined,
-      language: '',
-      theme: '',
-      wikiResearchEnabled: undefined,
-    } as any;
-
-    afterRehydrate(partialState);
-
-    expect(partialState.featureConfigs.generate).toBeDefined();
-    expect(partialState.language).toBe('en');
-    expect(partialState.theme).toBe('system');
-    expect(partialState.wikiResearchEnabled).toBe(false);
-  });
-
-  it('normalizes unsupported locally persisted languages', () => {
-    const onRehydrateStorage = useSettingsStore.persist.getOptions().onRehydrateStorage;
-    const afterRehydrate = onRehydrateStorage?.(useSettingsStore.getState());
-    if (!afterRehydrate) throw new Error('Expected a rehydration callback');
-
-    const partialState = {
-      featureConfigs: undefined,
-      language: 'zz',
-      outputLanguage: 'zz',
-    } as any;
-
-    afterRehydrate(partialState);
-
-    expect(partialState.language).toBe('en');
-    expect(partialState.outputLanguage).toBe('en');
-  });
-
-  it('canonicalizes legacy local configs and removes client credentials', () => {
-    const onRehydrateStorage = useSettingsStore.persist.getOptions().onRehydrateStorage;
-    const afterRehydrate = onRehydrateStorage?.(useSettingsStore.getState());
-    if (!afterRehydrate) throw new Error('Expected a rehydration callback');
-
-    const partialState = {
-      featureConfigs: {
-        generate: {
-          provider: 'google',
-          model: 'gemini-3-flash-preview',
-          temperature: 0.3,
-          reasoningEffort: 'medium',
-          apiKey: 'legacy-secret',
-          baseUrl: 'https://legacy.example.test',
-        },
-      },
-    } as any;
-
-    afterRehydrate(partialState);
-
-    expect(partialState.featureConfigs.generate).toMatchObject({
-      provider: 'openrouter',
-      model: 'google/gemini-3.8-flash',
-      temperature: 0.3,
-      reasoningEffort: 'medium',
-    });
-    expect(partialState.featureConfigs.generate).not.toHaveProperty('apiKey');
-    expect(partialState.featureConfigs.generate).not.toHaveProperty('baseUrl');
-  });
-
-  it('preserves the local mock fixture during local rehydration', () => {
-    const onRehydrateStorage = useSettingsStore.persist.getOptions().onRehydrateStorage;
-    const afterRehydrate = onRehydrateStorage?.(useSettingsStore.getState());
-    if (!afterRehydrate) throw new Error('Expected a rehydration callback');
-
-    const partialState = {
-      featureConfigs: {
-        generate: { provider: 'mock', model: 'local', temperature: 0.7 },
-      },
-    } as any;
-
-    afterRehydrate(partialState);
-
-    expect(partialState.featureConfigs.generate).toMatchObject({
-      provider: 'mock',
-      model: 'local',
-      reasoningEffort: 'low',
-    });
-  });
-
-  it('durably migrates legacy local credentials to the default OpenRouter config', async () => {
-    localStorage.setItem('debate-trainer-settings', JSON.stringify({
-      version: 0,
-      state: {
-        featureConfigs: {
-          generate: {
-            provider: 'openai',
-            model: 'gpt-5.5',
-            temperature: 0.4,
-            apiKey: 'legacy-secret',
-            baseUrl: 'https://legacy.example.test',
-          },
-        },
-      },
-    }));
-
-    await useSettingsStore.persist.rehydrate();
-
-    const persisted = JSON.parse(localStorage.getItem('debate-trainer-settings') || '{}');
-    expect(persisted.version).toBe(2);
-    expect(persisted.state.featureConfigs.generate).toMatchObject({
-      provider: 'openrouter',
-      model: 'openai/gpt-5.6-luna',
-      temperature: 0.4,
-      reasoningEffort: 'low',
-    });
-    expect(persisted.state.featureConfigs.generate).not.toHaveProperty('apiKey');
-    expect(persisted.state.featureConfigs.generate).not.toHaveProperty('baseUrl');
-  });
-
-  it('uses Luna for a saved GLM default until entitlement hydration completes', async () => {
-    localStorage.setItem('debate-trainer-settings', JSON.stringify({
-      version: 1,
-      state: {
-        featureConfigs: {
-          generate: {
-            provider: 'openrouter',
-            model: 'z-ai/glm-5.3-flash',
-            temperature: 0.7,
-            reasoningEffort: 'low',
-          },
-        },
-      },
-    }));
-
-    await useSettingsStore.persist.rehydrate();
-
-    const persisted = JSON.parse(localStorage.getItem('debate-trainer-settings') || '{}');
-    expect(persisted.version).toBe(2);
-    expect(persisted.state.featureConfigs.generate.model).toBe('openai/gpt-5.6-luna');
-  });
-});
diff --git a/src/test/stores/settings-store-extended.test.ts b/src/test/stores/settings-store-extended.test.ts
deleted file mode 100644
index 75919ec8b..000000000
--- a/src/test/stores/settings-store-extended.test.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-// src/test/stores/settings-store-extended.test.ts
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { act } from '@testing-library/react';
-
-// Mock Supabase
-vi.mock('@/lib/supabase/client', () => ({
-    supabase: {
-        from: vi.fn(() => ({
-            select: vi.fn(() => ({
-                eq: vi.fn(() => ({
-                    single: vi.fn(() => Promise.resolve({ data: null, error: null })),
-                    maybeSingle: vi.fn(() => Promise.resolve({ data: null, error: null })),
-                })),
-                single: vi.fn(() => Promise.resolve({ data: null, error: null })),
-            })),
-            insert: vi.fn(() => Promise.resolve({ data: null, error: null })),
-            update: vi.fn(() => ({
-                eq: vi.fn(() => Promise.resolve({ data: null, error: null })),
-            })),
-            upsert: vi.fn(() => Promise.resolve({ data: null, error: null })),
-        })),
-        auth: {
-            getUser: vi.fn(() => Promise.resolve({ data: { user: { id: 'test-user-id' } }, error: null })),
-            onAuthStateChange: vi.fn(() => ({ data: { subscription: { unsubscribe: vi.fn() } } })),
-        },
-    },
-}));
-
-// Import after mocking
-import { useSettingsStore } from '@/lib/stores/settings-store';
-import type { ProviderConfig } from '@/lib/ai/providers/types';
-
-// Helper to create default configs since it's not exported
-const createDefaultConfigs = (): Record<'generate' | 'attack' | 'brainstorm' | 'factoids' | 'ask', ProviderConfig> => ({
-    generate: { provider: 'openrouter', model: 'openai/gpt-5.6-luna', temperature: 0.7, reasoningEffort: 'low' },
-    attack: { provider: 'openrouter', model: 'openai/gpt-5.6-luna', temperature: 0.7, reasoningEffort: 'low' },
-    brainstorm: { provider: 'openrouter', model: 'openai/gpt-5.6-luna', temperature: 0.9, reasoningEffort: 'low' },
-    factoids: { provider: 'openrouter', model: 'openai/gpt-5.6-luna', temperature: 0.3, reasoningEffort: 'low' },
-    ask: { provider: 'openrouter', model: 'openai/gpt-5.6-luna', temperature: 0.7, reasoningEffort: 'low' },
-});
-
-describe('Settings Store Extended', () => {
-    beforeEach(() => {
-        // Reset store state before each test
-        act(() => {
-            useSettingsStore.setState({
-                language: 'en',
-                theme: 'system',
-                featureConfigs: createDefaultConfigs(),
-                customSystemPrompt: undefined,
-                wikiResearchEnabled: false,
-            });
-        });
-    });
-
-    describe('Language Settings', () => {
-        it('gets default language', () => {
-            const state = useSettingsStore.getState();
-            expect(state.language).toBe('en');
-        });
-
-        it('sets language to Spanish', () => {
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setLanguage('es');
-            });
-            expect(useSettingsStore.getState().language).toBe('es');
-        });
-
-        it('sets language to English', () => {
-            act(() => {
-                useSettingsStore.setState({ language: 'es' });
-            });
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setLanguage('en');
-            });
-            expect(useSettingsStore.getState().language).toBe('en');
-        });
-    });
-
-    describe('Theme Settings', () => {
-        it('gets default theme', () => {
-            const state = useSettingsStore.getState();
-            expect(state.theme).toBe('system');
-        });
-
-        it('sets theme to dark', () => {
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setTheme('dark');
-            });
-            expect(useSettingsStore.getState().theme).toBe('dark');
-        });
-
-        it('sets theme to light', () => {
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setTheme('light');
-            });
-            expect(useSettingsStore.getState().theme).toBe('light');
-        });
-
-        it('sets theme to system', () => {
-            act(() => {
-                useSettingsStore.setState({ theme: 'dark' });
-            });
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setTheme('system');
-            });
-            expect(useSettingsStore.getState().theme).toBe('system');
-        });
-    });
-
-    describe('Feature Configs', () => {
-        it('has feature configs defined', () => {
-            const configs = useSettingsStore.getState().featureConfigs;
-            expect(configs).toBeDefined();
-            expect(typeof configs).toBe('object');
-        });
-
-        it('sets feature config for generate', () => {
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setFeatureConfig('generate', { temperature: 0.5 });
-            });
-            expect(useSettingsStore.getState().featureConfigs.generate.temperature).toBe(0.5);
-        });
-
-        it('sets feature config for attack', () => {
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setFeatureConfig('attack', { temperature: 0.8 });
-            });
-            expect(useSettingsStore.getState().featureConfigs.attack.temperature).toBe(0.8);
-        });
-
-        it('preserves other configs when updating one', () => {
-            const store = useSettingsStore.getState();
-            const originalBrainstormTemp = store.featureConfigs.brainstorm.temperature;
-            act(() => {
-                store.setFeatureConfig('generate', { temperature: 0.5 });
-            });
-            expect(useSettingsStore.getState().featureConfigs.brainstorm.temperature).toBe(originalBrainstormTemp);
-        });
-
-        it('gets feature config for specific feature', () => {
-            const store = useSettingsStore.getState();
-            const config = store.getFeatureConfig('generate');
-            expect(config).toBeDefined();
-            expect(config.provider).toBe('openrouter');
-        });
-    });
-
-    describe('System Prompt', () => {
-        it('gets default undefined system prompt', () => {
-            const state = useSettingsStore.getState();
-            expect(state.customSystemPrompt).toBeUndefined();
-        });
-
-        it('sets custom system prompt', () => {
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setSystemPrompt('You are a debate coach.');
-            });
-            expect(useSettingsStore.getState().customSystemPrompt).toBe('You are a debate coach.');
-        });
-
-        it('clears system prompt', () => {
-            act(() => {
-                useSettingsStore.setState({ customSystemPrompt: 'Custom prompt' });
-            });
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.setSystemPrompt('');
-            });
-            expect(useSettingsStore.getState().customSystemPrompt).toBe('');
-        });
-
-        it('handles multiline system prompt', () => {
-            const store = useSettingsStore.getState();
-            const multilinePrompt = `You are a debate coach.
-Focus on:
-1. Logic
-2. Evidence
-3. Delivery`;
-            act(() => {
-                store.setSystemPrompt(multilinePrompt);
-            });
-            expect(useSettingsStore.getState().customSystemPrompt).toBe(multilinePrompt);
-        });
-    });
-
-    describe('Reset', () => {
-        it('resets to default settings', () => {
-            // Set non-default values
-            act(() => {
-                useSettingsStore.setState({
-                    language: 'es',
-                    theme: 'dark',
-                    customSystemPrompt: 'Custom prompt',
-                });
-            });
-
-            const store = useSettingsStore.getState();
-            act(() => {
-                store.resetLocalData();
-            });
-
-            const state = useSettingsStore.getState();
-            expect(state.language).toBe('en');
-            expect(state.theme).toBe('system');
-            expect(state.customSystemPrompt).toBeUndefined();
-            expect(state.wikiResearchEnabled).toBe(false);
-        });
-    });
-});
diff --git a/src/test/settings-store.test.ts b/src/test/stores/settings-store.test.ts
similarity index 56%
rename from src/test/settings-store.test.ts
rename to src/test/stores/settings-store.test.ts
index a7b3c5639..983cc0555 100644
--- a/src/test/settings-store.test.ts
+++ b/src/test/stores/settings-store.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import {
   resetMockState,
@@ -9,6 +10,7 @@ import {
 vi.mock("@/lib/supabase/client", () => ({ supabase: supabaseMock }));
 
 import { useSettingsStore } from "@/lib/stores/settings-store";
+import i18n from "@/i18n";
 
 describe("settings-store", () => {
   beforeEach(() => {
@@ -118,7 +120,10 @@ describe("settings-store", () => {
     warnSpy.mockRestore();
   });
 
-  it("getFeatureConfig returns defaults when missing", () => {
+  it("getFeatureConfig returns the stored config, or defaults when missing", () => {
+    useSettingsStore.getState().setFeatureConfig("ask", { temperature: 0.42 });
+    expect(useSettingsStore.getState().getFeatureConfig("ask").temperature).toBe(0.42);
+
     useSettingsStore.setState({ featureConfigs: {} } as Partial<ReturnType<typeof useSettingsStore.getState>>);
     const config = useSettingsStore.getState().getFeatureConfig("ask");
     expect(config.provider).toBe("openrouter");
@@ -390,4 +395,321 @@ describe("settings-store", () => {
     await new Promise((resolve) => setTimeout(resolve, 0));
     expect(supabaseMock.from).not.toHaveBeenCalled();
   });
+
+  it("persists a cleared system prompt as null and carries a set one into config writes", async () => {
+    const store = useSettingsStore.getState();
+    store.setSystemPrompt("You are a debate coach.");
+    store.setFeatureConfig("generate", { temperature: 0.5 });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    const configWrite = supabaseMock.from.mock.results
+      .map(({ value }) => value.upsert?.mock.calls?.at(-1)?.[0])
+      .filter(Boolean)
+      .at(-1);
+    expect(configWrite.custom_system_prompt).toBe("You are a debate coach.");
+
+    store.setSystemPrompt("");
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    const clearWrite = supabaseMock.from.mock.results
+      .map(({ value }) => value.upsert?.mock.calls?.at(-1)?.[0])
+      .filter(Boolean)
+      .at(-1);
+    expect(clearWrite.custom_system_prompt).toBeNull();
+  });
+
+  it("setLanguage updates state and switches the i18n runtime", () => {
+    const spy = vi.spyOn(i18n, "changeLanguage");
+    useSettingsStore.getState().setLanguage("hu");
+
+    expect(useSettingsStore.getState().language).toBe("hu");
+    expect(spy).toHaveBeenCalledWith("hu");
+    spy.mockRestore();
+  });
+
+  it('hydrateFromServer returns early when no server row exists', async () => {
+    setMockTableResponse('user_settings', { single: null });
+
+    useSettingsStore.setState({ theme: 'dark' });
+    await useSettingsStore.getState().hydrateFromServer();
+
+    expect(useSettingsStore.getState().theme).toBe('dark');
+  });
+
+  it('hydrateFromServer applies fallback values when server fields are empty', async () => {
+    setMockTableResponse('user_settings', {
+      single: {
+        language: undefined,
+        theme: undefined,
+        custom_system_prompt: '',
+        feature_configs: undefined,
+      },
+    });
+
+    await useSettingsStore.getState().hydrateFromServer();
+
+    const state = useSettingsStore.getState();
+    expect(state.language).toBe('en');
+    expect(state.theme).toBe('system');
+    expect(state.customSystemPrompt).toBeUndefined();
+    expect(state.featureConfigs.generate.model).toBe('openai/gpt-5.6-luna');
+  });
+
+  it('normalizes persisted state in onRehydrateStorage callback', () => {
+    const onRehydrateStorage = useSettingsStore.persist.getOptions().onRehydrateStorage;
+    expect(onRehydrateStorage).toBeTypeOf('function');
+
+    const afterRehydrate = onRehydrateStorage?.(useSettingsStore.getState());
+    if (!afterRehydrate) throw new Error('Expected a rehydration callback');
+
+    const partialState = {
+      featureConfigs: undefined,
+      language: '',
+      theme: '',
+      wikiResearchEnabled: undefined,
+    } as any;
+
+    afterRehydrate(partialState);
+
+    expect(partialState.featureConfigs.generate).toBeDefined();
+    expect(partialState.language).toBe('en');
+    expect(partialState.theme).toBe('system');
+    expect(partialState.wikiResearchEnabled).toBe(false);
+  });
+
+  it('canonicalizes legacy local configs and removes client credentials', () => {
+    const onRehydrateStorage = useSettingsStore.persist.getOptions().onRehydrateStorage;
+    const afterRehydrate = onRehydrateStorage?.(useSettingsStore.getState());
+    if (!afterRehydrate) throw new Error('Expected a rehydration callback');
+
+    const partialState = {
+      featureConfigs: {
+        generate: {
+          provider: 'google',
+          model: 'gemini-3-flash-preview',
+          temperature: 0.3,
+          reasoningEffort: 'medium',
+          apiKey: 'legacy-secret',
+          baseUrl: 'https://legacy.example.test',
+        },
+      },
+    } as any;
+
+    afterRehydrate(partialState);
+
+    expect(partialState.featureConfigs.generate).toMatchObject({
+      provider: 'openrouter',
+      model: 'google/gemini-3.8-flash',
+      temperature: 0.3,
+      reasoningEffort: 'medium',
+    });
+    expect(partialState.featureConfigs.generate).not.toHaveProperty('apiKey');
+    expect(partialState.featureConfigs.generate).not.toHaveProperty('baseUrl');
+  });
+
+  it('normalizes a stored local mock fixture back to the real provider on rehydration', () => {
+    const onRehydrateStorage = useSettingsStore.persist.getOptions().onRehydrateStorage;
+    const afterRehydrate = onRehydrateStorage?.(useSettingsStore.getState());
+    if (!afterRehydrate) throw new Error('Expected a rehydration callback');
+
+    const partialState = {
+      featureConfigs: {
+        generate: { provider: 'mock', model: 'local', temperature: 0.7 },
+      },
+    } as any;
+
+    afterRehydrate(partialState);
+
+    // The in-app mock provider is gone; e2e specs stub the network instead, so
+    // a leftover 'mock'/'local' pair must not survive into a live config.
+    expect(partialState.featureConfigs.generate).toMatchObject({
+      provider: 'openrouter',
+      reasoningEffort: 'low',
+    });
+    expect(partialState.featureConfigs.generate.model).not.toBe('local');
+  });
+
+  it('durably migrates legacy local credentials to the default OpenRouter config', async () => {
+    localStorage.setItem('debate-trainer-settings', JSON.stringify({
+      version: 0,
+      state: {
+        featureConfigs: {
+          generate: {
+            provider: 'openai',
+            model: 'gpt-5.5',
+            temperature: 0.4,
+            apiKey: 'legacy-secret',
+            baseUrl: 'https://legacy.example.test',
+          },
+        },
+      },
+    }));
+
+    await useSettingsStore.persist.rehydrate();
+
+    const persisted = JSON.parse(localStorage.getItem('debate-trainer-settings') || '{}');
+    expect(persisted.version).toBe(2);
+    expect(persisted.state.featureConfigs.generate).toMatchObject({
+      provider: 'openrouter',
+      model: 'openai/gpt-5.6-luna',
+      temperature: 0.4,
+      reasoningEffort: 'low',
+    });
+    expect(persisted.state.featureConfigs.generate).not.toHaveProperty('apiKey');
+    expect(persisted.state.featureConfigs.generate).not.toHaveProperty('baseUrl');
+  });
+
+  it('uses Luna for a saved GLM default until entitlement hydration completes', async () => {
+    localStorage.setItem('debate-trainer-settings', JSON.stringify({
+      version: 1,
+      state: {
+        featureConfigs: {
+          generate: {
+            provider: 'openrouter',
+            model: 'z-ai/glm-5.3-flash',
+            temperature: 0.7,
+            reasoningEffort: 'low',
+          },
+        },
+      },
+    }));
+
+    await useSettingsStore.persist.rehydrate();
+
+    const persisted = JSON.parse(localStorage.getItem('debate-trainer-settings') || '{}');
+    expect(persisted.version).toBe(2);
+    expect(persisted.state.featureConfigs.generate.model).toBe('openai/gpt-5.6-luna');
+  });
+
+  it("keeps Auto Fast for trial users", async () => {
+    setMockTableResponse("user_settings", {
+      single: {
+        subscription_tier: "trial",
+        trial_ends_at: "2099-01-01T00:00:00.000Z",
+        feature_configs: {
+          generate: {
+            provider: "openrouter",
+            model: "auto-fast",
+            temperature: 0.7,
+            reasoningEffort: "high",
+          },
+        },
+      },
+    });
+
+    await useSettingsStore.getState().hydrateFromServer();
+
+    expect(useSettingsStore.getState().featureConfigs.generate).toMatchObject({
+      model: "auto-fast",
+      reasoningEffort: "high",
+    });
+  });
+
+  it("moves an inaccessible Auto Pro selection to Auto Fast", async () => {
+    setMockTableResponse("user_settings", {
+      single: {
+        subscription_tier: "trial",
+        trial_ends_at: "2099-01-01T00:00:00.000Z",
+        feature_configs: {
+          generate: {
+            provider: "openrouter",
+            model: "auto-pro",
+            temperature: 0.7,
+            reasoningEffort: "high",
+          },
+        },
+      },
+    });
+
+    await useSettingsStore.getState().hydrateFromServer();
+
+    expect(useSettingsStore.getState().featureConfigs.generate.model).toBe("auto-fast");
+  });
+
+  it("keeps Auto Pro for active Pro users", async () => {
+    setMockTableResponse("subscriptions", {
+      select: [{ status: "active", current_period_end: "2099-01-01T00:00:00.000Z" }],
+    });
+    setMockTableResponse("user_settings", {
+      single: {
+        subscription_tier: "pro",
+        feature_configs: {
+          generate: {
+            provider: "openrouter",
+            model: "auto-pro",
+            temperature: 0.7,
+            reasoningEffort: "high",
+          },
+        },
+      },
+    });
+
+    await useSettingsStore.getState().hydrateFromServer();
+
+    expect(useSettingsStore.getState().featureConfigs.generate.model).toBe("auto-pro");
+  });
+
+  it('resetLocalData can preserve only the interface language', () => {
+    const store = useSettingsStore.getState();
+    store.setLanguage('hu');
+    store.setOutputLanguage('hu');
+    store.setTheme('dark');
+    store.setSystemPrompt('custom');
+    store.resetLocalData(true);
+
+    const state = useSettingsStore.getState();
+    expect(state.language).toBe('hu');
+    expect(state.outputLanguage).toBe('en');
+    expect(state.theme).toBe('system');
+    expect(state.customSystemPrompt).toBeUndefined();
+  });
+
+  it('hydrateFromServer accepts Hungarian language settings', async () => {
+    setMockTableResponse('user_settings', {
+      single: {
+        language: 'hu',
+        output_language: 'hu',
+        feature_configs: undefined,
+      },
+    });
+
+    await useSettingsStore.getState().hydrateFromServer();
+
+    expect(useSettingsStore.getState().language).toBe('hu');
+    expect(useSettingsStore.getState().outputLanguage).toBe('hu');
+    expect(document.documentElement.lang).toBe('hu');
+  });
+
+  it('hydrateFromServer rejects unsupported language settings', async () => {
+    setMockTableResponse('user_settings', {
+      single: {
+        language: 'zz',
+        output_language: 'zz',
+        feature_configs: undefined,
+      },
+    });
+
+    await useSettingsStore.getState().hydrateFromServer();
+
+    expect(useSettingsStore.getState().language).toBe('en');
+    expect(useSettingsStore.getState().outputLanguage).toBe('en');
+    expect(document.documentElement.lang).toBe('en');
+  });
+
+  it('normalizes unsupported locally persisted languages', () => {
+    const onRehydrateStorage = useSettingsStore.persist.getOptions().onRehydrateStorage;
+    const afterRehydrate = onRehydrateStorage?.(useSettingsStore.getState());
+    if (!afterRehydrate) throw new Error('Expected a rehydration callback');
+
+    const partialState = {
+      featureConfigs: undefined,
+      language: 'zz',
+      outputLanguage: 'zz',
+    } as any;
+
+    afterRehydrate(partialState);
+
+    expect(partialState.language).toBe('en');
+    expect(partialState.outputLanguage).toBe('en');
+  });
 });
diff --git a/supabase/README.md b/supabase/README.md
index d4e44e665..19607797f 100644
--- a/supabase/README.md
+++ b/supabase/README.md
@@ -33,7 +33,7 @@ supabase/tests/            pgTAP database and policy tests
 
 Both endpoints route every model inference through OpenRouter and enforce the shared ten-model Basic/Pro catalog. GPT-5.6 Luna is the Basic default; Pro-only models require active Pro access.
 
-The browser boundary is [`../src/lib/ai/client.ts`](../src/lib/ai/client.ts). Shared prompt, research, source-quality, model-pricing, cost, and control logic lives in `_shared`.
+The browser boundary is [`../src/lib/ai/client.ts`](../src/lib/ai/client.ts). Shared prompt, research, source-quality, cost, entitlement, CORS, and control logic lives in `_shared`.
 
 ### Content and sharing
 
diff --git a/supabase/functions/_shared/cors.test.ts b/supabase/functions/_shared/cors.test.ts
new file mode 100644
index 000000000..2f110017c
--- /dev/null
+++ b/supabase/functions/_shared/cors.test.ts
@@ -0,0 +1,52 @@
+import { assertEquals, assertStringIncludes } from "jsr:@std/assert@1.0.19";
+import { ALLOWED_ORIGINS, getCorsHeaders, isDevOrigin } from "./cors.ts";
+
+Deno.test("allows the Capacitor WebView origin", () => {
+  const headers = getCorsHeaders("capacitor://localhost");
+  assertEquals(headers["Access-Control-Allow-Origin"], "capacitor://localhost");
+});
+
+Deno.test("allows the isolated staging browser origin", () => {
+  const headers = getCorsHeaders("http://127.0.0.1:18080");
+  assertEquals(headers["Access-Control-Allow-Origin"], "http://127.0.0.1:18080");
+});
+
+Deno.test("falls back to the public origin for an unknown caller", () => {
+  const headers = getCorsHeaders("https://evil.example.com");
+  assertEquals(headers["Access-Control-Allow-Origin"], "https://debate.pi-stack.org");
+  assertEquals(ALLOWED_ORIGINS[0], "https://debate.pi-stack.org");
+});
+
+Deno.test("falls back when no origin header is present", () => {
+  assertEquals(getCorsHeaders(null)["Access-Control-Allow-Origin"], "https://debate.pi-stack.org");
+});
+
+Deno.test("rejects a hostname that merely starts with localhost", () => {
+  assertEquals(isDevOrigin("http://localhost.evil.com"), false);
+  assertEquals(isDevOrigin("http://localhostevil.com"), false);
+  assertEquals(isDevOrigin("https://localhost"), false);
+  assertEquals(isDevOrigin("http://localhost:4173"), true);
+  assertEquals(isDevOrigin("http://192.168.1.14:8080"), true);
+});
+
+Deno.test("only echoes a dev origin when the function opts in", () => {
+  const origin = "http://192.168.1.14:8080";
+  assertEquals(getCorsHeaders(origin)["Access-Control-Allow-Origin"], "https://debate.pi-stack.org");
+  assertEquals(
+    getCorsHeaders(origin, { allowDevOrigins: true })["Access-Control-Allow-Origin"],
+    origin,
+  );
+});
+
+Deno.test("carries the requested methods", () => {
+  assertEquals(getCorsHeaders(null)["Access-Control-Allow-Methods"], "POST, OPTIONS");
+  assertEquals(
+    getCorsHeaders(null, { methods: "GET, POST, OPTIONS" })["Access-Control-Allow-Methods"],
+    "GET, POST, OPTIONS",
+  );
+});
+
+Deno.test("native share links use the public HTTPS origin", async () => {
+  const source = await Deno.readTextFile(new URL("../share/index.ts", import.meta.url));
+  assertStringIncludes(source, "shareUrl: `${PUBLIC_WEB_APP_ORIGIN}/share/${data.share_code}`");
+});
diff --git a/supabase/functions/_shared/cors.ts b/supabase/functions/_shared/cors.ts
new file mode 100644
index 000000000..67a1b27ea
--- /dev/null
+++ b/supabase/functions/_shared/cors.ts
@@ -0,0 +1,62 @@
+// Shared CORS policy for every browser-called Edge Function.
+//
+// This used to be copy-pasted into each function and had drifted: some lists
+// omitted the Playwright port (18080), and demo-code-login omitted the
+// Capacitor WebView origin entirely.
+
+export const PUBLIC_WEB_APP_ORIGIN = "https://debate.pi-stack.org";
+
+/** Browser origins allowed to call the functions. Index 0 is the fallback. */
+export const ALLOWED_ORIGINS = [
+  PUBLIC_WEB_APP_ORIGIN,
+  "http://localhost:8080",
+  "http://127.0.0.1:8080",
+  "http://localhost:18080",
+  "http://127.0.0.1:18080",
+  "http://localhost:5173",
+  "http://127.0.0.1:54321", // Local Supabase
+  "capacitor://localhost", // iOS Capacitor WebView
+] as const;
+
+export type CorsMethods = "POST, OPTIONS" | "GET, POST, OPTIONS" | "POST, GET, OPTIONS";
+
+/**
+ * Matches the exact hostname and requires http:, rather than a string prefix.
+ * `startsWith("http://localhost")` also matches an attacker-controlled origin
+ * like "http://localhost.evil.com".
+ */
+export function isDevOrigin(origin: string): boolean {
+  let url: URL;
+  try {
+    url = new URL(origin);
+  } catch {
+    return false;
+  }
+  if (url.protocol !== "http:") return false;
+  return (
+    url.hostname === "localhost" ||
+    url.hostname === "127.0.0.1" ||
+    /^192\.168\.\d{1,3}\.\d{1,3}$/.test(url.hostname)
+  );
+}
+
+export interface CorsOptions {
+  /** Allow any localhost/127.0.0.1/192.168.x.x origin, for on-device testing. */
+  allowDevOrigins?: boolean;
+  methods?: CorsMethods;
+}
+
+export function getCorsHeaders(
+  origin: string | null,
+  { allowDevOrigins = false, methods = "POST, OPTIONS" }: CorsOptions = {},
+): Record<string, string> {
+  const permitted = Boolean(origin) && (
+    ALLOWED_ORIGINS.includes(origin as typeof ALLOWED_ORIGINS[number]) ||
+    (allowDevOrigins && isDevOrigin(origin as string))
+  );
+  return {
+    "Access-Control-Allow-Origin": permitted ? origin as string : ALLOWED_ORIGINS[0],
+    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
+    "Access-Control-Allow-Methods": methods,
+  };
+}
diff --git a/supabase/functions/_shared/cost.test.ts b/supabase/functions/_shared/cost.test.ts
index 6217ddcab..850a5926d 100644
--- a/supabase/functions/_shared/cost.test.ts
+++ b/supabase/functions/_shared/cost.test.ts
@@ -1,169 +1,82 @@
 import {
   calculateRequestCost,
-  mergeNormalizedUsage,
   markIncompleteUsage,
-  normalizeAnthropicUsage,
-  normalizeGoogleUsage,
+  mergeNormalizedUsage,
   normalizeOpenRouterUsage,
-  normalizeOpenAIUsage,
   selectObservedUsage,
 } from "./cost.ts";
 
-function approxEqual(a: number | null, b: number, epsilon = 1e-9): boolean {
-  return a !== null && Math.abs(a - b) < epsilon;
-}
-
-Deno.test("openai standard usage costs input and output at short-context rates", () => {
-  const result = calculateRequestCost({
-    provider: "openai",
-    model: "gpt-5.4-mini",
-    usage: normalizeOpenAIUsage({ prompt_tokens: 1000, completion_tokens: 500 }),
-  });
-  if (result.inputTokens !== 1000 || result.outputTokens !== 500) throw new Error("token passthrough failed");
-  // 1000/1M * $0.75 + 500/1M * $4.50
-  if (!approxEqual(result.costUsd, 0.00075 + 0.00225)) throw new Error(`unexpected cost ${result.costUsd}`);
-  if (result.pricingSnapshotId !== "official-docs-2026-09-19") throw new Error("snapshot id missing");
-});
-
-Deno.test("openai cached and reasoning tokens are not double counted", () => {
-  const result = calculateRequestCost({
-    provider: "openai",
-    model: "gpt-5.4-mini",
-    usage: normalizeOpenAIUsage({
-      prompt_tokens: 1000,
-      completion_tokens: 500,
-      prompt_tokens_details: { cached_tokens: 400 },
-      completion_tokens_details: { reasoning_tokens: 200 },
-    }),
-  });
-  if (result.cachedInputTokens !== 400) throw new Error("cached tokens not captured");
-  if (result.reasoningOutputTokens !== 200) throw new Error("reasoning tokens not captured");
-  // (600 * 0.75 + 400 * 0.075 + 500 * 4.50) / 1M
-  const expected = (600 * 0.75 + 400 * 0.075 + 500 * 4.5) / 1_000_000;
-  if (!approxEqual(result.costUsd, expected)) throw new Error(`reasoning or cached double counted: ${result.costUsd} vs ${expected}`);
-});
-
-Deno.test("openai long-context rates apply above the published threshold", () => {
+Deno.test("OpenRouter usage uses its reported account cost, including zero", () => {
   const result = calculateRequestCost({
-    provider: "openai",
-    model: "gpt-5.4",
-    usage: normalizeOpenAIUsage({ prompt_tokens: 300_000, completion_tokens: 1000 }),
+    provider: "openrouter",
+    model: "z-ai/glm-5.3-flash",
+    usage: normalizeOpenRouterUsage({ prompt_tokens: 1000, completion_tokens: 500, cost: 0 }),
   });
-  // long context: input $5.00, output $22.50
-  const expected = (300_000 * 5 + 1000 * 22.5) / 1_000_000;
-  if (!approxEqual(result.costUsd, expected)) throw new Error(`long context cost wrong: ${result.costUsd} vs ${expected}`);
+  if (result.costUsd !== 0) throw new Error(`zero cost was discarded: ${result.costUsd}`);
+  if (result.inputTokens !== 1000 || result.outputTokens !== 500) throw new Error("token counts lost");
+  if (result.costCalculationVersion !== "openrouter-usage-v1") throw new Error("wrong calculation version");
 });
 
-Deno.test("anthropic cache read and write tokens use their own rates", () => {
+Deno.test("OpenRouter usage without a reported cost fails closed", () => {
   const result = calculateRequestCost({
-    provider: "anthropic",
-    model: "claude-opus-4-7",
-    usage: normalizeAnthropicUsage({
-      input_tokens: 1000,
-      output_tokens: 500,
-      cache_read_input_tokens: 2000,
-      cache_creation_input_tokens: 300,
-    }),
+    provider: "openrouter",
+    model: "z-ai/glm-5.3-flash",
+    usage: normalizeOpenRouterUsage({ prompt_tokens: 1000, completion_tokens: 500 }),
   });
-  if (result.cachedInputTokens !== 2000) throw new Error("cache read tokens not captured");
-  const expected = (1000 * 5 + 2000 * 0.5 + 300 * 6.25 + 500 * 25) / 1_000_000;
-  if (!approxEqual(result.costUsd, expected)) throw new Error(`anthropic cost wrong: ${result.costUsd} vs ${expected}`);
+  if (result.costUsd !== null) throw new Error(`missing cost was estimated: ${result.costUsd}`);
+  if (result.inputTokens !== 1000) throw new Error("token counts lost");
 });
 
-Deno.test("gemini thinking tokens are billed as output without double counting", () => {
+Deno.test("cached and reasoning tokens are reported without double counting", () => {
   const result = calculateRequestCost({
-    provider: "google",
-    model: "gemini-3-flash-preview",
-    usage: normalizeGoogleUsage({
-      promptTokenCount: 1000,
-      candidatesTokenCount: 400,
-      thoughtsTokenCount: 100,
-      cachedContentTokenCount: 200,
-      totalTokenCount: 1700,
+    provider: "openrouter",
+    model: "z-ai/glm-5.3-flash",
+    usage: normalizeOpenRouterUsage({
+      prompt_tokens: 1000,
+      completion_tokens: 500,
+      cost: 0.42,
+      prompt_tokens_details: { cached_tokens: 400, cache_write_tokens: 100 },
+      completion_tokens_details: { reasoning_tokens: 200 },
     }),
   });
-  if (result.reasoningOutputTokens !== 100) throw new Error("thinking tokens not captured");
-  if (result.outputTokens !== 500) throw new Error("billable output must be candidates + thoughts");
-  const expected = (800 * 0.5 + 200 * 0.05 + 500 * 3.0) / 1_000_000;
-  if (!approxEqual(result.costUsd, expected)) throw new Error(`gemini cost wrong: ${result.costUsd} vs ${expected}`);
+  if (result.cachedInputTokens !== 400) throw new Error("cached tokens lost");
+  if (result.cacheWriteTokens !== 100) throw new Error("cache write tokens lost");
+  if (result.reasoningOutputTokens !== 200) throw new Error("reasoning tokens lost");
+  // Reasoning is a subset of completion_tokens; it must not inflate the output total.
+  if (result.outputTokens !== 500) throw new Error("reasoning tokens were double counted");
+  if (result.costUsd !== 0.42) throw new Error("reported cost changed");
 });
 
-Deno.test("gemini pro applies the 200k long-context threshold", () => {
-  const result = calculateRequestCost({
-    provider: "google",
-    model: "gemini-3.1-pro-preview",
-    usage: normalizeGoogleUsage({ promptTokenCount: 250_000, candidatesTokenCount: 1000 }),
-  });
-  const expected = (250_000 * 4 + 1000 * 18) / 1_000_000;
-  if (!approxEqual(result.costUsd, expected)) throw new Error(`pro long context cost wrong: ${result.costUsd} vs ${expected}`);
+Deno.test("missing usage yields nulls instead of zeros", () => {
+  const result = calculateRequestCost({ provider: "openrouter", model: "z-ai/glm-5.3-flash" });
+  if (result.costUsd !== null || result.inputTokens !== null || result.outputTokens !== null) {
+    throw new Error("absent usage was reported as zero");
+  }
 });
 
-Deno.test("unknown model returns null cost but keeps token counts", () => {
+Deno.test("negative provider token counts are dropped, not billed", () => {
   const result = calculateRequestCost({
-    provider: "google",
-    model: "gemini-3.1-flash-lite-preview",
-    usage: normalizeGoogleUsage({ promptTokenCount: 1234, candidatesTokenCount: 567 }),
+    provider: "openrouter",
+    model: "z-ai/glm-5.3-flash",
+    usage: normalizeOpenRouterUsage({ prompt_tokens: -5, completion_tokens: 500, cost: 0.1 }),
   });
-  if (result.costUsd !== null) throw new Error(`unknown model must fail closed, got ${result.costUsd}`);
-  if (result.inputTokens !== 1234 || result.outputTokens !== 567) throw new Error("tokens lost for unknown model");
-});
-
-Deno.test("missing usage yields nulls instead of zeros", () => {
-  const result = calculateRequestCost({ provider: "openai", model: "gpt-5.4-mini" });
-  if (result.costUsd !== null) throw new Error("cost must be null without usage");
-  if (result.inputTokens !== null || result.outputTokens !== null) throw new Error("tokens must be null without usage");
+  if (result.inputTokens !== null) throw new Error(`negative token count survived: ${result.inputTokens}`);
 });
 
 Deno.test("raw provider usage is preserved for audit", () => {
-  const raw = { prompt_tokens: 10, completion_tokens: 5, system_fingerprint: "fp_x" };
-  const result = calculateRequestCost({ provider: "openai", model: "gpt-5.4-mini", usage: normalizeOpenAIUsage(raw) });
-  if (!result.rawUsage || result.rawUsage.system_fingerprint !== "fp_x") throw new Error("raw usage dropped");
-});
-
-Deno.test("OpenRouter usage uses its reported account cost, including zero", () => {
-  const raw = {
-    prompt_tokens: 10,
-    completion_tokens: 5,
-    total_tokens: 15,
-    cost: 0,
-  };
-  const usage = normalizeOpenRouterUsage(raw);
-  const result = calculateRequestCost({ provider: "openrouter", model: "z-ai/glm-5.3-flash", usage });
-  if (usage.reportedCostUsd !== 0 || result.costUsd !== 0) {
-    throw new Error(`zero OpenRouter cost was not preserved: ${JSON.stringify({ usage, result })}`);
-  }
-  if (result.rawUsage?.cost !== 0) throw new Error("raw OpenRouter usage was dropped");
-});
-
-Deno.test("OpenRouter usage without a reported cost fails closed", () => {
-  const usage = normalizeOpenRouterUsage({ prompt_tokens: 10, completion_tokens: 5 });
-  const result = calculateRequestCost({ provider: "openrouter", model: "z-ai/glm-5.3-flash", usage });
-  if (result.costUsd !== null) {
-    throw new Error(`missing OpenRouter cost was estimated: ${JSON.stringify(result)}`);
-  }
-});
-
-Deno.test("anthropic ttl-split cache writes bill at 5m and 1h rates", () => {
+  const raw = { prompt_tokens: 10, completion_tokens: 5, cost: 0.01, provider_extra: "keep me" };
   const result = calculateRequestCost({
-    provider: "anthropic",
-    model: "claude-opus-4-7",
-    usage: normalizeAnthropicUsage({
-      input_tokens: 1000,
-      output_tokens: 100,
-      cache_creation_input_tokens: {
-        ephemeral_5m_input_tokens: 400,
-        ephemeral_1h_input_tokens: 600,
-      },
-    }),
+    provider: "openrouter",
+    model: "z-ai/glm-5.3-flash",
+    usage: normalizeOpenRouterUsage(raw),
   });
-  const expected = (1000 * 5 + 400 * 6.25 + 600 * 10 + 100 * 25) / 1_000_000;
-  if (!approxEqual(result.costUsd, expected)) throw new Error(`ttl split cost wrong: ${result.costUsd} vs ${expected}`);
+  if (result.rawUsage !== raw) throw new Error("raw usage was not preserved verbatim");
 });
 
-Deno.test("research sub-calls merge into one auditable usage record", async () => {
+Deno.test("research sub-calls merge into one auditable usage record", () => {
   const merged = mergeNormalizedUsage([
-    normalizeOpenAIUsage({ prompt_tokens: 1000, completion_tokens: 500 }),
-    normalizeOpenAIUsage({ prompt_tokens: 300, completion_tokens: 100 }),
+    normalizeOpenRouterUsage({ prompt_tokens: 1000, completion_tokens: 500, cost: 0.2 }),
+    normalizeOpenRouterUsage({ prompt_tokens: 300, completion_tokens: 100, cost: 0.05 }),
   ]);
   if (!merged) throw new Error("merge dropped all usage");
   if (merged.inputTokens !== 1300 || merged.outputTokens !== 600) throw new Error("sums wrong");
@@ -199,7 +112,7 @@ Deno.test("merged OpenRouter research usage sums only complete reported costs",
 
 Deno.test("incomplete merged usage keeps observed tokens but fails closed on cost", () => {
   const merged = mergeNormalizedUsage([
-    normalizeOpenAIUsage({ prompt_tokens: 1000, completion_tokens: 500 }),
+    normalizeOpenRouterUsage({ prompt_tokens: 1000, completion_tokens: 500, cost: 0.3 }),
     { incomplete: true },
   ]);
   if (!merged?.incomplete) throw new Error("incomplete marker was dropped");
@@ -207,11 +120,7 @@ Deno.test("incomplete merged usage keeps observed tokens but fails closed on cos
     throw new Error("observed token counts were dropped");
   }
 
-  const result = calculateRequestCost({
-    provider: "openai",
-    model: "gpt-5.4-mini",
-    usage: merged,
-  });
+  const result = calculateRequestCost({ provider: "openrouter", model: "z-ai/glm-5.3-flash", usage: merged });
   if (result.costUsd !== null) throw new Error("incomplete usage must not produce a known cost");
   if (result.inputTokens !== 1000 || result.outputTokens !== 500) {
     throw new Error("cost audit lost observed token counts");
@@ -219,8 +128,8 @@ Deno.test("incomplete merged usage keeps observed tokens but fails closed on cos
 });
 
 Deno.test("observed usage selection prefers merged usage and selects each record once", () => {
-  const firstAttempt = normalizeOpenAIUsage({ prompt_tokens: 1000, completion_tokens: 500 });
-  const repairAttempt = normalizeOpenAIUsage({ prompt_tokens: 300, completion_tokens: 100 });
+  const firstAttempt = normalizeOpenRouterUsage({ prompt_tokens: 1000, completion_tokens: 500, cost: 0.2 });
+  const repairAttempt = normalizeOpenRouterUsage({ prompt_tokens: 300, completion_tokens: 100, cost: 0.05 });
   const merged = mergeNormalizedUsage([firstAttempt, repairAttempt]);
   if (!merged) throw new Error("merge dropped usage");
 
@@ -232,8 +141,8 @@ Deno.test("observed usage selection prefers merged usage and selects each record
 });
 
 Deno.test("observed usage selection prefers completed usage after abort and supports fallbacks", () => {
-  const usage = normalizeOpenAIUsage({ prompt_tokens: 300, completion_tokens: 100 });
-  const completedUsage = normalizeOpenAIUsage({ prompt_tokens: 1000, completion_tokens: 500 });
+  const usage = normalizeOpenRouterUsage({ prompt_tokens: 300, completion_tokens: 100, cost: 0.05 });
+  const completedUsage = normalizeOpenRouterUsage({ prompt_tokens: 1000, completion_tokens: 500, cost: 0.2 });
 
   const abortedSelection = selectObservedUsage({ usage, completedUsage }, true);
   if (abortedSelection !== completedUsage) throw new Error("aborted errors must select completed usage");
@@ -263,11 +172,11 @@ Deno.test("observed usage selection prefers completed usage after abort and supp
 });
 
 Deno.test("incomplete stream usage preserves observations and fails closed without usage", () => {
-  const raw = { prompt_tokens: 100, completion_tokens: 20 };
-  const observed = normalizeOpenAIUsage(raw);
+  const raw = { prompt_tokens: 100, completion_tokens: 20, cost: 0.02 };
+  const observed = normalizeOpenRouterUsage(raw);
   for (const usage of [observed, undefined]) {
     const marked = markIncompleteUsage(usage);
-    const cost = calculateRequestCost({ provider: "openai", model: "gpt-5.4-mini", usage: marked });
+    const cost = calculateRequestCost({ provider: "openrouter", model: "z-ai/glm-5.3-flash", usage: marked });
     if (!marked.incomplete || cost.costUsd !== null) throw new Error("Partial work must remain unknown-cost");
     if (usage && (marked.raw !== raw || cost.inputTokens !== 100 || cost.outputTokens !== 20)) throw new Error("Observed usage changed");
   }
diff --git a/supabase/functions/_shared/cost.ts b/supabase/functions/_shared/cost.ts
index 3c39fc775..c029083b3 100644
--- a/supabase/functions/_shared/cost.ts
+++ b/supabase/functions/_shared/cost.ts
@@ -2,14 +2,6 @@
 // costUsd = null, never an invented estimate. Raw provider usage is preserved
 // so every billing-relevant field stays auditable.
 
-import {
-  PRICING_SNAPSHOT_ID,
-  PRICING_SOURCE_URLS,
-  findModelPricing,
-  type PricingProvider,
-} from "./model-pricing.ts";
-
-export const COST_CALCULATION_VERSION = "cost-calc-v1";
 export const OPENROUTER_COST_CALCULATION_VERSION = "openrouter-usage-v1";
 
 export interface NormalizedUsage {
@@ -60,53 +52,6 @@ function reportedCostOrUndefined(value: unknown): number | undefined {
   return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : undefined;
 }
 
-export function normalizeOpenAIUsage(usage: Record<string, unknown>): NormalizedUsage {
-  const promptDetails = asRecord(usage.prompt_tokens_details);
-  const completionDetails = asRecord(usage.completion_tokens_details);
-  return {
-    inputTokens: intOrUndefined(usage.prompt_tokens),
-    cachedInputTokens: intOrUndefined(promptDetails?.cached_tokens),
-    outputTokens: intOrUndefined(usage.completion_tokens),
-    reasoningOutputTokens: intOrUndefined(completionDetails?.reasoning_tokens),
-    raw: usage,
-  };
-}
-
-export function normalizeAnthropicUsage(usage: Record<string, unknown>): NormalizedUsage {
-  // cache_creation_input_tokens can be a flat count or split by TTL.
-  const creation = usage.cache_creation_input_tokens;
-  let cacheWrite: number | undefined;
-  let cacheWrite1h: number | undefined;
-  if (typeof creation === "number") {
-    cacheWrite = creation;
-  } else if (asRecord(creation)) {
-    const details = creation as Record<string, unknown>;
-    cacheWrite = intOrUndefined(details.ephemeral_5m_input_tokens);
-    cacheWrite1h = intOrUndefined(details.ephemeral_1h_input_tokens);
-  }
-  return {
-    inputTokens: intOrUndefined(usage.input_tokens),
-    cachedInputTokens: intOrUndefined(usage.cache_read_input_tokens),
-    cacheWriteTokens: cacheWrite,
-    cacheWrite1hTokens: cacheWrite1h,
-    outputTokens: intOrUndefined(usage.output_tokens),
-    raw: usage,
-  };
-}
-
-export function normalizeGoogleUsage(usageMetadata: Record<string, unknown>): NormalizedUsage {
-  const candidates = intOrUndefined(usageMetadata.candidatesTokenCount);
-  const thoughts = intOrUndefined(usageMetadata.thoughtsTokenCount);
-  const output = [candidates, thoughts].filter((n): n is number => typeof n === "number");
-  return {
-    inputTokens: intOrUndefined(usageMetadata.promptTokenCount),
-    cachedInputTokens: intOrUndefined(usageMetadata.cachedContentTokenCount),
-    outputTokens: output.length ? output.reduce((a, b) => a + b, 0) : undefined,
-    reasoningOutputTokens: thoughts,
-    raw: usageMetadata,
-  };
-}
-
 export function normalizeOpenRouterUsage(usage: Record<string, unknown>): NormalizedUsage {
   const promptDetails = asRecord(usage.prompt_tokens_details);
   const completionDetails = asRecord(usage.completion_tokens_details);
@@ -121,92 +66,34 @@ export function normalizeOpenRouterUsage(usage: Record<string, unknown>): Normal
   };
 }
 
-function nonNegative(value: number | undefined): number {
-  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
-}
-
-function perMillion(tokens: number, rate: number): number {
-  return (tokens / 1_000_000) * rate;
-}
-
 export function calculateRequestCost(args: {
-  provider: PricingProvider | string;
+  provider: string;
   model: string;
   usage?: NormalizedUsage;
 }): CostResult {
-  const { provider, model, usage } = args;
+  const { usage } = args;
   // Cache writes report the combined 5m + 1h total for storage; raw_usage
   // keeps the exact TTL split for audit.
   const combinedCacheWrite = usage?.cacheWriteTokens !== undefined || usage?.cacheWrite1hTokens !== undefined
     ? (usage?.cacheWriteTokens ?? 0) + (usage?.cacheWrite1hTokens ?? 0)
     : undefined;
 
-  const base: CostResult = {
+  // OpenRouter is the only provider the app routes through, and it reports the
+  // authoritative account charge per response. Incomplete work stays unpriced
+  // rather than publishing a lower bound.
+  const result: CostResult = {
     inputTokens: usage?.inputTokens ?? null,
     cachedInputTokens: usage?.cachedInputTokens ?? null,
     cacheWriteTokens: combinedCacheWrite ?? null,
     outputTokens: usage?.outputTokens ?? null,
     reasoningOutputTokens: usage?.reasoningOutputTokens ?? null,
-    costUsd: null,
-    pricingSnapshotId: PRICING_SNAPSHOT_ID,
-    pricingSourceUrl: PRICING_SOURCE_URLS[provider] ?? null,
-    costCalculationVersion: COST_CALCULATION_VERSION,
+    costUsd: usage?.incomplete ? null : usage?.reportedCostUsd ?? null,
+    pricingSnapshotId: "openrouter-response-usage",
+    pricingSourceUrl: "https://openrouter.ai/docs/cookbook/administration/usage-accounting",
+    costCalculationVersion: OPENROUTER_COST_CALCULATION_VERSION,
   };
-  if (usage?.raw) base.rawUsage = usage.raw;
-
-  if (provider === "openrouter") {
-    base.pricingSnapshotId = "openrouter-response-usage";
-    base.pricingSourceUrl = "https://openrouter.ai/docs/cookbook/administration/usage-accounting";
-    base.costCalculationVersion = OPENROUTER_COST_CALCULATION_VERSION;
-    base.costUsd = usage?.incomplete ? null : usage?.reportedCostUsd ?? null;
-    return base;
-  }
-
-  // Preserve observed token fields and raw audit data, but never publish a
-  // lower-bound cost when cancelled work may have consumed unobserved tokens.
-  if (usage?.incomplete) return base;
-
-  if (!usage || !usage.inputTokens && !usage.outputTokens) return base;
-
-  const pricing = findModelPricing(provider, model);
-  if (!pricing) {
-    base.pricingSourceUrl = null;
-    return base;
-  }
-
-  const longContext = typeof pricing.longContextThresholdTokens === "number" &&
-    (usage.inputTokens ?? 0) > pricing.longContextThresholdTokens;
-
-  const inputRate = longContext ? pricing.longContextInputPer1m ?? pricing.inputPer1m : pricing.inputPer1m;
-  const outputRate = longContext ? pricing.longContextOutputPer1m ?? pricing.outputPer1m : pricing.outputPer1m;
-  const cachedRate = longContext
-    ? pricing.longContextCachedInputPer1m ?? pricing.cachedInputPer1m
-    : pricing.cachedInputPer1m;
-  // Unknown cached rate must not bill at $0; charge standard input instead.
-  const effectiveCachedRate = typeof cachedRate === "number" ? cachedRate : inputRate;
-
-  let cost = 0;
-  const inputTokens = nonNegative(usage.inputTokens);
-
-  if (provider === "anthropic") {
-    // Anthropic reports cache reads/writes separately from base input.
-    cost += perMillion(inputTokens, inputRate);
-    cost += perMillion(nonNegative(usage.cachedInputTokens), effectiveCachedRate);
-    // Unpublished write rates fall back to standard input, never $0.
-    cost += perMillion(nonNegative(usage.cacheWriteTokens), nonNegative(pricing.cacheWritePer1m ?? inputRate));
-    cost += perMillion(nonNegative(usage.cacheWrite1hTokens), nonNegative(pricing.cacheWrite1hPer1m ?? inputRate));
-  } else {
-    // OpenAI and Google include cached tokens inside the reported prompt count.
-    const cached = Math.min(nonNegative(usage.cachedInputTokens), inputTokens);
-    const uncachedInput = inputTokens - cached;
-    cost += perMillion(uncachedInput, inputRate);
-    cost += perMillion(cached, effectiveCachedRate);
-  }
-
-  cost += perMillion(nonNegative(usage.outputTokens), outputRate);
-
-  base.costUsd = Number.isFinite(cost) ? cost : null;
-  return base;
+  if (usage?.raw) result.rawUsage = usage.raw;
+  return result;
 }
 
 /**
diff --git a/supabase/functions/_shared/entitlements.test.ts b/supabase/functions/_shared/entitlements.test.ts
new file mode 100644
index 000000000..cc4c79baf
--- /dev/null
+++ b/supabase/functions/_shared/entitlements.test.ts
@@ -0,0 +1,142 @@
+// Entitlement behaviour that ai/ and ai-stream/ now share. The two copies had
+// drifted on the gift-trial fallback; these tests pin the surviving semantics.
+
+for (const [key, value] of Object.entries({
+  SUPABASE_URL: "https://supabase.test",
+  SUPABASE_SERVICE_ROLE_KEY: "test-service-role-key",
+})) Deno.env.set(key, value);
+
+const { getSubscriptionInfo, checkRateLimit } = await import("./entitlements.ts");
+
+function json(body: unknown, status = 200): Response {
+  return Response.json(body, { status });
+}
+
+const DAY = 24 * 60 * 60 * 1000;
+const future = () => new Date(Date.now() + DAY).toISOString();
+const past = () => new Date(Date.now() - DAY).toISOString();
+
+interface Routes {
+  user_settings?: unknown;
+  user_roles?: unknown;
+  subscriptions?: unknown;
+  rate_limits?: unknown;
+  quota?: unknown;
+}
+
+async function withSupabase<T>(routes: Routes, run: () => Promise<T>): Promise<T> {
+  const originalFetch = globalThis.fetch;
+  globalThis.fetch = (async (input: Request | URL | string) => {
+    const url = new URL(input instanceof Request ? input.url : String(input));
+    if (url.pathname.includes("/rest/v1/user_settings")) return json(routes.user_settings ?? null);
+    if (url.pathname.includes("/rest/v1/user_roles")) return json(routes.user_roles ?? { role: "user" });
+    if (url.pathname.includes("/rest/v1/subscriptions")) return json(routes.subscriptions ?? []);
+    if (url.pathname.includes("/rest/v1/rate_limits")) return json(routes.rate_limits ?? null);
+    if (url.pathname.includes("/rpc/consume_daily_quota")) return json(routes.quota ?? [{ allowed: true, current_count: 1 }]);
+    throw new Error(`Unexpected request: ${url}`);
+  }) as typeof fetch;
+  try {
+    return await run();
+  } finally {
+    globalThis.fetch = originalFetch;
+  }
+}
+
+function assertEquals(actual: unknown, expected: unknown, message: string) {
+  if (actual !== expected) throw new Error(`${message}: expected ${expected}, got ${actual}`);
+}
+
+Deno.test("a missing settings row fails closed instead of granting a trial", async () => {
+  await withSupabase({ user_settings: null }, async () => {
+    const info = await getSubscriptionInfo("user-1");
+    assertEquals(info.tier, "expired", "tier");
+    assertEquals(info.dailyLimit, 0, "dailyLimit");
+    assertEquals(info.canAccessProModels, false, "canAccessProModels");
+  });
+});
+
+Deno.test("an unknown tier still honours an active gift trial", async () => {
+  // ai/ applied this fallback, ai-stream/ did not. The shared module keeps the
+  // permissive-but-limited branch so a gifted trial is not silently voided.
+  await withSupabase({
+    user_settings: { subscription_tier: "something_new", daily_limit_override: null, trial_ends_at: future(), grace_period_ends_at: null },
+  }, async () => {
+    const info = await getSubscriptionInfo("user-1");
+    assertEquals(info.tier, "trial", "tier");
+    assertEquals(info.dailyLimit, 5, "dailyLimit");
+    assertEquals(info.canAccessProModels, false, "canAccessProModels");
+  });
+});
+
+Deno.test("a lapsed pro subscription falls back to an active gift trial", async () => {
+  await withSupabase({
+    user_settings: { subscription_tier: "pro", daily_limit_override: null, trial_ends_at: future(), grace_period_ends_at: past() },
+    subscriptions: [],
+  }, async () => {
+    const info = await getSubscriptionInfo("user-1");
+    assertEquals(info.tier, "trial", "tier");
+    assertEquals(info.canAccessProModels, false, "canAccessProModels");
+  });
+});
+
+Deno.test("a promo grace period grants pro model access", async () => {
+  await withSupabase({
+    user_settings: { subscription_tier: "pro", daily_limit_override: null, trial_ends_at: null, grace_period_ends_at: future() },
+  }, async () => {
+    const info = await getSubscriptionInfo("user-1");
+    assertEquals(info.tier, "pro", "tier");
+    assertEquals(info.dailyLimit, 50, "dailyLimit");
+    assertEquals(info.canAccessProModels, true, "canAccessProModels");
+  });
+});
+
+Deno.test("daily_limit_override wins over the tier default", async () => {
+  await withSupabase({
+    user_settings: { subscription_tier: "trial", daily_limit_override: 3, trial_ends_at: future(), grace_period_ends_at: null },
+  }, async () => {
+    assertEquals((await getSubscriptionInfo("user-1")).dailyLimit, 3, "dailyLimit");
+  });
+});
+
+Deno.test("banned users are refused before any quota is consumed", async () => {
+  let quotaConsumed = false;
+  await withSupabase({
+    user_roles: { role: "banned" },
+    get quota() { quotaConsumed = true; return [{ allowed: true, current_count: 1 }]; },
+  }, async () => {
+    const result = await checkRateLimit("user-1", "openai/gpt-5.6-luna");
+    assertEquals(result.allowed, false, "allowed");
+    assertEquals(result.code, "banned", "code");
+    assertEquals(result.statusCode, 403, "statusCode");
+    assertEquals(quotaConsumed, false, "quota must not be consumed for a banned user");
+  });
+});
+
+Deno.test("anonymous callers bypass the rate limit", async () => {
+  const result = await checkRateLimit(null);
+  assertEquals(result.allowed, true, "allowed");
+});
+
+Deno.test("an exhausted quota reports the limit-reached code", async () => {
+  await withSupabase({
+    user_settings: { subscription_tier: "trial", daily_limit_override: null, trial_ends_at: future(), grace_period_ends_at: null },
+    quota: [{ allowed: false, current_count: 5 }],
+  }, async () => {
+    const result = await checkRateLimit("user-1");
+    assertEquals(result.allowed, false, "allowed");
+    assertEquals(result.code, "limit_reached", "code");
+    assertEquals(result.limit, 5, "limit");
+    assertEquals(result.current, 5, "current");
+  });
+});
+
+Deno.test("expired access is refused with the trial-expired code", async () => {
+  await withSupabase({
+    user_settings: { subscription_tier: "trial", daily_limit_override: null, trial_ends_at: past(), grace_period_ends_at: null },
+  }, async () => {
+    const result = await checkRateLimit("user-1");
+    assertEquals(result.allowed, false, "allowed");
+    assertEquals(result.code, "trial_expired", "code");
+    assertEquals(result.statusCode, 402, "statusCode");
+  });
+});
diff --git a/supabase/functions/_shared/entitlements.ts b/supabase/functions/_shared/entitlements.ts
new file mode 100644
index 000000000..abcf52fda
--- /dev/null
+++ b/supabase/functions/_shared/entitlements.ts
@@ -0,0 +1,241 @@
+// Subscription gating, rate limiting, and usage logging shared by the AI
+// endpoints. Previously copy-pasted into ai/ and ai-stream/, where the two
+// copies had already drifted apart on trial handling.
+
+import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
+import { calculateRequestCost, type CostResult, type NormalizedUsage } from "./cost.ts";
+import {
+  AUTO_PRO,
+  getModelCatalogEntry,
+  isAutoModelSelection,
+  type ModelSelection,
+} from "./model-catalog.ts";
+
+const supabase = createClient(
+  Deno.env.get("SUPABASE_URL")!,
+  Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!,
+);
+
+export interface RateLimitResult {
+  allowed: boolean;
+  canAccessProModels?: boolean;
+  reason?: string;
+  limit?: number;
+  current?: number;
+  code?: "limit_reached" | "trial_expired" | "banned" | "upgrade_required";
+  statusCode?: number;
+}
+
+export interface SubscriptionInfo {
+  tier: string; // 'trial' | 'pro' | 'legacy_free' | 'expired'
+  dailyLimit: number;
+  canAccessProModels: boolean;
+  trialEndsAt: string | null;
+  gracePeriodEndsAt: string | null;
+}
+
+export async function checkUserBanned(userId: string): Promise<boolean> {
+  const { data } = await supabase
+    .from("user_roles")
+    .select("role")
+    .eq("user_id", userId)
+    .single();
+  return data?.role === "banned";
+}
+
+export async function getSubscriptionInfo(userId: string): Promise<SubscriptionInfo> {
+  const { data: user } = await supabase
+    .from("user_settings")
+    .select("subscription_tier, daily_limit_override, trial_ends_at, grace_period_ends_at")
+    .eq("user_id", userId)
+    .single();
+
+  // A settings row is provisioned for every account by the on_auth_user_created
+  // trigger and can no longer be deleted by the client (see 20260819000000
+  // security_hardening.sql). A missing row is therefore untrusted, not a new
+  // user — fail closed instead of granting a fresh trial.
+  if (!user) return { tier: "expired", dailyLimit: 0, canAccessProModels: false, trialEndsAt: null, gracePeriodEndsAt: null };
+
+  const tier = user.subscription_tier || "trial";
+  const limitOrDefault = (defaultLimit: number) => user.daily_limit_override ?? defaultLimit;
+  const now = new Date();
+  const expired = { tier: "expired", dailyLimit: limitOrDefault(0), canAccessProModels: false, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
+  const activeGiftTrial = user.trial_ends_at ? new Date(user.trial_ends_at) : null;
+  const giftTrialInfo = activeGiftTrial && now < activeGiftTrial
+    ? { tier: "trial", dailyLimit: limitOrDefault(5), canAccessProModels: false, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at }
+    : null;
+
+  // Legacy free users in grace period get pro-level access
+  if (tier === "legacy_free") {
+    const graceEnd = user.grace_period_ends_at ? new Date(user.grace_period_ends_at) : null;
+    if (graceEnd && now < graceEnd) {
+      return { tier: "legacy_free", dailyLimit: limitOrDefault(50), canAccessProModels: true, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
+    }
+    if (giftTrialInfo) return giftTrialInfo;
+    // Grace period expired — treat as expired
+    return expired;
+  }
+
+  // Pro subscribers or promo Pro access. Stripe Pro must have an active
+  // subscription period; promo Pro uses grace_period_ends_at, with lifetime
+  // promo codes represented by a far-future date.
+  if (tier === "pro") {
+    const promoEnd = user.grace_period_ends_at ? new Date(user.grace_period_ends_at) : null;
+    if (promoEnd && now < promoEnd) {
+      return { tier: "pro", dailyLimit: limitOrDefault(50), canAccessProModels: true, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
+    }
+
+    const { data: subscriptions } = await supabase
+      .from("subscriptions")
+      .select("status, current_period_end")
+      .eq("user_id", userId)
+      .in("status", ["active", "trialing"])
+      .order("current_period_end", { ascending: false })
+      .limit(1);
+
+    const activeSubscription = subscriptions?.find((sub) =>
+      sub.current_period_end && new Date(sub.current_period_end) > now
+    );
+
+    if (activeSubscription) {
+      return { tier: "pro", dailyLimit: limitOrDefault(50), canAccessProModels: true, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
+    }
+
+    if (giftTrialInfo) return giftTrialInfo;
+    return expired;
+  }
+
+  // Trial users
+  if (tier === "trial") {
+    const trialEnd = user.trial_ends_at ? new Date(user.trial_ends_at) : null;
+    if (trialEnd && now < trialEnd) {
+      return { tier: "trial", dailyLimit: limitOrDefault(5), canAccessProModels: false, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
+    }
+    // Trial expired
+    return expired;
+  }
+
+  if (giftTrialInfo) return giftTrialInfo;
+
+  // Expired
+  return expired;
+}
+
+export async function getConfiguredDailyLimit(userId: string, fallbackLimit: number): Promise<number> {
+  const { data: userLimit } = await supabase
+    .from("rate_limits")
+    .select("limit_value")
+    .eq("user_id", userId)
+    .eq("limit_type", "daily_requests")
+    .order("updated_at", { ascending: false })
+    .limit(1)
+    .maybeSingle();
+
+  if (typeof userLimit?.limit_value === "number") return userLimit.limit_value;
+
+  const { data: globalLimit } = await supabase
+    .from("rate_limits")
+    .select("limit_value")
+    .is("user_id", null)
+    .eq("limit_type", "daily_requests")
+    .order("updated_at", { ascending: false })
+    .limit(1)
+    .maybeSingle();
+
+  return typeof globalLimit?.limit_value === "number" ? globalLimit.limit_value : fallbackLimit;
+}
+
+export async function checkRateLimit(userId: string | null, model?: ModelSelection): Promise<RateLimitResult> {
+  if (!userId) return { allowed: true }; // Anonymous users not rate limited (for now)
+
+  try {
+    if (await checkUserBanned(userId)) {
+      return { allowed: false, reason: "Your account has been suspended. Please contact support.", code: "banned", statusCode: 403 };
+    }
+
+    const sub = await getSubscriptionInfo(userId);
+    const dailyLimit = sub.tier === "expired" && sub.dailyLimit === 0
+      ? 0
+      : await getConfiguredDailyLimit(userId, sub.dailyLimit);
+
+    // Trial/access expired
+    if (sub.tier === "expired" && dailyLimit === 0) {
+      return { allowed: false, reason: "Your free trial has ended. Upgrade to Pro to continue using DebateLab.", code: "trial_expired", limit: 0, current: 0, statusCode: 402 };
+    }
+
+    if (model && (model === AUTO_PRO || (!isAutoModelSelection(model) && getModelCatalogEntry(model)?.isProOnly)) && !sub.canAccessProModels) {
+      return { allowed: false, reason: "This model requires a Pro subscription. Upgrade to unlock advanced models.", code: "upgrade_required", statusCode: 403 };
+    }
+
+    if (dailyLimit <= 0) {
+      return { allowed: false, reason: "Your daily request limit is currently set to zero. Contact support if this seems wrong.", code: "limit_reached", limit: 0, current: 0, statusCode: 402 };
+    }
+
+    // Atomically reserve today's request slot server-side so concurrent requests
+    // can't race past the limit (see consume_daily_quota in the security hardening migration).
+    const { data: quota, error: quotaError } = await supabase.rpc("consume_daily_quota", {
+      p_user_id: userId,
+      p_limit: dailyLimit,
+    });
+
+    if (quotaError) {
+      console.error("[RATE LIMIT] Quota reservation failed:", quotaError);
+      return { allowed: false, reason: "Unable to verify your quota. Please try again.", statusCode: 500 };
+    }
+
+    const quotaRow = Array.isArray(quota) ? quota[0] : quota;
+    const current = quotaRow?.current_count ?? 0;
+
+    if (!quotaRow?.allowed) {
+      return { allowed: false, reason: `You've used all ${dailyLimit} of your daily requests. ${sub.tier === "pro" ? "Limit resets at midnight UTC." : "Upgrade to Pro for 50 daily requests."}`, code: "limit_reached", limit: dailyLimit, current, statusCode: 402 };
+    }
+
+    return { allowed: true, limit: dailyLimit, current, canAccessProModels: sub.canAccessProModels };
+  } catch (err) {
+    console.error("[RATE LIMIT] Check failed:", err);
+    return { allowed: false, reason: "Unable to verify your account access. Please try again.", statusCode: 500 };
+  }
+}
+
+export async function logUsage(
+  userId: string | null,
+  feature: string,
+  provider: string,
+  model: string,
+  usage?: NormalizedUsage,
+  latencyMs?: number,
+  status: string = "success",
+  errorCode?: string,
+) {
+  try {
+    const cost: CostResult = usage
+      ? calculateRequestCost({ provider, model, usage })
+      : calculateRequestCost({ provider, model });
+
+    const row: Record<string, unknown> = {
+      user_id: userId,
+      feature,
+      provider,
+      model,
+      input_tokens: cost.inputTokens,
+      output_tokens: cost.outputTokens,
+      latency_ms: latencyMs,
+      status,
+      error_code: errorCode,
+      cost_usd: cost.costUsd,
+      // Audit columns added by migration 20260822000000_ai_request_cost_audit.sql.
+      cached_input_tokens: cost.cachedInputTokens,
+      cache_write_tokens: cost.cacheWriteTokens,
+      reasoning_output_tokens: cost.reasoningOutputTokens,
+      pricing_snapshot_id: cost.pricingSnapshotId,
+      pricing_source_url: cost.pricingSourceUrl,
+      cost_calculation_version: cost.costCalculationVersion,
+      raw_usage: cost.rawUsage ?? null,
+    };
+
+    const { error } = await supabase.from("ai_requests").insert(row);
+    if (error) throw error;
+  } catch (err) {
+    console.warn("[USAGE LOG] Failed to log:", err);
+  }
+}
diff --git a/supabase/functions/_shared/model-pricing.ts b/supabase/functions/_shared/model-pricing.ts
deleted file mode 100644
index 37f8b797c..000000000
--- a/supabase/functions/_shared/model-pricing.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-// Normalized model pricing snapshot, sourced from official provider pricing pages.
-// Regenerate with `npx tsx scripts/update-model-pricing.ts`; see docs/pricing-snapshots/metadata.json
-// for retrieval timestamps, content hashes, and per-model findings.
-
-export const PRICING_SNAPSHOT_ID = "official-docs-2026-09-19";
-
-export const PRICING_SOURCE_URLS: Record<string, string> = {
-  openai: "https://platform.openai.com/docs/pricing",
-  anthropic: "https://platform.claude.com/docs/en/about-claude/pricing",
-  google: "https://ai.google.dev/gemini-api/docs/pricing",
-};
-
-export type PricingProvider = "openai" | "anthropic" | "google";
-
-export interface ModelPricing {
-  provider: PricingProvider;
-  model: string;
-  currency: "USD";
-  /** Standard input price per 1M tokens. */
-  inputPer1m: number;
-  /** Output price per 1M tokens (includes reasoning/thinking tokens wherever the provider bills them as output). */
-  outputPer1m: number;
-  /** Price per 1M tokens for cached input reads: OpenAI cached input, Anthropic cache hits, Google context caching. */
-  cachedInputPer1m?: number;
-  /** Anthropic 5-minute cache write price per 1M tokens. */
-  cacheWritePer1m?: number;
-  /** Anthropic 1-hour cache write price per 1M tokens. */
-  cacheWrite1hPer1m?: number;
-  /** Prompt size above which the long-context rates apply. */
-  longContextThresholdTokens?: number;
-  longContextInputPer1m?: number;
-  longContextCachedInputPer1m?: number;
-  longContextOutputPer1m?: number;
-}
-
-// Every entry below was transcribed from the official pricing page captured in
-// docs/pricing-snapshots/ on 2026-09-19 (snapshot official-docs-2026-09-19). Models absent from this list are
-// unknown-priced on purpose: the calculator fails closed with costUsd=null.
-// gemini-3.1-flash-lite-preview has no exact entry on the official page at
-// retrieval time, so it is intentionally missing here.
-export const MODEL_PRICING: ModelPricing[] = [
-  {
-    provider: "openai",
-    model: "gpt-5.5",
-    currency: "USD",
-    inputPer1m: 5,
-    outputPer1m: 30,
-    cachedInputPer1m: 0.5,
-    longContextThresholdTokens: 272_000,
-    longContextInputPer1m: 10,
-    longContextCachedInputPer1m: 1,
-    longContextOutputPer1m: 45,
-  },
-  {
-    provider: "openai",
-    model: "gpt-5.4",
-    currency: "USD",
-    inputPer1m: 2.5,
-    outputPer1m: 15,
-    cachedInputPer1m: 0.25,
-    longContextThresholdTokens: 272_000,
-    longContextInputPer1m: 5,
-    longContextCachedInputPer1m: 0.5,
-    longContextOutputPer1m: 22.5,
-  },
-  { provider: "openai", model: "gpt-5.4-mini", currency: "USD", inputPer1m: 0.75, outputPer1m: 4.5, cachedInputPer1m: 0.075 },
-  { provider: "openai", model: "gpt-4o", currency: "USD", inputPer1m: 2.5, outputPer1m: 10, cachedInputPer1m: 1.25 },
-  { provider: "openai", model: "gpt-4o-mini", currency: "USD", inputPer1m: 0.15, outputPer1m: 0.6, cachedInputPer1m: 0.075 },
-  {
-    provider: "anthropic",
-    model: "claude-opus-4-7",
-    currency: "USD",
-    inputPer1m: 5,
-    outputPer1m: 25,
-    cachedInputPer1m: 0.5,
-    cacheWritePer1m: 6.25,
-    cacheWrite1hPer1m: 10,
-  },
-  {
-    provider: "anthropic",
-    model: "claude-sonnet-4-6",
-    currency: "USD",
-    inputPer1m: 3,
-    outputPer1m: 15,
-    cachedInputPer1m: 0.3,
-    cacheWritePer1m: 3.75,
-    cacheWrite1hPer1m: 6,
-  },
-  {
-    provider: "anthropic",
-    model: "claude-haiku-4-5-20251001",
-    currency: "USD",
-    inputPer1m: 1,
-    outputPer1m: 5,
-    cachedInputPer1m: 0.1,
-    cacheWritePer1m: 1.25,
-    cacheWrite1hPer1m: 2,
-  },
-  {
-    provider: "google",
-    model: "gemini-3.1-pro-preview",
-    currency: "USD",
-    inputPer1m: 2,
-    outputPer1m: 12,
-    cachedInputPer1m: 0.2,
-    longContextThresholdTokens: 200_000,
-    longContextInputPer1m: 4,
-    longContextCachedInputPer1m: 0.4,
-    longContextOutputPer1m: 18,
-  },
-  { provider: "google", model: "gemini-3-flash-preview", currency: "USD", inputPer1m: 0.5, outputPer1m: 3, cachedInputPer1m: 0.05 },
-  { provider: "google", model: "gemini-3.5-flash", currency: "USD", inputPer1m: 1.5, outputPer1m: 9, cachedInputPer1m: 0.15 },
-];
-
-export function findModelPricing(provider: string, model: string): ModelPricing | null {
-  return MODEL_PRICING.find((entry) => entry.provider === provider && entry.model === model) ?? null;
-}
diff --git a/supabase/functions/_shared/native-cors.test.ts b/supabase/functions/_shared/native-cors.test.ts
deleted file mode 100644
index cbee47cdf..000000000
--- a/supabase/functions/_shared/native-cors.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { assertStringIncludes } from "jsr:@std/assert@1.0.19";
-
-const browserCalledFunctions = [
-  "admin",
-  "announcements",
-  "ai",
-  "ai-stream",
-  "create-checkout",
-  "create-portal",
-  "export-gdoc",
-  "import-source",
-  "redeem-promo",
-  "share",
-];
-
-for (const functionName of browserCalledFunctions) {
-  Deno.test(`${functionName} allows the Capacitor WebView origin`, async () => {
-    const source = await Deno.readTextFile(new URL(`../${functionName}/index.ts`, import.meta.url));
-    assertStringIncludes(source, '"capacitor://localhost"');
-  });
-}
-
-for (const functionName of ["admin", "announcements"]) {
-  Deno.test(`${functionName} allows the isolated staging browser origin`, async () => {
-    const source = await Deno.readTextFile(new URL(`../${functionName}/index.ts`, import.meta.url));
-    assertStringIncludes(source, '"http://127.0.0.1:18080"');
-  });
-}
-
-Deno.test("native share links use the public HTTPS origin", async () => {
-  const source = await Deno.readTextFile(new URL("../share/index.ts", import.meta.url));
-  assertStringIncludes(source, 'const PUBLIC_WEB_APP_ORIGIN = "https://debate.pi-stack.org";');
-  assertStringIncludes(source, "shareUrl: `${PUBLIC_WEB_APP_ORIGIN}/share/${data.share_code}`");
-});
diff --git a/supabase/functions/admin/index.ts b/supabase/functions/admin/index.ts
index 04b878a51..52a3716f4 100644
--- a/supabase/functions/admin/index.ts
+++ b/supabase/functions/admin/index.ts
@@ -8,26 +8,10 @@ import {
 } from "../_shared/announcements.ts";
 import { generateDemoCode, hashDemoCode, isCreatableDemoRole } from "../_shared/demo-code.ts";
 import { collectAdminUsagePages, getKnownCost, hasUnknownCost, isNonAiActivity } from "../_shared/admin-cost.ts";
+import { getCorsHeaders } from "../_shared/cors.ts";
 
 // SECURITY: Allow specific origins for CORS
-const ALLOWED_ORIGINS = [
-    "https://debate.pi-stack.org",
-    "http://localhost:8080",
-    "http://127.0.0.1:8080",
-    "http://127.0.0.1:18080",
-    "http://localhost:5173",
-    "http://127.0.0.1:54321",
-    "capacitor://localhost"
-];
-
-function getCorsHeaders(origin: string | null) {
-    const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-    return {
-        "Access-Control-Allow-Origin": allowedOrigin,
-        "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-        "Access-Control-Allow-Methods": "POST, GET, OPTIONS",
-    };
-}
+
 
 const supabaseUrl = Deno.env.get("SUPABASE_URL")!;
 const supabaseServiceKey = Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!;
@@ -104,7 +88,7 @@ async function assertCurrentAdmin(userId: string) {
 
 Deno.serve(async (req) => {
     const origin = req.headers.get("origin");
-    const corsHeaders = getCorsHeaders(origin);
+    const corsHeaders = getCorsHeaders(origin, { methods: "POST, GET, OPTIONS" });
 
     if (req.method === "OPTIONS") {
         return new Response("ok", { headers: corsHeaders });
diff --git a/supabase/functions/ai-stream/index.ts b/supabase/functions/ai-stream/index.ts
index 7de16a2bc..e9ed522be 100644
--- a/supabase/functions/ai-stream/index.ts
+++ b/supabase/functions/ai-stream/index.ts
@@ -1,37 +1,17 @@
 // Supabase Edge Function: streaming Ask proxy for DebateLab.
 // Keeps provider keys server-side and uses SSE for progressive UI rendering.
 
-const ALLOWED_ORIGINS = [
-  "https://debate.pi-stack.org",
-  "http://localhost:8080",
-  "http://127.0.0.1:8080",
-  "http://localhost:18080",
-  "http://127.0.0.1:18080",
-  "http://localhost:5173",
-  "http://127.0.0.1:54321",
-  "capacitor://localhost",
-];
-
-function getCorsHeaders(origin: string | null) {
-  const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-  return {
-    "Access-Control-Allow-Origin": allowedOrigin,
-    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-    "Access-Control-Allow-Methods": "POST, OPTIONS",
-  };
-}
-
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
 import { getAskModeGuidance } from "../ai/prompt-builder.ts";
 import { isAskStreamingModeAllowed, validateControlInput } from "../_shared/control-enforcement.ts";
 import { buildStreamingAskSystemPrompt } from "../_shared/prompts.ts";
 import {
-  calculateRequestCost,
-  type CostResult,
   markIncompleteUsage,
   normalizeOpenRouterUsage,
   type NormalizedUsage,
 } from "../_shared/cost.ts";
+import { getCorsHeaders } from "../_shared/cors.ts";
+import { checkRateLimit, logUsage } from "../_shared/entitlements.ts";
 import {
   AUTO_PRO,
   DEFAULT_MODEL,
@@ -55,22 +35,6 @@ type ChatMessage = {
   content: string;
 };
 
-type RateLimitResult = {
-  allowed: boolean;
-  canAccessProModels?: boolean;
-  reason?: string;
-  limit?: number;
-  current?: number;
-  code?: "limit_reached" | "trial_expired" | "banned" | "upgrade_required";
-  statusCode?: number;
-};
-
-type SubscriptionInfo = {
-  tier: string;
-  dailyLimit: number;
-  canAccessProModels: boolean;
-};
-
 const supabaseUrl = Deno.env.get("SUPABASE_URL")!;
 const supabaseServiceKey = Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!;
 const supabase = createClient(supabaseUrl, supabaseServiceKey);
@@ -116,183 +80,6 @@ export function buildMessages(message: string, history: ChatMessage[], mode: str
   ];
 }
 
-async function checkUserBanned(userId: string): Promise<boolean> {
-  const { data } = await supabase
-    .from("user_roles")
-    .select("role")
-    .eq("user_id", userId)
-    .single();
-  return data?.role === "banned";
-}
-
-async function getSubscriptionInfo(userId: string): Promise<SubscriptionInfo> {
-  const { data: user } = await supabase
-    .from("user_settings")
-    .select("subscription_tier, daily_limit_override, trial_ends_at, grace_period_ends_at")
-    .eq("user_id", userId)
-    .single();
-
-  // A settings row is provisioned for every account on signup and can no
-  // longer be deleted by the client (see 20260819000000 security_hardening.sql).
-  // A missing row is untrusted, not a new user — fail closed.
-  if (!user) return { tier: "expired", dailyLimit: 0, canAccessProModels: false };
-
-  const tier = user.subscription_tier || "trial";
-  const limitOrDefault = (defaultLimit: number) => user.daily_limit_override ?? defaultLimit;
-  const now = new Date();
-  const trialEnd = user.trial_ends_at ? new Date(user.trial_ends_at) : null;
-  const graceEnd = user.grace_period_ends_at ? new Date(user.grace_period_ends_at) : null;
-
-  if (tier === "legacy_free") {
-    if (graceEnd && now < graceEnd) return { tier, dailyLimit: limitOrDefault(50), canAccessProModels: true };
-    if (trialEnd && now < trialEnd) return { tier: "trial", dailyLimit: limitOrDefault(5), canAccessProModels: false };
-    return { tier: "expired", dailyLimit: limitOrDefault(0), canAccessProModels: false };
-  }
-
-  if (tier === "pro") {
-    if (graceEnd && now < graceEnd) return { tier, dailyLimit: limitOrDefault(50), canAccessProModels: true };
-
-    const { data: subscriptions } = await supabase
-      .from("subscriptions")
-      .select("status, current_period_end")
-      .eq("user_id", userId)
-      .in("status", ["active", "trialing"])
-      .order("current_period_end", { ascending: false })
-      .limit(1);
-
-    const activeSubscription = subscriptions?.find((sub) =>
-      sub.current_period_end && new Date(sub.current_period_end) > now
-    );
-    if (activeSubscription) return { tier, dailyLimit: limitOrDefault(50), canAccessProModels: true };
-    if (trialEnd && now < trialEnd) return { tier: "trial", dailyLimit: limitOrDefault(5), canAccessProModels: false };
-    return { tier: "expired", dailyLimit: limitOrDefault(0), canAccessProModels: false };
-  }
-
-  if (tier === "trial") {
-    if (trialEnd && now < trialEnd) return { tier, dailyLimit: limitOrDefault(5), canAccessProModels: false };
-    return { tier: "expired", dailyLimit: limitOrDefault(0), canAccessProModels: false };
-  }
-
-  return { tier: "expired", dailyLimit: limitOrDefault(0), canAccessProModels: false };
-}
-
-async function getConfiguredDailyLimit(userId: string, fallbackLimit: number): Promise<number> {
-  const { data: userLimit } = await supabase
-    .from("rate_limits")
-    .select("limit_value")
-    .eq("user_id", userId)
-    .eq("limit_type", "daily_requests")
-    .order("updated_at", { ascending: false })
-    .limit(1)
-    .maybeSingle();
-
-  if (typeof userLimit?.limit_value === "number") return userLimit.limit_value;
-
-  const { data: globalLimit } = await supabase
-    .from("rate_limits")
-    .select("limit_value")
-    .is("user_id", null)
-    .eq("limit_type", "daily_requests")
-    .order("updated_at", { ascending: false })
-    .limit(1)
-    .maybeSingle();
-
-  return typeof globalLimit?.limit_value === "number" ? globalLimit.limit_value : fallbackLimit;
-}
-
-async function checkRateLimit(userId: string, model: ModelSelection): Promise<RateLimitResult> {
-  try {
-    if (await checkUserBanned(userId)) {
-      return { allowed: false, reason: "Your account has been suspended. Please contact support.", code: "banned", statusCode: 403 };
-    }
-
-    const sub = await getSubscriptionInfo(userId);
-    const dailyLimit = sub.tier === "expired" && sub.dailyLimit === 0
-      ? 0
-      : await getConfiguredDailyLimit(userId, sub.dailyLimit);
-
-    if (sub.tier === "expired" && dailyLimit === 0) {
-      return { allowed: false, reason: "Your free trial has ended. Upgrade to Pro to continue using DebateLab.", code: "trial_expired", limit: 0, current: 0, statusCode: 402 };
-    }
-
-    if ((model === AUTO_PRO || (!isAutoModelSelection(model) && getModelCatalogEntry(model)?.isProOnly)) && !sub.canAccessProModels) {
-      return { allowed: false, reason: "This model requires a Pro subscription. Upgrade to unlock advanced models.", code: "upgrade_required", statusCode: 403 };
-    }
-
-    if (dailyLimit <= 0) {
-      return { allowed: false, reason: "Your daily request limit is currently set to zero. Contact support if this seems wrong.", code: "limit_reached", limit: 0, current: 0, statusCode: 402 };
-    }
-
-    // Atomically reserve today's request slot server-side so concurrent requests
-    // can't race past the limit (see consume_daily_quota in the security hardening migration).
-    const { data: quota, error: quotaError } = await supabase.rpc("consume_daily_quota", {
-      p_user_id: userId,
-      p_limit: dailyLimit,
-    });
-
-    if (quotaError) {
-      console.error("[AI STREAM] Quota reservation failed:", quotaError);
-      return { allowed: false, reason: "Unable to verify your quota. Please try again.", statusCode: 500 };
-    }
-
-    const quotaRow = Array.isArray(quota) ? quota[0] : quota;
-    const current = quotaRow?.current_count ?? 0;
-    if (!quotaRow?.allowed) {
-      return { allowed: false, reason: `You've used all ${dailyLimit} of your daily requests. ${sub.tier === "pro" ? "Limit resets at midnight UTC." : "Upgrade to Pro for 50 daily requests."}`, code: "limit_reached", limit: dailyLimit, current, statusCode: 402 };
-    }
-
-    return { allowed: true, limit: dailyLimit, current, canAccessProModels: sub.canAccessProModels };
-  } catch (err) {
-    console.error("[AI STREAM] Rate-limit check failed:", err);
-    return { allowed: false, reason: "Unable to verify your account access. Please try again.", statusCode: 500 };
-  }
-}
-
-async function logUsage(
-  userId: string,
-  provider: string,
-  model: string,
-  usage?: NormalizedUsage,
-  latencyMs?: number,
-  status = "success",
-  errorCode?: string,
-  feature = "ask",
-) {
-  try {
-    const cost: CostResult = usage
-      ? calculateRequestCost({ provider, model, usage })
-      : calculateRequestCost({ provider, model });
-
-    const row: Record<string, unknown> = {
-      user_id: userId,
-      feature,
-      provider,
-      model,
-      input_tokens: cost.inputTokens,
-      output_tokens: cost.outputTokens,
-      latency_ms: latencyMs,
-      status,
-      error_code: errorCode,
-      cost_usd: cost.costUsd,
-    };
-
-    // Audit columns added by migration 20260822000000_ai_request_cost_audit.sql.
-    const auditFields: Record<string, unknown> = {
-      cached_input_tokens: cost.cachedInputTokens,
-      cache_write_tokens: cost.cacheWriteTokens,
-      reasoning_output_tokens: cost.reasoningOutputTokens,
-      pricing_snapshot_id: cost.pricingSnapshotId,
-      pricing_source_url: cost.pricingSourceUrl,
-      cost_calculation_version: cost.costCalculationVersion,
-      raw_usage: cost.rawUsage ?? null,
-    };
-
-    const { error } = await supabase.from("ai_requests").insert({ ...row, ...auditFields });
-    if (error) throw error;
-  } catch (err) {
-    console.warn("[AI STREAM] Failed to log usage:", err);
-  }
-}
 
 export async function handleRequest(req: Request): Promise<Response> {
   const corsHeaders = getCorsHeaders(req.headers.get("Origin"));
@@ -385,13 +172,13 @@ export async function handleRequest(req: Request): Promise<Response> {
     if (routingUsage) {
       await logUsage(
         user.id,
+        "jev_model_router",
         OPENROUTER_PROVIDER,
         JEV_MODEL,
         routingUsage,
         Date.now() - routingStartedAt,
         resolution.jevUsage ? "error" : "success",
         resolution.jevUsage ? "jev_incomplete" : undefined,
-        "jev_model_router",
       );
     }
   } catch (error) {
@@ -532,7 +319,7 @@ export async function handleRequest(req: Request): Promise<Response> {
         if (!req.signal.aborted) {
           try { emit("final", { output, meta: { requestedModel, resolvedModel: model } }); } catch { /* client disconnected after provider completion */ }
         }
-        await logUsage(user.id, OPENROUTER_PROVIDER, model, collectUsage(), Date.now() - startedAt);
+        await logUsage(user.id, "ask", OPENROUTER_PROVIDER, model, collectUsage(), Date.now() - startedAt);
       } catch (err) {
         cancelUpstream();
         const errorMessage = err instanceof Error ? err.message : "Streaming failed";
@@ -543,6 +330,7 @@ export async function handleRequest(req: Request): Promise<Response> {
         const observedUsage = collectUsage();
         await logUsage(
           user.id,
+          "ask",
           OPENROUTER_PROVIDER,
           model,
           markIncompleteUsage(observedUsage),
diff --git a/supabase/functions/ai/index.ts b/supabase/functions/ai/index.ts
index f44c485fd..b35d37ff2 100644
--- a/supabase/functions/ai/index.ts
+++ b/supabase/functions/ai/index.ts
@@ -5,25 +5,7 @@
 // SECURITY: Using production domain. Localhost calls from dev browser work because 
 // browsers accept specific origin even when request is from different origin.
 // SECURITY: Allow specific origins for CORS
-const ALLOWED_ORIGINS = [
-  "https://debate.pi-stack.org",
-  "http://localhost:8080",
-  "http://127.0.0.1:8080",
-  "http://localhost:18080",
-  "http://127.0.0.1:18080",
-  "http://localhost:5173",
-  "http://127.0.0.1:54321", // Local Supabase
-  "capacitor://localhost"
-];
 
-function getCorsHeaders(origin: string | null) {
-  const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-  return {
-    "Access-Control-Allow-Origin": allowedOrigin,
-    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-    "Access-Control-Allow-Methods": "POST, OPTIONS",
-  };
-}
 
 type Feature = "generate" | "attack" | "brainstorm" | "factoids" | "ask" | "sparring" | "crossfire";
 
@@ -134,6 +116,13 @@ import {
   type ResearchDeps,
   type ResearchSource,
 } from "../_shared/research.ts";
+import { getCorsHeaders } from "../_shared/cors.ts";
+import {
+  checkRateLimit,
+  checkUserBanned,
+  logUsage,
+  type RateLimitResult,
+} from "../_shared/entitlements.ts";
 import {
   MAX_CROSSFIRE_REPLY_CHARS,
   validateCrossfireDebrief,
@@ -162,33 +151,6 @@ function modelForRequest(model: string): ModelCatalogEntry {
   return entry;
 }
 
-interface RateLimitResult {
-  allowed: boolean;
-  canAccessProModels?: boolean;
-  reason?: string;
-  limit?: number;
-  current?: number;
-  code?: "limit_reached" | "trial_expired" | "banned" | "upgrade_required";
-  statusCode?: number;
-}
-
-interface SubscriptionInfo {
-  tier: string; // 'trial' | 'pro' | 'legacy_free' | 'expired'
-  dailyLimit: number;
-  canAccessProModels: boolean;
-  trialEndsAt: string | null;
-  gracePeriodEndsAt: string | null;
-}
-
-async function checkUserBanned(userId: string): Promise<boolean> {
-  const { data } = await supabase
-    .from("user_roles")
-    .select("role")
-    .eq("user_id", userId)
-    .single();
-  return data?.role === "banned";
-}
-
 async function getGlobalPrompt(feature: string): Promise<string | null> {
   // First try feature-specific prompt
   const { data: featurePrompt } = await supabase
@@ -213,245 +175,6 @@ async function getGlobalPrompt(feature: string): Promise<string | null> {
   return allPrompt?.prompt_text || null;
 }
 
-async function getSubscriptionInfo(userId: string): Promise<SubscriptionInfo> {
-  const { data: user } = await supabase
-    .from("user_settings")
-    .select("subscription_tier, daily_limit_override, trial_ends_at, grace_period_ends_at")
-    .eq("user_id", userId)
-    .single();
-
-  // A settings row is provisioned for every account by the on_auth_user_created
-  // trigger and can no longer be deleted by the client (see 20260819000000
-  // security_hardening.sql). A missing row is therefore untrusted, not a new
-  // user — fail closed instead of granting a fresh trial.
-  if (!user) return { tier: "expired", dailyLimit: 0, canAccessProModels: false, trialEndsAt: null, gracePeriodEndsAt: null };
-
-  const tier = user.subscription_tier || "trial";
-  const limitOrDefault = (defaultLimit: number) => user.daily_limit_override ?? defaultLimit;
-  const now = new Date();
-  const expired = { tier: "expired", dailyLimit: limitOrDefault(0), canAccessProModels: false, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
-  const activeGiftTrial = user.trial_ends_at ? new Date(user.trial_ends_at) : null;
-  const giftTrialInfo = activeGiftTrial && now < activeGiftTrial
-    ? { tier: "trial", dailyLimit: limitOrDefault(5), canAccessProModels: false, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at }
-    : null;
-
-  // Legacy free users in grace period get pro-level access
-  if (tier === "legacy_free") {
-    const graceEnd = user.grace_period_ends_at ? new Date(user.grace_period_ends_at) : null;
-    if (graceEnd && now < graceEnd) {
-      const limit = limitOrDefault(50);
-      return { tier: "legacy_free", dailyLimit: limit, canAccessProModels: true, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
-    }
-    if (giftTrialInfo) return giftTrialInfo;
-    // Grace period expired — treat as expired
-    return expired;
-  }
-
-  // Pro subscribers or promo Pro access. Stripe Pro must have an active
-  // subscription period; promo Pro uses grace_period_ends_at, with lifetime
-  // promo codes represented by a far-future date.
-  if (tier === "pro") {
-    const promoEnd = user.grace_period_ends_at ? new Date(user.grace_period_ends_at) : null;
-    if (promoEnd && now < promoEnd) {
-      const limit = limitOrDefault(50);
-      return { tier: "pro", dailyLimit: limit, canAccessProModels: true, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
-    }
-
-    const { data: subscriptions } = await supabase
-      .from("subscriptions")
-      .select("status, current_period_end")
-      .eq("user_id", userId)
-      .in("status", ["active", "trialing"])
-      .order("current_period_end", { ascending: false })
-      .limit(1);
-
-    const activeSubscription = subscriptions?.find((sub) =>
-      sub.current_period_end && new Date(sub.current_period_end) > now
-    );
-
-    if (activeSubscription) {
-      const limit = limitOrDefault(50);
-      return { tier: "pro", dailyLimit: limit, canAccessProModels: true, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
-    }
-
-    if (giftTrialInfo) return giftTrialInfo;
-    return expired;
-  }
-
-  // Trial users
-  if (tier === "trial") {
-    const trialEnd = user.trial_ends_at ? new Date(user.trial_ends_at) : null;
-    if (trialEnd && now < trialEnd) {
-      const limit = limitOrDefault(5);
-      return { tier: "trial", dailyLimit: limit, canAccessProModels: false, trialEndsAt: user.trial_ends_at, gracePeriodEndsAt: user.grace_period_ends_at };
-    }
-    // Trial expired
-    return expired;
-  }
-
-  if (giftTrialInfo) return giftTrialInfo;
-
-  // Expired
-  return expired;
-}
-
-async function getConfiguredDailyLimit(userId: string, fallbackLimit: number): Promise<number> {
-  const { data: userLimit } = await supabase
-    .from("rate_limits")
-    .select("limit_value")
-    .eq("user_id", userId)
-    .eq("limit_type", "daily_requests")
-    .order("updated_at", { ascending: false })
-    .limit(1)
-    .maybeSingle();
-
-  if (typeof userLimit?.limit_value === "number") {
-    return userLimit.limit_value;
-  }
-
-  const { data: globalLimit } = await supabase
-    .from("rate_limits")
-    .select("limit_value")
-    .is("user_id", null)
-    .eq("limit_type", "daily_requests")
-    .order("updated_at", { ascending: false })
-    .limit(1)
-    .maybeSingle();
-
-  if (typeof globalLimit?.limit_value === "number") {
-    return globalLimit.limit_value;
-  }
-
-  return fallbackLimit;
-}
-
-async function checkRateLimit(userId: string | null, model?: ModelSelection): Promise<RateLimitResult> {
-  if (!userId) return { allowed: true }; // Anonymous users not rate limited (for now)
-
-  try {
-    // First check if user is banned
-    const isBanned = await checkUserBanned(userId);
-    if (isBanned) {
-      return { allowed: false, reason: "Your account has been suspended. Please contact support.", code: "banned", statusCode: 403 };
-    }
-
-    // Get subscription info
-    const sub = await getSubscriptionInfo(userId);
-    const dailyLimit = sub.tier === "expired" && sub.dailyLimit === 0
-      ? 0
-      : await getConfiguredDailyLimit(userId, sub.dailyLimit);
-
-    // Check if trial/access expired (limit = 0)
-    if (sub.tier === "expired" && dailyLimit === 0) {
-      return {
-        allowed: false,
-        reason: "Your free trial has ended. Upgrade to Pro to continue using DebateLab.",
-        code: "trial_expired",
-        limit: 0,
-        current: 0,
-        statusCode: 402,
-      };
-    }
-
-    // Check model access
-    if (model && (model === AUTO_PRO || (!isAutoModelSelection(model) && getModelCatalogEntry(model)?.isProOnly)) && !sub.canAccessProModels) {
-      return {
-        allowed: false,
-        reason: "This model requires a Pro subscription. Upgrade to unlock advanced models.",
-        code: "upgrade_required",
-        statusCode: 403,
-      };
-    }
-
-    if (dailyLimit <= 0) {
-      return {
-        allowed: false,
-        reason: "Your daily request limit is currently set to zero. Contact support if this seems wrong.",
-        code: "limit_reached",
-        limit: 0,
-        current: 0,
-        statusCode: 402,
-      };
-    }
-
-    // Atomically reserve today's request slot server-side so concurrent requests
-    // can't race past the limit (see consume_daily_quota in the security hardening migration).
-    const { data: quota, error: quotaError } = await supabase.rpc("consume_daily_quota", {
-      p_user_id: userId,
-      p_limit: dailyLimit,
-    });
-
-    if (quotaError) {
-      console.error("[RATE LIMIT] Quota reservation failed:", quotaError);
-      return { allowed: false, reason: "Unable to verify your quota. Please try again.", statusCode: 500 };
-    }
-
-    const quotaRow = Array.isArray(quota) ? quota[0] : quota;
-    const currentCount = quotaRow?.current_count ?? 0;
-
-    if (!quotaRow?.allowed) {
-      return {
-        allowed: false,
-        reason: `You've used all ${dailyLimit} of your daily requests. ${sub.tier === "pro" ? "Limit resets at midnight UTC." : "Upgrade to Pro for 50 daily requests."}`,
-        code: "limit_reached",
-        limit: dailyLimit,
-        current: currentCount,
-        statusCode: 402,
-      };
-    }
-
-    return { allowed: true, limit: dailyLimit, current: currentCount, canAccessProModels: sub.canAccessProModels };
-  } catch (err) {
-    console.error("[RATE LIMIT] Check failed:", err);
-    return { allowed: false, reason: "Unable to verify your account access. Please try again.", statusCode: 500 };
-  }
-}
-
-async function logUsage(
-  userId: string | null,
-  feature: string,
-  provider: Provider,
-  model: string,
-  usage?: NormalizedUsage,
-  latencyMs?: number,
-  status: string = "success",
-  errorCode?: string
-) {
-  try {
-    const cost: CostResult = usage
-      ? calculateRequestCost({ provider, model, usage })
-      : calculateRequestCost({ provider, model });
-
-    const row: Record<string, unknown> = {
-      user_id: userId,
-      feature,
-      provider,
-      model,
-      input_tokens: cost.inputTokens,
-      output_tokens: cost.outputTokens,
-      latency_ms: latencyMs,
-      status,
-      error_code: errorCode,
-      cost_usd: cost.costUsd,
-    };
-
-    // Audit columns added by migration 20260822000000_ai_request_cost_audit.sql.
-    const auditFields: Record<string, unknown> = {
-      cached_input_tokens: cost.cachedInputTokens,
-      cache_write_tokens: cost.cacheWriteTokens,
-      reasoning_output_tokens: cost.reasoningOutputTokens,
-      pricing_snapshot_id: cost.pricingSnapshotId,
-      pricing_source_url: cost.pricingSourceUrl,
-      cost_calculation_version: cost.costCalculationVersion,
-      raw_usage: cost.rawUsage ?? null,
-    };
-
-    const { error } = await supabase.from("ai_requests").insert({ ...row, ...auditFields });
-    if (error) throw error;
-  } catch (err) {
-    console.warn("[USAGE LOG] Failed to log:", err);
-  }
-}
 
 function badRequest(message: string, corsHeaders: Record<string, string>, status = 400) {
   return new Response(JSON.stringify({ error: message }), {
diff --git a/supabase/functions/announcements/index.ts b/supabase/functions/announcements/index.ts
index af0154a95..337703e5d 100644
--- a/supabase/functions/announcements/index.ts
+++ b/supabase/functions/announcements/index.ts
@@ -2,32 +2,16 @@
 
 import { HttpError, jsonError, requireUser } from "../_shared/auth.ts";
 import { validateAnnouncementId } from "../_shared/announcements.ts";
+import { getCorsHeaders } from "../_shared/cors.ts";
+
 
-const ALLOWED_ORIGINS = [
-  "https://debate.pi-stack.org",
-  "http://localhost:8080",
-  "http://127.0.0.1:8080",
-  "http://127.0.0.1:18080",
-  "http://localhost:5173",
-  "http://127.0.0.1:54321",
-  "capacitor://localhost",
-];
-
-function getCorsHeaders(origin: string | null) {
-  const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-  return {
-    "Access-Control-Allow-Origin": allowedOrigin,
-    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-    "Access-Control-Allow-Methods": "GET, POST, OPTIONS",
-  };
-}
 
 function json(data: unknown, status: number, corsHeaders: Record<string, string>) {
   return Response.json(data, { status, headers: corsHeaders });
 }
 
 Deno.serve(async (req) => {
-  const corsHeaders = getCorsHeaders(req.headers.get("origin"));
+  const corsHeaders = getCorsHeaders(req.headers.get("origin"), { methods: "GET, POST, OPTIONS" });
   if (req.method === "OPTIONS") return new Response("ok", { headers: corsHeaders });
 
   try {
diff --git a/supabase/functions/create-checkout/index.ts b/supabase/functions/create-checkout/index.ts
index a4030a94f..f49c4a908 100644
--- a/supabase/functions/create-checkout/index.ts
+++ b/supabase/functions/create-checkout/index.ts
@@ -3,6 +3,7 @@
 
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
 import Stripe from "https://esm.sh/stripe@14.10.0?target=deno";
+import { getCorsHeaders } from "../_shared/cors.ts";
 import {
   findCustomerOwnedByUser,
   isAllowedCheckoutRedirectUrl,
@@ -26,23 +27,7 @@ const stripe = new Stripe(STRIPE_SECRET_KEY, {
 
 const supabase = createClient(SUPABASE_URL, SUPABASE_SERVICE_ROLE_KEY);
 
-const ALLOWED_ORIGINS = [
-  "https://debate.pi-stack.org",
-  "http://localhost:8080",
-  "http://127.0.0.1:8080",
-  "http://localhost:5173",
-  "http://127.0.0.1:54321",
-  "capacitor://localhost",
-];
-
-function getCorsHeaders(origin: string | null) {
-  const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-  return {
-    "Access-Control-Allow-Origin": allowedOrigin,
-    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-    "Access-Control-Allow-Methods": "POST, OPTIONS",
-  };
-}
+
 
 function isStripePriceId(value: string): boolean {
   return /^price_[A-Za-z0-9]+$/.test(value);
diff --git a/supabase/functions/create-portal/index.ts b/supabase/functions/create-portal/index.ts
index 056dffdb5..2945474b9 100644
--- a/supabase/functions/create-portal/index.ts
+++ b/supabase/functions/create-portal/index.ts
@@ -3,6 +3,7 @@
 
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
 import Stripe from "https://esm.sh/stripe@14.10.0?target=deno";
+import { getCorsHeaders } from "../_shared/cors.ts";
 import {
   findCustomerOwnedByUser,
   isAllowedCheckoutRedirectUrl,
@@ -24,23 +25,7 @@ const stripe = new Stripe(STRIPE_SECRET_KEY, {
 
 const supabase = createClient(SUPABASE_URL, SUPABASE_SERVICE_ROLE_KEY);
 
-const ALLOWED_ORIGINS = [
-  "https://debate.pi-stack.org",
-  "http://localhost:8080",
-  "http://127.0.0.1:8080",
-  "http://localhost:5173",
-  "http://127.0.0.1:54321",
-  "capacitor://localhost",
-];
-
-function getCorsHeaders(origin: string | null) {
-  const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-  return {
-    "Access-Control-Allow-Origin": allowedOrigin,
-    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-    "Access-Control-Allow-Methods": "POST, OPTIONS",
-  };
-}
+
 
 async function findCustomerIdByUser(user: { id: string; email?: string | null }): Promise<string | null> {
   const { data: sub, error: subError } = await supabase
diff --git a/supabase/functions/demo-code-login/index.ts b/supabase/functions/demo-code-login/index.ts
index f9122da6a..ce07557c3 100644
--- a/supabase/functions/demo-code-login/index.ts
+++ b/supabase/functions/demo-code-login/index.ts
@@ -1,4 +1,5 @@
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
+import { ALLOWED_ORIGINS, getCorsHeaders } from "../_shared/cors.ts";
 import {
   getDemoCodeDenialReason,
   getDemoLoginRole,
@@ -9,15 +10,6 @@ import {
   normalizeDemoCode,
 } from "../_shared/demo-code.ts";
 
-const ALLOWED_ORIGINS = [
-  "https://debate.pi-stack.org",
-  "http://localhost:8080",
-  "http://127.0.0.1:8080",
-  "http://localhost:18080",
-  "http://127.0.0.1:18080",
-  "http://localhost:5173",
-  "http://127.0.0.1:54321",
-];
 
 const supabaseUrl = Deno.env.get("SUPABASE_URL")!;
 const supabaseServiceKey = Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!;
@@ -35,14 +27,6 @@ type DemoAccessCode = {
   disabled_at: string | null;
 };
 
-function getCorsHeaders(origin: string | null) {
-  const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-  return {
-    "Access-Control-Allow-Origin": allowedOrigin,
-    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-    "Access-Control-Allow-Methods": "POST, OPTIONS",
-  };
-}
 
 // Only hand generateLink a redirectTo that points at one of our own origins,
 // so a client-supplied value can't be used for an open redirect off the auth
@@ -51,7 +35,14 @@ function sanitizeRedirectTo(value: unknown): string | undefined {
   if (typeof value !== "string" || !value) return undefined;
   try {
     const url = new URL(value);
-    return ALLOWED_ORIGINS.includes(`${url.protocol}//${url.host}`) ? value : undefined;
+    // Web origins only. The shared CORS list also carries the Capacitor
+    // WebView scheme, which must never be a generateLink redirect target.
+    if (url.protocol !== "http:" && url.protocol !== "https:") return undefined;
+    return ALLOWED_ORIGINS.includes(
+      `${url.protocol}//${url.host}` as typeof ALLOWED_ORIGINS[number],
+    )
+      ? value
+      : undefined;
   } catch {
     return undefined;
   }
diff --git a/supabase/functions/export-gdoc/index.ts b/supabase/functions/export-gdoc/index.ts
index 3f802bde8..7b0c99f31 100644
--- a/supabase/functions/export-gdoc/index.ts
+++ b/supabase/functions/export-gdoc/index.ts
@@ -4,6 +4,7 @@
 
 // Import Supabase client for JWT verification
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
+import { getCorsHeaders } from "../_shared/cors.ts";
 
 // Initialize Supabase client with service role key for user verification
 const supabaseUrl = Deno.env.get("SUPABASE_URL")!;
@@ -31,44 +32,8 @@ async function validateJWT(req: Request): Promise<{ valid: boolean; userId?: str
     }
 }
 
-const ALLOWED_ORIGINS = [
-    "https://debate.pi-stack.org",
-    "http://localhost:5173",
-    "http://localhost:8080",
-    "http://127.0.0.1:54321",
-    "capacitor://localhost"
-];
-
-function isDevOrigin(origin: string): boolean {
-    // Match the exact hostname (and require http:), not a string prefix —
-    // `startsWith('http://localhost')` also matches an attacker-controlled
-    // origin like "http://localhost.evil.com" or "http://localhostevil.com".
-    let url: URL;
-    try {
-        url = new URL(origin);
-    } catch {
-        return false;
-    }
-    if (url.protocol !== 'http:') return false;
-    return (
-        url.hostname === 'localhost' ||
-        url.hostname === '127.0.0.1' ||
-        /^192\.168\.\d{1,3}\.\d{1,3}$/.test(url.hostname)
-    );
-}
 
-function getCorsHeaders(origin: string | null) {
-    // Allow any localhost/127.0.0.1 origin for development
-    // Also allow local network IPs (192.168.x.x) for mobile/device testing
-    const allowedOrigin = (origin && (isDevOrigin(origin) || ALLOWED_ORIGINS.includes(origin)))
-        ? origin
-        : ALLOWED_ORIGINS[0];
-    return {
-        "Access-Control-Allow-Origin": allowedOrigin,
-        "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-        "Access-Control-Allow-Methods": "POST, OPTIONS",
-    };
-}
+
 
 type ExportMode = 'generate' | 'attack' | 'brainstorm' | 'factoids';
 
@@ -792,7 +757,7 @@ Deno.serve(async (req: Request) => {
     console.log("[GDOC] Function invoked, method:", req.method);
 
     const origin = req.headers.get("origin");
-    const corsHeaders = getCorsHeaders(origin);
+    const corsHeaders = getCorsHeaders(origin, { allowDevOrigins: true });
 
     if (req.method === "OPTIONS") {
         return new Response("ok", { headers: corsHeaders });
diff --git a/supabase/functions/import-source/index.ts b/supabase/functions/import-source/index.ts
index 801a2e38f..10784a3bc 100644
--- a/supabase/functions/import-source/index.ts
+++ b/supabase/functions/import-source/index.ts
@@ -1,32 +1,17 @@
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
 import { isPrivateIpv4, isPrivateIpv6, validatePublicHttpUrl, validateResolvedPublicHost } from "./url-validation.ts";
 import { readBoundedText } from "./resource-limits.ts";
+import { getCorsHeaders } from "../_shared/cors.ts";
 
 // Re-export helpers so existing callers (if any) keep working.
 export { isPrivateIpv4, isPrivateIpv6, validatePublicHttpUrl };
 
-const ALLOWED_ORIGINS = [
-  "https://debate.pi-stack.org",
-  "http://localhost:8080",
-  "http://127.0.0.1:8080",
-  "http://localhost:5173",
-  "http://127.0.0.1:54321",
-  "capacitor://localhost",
-];
 
 const MAX_CONTENT_CHARS = 50_000;
 const FETCH_TIMEOUT_MS = 10_000;
 const MAX_REDIRECTS = 5;
 const DAILY_IMPORT_LIMIT = 50;
 
-function getCorsHeaders(origin: string | null) {
-  const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-  return {
-    "Access-Control-Allow-Origin": allowedOrigin,
-    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-    "Access-Control-Allow-Methods": "POST, OPTIONS",
-  };
-}
 
 const supabaseUrl = Deno.env.get("SUPABASE_URL")!;
 const supabaseServiceKey = Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!;
diff --git a/supabase/functions/redeem-promo/index.ts b/supabase/functions/redeem-promo/index.ts
index 8b39b63b1..e2e0752da 100644
--- a/supabase/functions/redeem-promo/index.ts
+++ b/supabase/functions/redeem-promo/index.ts
@@ -2,29 +2,14 @@
 // Validates and applies promo codes for users.
 
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
+import { getCorsHeaders } from "../_shared/cors.ts";
 
 const supabaseUrl = Deno.env.get("SUPABASE_URL")!;
 const supabaseServiceKey = Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!;
 const supabaseAnonKey = Deno.env.get("SUPABASE_ANON_KEY")!;
 const supabase = createClient(supabaseUrl, supabaseServiceKey);
 
-const ALLOWED_ORIGINS = [
-  "https://debate.pi-stack.org",
-  "http://localhost:8080",
-  "http://127.0.0.1:8080",
-  "http://localhost:5173",
-  "http://127.0.0.1:54321",
-  "capacitor://localhost",
-];
 
-function getCorsHeaders(origin: string | null) {
-  const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-  return {
-    "Access-Control-Allow-Origin": allowedOrigin,
-    "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-    "Access-Control-Allow-Methods": "POST, OPTIONS",
-  };
-}
 
 Deno.serve(async (req) => {
   const origin = req.headers.get("origin");
diff --git a/supabase/functions/share/index.ts b/supabase/functions/share/index.ts
index eb750d82e..d210b639f 100644
--- a/supabase/functions/share/index.ts
+++ b/supabase/functions/share/index.ts
@@ -2,27 +2,11 @@
 // Creates and manages shareable links for debate content
 
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
+import { PUBLIC_WEB_APP_ORIGIN, getCorsHeaders } from "../_shared/cors.ts";
 
-const PUBLIC_WEB_APP_ORIGIN = "https://debate.pi-stack.org";
 
 // SECURITY: Allow specific origins for CORS
-const ALLOWED_ORIGINS = [
-    PUBLIC_WEB_APP_ORIGIN,
-    "http://localhost:8080",
-    "http://127.0.0.1:8080",
-    "http://localhost:5173",
-    "http://127.0.0.1:54321",
-    "capacitor://localhost"
-];
-
-function getCorsHeaders(origin: string | null) {
-    const allowedOrigin = origin && ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
-    return {
-        "Access-Control-Allow-Origin": allowedOrigin,
-        "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type",
-        "Access-Control-Allow-Methods": "POST, OPTIONS",
-    };
-}
+
 
 const supabaseUrl = Deno.env.get("SUPABASE_URL")!;
 const supabaseServiceKey = Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!;
diff --git a/vitest.config.ts b/vitest.config.ts
index c13e7994b..440ad688f 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -1,4 +1,4 @@
-import { configDefaults, defineConfig } from "vitest/config";
+import { defineConfig } from "vitest/config";
 import react from "@vitejs/plugin-react-swc";
 import path from "path";
 
@@ -7,15 +7,10 @@ export default defineConfig({
   test: {
     environment: "jsdom",
     globals: true,
-    setupFiles: ["./src/test/setup.ts", "./src/test/deno-compat.ts"],
-    include: [
-      "src/**/*.{test,spec}.{ts,tsx}",
-      "supabase/functions/**/*.{test,spec}.{ts,tsx}",
-    ],
-    // This boundary test imports the deployed Edge Function entrypoint and its
-    // remote Deno dependencies. Run it with `deno test`; Vite cannot resolve
-    // those URL imports in the browser-oriented Vitest suite.
-    exclude: [...configDefaults.exclude, "supabase/functions/ai/handler-research.test.ts"],
+    setupFiles: ["./src/test/setup.ts"],
+    // Edge function tests are Deno tests. `npm run test:edge` runs them under
+    // the runtime they ship on, so Vitest does not re-run them through a shim.
+    include: ["src/**/*.{test,spec}.{ts,tsx}"],
     coverage: {
       provider: "v8",
       // Omit `all` intentionally: this is a selected-scope gate for the audited
@@ -35,7 +30,6 @@ export default defineConfig({
         "src/lib/supabase/AuthProvider.tsx",
         "src/hooks/use-subscription.ts",
         "src/hooks/use-subscription-error.ts",
-        "supabase/functions/ai/prompt-builder.ts",
       ],
       thresholds: {
         statements: 90,
@@ -51,12 +45,6 @@ export default defineConfig({
   resolve: {
     alias: {
       "@": path.resolve(__dirname, "./src"),
-      // Run Deno-flavored function tests under Vitest without rewriting them.
-      // Deno resolves this pinned JSR package directly; Vitest uses the shim.
-      "jsr:@std/assert@1.0.19": path.resolve(
-        __dirname,
-        "./src/test/deno-assert-shim.ts",
-      ),
     },
   },
 });