diff --git a/e2e/animation-polish.spec.ts b/e2e/animation-polish.spec.ts
index 9061985a7..41235dcad 100644
--- a/e2e/animation-polish.spec.ts
+++ b/e2e/animation-polish.spec.ts
@@ -65,23 +65,6 @@ async function openFeatureRoute(page: Page, route: 'brainstorm' | 'factoids' | '
   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);
-
-  await expect(page.locator('[data-route-transition-ms]')).toHaveCount(0);
-  const transitionMs = await options.evaluate((element) => Number.parseFloat(getComputedStyle(element).transitionDuration) * 1000);
-  expect(transitionMs).toBeGreaterThan(0);
-  await page.screenshot({ path: testInfo.outputPath('normal-empty-options.png'), fullPage: true });
-
-  await generateMockCase(page);
-  await expect(page.locator('#generate-results')).toBeVisible();
-  await expect.poll(() => page.evaluate(() => window.scrollY)).toBeGreaterThan(0);
-  await expect(page.locator('main.page-enter')).toHaveCount(0);
-  await expect(page.getByText('Generate complete', { exact: true })).toBeHidden({ timeout: 10_000 });
-  await page.screenshot({ path: testInfo.outputPath('normal-result.png'), fullPage: true });
-});
-
 test('removes non-essential route and state movement for reduced motion', async ({ page }, testInfo) => {
   await prepareMotionFixture(page, 'reduce');
   const options = await openGenerateOptions(page);
diff --git a/e2e/home-navigation.spec.ts b/e2e/home-navigation.spec.ts
index 82aa52824..9f74a749e 100644
--- a/e2e/home-navigation.spec.ts
+++ b/e2e/home-navigation.spec.ts
@@ -124,20 +124,6 @@ test('header keeps the brand and controls inside a 320px viewport', async ({ pag
   expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBe(320);
 });
 
-test('desktop header holds Home, Current debate, Library, and History with no tool links', async ({ page }) => {
-  test.skip((page.viewportSize()?.width ?? 0) < 1024, 'Desktop-only header check');
-  await page.goto('/app', { waitUntil: 'domcontentloaded' });
-
-  const navigation = page.getByRole('navigation', { name: 'Main navigation' });
-  await expect(navigation.getByRole('link')).toHaveText(['Home', 'Library', 'History']);
-  await expect(navigation.getByTestId('current-debate-desktop')).toHaveText('Start debate');
-  for (const tool of ['Generate', 'Attack', 'Ask', 'Crossfire', 'Sparring', 'More']) {
-    await expect(navigation.getByText(tool, { exact: true })).toHaveCount(0);
-  }
-  await expect(page.getByRole('link', { name: 'Settings' })).toBeVisible();
-  expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBeLessThanOrEqual(await page.evaluate(() => window.innerWidth));
-});
-
 test('desktop header fits without internal or document overflow at supported widths', async ({ page }) => {
   for (const width of [1024, 1280, 1440, 1920]) {
     await page.setViewportSize({ width, height: 900 });
diff --git a/e2e/loading-performance.spec.ts b/e2e/loading-performance.spec.ts
index 4dfb1a311..475afd891 100644
--- a/e2e/loading-performance.spec.ts
+++ b/e2e/loading-performance.spec.ts
@@ -60,40 +60,3 @@ test('landing CTA enters the app without replacing the document', async ({ page
   expect(await page.evaluate(() => performance.getEntriesByType('navigation'))).toHaveLength(1);
   expect(await page.evaluate(() => document.documentElement.dataset.e2eDocument)).toBe('original');
 });
-
-test('protected sibling navigation keeps AppLayout mounted while the page loads', async ({ page }) => {
-  await setLocale(page, 'en');
-  await stubSupabaseSession(page);
-  await page.addInitScript(() => {
-    window.localStorage.setItem('debate-trainer-onboarding', JSON.stringify({
-      state: { hasCompletedOnboarding: true, isTourRunning: false },
-      version: 0,
-    }));
-  });
-  await page.goto('/app');
-  const header = page.locator('header');
-  await expect(header).toBeVisible();
-  await header.evaluate((element) => { element.dataset.e2eLayout = 'original'; });
-
-  let releaseAttackModule: (() => void) | undefined;
-  const attackModuleReleased = new Promise<void>((resolve) => { releaseAttackModule = resolve; });
-  let attackModuleRequested = false;
-  await page.route('**/src/pages/AttackPage.tsx*', async (route) => {
-    attackModuleRequested = true;
-    await attackModuleReleased;
-    await route.continue();
-  });
-
-  // Tools open from Home; the header no longer lists them.
-  await page.locator('main [data-tour="mode-attack"]').click();
-  await expect.poll(() => attackModuleRequested).toBe(true);
-  await page.waitForTimeout(250);
-
-  await expect(header).toBeVisible();
-  expect(await header.getAttribute('data-e2e-layout')).toBe('original');
-
-  releaseAttackModule?.();
-  await expect(page).toHaveURL(/\/app\/attack$/);
-  await expect(page.getByRole('heading', { name: /Attack/i }).first()).toBeVisible();
-  expect(await header.getAttribute('data-e2e-layout')).toBe('original');
-});
diff --git a/e2e/navigation-performance.spec.ts b/e2e/navigation-performance.spec.ts
index 9d3b914c1..d6de7af2f 100644
--- a/e2e/navigation-performance.spec.ts
+++ b/e2e/navigation-performance.spec.ts
@@ -5,7 +5,6 @@ declare global {
   interface Window {
     __baselineAppLayout?: Element | null;
     __baselineShell?: Element | null;
-    __baselineClickAt?: number | null;
     __genericLoaderObserver?: MutationObserver;
     __genericLoaderSeen?: boolean;
   }
@@ -125,13 +124,6 @@ test('a delayed destination chunk exposes the route fallback without replacing t
   await page.evaluate(() => {
     window.__baselineAppLayout = document.querySelector('header')?.parentElement;
     window.__baselineShell = document.querySelector('header');
-    window.__baselineClickAt = null;
-    document.addEventListener('click', (event) => {
-      const anchor = event.target instanceof Element ? event.target.closest('a[href]') : null;
-      if (anchor && new URL(anchor.href, window.location.href).pathname === '/app/attack') {
-        window.__baselineClickAt = performance.now();
-      }
-    }, true);
   });
   let destinationRequested = false;
   await page.route('**/src/pages/AttackPage.tsx*', async (route) => {
@@ -178,27 +170,6 @@ test('a delayed destination chunk exposes the route fallback without replacing t
     appLayout: document.querySelector('header')?.parentElement === window.__baselineAppLayout,
     header: document.querySelector('header') === window.__baselineShell,
   }))).toEqual({ appLayout: true, header: true });
-
-  const transitionMetrics = await page.evaluate(() => ({
-    clickTime: window.__baselineClickAt ?? null,
-    route: location.pathname,
-    shellDomIdentitySurvived: document.querySelector('header') === window.__baselineShell,
-    allRequestCount: performance.getEntriesByType('resource').length,
-    measuredRequestCount: performance.getEntriesByType('resource')
-      .filter((entry) => window.__baselineClickAt !== null && entry.startTime >= window.__baselineClickAt).length,
-    sourceRequestCount: performance.getEntriesByType('resource')
-      .filter((entry) => window.__baselineClickAt !== null && entry.startTime < window.__baselineClickAt).length,
-    allLongTaskCount: performance.getEntriesByType('longtask').length,
-    measuredLongTaskCount: performance.getEntriesByType('longtask')
-      .filter((entry) => window.__baselineClickAt !== null && entry.startTime >= window.__baselineClickAt).length,
-  }));
-  expect(transitionMetrics.clickTime).not.toBeNull();
-  expect(transitionMetrics.route).toBe('/app/attack');
-  expect(transitionMetrics.shellDomIdentitySurvived).toBe(true);
-  expect(transitionMetrics.sourceRequestCount).toBeGreaterThan(0);
-  expect(transitionMetrics.measuredRequestCount).toBeGreaterThan(0);
-  expect(transitionMetrics.measuredRequestCount).toBeLessThan(transitionMetrics.allRequestCount);
-  expect(transitionMetrics.measuredLongTaskCount).toBeLessThanOrEqual(transitionMetrics.allLongTaskCount);
 });
 
 test('a failed route chunk recovers after the offered reload', async ({ page }) => {
@@ -226,35 +197,6 @@ test('a failed route chunk recovers after the offered reload', async ({ page })
   await expect(page.locator('header')).toBeVisible();
 });
 
-for (const [locale, openingLabel] of [
-  ['es', 'Abriendo Atacar'],
-  ['hu', 'Támadás megnyitása'],
-] as const) {
-  test(`${locale} delayed route announces the localized destination`, async ({ page }) => {
-    await setLocale(page, locale);
-    await stubSupabaseSession(page);
-    await skipOnboarding(page);
-    await page.goto('/app', { waitUntil: 'domcontentloaded' });
-    await expect(homeToolLink(page, 'attack')).toBeVisible();
-
-    let destinationRequested = false;
-    await page.route('**/src/pages/AttackPage.tsx*', async (route) => {
-      destinationRequested = true;
-      await new Promise((resolve) => setTimeout(resolve, 1500));
-      await route.continue();
-    });
-
-    await homeToolLink(page, 'attack').click();
-
-    await expect.poll(() => destinationRequested).toBe(true);
-    const status = page.getByRole('status', { name: openingLabel, exact: true });
-    await expect(status).toHaveCount(1);
-    await expect(status).toHaveText(openingLabel);
-    await expect(status).not.toHaveText('Opening Attack');
-    await expect(page.locator('[data-route-skeleton="tool-form"][aria-busy="true"]')).toBeVisible();
-  });
-}
-
 async function gotoHome(page: Page) {
   await setLocale(page, 'en');
   await stubSupabaseSession(page);
diff --git a/e2e/public-pages.spec.ts b/e2e/public-pages.spec.ts
index 44178595f..63f602f68 100644
--- a/e2e/public-pages.spec.ts
+++ b/e2e/public-pages.spec.ts
@@ -39,22 +39,3 @@ for (const locale of LOCALES) {
     }
   });
 }
-
-test('landing logos use the sized display asset with intrinsic dimensions', async ({ page }) => {
-  await setLocale(page, 'en');
-  await page.goto('/');
-
-  const logos = page.locator('img[alt="DebateLab logo"]');
-  await expect(logos).toHaveCount(2);
-  expect(await logos.evaluateAll((images) => images.map((image) => {
-    const logo = image as HTMLImageElement;
-    return {
-      path: new URL(logo.currentSrc).pathname,
-      width: logo.getAttribute('width'),
-      height: logo.getAttribute('height'),
-    };
-  }))).toEqual([
-    { path: '/favicon-72.png', width: '36', height: '36' },
-    { path: '/favicon-72.png', width: '32', height: '32' },
-  ]);
-});
diff --git a/e2e/sparring.spec.ts b/e2e/sparring.spec.ts
index f3db31788..8facd239c 100644
--- a/e2e/sparring.spec.ts
+++ b/e2e/sparring.spec.ts
@@ -132,24 +132,8 @@ test('keeps the setup usable on mobile with reduced motion', async ({ page }) =>
   await page.emulateMedia({ reducedMotion: 'reduce' });
   await page.goto('/app/sparring', { waitUntil: 'domcontentloaded' });
   await expect(page.getByRole('heading', { name: 'Sparring' })).toBeVisible();
-  const logo = page.getByAltText('DebateLab logo');
-  await expect(logo).toHaveAttribute('src', '/favicon-72.png');
-  await expect(logo).toHaveAttribute('width', '36');
-  await expect(logo).toHaveAttribute('height', '36');
-  await expect.poll(() => logo.evaluate((image: HTMLImageElement) => image.naturalWidth)).toBeGreaterThan(0);
   await expect(page.getByRole('combobox', { name: 'Round format' })).toHaveText('School 4-6-6-3 · 8 speeches');
-  await expect(page.getByText('Write the resolution as you would hear it in the room.')).toHaveCount(0);
-  await expect(page.getByText('A precise motion gives the opponent something concrete to attack.')).toHaveCount(0);
   await expect(page.getByText('Pro Introductor')).toBeHidden();
-  const speakingSummary = page.locator('main details > summary');
-  const summaryMetrics = await speakingSummary.evaluate((element) => {
-    const icon = element.querySelector('svg');
-    if (!icon) throw new Error('Speaking order disclosure is missing its chevron.');
-    const summaryBox = element.getBoundingClientRect();
-    const iconBox = icon.getBoundingClientRect();
-    return Math.abs((summaryBox.top + summaryBox.height / 2) - (iconBox.top + iconBox.height / 2));
-  });
-  expect(summaryMetrics).toBeLessThanOrEqual(1);
   await page.getByText('Speaking order', { exact: true }).click();
   await expect(page.getByText('Pro Introductor')).toBeVisible();
   await expect(page.getByText('Pro Conclusor')).toBeVisible();
diff --git a/e2e/startup-shell.spec.ts b/e2e/startup-shell.spec.ts
index ad252945b..4fd7f0461 100644
--- a/e2e/startup-shell.spec.ts
+++ b/e2e/startup-shell.spec.ts
@@ -16,7 +16,6 @@ test('shows a dark private startup shell while the entry module is delayed', { t
 
   await page.goto('/app', { waitUntil: 'commit' });
   await expect(page.locator('[data-startup-shell]')).toBeVisible();
-  await expect(page.locator('#root > .seo-fallback')).toBeHidden();
   await expect(page.locator('[data-startup-status]')).toHaveText('Loading DebateLab');
   await expect.poll(() => page.evaluate(() => ({
     appShell: document.documentElement.classList.contains('app-shell'),
@@ -24,19 +23,6 @@ test('shows a dark private startup shell while the entry module is delayed', { t
   }))).toEqual({ appShell: true, dark: true });
 });
 
-test('shows the startup shell on login while the entry module is delayed', { tag: '@smoke' }, async ({ page }) => {
-  await setLocale(page, 'en');
-  await page.route('**/src/bootstrap.ts*', async (route) => {
-    await new Promise((resolve) => setTimeout(resolve, 1500));
-    await route.continue();
-  });
-
-  await page.goto('/login', { waitUntil: 'commit' });
-  await expect(page.locator('[data-startup-shell]')).toBeVisible();
-  await expect(page.locator('#root > .seo-fallback')).toBeHidden();
-  await expect.poll(() => page.evaluate(() => document.documentElement.classList.contains('app-shell'))).toBe(true);
-});
-
 test('mounts the app before Jam recorder modules resolve', { tag: '@smoke' }, async ({ page }) => {
   await setLocale(page, 'en');
   await stubSupabaseSession(page);
@@ -52,7 +38,6 @@ test('mounts the app before Jam recorder modules resolve', { tag: '@smoke' }, as
 
   await page.goto('/app', { waitUntil: 'domcontentloaded' });
   await expect(page.getByRole('main').getByRole('heading', { name: 'DebateLab', exact: true, level: 1 })).toBeVisible({ timeout: 5_000 });
-  await expect(page.locator('#root > .seo-fallback')).toHaveCount(0);
   expect(await page.evaluate(() => {
     const jam = (window as Window & { __jam__?: { exports?: { metadata?: unknown } } }).__jam__;
     return typeof jam?.exports?.metadata === 'function';
@@ -67,15 +52,3 @@ test('shows a recoverable message when the static main entry fails', { tag: '@sm
   await expect(page.getByRole('heading', { name: 'Unable to load DebateLab' })).toBeVisible();
   await expect(page.getByRole('button', { name: 'Reload' })).toBeEnabled();
 });
-
-test('keeps the branded shell visible before a delayed public entry module', { tag: '@smoke' }, async ({ page }) => {
-  await setLocale(page, 'en');
-  await page.route('**/src/bootstrap.ts*', async (route) => {
-    await new Promise((resolve) => setTimeout(resolve, 1500));
-    await route.continue();
-  });
-
-  await page.goto('/', { waitUntil: 'commit' });
-  await expect(page.locator('[data-startup-shell]')).toBeVisible();
-  await expect(page.getByText('DebateLab by Programcode is the official')).toHaveCount(0);
-});
diff --git a/services/collaboration/src/postgres-store.test.ts b/services/collaboration/src/postgres-store.test.ts
index e98af150c..44919fc78 100644
--- a/services/collaboration/src/postgres-store.test.ts
+++ b/services/collaboration/src/postgres-store.test.ts
@@ -224,6 +224,15 @@ describe("Postgres collaboration writer locks", () => {
       documentId: "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa",
       epoch: 3,
     })).resolves.toBe(true);
+    expect(client.query).toHaveBeenCalledWith(
+      expect.stringContaining("member.user_id = $3"),
+      [
+        "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa",
+        3,
+        "cccccccc-cccc-4ccc-8ccc-cccccccccccc",
+        false,
+      ],
+    );
     expect(client.release).toHaveBeenCalledTimes(1);
   });
 
diff --git a/src/test/components/EnvironmentSwitcher.test.tsx b/src/test/components/EnvironmentSwitcher.test.tsx
index 43c39350e..8a4526c55 100644
--- a/src/test/components/EnvironmentSwitcher.test.tsx
+++ b/src/test/components/EnvironmentSwitcher.test.tsx
@@ -55,12 +55,6 @@ describe('EnvironmentSwitcher', () => {
     expect(reload).not.toHaveBeenCalled();
   });
 
-  it('offers production while staging is active', () => {
-    mocks.env = 'staging';
-    render(<EnvironmentSwitcher reload={vi.fn()} />);
-    expect(screen.getByRole('button', { name: 'Switch to Production' })).toBeInTheDocument();
-  });
-
   it('still switches when sign-out fails, so nobody is stranded on a broken project', async () => {
     mocks.env = 'staging';
     mocks.signOut.mockRejectedValue(new Error('staging unreachable'));
diff --git a/src/test/debate/debate-context.test.tsx b/src/test/debate/debate-context.test.tsx
index b10e29126..24a8669cf 100644
--- a/src/test/debate/debate-context.test.tsx
+++ b/src/test/debate/debate-context.test.tsx
@@ -172,8 +172,13 @@ describe('Current Debate context in requests and the Review control', () => {
     }
   });
 
-  it('sends no debate material in one-off mode and says so above the button', () => {
+  it('sends no debate material in one-off mode and says so above the button', async () => {
     enableOneOffMode();
+    setMockInvokeResponse({ output: { needsMoreInfo: false, clarifyingQuestions: [], topFive: [], nextSteps: [], warningsAndTradeoffs: [] } });
+    await brainstorm(brainstormInput, config);
+    expect(lastBody().debateContext).toBeUndefined();
+    expect(lastBody().sourceIds).toEqual([]);
+
     render(<DebateContextControl feature="generate" side="pro" />);
     expect(screen.getByTestId('debate-context-control')).toHaveTextContent('One-off mode: no Current Debate material will be used or saved.');
   });
diff --git a/src/test/pages/GeneratePage.test.tsx b/src/test/pages/GeneratePage.test.tsx
index e21870df6..46d90150d 100644
--- a/src/test/pages/GeneratePage.test.tsx
+++ b/src/test/pages/GeneratePage.test.tsx
@@ -130,53 +130,6 @@ describe('GeneratePage Integration', () => {
         mockGenerateForm = { motion: 'Existing motion', side: 'pro', format: 'bp', role: 'intro', length: 'brief', audience: 'beginner', tone: 'formal' };
     });
 
-    it('renders the empty state initially', () => {
-        // Override store mock for this test if needed, but default is null result
-        render(
-            <BrowserRouter>
-                <GeneratePage />
-            </BrowserRouter>
-        );
-
-        expect(screen.getByText('Ready to Generate')).toBeInTheDocument();
-        expect(screen.getByTestId('generate-form')).toBeInTheDocument();
-        expect(screen.queryByTestId('generate-results')).not.toBeInTheDocument();
-    });
-
-    it('handles form submission and successful generation', async () => {
-        // Setup API mock
-        const mockResult = {
-            caseStructure: { thesis: 'Test Thesis' },
-            contentions: [] as any[],
-            predictedOpponentCase: {},
-            counters: [] as any[]
-        };
-        (generateCase as Mock).mockResolvedValue({ result: mockResult, discoveredSources: [] });
-
-        render(
-            <BrowserRouter>
-                <GeneratePage />
-            </BrowserRouter>
-        );
-
-        // Trigger submit
-        fireEvent.click(screen.getByTestId('submit-button'));
-
-        // Verify loading state calls
-        expect(mockSetGenerateLoading).toHaveBeenCalledWith(true);
-
-        // Wait for API call
-        await waitFor(() => {
-            expect(generateCase).toHaveBeenCalled();
-        });
-
-        // Verify result setting and completion
-        await waitFor(() => {
-            expect(mockSetGenerateResult).toHaveBeenCalledWith(mockResult);
-            expect(mockSetGenerateLoading).toHaveBeenCalledWith(false);
-        });
-    });
-
     it('reports a rejected case save instead of confirming success', async () => {
         mockGenerateResult = {
             caseStructure: { thesis: 'Existing Thesis' },
@@ -202,34 +155,6 @@ describe('GeneratePage Integration', () => {
         expect(mockToast).not.toHaveBeenCalledWith(expect.objectContaining({ title: 'Case Saved' }));
     });
 
-    it('displays results when store has data', () => {
-        mockGenerateResult = {
-            caseStructure: { thesis: 'Existing Thesis' },
-            contentions: [] as any[],
-            predictedOpponentCase: {
-                likelyArguments: [] as any[],
-                strategicWeaknesses: [] as any[],
-                keyClashes: [] as any[],
-            },
-            counters: [] as any[],
-            metadata: {
-                side: 'pro',
-                format: 'bp',
-                generatedAt: '2024-01-01T00:00:00Z',
-            },
-        };
-
-        render(
-            <BrowserRouter>
-                <GeneratePage />
-            </BrowserRouter>
-        );
-
-        expect(screen.getByTestId('generate-results')).toBeInTheDocument();
-        expect(screen.getByText('Results for Existing Thesis')).toBeInTheDocument();
-        expect(screen.queryByText('Ready to Generate')).not.toBeInTheDocument();
-    });
-
     it('opens Crossfire with the generated resolution and argument', () => {
         mockGenerateResult = {
             caseStructure: { thesis: 'Existing Thesis', framework: 'Framework', keyDefinitions: [], burdenOfProof: 'Burden' },
diff --git a/src/test/sparring/formats.test.ts b/src/test/sparring/formats.test.ts
index 23483db0b..6be2f0af1 100644
--- a/src/test/sparring/formats.test.ts
+++ b/src/test/sparring/formats.test.ts
@@ -65,18 +65,11 @@ describe('sparring formats', () => {
       expect(definition.turnCount).toBe(expected.length);
       expect(definition.name).toBeTruthy();
       expect(definition.shortDescription).toBeTruthy();
-      expect(definition.approximateMinutes).toBeGreaterThan(0);
+      const speakingSeconds = expected.reduce((total, turn) => total + turn.seconds, 0);
+      expect(definition.approximateMinutes).toBe(Math.round(speakingSeconds / 60));
     }
   });
 
-  it('presents the school format as the primary 4-6-6-3 format', () => {
-    expect(getSparringFormat('standard')).toMatchObject({
-      name: 'School 4-6-6-3',
-      turnCount: 8,
-      approximateMinutes: 38,
-    });
-  });
-
   it.each([
     [0, '0:00'],
     [1, '0:01'],
diff --git a/src/test/vercel-deployment-config.test.ts b/src/test/vercel-deployment-config.test.ts
index a7da83d1c..2da68064f 100644
--- a/src/test/vercel-deployment-config.test.ts
+++ b/src/test/vercel-deployment-config.test.ts
@@ -8,10 +8,6 @@ type HeaderRule = {
 };
 
 type VercelConfig = {
-  $schema?: string;
-  framework?: string;
-  buildCommand?: string;
-  outputDirectory?: string;
   rewrites?: Array<{ source: string; destination: string }>;
   headers?: HeaderRule[];
 };
@@ -21,18 +17,10 @@ function loadConfig(): VercelConfig {
   return JSON.parse(readFileSync(path, "utf8")) as VercelConfig;
 }
 
-function loadPackageJson(): {
-  engines?: { node?: string };
-  dependencies?: Record<string, string>;
-  scripts?: Record<string, string>;
-} {
+function loadPackageJson(): { scripts?: Record<string, string> } {
   return JSON.parse(readFileSync(resolve(process.cwd(), "package.json"), "utf8"));
 }
 
-function loadMainSource(): string {
-  return readFileSync(resolve(process.cwd(), "src/main.tsx"), "utf8");
-}
-
 function readProjectFile(path: string): string {
   return readFileSync(resolve(process.cwd(), path), "utf8");
 }
@@ -44,15 +32,6 @@ function headersFor(config: VercelConfig, source: string) {
 }
 
 describe("Vercel frontend deployment configuration", () => {
-  it("builds DebateLab as a Vite static site", () => {
-    const config = loadConfig();
-
-    expect(config.$schema).toBe("https://openapi.vercel.sh/vercel.json");
-    expect(config.framework).toBe("vite");
-    expect(config.buildCommand).toBe("npm run build");
-    expect(config.outputDirectory).toBe("dist");
-  });
-
   it("falls back to the SPA shell after Vercel checks the filesystem", () => {
     const config = loadConfig();
 
@@ -119,17 +98,6 @@ describe("Vercel frontend deployment configuration", () => {
     expect(indexHtml).toContain('<meta name="jam:team" content="b79917fc-80c6-4de1-9047-c98fa5db0aff" />');
   });
 
-  it("starts with a branded boot shell instead of visible crawl-only copy", () => {
-    const indexHtml = readProjectFile("index.html");
-    const mainSource = loadMainSource();
-    const rootMarkup = indexHtml.match(/<div id="root">([\s\S]*?)<\/div>/)?.[1] ?? "";
-
-    expect(indexHtml).toContain('aria-label="DebateLab is loading"');
-    expect(rootMarkup).not.toContain("DebateLab by Programcode is the official");
-    expect(indexHtml).toMatch(/<noscript>[\s\S]*DebateLab by Programcode is the official/);
-    expect(mainSource).not.toContain("preloadOfflineRoutes");
-  });
-
   it("keeps route chunks out of the initial document and runs the graph gate", () => {
     const indexHtml = readProjectFile("index.html");
     const packageJson = loadPackageJson();
@@ -171,22 +139,4 @@ describe("Vercel frontend deployment configuration", () => {
       "public, max-age=31536000, immutable",
     );
   });
-
-  it("pins the Vercel runtime to Node 22", () => {
-    expect(loadPackageJson().engines?.node).toBe("22.x");
-  });
-
-  it("includes Vercel Web Analytics and Speed Insights in the app root", () => {
-    const packageJson = loadPackageJson();
-    const mainSource = loadMainSource();
-    const telemetrySource = readProjectFile("src/components/WebTelemetry.tsx");
-
-    expect(packageJson.dependencies).toHaveProperty("@vercel/analytics");
-    expect(packageJson.dependencies).toHaveProperty("@vercel/speed-insights");
-    expect(mainSource).toContain("<WebTelemetry />");
-    expect(mainSource).toContain('window.requestIdleCallback(run)');
-    expect(telemetrySource).toContain('lazy(() => import("@vercel/analytics/react")');
-    expect(telemetrySource).toContain('lazy(() => import("@vercel/speed-insights/react")');
-    expect(telemetrySource).toContain('window.requestIdleCallback(() => setReady(true))');
-  });
 });
diff --git a/supabase/functions/_shared/auto-model-router.test.ts b/supabase/functions/_shared/auto-model-router.test.ts
index 0a48b5747..b6b0f4b52 100644
--- a/supabase/functions/_shared/auto-model-router.test.ts
+++ b/supabase/functions/_shared/auto-model-router.test.ts
@@ -1,8 +1,4 @@
-import {
-  AUTO_FAST,
-  AUTO_PRO,
-  isAutoModelSelection,
-} from "./model-catalog.ts";
+import { AUTO_FAST, AUTO_PRO } from "./model-catalog.ts";
 import {
   resolveModelSelection,
   type AutoModelRouterJev,
@@ -33,11 +29,6 @@ function jevReturning(result: JevDecisionResult, observed?: { calls: number; sta
   };
 }
 
-Deno.test("Auto Fast is a Basic selection and Auto Pro is Pro-only", () => {
-  if (!isAutoModelSelection(AUTO_FAST) || !isAutoModelSelection(AUTO_PRO)) throw new Error("auto selections missing");
-  if (AUTO_FAST !== "auto-fast" || AUTO_PRO !== "auto-pro") throw new Error("auto IDs changed");
-});
-
 Deno.test("Auto Fast normally resolves to GLM for a Basic user", async () => {
   const resolved = await resolveModelSelection({
     requestedModel: AUTO_FAST,
diff --git a/supabase/functions/_shared/cors.test.ts b/supabase/functions/_shared/cors.test.ts
index 56d7c33cc..606375c55 100644
--- a/supabase/functions/_shared/cors.test.ts
+++ b/supabase/functions/_shared/cors.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals, assertStringIncludes } from "jsr:@std/assert@1.0.19";
+import { assertEquals } from "jsr:@std/assert@1.0.19";
 import { ALLOWED_ORIGINS, getCorsHeaders, isAllowedOrigin, isDevOrigin } from "./cors.ts";
 
 Deno.test("allows the Capacitor WebView origin", () => {
@@ -46,11 +46,6 @@ Deno.test("carries the requested methods", () => {
   );
 });
 
-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}`");
-});
-
 Deno.test("allows both Vercel projects' preview and staging hosts", () => {
   for (const origin of [
     "https://debate-navigator-git-feat-accou-6d6edb-adam-gaborjanis-projects.vercel.app",
diff --git a/supabase/functions/_shared/model-catalog.test.ts b/supabase/functions/_shared/model-catalog.test.ts
index 6c81af147..f18ab5ea5 100644
--- a/supabase/functions/_shared/model-catalog.test.ts
+++ b/supabase/functions/_shared/model-catalog.test.ts
@@ -7,30 +7,14 @@ import {
   MODEL_CATALOG,
 } from "./model-catalog.ts";
 
-const APPROVED_IDS = [
-  "openai/gpt-5.6-luna",
-  "google/gemini-3.8-flash",
-  "deepseek/deepseek-v4-flash-0731",
-  "anthropic/claude-sonnet-5",
-  "anthropic/claude-opus-5",
-  "openai/gpt-5.6-sol",
-  "openai/gpt-5.6-terra",
-  "deepseek/deepseek-v4-pro-0813",
-  "z-ai/glm-5.3-flash",
-  "meta/muse-spark-1.3",
-] as const;
-
-Deno.test("model catalog contains the ten approved exact OpenRouter IDs", () => {
-  const ids = MODEL_CATALOG.map((entry) => entry.id);
-  if (ids.length !== APPROVED_IDS.length) throw new Error(`unexpected catalog size: ${ids.length}`);
-  for (const id of APPROVED_IDS) {
-    const entry = getModelCatalogEntry(id);
-    if (!entry || !ids.includes(id)) throw new Error(`missing approved model: ${id}`);
-    if (!entry.name || entry.maxTokens <= 0) throw new Error(`incomplete model entry: ${id}`);
-    if (!entry.supportedEfforts.includes("low")) throw new Error(`low effort is not declared for ${id}`);
+Deno.test("every catalog model supports the forced trial effort and both defaults resolve to valid tiers", () => {
+  for (const entry of MODEL_CATALOG) {
+    if (getModelCatalogEntry(entry.id) !== entry) throw new Error(`catalog lookup lost ${entry.id}`);
+    if (!entry.supportedEfforts.includes("low")) throw new Error(`low effort is not declared for ${entry.id}`);
   }
-  if (DEFAULT_MODEL !== "openai/gpt-5.6-luna") throw new Error(`unexpected Basic default: ${DEFAULT_MODEL}`);
-  if (DEFAULT_PRO_MODEL !== "anthropic/claude-sonnet-5") throw new Error(`unexpected Pro default: ${DEFAULT_PRO_MODEL}`);
+  const basic = getModelCatalogEntry(DEFAULT_MODEL);
+  if (!basic || basic.isProOnly) throw new Error(`Basic default is missing or Pro-only: ${DEFAULT_MODEL}`);
+  if (!getModelCatalogEntry(DEFAULT_PRO_MODEL)) throw new Error(`Pro default is not in the catalog: ${DEFAULT_PRO_MODEL}`);
 });
 
 Deno.test("model catalog marks only the approved Pro entries as Pro-only", () => {
diff --git a/supabase/functions/_shared/prompts.test.ts b/supabase/functions/_shared/prompts.test.ts
index b778ba4ac..e747b9e36 100644
--- a/supabase/functions/_shared/prompts.test.ts
+++ b/supabase/functions/_shared/prompts.test.ts
@@ -6,7 +6,6 @@ import {
   FACTOIDS_PROMPT,
   GENERATE_PROMPT,
   JSON_RULES,
-  PRODUCT_IDENTITY,
   RESEARCH_RULES,
   SPARRING_PROMPT,
   boundPromptSources,
@@ -88,19 +87,6 @@ Deno.test("research citation rules appear exactly when research is attached", ()
   }
 });
 
-Deno.test("research and citation honesty rules are present when research is provided", () => {
-  const prompt = buildSystemPrompt({ feature: "ask", researchContext: "=== WEB RESEARCH RESULTS ===" });
-  if (!prompt.includes(RESEARCH_RULES.slice(0, 60))) throw new Error("research rules missing");
-  if (!prompt.includes("=== WEB RESEARCH RESULTS ===")) throw new Error("research context missing");
-});
-
-Deno.test("research rules are absent when no research was provided", () => {
-  const prompt = buildSystemPrompt({ feature: "brainstorm" });
-  if (prompt.includes("RESEARCH CITATION RULES:") || prompt.includes(RESEARCH_RULES.slice(0, 60))) {
-    throw new Error("citation rules leaked into a prompt without research");
-  }
-});
-
 Deno.test("admin, library, debate, and student-material rules follow the task layer in order", () => {
   const prompt = buildSystemPrompt({
     feature: "generate",
@@ -126,12 +112,6 @@ Deno.test("admin, library, debate, and student-material rules follow the task la
   if (!prompt.endsWith(UNTRUSTED_CONTENT_RULES)) throw new Error("student-material rules must close the prompt");
 });
 
-Deno.test("the retired per-user custom prompt has no prompt layer", () => {
-  const prompt = buildSystemPrompt({ feature: "ask", globalPrompt: "ADMIN RULE" });
-  if (prompt.includes("CUSTOM SYSTEM PROMPT")) throw new Error("custom prompt layer still rendered");
-  if (prompt.includes("STUDENT MATERIAL RULES")) throw new Error("material rules added without student material");
-});
-
 Deno.test("date context replaces the placeholder in every feature task prompt", () => {
   for (const feature of FEATURES) {
     const prompt = buildSystemPrompt({ feature, dateContext: "CURRENT DATE: Testdate" });
@@ -140,99 +120,6 @@ Deno.test("date context replaces the placeholder in every feature task prompt",
   }
 });
 
-Deno.test("product identity includes the humanizer style rules", () => {
-  if (!PRODUCT_IDENTITY.includes("HUMANIZER STYLE INSTRUCTIONS")) throw new Error("humanizer missing from identity layer");
-});
-
-Deno.test("feature prompts carry plain-language calibration", () => {
-  const expectedByFeature: Record<Feature, string> = {
-    generate: "Match the requested audience, length, and tone.",
-    attack: "Be direct and substantive, not hostile.",
-    brainstorm: "Use plain language and concrete examples.",
-    factoids: "Write evidence in clear, card-ready language.",
-    ask: "Answer the user's question first in plain language.",
-    sparring: "Difficulty changes argument pressure, not vocabulary.",
-    crossfire: "Ask one direct question at a time.",
-  };
-
-  for (const feature of FEATURES) {
-    const prompt = buildSystemPrompt({ feature });
-    if (!prompt.includes(expectedByFeature[feature])) {
-      throw new Error(`${feature}: plain-language calibration missing`);
-    }
-  }
-});
-
-Deno.test("Crossfire keeps replies short and easy to say aloud", () => {
-  const prompt = buildSystemPrompt({ feature: "crossfire" });
-  if (!prompt.includes("Keep the answer short and easy to say aloud.")) {
-    throw new Error("Crossfire speech-length guidance missing");
-  }
-  if (!prompt.includes("Questions should be one sentence. Answers should be no more than three short sentences.")) {
-    throw new Error("Crossfire sentence-length guidance missing");
-  }
-  if (!prompt.includes("Use the user's own words where possible")) {
-    throw new Error("Crossfire vocabulary guidance missing");
-  }
-  if (!prompt.includes("Tie each reply to the latest relevant transcript turn")) {
-    throw new Error("Crossfire transcript-targeting guidance missing");
-  }
-});
-
-Deno.test("shared language rules honor explicit output-language instructions", () => {
-  const prompt = buildSystemPrompt({ feature: "generate" });
-  if (!prompt.includes("Follow any explicit output-language instruction. Otherwise match the language used by the user.")) {
-    throw new Error("explicit output-language rule missing");
-  }
-});
-
-Deno.test("sparring system prompt defines difficulty and transcript-only scoring", () => {
-  const prompt = buildSystemPrompt({ feature: "sparring", dateContext: "CURRENT DATE: Testdate" });
-  if (!prompt.includes("Difficulty is a real control")) throw new Error("difficulty guidance missing");
-  if (!prompt.includes("clarity, organization, and time discipline")) throw new Error("typed delivery guidance missing");
-  if (!prompt.includes("Never invent citations")) throw new Error("transcript-only guidance missing");
-});
-
-Deno.test("sparring system prompt teaches the school 4-6-6-3 speaker duties", () => {
-  const prompt = buildSystemPrompt({ feature: "sparring", dateContext: "CURRENT DATE: August 31, 2026 (2026)" });
-  for (const expected of ["Introductor", "R1", "R2", "Conclusor", "no new arguments"]) {
-    if (!prompt.includes(expected)) throw new Error(`school role guidance missing: ${expected}`);
-  }
-});
-
-Deno.test("sparring system prompt keeps LD and PF duties separate from school roles", () => {
-  const prompt = buildSystemPrompt({ feature: "sparring", dateContext: "CURRENT DATE: August 31, 2026 (2026)" });
-  if (!prompt.includes('When format is "standard"')) throw new Error("school role condition missing");
-  if (!prompt.includes('When format is "ld" or "pf"')) throw new Error("LD/PF role condition missing");
-  if (!prompt.includes("rather than importing the school roles")) throw new Error("format separation missing");
-});
-
-Deno.test("sparring system prompt names the behavioral rules for school, LD, and PF", () => {
-  const prompt = buildSystemPrompt({ feature: "sparring" });
-  for (const expected of [
-    'When format is "standard"',
-    'When format is "ld" or "pf"',
-    "Difficulty is a real control",
-    "Follow the requested language for every prose field",
-  ]) {
-    if (!prompt.includes(expected)) throw new Error(`sparring control guidance missing: ${expected}`);
-  }
-  if (prompt.includes("RESEARCH CITATION RULES:")) throw new Error("sparring received research rules without research");
-});
-
-Deno.test("crossfire system prompt carries strict turn and debrief safety rules", () => {
-  const prompt = buildSystemPrompt({ feature: "crossfire" });
-  if (!prompt.includes("Each non-empty debrief item must cite only actual turn IDs")) {
-    throw new Error("crossfire turn-reference rule missing");
-  }
-  if (!prompt.includes("without insults, threats, harassment")) {
-    throw new Error("crossfire style safety rule missing");
-  }
-  if (prompt.includes("RESEARCH CITATION RULES:")) {
-    throw new Error("crossfire unexpectedly carries live research rules");
-  }
-});
-
 Deno.test("prompt source library is capped by count, per-source text, and aggregate text", () => {
   const sources = Array.from({ length: MAX_PROMPT_SOURCE_COUNT + 2 }, (_, index) => ({
     title: `Source ${index}`,
diff --git a/supabase/functions/_shared/prompts/prompt-examples.test.ts b/supabase/functions/_shared/prompts/prompt-examples.test.ts
index 7fa9d2b24..b41e4ac46 100644
--- a/supabase/functions/_shared/prompts/prompt-examples.test.ts
+++ b/supabase/functions/_shared/prompts/prompt-examples.test.ts
@@ -50,16 +50,6 @@ function promptsFor(example: typeof PROMPT_EXAMPLES[number]) {
   return { system, user, score };
 }
 
-Deno.test("every feature has two representative examples", () => {
-  for (const feature of Object.keys(QUALITY_RULES) as Feature[]) {
-    const examples = PROMPT_EXAMPLES.filter((example) => example.feature === feature);
-    assert(examples.length === 2, `${feature} needs exactly two examples`);
-    if (feature !== "ask" && feature !== "crossfire") {
-      assert(new Set(examples.map((example) => example.side)).size === 2, `${feature} examples must cover both sides`);
-    }
-  }
-});
-
 for (const example of PROMPT_EXAMPLES) {
   Deno.test(`prompt example ${example.id} carries its quality rules and allowed debate material`, () => {
     const { system, user, score } = promptsFor(example);
diff --git a/supabase/functions/admin/demo-code-contract.test.ts b/supabase/functions/admin/demo-code-contract.test.ts
index 081cadff2..5c6a38241 100644
--- a/supabase/functions/admin/demo-code-contract.test.ts
+++ b/supabase/functions/admin/demo-code-contract.test.ts
@@ -1,26 +1,57 @@
-import { getDemoLoginRole, isCreatableDemoRole } from "../_shared/demo-code.ts";
+for (const [key, value] of Object.entries({
+  SUPABASE_URL: "https://supabase.test",
+  SUPABASE_ANON_KEY: "test-anon-key",
+  SUPABASE_SERVICE_ROLE_KEY: "test-service-role-key",
+})) Deno.env.set(key, value);
 
-Deno.test("admin exposes the demo-code lifecycle contract", async () => {
-  const source = await Deno.readTextFile(new URL("./index.ts", import.meta.url));
-  const loginSource = await Deno.readTextFile(new URL("../demo-code-login/index.ts", import.meta.url));
+const { handleRequest } = await import("./index.ts");
+const { getDemoLoginRole, hashDemoCode, isCreatableDemoRole } = await import("../_shared/demo-code.ts");
 
-  for (const action of ["demo-codes", "create-demo-code", "disable-demo-code", "reset-demo-code"]) {
-    if (!source.includes(`action === "${action}"`)) {
-      throw new Error(`missing admin action: ${action}`);
+async function createDemoCode(body: Record<string, unknown>) {
+  const inserts: Array<Record<string, unknown>> = [];
+  const originalFetch = globalThis.fetch;
+  globalThis.fetch = (async (input: Request | URL | string, init?: RequestInit) => {
+    const request = input instanceof Request ? input : new Request(input, init);
+    const url = new URL(request.url);
+    if (url.pathname === "/auth/v1/user") return Response.json({ id: "admin-1", aud: "authenticated" });
+    if (url.pathname === "/rest/v1/user_roles") return Response.json({ role: "admin" });
+    if (url.pathname === "/rest/v1/demo_access_codes" && request.method === "POST") {
+      const row = await request.json() as Record<string, unknown>;
+      inserts.push(row);
+      return Response.json({ id: "code-1", label: row.label, email: row.email, role: row.role }, { status: 201 });
     }
+    throw new Error(`Unexpected request: ${request.method} ${url}`);
+  }) as typeof fetch;
+  try {
+    const response = await handleRequest(new Request("http://127.0.0.1/functions/v1/admin?action=create-demo-code", {
+      method: "POST",
+      headers: { Authorization: "Bearer admin-token", "Content-Type": "application/json" },
+      body: JSON.stringify(body),
+    }));
+    return { inserts, response, payload: await response.json() as { code?: string; error?: string } };
+  } finally {
+    globalThis.fetch = originalFetch;
   }
+}
 
-  if (!source.includes("codeHash") || !source.includes("generateDemoCode")) {
-    throw new Error("admin creation must hash and generate demo codes");
+Deno.test("create-demo-code returns the raw code once, stores only its hash, and refuses other roles", async () => {
+  const { inserts, response, payload } = await createDemoCode({ label: "Tournament room" });
+  if (response.status !== 201) throw new Error(`create returned ${response.status}: ${JSON.stringify(payload)}`);
+  const code = payload.code ?? "";
+  if (!/^DEMO-[A-Z0-9]{4}-[A-Z0-9]{4}$/.test(code)) throw new Error(`create did not return a usable code: ${code}`);
+  if (inserts.length !== 1) throw new Error(`expected one insert, got ${inserts.length}`);
+  const [row] = inserts;
+  if (row.code_hash !== await hashDemoCode(code)) throw new Error("the stored hash does not match the returned code");
+  if (row.role !== "user") throw new Error(`demo code stored role ${String(row.role)}`);
+  const stored = JSON.stringify(row).toLowerCase();
+  const secret = code.slice(5).replace("-", "").toLowerCase();
+  if (stored.includes(code.toLowerCase()) || stored.includes(secret)) {
+    throw new Error("the raw code, or the assigned email, reveals the code in the stored row");
   }
-  if (!source.includes("code: rawCode")) {
-    throw new Error("create must return the raw code in its one-time response");
-  }
-  if (source.includes("rawCode.replaceAll")) {
-    throw new Error("the assigned email must not reveal or derive the raw code");
-  }
-  if (!loginSource.includes("isDemoUserForCode") || !loginSource.includes("email_conflict")) {
-    throw new Error("demo login must not reuse an unrelated existing account");
+
+  const refused = await createDemoCode({ label: "Tournament room", role: "admin" });
+  if (refused.response.status !== 400 || refused.inserts.length !== 0) {
+    throw new Error(`admin-role demo code returned ${refused.response.status} with ${refused.inserts.length} inserts`);
   }
 });
 
diff --git a/supabase/functions/ai-stream/prompt.test.ts b/supabase/functions/ai-stream/prompt.test.ts
index c28e7ac52..7f008e2f1 100644
--- a/supabase/functions/ai-stream/prompt.test.ts
+++ b/supabase/functions/ai-stream/prompt.test.ts
@@ -1,4 +1,3 @@
-import { isAskStreamingModeAllowed } from "../_shared/control-enforcement.ts";
 import {
   buildStreamingAskSystemPrompt,
   PRODUCT_IDENTITY,
@@ -55,14 +54,3 @@ Deno.test("streaming Ask keeps the shared identity, language, and evidence rules
     "OUTPUT RULES: Return ONLY a valid JSON object",
   );
 });
-
-Deno.test("streaming Ask still allows only general mode", () => {
-  if (!isAskStreamingModeAllowed("general")) {
-    throw new Error("general Ask mode was rejected");
-  }
-  for (const mode of ["clarify", "summarize", "proscons", "argumentmap"]) {
-    if (isAskStreamingModeAllowed(mode)) {
-      throw new Error(`${mode} Ask mode was allowed to stream`);
-    }
-  }
-});
diff --git a/supabase/functions/ai/control-matrix.test.ts b/supabase/functions/ai/control-matrix.test.ts
index 70b3c59a3..db941a48e 100644
--- a/supabase/functions/ai/control-matrix.test.ts
+++ b/supabase/functions/ai/control-matrix.test.ts
@@ -10,7 +10,6 @@ import {
   enforceAttackControls,
   enforceBrainstormControls,
   enforceGenerateControls,
-  isAskStreamingModeAllowed,
 } from "../_shared/control-enforcement.ts";
 import { buildSearchRequests } from "../_shared/source-quality.ts";
 
@@ -22,38 +21,6 @@ function assert(condition: boolean, label: string) {
   if (!condition) throw new Error(`[${label}] behavioral effect missing`);
 }
 
-Deno.test("generate controls propagate to prompt and post-processing", () => {
-  const genBrief = buildUserPrompt("generate", { motion: "M", side: "pro", length: "brief", role: "r1" }, "");
-  assertIncludes(genBrief, "Length: brief", "generate.length payload");
-  assertIncludes(genBrief, "Length Instruction: Return exactly 2 contentions", "generate.length prompt");
-  const out: Record<string, unknown> = { contentions: [{}, {}, {}], metadata: {} };
-  enforceGenerateControls(out, "pro", "custom", "brief", "intro");
-  assert((out.contentions as unknown[]).length === 2, "generate.length post-processing");
-
-  const underlength: Record<string, unknown> = { contentions: [{}], metadata: {} };
-  let rejected = false;
-  try {
-    enforceGenerateControls(underlength, "pro", "custom", "comprehensive", "r1");
-  } catch (error) {
-    rejected = error instanceof Error && error.message.includes("requires exactly 4");
-  }
-  assert(rejected, "generate.length underlength responses fail closed");
-  assert((underlength.contentions as unknown[]).length === 1, "generate.length never fabricates contentions");
-
-  assertIncludes(
-    buildUserPrompt("generate", { motion: "M", side: "pro", audience: "advanced", role: "r1" }, ""),
-    "Audience Instruction: Assume an advanced debater",
-    "generate.audience",
-  );
-  assertIncludes(
-    buildUserPrompt("generate", { motion: "M", side: "pro", tone: "aggressive", role: "r1" }, ""),
-    "Tone Instruction: Use sharper strategic phrasing",
-    "generate.tone",
-  );
-  assertIncludes(buildUserPrompt("generate", { motion: "M", side: "con", role: "r1" }, ""), "Side: con", "generate.side");
-  assertIncludes(buildUserPrompt("generate", { motion: "M", side: "pro", role: "conc" }, ""), "Role: conc", "generate.role");
-});
-
 Deno.test("generate length and role controls preserve the output contract", () => {
   const targets = { brief: 2, standard: 3, comprehensive: 4 } as const;
   for (const length of ["brief", "standard", "comprehensive"] as const) {
@@ -70,29 +37,6 @@ Deno.test("generate length and role controls preserve the output contract", () =
   }
 });
 
-Deno.test("attack controls propagate to prompt and post-processing", () => {
-  const attackOff = buildUserPrompt("attack", { caseText: "C", detectFallacies: false, analyzeWeighing: false }, "");
-  assertIncludes(attackOff, "Detect Fallacies: disabled", "attack.fallacies payload");
-  assertIncludes(attackOff, "Analyze Weighing: disabled", "attack.weighing payload");
-  const out: Record<string, unknown> = {
-    fallaciesDetected: [{}],
-    weighingAnalysis: { currentWeighing: "x", missingComparisons: ["y"], improvementSuggestions: ["z"] },
-  };
-  enforceAttackControls(out, false, false);
-  assert((out.fallaciesDetected as unknown[]).length === 0, "attack.fallacies post-processing");
-
-  assertIncludes(
-    buildUserPrompt("attack", { caseText: "C", aggressiveness: "ruthless", judgeParadigm: "policy" }, ""),
-    "Attack Intensity: ruthless",
-    "attack.intensity",
-  );
-  assertIncludes(
-    buildUserPrompt("attack", { caseText: "C", judgeParadigm: "values" }, ""),
-    "Judge Paradigm: values",
-    "attack.paradigm",
-  );
-});
-
 Deno.test("attack toggle controls retain or clear only their requested sections", () => {
   for (const detectFallacies of [true, false]) {
     for (const analyzeWeighing of [true, false]) {
@@ -119,18 +63,6 @@ Deno.test("attack toggle controls retain or clear only their requested sections"
   }
 });
 
-Deno.test("brainstorm controls propagate to prompt and post-processing", () => {
-  assertIncludes(
-    buildUserPrompt("brainstorm", { motion: "M", side: "pro", outputMode: "buckets" }, ""),
-    "Output Mode: buckets",
-    "brainstorm.outputMode payload",
-  );
-  const out: Record<string, unknown> = { topFive: [], mindmap: [], buckets: [] };
-  enforceBrainstormControls(out, "pro", "buckets");
-  assert("buckets" in out && !("topFive" in out), "brainstorm.outputMode post-processing");
-  assertIncludes(buildUserPrompt("brainstorm", { motion: "M", side: "both", outputMode: "topfive" }, ""), "Side: both", "brainstorm.side");
-});
-
 Deno.test("brainstorm output mode controls keep only the requested branch", () => {
   for (const side of ["pro", "con", "both"] as const) {
     for (const outputMode of ["topfive", "mindmap", "buckets"] as const) {
@@ -145,23 +77,6 @@ Deno.test("brainstorm output mode controls keep only the requested branch", () =
   }
 });
 
-Deno.test("factoids controls propagate to prompt and query construction", () => {
-  assertIncludes(
-    buildUserPrompt("factoids", { claim: "C", region: "EU", sourceType: "government", timeframe: "2024-2026" }, ""),
-    "Source Type: government",
-    "factoids.sourceType prompt",
-  );
-  assertIncludes(
-    buildUserPrompt("factoids", { claim: "C", region: "EU", timeframe: "2024-2026" }, ""),
-    "Timeframe: 2024-2026",
-    "factoids.timeframe prompt",
-  );
-  const govRequests = buildSearchRequests("C", "EU", "government", "2024-2026");
-  assert(govRequests.some((request) => request.includeDomains?.includes("energy.gov")), "factoids.sourceType retrieval");
-  assert(govRequests.some((request) => request.startPublishedDate?.startsWith("2024")), "factoids.timeframe retrieval");
-  assert(govRequests.some((request) => request.endPublishedDate?.startsWith("2026")), "factoids.timeframe upper bound");
-});
-
 Deno.test("factoids matrix preserves legal, statistics, academic, recent, direction, and count effects", () => {
   const legalRequests = buildSearchRequests("Is this law constitutional?", "EU", "government", "2024-2026");
   assert(legalRequests.some((request) => request.query.includes("official law court ruling")), "factoids.legal query");
@@ -190,55 +105,6 @@ Deno.test("factoids matrix preserves legal, statistics, academic, recent, direct
   assertIncludes(againstPrompt, "Source Count: 12", "factoids.sourceCount prompt");
 });
 
-Deno.test("ask toggles and modes appear verbatim in the request prompt", () => {
-  assertIncludes(buildUserPrompt("ask", { message: "Hi", mode: "clarify" }, ""), "Mode Guidance:", "ask.mode payload");
-
-  const allOn = buildAskBasePrompt({
-    message: "Hi",
-    mode: "clarify",
-    citationMode: true,
-    webSearchEnabled: true,
-    prosConsMode: true,
-    argumentMapMode: true,
-    researchAvailable: true,
-  });
-  assertIncludes(allOn, "Citation Mode: ON", "ask.citationMode payload");
-  assertIncludes(allOn, "Web Search: ENABLED", "ask.webSearch payload");
-  assertIncludes(allOn, "Pros/Cons: ON", "ask.prosCons payload");
-  assertIncludes(allOn, "Argument Map: ON", "ask.argumentMap payload");
-  assertIncludes(allOn, "Research Context: AVAILABLE", "ask.research gating");
-
-  const allOff = buildAskBasePrompt({
-    message: "Hi",
-    mode: "general",
-    citationMode: false,
-    webSearchEnabled: false,
-    prosConsMode: false,
-    argumentMapMode: false,
-    researchAvailable: false,
-  });
-  assertIncludes(allOff, "Citation Mode: OFF", "ask.citationMode off state");
-  assertIncludes(allOff, "Web Search: DISABLED", "ask.webSearch off state");
-  assertIncludes(allOff, "Pros/Cons: OFF", "ask.prosCons off state");
-  assertIncludes(allOff, "Argument Map: OFF", "ask.argumentMap off state");
-  assertIncludes(allOff, "Research Context: NONE", "ask.research off state");
-
-  const out: Record<string, unknown> = {
-    response: "r",
-    followUpQuestions: ["q"],
-    uncertainties: [] as string[],
-    prosConsAnalysis: { pros: ["p"], cons: ["c"] },
-    argumentMap: { mainClaim: "m", supportingPoints: [], counterpoints: [], assumptions: [] },
-  };
-  enforceAskControls(out, { mode: "clarify", citationMode: true, prosConsMode: true, argumentMapMode: true });
-  assert((out.uncertainties as string[]).length === 0, "ask.clarify quiet when follow-ups exist");
-  assert("prosConsAnalysis" in out && "argumentMap" in out, "ask toggles on keep sections");
-
-  const stripped: Record<string, unknown> = { response: "r", followUpQuestions: [], uncertainties: [], citations: [{}] };
-  enforceAskControls(stripped, { mode: "general" });
-  assert(Array.isArray(stripped.citations) && stripped.citations.length === 0, "ask citations off clears list");
-});
-
 Deno.test("ask matrix preserves every mode, toggle, research, and output effect", () => {
   const commonLanguageRule = "Follow any explicit output-language instruction. Otherwise match the language used by the user.";
 
@@ -315,24 +181,3 @@ Deno.test("ask matrix preserves every mode, toggle, research, and output effect"
     }
   }
 });
-
-Deno.test("prompt matrix applies the explicit Hungarian output contract", () => {
-  const instruction = "Language: Hungarian (hu) - Write ALL output in this language.";
-  for (const [feature, input] of [
-    ["generate", { motion: "M", language: "hu" }],
-    ["attack", { caseText: "C", language: "hu" }],
-    ["brainstorm", { motion: "M", language: "hu" }],
-    ["factoids", { claim: "C", language: "hu" }],
-    ["ask", { message: "Q", language: "hu" }],
-    ["sparring", { motion: "M", language: "hu" }],
-  ] as const) {
-    assertIncludes(buildUserPrompt(feature, input, ""), instruction, `${feature}.language`);
-  }
-});
-
-Deno.test("only plain general ask mode is eligible for streaming", () => {
-  for (const mode of ["clarify", "summarize", "proscons", "argumentmap"]) {
-    assert(!isAskStreamingModeAllowed(mode), `ask.${mode} streaming bypass`);
-  }
-  assert(isAskStreamingModeAllowed("general"), "ask.general streaming eligibility");
-});
diff --git a/supabase/functions/ai/handler-research.test.ts b/supabase/functions/ai/handler-research.test.ts
index 97110a756..7732ba838 100644
--- a/supabase/functions/ai/handler-research.test.ts
+++ b/supabase/functions/ai/handler-research.test.ts
@@ -856,61 +856,6 @@ Deno.test("streaming rejects provider errors and incomplete EOFs, while acceptin
   }
 });
 
-Deno.test("cancelled streams keep observed cost unknown", async () => {
-  const originalFetch = globalThis.fetch;
-  const usageRows: Array<Record<string, unknown>> = [];
-  const encoder = new TextEncoder();
-  let providerStartedResolve!: () => void;
-  const providerStarted = new Promise<void>((resolve) => providerStartedResolve = resolve);
-  globalThis.fetch = (async (input: Request | URL | string, init?: RequestInit) => {
-    const url = new URL(input instanceof Request ? input.url : String(input));
-    const supabaseResponse = supabaseTestResponse(url);
-    if (supabaseResponse) {
-      if (url.pathname.includes("/rest/v1/ai_requests")) usageRows.push(JSON.parse(String(init?.body)) as Record<string, unknown>);
-      return supabaseResponse;
-    }
-    if (url.href === "https://openrouter.ai/api/v1/chat/completions") {
-      const body = new ReadableStream<Uint8Array>({
-        start(controller) {
-          controller.enqueue(encoder.encode(`data: ${JSON.stringify({ choices: [{ delta: { content: "partial" } }] })}\n\n`));
-          controller.enqueue(encoder.encode(`data: ${JSON.stringify({ choices: [], usage: { prompt_tokens: 2, completion_tokens: 1, cost: 0.25 } })}\n\n`));
-          providerStartedResolve();
-          init?.signal?.addEventListener("abort", () => controller.error(new DOMException("Upstream aborted", "AbortError")), { once: true });
-        },
-        pull() {
-          return new Promise<void>(() => {});
-        },
-      });
-      return new Response(body, { headers: { "Content-Type": "text/event-stream" } });
-    }
-    throw new Error(`Unexpected request: ${url}`);
-  }) as typeof fetch;
-
-  const testState = globalThis as typeof globalThis & { __testTier?: string };
-  const originalTier = testState.__testTier;
-  testState.__testTier = "trial";
-  const caller = new AbortController();
-  try {
-    const response = await handleStreamRequest(new Request("http://127.0.0.1/functions/v1/ai-stream", {
-      method: "POST",
-      headers: { Authorization: "Bearer test-user-token", "Content-Type": "application/json" },
-      body: JSON.stringify({ feature: "ask", model: "openai/gpt-5.6-luna", input: { message: "Hello", mode: "general" } }),
-      signal: caller.signal,
-    }));
-    const read = response.text();
-    await providerStarted;
-    await new Promise((resolve) => setTimeout(resolve, 5));
-    caller.abort();
-    await read;
-    const row = usageRows.at(-1);
-    if (row?.status !== "cancelled" || row.cost_usd !== null) throw new Error(`cancelled stream was billed: ${JSON.stringify(row)}`);
-  } finally {
-    globalThis.fetch = originalFetch;
-    if (originalTier === undefined) delete testState.__testTier;
-    else testState.__testTier = originalTier;
-  }
-});
-
 Deno.test("cancelled JSON repair keeps observed tokens but makes the total cost unknown", async () => {
   const originalFetch = globalThis.fetch;
   const usageRows: Array<Record<string, unknown>> = [];
diff --git a/supabase/functions/ai/prompt-builder.test.ts b/supabase/functions/ai/prompt-builder.test.ts
index c9c6847d2..04cf305a3 100644
--- a/supabase/functions/ai/prompt-builder.test.ts
+++ b/supabase/functions/ai/prompt-builder.test.ts
@@ -113,6 +113,7 @@ Deno.test("attack prompt includes intensity, paradigm, and toggle states", () =>
 Deno.test("every AI feature carries an explicit Hungarian output instruction", () => {
   const instruction = "Language: Hungarian (hu) - Write ALL output in this language.";
   const prompts = [
+    buildUserPrompt("generate", { motion: "MOTION", language: "hu" }, ""),
     buildUserPrompt("attack", { caseText: "CASE", language: "hu" }, ""),
     buildUserPrompt("brainstorm", { motion: "MOTION", language: "hu" }, ""),
     buildUserPrompt("factoids", { claim: "CLAIM", language: "hu" }, ""),
@@ -197,22 +198,6 @@ Deno.test("brainstorm prompt matrix preserves both one-side and comparative inpu
   }
 });
 
-Deno.test("factoids prompt includes source filters and language", () => {
-  const prompt = buildUserPrompt("factoids", {
-    claim: "Solar is cheaper than coal",
-    region: "United States",
-    sourceType: "government",
-    timeframe: "2020-2025",
-    language: "en",
-  }, "SEARCH CONTEXT");
-
-  assertIncludes(prompt, "Find evidence in favor of this statement: \"Solar is cheaper than coal\"");
-  assertIncludes(prompt, "Region: United States");
-  assertIncludes(prompt, "Source Type: government");
-  assertIncludes(prompt, "Timeframe: 2020-2025");
-  assertIncludes(prompt, "Language: English (en)");
-});
-
 Deno.test("factoids prompt matrix preserves legal, statistics, academic, recent, direction, and count inputs", () => {
   const fixtures = [
     {
@@ -375,36 +360,6 @@ Deno.test("sparring score prompt has no current turn", () => {
   assertIncludes(prompt, "Current Turn: none for scoring");
 });
 
-Deno.test("crossfire next-turn prompt carries the expected reply and real turn IDs", () => {
-  const prompt = buildCrossfireNextTurnPrompt({
-    config: {
-      resolution: "Cities should ban private cars downtown.",
-      argument: "Private cars create congestion and unsafe streets.",
-      mode: "question-ai",
-      style: "aggressive",
-      durationSeconds: 300,
-      useSourceLibrary: false,
-      seedQuestions: ["What is the mechanism?"],
-    },
-    transcript: [{
-      id: "T1",
-      sequence: 1,
-      speaker: "user",
-      kind: "question",
-      text: "What is the mechanism?",
-      createdAt: 1,
-    }],
-    expectedReply: "answer",
-    language: "hu",
-  });
-
-  assertIncludes(prompt, "The next model reply must be type \"answer\"");
-  assertIncludes(prompt, "turn-id=T1");
-  assertIncludes(prompt, "aggressive");
-  assertIncludes(prompt, "Do not insult, threaten, harass");
-  assertIncludes(prompt, "Language: Hungarian (hu) - Write ALL output in this language.");
-});
-
 Deno.test("crossfire next-turn builder preserves all three style controls", () => {
   const styleGuidance = {
     cooperative: "Do not force a concession",
diff --git a/supabase/tests/daily_usage_quota_test.sql b/supabase/tests/daily_usage_quota_test.sql
index 7219d4070..14cb94513 100644
--- a/supabase/tests/daily_usage_quota_test.sql
+++ b/supabase/tests/daily_usage_quota_test.sql
@@ -1,17 +1,11 @@
 BEGIN;
-SELECT plan(15);
+SELECT plan(14);
 
 INSERT INTO auth.users (id)
 VALUES
   ('44444444-4444-4444-8444-444444444444'),
   ('55555555-5555-4555-8555-555555555555');
 
-SELECT has_column(
-  'public',
-  'daily_usage_counters',
-  'quota_key',
-  'daily usage counters identify the quota being consumed'
-);
 SELECT col_not_null(
   'public',
   'daily_usage_counters',
diff --git a/supabase/tests/workspace_collaboration_test.sql b/supabase/tests/workspace_collaboration_test.sql
index ff475bc48..02c446add 100644
--- a/supabase/tests/workspace_collaboration_test.sql
+++ b/supabase/tests/workspace_collaboration_test.sql
@@ -1,44 +1,12 @@
 BEGIN;
-SELECT plan(19);
+SELECT plan(12);
 
-SELECT has_table(
-  'private',
-  'workspace_document_state',
-  'canonical workspace document state is private'
-);
-SELECT has_table(
-  'private',
-  'workspace_document_updates',
-  'durable workspace updates are private'
-);
-SELECT has_function(
-  'public',
-  'create_workspace_document',
-  ARRAY['uuid', 'text', 'text', 'uuid', 'bigint', 'uuid'],
-  'members create or duplicate files through one transactional RPC'
-);
 SELECT has_trigger(
   'public',
   'workspace_members',
   'workspace_members_notify_access_revoked_after_delete',
   'member removal notifies the collaboration fence after commit'
 );
-SELECT has_table('public', 'workspace_versions', 'version metadata is member-readable');
-SELECT has_function(
-  'public', 'create_workspace_version',
-  ARRAY['uuid', 'uuid', 'text', 'bigint', 'uuid'],
-  'members create named or automatic versions through one RPC'
-);
-SELECT has_function(
-  'public', 'restore_workspace_version',
-  ARRAY['uuid', 'uuid', 'uuid', 'bigint', 'uuid'],
-  'restore compares the previewed sequence through one RPC'
-);
-SELECT has_function(
-  'public', 'get_workspace_version_snapshot',
-  ARRAY['uuid', 'uuid', 'uuid'],
-  'preview returns private version bytes only through an authorized RPC'
-);
 
 INSERT INTO auth.users (id) VALUES
   ('71111111-1111-4111-8111-111111111111'),
diff --git a/supabase/tests/workspace_invites_test.sql b/supabase/tests/workspace_invites_test.sql
index 90327e009..03b5780a7 100644
--- a/supabase/tests/workspace_invites_test.sql
+++ b/supabase/tests/workspace_invites_test.sql
@@ -1,5 +1,5 @@
 BEGIN;
-SELECT plan(48);
+SELECT plan(46);
 
 INSERT INTO auth.users (id, email, email_confirmed_at)
 VALUES
@@ -25,8 +25,6 @@ SELECT set_config(
 INSERT INTO public.workspace_members (workspace_id, user_id)
 VALUES (current_setting('test.workspace_id')::uuid, '62222222-2222-4222-8222-222222222222');
 
-SELECT has_table('private', 'workspace_invites', 'private workspace invites exist');
-SELECT has_table('private', 'workspace_invite_attempts', 'private redemption attempts exist');
 SELECT ok(
   NOT has_table_privilege('anon', 'private.workspace_invites', 'SELECT,INSERT,UPDATE,DELETE')
     AND NOT has_table_privilege('authenticated', 'private.workspace_invites', 'SELECT,INSERT,UPDATE,DELETE')
diff --git a/supabase/tests/workspace_practice_test.sql b/supabase/tests/workspace_practice_test.sql
index ac48de43d..c42820f50 100644
--- a/supabase/tests/workspace_practice_test.sql
+++ b/supabase/tests/workspace_practice_test.sql
@@ -1,16 +1,6 @@
 BEGIN;
-SELECT plan(32);
+SELECT plan(22);
 
-SELECT has_table('public', 'workspace_sources', 'shared sources exist');
-SELECT has_table('public', 'workspace_threads', 'shared threads exist');
-SELECT has_table('public', 'workspace_thread_messages', 'thread messages exist');
-SELECT has_table('public', 'workspace_artifacts', 'practice artifacts exist');
-SELECT has_function('public', 'save_workspace_source', ARRAY['uuid','uuid','text','text','text','jsonb','jsonb'], 'sources use an authorized RPC');
-SELECT has_function('public', 'create_workspace_thread', ARRAY['uuid','uuid','text'], 'threads use an authorized RPC');
-SELECT has_function('public', 'save_workspace_thread_message', ARRAY['uuid','uuid','uuid','uuid','text','text','text'], 'messages use an authorized RPC');
-SELECT has_function('public', 'start_workspace_thread_generation', ARRAY['uuid','uuid','uuid','uuid','uuid','uuid','text'], 'thread generation starts atomically');
-SELECT has_function('public', 'complete_workspace_thread_generation', ARRAY['uuid','uuid','uuid','uuid','text','text'], 'assistant completion stays server-owned');
-SELECT has_function('public', 'save_workspace_artifact', ARRAY['uuid','uuid','uuid','uuid','bigint','text','text','jsonb','jsonb','jsonb'], 'artifacts use an authorized RPC');
 SELECT ok(
   NOT has_function_privilege('anon', 'public.start_workspace_thread_generation(uuid,uuid,uuid,uuid,uuid,uuid,text)', 'EXECUTE')
     AND NOT has_function_privilege('anon', 'public.complete_workspace_thread_generation(uuid,uuid,uuid,uuid,text,text)', 'EXECUTE')
diff --git a/supabase/tests/workspace_review_test.sql b/supabase/tests/workspace_review_test.sql
index bb49f8707..02725fe26 100644
--- a/supabase/tests/workspace_review_test.sql
+++ b/supabase/tests/workspace_review_test.sql
@@ -1,14 +1,5 @@
 BEGIN;
-SELECT plan(25);
-
-SELECT has_table('public', 'workspace_proposals', 'proposal metadata is persisted');
-SELECT has_table('public', 'workspace_comments', 'inline comments are persisted');
-SELECT has_table('public', 'workspace_comment_replies', 'comment replies are persisted');
-SELECT has_table('public', 'workspace_notifications', 'mention notifications are persisted');
-SELECT has_function('public', 'create_workspace_proposal', ARRAY['uuid', 'uuid', 'uuid', 'bigint', 'bigint', 'jsonb'], 'proposal creation is authorized');
-SELECT has_function('public', 'create_workspace_comment', ARRAY['uuid', 'uuid', 'uuid', 'jsonb', 'text', 'uuid[]'], 'comment creation is authorized');
-SELECT has_function('public', 'reply_workspace_comment', ARRAY['uuid', 'uuid', 'uuid', 'text'], 'comment replies are authorized');
-SELECT has_function('public', 'resolve_workspace_comment', ARRAY['uuid', 'uuid', 'boolean'], 'comment resolution is authorized');
+SELECT plan(17);
 
 INSERT INTO auth.users (id) VALUES
   ('81111111-1111-4111-8111-111111111111'),
diff --git a/supabase/tests/workspaces_rls_test.sql b/supabase/tests/workspaces_rls_test.sql
index 37704003b..4d4f01e63 100644
--- a/supabase/tests/workspaces_rls_test.sql
+++ b/supabase/tests/workspaces_rls_test.sql
@@ -1,5 +1,5 @@
 BEGIN;
-SELECT plan(36);
+SELECT plan(32);
 
 INSERT INTO auth.users (id)
 VALUES
@@ -8,11 +8,6 @@ VALUES
   ('33333333-3333-4333-8333-333333333333'),
   ('44444444-4444-4444-8444-444444444444');
 
-SELECT has_table('public', 'workspaces', 'workspaces exists');
-SELECT has_table('public', 'workspace_members', 'workspace_members exists');
-SELECT has_table('public', 'workspace_documents', 'workspace_documents exists');
-SELECT has_table('public', 'workspace_audit_events', 'workspace_audit_events exists');
-
 SELECT results_eq(
   $$SELECT relrowsecurity
     FROM pg_class