diff --git a/docs/architecture.md b/docs/architecture.md
index daa95d22e..a9a91b862 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -17,7 +17,7 @@ Browser or Capacitor
 
 [`src/bootstrap.ts`](../src/bootstrap.ts) imports the application entry immediately, then schedules Jam after window load and idle time. [`src/main.tsx`](../src/main.tsx) mounts the application before starting native runtime handling, observability, native URL handling, and service-worker registration. Vercel browser telemetry is disabled inside the native shell and loaded behind a separate Suspense boundary.
 
-[`src/App.tsx`](../src/App.tsx) owns routes and top-level providers. Pages are lazy loaded. Public routes cover marketing, legal pages, login, sources, and shared content. `/app/*` routes pass through `RequireAuth` and include the main tools, history, library, timer, sparring, flowchart, settings, and administration.
+[`src/App.tsx`](../src/App.tsx) owns routes and top-level providers. Pages are lazy loaded. Public routes cover marketing, legal pages, login, sources, and shared content. `/app/*` routes pass through `RequireAuth` and include the main tools, the Current Debate dashboard (`/app/debate`), history, library, timer, sparring, flowchart, settings, and administration. The header holds only Home, the Current debate menu, Library, History, and the language, theme, and Settings controls; tools are launched from Home and the dashboard.
 
 `AuthProvider`, TanStack Query, theme and motion providers, toast systems, the offline indicator, and the route error boundary wrap the routed application.
 
@@ -25,6 +25,8 @@ Browser or Capacitor
 
 [`src/lib/stores/session-store.ts`](../src/lib/stores/session-store.ts) owns active AI results, conversations, saved work, sources, folders, flowcharts, autosave state, and persisted form state. It persists selected local state and hydrates authenticated rows from Supabase.
 
+[`src/lib/stores/debate-store.ts`](../src/lib/stores/debate-store.ts) owns the signed-in user's debates, the Current Debate pointer, session-only one-off mode, and the shared Switch and Start dialogs. Every source and every automatically recorded result carries a `debateId`; one-off work and unsorted legacy rows have none. The Library, History, the AI source context, and discovered-source autosave all read from one debate at a time, so material never crosses debates. Motion-bearing tools confirm a motion that differs from the Current Debate (switch, create, or use once) before submitting, and the app blocks with Continue, Start new, or Switch after five days without work in the Current Debate.
+
 [`src/lib/stores/settings-store.ts`](../src/lib/stores/settings-store.ts) owns language, theme, feature provider settings, prompts, and research preferences. It persists locally and synchronizes authenticated settings.
 
 [`src/lib/stores/sparring-store.ts`](../src/lib/stores/sparring-store.ts) owns active sparring rounds in session storage and hydrates completed sessions from Supabase.
@@ -68,9 +70,9 @@ Shared research, source ranking, URL validation, and prompt construction live un
 
 The import endpoint validates public HTTP URLs, resolves redirect targets, blocks private networks, and enforces response timeout, content type, and size limits. Research paths bound source count and content before prompt construction.
 
-Authenticated personal AI requests carry stable source IDs instead of source content. The Edge Function loads matching active rows for the authenticated user, bounds their title, content, origin, and type, then passes that context to ranking and prompt construction. Jev scores relevance, importance, and evidence strength after the existing deterministic quality floor, while failures preserve the prior order. Generate also records a bounded source-use snapshot in the saved case output. Semantic counts and the latest case-use flag live in the existing source `metadata` JSON, so the Library can default to Smart ordering without a schema migration.
+Authenticated personal AI requests carry stable source IDs instead of source content, drawn only from the target debate's active sources; one-off requests send none. The Edge Function loads matching active rows for the authenticated user, bounds their title, content, origin, and type, then passes that context to ranking and prompt construction. Jev scores relevance, importance, and evidence strength after the existing deterministic quality floor, while failures preserve the prior order. Generate also records a bounded source-use snapshot in the saved case output. Semantic counts and the latest case-use flag live in the existing source `metadata` JSON, so the Library can default to Smart ordering without a schema migration.
 
-Ordinary Ask remains stateless while a conversation is in progress. The browser sends only the newest eight messages within a UTF-8 byte budget. Pressing Save persists the chat and its messages in Supabase; Workspace threads use their separate durable server-side context path. Legacy local-only sources are not sent to the authenticated AI endpoint because they have no persisted UUID to authorize and load.
+Ordinary Ask remains stateless while a conversation is in progress. The browser sends only the newest eight messages within a UTF-8 byte budget. Inside a debate, each finished exchange is recorded into one chat for that debate; in one-off mode, pressing Save persists the chat and its messages; Workspace threads use their separate durable server-side context path. Legacy local-only sources are not sent to the authenticated AI endpoint because they have no persisted UUID to authorize and load.
 
 ## Database boundary
 
diff --git a/e2e/admin-announcements.spec.ts b/e2e/admin-announcements.spec.ts
index 438c8f063..3e9089dfb 100644
--- a/e2e/admin-announcements.spec.ts
+++ b/e2e/admin-announcements.spec.ts
@@ -110,8 +110,8 @@ test('keeps announcements stable across routes and refreshes on a full reload',
   await page.getByRole('button', { name: 'Dismiss announcement: Scheduled maintenance' }).click();
   await expect(page.getByRole('heading', { name: 'Scheduled maintenance' })).toHaveCount(0);
 
-  await openAppNav(page, 'Attack');
-  await expect(page.getByRole('heading', { name: 'Attack', exact: true })).toBeVisible();
+  await openAppNav(page, 'Library');
+  await expect(page.getByRole('heading', { name: 'Source Library', exact: true })).toBeVisible();
   await openAppNav(page, 'Home');
   await expect(page.getByRole('main').getByRole('heading', { name: 'DebateLab', exact: true })).toBeVisible();
   expect(listRequestCount()).toBe(1);
diff --git a/e2e/animation-polish.spec.ts b/e2e/animation-polish.spec.ts
index 17886e968..9061985a7 100644
--- a/e2e/animation-polish.spec.ts
+++ b/e2e/animation-polish.spec.ts
@@ -1,5 +1,5 @@
 import { expect, test, type Page } from '@playwright/test';
-import { stubSupabaseSession } from './helpers/auth';
+import { seedCurrentDebate, stubSupabaseSession } from './helpers/auth';
 import { stubAIResponses } from './fixtures/ai-responses';
 
 const featureConfig = { provider: 'openrouter', model: 'z-ai/glm-5.3-flash', temperature: 0.7 };
@@ -8,6 +8,10 @@ const STATE_TIMEOUT_MS = 15_000;
 async function prepareMotionFixture(page: Page, reducedMotion: 'no-preference' | 'reduce') {
   await page.emulateMedia({ reducedMotion });
   await stubSupabaseSession(page);
+  await seedCurrentDebate(page, 'This House would make public transport free.');
+  await page.addInitScript(() => {
+    window.localStorage.setItem('debate-trainer-onboarding', JSON.stringify({ state: { hasCompletedOnboarding: true, isTourRunning: false }, version: 0 }));
+  });
   await stubAIResponses(page);
   await page.addInitScript((config) => {
     window.localStorage.setItem('debate-trainer-settings', JSON.stringify({
@@ -54,19 +58,10 @@ async function generateMockCase(page: Page) {
   await expect(page.getByText(/We support the motion/)).toBeVisible({ timeout: STATE_TIMEOUT_MS });
 }
 
+/** Tools open from Home, which is reached from the header. */
 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 page.locator('header a[href="/app"]').first().click();
+  await page.locator('main').locator(`a[href="/app/${route}"]`).click();
   await expect(page).toHaveURL(new RegExp(`/app/${route}$`));
 }
 
@@ -106,8 +101,8 @@ test('removes non-essential route and state movement for reduced motion', async
 
 test('keeps a delayed route skeleton static under reduced motion', async ({ page }, testInfo) => {
   await prepareMotionFixture(page, 'reduce');
-  await page.goto('/app/generate', { waitUntil: 'domcontentloaded' });
-  await expect(page.getByRole('heading', { name: 'Generate', exact: true })).toBeVisible({ timeout: STATE_TIMEOUT_MS });
+  await page.goto('/app', { waitUntil: 'domcontentloaded' });
+  await expect(page.getByRole('heading', { name: 'Prepare' })).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.screenshot({ path: testInfo.outputPath('reduced-route-before.png'), fullPage: true });
 
   let destinationRequested = false;
@@ -117,13 +112,7 @@ test('keeps a delayed route skeleton static under reduced motion', async ({ page
     await route.continue();
   });
 
-  const attackLink = (page.viewportSize()?.width ?? 1280) < 1024
-    ? await (async () => {
-      await page.getByRole('button', { name: 'Open menu' }).click();
-      return page.getByRole('navigation', { name: 'Mobile navigation' }).getByRole('link', { name: /^Attack/ });
-    })()
-    : page.getByRole('navigation', { name: 'Main navigation' }).getByRole('link', { name: 'Attack' });
-  await attackLink.click();
+  await page.locator('main').locator('a[href="/app/attack"]').click();
   await expect.poll(() => destinationRequested).toBe(true);
 
   const pendingStatus = page.getByRole('status', { name: 'Opening Attack', exact: true });
diff --git a/e2e/crossfire.spec.ts b/e2e/crossfire.spec.ts
index 60ec74fc1..4826c6cda 100644
--- a/e2e/crossfire.spec.ts
+++ b/e2e/crossfire.spec.ts
@@ -1,5 +1,8 @@
 import { expect, test, type Page } from '@playwright/test';
-import { setLocale, stubSupabaseSession } from './helpers/auth';
+import { seedCurrentDebate, setLocale, stubSupabaseSession } from './helpers/auth';
+
+const MOTION = 'Resolved: cities should ban private cars downtown.';
+const SEEDED_DEBATE_ID = '00000000-0000-4000-8000-00000000d001';
 
 type CrossfireRequest = {
   feature: string;
@@ -23,6 +26,16 @@ async function installDeterministicBackend(page: Page, requests: CrossfireReques
       return;
     }
 
+    // Serve the seeded debate so hydration keeps it as the Current Debate.
+    const debateRow = url.pathname.endsWith('/rest/v1/debates')
+      ? { id: SEEDED_DEBATE_ID, motion: MOTION, settings: {}, instructions: '', last_activity_at: new Date().toISOString(), created_at: new Date().toISOString() }
+      : url.pathname.endsWith('/rest/v1/current_debates') ? { debate_id: SEEDED_DEBATE_ID } : null;
+    if (debateRow && route.request().method() === 'GET') {
+      const single = (route.request().headers().accept ?? '').includes('vnd.pgrst.object');
+      await route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(single ? debateRow : [debateRow]) });
+      return;
+    }
+
     if (url.pathname.includes('/rest/v1/')) {
       await route.fulfill({
         status: 200,
@@ -102,6 +115,7 @@ async function installDeterministicBackend(page: Page, requests: CrossfireReques
 async function prepare(page: Page, requests: CrossfireRequest[], failFirstAnswer = false) {
   await setLocale(page, 'en');
   await stubSupabaseSession(page);
+  await seedCurrentDebate(page, MOTION);
   await page.addInitScript(() => {
     for (const key of Object.keys(window.localStorage)) {
       if (key.startsWith('debatelab-crossfire-draft:')) window.localStorage.removeItem(key);
diff --git a/e2e/full-stack/account-data.spec.ts b/e2e/full-stack/account-data.spec.ts
index acff3e971..f55851b1e 100644
--- a/e2e/full-stack/account-data.spec.ts
+++ b/e2e/full-stack/account-data.spec.ts
@@ -1,4 +1,4 @@
-import { admin, createDemoUser, deleteDemoUser, expect, MARK, providerCall, signIn, stackReady, test } from "./stack";
+import { admin, createDemoUser, deleteDemoUser, expect, MARK, providerCall, signIn, stackReady, startDebate, test } from "./stack";
 import type { Page } from "@playwright/test";
 
 test.skip(!stackReady, "Local full stack is required (run ./.superset/db-gate.sh)");
@@ -12,6 +12,7 @@ async function addSource(page: Page, title: string, content: string) {
 }
 
 test("only active Library sources ground AI requests, and deletions persist", async ({ signedIn: page, user }) => {
+  await startDebate(page, "Public transport should be free");
   await page.goto("/app/library");
   await addSource(page, "Active study", "ACTIVE-SOURCE-MARKER ridership rose after fares were removed.");
   await addSource(page, "Paused study", "PAUSED-SOURCE-MARKER congestion did not change.");
@@ -44,10 +45,12 @@ test("Delete All My Data erases the account's saved work and nobody else's", asy
     const bystander = await (await page.context().browser()!.newContext()).newPage();
     await bystander.addInitScript(() => localStorage.setItem("debate-trainer-onboarding", JSON.stringify({ state: { hasCompletedOnboarding: true, isTourRunning: false }, version: 0 })));
     await signIn(bystander, other);
+    await startDebate(bystander, "Bystander motion");
     await bystander.goto("/app/library");
     await addSource(bystander, "Bystander study", "Kept after another account erases its data.");
     await bystander.context().close();
 
+    await startDebate(page, "My motion");
     await page.goto("/app/library");
     await addSource(page, "My study", "Erased with the account data.");
     const userId = await user.userId();
@@ -62,6 +65,8 @@ test("Delete All My Data erases the account's saved work and nobody else's", asy
 
     const { data: mine } = await admin.from("sources").select("id").eq("user_id", userId);
     expect(mine).toEqual([]);
+    const { data: myDebates } = await admin.from("debates").select("id").eq("user_id", userId);
+    expect(myDebates).toEqual([]);
     const { data: theirs } = await admin.from("sources").select("title").eq("user_id", otherId);
     expect(theirs?.map((row) => row.title)).toEqual(["Bystander study"]);
 
diff --git a/e2e/full-stack/ai-tools.spec.ts b/e2e/full-stack/ai-tools.spec.ts
index d86712c62..49416c04d 100644
--- a/e2e/full-stack/ai-tools.spec.ts
+++ b/e2e/full-stack/ai-tools.spec.ts
@@ -1,4 +1,4 @@
-import { admin, expect, MARK, fake, providerCall, stackReady, test } from "./stack";
+import { admin, chooseForMotion, expect, MARK, fake, providerCall, stackReady, test } from "./stack";
 
 test.skip(!stackReady, "Local full stack is required (run ./.superset/db-gate.sh)");
 
@@ -15,6 +15,7 @@ test("Brainstorm returns ranked angles", async ({ signedIn: page }) => {
   await page.goto("/app/brainstorm");
   await page.getByLabel("Motion / Topic *").fill("Universal basic income should replace targeted welfare");
   await page.getByRole("button", { name: "Start Brainstorming" }).click();
+  await chooseForMotion(page, "create");
 
   await expect(page.getByText(`${MARK} idea 1`)).toBeVisible({ timeout: 30_000 });
   expect((await providerCall("brainstorm")).user).toContain("Motion: Universal basic income should replace targeted welfare");
diff --git a/e2e/full-stack/auth.spec.ts b/e2e/full-stack/auth.spec.ts
index 398216e79..5f89e1bfd 100644
--- a/e2e/full-stack/auth.spec.ts
+++ b/e2e/full-stack/auth.spec.ts
@@ -1,4 +1,4 @@
-import { admin, expect, MARK, stackReady, test } from "./stack";
+import { admin, chooseForMotion, expect, MARK, stackReady, test } from "./stack";
 
 test.skip(!stackReady, "Local full stack is required (run ./.superset/db-gate.sh)");
 
@@ -40,5 +40,6 @@ test("an expired access token refreshes before an AI request", async ({ signedIn
   await page.goto("/app/generate");
   await page.getByRole("textbox", { name: "Motion / Topic *" }).fill("This House would make public transport free");
   await page.getByRole("button", { name: "Generate Debate Case" }).click();
+  await chooseForMotion(page, "once");
   await expect(page.getByText(`${MARK} case thesis`)).toBeVisible({ timeout: 30_000 });
 });
diff --git a/e2e/full-stack/billing.spec.ts b/e2e/full-stack/billing.spec.ts
index 7d40b3ec4..dd41cce36 100644
--- a/e2e/full-stack/billing.spec.ts
+++ b/e2e/full-stack/billing.spec.ts
@@ -1,6 +1,6 @@
 import { createHmac, randomUUID } from "node:crypto";
 import type { Page } from "@playwright/test";
-import { admin, expect, fake, MARK, providerCall, stackReady, test } from "./stack";
+import { admin, chooseForMotion, expect, fake, MARK, providerCall, stackReady, test } from "./stack";
 
 test.skip(!stackReady, "Local full stack is required (run ./.superset/db-gate.sh)");
 
@@ -24,6 +24,7 @@ async function brainstorm(page: Page) {
   await page.goto("/app/brainstorm");
   await page.getByLabel("Motion / Topic *").fill("Public transport should be free");
   await page.getByRole("button", { name: "Start Brainstorming" }).click();
+  await chooseForMotion(page, "once");
 }
 
 function sendWebhook(event: object, signature = true) {
diff --git a/e2e/full-stack/case-generation.spec.ts b/e2e/full-stack/case-generation.spec.ts
index a50b8ccb5..bc7397bdf 100644
--- a/e2e/full-stack/case-generation.spec.ts
+++ b/e2e/full-stack/case-generation.spec.ts
@@ -1,5 +1,5 @@
 import { readFile } from "node:fs/promises";
-import { admin, expect, fake, MARK, providerCall, signIn, stackReady, test } from "./stack";
+import { admin, chooseForMotion, expect, fake, MARK, providerCall, signIn, stackReady, startDebate, test } from "./stack";
 
 test.skip(!stackReady, "Local full stack is required (run ./.superset/db-gate.sh)");
 
@@ -7,6 +7,7 @@ const motion = "This House would make public transport free";
 
 test("a signed-in user generates a case grounded in a saved Library source", async ({ signedIn: page, user }) => {
   const marker = `SOURCE-${Date.now()}`;
+  await startDebate(page, motion);
   await page.goto("/app/library");
   await page.getByRole("button", { name: "Add Source" }).click();
   await page.getByRole("textbox", { name: "Source title..." }).fill("Tallinn fare study");
@@ -40,6 +41,7 @@ test("a signed-in user generates a case grounded in a saved Library source", asy
 
 test("a provider failure shows an error and lets the user retry", async ({ signedIn: page }) => {
   await fake.fail("generate", 500);
+  await startDebate(page, motion);
   await page.goto("/app/generate");
   await page.getByRole("textbox", { name: "Motion / Topic *" }).fill(motion);
   await page.getByRole("button", { name: "Generate Debate Case" }).click();
@@ -53,6 +55,7 @@ test("a provider failure shows an error and lets the user retry", async ({ signe
 
 test("an account without quota is told why generation is blocked", async ({ signedIn: page, user }) => {
   await admin.from("user_settings").update({ daily_limit_override: 0 }).eq("user_id", await user.userId());
+  await startDebate(page, motion);
   await page.goto("/app/generate");
   await page.getByRole("textbox", { name: "Motion / Topic *" }).fill(motion);
   await page.getByRole("button", { name: "Generate Debate Case" }).click();
@@ -61,10 +64,11 @@ test("an account without quota is told why generation is blocked", async ({ sign
   expect((await fake.requests()).filter((request) => request.feature === "generate")).toEqual([]);
 });
 
-test("a saved case persists to the account and reloads from History", async ({ signedIn: page, user }) => {
+test("a saved one-off case persists to the account and reloads from History", async ({ signedIn: page, user }) => {
   await page.goto("/app/generate");
   await page.getByRole("textbox", { name: "Motion / Topic *" }).fill(motion);
   await page.getByRole("button", { name: "Generate Debate Case" }).click();
+  await chooseForMotion(page, "once");
   await expect(page.getByText(`${MARK} case thesis`)).toBeVisible({ timeout: 30_000 });
 
   const title = `Saved case ${Date.now()}`;
@@ -87,6 +91,7 @@ test("a saved case persists to the account and reloads from History", async ({ s
 });
 
 test("a generated case exports to PDF and DOCX files", async ({ signedIn: page }) => {
+  await startDebate(page, motion);
   await page.goto("/app/generate");
   await page.getByRole("textbox", { name: "Motion / Topic *" }).fill(motion);
   await page.getByRole("button", { name: "Generate Debate Case" }).click();
diff --git a/e2e/full-stack/current-debate.spec.ts b/e2e/full-stack/current-debate.spec.ts
new file mode 100644
index 000000000..6ca93a13f
--- /dev/null
+++ b/e2e/full-stack/current-debate.spec.ts
@@ -0,0 +1,128 @@
+import type { Page } from "@playwright/test";
+import { admin, chooseForMotion, debateControl, expect, fake, MARK, stackReady, startDebate, test } from "./stack";
+
+test.skip(!stackReady, "Local full stack is required (run ./.superset/db-gate.sh)");
+
+// EVIDENCE_DIR=<dir> records video and key screenshots for review.
+const evidenceDir = process.env.EVIDENCE_DIR;
+test.use({ video: evidenceDir ? "on" : "retain-on-failure" });
+
+const HOMEWORK = "This House would ban homework";
+const ZOOS = "This House would abolish zoos";
+
+async function snap(page: Page, name: string) {
+  if (!evidenceDir) return;
+  await page.screenshot({ path: `${evidenceDir}/${test.info().project.name}-${name}.png`, fullPage: true });
+}
+
+async function addSource(page: Page, title: string, content: string) {
+  await page.goto("/app/library");
+  await page.getByRole("button", { name: "Add Source" }).click();
+  await page.getByRole("textbox", { name: "Source title..." }).fill(title);
+  await page.getByRole("textbox", { name: "Paste source content..." }).fill(content);
+  await page.getByRole("button", { name: "Save to Library" }).click();
+  await expect(page.getByRole("switch", { name: `Toggle ${title}` })).toBeChecked();
+}
+
+async function switchDebate(page: Page, motion: string) {
+  await debateControl(page).click();
+  await page.getByRole("dialog").getByRole("button", { name: "Switch debate" }).click();
+  await page.getByRole("dialog").getByRole("button", { name: `Switch to ${motion}` }).click();
+  await expect(page.getByRole("dialog")).toBeHidden();
+  await expect(debateControl(page)).toHaveAttribute("aria-label", `Current debate: ${motion}`);
+}
+
+async function latestCall(feature: string) {
+  let call: Awaited<ReturnType<typeof fake.requests>>[number] | undefined;
+  await expect.poll(async () => {
+    call = (await fake.requests()).filter((request) => request.feature === feature).at(-1);
+    return Boolean(call);
+  }).toBe(true);
+  return call!;
+}
+
+test("two debates keep their motions, sources, and results apart", async ({ signedIn: page, user }) => {
+  test.setTimeout(120_000);
+  const userId = await user.userId();
+
+  // First debate: its source grounds a Brainstorm that fills in the motion by itself.
+  await expect(page.getByTestId("home-current-debate")).toContainText("No current debate");
+  await startDebate(page, HOMEWORK);
+  await addSource(page, "Homework study", "HOMEWORK-SOURCE pupils sleep less when homework runs late.");
+
+  await page.goto("/app/brainstorm");
+  await expect(page.getByTestId("current-debate-strip")).toContainText(`Working in: ${HOMEWORK}`);
+  await expect(page.getByLabel("Motion / Topic *")).toHaveValue(HOMEWORK);
+  await page.getByRole("button", { name: "Start Brainstorming" }).click();
+  await expect(page.getByText(`${MARK} idea 1`)).toBeVisible({ timeout: 30_000 });
+  const homeworkCall = await latestCall("brainstorm");
+  expect(homeworkCall.user).toContain(`Motion: ${HOMEWORK}`);
+  expect(homeworkCall.system).toContain("HOMEWORK-SOURCE");
+  await snap(page, "1-brainstorm-in-homework-debate");
+
+  // Second debate: a fresh Library and a case grounded only in its own source.
+  await startDebate(page, ZOOS);
+  await page.goto("/app/library");
+  await expect(page.getByTestId("library-debate")).toContainText(ZOOS);
+  await expect(page.getByRole("switch", { name: "Toggle Homework study" })).toHaveCount(0);
+  await addSource(page, "Zoo study", "ZOO-SOURCE conservation breeding saved several species.");
+  await snap(page, "2-library-in-zoo-debate");
+
+  await page.goto("/app/generate");
+  await expect(page.getByRole("textbox", { name: "Motion / Topic *" })).toHaveValue(ZOOS);
+  await page.getByRole("button", { name: "Generate Debate Case" }).click();
+  await expect(page.getByText(`${MARK} case thesis`)).toBeVisible({ timeout: 30_000 });
+  const zooCall = await latestCall("generate");
+  expect(zooCall.user).toContain(`Motion: ${ZOOS}`);
+  expect(zooCall.system).toContain("ZOO-SOURCE");
+  expect(zooCall.system).not.toContain("HOMEWORK-SOURCE");
+
+  // A different motion asks first; "use once" keeps it out of every debate.
+  await page.goto("/app/brainstorm");
+  await page.getByLabel("Motion / Topic *").fill("This House would lower the voting age");
+  await page.getByRole("button", { name: "Start Brainstorming" }).click();
+  await expect(page.getByRole("dialog")).toContainText("This is a different motion");
+  await snap(page, "3-different-motion-choice");
+  await chooseForMotion(page, "once");
+  await expect(page.getByText(`${MARK} idea 1`)).toBeVisible({ timeout: 30_000 });
+  const oneOffCall = await latestCall("brainstorm");
+  expect(oneOffCall.system).not.toContain("ZOO-SOURCE");
+  expect(oneOffCall.system).not.toContain("HOMEWORK-SOURCE");
+
+  // The dashboard shows only this debate's work, with both sides as equals.
+  await page.goto("/app/debate");
+  await expect(page.getByTestId("current-debate-motion")).toHaveText(ZOOS);
+  await expect(page.getByTestId("debate-side-pro")).toContainText("In favor");
+  await expect(page.getByTestId("debate-side-con")).toContainText("Against");
+  await expect(page.getByTestId("debate-sources")).toContainText("Zoo study");
+  await expect(page.getByTestId("debate-sources")).not.toContainText("Homework study");
+  await expect(page.getByTestId("debate-recent")).toContainText(ZOOS);
+  await snap(page, "4-zoo-dashboard");
+
+  // Switching back switches the Library and History with it.
+  await switchDebate(page, HOMEWORK);
+  await page.goto("/app/library");
+  await expect(page.getByRole("switch", { name: "Toggle Homework study" })).toBeVisible();
+  await expect(page.getByRole("switch", { name: "Toggle Zoo study" })).toHaveCount(0);
+  await page.goto("/app/history");
+  await page.getByRole("tab", { name: /Brainstorms/ }).click();
+  await expect(page.getByRole("tabpanel").getByText(HOMEWORK)).toBeVisible();
+  await page.getByRole("tab", { name: /Cases/ }).click();
+  await expect(page.getByRole("tabpanel").getByText("No saved cases yet")).toBeVisible();
+  await snap(page, "5-history-back-in-homework");
+
+  // The database agrees: every row sits in exactly the debate it came from.
+  const { data: debates } = await admin.from("debates").select("id,motion").eq("user_id", userId);
+  const idFor = (motion: string) => debates!.find((debate) => debate.motion === motion)!.id;
+  const { data: sources } = await admin.from("sources").select("title,debate_id").eq("user_id", userId).order("title");
+  expect(sources).toEqual([
+    { title: "Homework study", debate_id: idFor(HOMEWORK) },
+    { title: "Zoo study", debate_id: idFor(ZOOS) },
+  ]);
+  const { data: cases } = await admin.from("cases").select("debate_id,side").eq("user_id", userId);
+  expect(cases).toEqual([{ debate_id: idFor(ZOOS), side: "pro" }]);
+  const { data: brainstorms } = await admin.from("brainstorms").select("debate_id").eq("user_id", userId);
+  expect(brainstorms).toEqual([{ debate_id: idFor(HOMEWORK) }]);
+  const { data: current } = await admin.from("current_debates").select("debate_id").eq("user_id", userId).single();
+  expect(current?.debate_id).toBe(idFor(HOMEWORK));
+});
diff --git a/e2e/full-stack/practice.spec.ts b/e2e/full-stack/practice.spec.ts
index 4367c0479..2845bbc89 100644
--- a/e2e/full-stack/practice.spec.ts
+++ b/e2e/full-stack/practice.spec.ts
@@ -1,4 +1,4 @@
-import { admin, expect, MARK, providerCall, stackReady, test } from "./stack";
+import { admin, chooseForMotion, expect, MARK, providerCall, stackReady, test } from "./stack";
 
 test.skip(!stackReady, "Local full stack is required (run ./.superset/db-gate.sh)");
 
@@ -8,6 +8,7 @@ test("a Lincoln-Douglas sparring round is judged and saved", async ({ signedIn:
   await page.getByRole("combobox", { name: "Round format" }).click();
   await page.getByRole("option", { name: /Lincoln-Douglas · 5 speeches/ }).click();
   await page.getByRole("button", { name: "Start round" }).click();
+  await chooseForMotion(page, "create");
 
   const speeches = [
     ["Affirmative constructive", "Universal access removes the direct price barrier to participation."],
@@ -31,14 +32,20 @@ test("a Lincoln-Douglas sparring round is judged and saved", async ({ signedIn:
     const { data } = await admin.from("sparring_sessions").select("status,final_evaluation").eq("user_id", await user.userId());
     return data?.map((row) => row.status);
   }).toEqual(["complete"]);
+  // The judged round is filed in the debate created for its motion, with the user's side.
+  await expect.poll(async () => {
+    const { data } = await admin.from("sparring_sessions").select("side,debates(motion)").eq("user_id", await user.userId()).single();
+    return data;
+  }).toEqual({ side: "pro", debates: { motion: "This House would make public transport free at the point of use." } });
 });
 
-test("Crossfire answers a question and produces a debrief", async ({ signedIn: page }) => {
+test("Crossfire answers a question and produces a debrief", async ({ signedIn: page, user }) => {
   await page.goto("/app/crossfire");
   await page.getByTestId("crossfire-resolution").fill("Resolved: cities should ban private cars downtown.");
   await page.getByTestId("crossfire-argument").fill("Private cars create congestion and unsafe streets.");
   await page.getByTestId("mode-question-ai").click();
   await page.getByTestId("start-crossfire").click();
+  await chooseForMotion(page, "create");
 
   await page.getByTestId("crossfire-input").fill("What evidence supports the safety mechanism?");
   await page.getByTestId("submit-turn").click();
@@ -50,4 +57,9 @@ test("Crossfire answers a question and produces a debrief", async ({ signedIn: p
 
   await page.getByTestId("end-crossfire").click();
   await expect(page.getByTestId("crossfire-debrief")).toBeVisible({ timeout: 30_000 });
+  // The finished round is recorded in its debate.
+  await expect.poll(async () => {
+    const { data } = await admin.from("crossfires").select("title,debates(motion)").eq("user_id", await user.userId());
+    return data;
+  }).toEqual([{ title: "Resolved: cities should ban private cars downtown.", debates: { motion: "Resolved: cities should ban private cars downtown." } }]);
 });
diff --git a/e2e/full-stack/stack.ts b/e2e/full-stack/stack.ts
index 33b94ce60..4176368a7 100644
--- a/e2e/full-stack/stack.ts
+++ b/e2e/full-stack/stack.ts
@@ -75,6 +75,38 @@ export async function signIn(page: Page, user: DemoUser) {
   await expect(page).toHaveURL(/\/app$/, { timeout: 20_000 });
 }
 
+/** The visible Current Debate control: the header menu on desktop, the second header row on mobile. */
+export function debateControl(page: Page) {
+  return page.locator('[data-testid="current-debate-desktop"]:visible, [data-testid="current-debate-mobile"]:visible').first();
+}
+
+/** Starts a new Current Debate from the header, as a student would. */
+export async function startDebate(page: Page, motion: string) {
+  if (!page.url().includes("/app")) await page.goto("/app");
+  const control = debateControl(page);
+  if ((await control.textContent())?.includes("Start debate")) {
+    await control.click();
+  } else {
+    await control.click();
+    await page.getByRole("dialog").getByRole("button", { name: "Start new debate" }).click();
+  }
+  const dialog = page.getByRole("dialog");
+  await dialog.getByLabel("Motion").fill(motion);
+  await dialog.getByRole("button", { name: "Start debate" }).click();
+  await expect(dialog).toBeHidden();
+  await expect(debateControl(page)).toHaveAttribute("aria-label", `Current debate: ${motion}`);
+}
+
+/** Answers "Which debate is this for?" after submitting a motion that is not the Current Debate. */
+export async function chooseForMotion(page: Page, choice: "create" | "once") {
+  // Scope to the motion choice: the next step may open its own dialog, such as the paywall.
+  const dialog = page.getByRole("dialog", { name: /^(Which debate is this for\?|This is a different motion)$/ });
+  await dialog.getByRole("button", {
+    name: choice === "create" ? "Create a new debate for this motion" : "Use once without saving to a debate",
+  }).click();
+  await expect(dialog).toBeHidden();
+}
+
 type Fixtures = { user: DemoUser; signedIn: Page };
 
 export const test = base.extend<Fixtures>({
diff --git a/e2e/helpers/auth.ts b/e2e/helpers/auth.ts
index f9eb835b5..4a6e17918 100644
--- a/e2e/helpers/auth.ts
+++ b/e2e/helpers/auth.ts
@@ -70,3 +70,27 @@ export async function setLocale(page: Page, locale: 'en' | 'es' | 'hu') {
     }
   }, locale);
 }
+
+/**
+ * Seed a Current Debate for a stub session. Stub sessions cannot reach the
+ * server, so the app keeps this persisted copy; it proves rendering only.
+ */
+export async function seedCurrentDebate(page: Page, motion: string, opts: { userId?: string } = {}) {
+  const userId = opts.userId ?? '00000000-0000-0000-0000-000000000001';
+  const now = Date.now();
+  const debate = {
+    id: '00000000-0000-4000-8000-00000000d001',
+    motion,
+    settings: {},
+    instructions: '',
+    lastActivityAt: now,
+    createdAt: now,
+  };
+  await page.addInitScript(({ value }) => {
+    try {
+      window.localStorage.setItem('debatelab-current-debate', JSON.stringify(value));
+    } catch {
+      /* ignore */
+    }
+  }, { value: { state: { ownerUserId: userId, debates: [debate], currentDebateId: debate.id }, version: 1 } });
+}
diff --git a/e2e/home-navigation.spec.ts b/e2e/home-navigation.spec.ts
index 7fc83f153..f607a0170 100644
--- a/e2e/home-navigation.spec.ts
+++ b/e2e/home-navigation.spec.ts
@@ -39,11 +39,6 @@ test('onboarding follows visible home targets when secondary navigation is close
   });
   await page.goto('/app', { waitUntil: 'domcontentloaded' });
 
-  const desktopMoreMenu = page.locator('details').filter({ has: page.locator('summary[aria-label="More"]') });
-  if ((page.viewportSize()?.width ?? 0) >= 1024) {
-    await expect(desktopMoreMenu).not.toHaveAttribute('open');
-  }
-
   await expect(page.locator('.react-joyride__tooltip')).toBeVisible({ timeout: 15_000 });
   await page.locator('[data-test-id="button-primary"]').click();
 
@@ -113,11 +108,12 @@ test('header keeps the brand and controls inside a 320px viewport', async ({ pag
   await page.goto('/app', { waitUntil: 'domcontentloaded' });
   await expect(page.getByRole('heading', { name: 'Prepare' })).toBeVisible({ timeout: 15_000 });
 
+  // Mobile keeps the logo, language, theme, and menu on the first row; Settings lives in the menu.
   const languageControl = page.getByRole('button', { name: 'Language' });
   const themeControl = page.getByRole('button', { name: 'Toggle theme' });
-  const settingsControl = page.getByRole('link', { name: 'Settings' });
   const menuControl = page.getByRole('button', { name: 'Open menu' });
-  const controls = [languageControl, themeControl, settingsControl, menuControl];
+  const debateControl = page.getByTestId('current-debate-mobile');
+  const controls = [languageControl, themeControl, menuControl, debateControl];
 
   await expect(page.getByAltText('DebateLab logo')).toBeVisible();
   for (const control of controls) await expect(control).toBeVisible();
@@ -127,22 +123,17 @@ test('header keeps the brand and controls inside a 320px viewport', async ({ pag
   expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBe(320);
 });
 
-test('desktop More menu exposes secondary destinations without horizontal scrolling', async ({ page }) => {
-  test.skip((page.viewportSize()?.width ?? 0) < 1024, 'Desktop-only More menu check');
+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' });
-  await page.locator('summary[aria-label="More"]').click();
-
-  const moreMenu = page.locator('details').filter({ has: page.locator('summary[aria-label="More"]') });
-  for (const [label, href] of [
-    ['Brainstorm', '/app/brainstorm'],
-    ['Factoids', '/app/factoids'],
-    ['Flowchart', '/app/flowchart'],
-    ['Library', '/app/library'],
-    ['Timer', '/app/timer'],
-    ['History', '/app/history'],
-  ] as const) {
-    await expect(moreMenu.getByRole('link', { name: label })).toHaveAttribute('href', href);
+
+  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));
 });
 
@@ -159,17 +150,16 @@ test('desktop header fits without internal or document overflow at supported wid
   }
 });
 
-test('mobile menu exposes every tool destination and closes after navigation', async ({ page }) => {
+test('mobile menu holds only Home, Current debate, Library, History, and Settings', async ({ page }) => {
   await page.setViewportSize({ width: 390, height: 844 });
   await page.goto('/app', { waitUntil: 'domcontentloaded' });
   await page.getByRole('button', { name: 'Open menu' }).click();
 
   const mobileNavigation = page.getByRole('navigation', { name: 'Mobile navigation' });
-  for (const label of ['Home', 'Generate', 'Attack', 'Brainstorm', 'Factoids', 'Ask', 'Crossfire', 'Library', 'Timer', 'Sparring', 'Flowchart', 'History']) {
-    await expect(mobileNavigation.getByRole('link', { name: new RegExp(`^${label}`) })).toBeVisible();
-  }
+  const hrefs = await mobileNavigation.getByRole('link').evaluateAll((links) => links.map((link) => link.getAttribute('href')));
+  expect(hrefs).toEqual(['/app', '/app/debate', '/app/library', '/app/history', '/app/settings']);
 
-  await mobileNavigation.getByRole('link', { name: /^Brainstorm/ }).click();
-  await expect(page).toHaveURL(/\/app\/brainstorm$/);
+  await mobileNavigation.getByRole('link', { name: /^Library/ }).click();
+  await expect(page).toHaveURL(/\/app\/library$/);
   await expect(page.getByRole('navigation', { name: 'Mobile navigation' })).toHaveCount(0);
 });
diff --git a/e2e/hungarian-parity.spec.ts b/e2e/hungarian-parity.spec.ts
index 0043fd241..d2fedeb0f 100644
--- a/e2e/hungarian-parity.spec.ts
+++ b/e2e/hungarian-parity.spec.ts
@@ -1,5 +1,5 @@
 import { expect, test, type Page } from '@playwright/test';
-import { setLocale, stubSupabaseSession } from './helpers/auth';
+import { seedCurrentDebate, setLocale, stubSupabaseSession } from './helpers/auth';
 
 function collectRuntimeErrors(page: Page) {
   const errors: string[] = [];
@@ -58,7 +58,7 @@ test.describe('Hungarian parity', () => {
     expect(errors, errors.join('\n')).toEqual([]);
   });
 
-  test('renders Hungarian workspace navigation, route titles, and onboarding', async ({ page }, testInfo) => {
+  test('renders Hungarian workspace navigation, route titles, and onboarding', async ({ page }) => {
     const errors = collectRuntimeErrors(page);
     await stubSupabaseSession(page);
     await page.addInitScript(() => {
@@ -87,18 +87,10 @@ test.describe('Hungarian parity', () => {
       ['factoids', 'Tények'],
       ['ask', 'Kérdezés'],
     ] as const) {
-      const link = page.locator(`[data-tour="nav-${route}"]`).first();
-      if (testInfo.project.name === 'mobile-chromium') {
-        await page.getByRole('button', { name: 'Menü megnyitása' }).click();
-        await page.getByRole('navigation', { name: 'Mobil navigáció' })
-          .getByRole('link')
-          .filter({ hasText: heading })
-          .first()
-          .click();
-      } else {
-        if (!await link.isVisible()) await page.locator('summary[data-tour="nav-more"]').click();
-        await link.click();
-      }
+      // Tools open from Home; the header keeps only Home, Current debate, Library and History.
+      // Navigate in-app: a reload would rerun the init script and restart the tour.
+      await page.locator('header a[href="/app"]').first().click();
+      await page.locator(`main [data-tour="mode-${route}"]`).click();
       await expect(page).toHaveURL(new RegExp(`/app/${route}$`));
       await expect(page.getByRole('heading', { name: heading, exact: true }).last()).toBeVisible();
     }
@@ -111,6 +103,8 @@ test.describe('Hungarian parity', () => {
   test('localizes saved chats, library controls, timer, and close labels', async ({ page }, testInfo) => {
     const errors = collectRuntimeErrors(page);
     await stubSupabaseSession(page);
+    // Library needs a Current Debate before sources can be added.
+    await seedCurrentDebate(page, 'Ez a Ház eltörölné a házi feladatot.');
     await page.addInitScript(() => {
       try {
         window.localStorage.setItem('debate-trainer-onboarding', JSON.stringify({
diff --git a/e2e/loading-performance.spec.ts b/e2e/loading-performance.spec.ts
index a5bba585c..4dfb1a311 100644
--- a/e2e/loading-performance.spec.ts
+++ b/e2e/loading-performance.spec.ts
@@ -1,12 +1,6 @@
-import { expect, test, type Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
 import { setLocale, stubSupabaseSession } from './helpers/auth';
 
-async function openMobileNavigation(page: Page) {
-  if ((page.viewportSize()?.width ?? 1280) < 1024) {
-    await page.getByRole('button', { name: 'Open menu' }).click();
-  }
-}
-
 test('a stalled Jam recorder cannot delay the real application', async ({ page, browserName }) => {
   test.skip(browserName === 'webkit', 'Jam recording requires MediaRecorder, which this WebKit runtime does not expose.');
   await page.route('https://js.jam.dev/**', async () => new Promise(() => undefined));
@@ -70,7 +64,13 @@ test('landing CTA enters the app without replacing the document', async ({ page
 test('protected sibling navigation keeps AppLayout mounted while the page loads', async ({ page }) => {
   await setLocale(page, 'en');
   await stubSupabaseSession(page);
-  await page.goto('/app/generate');
+  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'; });
@@ -84,8 +84,8 @@ test('protected sibling navigation keeps AppLayout mounted while the page loads'
     await route.continue();
   });
 
-  await openMobileNavigation(page);
-  await page.getByRole('link', { name: 'Attack' }).click();
+  // 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);
 
diff --git a/e2e/navigation-performance.spec.ts b/e2e/navigation-performance.spec.ts
index 463874066..9d3b914c1 100644
--- a/e2e/navigation-performance.spec.ts
+++ b/e2e/navigation-performance.spec.ts
@@ -41,20 +41,28 @@ async function waitForContent(page: Page, marker: string | ContentMarker) {
   await expect(locator).toBeVisible({ timeout: 15_000 });
 }
 
-async function openAppNav(page: Page, label: string) {
+async function skipOnboarding(page: Page) {
+  await page.addInitScript(() => {
+    window.localStorage.setItem('debate-trainer-onboarding', JSON.stringify({
+      state: { hasCompletedOnboarding: true, isTourRunning: false },
+      version: 0,
+    }));
+  });
+}
+
+// Tools open from Home; the header carries only Home, Current debate, Library and History.
+function homeToolLink(page: Page, tool: string) {
+  return page.locator(`main [data-tour="mode-${tool}"]`);
+}
+
+async function openHome(page: Page) {
   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: 'Mobile navigation' }).getByRole('link', { name: /^Home/ }).click();
+  } else {
+    await page.getByRole('navigation', { name: 'Main navigation' }).getByRole('link', { name: 'Home' }).click();
   }
-
-  await page.getByRole('navigation', { name: 'Main navigation' }).getByRole('link', { name: label }).click();
+  await expect(page).toHaveURL(/\/app$/);
 }
 
 test('cold routes expose real content on both browser profiles', async ({ page }) => {
@@ -110,8 +118,9 @@ test('a delayed public route keeps the main landmark', async ({ page }) => {
 test('a delayed destination chunk exposes the route fallback without replacing the shell', async ({ page }) => {
   await setLocale(page, 'en');
   await stubSupabaseSession(page);
-  await page.goto('/app/generate', { waitUntil: 'domcontentloaded' });
-  await waitForContent(page, { selector: 'main h1', text: 'Generate' });
+  await skipOnboarding(page);
+  await page.goto('/app', { waitUntil: 'domcontentloaded' });
+  await waitForContent(page, { selector: 'main h1', text: 'DebateLab' });
 
   await page.evaluate(() => {
     window.__baselineAppLayout = document.querySelector('header')?.parentElement;
@@ -132,7 +141,7 @@ test('a delayed destination chunk exposes the route fallback without replacing t
   });
 
   await startGenericLoaderObservation(page);
-  await openAppNav(page, 'Attack');
+  await homeToolLink(page, 'attack').click();
   await expect.poll(() => destinationRequested).toBe(true);
   const pendingStatus = page.locator('main').getByRole('status', { name: 'Opening Attack', exact: true });
   await expect(pendingStatus).toHaveCount(1);
@@ -205,9 +214,10 @@ test('a failed route chunk recovers after the offered reload', async ({ page })
     await route.continue();
   });
 
-  await page.goto('/app/generate', { waitUntil: 'domcontentloaded' });
-  await waitForContent(page, { selector: 'main h1', text: 'Generate' });
-  await openAppNav(page, 'Attack');
+  await skipOnboarding(page);
+  await page.goto('/app', { waitUntil: 'domcontentloaded' });
+  await waitForContent(page, { selector: 'main h1', text: 'DebateLab' });
+  await homeToolLink(page, 'attack').click();
 
   await expect(page.getByRole('heading', { name: 'Unable to load this page' })).toBeVisible();
   await page.getByRole('button', { name: 'Reload' }).click();
@@ -216,15 +226,16 @@ test('a failed route chunk recovers after the offered reload', async ({ page })
   await expect(page.locator('header')).toBeVisible();
 });
 
-for (const [locale, attackLabel, menuLabel, mainNavigationLabel, mobileNavigationLabel, openingLabel] of [
-  ['es', 'Atacar', 'Abrir menú', 'Navegación principal', 'Navegación móvil', 'Abriendo Atacar'],
-  ['hu', 'Támadás', 'Menü megnyitása', 'Fő navigáció', 'Mobil navigáció', 'Támadás megnyitása'],
+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 page.goto('/app/generate', { waitUntil: 'domcontentloaded' });
-    await expect(page.locator('header')).toBeVisible();
+    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) => {
@@ -233,12 +244,7 @@ for (const [locale, attackLabel, menuLabel, mainNavigationLabel, mobileNavigatio
       await route.continue();
     });
 
-    if ((page.viewportSize()?.width ?? 1280) < 1024) {
-      await page.getByRole('button', { name: menuLabel }).click();
-      await page.getByRole('navigation', { name: mobileNavigationLabel }).getByRole('link', { name: new RegExp(`^${attackLabel}`) }).click();
-    } else {
-      await page.getByRole('navigation', { name: mainNavigationLabel }).getByRole('link', { name: attackLabel }).click();
-    }
+    await homeToolLink(page, 'attack').click();
 
     await expect.poll(() => destinationRequested).toBe(true);
     const status = page.getByRole('status', { name: openingLabel, exact: true });
@@ -249,19 +255,18 @@ for (const [locale, attackLabel, menuLabel, mainNavigationLabel, mobileNavigatio
   });
 }
 
-async function gotoGenerate(page: Page) {
+async function gotoHome(page: Page) {
   await setLocale(page, 'en');
   await stubSupabaseSession(page);
-  await page.goto('/app/generate', { waitUntil: 'domcontentloaded' });
-  await waitForContent(page, { selector: 'main h1', text: 'Generate' });
+  await skipOnboarding(page);
+  await page.goto('/app', { waitUntil: 'domcontentloaded' });
+  await waitForContent(page, { selector: 'main h1', text: 'DebateLab' });
 }
 
 async function attackLink(page: Page) {
-  if ((page.viewportSize()?.width ?? 1280) < 1024) {
-    await page.getByRole('button', { name: 'Open menu' }).click();
-    return page.getByRole('navigation', { name: 'Mobile navigation' }).getByRole('link', { name: /^Attack/ });
-  }
-  return page.getByRole('navigation', { name: 'Main navigation' }).getByRole('link', { name: 'Attack' });
+  const link = homeToolLink(page, 'attack');
+  await expect(link).toBeVisible();
+  return link;
 }
 
 async function startGenericLoaderObservation(page: Page) {
@@ -312,7 +317,7 @@ async function signalAllowedIntent(page: Page, link: Awaited<ReturnType<typeof a
 
 test('hover intent is limited to fine pointers and click stays in-document', async ({ page }) => {
   const requestCount = countAttackRequests(page);
-  await gotoGenerate(page);
+  await gotoHome(page);
   const link = await attackLink(page);
   expect(requestCount()).toBe(0);
 
@@ -337,7 +342,7 @@ test('hover intent is limited to fine pointers and click stays in-document', asy
 
 test('keyboard focus fetches one destination chunk before click', async ({ page }) => {
   const requestCount = countAttackRequests(page);
-  await gotoGenerate(page);
+  await gotoHome(page);
   const link = await attackLink(page);
   expect(requestCount()).toBe(0);
 
@@ -355,7 +360,7 @@ test('keyboard focus fetches one destination chunk before click', async ({ page
 
 test('touch intent fetches one destination chunk before click', async ({ page }) => {
   const requestCount = countAttackRequests(page);
-  await gotoGenerate(page);
+  await gotoHome(page);
   const link = await attackLink(page);
   expect(requestCount()).toBe(0);
 
@@ -378,7 +383,7 @@ for (const [label, connection] of [
   test(`${label} skips speculative route requests for the same intent`, async ({ page }) => {
     await setConnection(page, connection);
     const requestCount = countAttackRequests(page);
-    await gotoGenerate(page);
+    await gotoHome(page);
     const link = await attackLink(page);
     expect(requestCount()).toBe(0);
 
@@ -441,7 +446,8 @@ test('subscription reads stay cached across sibling tool routes', async ({ page
   await waitForContent(page, { selector: 'main h1', text: 'Generate' });
   await expect.poll(() => subscriptionRequests.filter((name) => name === 'ai_requests').length).toBe(1);
 
-  await openAppNav(page, 'Attack');
+  await openHome(page);
+  await homeToolLink(page, 'attack').click();
   await waitForContent(page, attackContent);
   await page.waitForTimeout(100);
 
diff --git a/e2e/quality-backlog.spec.ts b/e2e/quality-backlog.spec.ts
index 392fb0508..4154a0a7d 100644
--- a/e2e/quality-backlog.spec.ts
+++ b/e2e/quality-backlog.spec.ts
@@ -1,12 +1,12 @@
 import { expect, test } from '@playwright/test';
-import { setLocale, stubSupabaseSession } from './helpers/auth';
+import { seedCurrentDebate, setLocale, stubSupabaseSession } from './helpers/auth';
 
 const locales = ['en', 'es', 'hu'] as const;
 const titledRoutes = ['generate', 'attack', 'brainstorm', 'factoids', 'ask'] as const;
-const mobileNavigationNames = {
-  en: 'Mobile navigation',
-  es: 'Navegación móvil',
-  hu: 'Mobil navigáció',
+const toolsHeadings = {
+  en: 'Prepare and practice',
+  es: 'Preparar y practicar',
+  hu: 'Felkészülés és gyakorlás',
 } as const;
 
 test('Sources does not show the stale consultation date', async ({ page }) => {
@@ -17,7 +17,7 @@ test('Sources does not show the stale consultation date', async ({ page }) => {
 });
 
 for (const locale of locales) {
-  test(`navigation and page titles agree in ${locale}`, async ({ page }, testInfo) => {
+  test(`navigation and page titles agree in ${locale}`, async ({ page }) => {
     await setLocale(page, locale);
     await stubSupabaseSession(page);
     await page.addInitScript(() => {
@@ -26,27 +26,17 @@ for (const locale of locales) {
         version: 0,
       }));
     });
-    await page.goto('/app');
+    await seedCurrentDebate(page, 'This House would make public transport free.');
 
+    // The Current Debate dashboard lists every tool under its navigation label.
     for (const route of titledRoutes) {
-      const desktopLink = page.locator(`[data-tour="nav-${route}"]`).first();
-      const label = await desktopLink.getAttribute('aria-label');
+      await page.goto('/app/debate');
+      const toolLink = page.getByRole('region', { name: toolsHeadings[locale] }).locator(`a[href="/app/${route}"]`);
+      const label = (await toolLink.innerText()).trim();
       expect(label).toBeTruthy();
-      if (testInfo.project.name === 'mobile-chromium') {
-        await page.locator('header button.lg\\:hidden[aria-expanded]').click();
-        await page.getByRole('navigation', { name: mobileNavigationNames[locale] })
-          .getByRole('link')
-          .filter({ hasText: label! })
-          .first()
-          .click();
-      } else {
-        if (!await desktopLink.isVisible()) {
-          await page.locator('summary[data-tour="nav-more"]').click();
-        }
-        await desktopLink.click();
-      }
+      await toolLink.click();
       await expect(page).toHaveURL(new RegExp(`/app/${route}$`));
-      await expect(page.getByRole('heading', { level: 1, name: label!, exact: true }).last()).toBeVisible();
+      await expect(page.getByRole('heading', { level: 1, name: label, exact: true }).last()).toBeVisible();
     }
   });
 }
diff --git a/e2e/sparring.spec.ts b/e2e/sparring.spec.ts
index 9d88550fe..64ff22b1d 100644
--- a/e2e/sparring.spec.ts
+++ b/e2e/sparring.spec.ts
@@ -68,6 +68,8 @@ test('completes an LD sparring round through mocked opponent turns and judging',
   await page.getByRole('combobox', { name: 'Round format' }).click();
   await page.getByRole('option', { name: /Lincoln-Douglas · 5 speeches/ }).click();
   await page.getByRole('button', { name: 'Start round' }).click();
+  // No Current Debate yet: run this round once without saving it to a debate.
+  await page.getByRole('button', { name: 'Use once without saving to a debate' }).click();
 
   const userSpeeches = [
     ['Affirmative constructive', 'Universal access removes the direct price barrier to participation.'],
@@ -110,6 +112,8 @@ test('uses the school 4-6-6-3 roles and coaching in the default round', async ({
   await page.goto('/app/sparring', { waitUntil: 'domcontentloaded' });
   await page.getByLabel('Motion').fill('This House would require community service for graduation.');
   await page.getByRole('button', { name: 'Start round' }).click();
+  // No Current Debate yet: run this round once without saving it to a debate.
+  await page.getByRole('button', { name: 'Use once without saving to a debate' }).click();
   await expect.poll(() => page.evaluate(() => window.scrollY)).toBe(0);
 
   const introductor = page.getByRole('textbox', { name: 'Draft for Pro Introductor' });
diff --git a/scripts/test-service-worker-offline.mjs b/scripts/test-service-worker-offline.mjs
index 433abcaf2..70420d5b6 100644
--- a/scripts/test-service-worker-offline.mjs
+++ b/scripts/test-service-worker-offline.mjs
@@ -90,7 +90,7 @@ async function cachePaths(page) {
 async function main() {
   const manifest = JSON.parse(await readFile('dist/.vite/manifest.json', 'utf8'));
   const entryPath = `/${Object.values(manifest).find((entry) => entry.isEntry).file}`;
-  const generatePath = `/${manifest['src/pages/GeneratePage.tsx'].file}`;
+  const homePath = `/${manifest['src/pages/HomePage.tsx'].file}`;
   const attackPath = `/${manifest['src/pages/AttackPage.tsx'].file}`;
   const port = await freePort();
   const origin = `http://127.0.0.1:${port}`;
@@ -167,34 +167,34 @@ async function main() {
 
     const page = await context.newPage();
     await prepare(page);
-    await page.goto(`${origin}/app/generate`, { waitUntil: 'networkidle' });
-    await page.getByRole('heading', { name: 'Generate', exact: true }).waitFor({ timeout: CONTENT_TIMEOUT_MS });
+    await page.goto(`${origin}/app`, { waitUntil: 'networkidle' });
+    await page.locator('main h1', { hasText: 'DebateLab' }).waitFor({ timeout: CONTENT_TIMEOUT_MS });
     await page.evaluate(async () => navigator.serviceWorker.ready);
     await page.waitForFunction(async (paths) => {
       const urls = (await Promise.all((await caches.keys()).map(async (key) =>
         (await (await caches.open(key)).keys()).map((request) => new URL(request.url).pathname)
       ))).flat();
       return paths.every((path) => urls.includes(path));
-    }, [entryPath, generatePath, '/favicon-72.png'], { timeout: CONTENT_TIMEOUT_MS });
+    }, [entryPath, homePath, '/favicon-72.png'], { timeout: CONTENT_TIMEOUT_MS });
 
     const firstVisitCache = await cachePaths(page);
     assert.equal(firstVisitCache.includes(attackPath), false, 'unvisited Attack chunk was cached');
     await context.setOffline(true);
     await page.reload({ waitUntil: 'domcontentloaded' });
-    await page.getByRole('heading', { name: 'Generate', exact: true }).waitFor({ timeout: CONTENT_TIMEOUT_MS });
+    await page.locator('main h1', { hasText: 'DebateLab' }).waitFor({ timeout: CONTENT_TIMEOUT_MS });
     const logo = page.locator('header a[href="/app"] img');
     assert.equal(await logo.getAttribute('src'), '/favicon-72.png');
     assert.ok(await logo.evaluate((image) => image.naturalWidth > 0), 'offline logo did not load');
 
-    await page.getByRole('navigation', { name: 'Main navigation' }).getByRole('link', { name: 'Attack' }).click();
+    await page.locator('main [data-tour="mode-attack"]').click();
     await page.getByRole('heading', { name: 'Unable to load this page' }).waitFor({ timeout: CONTENT_TIMEOUT_MS });
 
     await context.setOffline(false);
     const prefetchedPage = await context.newPage();
     await prepare(prefetchedPage);
-    await prefetchedPage.goto(`${origin}/app/generate`, { waitUntil: 'networkidle' });
-    await prefetchedPage.getByRole('heading', { name: 'Generate', exact: true }).waitFor({ timeout: CONTENT_TIMEOUT_MS });
-    const attackLink = prefetchedPage.getByRole('navigation', { name: 'Main navigation' }).getByRole('link', { name: 'Attack' });
+    await prefetchedPage.goto(`${origin}/app`, { waitUntil: 'networkidle' });
+    await prefetchedPage.locator('main h1', { hasText: 'DebateLab' }).waitFor({ timeout: CONTENT_TIMEOUT_MS });
+    const attackLink = prefetchedPage.locator('main [data-tour="mode-attack"]');
     await attackLink.hover();
     await prefetchedPage.waitForFunction(async (path) => {
       const urls = (await Promise.all((await caches.keys()).map(async (key) =>
diff --git a/src/App.tsx b/src/App.tsx
index 0370e716a..14bf0fae4 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -24,6 +24,7 @@ const LandingPage = lazy(routeLoaders["/"]);
 const TermsPage = lazy(routeLoaders["/terms"]);
 const PrivacyPage = lazy(routeLoaders["/privacy"]);
 const HomePage = lazy(routeLoaders["/app"]);
+const CurrentDebatePage = lazy(routeLoaders["/app/debate"]);
 const WorkspacesPage = lazy(routeLoaders["/app/workspaces"]);
 const WorkspaceInvitePage = lazy(routeLoaders["/app/workspaces/invite"]);
 const WorkspacePage = lazy(routeLoaders["/app/workspaces/:workspaceId"]);
@@ -97,6 +98,7 @@ const ROUTE_FALLBACKS: Record<string, RouteFallback> = {
   "/expocit/sources": { variant: "public", label: "Sources", labelKey: "crossfire.sources" },
   "/login": { variant: "public", label: "Sign in", labelKey: "login.title" },
   "/app": { variant: "home-grid", label: "Home", labelKey: "nav.home" },
+  "/app/debate": { variant: "settings/list", label: "Current debate", labelKey: "nav.currentDebate" },
   "/app/workspaces": { variant: "settings/list", label: "Workspaces", labelKey: "nav.workspaces" },
   "/app/generate": { variant: "tool-form", label: "Generate", labelKey: "nav.generate" },
   "/app/attack": { variant: "tool-form", label: "Attack", labelKey: "nav.attack" },
@@ -240,6 +242,7 @@ function AppRoutes() {
             }
           >
             <Route path="/app" element={<RouteContent><HomePage /></RouteContent>} />
+            <Route path="/app/debate" element={<RouteContent><CurrentDebatePage /></RouteContent>} />
             {COLLABORATION_URL && (
               <>
                 <Route path="/app/workspaces" element={<RouteContent><WorkspacesPage /></RouteContent>} />
diff --git a/src/components/features/AutoSavedSourcesUndo.tsx b/src/components/features/AutoSavedSourcesUndo.tsx
index f35bcd760..2e8470d0c 100644
--- a/src/components/features/AutoSavedSourcesUndo.tsx
+++ b/src/components/features/AutoSavedSourcesUndo.tsx
@@ -4,13 +4,16 @@ import { useTranslation } from 'react-i18next';
 import { toast } from 'sonner';
 import { Button } from '@/components/ui/button';
 import { useSessionStore } from '@/lib/stores/session-store';
+import { useDebateStore } from '@/lib/stores/debate-store';
 
 export function AutoSavedSourcesUndo() {
   const { t } = useTranslation();
   const sourceLibrary = useSessionStore((state) => state.sourceLibrary);
   const removeSource = useSessionStore((state) => state.removeSource);
   const [removing, setRemoving] = useState(false);
-  const autoSavedSources = sourceLibrary.filter((source) => source.folder === 'Auto-saved');
+  const currentDebateId = useDebateStore((state) => state.currentDebateId);
+  // Undo only this debate's auto-saved research; other debates keep theirs.
+  const autoSavedSources = sourceLibrary.filter((source) => source.folder === 'Auto-saved' && source.debateId === currentDebateId);
 
   if (autoSavedSources.length === 0) return null;
 
diff --git a/src/components/features/brainstorm/BrainstormForm.tsx b/src/components/features/brainstorm/BrainstormForm.tsx
index 3422aa7de..d3faac497 100644
--- a/src/components/features/brainstorm/BrainstormForm.tsx
+++ b/src/components/features/brainstorm/BrainstormForm.tsx
@@ -17,6 +17,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/com
 import { BrainstormInputSchema, type BrainstormInput } from '@/lib/ai/schemas/brainstorm';
 import { LoadingSpinner } from '@/components/ui/loading-spinner';
 
+import { useDebateMotionPrefill } from '@/components/features/debate/CurrentDebateStrip';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useEffect } from 'react';
 import { ModelSelector } from '@/components/ModelSelector';
@@ -24,13 +25,15 @@ import { ModelSelector } from '@/components/ModelSelector';
 interface BrainstormFormProps {
   onSubmit: (data: BrainstormInput) => void;
   isLoading: boolean;
+  /** Fill the motion from the Current Debate. */
+  debatePrefill?: boolean;
 }
 
-export function BrainstormForm({ onSubmit, isLoading }: BrainstormFormProps) {
+export function BrainstormForm({ onSubmit, isLoading, debatePrefill = true }: BrainstormFormProps) {
   const { t } = useTranslation();
   const { brainstormForm, setBrainstormForm } = useSessionStore();
 
-  const { register, handleSubmit, setValue, watch, formState: { errors } } = useForm<BrainstormInput>({
+  const { register, handleSubmit, setValue, getValues, watch, formState: { errors } } = useForm<BrainstormInput>({
     resolver: zodResolver(BrainstormInputSchema),
     defaultValues: {
       motion: '',
@@ -49,6 +52,8 @@ export function BrainstormForm({ onSubmit, isLoading }: BrainstormFormProps) {
     return () => subscription.unsubscribe();
   }, [watch, setBrainstormForm]);
 
+  useDebateMotionPrefill(() => getValues('motion'), (motion) => setValue('motion', motion, { shouldValidate: true }), !debatePrefill);
+
   const currentValues = watch();
 
   return (
diff --git a/src/components/features/debate/CurrentDebateMenu.tsx b/src/components/features/debate/CurrentDebateMenu.tsx
new file mode 100644
index 000000000..f41ed2148
--- /dev/null
+++ b/src/components/features/debate/CurrentDebateMenu.tsx
@@ -0,0 +1,81 @@
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+import { ChevronDown } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import { formatRelativeDate } from '@/lib/date-format';
+import { cn } from '@/lib/utils';
+import { useCurrentDebate, useDebateStore } from '@/lib/stores/debate-store';
+import { useDebateCounts } from './CurrentDebateStrip';
+
+/**
+ * Header control for the Current Debate. Desktop shows only the label; the
+ * mobile row also shows the motion on one truncated line.
+ */
+export function CurrentDebateMenu({ variant }: { variant: 'desktop' | 'mobile' }) {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const debate = useCurrentDebate();
+  const oneOff = useDebateStore((state) => state.oneOff);
+  const openDialog = useDebateStore((state) => state.openDialog);
+  const setOneOff = useDebateStore((state) => state.setOneOff);
+  const counts = useDebateCounts(debate?.id);
+  const [open, setOpen] = useState(false);
+
+  const triggerClass = cn(
+    'motion-press nav-glow flex min-w-0 items-center gap-1.5 rounded-md px-2 py-2 text-sm font-medium text-muted-foreground hover:bg-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+    variant === 'desktop' && 'xl:px-3 whitespace-nowrap',
+    variant === 'mobile' && 'w-full',
+  );
+
+  if (!debate) {
+    return (
+      <button type="button" className={triggerClass} onClick={() => openDialog('create')} data-testid={`current-debate-${variant}`}>
+        {t('debate.startDebate', 'Start debate')}
+      </button>
+    );
+  }
+
+  const act = (action: () => void) => {
+    setOpen(false);
+    action();
+  };
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          className={triggerClass}
+          aria-label={t('debate.menuAria', { motion: debate.motion, defaultValue: 'Current debate: {{motion}}' })}
+          data-testid={`current-debate-${variant}`}
+        >
+          <span className="shrink-0 text-foreground">{t('nav.currentDebate', 'Current debate')}</span>
+          <ChevronDown className="h-4 w-4 shrink-0" aria-hidden="true" />
+          {variant === 'mobile' && <span className="min-w-0 flex-1 truncate text-left font-normal">{debate.motion}</span>}
+        </button>
+      </PopoverTrigger>
+      <PopoverContent align="start" className="w-[min(22rem,calc(100vw-2rem))] space-y-3">
+        <div className="space-y-1">
+          <p className="break-words font-semibold leading-snug">{debate.motion}</p>
+          <p className="text-xs text-muted-foreground">
+            {t('debate.lastActivity', { when: formatRelativeDate(debate.lastActivityAt), defaultValue: 'Last activity {{when}}' })}
+          </p>
+          <p className="text-xs text-muted-foreground">
+            {t('debate.counts', { sources: counts.sources, outputs: counts.outputs, defaultValue: '{{sources}} sources · {{outputs}} outputs' })}
+          </p>
+          {oneOff && <p className="text-xs font-medium text-primary">{t('debate.oneOffActive', 'One-off mode is on')}</p>}
+        </div>
+        <div className="grid gap-1">
+          <Button variant="ghost" className="justify-start" onClick={() => act(() => navigate('/app/debate'))}>{t('debate.open', 'Open debate')}</Button>
+          <Button variant="ghost" className="justify-start" onClick={() => act(() => openDialog('switch'))}>{t('debate.switch', 'Switch debate')}</Button>
+          <Button variant="ghost" className="justify-start" onClick={() => act(() => openDialog('create'))}>{t('debate.startNew', 'Start new debate')}</Button>
+          <Button variant="ghost" className="justify-start" onClick={() => act(() => setOneOff(!oneOff))}>
+            {oneOff ? t('debate.returnToDebate', 'Return to debate') : t('debate.useOneOff', 'Use one-off mode')}
+          </Button>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/src/components/features/debate/CurrentDebateStrip.tsx b/src/components/features/debate/CurrentDebateStrip.tsx
new file mode 100644
index 000000000..5833b1a5e
--- /dev/null
+++ b/src/components/features/debate/CurrentDebateStrip.tsx
@@ -0,0 +1,89 @@
+import { useEffect, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { shouldPrefillMotion } from '@/lib/debate/motion';
+import { useCurrentDebate, useDebateStore, type DebateSide } from '@/lib/stores/debate-store';
+import { useSessionStore } from '@/lib/stores/session-store';
+import { useSparringStore } from '@/lib/stores/sparring-store';
+
+// eslint-disable-next-line react-refresh/only-export-components
+export function sideLabelKey(side: DebateSide): string {
+  return `debate.side.${side}`;
+}
+
+/** Sources and saved outputs that belong to one debate. */
+// eslint-disable-next-line react-refresh/only-export-components
+export function useDebateCounts(debateId: string | null | undefined) {
+  const sources = useSessionStore((state) => debateId ? state.sourceLibrary.filter((source) => source.debateId === debateId).length : 0);
+  const outputs = useSessionStore((state) => debateId ? [
+    state.savedCases, state.savedAttacks, state.savedBrainstorms, state.savedFactoids,
+    state.savedChats, state.savedFlowcharts, state.savedCrossfires,
+  ].reduce((count, list) => count + list.filter((item) => item.debateId === debateId).length, 0) : 0);
+  const sparring = useSparringStore((state) => debateId ? state.savedSessions.filter((session) => session.debateId === debateId).length : 0);
+  return { sources, outputs: outputs + sparring };
+}
+
+/**
+ * Fills a feature's motion from the Current Debate on open and after a switch,
+ * without overwriting text the user typed themselves.
+ */
+// eslint-disable-next-line react-refresh/only-export-components
+export function useDebateMotionPrefill(getMotion: () => string | undefined, setMotion: (motion: string) => void, disabled = false) {
+  const debate = useCurrentDebate();
+  const oneOff = useDebateStore((state) => state.oneOff);
+  const getRef = useRef(getMotion);
+  const setRef = useRef(setMotion);
+  getRef.current = getMotion;
+  setRef.current = setMotion;
+
+  useEffect(() => {
+    if (disabled || oneOff || !debate) return;
+    const known = useDebateStore.getState().debates.map((item) => item.motion);
+    if (shouldPrefillMotion(getRef.current(), debate.motion, known)) setRef.current(debate.motion);
+  }, [debate, disabled, oneOff]);
+}
+
+/** Compact “Working in” line directly below each feature title. */
+export function CurrentDebateStrip({ side, hidden = false, className = 'mb-6' }: { side?: DebateSide; hidden?: boolean; className?: string }) {
+  const { t } = useTranslation();
+  const debate = useCurrentDebate();
+  const oneOff = useDebateStore((state) => state.oneOff);
+  const setOneOff = useDebateStore((state) => state.setOneOff);
+  const openDialog = useDebateStore((state) => state.openDialog);
+  if (hidden) return null;
+
+  const base = `${className} flex flex-wrap items-center gap-x-3 gap-y-2 rounded-lg border px-3 py-2 text-sm`;
+
+  if (oneOff) {
+    return (
+      <div className={`${base} border-dashed border-border bg-muted/40`} data-testid="current-debate-strip">
+        <span className="min-w-0 flex-1 basis-48 text-muted-foreground">{t('debate.oneOffStrip', 'One-off mode: nothing here uses or saves to a debate.')}</span>
+        {debate && <Button size="sm" variant="outline" onClick={() => setOneOff(false)}>{t('debate.returnToDebate', 'Return to debate')}</Button>}
+      </div>
+    );
+  }
+
+  if (!debate) {
+    return (
+      <div className={`${base} border-border bg-card/60`} data-testid="current-debate-strip">
+        <span className="min-w-0 flex-1 basis-48 text-muted-foreground">{t('debate.noCurrentStrip', 'No current debate. Results stay one-off until you start one.')}</span>
+        <Button size="sm" onClick={() => openDialog('create')}>{t('debate.startDebate', 'Start debate')}</Button>
+      </div>
+    );
+  }
+
+  return (
+    <div className={`${base} border-primary/20 bg-primary/5`} data-testid="current-debate-strip">
+      <span className="min-w-0 flex-1 basis-48">
+        <span className="text-muted-foreground">{t('debate.workingIn', 'Working in:')} </span>
+        <span className="break-words font-medium text-foreground">{debate.motion}</span>
+      </span>
+      {side && <Badge variant="outline">{t(sideLabelKey(side))}</Badge>}
+      <div className="flex gap-2">
+        <Button size="sm" variant="ghost" onClick={() => openDialog('switch')}>{t('debate.change', 'Change')}</Button>
+        <Button size="sm" variant="ghost" onClick={() => setOneOff(true)}>{t('debate.useOnceShort', 'Use once')}</Button>
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/features/debate/DebateDialogs.tsx b/src/components/features/debate/DebateDialogs.tsx
new file mode 100644
index 000000000..15ea8fec8
--- /dev/null
+++ b/src/components/features/debate/DebateDialogs.tsx
@@ -0,0 +1,226 @@
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Check, Trash2 } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import {
+  AlertDialog,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
+import { useToast } from '@/hooks/use-toast';
+import { formatRelativeDate } from '@/lib/date-format';
+import { cn } from '@/lib/utils';
+import { isDebateInactive, useCurrentDebate, useDebateStore, type Debate } from '@/lib/stores/debate-store';
+import { useSessionStore } from '@/lib/stores/session-store';
+import { DebateForm, type DebateFormValues } from './DebateForm';
+
+/** Switching or starting a debate from navigation clears open tool results so debates never mix. */
+// eslint-disable-next-line react-refresh/only-export-components
+export function useDebateNavigationActions() {
+  const switchDebate = useDebateStore((state) => state.switchDebate);
+  const createDebate = useDebateStore((state) => state.createDebate);
+  const clearSession = useSessionStore((state) => state.clearSession);
+  return {
+    switchTo: async (id: string) => {
+      await switchDebate(id);
+      clearSession();
+    },
+    create: async (values: DebateFormValues) => {
+      const debate = await createDebate(values);
+      clearSession();
+      return debate;
+    },
+  };
+}
+
+export function DebatePicker({ onPicked, excludeCurrent = false }: { onPicked: () => void; excludeCurrent?: boolean }) {
+  const { t } = useTranslation();
+  const { toast } = useToast();
+  const debates = useDebateStore((state) => state.debates);
+  const currentDebateId = useDebateStore((state) => state.currentDebateId);
+  const deleteDebate = useDebateStore((state) => state.deleteDebate);
+  const { switchTo } = useDebateNavigationActions();
+  const [confirmingId, setConfirmingId] = useState<string | null>(null);
+  const visible = excludeCurrent ? debates.filter((debate) => debate.id !== currentDebateId) : debates;
+
+  if (visible.length === 0) {
+    return <p className="text-sm text-muted-foreground">{t('debate.noOtherDebates', 'You have no other debates yet.')}</p>;
+  }
+
+  const pick = async (debate: Debate) => {
+    try {
+      await switchTo(debate.id);
+      onPicked();
+    } catch {
+      toast({ title: t('debate.switchFailed', 'Could not switch debates'), variant: 'destructive' });
+    }
+  };
+
+  const remove = async (debate: Debate) => {
+    try {
+      await deleteDebate(debate.id);
+      setConfirmingId(null);
+      toast({ title: t('debate.deleted', 'Debate deleted') });
+    } catch {
+      toast({ title: t('debate.deleteFailed', 'Could not delete the debate'), variant: 'destructive' });
+    }
+  };
+
+  return (
+    <ul className="max-h-[50vh] space-y-2 overflow-y-auto pr-1" aria-label={t('debate.yourDebates', 'Your debates')}>
+      {visible.map((debate) => {
+        const isCurrent = debate.id === currentDebateId;
+        return (
+          <li key={debate.id} className={cn('rounded-lg border p-3', isCurrent && 'border-primary/40 bg-primary/5')}>
+            <div className="flex items-start gap-3">
+              <button
+                type="button"
+                className="min-w-0 flex-1 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring rounded-sm"
+                onClick={() => void pick(debate)}
+                aria-label={t('debate.switchToAria', { motion: debate.motion, defaultValue: 'Switch to {{motion}}' })}
+              >
+                <span className="block break-words font-medium">{debate.motion}</span>
+                <span className="block text-xs text-muted-foreground">
+                  {t('debate.lastActivity', { when: formatRelativeDate(debate.lastActivityAt), defaultValue: 'Last activity {{when}}' })}
+                </span>
+              </button>
+              {isCurrent ? (
+                <Check className="mt-1 h-4 w-4 shrink-0 text-primary" aria-label={t('debate.current', 'Current debate')} />
+              ) : (
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  className="h-8 w-8 shrink-0 text-destructive"
+                  onClick={() => setConfirmingId(debate.id)}
+                  aria-label={t('debate.deleteAria', { motion: debate.motion, defaultValue: 'Delete {{motion}}' })}
+                >
+                  <Trash2 className="h-4 w-4" />
+                </Button>
+              )}
+            </div>
+            {confirmingId === debate.id && (
+              <div className="mt-3 flex flex-wrap items-center justify-end gap-2 border-t pt-3">
+                <span className="mr-auto text-xs text-muted-foreground">{t('debate.deleteWarning', 'Deletes its sources and saved work.')}</span>
+                <Button size="sm" variant="outline" onClick={() => setConfirmingId(null)}>{t('common.cancel', 'Cancel')}</Button>
+                <Button size="sm" variant="destructive" onClick={() => void remove(debate)}>{t('common.delete', 'Delete')}</Button>
+              </div>
+            )}
+          </li>
+        );
+      })}
+    </ul>
+  );
+}
+
+/** Global Switch and Start-new dialogs, opened from the header, strip, Home, or dashboard. */
+export function DebateDialogs() {
+  const { t } = useTranslation();
+  const dialog = useDebateStore((state) => state.dialog);
+  const dialogMotion = useDebateStore((state) => state.dialogMotion);
+  const openDialog = useDebateStore((state) => state.openDialog);
+  const { create } = useDebateNavigationActions();
+  const close = () => openDialog(null);
+
+  return (
+    <Dialog open={dialog !== null} onOpenChange={(open) => { if (!open) close(); }}>
+      <DialogContent className="max-w-lg">
+        {dialog === 'create' ? (
+          <>
+            <DialogHeader>
+              <DialogTitle>{t('debate.startNew', 'Start new debate')}</DialogTitle>
+              <DialogDescription>{t('debate.startNewDesc', 'Your tools, sources, and results will follow this motion. Older debates stay available.')}</DialogDescription>
+            </DialogHeader>
+            <DebateForm
+              key={dialogMotion}
+              idPrefix="new-debate"
+              initial={{ motion: dialogMotion }}
+              submitLabel={t('debate.startDebate', 'Start debate')}
+              onCancel={close}
+              onSubmit={async (values) => {
+                await create(values);
+                close();
+              }}
+            />
+          </>
+        ) : (
+          <>
+            <DialogHeader>
+              <DialogTitle>{t('debate.switch', 'Switch debate')}</DialogTitle>
+              <DialogDescription>{t('debate.switchDesc', 'Pick the motion you are preparing now.')}</DialogDescription>
+            </DialogHeader>
+            <DebatePicker onPicked={close} />
+            <Button variant="outline" onClick={() => openDialog('create')}>{t('debate.startNew', 'Start new debate')}</Button>
+          </>
+        )}
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+/**
+ * After five days without meaningful work the app is blocked until the user
+ * confirms the Current Debate, starts a new one, or switches.
+ */
+export function InactiveDebateGate() {
+  const { t } = useTranslation();
+  const { toast } = useToast();
+  const debate = useCurrentDebate();
+  const hydrated = useDebateStore((state) => state.hydrated);
+  const continueDebate = useDebateStore((state) => state.continueDebate);
+  const { create } = useDebateNavigationActions();
+  const [mode, setMode] = useState<'ask' | 'create' | 'switch'>('ask');
+
+  const open = Boolean(hydrated && debate && isDebateInactive(debate));
+  if (!open || !debate) return null;
+
+  const handleContinue = async () => {
+    try {
+      await continueDebate();
+    } catch {
+      toast({ title: t('debate.continueFailed', 'Could not update the debate'), variant: 'destructive' });
+    }
+  };
+
+  return (
+    <AlertDialog open>
+      <AlertDialogContent className="max-w-lg" onEscapeKeyDown={(event) => event.preventDefault()}>
+        <AlertDialogHeader>
+          <AlertDialogTitle>{t('debate.gateTitle', 'Still preparing this debate?')}</AlertDialogTitle>
+          <AlertDialogDescription asChild>
+            <div className="space-y-2">
+              <p className="break-words font-medium text-foreground">{debate.motion}</p>
+              <p>{t('debate.gateDesc', { when: formatRelativeDate(debate.lastActivityAt), defaultValue: 'Last activity {{when}}. Choose how to continue.' })}</p>
+            </div>
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        {mode === 'ask' && (
+          <div className="flex flex-col gap-2 sm:flex-row sm:justify-end">
+            <Button variant="outline" onClick={() => setMode('switch')}>{t('debate.switch', 'Switch debate')}</Button>
+            <Button variant="outline" onClick={() => setMode('create')}>{t('debate.startNew', 'Start new debate')}</Button>
+            <Button onClick={() => void handleContinue()}>{t('debate.continue', 'Continue')}</Button>
+          </div>
+        )}
+        {mode === 'create' && (
+          <DebateForm
+            idPrefix="gate-debate"
+            submitLabel={t('debate.startDebate', 'Start debate')}
+            onCancel={() => setMode('ask')}
+            onSubmit={async (values) => {
+              await create(values);
+              setMode('ask');
+            }}
+          />
+        )}
+        {mode === 'switch' && (
+          <div className="space-y-3">
+            <DebatePicker excludeCurrent onPicked={() => setMode('ask')} />
+            <Button variant="outline" className="w-full" onClick={() => setMode('ask')}>{t('common.back', 'Back')}</Button>
+          </div>
+        )}
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+}
diff --git a/src/components/features/debate/DebateForm.tsx b/src/components/features/debate/DebateForm.tsx
new file mode 100644
index 000000000..d21e628b6
--- /dev/null
+++ b/src/components/features/debate/DebateForm.tsx
@@ -0,0 +1,122 @@
+import { useState, type FormEvent } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { Textarea } from '@/components/ui/textarea';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { MAX_INSTRUCTIONS_LENGTH, MAX_MOTION_LENGTH, type DebateSettings } from '@/lib/stores/debate-store';
+
+export interface DebateFormValues {
+  motion: string;
+  settings: DebateSettings;
+  instructions: string;
+}
+
+const FORMATS = ['custom', 'bp', 'policy', 'classroom'] as const;
+const ROLES = ['general', 'intro', 'r1', 'r2', 'conc'] as const;
+const ROLE_LABEL_KEYS: Record<(typeof ROLES)[number], string> = {
+  general: 'debate.roleAny',
+  intro: 'generateForm.roleIntro',
+  r1: 'generateForm.roleR1',
+  r2: 'generateForm.roleR2',
+  conc: 'generateForm.roleConc',
+};
+
+interface DebateFormProps {
+  initial?: Partial<DebateFormValues>;
+  submitLabel: string;
+  onSubmit: (values: DebateFormValues) => Promise<void>;
+  onCancel?: () => void;
+  /** Motion is fixed when editing only settings. */
+  showDetails?: boolean;
+  idPrefix?: string;
+}
+
+export function DebateForm({ initial, submitLabel, onSubmit, onCancel, showDetails = true, idPrefix = 'debate' }: DebateFormProps) {
+  const { t } = useTranslation();
+  const [motion, setMotion] = useState(initial?.motion ?? '');
+  const [format, setFormat] = useState(initial?.settings?.format ?? 'custom');
+  const [role, setRole] = useState(initial?.settings?.role ?? 'general');
+  const [instructions, setInstructions] = useState(initial?.instructions ?? '');
+  const [saving, setSaving] = useState(false);
+  const [error, setError] = useState('');
+
+  const submit = async (event: FormEvent) => {
+    event.preventDefault();
+    if (!motion.trim()) {
+      setError(t('debate.motionRequired', 'Enter the motion you are preparing.'));
+      return;
+    }
+    setSaving(true);
+    setError('');
+    try {
+      await onSubmit({ motion: motion.trim(), settings: { format, role }, instructions: instructions.trim() });
+    } catch (submitError) {
+      setError(submitError instanceof Error ? submitError.message : t('debate.saveFailed', 'Could not save the debate.'));
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <form onSubmit={submit} className="space-y-4">
+      <div className="space-y-2">
+        <Label htmlFor={`${idPrefix}-motion`}>{t('debate.motion', 'Motion')}</Label>
+        <Textarea
+          id={`${idPrefix}-motion`}
+          value={motion}
+          onChange={(event) => setMotion(event.target.value)}
+          maxLength={MAX_MOTION_LENGTH}
+          rows={3}
+          placeholder={t('debate.motionPlaceholder', 'This House would…')}
+          autoFocus
+        />
+      </div>
+      {showDetails && (
+        <>
+          <div className="grid gap-3 sm:grid-cols-2">
+            <div className="space-y-2">
+              <Label htmlFor={`${idPrefix}-format`}>{t('debate.format', 'Format')}</Label>
+              <Select value={format} onValueChange={setFormat}>
+                <SelectTrigger id={`${idPrefix}-format`}><SelectValue /></SelectTrigger>
+                <SelectContent>
+                  {FORMATS.map((value) => (
+                    <SelectItem key={value} value={value}>{t(`debate.formats.${value}`, value)}</SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor={`${idPrefix}-role`}>{t('debate.role', 'Your role')}</Label>
+              <Select value={role} onValueChange={setRole}>
+                <SelectTrigger id={`${idPrefix}-role`}><SelectValue /></SelectTrigger>
+                <SelectContent>
+                  {ROLES.map((value) => (
+                    <SelectItem key={value} value={value}>{t(ROLE_LABEL_KEYS[value], value)}</SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          </div>
+          <div className="space-y-2">
+            <Label htmlFor={`${idPrefix}-instructions`}>{t('debate.instructions', 'Instructions')}</Label>
+            <Textarea
+              id={`${idPrefix}-instructions`}
+              value={instructions}
+              onChange={(event) => setInstructions(event.target.value)}
+              maxLength={MAX_INSTRUCTIONS_LENGTH}
+              rows={3}
+              placeholder={t('debate.instructionsPlaceholder', 'Roles, judge expectations, agreed definitions, school conventions, writing preferences…')}
+            />
+            <p className="text-right text-xs tabular-nums text-muted-foreground">{instructions.length}/{MAX_INSTRUCTIONS_LENGTH}</p>
+          </div>
+        </>
+      )}
+      {error && <p role="alert" className="text-sm text-destructive">{error}</p>}
+      <div className="flex flex-wrap justify-end gap-2">
+        {onCancel && <Button type="button" variant="outline" onClick={onCancel}>{t('common.cancel', 'Cancel')}</Button>}
+        <Button type="submit" disabled={saving || !motion.trim()}>{submitLabel}</Button>
+      </div>
+    </form>
+  );
+}
diff --git a/src/components/features/debate/DebateMotionGate.tsx b/src/components/features/debate/DebateMotionGate.tsx
new file mode 100644
index 000000000..f73fbed39
--- /dev/null
+++ b/src/components/features/debate/DebateMotionGate.tsx
@@ -0,0 +1,114 @@
+import { useCallback, useRef, useState, type ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Button } from '@/components/ui/button';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { useToast } from '@/hooks/use-toast';
+import { decideMotionTarget } from '@/lib/debate/motion';
+import { useCurrentDebate, useDebateStore, type Debate } from '@/lib/stores/debate-store';
+
+/** Where one submission's work belongs. `debateId: null` is one-off work. */
+export interface DebateTarget {
+  debateId: string | null;
+}
+
+interface PendingChoice {
+  motion: string;
+  matches: Debate[];
+  resolve: (target: DebateTarget | null) => void;
+}
+
+/**
+ * Before a motion-bearing tool submits, confirm which debate the work belongs
+ * to. A motion other than the Current Debate's asks the user to switch to a
+ * matching debate, create a new one, or use the motion once.
+ */
+export function useDebateMotionGate(options: { disabled?: boolean } = {}): {
+  /** Calls `proceed` right away when the target is clear, or after the user chooses. Cancelling never calls it. */
+  run: (motion: string, proceed: (target: DebateTarget) => void) => void;
+  dialog: ReactNode;
+} {
+  const { t } = useTranslation();
+  const { toast } = useToast();
+  const current = useCurrentDebate();
+  const [pending, setPending] = useState<PendingChoice | null>(null);
+  const [busy, setBusy] = useState(false);
+  const pendingRef = useRef<PendingChoice | null>(null);
+  const disabled = Boolean(options.disabled);
+
+  const run = useCallback((motion: string, proceed: (target: DebateTarget) => void) => {
+    if (disabled) return proceed({ debateId: null });
+    const decision = decideMotionTarget(motion, useDebateStore.getState());
+    if (decision.kind === 'attach') return proceed({ debateId: decision.debateId });
+    if (decision.kind === 'one-off') return proceed({ debateId: null });
+    const choice = { motion, matches: decision.matches, resolve: (target: DebateTarget | null) => { if (target) proceed(target); } };
+    pendingRef.current = choice;
+    setPending(choice);
+  }, [disabled]);
+
+  const finish = (target: DebateTarget | null) => {
+    pendingRef.current?.resolve(target);
+    pendingRef.current = null;
+    setPending(null);
+  };
+
+  const choose = async (action: () => Promise<DebateTarget>) => {
+    setBusy(true);
+    try {
+      finish(await action());
+    } catch {
+      toast({ title: t('debate.saveFailed', 'Could not save the debate.'), variant: 'destructive' });
+    } finally {
+      setBusy(false);
+    }
+  };
+
+  const dialog = (
+    <Dialog open={pending !== null} onOpenChange={(open) => { if (!open && !busy) finish(null); }}>
+      <DialogContent className="max-w-lg">
+        <DialogHeader>
+          <DialogTitle>
+            {current ? t('debate.mismatchTitle', 'This is a different motion') : t('debate.noDebateTitle', 'Which debate is this for?')}
+          </DialogTitle>
+          <DialogDescription asChild>
+            <div className="space-y-2">
+              <p className="break-words font-medium text-foreground">{pending?.motion}</p>
+              {current && (
+                <p className="break-words">{t('debate.mismatchDesc', { motion: current.motion, defaultValue: 'Your Current Debate is “{{motion}}”.' })}</p>
+              )}
+            </div>
+          </DialogDescription>
+        </DialogHeader>
+        <div className="flex flex-col gap-2">
+          {pending?.matches.map((debate) => (
+            <Button
+              key={debate.id}
+              variant="outline"
+              disabled={busy}
+              className="h-auto justify-start whitespace-normal py-2 text-left"
+              onClick={() => void choose(async () => {
+                await useDebateStore.getState().switchDebate(debate.id);
+                return { debateId: debate.id };
+              })}
+            >
+              {t('debate.switchToExisting', 'Switch to this existing debate')}
+            </Button>
+          ))}
+          <Button
+            disabled={busy}
+            onClick={() => void choose(async () => {
+              const debate = await useDebateStore.getState().createDebate({ motion: pending?.motion ?? '' });
+              return { debateId: debate.id };
+            })}
+          >
+            {t('debate.createFromMotion', 'Create a new debate for this motion')}
+          </Button>
+          <Button variant="ghost" disabled={busy} onClick={() => finish({ debateId: null })}>
+            {t('debate.useOnce', 'Use once without saving to a debate')}
+          </Button>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+
+  return { run, dialog };
+}
diff --git a/src/components/features/debate/UnsortedWork.tsx b/src/components/features/debate/UnsortedWork.tsx
new file mode 100644
index 000000000..0d3a23121
--- /dev/null
+++ b/src/components/features/debate/UnsortedWork.tsx
@@ -0,0 +1,116 @@
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Inbox } from 'lucide-react';
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { EmptyState } from '@/components/ui/empty-state';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { useToast } from '@/hooks/use-toast';
+import { formatEuropeanDateTime } from '@/lib/date-format';
+import { sameMotion, useDebateStore, type Debate } from '@/lib/stores/debate-store';
+import { useSessionStore } from '@/lib/stores/session-store';
+import { useSparringStore } from '@/lib/stores/sparring-store';
+import { useAllDebateItems, useOpenDebateItem, type DebateItem } from './debate-items';
+
+type UnsortedEntry =
+  | { kind: 'item'; item: DebateItem }
+  | { kind: 'source'; id: string; title: string; createdAt: number };
+
+function entryKey(entry: UnsortedEntry) {
+  return entry.kind === 'item' ? `${entry.item.kind}-${entry.item.id}` : `source-${entry.id}`;
+}
+
+/** Suggest a debate only on an exact motion or title match; the user still confirms. */
+// eslint-disable-next-line react-refresh/only-export-components
+export function suggestDebate(debates: Debate[], candidates: Array<string | undefined>): Debate | undefined {
+  return debates.find((debate) => candidates.some((candidate) => sameMotion(debate.motion, candidate)));
+}
+
+function UnsortedRow({ entry, debates }: { entry: UnsortedEntry; debates: Debate[] }) {
+  const { t } = useTranslation();
+  const { toast } = useToast();
+  const attachItem = useSessionStore((state) => state.attachItem);
+  const attachSparring = useSparringStore((state) => state.attachSessionToDebate);
+  const openItem = useOpenDebateItem();
+  const title = entry.kind === 'item' ? entry.item.title : entry.title;
+  const suggestion = suggestDebate(debates, entry.kind === 'item' ? [entry.item.motion, entry.item.title] : [entry.title]);
+  const [target, setTarget] = useState<string>(suggestion?.id ?? '');
+  const [busy, setBusy] = useState(false);
+
+  const attach = async () => {
+    if (!target) return;
+    setBusy(true);
+    try {
+      if (entry.kind === 'source') await attachItem('source', entry.id, target);
+      else if (entry.item.kind === 'sparring') await attachSparring(entry.item.id, target);
+      else await attachItem(entry.item.kind, entry.item.id, target);
+      toast({ title: t('debate.attached', 'Added to debate') });
+    } catch {
+      toast({ title: t('debate.attachFailed', 'Could not add this to the debate'), variant: 'destructive' });
+    } finally {
+      setBusy(false);
+    }
+  };
+
+  return (
+    <li className="space-y-3 rounded-lg border bg-card p-4" data-testid="unsorted-item">
+      <div className="flex flex-wrap items-start justify-between gap-2">
+        <div className="min-w-0">
+          <p className="break-words font-semibold">{title}</p>
+          <p className="text-xs text-muted-foreground">
+            {entry.kind === 'item' ? t(`debate.kinds.${entry.item.kind}`) : t('debate.kinds.source', 'Source')}
+            {' · '}
+            {formatEuropeanDateTime(entry.kind === 'item' ? entry.item.createdAt : entry.createdAt)}
+          </p>
+        </div>
+        {entry.kind === 'item' && entry.item.kind !== 'crossfire' && (
+          <Button variant="outline" size="sm" onClick={() => openItem(entry.item)}>{t('historyPage.load', 'Load')}</Button>
+        )}
+      </div>
+      {suggestion && (
+        <p className="text-sm">
+          <Badge variant="secondary" className="mr-2">{t('debate.suggested', 'Suggested')}</Badge>
+          <span className="break-words">{suggestion.motion}</span>
+        </p>
+      )}
+      {debates.length > 0 && (
+        <div className="flex flex-col gap-2 sm:flex-row">
+          <Select value={target} onValueChange={setTarget}>
+            <SelectTrigger className="sm:flex-1" aria-label={t('debate.attachTo', 'Add to debate')}>
+              <SelectValue placeholder={t('debate.chooseDebate', 'Choose a debate')} />
+            </SelectTrigger>
+            <SelectContent>
+              {debates.map((debate) => <SelectItem key={debate.id} value={debate.id}>{debate.motion}</SelectItem>)}
+            </SelectContent>
+          </Select>
+          <Button disabled={!target || busy} onClick={() => void attach()}>{t('debate.attachConfirm', 'Add to debate')}</Button>
+        </div>
+      )}
+    </li>
+  );
+}
+
+/** One-off work and recent legacy material that belongs to no debate yet. */
+export function UnsortedWork() {
+  const { t } = useTranslation();
+  const debates = useDebateStore((state) => state.debates);
+  const items = useAllDebateItems();
+  const sources = useSessionStore((state) => state.sourceLibrary);
+  const entries: UnsortedEntry[] = [
+    ...items.filter((item) => !item.debateId).map((item) => ({ kind: 'item' as const, item })),
+    ...sources.filter((source) => !source.debateId).map((source) => ({ kind: 'source' as const, id: source.id, title: source.title, createdAt: source.createdAt })),
+  ].sort((a, b) => (b.kind === 'item' ? b.item.createdAt : b.createdAt) - (a.kind === 'item' ? a.item.createdAt : a.createdAt));
+
+  if (entries.length === 0) {
+    return <EmptyState icon={Inbox} title={t('debate.unsortedEmpty', 'Nothing outside your debates')} description={t('debate.unsortedEmptyDesc', 'One-off results and older unsorted work appear here.')} />;
+  }
+
+  return (
+    <div className="space-y-3">
+      <p className="text-sm text-muted-foreground">{t('debate.unsortedDesc', 'These results are not in any debate. Nothing moves until you confirm.')}</p>
+      <ul className="space-y-3">
+        {entries.map((entry) => <UnsortedRow key={entryKey(entry)} entry={entry} debates={debates} />)}
+      </ul>
+    </div>
+  );
+}
diff --git a/src/components/features/debate/debate-items.ts b/src/components/features/debate/debate-items.ts
new file mode 100644
index 000000000..afe628232
--- /dev/null
+++ b/src/components/features/debate/debate-items.ts
@@ -0,0 +1,110 @@
+import { useMemo } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { useSessionStore, type AttachKind } from '@/lib/stores/session-store';
+import { useSparringStore } from '@/lib/stores/sparring-store';
+import type { DebateSide } from '@/lib/stores/debate-store';
+
+export type DebateItemKind = Exclude<AttachKind, 'source'> | 'sparring';
+
+/** One saved result, whatever tool produced it. */
+export interface DebateItem {
+  id: string;
+  kind: DebateItemKind;
+  title: string;
+  /** Exact motion recorded with the work, when the tool had one. */
+  motion?: string;
+  side: DebateSide | null;
+  debateId: string | null;
+  createdAt: number;
+}
+
+export const ITEM_ROUTES: Record<DebateItemKind, string> = {
+  case: '/app/generate',
+  attack: '/app/attack',
+  brainstorm: '/app/brainstorm',
+  factoids: '/app/factoids',
+  chat: '/app/ask',
+  flowchart: '/app/flowchart',
+  crossfire: '/app/crossfire',
+  sparring: '/app/sparring',
+};
+
+function motionOf(data: unknown): string | undefined {
+  const metadata = (data as { metadata?: { motion?: unknown } } | null)?.metadata;
+  return typeof metadata?.motion === 'string' ? metadata.motion : undefined;
+}
+
+/** Every saved result across tools, newest first. Filter by debate at the call site. */
+export function useAllDebateItems(): DebateItem[] {
+  const savedCases = useSessionStore((state) => state.savedCases);
+  const savedAttacks = useSessionStore((state) => state.savedAttacks);
+  const savedBrainstorms = useSessionStore((state) => state.savedBrainstorms);
+  const savedFactoids = useSessionStore((state) => state.savedFactoids);
+  const savedChats = useSessionStore((state) => state.savedChats);
+  const savedFlowcharts = useSessionStore((state) => state.savedFlowcharts);
+  const savedCrossfires = useSessionStore((state) => state.savedCrossfires);
+  const sparringSessions = useSparringStore((state) => state.savedSessions);
+
+  return useMemo(() => {
+    const items: DebateItem[] = [];
+    const push = (kind: DebateItemKind, list: Array<{ id: string; title: string; data: unknown; createdAt: number; debateId?: string | null; side?: DebateSide | null }>) => {
+      for (const item of list) {
+        items.push({
+          id: item.id,
+          kind,
+          title: item.title,
+          motion: motionOf(item.data),
+          side: item.side ?? null,
+          debateId: item.debateId ?? null,
+          createdAt: item.createdAt,
+        });
+      }
+    };
+    push('case', savedCases);
+    push('attack', savedAttacks);
+    push('brainstorm', savedBrainstorms);
+    push('factoids', savedFactoids);
+    push('chat', savedChats);
+    push('flowchart', savedFlowcharts);
+    push('crossfire', savedCrossfires);
+    for (const session of sparringSessions) {
+      items.push({
+        id: session.id,
+        kind: 'sparring',
+        title: session.motion,
+        motion: session.motion,
+        side: session.userSide,
+        debateId: session.debateId ?? null,
+        createdAt: session.updatedAt,
+      });
+    }
+    return items.sort((a, b) => b.createdAt - a.createdAt);
+  }, [savedAttacks, savedBrainstorms, savedCases, savedChats, savedCrossfires, savedFactoids, savedFlowcharts, sparringSessions]);
+}
+
+/** Loads a saved item back into its tool. Returns false when the tool cannot reopen it. */
+export function useOpenDebateItem() {
+  const navigate = useNavigate();
+  const session = useSessionStore();
+  const loadSparringSession = useSparringStore((state) => state.loadSavedSession);
+
+  return (item: DebateItem): boolean => {
+    switch (item.kind) {
+      case 'case': session.loadSavedCase(item.id); break;
+      case 'attack': session.loadSavedAttack(item.id); break;
+      case 'brainstorm': session.loadSavedBrainstorm(item.id); break;
+      case 'factoids': session.loadSavedFactoids(item.id); break;
+      case 'chat': session.loadSavedChat(item.id); break;
+      case 'flowchart': {
+        const flowchart = session.savedFlowcharts.find((candidate) => candidate.id === item.id);
+        if (!flowchart) return false;
+        session.setPendingFlowchartData(flowchart.data);
+        break;
+      }
+      case 'sparring': loadSparringSession(item.id); break;
+      case 'crossfire': return false;
+    }
+    navigate(ITEM_ROUTES[item.kind]);
+    return true;
+  };
+}
diff --git a/src/components/features/generate/GenerateForm.tsx b/src/components/features/generate/GenerateForm.tsx
index be5ab3ceb..14bffae0a 100644
--- a/src/components/features/generate/GenerateForm.tsx
+++ b/src/components/features/generate/GenerateForm.tsx
@@ -17,6 +17,7 @@ import {
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { GenerateInputSchema, type GenerateInput } from '@/lib/ai/schemas/generate';
 import { LoadingSpinner } from '@/components/ui/loading-spinner';
+import { useDebateMotionPrefill } from '@/components/features/debate/CurrentDebateStrip';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useSpeechToText } from '@/hooks/use-speech-to-text';
 import { ModelSelector } from '@/components/ModelSelector';
@@ -25,9 +26,11 @@ import { ModelSelector } from '@/components/ModelSelector';
 interface GenerateFormProps {
   onSubmit: (data: GenerateInput) => void;
   isLoading: boolean;
+  /** Fill the motion from the Current Debate. */
+  debatePrefill?: boolean;
 }
 
-export function GenerateForm({ onSubmit, isLoading }: GenerateFormProps) {
+export function GenerateForm({ onSubmit, isLoading, debatePrefill = true }: GenerateFormProps) {
   const { t } = useTranslation();
   const { generateForm, setGenerateForm } = useSessionStore();
   const [advancedOpen, setAdvancedOpen] = useState(false);
@@ -37,7 +40,7 @@ export function GenerateForm({ onSubmit, isLoading }: GenerateFormProps) {
     if (advancedOptionsRef.current) advancedOptionsRef.current.inert = !advancedOpen;
   }, [advancedOpen]);
 
-  const { register, handleSubmit, setValue, watch, formState: { errors } } = useForm<GenerateInput>({
+  const { register, handleSubmit, setValue, getValues, watch, formState: { errors } } = useForm<GenerateInput>({
     resolver: zodResolver(GenerateInputSchema),
     defaultValues: {
       motion: '',
@@ -59,6 +62,8 @@ export function GenerateForm({ onSubmit, isLoading }: GenerateFormProps) {
     return () => subscription.unsubscribe();
   }, [watch, setGenerateForm]);
 
+  useDebateMotionPrefill(() => getValues('motion'), (motion) => setValue('motion', motion, { shouldValidate: true }), !debatePrefill);
+
   // Voice input integration
   const { isListening, transcript, error: voiceError, startListening, stopListening, resetTranscript, hasSupport: hasVoiceSupport } = useSpeechToText();
 
diff --git a/src/components/features/sparring/SparringSetup.tsx b/src/components/features/sparring/SparringSetup.tsx
index 628cc9ebf..6f0ecbca2 100644
--- a/src/components/features/sparring/SparringSetup.tsx
+++ b/src/components/features/sparring/SparringSetup.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ArrowRight, Check, ChevronDown, Cpu, Gauge, Swords } from 'lucide-react';
 import { Button } from '@/components/ui/button';
@@ -6,6 +6,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { Label } from '@/components/ui/label';
 import { Textarea } from '@/components/ui/textarea';
 import { Badge } from '@/components/ui/badge';
+import { useDebateMotionPrefill } from '@/components/features/debate/CurrentDebateStrip';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import { ModelSelector } from '@/components/ModelSelector';
 import { cn } from '@/lib/utils';
@@ -24,6 +25,10 @@ export interface SparringSetupValues {
 }
 
 interface SparringSetupProps {
+  /** Rendered directly below the title, e.g. the Current Debate strip. */
+  banner?: React.ReactNode;
+  /** Fill the motion from the Current Debate. */
+  debatePrefill?: boolean;
   onStart: (values: SparringSetupValues) => void;
   isStarting?: boolean;
   initialValues?: Partial<SparringSetupValues>;
@@ -35,9 +40,12 @@ const DIFFICULTIES: Array<{ id: SparringDifficulty; name: string }> = [
   { id: 'hard', name: 'Ruthless' },
 ];
 
-export function SparringSetup({ onStart, isStarting = false, initialValues }: SparringSetupProps) {
+export function SparringSetup({ onStart, isStarting = false, initialValues, banner, debatePrefill = false }: SparringSetupProps) {
   const { t } = useTranslation();
   const [motion, setMotion] = useState(initialValues?.motion ?? '');
+  const motionRef = useRef(motion);
+  motionRef.current = motion;
+  useDebateMotionPrefill(() => motionRef.current, setMotion, !debatePrefill);
   const [userSide, setUserSide] = useState<SparringSide>(initialValues?.userSide ?? 'pro');
   const [format, setFormat] = useState<SparringFormat>('standard');
   const [difficulty, setDifficulty] = useState<SparringDifficulty>('medium');
@@ -69,6 +77,7 @@ export function SparringSetup({ onStart, isStarting = false, initialValues }: Sp
   return (
     <div className="mx-auto w-full max-w-6xl space-y-6">
       <h1 className="text-3xl font-semibold tracking-tight text-foreground sm:text-4xl">{t('nav.sparring', 'Sparring')}</h1>
+      {banner}
 
       <form onSubmit={handleSubmit} className="grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_300px]">
         <div className="space-y-6">
diff --git a/src/components/layout/AppLayout.tsx b/src/components/layout/AppLayout.tsx
index c3b01b5d2..abee7bd0b 100644
--- a/src/components/layout/AppLayout.tsx
+++ b/src/components/layout/AppLayout.tsx
@@ -4,22 +4,12 @@ import { Link, Outlet, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import {
   Home,
-  Sparkles,
-  Swords,
-  Lightbulb,
-  BookOpen,
-  ChevronDown,
-  MessageCircle,
   Settings,
   Menu,
   X,
   Clock,
-  Timer,
-  Dumbbell,
   Database,
-  GitBranch,
-  Crosshair,
-  Files,
+  Target,
 } from 'lucide-react';
 import { NavLink } from '@/components/NavLink';
 import { Button } from '@/components/ui/button';
@@ -29,34 +19,32 @@ 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 { CurrentDebateMenu } from '@/components/features/debate/CurrentDebateMenu';
+import { DebateDialogs, InactiveDebateGate } from '@/components/features/debate/DebateDialogs';
 import {
   dismissAnnouncement,
   listActiveAnnouncements,
   type UserAnnouncement,
 } from '@/lib/announcements';
 
-const navItems = [
-  { path: '/app', key: 'home', icon: Home },
-  { path: '/app/workspaces', key: 'workspaces', icon: Files },
-  { path: '/app/generate', key: 'generate', icon: Sparkles },
-  { path: '/app/attack', key: 'attack', icon: Swords },
-  { path: '/app/brainstorm', key: 'brainstorm', icon: Lightbulb },
-  { path: '/app/factoids', key: 'factoids', icon: BookOpen },
-  { path: '/app/ask', key: 'ask', icon: MessageCircle },
-  { path: '/app/crossfire', key: 'crossfire', icon: Crosshair },
+// Features live on Home and the Current Debate dashboard, not in the header.
+const libraryNavItems = [
   { path: '/app/library', key: 'library', icon: Database },
-  { path: '/app/timer', key: 'timer', icon: Timer },
-  { 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 mobileNavItems = [
+  { path: '/app', key: 'home', icon: Home },
+  { path: '/app/debate', key: 'currentDebate', icon: Target },
+  ...libraryNavItems,
+  { path: '/app/settings', key: 'settings', icon: Settings },
+];
 
-const primaryNavItems = navItems.filter((item) =>
-  ['home', 'workspaces', 'generate', 'attack', 'ask', 'crossfire', 'sparring'].includes(item.key),
+const desktopLinkClass = cn(
+  "motion-press nav-glow flex items-center gap-1.5 px-2 xl:px-3 py-2 rounded-md text-sm font-medium whitespace-nowrap",
+  "text-muted-foreground hover:text-foreground hover:bg-accent"
 );
 
-const moreNavItems = navItems.filter((item) => !primaryNavItems.includes(item));
 const ANNOUNCEMENTS_STALE_MS = 60_000;
 
 function filterVisibleAnnouncements(announcements: UserAnnouncement[], now: number) {
@@ -74,7 +62,6 @@ export function AppLayout() {
   const [dismissingId, setDismissingId] = useState<string | null>(null);
   const [dismissError, setDismissError] = useState<{ announcementId: string; message: string } | null>(null);
   const dismissedAnnouncementIds = useRef(new Set<string>());
-  const moreMenuRef = useRef<HTMLDetailsElement>(null);
   const mobileMenuTriggerRef = useRef<HTMLButtonElement>(null);
   const activeRequestRef = useRef<AbortController | null>(null);
   const lastRequestAtRef = useRef<number | null>(null);
@@ -138,7 +125,6 @@ export function AppLayout() {
 
   useEffect(() => {
     setMobileMenuOpen(false);
-    moreMenuRef.current?.removeAttribute('open');
     setDismissError(null);
     setAnnouncements((current) => filterVisibleAnnouncements(current, Date.now()));
     void loadAnnouncements();
@@ -160,10 +146,6 @@ export function AppLayout() {
     const closeMenus = (event: KeyboardEvent) => {
       if (event.key !== 'Escape') return;
       setMobileMenuOpen(false);
-      if (moreMenuRef.current?.hasAttribute('open')) {
-        moreMenuRef.current.removeAttribute('open');
-        moreMenuRef.current.querySelector('summary')?.focus();
-      }
       if (mobileMenuOpen) mobileMenuTriggerRef.current?.focus();
     };
     document.addEventListener('keydown', closeMenus);
@@ -205,55 +187,31 @@ export function AppLayout() {
           </Link>
 
           {/* Desktop Nav */}
-          <nav aria-label={t('nav.mainNavigation')} className="hidden lg:flex items-center gap-0.5 xl:gap-1 ml-4">
-            {primaryNavItems.map((item) => (
+          <nav aria-label={t('nav.mainNavigation')} className="hidden lg:flex min-w-0 flex-1 items-center gap-0.5 xl:gap-1 ml-4">
+            <NavLink
+              to="/app"
+              end
+              data-tour="nav-home"
+              className={desktopLinkClass}
+              activeClassName="bg-primary/10 text-primary nav-active-pill"
+            >
+              <Home className="h-4 w-4 shrink-0" aria-hidden="true" />
+              <span>{t('nav.home')}</span>
+            </NavLink>
+            <CurrentDebateMenu variant="desktop" />
+            {libraryNavItems.map((item) => (
               <NavLink
                 key={item.path}
                 to={item.path}
-                end={item.path === '/app'}
-                aria-label={t(`nav.${item.key}`)}
+                end
                 data-tour={`nav-${item.key}`}
-                className={cn(
-                  "motion-press nav-glow flex items-center gap-1.5 px-2 xl:px-3 py-2 rounded-md text-sm font-medium whitespace-nowrap",
-                  "text-muted-foreground hover:text-foreground hover:bg-accent"
-                )}
+                className={desktopLinkClass}
                 activeClassName="bg-primary/10 text-primary nav-active-pill"
               >
-                <item.icon className="h-4 w-4 shrink-0" />
-                <span className="hidden xl:inline">{t(`nav.${item.key}`)}</span>
+                <item.icon className="h-4 w-4 shrink-0" aria-hidden="true" />
+                <span>{t(`nav.${item.key}`)}</span>
               </NavLink>
             ))}
-            <details ref={moreMenuRef} className="relative">
-              <summary
-                className={cn(
-                  'motion-press nav-glow flex cursor-pointer list-none items-center gap-1.5 rounded-md px-2 py-2 text-sm font-medium whitespace-nowrap text-muted-foreground hover:bg-accent hover:text-foreground',
-                  '[&::-webkit-details-marker]:hidden',
-                  moreNavItems.some((item) => location.pathname === item.path) && 'bg-primary/10 text-primary nav-active-pill',
-                )}
-                aria-label={t('nav.more', 'More')}
-                data-tour="nav-more"
-              >
-                {t('nav.more', 'More')}
-                <ChevronDown className="h-4 w-4" aria-hidden="true" />
-              </summary>
-              <div className="absolute right-0 top-full z-10 mt-2 grid min-w-48 gap-1 rounded-lg border border-border bg-popover p-1 shadow-lg">
-                {moreNavItems.map((item) => (
-                  <NavLink
-                    key={item.path}
-                    to={item.path}
-                    end
-                    onClick={() => moreMenuRef.current?.removeAttribute('open')}
-                    aria-label={t(`nav.${item.key}`)}
-                    data-tour={`nav-${item.key}`}
-                    className="motion-press flex items-center gap-2 rounded-md px-3 py-2 text-sm font-medium text-muted-foreground hover:bg-accent hover:text-foreground"
-                    activeClassName="bg-primary/10 text-primary"
-                  >
-                    <item.icon className="h-4 w-4 shrink-0" />
-                    <span>{t(`nav.${item.key}`)}</span>
-                  </NavLink>
-                ))}
-              </div>
-            </details>
           </nav>
 
           <div className="flex items-center gap-1.5 max-[359px]:gap-1 shrink-0">
@@ -263,7 +221,7 @@ export function AppLayout() {
               to="/app/settings"
               aria-label={t('nav.settings', 'Settings')}
               data-tour="nav-settings"
-              className="motion-press inline-flex h-10 w-10 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+              className="motion-press hidden lg:inline-flex h-10 w-10 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
               activeClassName="bg-primary/10 text-primary"
             >
               <Settings className="h-5 w-5" aria-hidden="true" />
@@ -282,15 +240,20 @@ export function AppLayout() {
           </div>
         </div>
 
+        {/* Mobile Current Debate row */}
+        <div className="container min-w-0 border-t border-border/60 px-4 py-1 max-[359px]:px-2 lg:hidden">
+          <CurrentDebateMenu variant="mobile" />
+        </div>
+
         {/* Mobile Nav */}
         {mobileMenuOpen && (
           <nav className="motion-reveal native-scroll-y native-mobile-menu overflow-y-auto border-t border-border bg-card p-4 lg:hidden" aria-label={t('nav.mobileNavigation')}>
             <div className="grid gap-1 pb-[var(--native-safe-bottom,0px)]">
-              {navItems.map((item) => (
+              {mobileNavItems.map((item) => (
                 <NavLink
                   key={item.path}
                   to={item.path}
-                  end={item.path === '/app'}
+                  end
                   onClick={() => setMobileMenuOpen(false)}
                   className={cn(
                     "motion-press flex items-center gap-3 px-3 py-2.5 rounded-lg",
@@ -321,6 +284,9 @@ export function AppLayout() {
         />
       )}
 
+      <DebateDialogs />
+      <InactiveDebateGate />
+
       {/* Main Content */}
       <main className="native-main-content flex-1">
         <Outlet />
diff --git a/src/lib/ai/client.ts b/src/lib/ai/client.ts
index 73b82ca4b..a4b1e8f70 100644
--- a/src/lib/ai/client.ts
+++ b/src/lib/ai/client.ts
@@ -15,6 +15,7 @@ import {
 } from './schemas/sparring';
 import { useSettingsStore } from '../stores/settings-store';
 import { useSessionStore } from '../stores/session-store';
+import { activeDebateId } from '../stores/debate-store';
 import {
   type SourceAssessmentUpdate,
   type SourceProvenance,
@@ -61,6 +62,8 @@ interface AIRequestOptions<T = unknown> {
   signal?: AbortSignal;
   transformResponse?: (data: unknown) => T;
   workspaceContext?: WorkspaceToolContext;
+  /** Debate whose sources ground this request; null for one-off work. Defaults to the active debate. */
+  debateId?: string | null;
 }
 
 function selectedOutputLanguage(): AppLanguage {
@@ -446,10 +449,12 @@ async function callSupabaseAI<T = unknown>(
   const settings = useSettingsStore.getState();
   const session = useSessionStore.getState();
 
-  const sourceIds = options.workspaceContext || options.includeActiveSources === false || feature === 'sparring'
+  const debateId = options.debateId !== undefined ? options.debateId : activeDebateId();
+  // Sources never cross debates, and one-off work uses none of them.
+  const sourceIds = options.workspaceContext || options.includeActiveSources === false || feature === 'sparring' || !debateId
     ? []
     : session.sourceLibrary
-      .filter((s) => s.isActive)
+      .filter((s) => s.isActive && s.debateId === debateId)
       .map((s) => s.id)
       .filter((id) => SOURCE_UUID_PATTERN.test(id))
       .slice(0, MAX_REQUEST_SOURCE_IDS);
@@ -754,7 +759,7 @@ function validateCrossfireTurnReferences(input: CrossfireAIInput, debrief: Cross
 export async function crossfire(
   rawInput: CrossfireAIInput,
   config: ProviderConfig,
-  options: Pick<AIRequestOptions, 'signal' | 'workspaceContext'> = {},
+  options: Pick<AIRequestOptions, 'signal' | 'workspaceContext' | 'debateId'> = {},
 ): Promise<(CrossfireReply & { signalToken?: string }) | CrossfireDebrief> {
   const input = CrossfireAIInputSchema.safeParse(rawInput);
   if (!input.success) {
@@ -773,6 +778,7 @@ export async function crossfire(
       timeoutMs: CROSSFIRE_REQUEST_TIMEOUT_MS,
       signal: options.signal,
       workspaceContext: options.workspaceContext,
+      debateId: options.debateId,
       transformResponse: (rawData) => {
         const data = rawData as { output: unknown; signalToken?: unknown };
         if (input.data.operation === 'next-turn') {
@@ -1185,7 +1191,10 @@ function validateGenerateOutput(output: unknown): GenerateOutput {
 
 type AutosaveFeature = 'generate' | 'attack' | 'brainstorm' | 'factoids';
 
-async function autosaveDiscoveredSources(sources: DiscoveredSource[], capturedVia: AutosaveFeature): Promise<void> {
+async function autosaveDiscoveredSources(sources: DiscoveredSource[], capturedVia: AutosaveFeature, debateId: string | null | undefined): Promise<void> {
+  const targetDebateId = debateId !== undefined ? debateId : activeDebateId();
+  // Every source belongs to one debate, so one-off research is not kept.
+  if (!targetDebateId) return;
   const retainedSources = sources.filter((source) => !source.semantic ||
     (source.qualityLabel !== 'weak' && source.semantic.relevance >= 0.45) ||
     source.semantic.lastUsedInCase === true);
@@ -1200,6 +1209,7 @@ async function autosaveDiscoveredSources(sources: DiscoveredSource[], capturedVi
         type: 'url',
         origin: source.url,
         folder: 'Auto-saved',
+        debateId: targetDebateId,
         isActive: source.qualityLabel === 'strong' || source.qualityLabel === 'moderate',
         metadata: {
           url: source.url,
@@ -1234,10 +1244,11 @@ function expectedContentionCount(length: GenerateInput['length']): number {
   }
 }
 
-export async function generateCase(input: GenerateInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext): Promise<ResultWithSources<GenerateOutput>> {
+export async function generateCase(input: GenerateInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null): Promise<ResultWithSources<GenerateOutput>> {
   const inputWithLanguage = withOutputLanguage(input as unknown as Record<string, unknown>);
   const response = await callSupabaseAI<ResultWithSources<GenerateOutput>>('generate', inputWithLanguage, config, {
     workspaceContext,
+    debateId,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown; discoveredSources?: unknown };
       const result = validateGenerateOutput(transformGenerateResponse(data.output as Record<string, unknown>));
@@ -1250,13 +1261,14 @@ export async function generateCase(input: GenerateInput, config: ProviderConfig,
       return { result, discoveredSources: parseDiscoveredSources(data.discoveredSources) };
     },
   });
-  await autosaveDiscoveredSources(response.discoveredSources, 'generate');
+  await autosaveDiscoveredSources(response.discoveredSources, 'generate', workspaceContext ? null : debateId);
   return response;
 }
 
-export async function attackCase(input: AttackInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext): Promise<ResultWithSources<AttackOutput>> {
+export async function attackCase(input: AttackInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null): Promise<ResultWithSources<AttackOutput>> {
   const response = await callSupabaseAI<ResultWithSources<AttackOutput>>('attack', withOutputLanguage(input as unknown as Record<string, unknown>), config, {
     workspaceContext,
+    debateId,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown; discoveredSources?: unknown };
       return {
@@ -1265,13 +1277,14 @@ export async function attackCase(input: AttackInput, config: ProviderConfig, wor
       };
     },
   });
-  await autosaveDiscoveredSources(response.discoveredSources, 'attack');
+  await autosaveDiscoveredSources(response.discoveredSources, 'attack', workspaceContext ? null : debateId);
   return response;
 }
 
-export async function brainstorm(input: BrainstormInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext): Promise<ResultWithSources<BrainstormOutput>> {
+export async function brainstorm(input: BrainstormInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null): Promise<ResultWithSources<BrainstormOutput>> {
   const response = await callSupabaseAI<ResultWithSources<BrainstormOutput>>('brainstorm', withOutputLanguage(input as unknown as Record<string, unknown>), config, {
     workspaceContext,
+    debateId,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown; discoveredSources?: unknown };
       return {
@@ -1280,11 +1293,11 @@ export async function brainstorm(input: BrainstormInput, config: ProviderConfig,
       };
     },
   });
-  await autosaveDiscoveredSources(response.discoveredSources, 'brainstorm');
+  await autosaveDiscoveredSources(response.discoveredSources, 'brainstorm', workspaceContext ? null : debateId);
   return response;
 }
 
-export async function factoids(input: FactoidsInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext): Promise<ResultWithSources<FactoidsOutput>> {
+export async function factoids(input: FactoidsInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null): Promise<ResultWithSources<FactoidsOutput>> {
   const inputWithLanguage = withOutputLanguage({
     ...input,
     region: input.region?.trim() || 'Global',
@@ -1292,6 +1305,7 @@ export async function factoids(input: FactoidsInput, config: ProviderConfig, wor
   });
   const response = await callSupabaseAI<ResultWithSources<FactoidsOutput>>('factoids', inputWithLanguage, config, {
     workspaceContext,
+    debateId,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown; discoveredSources?: unknown };
       const parsed = FactoidsOutputSchema.safeParse(data.output);
@@ -1314,7 +1328,7 @@ export async function factoids(input: FactoidsInput, config: ProviderConfig, wor
       };
     },
   });
-  await autosaveDiscoveredSources(response.discoveredSources, 'factoids');
+  await autosaveDiscoveredSources(response.discoveredSources, 'factoids', workspaceContext ? null : debateId);
   return response;
 }
 
@@ -1324,6 +1338,8 @@ export interface AskChatOptions {
   prosConsMode?: boolean;
   argumentMapMode?: boolean;
   workspaceContext?: WorkspaceToolContext;
+  /** Debate whose sources ground the answer; defaults to the active debate. */
+  debateId?: string | null;
 }
 
 export async function askChat(
@@ -1343,6 +1359,7 @@ export async function askChat(
     argumentMapMode: Boolean(options.argumentMapMode),
   }), config, {
     workspaceContext: options.workspaceContext,
+    debateId: options.debateId,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown };
       const parsed = AskOutputSchema.safeParse(data.output);
diff --git a/src/lib/debate/motion.ts b/src/lib/debate/motion.ts
new file mode 100644
index 000000000..7f2c667cb
--- /dev/null
+++ b/src/lib/debate/motion.ts
@@ -0,0 +1,35 @@
+import { normalizeMotion, sameMotion, type Debate } from '@/lib/stores/debate-store';
+
+export type MotionDecision =
+  | { kind: 'attach'; debateId: string }
+  | { kind: 'one-off' }
+  /** A different (or first) motion: the user chooses Switch, Create, or Use once. */
+  | { kind: 'ask'; matches: Debate[] };
+
+/**
+ * Decides where a submission with this motion belongs before anything is sent.
+ * Only an exact motion match attaches silently; anything else asks.
+ */
+export function decideMotionTarget(
+  motion: string,
+  state: { debates: Debate[]; currentDebateId: string | null; oneOff: boolean },
+): MotionDecision {
+  if (state.oneOff) return { kind: 'one-off' };
+  const current = state.debates.find((debate) => debate.id === state.currentDebateId);
+  if (current && sameMotion(current.motion, motion)) return { kind: 'attach', debateId: current.id };
+  return {
+    kind: 'ask',
+    matches: state.debates.filter((debate) => debate.id !== current?.id && sameMotion(debate.motion, motion)),
+  };
+}
+
+/**
+ * Prefill a feature's motion from the Current Debate only when the field is
+ * empty or still holds another debate's motion, never over the user's own text.
+ */
+export function shouldPrefillMotion(formMotion: string | undefined, debateMotion: string, knownMotions: string[]): boolean {
+  const current = normalizeMotion(formMotion ?? '');
+  if (!current) return true;
+  if (current === normalizeMotion(debateMotion)) return false;
+  return knownMotions.some((motion) => normalizeMotion(motion) === current);
+}
diff --git a/src/lib/debate/record.ts b/src/lib/debate/record.ts
new file mode 100644
index 000000000..0e8666bc5
--- /dev/null
+++ b/src/lib/debate/record.ts
@@ -0,0 +1,17 @@
+import i18n from '@/i18n';
+import { toast } from '@/hooks/use-toast';
+
+/**
+ * Saving a finished result into its debate must not turn a successful AI
+ * response into a failure: the result stays on screen and the user is told
+ * only that it was not saved.
+ */
+export async function recordInDebate(record: () => Promise<string>): Promise<string | null> {
+  try {
+    return await record();
+  } catch (error) {
+    console.error('Failed to record result in debate:', error);
+    toast({ title: i18n.t('debate.recordFailed'), variant: 'destructive' });
+    return null;
+  }
+}
diff --git a/src/lib/route-modules.ts b/src/lib/route-modules.ts
index d07253de3..9cef1e313 100644
--- a/src/lib/route-modules.ts
+++ b/src/lib/route-modules.ts
@@ -20,6 +20,7 @@ export const routeLoaders = {
   "/login": cacheLoader(() => import("@/pages/LoginPage")),
   "/share/:code": cacheLoader(() => import("@/pages/SharedPage")),
   "/app": cacheLoader(() => import("@/pages/HomePage")),
+  "/app/debate": cacheLoader(() => import("@/pages/CurrentDebatePage")),
   "/app/workspaces": cacheLoader(() => import("@/pages/WorkspacesPage")),
   "/app/workspaces/invite": cacheLoader(() => import("@/pages/WorkspaceInvitePage")),
   "/app/workspaces/:workspaceId": cacheLoader(() => import("@/pages/WorkspacePage")),
diff --git a/src/lib/stores/debate-store.ts b/src/lib/stores/debate-store.ts
new file mode 100644
index 000000000..271d88dbe
--- /dev/null
+++ b/src/lib/stores/debate-store.ts
@@ -0,0 +1,278 @@
+import { create } from 'zustand';
+import { createJSONStorage, persist } from 'zustand/middleware';
+import { supabase } from '@/lib/supabase/client';
+
+/** A favor, En contra, both sides, or not side-specific. */
+export type DebateSide = 'pro' | 'con' | 'both' | 'neutral';
+
+export interface DebateSettings {
+  format?: string;
+  role?: string;
+  judge?: string;
+}
+
+export interface Debate {
+  id: string;
+  motion: string;
+  settings: DebateSettings;
+  instructions: string;
+  lastActivityAt: number;
+  createdAt: number;
+}
+
+export type DebateDialog = 'switch' | 'create' | null;
+
+/** How long a debate may sit without meaningful work before the app asks about it. */
+export const INACTIVE_DEBATE_MS = 5 * 24 * 60 * 60 * 1000;
+export const MAX_MOTION_LENGTH = 1200;
+export const MAX_INSTRUCTIONS_LENGTH = 2000;
+
+interface DebateRow {
+  id: string;
+  motion: string;
+  settings: unknown;
+  instructions: string | null;
+  last_activity_at: string;
+  created_at: string;
+}
+
+interface DebateState {
+  ownerUserId: string | null;
+  debates: Debate[];
+  currentDebateId: string | null;
+  /** Session-only: tools run without reading from or saving to any debate. */
+  oneOff: boolean;
+  hydrated: boolean;
+  dialog: DebateDialog;
+  /** Motion to prefill when the create dialog opens from a feature. */
+  dialogMotion: string;
+
+  hydrate: () => Promise<void>;
+  createDebate: (input: { motion: string; settings?: DebateSettings; instructions?: string }) => Promise<Debate>;
+  switchDebate: (id: string) => Promise<void>;
+  updateDebate: (id: string, patch: Partial<Pick<Debate, 'motion' | 'settings' | 'instructions'>>) => Promise<void>;
+  deleteDebate: (id: string) => Promise<void>;
+  continueDebate: () => Promise<void>;
+  markActivity: (id: string, at?: number) => void;
+  setOneOff: (oneOff: boolean) => void;
+  openDialog: (dialog: DebateDialog, motion?: string) => void;
+  resetLocalData: () => void;
+}
+
+export function normalizeMotion(motion: string): string {
+  return motion.trim().replace(/\s+/g, ' ').toLocaleLowerCase();
+}
+
+export function sameMotion(a: string | undefined | null, b: string | undefined | null): boolean {
+  return Boolean(a && b) && normalizeMotion(a!) === normalizeMotion(b!);
+}
+
+function parseSettings(value: unknown): DebateSettings {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return {};
+  const record = value as Record<string, unknown>;
+  const settings: DebateSettings = {};
+  for (const key of ['format', 'role', 'judge'] as const) {
+    if (typeof record[key] === 'string' && record[key]) settings[key] = record[key] as string;
+  }
+  return settings;
+}
+
+function fromRow(row: DebateRow): Debate {
+  return {
+    id: row.id,
+    motion: row.motion,
+    settings: parseSettings(row.settings),
+    instructions: row.instructions ?? '',
+    lastActivityAt: new Date(row.last_activity_at).getTime(),
+    createdAt: new Date(row.created_at).getTime(),
+  };
+}
+
+function sortDebates(debates: Debate[]): Debate[] {
+  return [...debates].sort((a, b) => b.lastActivityAt - a.lastActivityAt);
+}
+
+async function requireUserId(): Promise<string> {
+  const { data } = await supabase.auth.getUser();
+  const userId = data.user?.id;
+  if (!userId) throw new Error('Sign in to manage debates');
+  return userId;
+}
+
+async function setCurrentPointer(userId: string, debateId: string) {
+  const { error } = await supabase
+    .from('current_debates')
+    .upsert({ user_id: userId, debate_id: debateId, updated_at: new Date().toISOString() }, { onConflict: 'user_id' });
+  if (error) throw new Error(error.message);
+}
+
+// Invalidates a hydrate that started before sign-out or an account switch.
+let hydrationEpoch = 0;
+// Counts debate writes so a load that started earlier cannot overwrite them.
+let debateWrites = 0;
+
+export const useDebateStore = create<DebateState>()(
+  persist(
+    (set, get) => ({
+      ownerUserId: null as string | null,
+      debates: [] as Debate[],
+      currentDebateId: null as string | null,
+      oneOff: false,
+      hydrated: false,
+      dialog: null as DebateDialog,
+      dialogMotion: '',
+
+      hydrate: async () => {
+        const epoch = hydrationEpoch;
+        const { data: { user } } = await supabase.auth.getUser();
+        if (epoch !== hydrationEpoch || !user) return;
+        if (get().ownerUserId !== user.id) {
+          set({ ownerUserId: user.id, debates: [], currentDebateId: null, oneOff: false, hydrated: false });
+        }
+        const writesBefore = debateWrites;
+        const [debatesResult, currentResult] = await Promise.all([
+          supabase.from('debates').select('id,motion,settings,instructions,last_activity_at,created_at').order('last_activity_at', { ascending: false }),
+          supabase.from('current_debates').select('debate_id').maybeSingle(),
+        ]);
+        if (epoch !== hydrationEpoch) return;
+        if (writesBefore !== debateWrites) {
+          // A create, switch, edit or delete landed mid-load; this snapshot is older than it.
+          await get().hydrate();
+          return;
+        }
+        if (debatesResult.error || currentResult.error) {
+          console.warn('[DebateStore] Failed to hydrate debates:', debatesResult.error?.message ?? currentResult.error?.message);
+          return;
+        }
+        const debates = ((debatesResult.data ?? []) as DebateRow[]).map(fromRow);
+        const currentId = (currentResult.data as { debate_id?: string } | null)?.debate_id ?? null;
+        set({
+          debates: sortDebates(debates),
+          currentDebateId: currentId && debates.some((debate) => debate.id === currentId) ? currentId : null,
+          hydrated: true,
+        });
+      },
+
+      createDebate: async ({ motion, settings = {}, instructions = '' }) => {
+        const trimmed = motion.trim();
+        if (!trimmed) throw new Error('A debate needs a motion');
+        const userId = await requireUserId();
+        const { data, error } = await supabase
+          .from('debates')
+          .insert({
+            user_id: userId,
+            motion: trimmed.slice(0, MAX_MOTION_LENGTH),
+            settings,
+            instructions: instructions.trim().slice(0, MAX_INSTRUCTIONS_LENGTH),
+          })
+          .select('id,motion,settings,instructions,last_activity_at,created_at')
+          .single();
+        if (error || !data) throw new Error(error?.message ?? 'Could not create debate');
+        const debate = fromRow(data as DebateRow);
+        await setCurrentPointer(userId, debate.id);
+        debateWrites += 1;
+        set((state) => ({
+          ownerUserId: userId,
+          debates: sortDebates([debate, ...state.debates.filter((item) => item.id !== debate.id)]),
+          currentDebateId: debate.id,
+          oneOff: false,
+        }));
+        return debate;
+      },
+
+      switchDebate: async (id) => {
+        const debate = get().debates.find((item) => item.id === id);
+        if (!debate) throw new Error('Debate not found');
+        const userId = await requireUserId();
+        await setCurrentPointer(userId, id);
+        // Choosing a debate is a deliberate confirmation that it is still being prepared.
+        const now = Date.now();
+        await supabase.from('debates').update({ last_activity_at: new Date(now).toISOString() }).eq('id', id);
+        debateWrites += 1;
+        set((state) => ({
+          currentDebateId: id,
+          oneOff: false,
+          debates: sortDebates(state.debates.map((item) => item.id === id ? { ...item, lastActivityAt: now } : item)),
+        }));
+      },
+
+      updateDebate: async (id, patch) => {
+        const current = get().debates.find((item) => item.id === id);
+        if (!current) throw new Error('Debate not found');
+        const next: Debate = {
+          ...current,
+          ...(patch.motion !== undefined ? { motion: patch.motion.trim().slice(0, MAX_MOTION_LENGTH) || current.motion } : {}),
+          ...(patch.settings !== undefined ? { settings: patch.settings } : {}),
+          ...(patch.instructions !== undefined ? { instructions: patch.instructions.trim().slice(0, MAX_INSTRUCTIONS_LENGTH) } : {}),
+        };
+        const { error } = await supabase
+          .from('debates')
+          .update({ motion: next.motion, settings: next.settings, instructions: next.instructions, updated_at: new Date().toISOString() })
+          .eq('id', id);
+        if (error) throw new Error(error.message);
+        debateWrites += 1;
+        set((state) => ({ debates: state.debates.map((item) => item.id === id ? next : item) }));
+      },
+
+      deleteDebate: async (id) => {
+        const { error } = await supabase.from('debates').delete().eq('id', id);
+        if (error) throw new Error(error.message);
+        debateWrites += 1;
+        set((state) => ({
+          debates: state.debates.filter((item) => item.id !== id),
+          currentDebateId: state.currentDebateId === id ? null : state.currentDebateId,
+        }));
+      },
+
+      continueDebate: async () => {
+        const id = get().currentDebateId;
+        if (!id) return;
+        const now = Date.now();
+        const { error } = await supabase.from('debates').update({ last_activity_at: new Date(now).toISOString() }).eq('id', id);
+        if (error) throw new Error(error.message);
+        get().markActivity(id, now);
+      },
+
+      markActivity: (id, at = Date.now()) => set((state) => ({
+        debates: sortDebates(state.debates.map((item) => item.id === id ? { ...item, lastActivityAt: Math.max(item.lastActivityAt, at) } : item)),
+      })),
+
+      setOneOff: (oneOff) => set({ oneOff }),
+      openDialog: (dialog, motion = '') => set({ dialog, dialogMotion: motion }),
+
+      resetLocalData: () => {
+        hydrationEpoch += 1;
+        set({ ownerUserId: null, debates: [], currentDebateId: null, oneOff: false, hydrated: false, dialog: null, dialogMotion: '' });
+      },
+    }),
+    {
+      name: 'debatelab-current-debate',
+      storage: createJSONStorage(() => localStorage),
+      version: 1,
+      partialize: (state) => ({
+        ownerUserId: state.ownerUserId,
+        debates: state.debates,
+        currentDebateId: state.currentDebateId,
+      }),
+    },
+  ),
+);
+
+export function selectCurrentDebate(state: Pick<DebateState, 'debates' | 'currentDebateId'>): Debate | null {
+  return state.debates.find((debate) => debate.id === state.currentDebateId) ?? null;
+}
+
+export function useCurrentDebate(): Debate | null {
+  return useDebateStore(selectCurrentDebate);
+}
+
+/** The debate that new work attaches to right now, or null for one-off work. */
+export function activeDebateId(): string | null {
+  const state = useDebateStore.getState();
+  if (state.oneOff) return null;
+  return selectCurrentDebate(state)?.id ?? null;
+}
+
+export function isDebateInactive(debate: Debate, now = Date.now()): boolean {
+  return now - debate.lastActivityAt > INACTIVE_DEBATE_MS;
+}
diff --git a/src/lib/stores/session-store.ts b/src/lib/stores/session-store.ts
index e29b154d2..3ca8eec9b 100644
--- a/src/lib/stores/session-store.ts
+++ b/src/lib/stores/session-store.ts
@@ -8,6 +8,7 @@ import type { FactoidsOutput, FactoidsInput } from '../ai/schemas/factoids';
 import type { AskOutput } from '../ai/schemas/ask';
 import { supabase } from '@/lib/supabase/client';
 import i18n from '@/i18n';
+import { activeDebateId, useDebateStore, type DebateSide } from './debate-store';
 
 interface Message {
   id: string;
@@ -67,15 +68,51 @@ export interface Source {
   origin?: string;
   folder?: string;
   metadata?: SourceProvenance;
+  /** The one debate this source belongs to; null only for unsorted legacy sources. */
+  debateId?: string | null;
   createdAt: number;
   isActive: boolean;
 }
 
-interface SavedItem<T> {
+export interface SavedItem<T> {
   id: string;
   data: T;
   createdAt: number;
   title: string;
+  /** Null for one-off work and unsorted legacy material. */
+  debateId?: string | null;
+  side?: DebateSide | null;
+}
+
+/** Tool results that DebateLab records automatically inside a debate. */
+export type ResultKind = 'case' | 'attack' | 'brainstorm' | 'factoids' | 'crossfire';
+/** Everything that can later be attached from one-off or Unsorted into a debate. */
+export type AttachKind = ResultKind | 'chat' | 'flowchart' | 'source';
+
+const RESULT_TABLES = {
+  case: 'cases',
+  attack: 'attacks',
+  brainstorm: 'brainstorms',
+  factoids: 'factoids',
+  crossfire: 'crossfires',
+} as const;
+
+const RESULT_LISTS = {
+  case: 'savedCases',
+  attack: 'savedAttacks',
+  brainstorm: 'savedBrainstorms',
+  factoids: 'savedFactoids',
+  crossfire: 'savedCrossfires',
+} as const;
+
+const ATTACH_LISTS = { ...RESULT_LISTS, chat: 'savedChats', flowchart: 'savedFlowcharts', source: 'sourceLibrary' } as const;
+
+export interface RecordResultInput {
+  title: string;
+  input: unknown;
+  output: unknown;
+  debateId: string;
+  side: DebateSide;
 }
 
 export interface FlowchartData {
@@ -99,6 +136,11 @@ interface SessionState {
   askMessages: Message[];
   askLoading: boolean;
   askStreamingAssistant: StreamingAskMessage | null;
+  /** Server chat that the current Ask conversation is being recorded into. */
+  askChatId: string | null;
+  /** Debate that `askChatId` belongs to; null for an unsorted chat. */
+  askChatDebateId: string | null;
+  askPersistedCount: number;
 
   savedCases: SavedItem<GenerateOutput>[];
   savedAttacks: SavedItem<AttackOutput>[];
@@ -106,6 +148,7 @@ interface SessionState {
   savedFactoids: SavedItem<FactoidsOutput>[];
   savedChats: SavedItem<Message[]>[];
   savedFlowcharts: SavedItem<FlowchartData>[];
+  savedCrossfires: SavedItem<unknown>[];
   autosavedCases: SavedItem<GenerateOutput>[];
   autosavedAttacks: SavedItem<AttackOutput>[];
   autosavedBrainstorms: SavedItem<BrainstormOutput>[];
@@ -153,7 +196,13 @@ interface SessionState {
   saveCurrentChat: (title: string) => Promise<void>;
   loadSavedChat: (id: string) => void;
 
-  saveFlowchart: (title: string, data: FlowchartData) => Promise<void>;
+  saveFlowchart: (title: string, data: FlowchartData, debateId?: string | null) => Promise<void>;
+
+  recordResult: (kind: ResultKind, input: RecordResultInput) => Promise<string>;
+  updateRecordedResult: (kind: ResultKind, id: string, output: unknown) => Promise<void>;
+  attachItem: (kind: AttachKind, id: string, debateId: string, side?: DebateSide) => Promise<void>;
+  /** Records new Ask messages: into the loaded chat, or a new chat in `debateId`. */
+  syncAskChat: (debateId: string | null) => Promise<void>;
   deleteSavedFlowchart: (id: string) => Promise<void>;
 
   addSource: (source: Omit<Source, 'id' | 'createdAt' | 'isActive'> & { isActive?: boolean }) => Promise<void>;
@@ -215,22 +264,6 @@ function settledData<T>(label: string, result: PromiseSettledResult<{ data?: T |
   return result.value.data ?? null;
 }
 
-function mergeSavedItems<T>(localItems: SavedItem<T>[], serverItems: SavedItem<T>[]) {
-  const merged = new Map<string, SavedItem<T>>();
-  [...localItems, ...serverItems].forEach((item) => {
-    merged.set(item.id, item);
-  });
-  return Array.from(merged.values()).sort((a, b) => b.createdAt - a.createdAt);
-}
-
-function mergeSources(localSources: Source[], serverSources: Source[]) {
-  const merged = new Map<string, Source>();
-  [...localSources, ...serverSources].forEach((source) => {
-    merged.set(source.id, { ...source, folder: normalizeFolder(source.folder) });
-  });
-  return Array.from(merged.values()).sort((a, b) => b.createdAt - a.createdAt);
-}
-
 function normalizeFolder(folder?: string | null) {
   const trimmed = folder?.trim();
   return trimmed || 'General';
@@ -279,14 +312,19 @@ function throwOnWriteError(result: unknown, action: string): void {
   if (error) throw new Error(`[SessionStore] Failed to ${action}: ${error.message || 'Unknown error'}`);
 }
 
-interface SupabaseSavedRow<T> {
+interface DebateColumns {
+  debate_id?: string | null;
+  side?: DebateSide | null;
+}
+
+interface SupabaseSavedRow<T> extends DebateColumns {
   id: string;
   title: string;
   output: T;
   created_at: string;
 }
 
-interface SupabaseFlowchartRow {
+interface SupabaseFlowchartRow extends DebateColumns {
   id: string;
   title: string;
   nodes: Node[];
@@ -294,7 +332,7 @@ interface SupabaseFlowchartRow {
   created_at: string;
 }
 
-interface SupabaseChatRow {
+interface SupabaseChatRow extends DebateColumns {
   id: string;
   title: string;
   created_at: string;
@@ -318,6 +356,7 @@ interface SupabaseSourceRow {
   folder?: string | null;
   is_active: boolean;
   metadata?: unknown | null;
+  debate_id?: string | null;
   created_at: string;
 }
 
@@ -327,6 +366,29 @@ interface SupabaseSourceFolderRow {
   created_at: string;
 }
 
+/** Thrown when a source would be saved without a debate to belong to. */
+export class DebateRequiredError extends Error {
+  constructor() {
+    super('Select or create a debate before adding sources');
+    this.name = 'DebateRequiredError';
+  }
+}
+
+function savedFromRow<T>(row: SupabaseSavedRow<T>): SavedItem<T> {
+  return {
+    id: row.id,
+    data: row.output,
+    createdAt: toTimestamp(row.created_at),
+    title: row.title,
+    debateId: row.debate_id ?? null,
+    side: row.side ?? null,
+  };
+}
+
+function markDebateActivity(debateId: string | null | undefined) {
+  if (debateId) useDebateStore.getState().markActivity(debateId);
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -393,6 +455,9 @@ export const useSessionStore = create<SessionState>()(
       askMessages: [] as Message[],
       askLoading: false,
       askStreamingAssistant: null as StreamingAskMessage | null,
+      askChatId: null as string | null,
+      askChatDebateId: null as string | null,
+      askPersistedCount: 0,
 
       savedCases: [] as SavedItem<GenerateOutput>[],
       savedAttacks: [] as SavedItem<AttackOutput>[],
@@ -400,6 +465,7 @@ export const useSessionStore = create<SessionState>()(
       savedFactoids: [] as SavedItem<FactoidsOutput>[],
       savedChats: [] as SavedItem<Message[]>[],
       savedFlowcharts: [] as SavedItem<FlowchartData>[],
+      savedCrossfires: [] as SavedItem<unknown>[],
       autosavedCases: [] as SavedItem<GenerateOutput>[],
       autosavedAttacks: [] as SavedItem<AttackOutput>[],
       autosavedBrainstorms: [] as SavedItem<BrainstormOutput>[],
@@ -423,7 +489,10 @@ export const useSessionStore = create<SessionState>()(
       addSource: async (source) => {
         const folder = normalizeFolder(source.folder);
         const isActive = source.isActive ?? true;
-        const localItem: Source = { ...source, folder, id: generateId(), createdAt: Date.now(), isActive };
+        // An omitted debate means the tool's scope, which is none in one-off mode.
+        const debateId = source.debateId !== undefined ? source.debateId : activeDebateId();
+        if (!debateId) throw new DebateRequiredError();
+        const localItem: Source = { ...source, folder, debateId, id: generateId(), createdAt: Date.now(), isActive };
         const userId = await getUserId();
         if (!userId) {
           set((state) => ({
@@ -441,6 +510,7 @@ export const useSessionStore = create<SessionState>()(
           .from('sources')
           .insert({
             user_id: userId,
+            debate_id: debateId,
             title: source.title,
             content: source.content,
             type: source.type,
@@ -462,6 +532,7 @@ export const useSessionStore = create<SessionState>()(
           origin: data.origin || undefined,
           folder: normalizeFolder(data.folder || localItem.folder),
           metadata: parseSourceProvenance(data.metadata),
+          debateId: data.debate_id ?? debateId,
           isActive: data.is_active,
           createdAt: toTimestamp(data.created_at),
         };
@@ -469,6 +540,7 @@ export const useSessionStore = create<SessionState>()(
           sourceFolders: mergeSourceFolders(state.sourceFolders, [savedSource]),
           sourceLibrary: [savedSource, ...state.sourceLibrary],
         }));
+        markDebateActivity(debateId);
       },
       createSourceFolder: async (folder) => {
         const normalized = normalizeFolder(folder);
@@ -539,9 +611,13 @@ export const useSessionStore = create<SessionState>()(
       applySourceAssessments: async (assessments) => {
         if (assessments.length === 0) return;
         const previous = get().sourceLibrary;
+        const debateId = activeDebateId();
+        if (!debateId) return;
+        // A URL can be saved in several debates; only this debate's copy was used.
+        const candidates = previous.filter((source) => source.debateId === debateId);
         const updates = new Map<string, Source>();
         for (const assessment of assessments.slice(0, 10)) {
-          const source = previous.find((candidate) => candidate.id === assessment.id || candidate.id === assessment.key || candidate.origin === assessment.key || candidate.metadata?.url === assessment.key);
+          const source = candidates.find((candidate) => candidate.id === assessment.id || candidate.id === assessment.key || candidate.origin === assessment.key || candidate.metadata?.url === assessment.key);
           if (!source) continue;
           const prior = source.metadata?.semantic;
           const usedInCase = assessment.usedInCase;
@@ -582,23 +658,24 @@ export const useSessionStore = create<SessionState>()(
           throw error;
         }
       },
+      // Folders are per account, but renaming or deleting one only moves the
+      // Current Debate's sources. The folder name survives while another debate uses it.
       renameSourceFolder: async (oldName, newName) => {
         const from = normalizeFolder(oldName);
         const to = normalizeFolder(newName);
         if (from === 'General' || from === to) return;
+        const debateId = useDebateStore.getState().currentDebateId;
+        if (!debateId) throw new DebateRequiredError();
+        const inThisDebate = (source: Source) => source.debateId === debateId && normalizeFolder(source.folder) === from;
+        const usedElsewhere = get().sourceLibrary.some((source) => source.debateId !== debateId && normalizeFolder(source.folder) === from);
 
         const applyRename = (): void => {
           set((state) => {
-            const renamedSources = state.sourceLibrary.map((source) =>
-              normalizeFolder(source.folder) === from ? { ...source, folder: to } : source
-            );
-            return {
-              sourceFolders: mergeSourceFolders(
-                state.sourceFolders.map((folder) => normalizeFolder(folder) === from ? to : folder),
-                renamedSources,
-              ),
-              sourceLibrary: renamedSources,
-            };
+            const renamedSources = state.sourceLibrary.map((source) => inThisDebate(source) ? { ...source, folder: to } : source);
+            const folders = usedElsewhere
+              ? [...state.sourceFolders, to]
+              : state.sourceFolders.map((folder) => normalizeFolder(folder) === from ? to : folder);
+            return { sourceFolders: mergeSourceFolders(folders, renamedSources), sourceLibrary: renamedSources };
           });
         };
 
@@ -609,63 +686,71 @@ export const useSessionStore = create<SessionState>()(
           .upsert({ user_id: userId, name: to }, { onConflict: 'user_id,name' });
         throwOnWriteError(folderResult, 'create renamed source folder');
         throwOnWriteError(
-          await applyUserScopedColumnFilter(supabase.from('sources').update({ folder: to }), userId, 'folder', from),
+          await supabase.from('sources').update({ folder: to }).eq('user_id', userId).eq('debate_id', debateId).eq('folder', from),
           'move sources to renamed folder',
         );
-        throwOnWriteError(
-          await applyUserScopedColumnFilter(supabase.from('source_folders').delete(), userId, 'name', from),
-          'delete renamed source folder',
-        );
+        if (!usedElsewhere) {
+          throwOnWriteError(
+            await applyUserScopedColumnFilter(supabase.from('source_folders').delete(), userId, 'name', from),
+            'delete renamed source folder',
+          );
+        }
         applyRename();
       },
       deleteSourceFolder: async (name, mode) => {
         const folder = normalizeFolder(name);
         if (folder === 'General') return;
-        const affected = get().sourceLibrary.filter((source) => normalizeFolder(source.folder) === folder);
+        const debateId = useDebateStore.getState().currentDebateId;
+        if (!debateId) throw new DebateRequiredError();
+        const inThisDebate = (source: Source) => source.debateId === debateId && normalizeFolder(source.folder) === folder;
+        const affected = get().sourceLibrary.filter(inThisDebate);
+        const usedElsewhere = get().sourceLibrary.some((source) => source.debateId !== debateId && normalizeFolder(source.folder) === folder);
         if (affected.length > 0 && mode === 'empty-only') {
           throw new Error('Folder is not empty');
         }
 
         const applyDelete = (): void => {
-          set((state) => ({
-            sourceFolders: mergeSourceFolders(
-              state.sourceFolders.filter((existing) => normalizeFolder(existing) !== folder),
-              state.sourceLibrary.map((source) =>
-                normalizeFolder(source.folder) === folder ? { ...source, folder: 'General' } : source
-              ),
-            ).filter((existing) => existing !== folder),
-            sourceLibrary: state.sourceLibrary.map((source) =>
-              normalizeFolder(source.folder) === folder ? { ...source, folder: 'General' } : source
-            ),
-          }));
+          set((state) => {
+            const movedSources = state.sourceLibrary.map((source) => inThisDebate(source) ? { ...source, folder: 'General' } : source);
+            const folders = mergeSourceFolders(state.sourceFolders, movedSources);
+            return {
+              sourceFolders: usedElsewhere ? folders : folders.filter((existing) => normalizeFolder(existing) !== folder),
+              sourceLibrary: movedSources,
+            };
+          });
         };
 
         const userId = await getUserId();
         if (!userId) return applyDelete();
         if (affected.length > 0) {
           throwOnWriteError(
-            await applyUserScopedColumnFilter(supabase.from('sources').update({ folder: 'General' }), userId, 'folder', folder),
+            await supabase.from('sources').update({ folder: 'General' }).eq('user_id', userId).eq('debate_id', debateId).eq('folder', folder),
             'move sources from deleted folder',
           );
         }
-        throwOnWriteError(
-          await applyUserScopedColumnFilter(supabase.from('source_folders').delete(), userId, 'name', folder),
-          'delete source folder',
-        );
+        if (!usedElsewhere) {
+          throwOnWriteError(
+            await applyUserScopedColumnFilter(supabase.from('source_folders').delete(), userId, 'name', folder),
+            'delete source folder',
+          );
+        }
         applyDelete();
       },
       setFolderActive: async (folder, isActive) => {
         const normalized = normalizeFolder(folder);
+        const debateId = useDebateStore.getState().currentDebateId;
+        if (!debateId) throw new DebateRequiredError();
         const userId = await getUserId();
         if (userId) {
           throwOnWriteError(
-            await applyUserScopedColumnFilter(supabase.from('sources').update({ is_active: isActive }), userId, 'folder', normalized),
+            await supabase.from('sources').update({ is_active: isActive })
+              .eq('user_id', userId).eq('debate_id', debateId).eq('folder', normalized),
             'update source folder activity',
           );
         }
         set((state) => ({
           sourceLibrary: state.sourceLibrary.map((source) =>
-            normalizeFolder(source.folder) === normalized ? { ...source, isActive } : source
+            source.debateId === debateId && normalizeFolder(source.folder) === normalized ? { ...source, isActive } : source
           ),
         }));
       },
@@ -693,16 +778,19 @@ export const useSessionStore = create<SessionState>()(
         }));
       },
       clearLibrary: async () => {
+        // The Library belongs to the Current Debate; other debates keep their sources.
+        // Read it before any wait so a switch mid-clear cannot redirect the delete.
+        const debateId = useDebateStore.getState().currentDebateId;
+        if (!debateId) throw new DebateRequiredError();
         const userId = await getUserId();
         if (!userId) {
           throw new Error('Cannot clear library: No authenticated user');
         }
-        set({ sourceLibrary: [], sourceFolders: ['General'] });
-        await supabase.from('sources').delete().eq('user_id', userId);
-        await supabase.from('source_folders').delete().eq('user_id', userId);
-        await supabase
-          .from('source_folders')
-          .upsert({ user_id: userId, name: 'General' }, { onConflict: 'user_id,name' });
+        throwOnWriteError(
+          await supabase.from('sources').delete().eq('user_id', userId).eq('debate_id', debateId),
+          'clear debate sources',
+        );
+        set((state) => ({ sourceLibrary: state.sourceLibrary.filter((source) => source.debateId !== debateId) }));
       },
 
       setGenerateResult: (result) => {
@@ -852,7 +940,7 @@ export const useSessionStore = create<SessionState>()(
           ? { ...state.askStreamingAssistant, content: `${state.askStreamingAssistant.content}${text}` }
           : state.askStreamingAssistant,
       })),
-      clearAskMessages: () => set({ askMessages: [], askStreamingAssistant: null, askLoading: false }),
+      clearAskMessages: () => set({ askMessages: [], askStreamingAssistant: null, askLoading: false, askChatId: null, askChatDebateId: null, askPersistedCount: 0 }),
       saveCurrentChat: async (title) => {
         const current = get().askMessages;
         if (current.length === 0) return;
@@ -884,11 +972,13 @@ export const useSessionStore = create<SessionState>()(
       },
       loadSavedChat: (id) => {
         const item = get().savedChats.find((c) => c.id === id);
-        if (item) set({ askMessages: item.data });
+        // Continuing a chat appends to it where it already lives; an unsorted
+        // chat stays unsorted until the user attaches it.
+        if (item) set({ askMessages: item.data, askChatId: item.id, askChatDebateId: item.debateId ?? null, askPersistedCount: item.data.length });
       },
 
-      saveFlowchart: async (title, data) => {
-        const localItem = { id: generateId(), data, createdAt: Date.now(), title };
+      saveFlowchart: async (title, data, debateId = activeDebateId()) => {
+        const localItem = { id: generateId(), data, createdAt: Date.now(), title, debateId, side: 'neutral' as const };
         const userId = await getUserId();
         if (!userId) {
           set((state) => ({ savedFlowcharts: [localItem, ...state.savedFlowcharts] }));
@@ -898,6 +988,8 @@ export const useSessionStore = create<SessionState>()(
           .from('flowcharts')
           .insert({
             user_id: userId,
+            debate_id: debateId,
+            side: 'neutral',
             title,
             nodes: data.nodes,
             edges: data.edges,
@@ -911,8 +1003,63 @@ export const useSessionStore = create<SessionState>()(
           data: { nodes: saved.nodes, edges: saved.edges },
           createdAt: toTimestamp(saved.created_at),
           title: saved.title,
+          debateId: saved.debate_id ?? null,
+          side: saved.side ?? null,
         };
         set((state) => ({ savedFlowcharts: [savedItem, ...state.savedFlowcharts] }));
+        markDebateActivity(debateId);
+      },
+
+      recordResult: async (kind, { title, input, output, debateId, side }) => {
+        const userId = await getUserId();
+        if (!userId) throw new Error('[SessionStore] Sign in to save results to a debate');
+        const { data, error } = await supabase
+          .from(RESULT_TABLES[kind])
+          .insert({ user_id: userId, debate_id: debateId, side, title: title.slice(0, 300) || 'Untitled', input: input ?? {}, output })
+          .select('id,title,output,created_at,debate_id,side')
+          .single();
+        throwOnWriteError({ error }, `save ${kind} to debate`);
+        if (!data) throw new Error(`[SessionStore] Failed to save ${kind}: No record returned`);
+        const item = savedFromRow(data as SupabaseSavedRow<unknown>);
+        const list = RESULT_LISTS[kind];
+        set((state) => ({ [list]: [item, ...(state[list] as SavedItem<unknown>[])] }) as Partial<SessionState>);
+        markDebateActivity(debateId);
+        return item.id;
+      },
+
+      updateRecordedResult: async (kind, id, output) => {
+        const userId = await getUserId();
+        if (!userId) return;
+        throwOnWriteError(
+          await applyUserScopedIdFilter(supabase.from(RESULT_TABLES[kind]).update({ output }), userId, id),
+          `update ${kind}`,
+        );
+        const list = RESULT_LISTS[kind];
+        set((state) => ({
+          [list]: (state[list] as SavedItem<unknown>[]).map((item) => item.id === id ? { ...item, data: output } : item),
+        }) as Partial<SessionState>);
+      },
+
+      attachItem: async (kind, id, debateId, side) => {
+        const { error } = await supabase.rpc('attach_to_debate', {
+          p_kind: kind,
+          p_id: id,
+          p_debate_id: debateId,
+          ...(side ? { p_side: side } : {}),
+        });
+        throwOnWriteError({ error }, `attach ${kind} to debate`);
+        const list = ATTACH_LISTS[kind];
+        set((state) => ({
+          [list]: (state[list] as Array<{ id: string; side?: DebateSide | null }>).map((item) =>
+            item.id === id ? { ...item, debateId, ...(kind !== 'source' ? { side: side ?? item.side ?? null } : {}) } : item),
+        }) as Partial<SessionState>);
+        markDebateActivity(debateId);
+      },
+
+      syncAskChat: (debateId): Promise<void> => {
+        // Serialized so two quick replies cannot create two chats.
+        askSyncQueue = askSyncQueue.catch((): void => undefined).then((): Promise<void> => syncAskChatNow(debateId));
+        return askSyncQueue;
       },
 
       deleteSavedFlowchart: async (id) => {
@@ -931,6 +1078,7 @@ export const useSessionStore = create<SessionState>()(
           supabase.from('flowcharts').select('*').order('created_at', { ascending: false }),
           supabase.from('sources').select('*').order('created_at', { ascending: false }),
           supabase.from('source_folders').select('*').order('created_at', { ascending: true }),
+          supabase.from('crossfires').select('id,title,output,created_at,debate_id,side').order('created_at', { ascending: false }),
         ]);
 
         const [
@@ -942,6 +1090,7 @@ export const useSessionStore = create<SessionState>()(
           flowchartsRes,
           sourcesRes,
           sourceFoldersRes,
+          crossfiresRes,
         ] = results;
 
         const casesData = settledData<SupabaseSavedRow<GenerateOutput>[]>('cases', casesRes);
@@ -952,6 +1101,7 @@ export const useSessionStore = create<SessionState>()(
         const flowchartsData = settledData<SupabaseFlowchartRow[]>('flowcharts', flowchartsRes);
         const sourcesData = settledData<SupabaseSourceRow[]>('sources', sourcesRes);
         const sourceFoldersData = settledData<SupabaseSourceFolderRow[]>('source_folders', sourceFoldersRes);
+        const crossfiresData = settledData<SupabaseSavedRow<unknown>[]>('crossfires', crossfiresRes);
 
         const chatRows = chatsData || [];
         const chatIds = chatRows.map((c) => c.id);
@@ -961,44 +1111,14 @@ export const useSessionStore = create<SessionState>()(
           ]).then(([result]) => result))
           : [];
 
-        const caseRows = casesData || [];
-        const serverCases = caseRows.map((row) => ({
-          id: row.id,
-          data: row.output,
-          createdAt: toTimestamp(row.created_at),
-          title: row.title,
-        }));
-
-        const attackRows = attacksData || [];
-        const serverAttacks = attackRows.map((row) => ({
-          id: row.id,
-          data: row.output,
-          createdAt: toTimestamp(row.created_at),
-          title: row.title,
-        }));
-
-        const brainstormRows = brainstormsData || [];
-        const serverBrainstorms = brainstormRows.map((row) => ({
-          id: row.id,
-          data: row.output,
-          createdAt: toTimestamp(row.created_at),
-          title: row.title,
-        }));
-
-        const factoidRows = factoidsData || [];
-        const serverFactoids = factoidRows.map((row) => ({
-          id: row.id,
-          data: row.output,
-          createdAt: toTimestamp(row.created_at),
-          title: row.title,
-        }));
-
         const flowchartRows = flowchartsData || [];
         const serverFlowcharts = flowchartRows.map((row) => ({
           id: row.id,
           data: { nodes: row.nodes, edges: row.edges },
           createdAt: toTimestamp(row.created_at),
           title: row.title,
+          debateId: row.debate_id ?? null,
+          side: row.side ?? null,
         }));
 
         const messageMap = new Map<string, Message[]>();
@@ -1020,6 +1140,8 @@ export const useSessionStore = create<SessionState>()(
           title: row.title,
           createdAt: toTimestamp(row.created_at),
           data: messageMap.get(row.id) || [],
+          debateId: row.debate_id ?? null,
+          side: row.side ?? null,
         }));
 
         const sourceRows = sourcesData || [];
@@ -1032,33 +1154,25 @@ export const useSessionStore = create<SessionState>()(
           origin: row.origin || undefined,
           folder: normalizeFolder(row.folder),
           metadata: parseSourceProvenance(row.metadata),
+          debateId: row.debate_id ?? null,
           isActive: row.is_active,
           createdAt: toTimestamp(row.created_at),
         }));
         const serverSourceFolders = sourceFolderRows.map((row) => normalizeFolder(row.name));
 
-        const hasServerData = [
-          serverCases.length,
-          serverAttacks.length,
-          serverBrainstorms.length,
-          serverFactoids.length,
-          serverChats.length,
-          serverFlowcharts.length,
-          serverSources.length,
-          serverSourceFolders.length,
-        ].some((count) => count > 0);
-
-        if (!hasServerData) return;
-
+        // The server is the source of truth for signed-in users. Replacing (not
+        // merging) keeps purged legacy rows and other accounts' rows out of
+        // debates; a list whose query failed keeps its last known state.
         set((state) => ({
-          savedCases: mergeSavedItems(state.savedCases, serverCases),
-          savedAttacks: mergeSavedItems(state.savedAttacks, serverAttacks),
-          savedBrainstorms: mergeSavedItems(state.savedBrainstorms, serverBrainstorms),
-          savedFactoids: mergeSavedItems(state.savedFactoids, serverFactoids),
-          savedChats: mergeSavedItems(state.savedChats, serverChats),
-          savedFlowcharts: mergeSavedItems(state.savedFlowcharts, serverFlowcharts),
-          sourceFolders: mergeSourceFolders([...state.sourceFolders, ...serverSourceFolders], serverSources),
-          sourceLibrary: mergeSources(state.sourceLibrary, serverSources),
+          savedCases: casesData ? casesData.map(savedFromRow) : state.savedCases,
+          savedAttacks: attacksData ? attacksData.map(savedFromRow) : state.savedAttacks,
+          savedBrainstorms: brainstormsData ? brainstormsData.map(savedFromRow) : state.savedBrainstorms,
+          savedFactoids: factoidsData ? factoidsData.map(savedFromRow) : state.savedFactoids,
+          savedCrossfires: crossfiresData ? crossfiresData.map(savedFromRow) : state.savedCrossfires,
+          savedChats: chatsData ? serverChats : state.savedChats,
+          savedFlowcharts: flowchartsData ? serverFlowcharts : state.savedFlowcharts,
+          sourceFolders: mergeSourceFolders([...(sourceFoldersData ? [] : state.sourceFolders), ...serverSourceFolders], sourcesData ? serverSources : state.sourceLibrary),
+          sourceLibrary: sourcesData ? serverSources : state.sourceLibrary,
         }));
       },
 
@@ -1080,12 +1194,16 @@ export const useSessionStore = create<SessionState>()(
           savedFactoids: [],
           savedChats: [],
           savedFlowcharts: [],
+          savedCrossfires: [],
           autosavedCases: [],
           autosavedAttacks: [],
           autosavedBrainstorms: [],
           autosavedFactoids: [],
           sourceFolders: ['General'],
           sourceLibrary: [],
+          askChatId: null,
+          askChatDebateId: null,
+          askPersistedCount: 0,
         });
       },
       resetLocalData: () => set({
@@ -1095,6 +1213,14 @@ export const useSessionStore = create<SessionState>()(
         savedFactoids: [],
         savedChats: [],
         savedFlowcharts: [],
+        savedCrossfires: [],
+        autosavedCases: [],
+        autosavedAttacks: [],
+        autosavedBrainstorms: [],
+        autosavedFactoids: [],
+        askChatId: null,
+        askChatDebateId: null,
+        askPersistedCount: 0,
         sourceFolders: ['General'],
         sourceLibrary: [],
         generateResult: null,
@@ -1112,6 +1238,9 @@ export const useSessionStore = create<SessionState>()(
         factoidsResult: null,
         askMessages: [],
         askStreamingAssistant: null,
+        askChatId: null,
+        askChatDebateId: null,
+        askPersistedCount: 0,
         pendingFlowchartData: null,
         generateForm: {},
         attackForm: {},
@@ -1122,6 +1251,20 @@ export const useSessionStore = create<SessionState>()(
     {
       name: 'debate-trainer-storage',
       storage: createJSONStorage(() => localStorage),
+      // v1 scopes saved work and sources to debates. Drop lists persisted by
+      // older clients: the server replaces them on hydrate, and keeping them
+      // would resurrect purged legacy rows and debate-less sources.
+      version: 1,
+      migrate: (persistedState) => {
+        const state = { ...(persistedState as Record<string, unknown>) };
+        for (const key of [
+          'savedCases', 'savedAttacks', 'savedBrainstorms', 'savedFactoids', 'savedChats', 'savedFlowcharts',
+          'autosavedCases', 'autosavedAttacks', 'autosavedBrainstorms', 'autosavedFactoids', 'sourceLibrary', 'sourceFolders',
+          // An open pre-upgrade conversation would otherwise be copied into the first debate.
+          'askMessages',
+        ]) delete state[key];
+        return state as unknown as SessionState;
+      },
       partialize: ({
         generateLoading,
         attackLoading,
@@ -1135,3 +1278,86 @@ export const useSessionStore = create<SessionState>()(
     }
   )
 );
+
+let askSyncQueue: Promise<void> = Promise.resolve();
+
+async function syncAskChatNow(debateId: string | null): Promise<void> {
+  const get = useSessionStore.getState;
+  const set = useSessionStore.setState;
+  const { askMessages, askChatId, askChatDebateId, askPersistedCount } = get();
+  if (askMessages.length === 0 || askPersistedCount >= askMessages.length) return;
+  if (!askChatId && !debateId) return;
+  const userId = await getUserId();
+  if (!userId) return;
+  // Clearing or replacing the conversation while a write is in flight must not
+  // hand this chat or its count to the next conversation.
+  const sameConversation = () => {
+    const current = get().askMessages;
+    return askMessages.every((message, index) => current[index] === message);
+  };
+  let chatId = askChatId;
+  let chatDebateId = askChatId ? askChatDebateId : debateId;
+  if (!chatId) {
+    const title = askMessages.find((message) => message.role === 'user')?.content.slice(0, 60) || 'Chat';
+    const { data: chat, error } = await supabase
+      .from('chats')
+      .insert({ user_id: userId, debate_id: debateId, side: 'neutral', title })
+      .select('id,title,created_at,debate_id,side')
+      .single();
+    throwOnWriteError({ error }, 'save chat to debate');
+    if (!chat) throw new Error('[SessionStore] Failed to save chat: No record returned');
+    chatId = chat.id as string;
+    chatDebateId = debateId;
+    set((state) => ({
+      ...(sameConversation() ? { askChatId: chatId, askChatDebateId: debateId } : {}),
+      savedChats: [{ id: chatId!, title: chat.title, createdAt: toTimestamp(chat.created_at), data: askMessages, debateId, side: 'neutral' }, ...state.savedChats],
+    }));
+  }
+  const pending = askMessages.slice(askPersistedCount);
+  const result = await supabase.from('messages').insert(pending.map((message) => ({
+    chat_id: chatId,
+    role: message.role,
+    content: message.content,
+    output: message.output || null,
+    created_at: new Date(message.timestamp).toISOString(),
+  })));
+  throwOnWriteError(result, 'save chat messages');
+  set((state) => ({
+    ...(state.askChatId === chatId && sameConversation() ? { askPersistedCount: askPersistedCount + pending.length } : {}),
+    savedChats: state.savedChats.map((chat) => chat.id === chatId ? { ...chat, data: askMessages } : chat),
+  }));
+  markDebateActivity(chatDebateId);
+}
+
+function removedDebateIds(debates: Array<{ id: string }>, previous: Array<{ id: string }>): Set<string> {
+  return new Set(previous.filter((debate) => !debates.some((next) => next.id === debate.id)).map((debate) => debate.id));
+}
+
+// A change of scope (another debate, or one-off mode on or off) starts a fresh
+// Ask conversation, and a deleted debate takes its local work with it (the
+// server already cascaded it).
+const askScope = (state: { oneOff: boolean; currentDebateId: string | null }) => state.oneOff ? null : state.currentDebateId;
+useDebateStore.subscribe((state, previous) => {
+  const removed = removedDebateIds(state.debates, previous.debates);
+  const session = useSessionStore.getState();
+  const scope = askScope(state);
+  const openChatStays = session.askChatId !== null && session.askChatDebateId !== null
+    && session.askChatDebateId === scope && !removed.has(session.askChatDebateId);
+  const leftAskScope = session.askMessages.length > 0 && !openChatStays
+    && (scope !== askScope(previous) || (session.askChatDebateId !== null && removed.has(session.askChatDebateId)));
+  if (removed.size === 0 && !leftAskScope) return;
+  const keep = <T extends { debateId?: string | null }>(list: T[]) => list.filter((item) => !item.debateId || !removed.has(item.debateId));
+  useSessionStore.setState((current) => ({
+    ...(removed.size > 0 ? {
+      savedCases: keep(current.savedCases),
+      savedAttacks: keep(current.savedAttacks),
+      savedBrainstorms: keep(current.savedBrainstorms),
+      savedFactoids: keep(current.savedFactoids),
+      savedChats: keep(current.savedChats),
+      savedFlowcharts: keep(current.savedFlowcharts),
+      savedCrossfires: keep(current.savedCrossfires),
+      sourceLibrary: keep(current.sourceLibrary),
+    } : {}),
+    ...(leftAskScope ? { askMessages: [], askStreamingAssistant: null, askLoading: false, askChatId: null, askChatDebateId: null, askPersistedCount: 0 } : {}),
+  }));
+});
diff --git a/src/lib/stores/sparring-store.ts b/src/lib/stores/sparring-store.ts
index 49f8532c4..ae1228bf9 100644
--- a/src/lib/stores/sparring-store.ts
+++ b/src/lib/stores/sparring-store.ts
@@ -15,6 +15,7 @@ import {
 } from '@/lib/ai/schemas/sparring';
 import { buildSparringTurns, type SparringTurn } from '@/lib/sparring/formats';
 import { captureProductEvent } from '@/lib/observability';
+import { useDebateStore } from './debate-store';
 
 export type SparringPhase = 'round' | 'judging' | 'complete';
 
@@ -33,6 +34,8 @@ export interface SparringSession {
   timerRunning: boolean;
   timerDeadline: number | null;
   scorecard?: SparringScorecard;
+  /** Debate the round attaches to once judged; null for one-off rounds. */
+  debateId?: string | null;
   createdAt: number;
   updatedAt: number;
 }
@@ -42,6 +45,7 @@ interface StartSessionInput {
   userSide: SparringSide;
   format: SparringFormat;
   difficulty: SparringDifficulty;
+  debateId?: string | null;
 }
 
 interface SparringStoreState {
@@ -62,6 +66,7 @@ interface SparringStoreState {
   submitUserSpeech: (content: string, now?: number) => SparringSession | null;
   appendAiSpeech: (speech: SparringSpeech, now?: number) => SparringSession | null;
   completeSession: (scorecard: SparringScorecard, now?: number) => SparringSession | null;
+  attachSessionToDebate: (id: string, debateId: string) => Promise<void>;
   hydrateSavedSessions: () => Promise<void>;
   prepareForUser: (userId: string) => void;
   loadSavedSession: (id: string) => void;
@@ -83,6 +88,7 @@ const SavedRowsSchema = z.array(z.object({
   turns: z.unknown(),
   final_evaluation: z.unknown(),
   status: z.string(),
+  debate_id: z.string().nullable().optional(),
   created_at: z.string(),
   updated_at: z.string(),
 }));
@@ -102,6 +108,7 @@ const PersistedSparringSessionSchema = z.object({
   timerRunning: z.boolean(),
   timerDeadline: z.number().nullable(),
   scorecard: SparringScorecardSchema.optional(),
+  debateId: z.string().nullable().optional(),
   createdAt: z.number(),
   updatedAt: z.number(),
 });
@@ -277,6 +284,7 @@ function parseSavedRows(value: unknown): SparringSession[] {
       timerRunning: false,
       timerDeadline: null,
       scorecard: scorecard.data,
+      debateId: row.debate_id ?? null,
       createdAt: Number.isFinite(createdAt) ? createdAt : Date.now(),
       updatedAt: Number.isFinite(updatedAt) ? updatedAt : Date.now(),
     }];
@@ -316,6 +324,7 @@ export const useSparringStore = create<SparringStoreState>()(
           phase: 'round',
           draft: '',
           ...timerForTurn(turns[0], now),
+          debateId: input.debateId ?? null,
           createdAt: now,
           updatedAt: now,
         };
@@ -433,6 +442,22 @@ export const useSparringStore = create<SparringStoreState>()(
         return completed;
       },
 
+      attachSessionToDebate: async (id, debateId) => {
+        const session = get().savedSessions.find((item) => item.id === id) ?? get().currentSession;
+        const { error } = await supabase.rpc('attach_to_debate', {
+          p_kind: 'sparring',
+          p_id: id,
+          p_debate_id: debateId,
+          p_side: session?.id === id ? session.userSide : null,
+        });
+        if (error) throw new Error(error.message);
+        const attach = (item: SparringSession) => item.id === id ? { ...item, debateId } : item;
+        set((state) => ({
+          savedSessions: state.savedSessions.map(attach),
+          currentSession: state.currentSession ? attach(state.currentSession) : null,
+        }));
+      },
+
       prepareForUser: (userId) => {
         if (get().ownerUserId === userId) return;
         hydrationEpoch += 1;
@@ -450,7 +475,7 @@ export const useSparringStore = create<SparringStoreState>()(
         }
         const { data, error } = await supabase
           .from('sparring_sessions')
-          .select('id,motion,user_side,format,difficulty,turns,final_evaluation,status,created_at,updated_at')
+          .select('id,motion,user_side,format,difficulty,turns,final_evaluation,status,debate_id,created_at,updated_at')
           .order('updated_at', { ascending: false });
         if (epoch !== hydrationEpoch) return;
         if (error) {
@@ -502,3 +527,15 @@ export const useSparringStore = create<SparringStoreState>()(
     },
   ),
 );
+
+// A deleted debate takes its sessions with it on the server; mirror that locally.
+useDebateStore.subscribe((state, previous) => {
+  const removed = new Set(previous.debates.filter((debate) => !state.debates.some((next) => next.id === debate.id)).map((debate) => debate.id));
+  if (removed.size === 0) return;
+  useSparringStore.setState((current) => ({
+    savedSessions: current.savedSessions.filter((session) => !session.debateId || !removed.has(session.debateId)),
+    currentSession: current.currentSession?.debateId && removed.has(current.currentSession.debateId)
+      ? { ...current.currentSession, debateId: null }
+      : current.currentSession,
+  }));
+});
diff --git a/src/lib/supabase/AuthProvider.tsx b/src/lib/supabase/AuthProvider.tsx
index fecd0e6f0..8bfb0d52c 100644
--- a/src/lib/supabase/AuthProvider.tsx
+++ b/src/lib/supabase/AuthProvider.tsx
@@ -5,6 +5,7 @@ import { setActiveAccessToken, supabase } from './client';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useSettingsStore } from '@/lib/stores/settings-store';
 import { useSparringStore } from '@/lib/stores/sparring-store';
+import { useDebateStore } from '@/lib/stores/debate-store';
 import { getOAuthRedirectUrl, openExternalUrl } from '@/lib/native';
 import { setJamUserId } from '@/lib/jam-metadata';
 import { clearCrossfireDraftOnAuthChange } from '@/lib/crossfire/storage';
@@ -104,6 +105,8 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
   const resetSessionStore = useSessionStore((state) => state.resetLocalData);
   const resetSettingsStore = useSettingsStore((state) => state.resetLocalData);
   const resetSparringStore = useSparringStore((state) => state.resetLocalData);
+  const hydrateDebateStore = useDebateStore((state) => state.hydrate);
+  const resetDebateStore = useDebateStore((state) => state.resetLocalData);
   const currentUserIdRef = useRef<string | undefined>(undefined);
 
   useEffect(() => {
@@ -116,6 +119,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       Promise.resolve(hydrateSessionStore()).catch((err) => console.warn('[Auth] hydrateSessionStore failed:', err));
       Promise.resolve(hydrateSettingsStore()).catch((err) => console.warn('[Auth] hydrateSettingsStore failed:', err));
       Promise.resolve(hydrateSparringStore()).catch((err) => console.warn('[Auth] hydrateSparringStore failed:', err));
+      Promise.resolve(hydrateDebateStore()).catch((err) => console.warn('[Auth] hydrateDebateStore failed:', err));
     };
 
     // Older clients persisted these credentials across browser sessions.
@@ -229,6 +233,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
         resetSessionStore();
         resetSettingsStore(!prevUserId);
         resetSparringStore();
+        resetDebateStore();
         sessionStorage.removeItem('google_provider_token');
         localStorage.removeItem('google_provider_token');
         // Remove refresh tokens written by older clients as well; this client
@@ -242,6 +247,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
         resetSessionStore();
         resetSettingsStore();
         resetSparringStore();
+        resetDebateStore();
       }
 
       hydrateStores(nextUserId);
@@ -251,7 +257,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       mounted = false;
       authListener.subscription.unsubscribe();
     };
-  }, [hydrateSessionStore, hydrateSettingsStore, hydrateSparringStore, prepareSparringStore, resetSessionStore, resetSettingsStore, resetSparringStore]);
+  }, [hydrateDebateStore, hydrateSessionStore, hydrateSettingsStore, hydrateSparringStore, prepareSparringStore, resetDebateStore, resetSessionStore, resetSettingsStore, resetSparringStore]);
 
   const value = useMemo<AuthContextValue>(() => ({
     session,
diff --git a/src/locales/en.json b/src/locales/en.json
index e7d0d3b1e..dee94190a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -23,7 +23,8 @@
     "closeMenu": "Close menu",
     "more": "More",
     "mainNavigation": "Main navigation",
-    "mobileNavigation": "Mobile navigation"
+    "mobileNavigation": "Mobile navigation",
+    "currentDebate": "Current debate"
   },
   "navDesc": {
     "home": "Choose a mode",
@@ -38,7 +39,9 @@
     "timer": "Practice timing",
     "sparring": "Practice a live round",
     "flowchart": "Map arguments",
-    "history": "Saved items"
+    "history": "Saved items",
+    "currentDebate": "Motion, sources, and results",
+    "settings": "Language, account, and data"
   },
   "workspaces": {
     "title": "Workspaces",
@@ -230,7 +233,11 @@
     "loading": "Loading",
     "error": "Error",
     "logoAlt": "DebateLab logo",
-    "or": "or"
+    "or": "or",
+    "back": "Back",
+    "cancel": "Cancel",
+    "delete": "Delete",
+    "save": "Save"
   },
   "aiClient": {
     "inputShortened": "Input was shortened",
@@ -2034,5 +2041,102 @@
       "moderate": "Moderate",
       "weak": "Weak"
     }
+  },
+  "debate": {
+    "motion": "Motion",
+    "motionPlaceholder": "This House would…",
+    "motionRequired": "Enter the motion you are preparing.",
+    "format": "Format",
+    "role": "Your role",
+    "roleAny": "Any role",
+    "instructions": "Instructions",
+    "instructionsPlaceholder": "Roles, judge expectations, agreed definitions, school conventions, writing preferences…",
+    "saveFailed": "Could not save the debate.",
+    "startDebate": "Start debate",
+    "startNew": "Start new debate",
+    "startNewDesc": "Your tools, sources, and results will follow this motion. Older debates stay available.",
+    "switch": "Switch debate",
+    "switchDesc": "Pick the motion you are preparing now.",
+    "switchFailed": "Could not switch debates",
+    "switchToAria": "Switch to {{motion}}",
+    "switchToExisting": "Switch to this existing debate",
+    "noOtherDebates": "You have no other debates yet.",
+    "yourDebates": "Your debates",
+    "current": "Current debate",
+    "deleteAria": "Delete {{motion}}",
+    "deleteWarning": "Deletes its sources and saved work.",
+    "deleted": "Debate deleted",
+    "deleteFailed": "Could not delete the debate",
+    "lastActivity": "Last activity {{when}}",
+    "counts": "{{sources}} sources · {{outputs}} outputs",
+    "menuAria": "Current debate: {{motion}}",
+    "open": "Open debate",
+    "useOneOff": "Use one-off mode",
+    "oneOffActive": "One-off mode is on",
+    "returnToDebate": "Return to debate",
+    "continue": "Continue",
+    "continueFailed": "Could not update the debate",
+    "gateTitle": "Still preparing this debate?",
+    "gateDesc": "Last activity {{when}}. Choose how to continue.",
+    "mismatchTitle": "This is a different motion",
+    "noDebateTitle": "Which debate is this for?",
+    "mismatchDesc": "Your Current Debate is “{{motion}}”.",
+    "createFromMotion": "Create a new debate for this motion",
+    "useOnce": "Use once without saving to a debate",
+    "useOnceShort": "Use once",
+    "workingIn": "Working in:",
+    "change": "Change",
+    "oneOffStrip": "One-off mode: nothing here uses or saves to a debate.",
+    "noCurrentStrip": "No current debate. Results stay one-off until you start one.",
+    "noCurrentTitle": "No current debate",
+    "noCurrentDesc": "Start a debate to keep one motion, its sources, and your results together.",
+    "editSettings": "Edit settings",
+    "settingsSaved": "Debate settings saved",
+    "itemCount": "{{count}} items",
+    "sideEmpty": "No work for this side yet.",
+    "sources": "Sources",
+    "noSources": "No sources in this debate yet.",
+    "recentWork": "Recent work",
+    "noWork": "Results from any tool appear here automatically.",
+    "tools": "Prepare and practice",
+    "openItemAria": "Open {{title}}",
+    "recordFailed": "Could not save this result to the debate",
+    "sourceNeedsDebate": "Start or select a debate before saving sources.",
+    "librarySources": "Sources for",
+    "libraryNeedsDebate": "Select or create a debate before adding or importing sources.",
+    "historyScope": "Show work from",
+    "outsideDebates": "One-off and unsorted work",
+    "unsortedDesc": "These results are not in any debate. Nothing moves until you confirm.",
+    "unsortedEmpty": "Nothing outside your debates",
+    "unsortedEmptyDesc": "One-off results and older unsorted work appear here.",
+    "suggested": "Suggested",
+    "attachTo": "Add to debate",
+    "chooseDebate": "Choose a debate",
+    "attachConfirm": "Add to debate",
+    "attached": "Added to debate",
+    "attachFailed": "Could not add this to the debate",
+    "side": {
+      "pro": "In favor",
+      "con": "Against",
+      "both": "Both sides",
+      "neutral": "Neutral"
+    },
+    "kinds": {
+      "case": "Case",
+      "attack": "Attack",
+      "brainstorm": "Brainstorm",
+      "factoids": "Factoids",
+      "chat": "Ask chat",
+      "flowchart": "Flowchart",
+      "crossfire": "Crossfire",
+      "sparring": "Sparring",
+      "source": "Source"
+    },
+    "formats": {
+      "custom": "Custom",
+      "bp": "British Parliamentary",
+      "policy": "Policy",
+      "classroom": "Classroom"
+    }
   }
 }
diff --git a/src/locales/es.json b/src/locales/es.json
index af3fb55e8..99e3b0fb4 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -23,7 +23,8 @@
     "closeMenu": "Cerrar menú",
     "more": "Más",
     "mainNavigation": "Navegación principal",
-    "mobileNavigation": "Navegación móvil"
+    "mobileNavigation": "Navegación móvil",
+    "currentDebate": "Debate actual"
   },
   "navDesc": {
     "home": "Elegir un modo",
@@ -38,7 +39,9 @@
     "timer": "Practicar tiempos",
     "sparring": "Practicar una ronda en directo",
     "flowchart": "Mapear argumentos",
-    "history": "Elementos guardados"
+    "history": "Elementos guardados",
+    "currentDebate": "Moción, fuentes y resultados",
+    "settings": "Idioma, cuenta y datos"
   },
   "workspaces": {
     "title": "Espacios de trabajo",
@@ -230,7 +233,11 @@
     "loading": "Cargando",
     "error": "Error",
     "logoAlt": "Logotipo de DebateLab",
-    "or": "o"
+    "or": "o",
+    "back": "Atrás",
+    "cancel": "Cancelar",
+    "delete": "Eliminar",
+    "save": "Guardar"
   },
   "aiClient": {
     "inputShortened": "La entrada se acortó",
@@ -2034,5 +2041,102 @@
       "moderate": "Moderada",
       "weak": "Débil"
     }
+  },
+  "debate": {
+    "motion": "Moción",
+    "motionPlaceholder": "Esta Casa haría…",
+    "motionRequired": "Escribe la moción que estás preparando.",
+    "format": "Formato",
+    "role": "Tu rol",
+    "roleAny": "Cualquier rol",
+    "instructions": "Instrucciones",
+    "instructionsPlaceholder": "Roles, expectativas del jurado, definiciones acordadas, normas del colegio, preferencias de redacción…",
+    "saveFailed": "No se pudo guardar el debate.",
+    "startDebate": "Iniciar debate",
+    "startNew": "Iniciar nuevo debate",
+    "startNewDesc": "Tus herramientas, fuentes y resultados seguirán esta moción. Los debates anteriores siguen disponibles.",
+    "switch": "Cambiar de debate",
+    "switchDesc": "Elige la moción que estás preparando ahora.",
+    "switchFailed": "No se pudo cambiar de debate",
+    "switchToAria": "Cambiar a {{motion}}",
+    "switchToExisting": "Cambiar a este debate existente",
+    "noOtherDebates": "Aún no tienes otros debates.",
+    "yourDebates": "Tus debates",
+    "current": "Debate actual",
+    "deleteAria": "Eliminar {{motion}}",
+    "deleteWarning": "Elimina sus fuentes y el trabajo guardado.",
+    "deleted": "Debate eliminado",
+    "deleteFailed": "No se pudo eliminar el debate",
+    "lastActivity": "Última actividad {{when}}",
+    "counts": "{{sources}} fuentes · {{outputs}} resultados",
+    "menuAria": "Debate actual: {{motion}}",
+    "open": "Abrir debate",
+    "useOneOff": "Usar modo puntual",
+    "oneOffActive": "El modo puntual está activado",
+    "returnToDebate": "Volver al debate",
+    "continue": "Continuar",
+    "continueFailed": "No se pudo actualizar el debate",
+    "gateTitle": "¿Sigues preparando este debate?",
+    "gateDesc": "Última actividad {{when}}. Elige cómo continuar.",
+    "mismatchTitle": "Esta es una moción diferente",
+    "noDebateTitle": "¿Para qué debate es esto?",
+    "mismatchDesc": "Tu debate actual es «{{motion}}».",
+    "createFromMotion": "Crear un nuevo debate para esta moción",
+    "useOnce": "Usar una vez sin guardar en un debate",
+    "useOnceShort": "Usar una vez",
+    "workingIn": "Trabajando en:",
+    "change": "Cambiar",
+    "oneOffStrip": "Modo puntual: nada de aquí usa ni se guarda en un debate.",
+    "noCurrentStrip": "No hay debate actual. Los resultados quedan como puntuales hasta que inicies uno.",
+    "noCurrentTitle": "No hay debate actual",
+    "noCurrentDesc": "Inicia un debate para mantener juntos una moción, sus fuentes y tus resultados.",
+    "editSettings": "Editar ajustes",
+    "settingsSaved": "Ajustes del debate guardados",
+    "itemCount": "{{count}} elementos",
+    "sideEmpty": "Aún no hay trabajo para este lado.",
+    "sources": "Fuentes",
+    "noSources": "Aún no hay fuentes en este debate.",
+    "recentWork": "Trabajo reciente",
+    "noWork": "Los resultados de cualquier herramienta aparecen aquí automáticamente.",
+    "tools": "Preparar y practicar",
+    "openItemAria": "Abrir {{title}}",
+    "recordFailed": "No se pudo guardar este resultado en el debate",
+    "sourceNeedsDebate": "Inicia o elige un debate antes de guardar fuentes.",
+    "librarySources": "Fuentes de",
+    "libraryNeedsDebate": "Elige o crea un debate antes de añadir o importar fuentes.",
+    "historyScope": "Mostrar trabajo de",
+    "outsideDebates": "Trabajo puntual y sin clasificar",
+    "unsortedDesc": "Estos resultados no están en ningún debate. Nada se mueve hasta que lo confirmes.",
+    "unsortedEmpty": "Nada fuera de tus debates",
+    "unsortedEmptyDesc": "Aquí aparecen los resultados puntuales y el trabajo antiguo sin clasificar.",
+    "suggested": "Sugerido",
+    "attachTo": "Añadir al debate",
+    "chooseDebate": "Elige un debate",
+    "attachConfirm": "Añadir al debate",
+    "attached": "Añadido al debate",
+    "attachFailed": "No se pudo añadir al debate",
+    "side": {
+      "pro": "A favor",
+      "con": "En contra",
+      "both": "Ambos lados",
+      "neutral": "Neutral"
+    },
+    "kinds": {
+      "case": "Caso",
+      "attack": "Ataque",
+      "brainstorm": "Lluvia de ideas",
+      "factoids": "Datos",
+      "chat": "Chat de preguntas",
+      "flowchart": "Diagrama",
+      "crossfire": "Contrainterrogatorio",
+      "sparring": "Sparring",
+      "source": "Fuente"
+    },
+    "formats": {
+      "custom": "Personalizado",
+      "bp": "Parlamentario británico",
+      "policy": "Policy",
+      "classroom": "Aula"
+    }
   }
 }
diff --git a/src/locales/hu.json b/src/locales/hu.json
index 2e1149212..80efe97c3 100644
--- a/src/locales/hu.json
+++ b/src/locales/hu.json
@@ -23,7 +23,8 @@
     "closeMenu": "Menü bezárása",
     "more": "Továbbiak",
     "mainNavigation": "Fő navigáció",
-    "mobileNavigation": "Mobil navigáció"
+    "mobileNavigation": "Mobil navigáció",
+    "currentDebate": "Aktuális vita"
   },
   "navDesc": {
     "home": "Mód választása",
@@ -38,7 +39,9 @@
     "timer": "Időzítés gyakorlása",
     "sparring": "Élő vita forduló gyakorlása",
     "flowchart": "Érvek térképezése",
-    "history": "Mentett elemek"
+    "history": "Mentett elemek",
+    "currentDebate": "Tétel, források és eredmények",
+    "settings": "Nyelv, fiók és adatok"
   },
   "workspaces": {
     "title": "Munkaterek",
@@ -230,7 +233,11 @@
     "loading": "Betöltés",
     "error": "Hiba",
     "logoAlt": "DebateLab logó",
-    "or": "vagy"
+    "or": "vagy",
+    "back": "Vissza",
+    "cancel": "Mégse",
+    "delete": "Törlés",
+    "save": "Mentés"
   },
   "aiClient": {
     "inputShortened": "A bemenet rövidítve lett",
@@ -2034,5 +2041,102 @@
       "moderate": "Közepes",
       "weak": "Gyenge"
     }
+  },
+  "debate": {
+    "motion": "Tétel",
+    "motionPlaceholder": "A Ház úgy döntene, hogy…",
+    "motionRequired": "Add meg a tételt, amelyre készülsz.",
+    "format": "Formátum",
+    "role": "Szereped",
+    "roleAny": "Bármely szerep",
+    "instructions": "Utasítások",
+    "instructionsPlaceholder": "Szerepek, zsűri elvárásai, elfogadott definíciók, iskolai szokások, írási preferenciák…",
+    "saveFailed": "Nem sikerült menteni a vitát.",
+    "startDebate": "Vita indítása",
+    "startNew": "Új vita indítása",
+    "startNewDesc": "Az eszközeid, forrásaid és eredményeid ezt a tételt követik. A korábbi viták elérhetők maradnak.",
+    "switch": "Vita váltása",
+    "switchDesc": "Válaszd ki a tételt, amelyre most készülsz.",
+    "switchFailed": "Nem sikerült vitát váltani",
+    "switchToAria": "Váltás erre: {{motion}}",
+    "switchToExisting": "Váltás erre a meglévő vitára",
+    "noOtherDebates": "Még nincs más vitád.",
+    "yourDebates": "Vitáid",
+    "current": "Aktuális vita",
+    "deleteAria": "Törlés: {{motion}}",
+    "deleteWarning": "Törli a forrásait és a mentett munkáit.",
+    "deleted": "Vita törölve",
+    "deleteFailed": "Nem sikerült törölni a vitát",
+    "lastActivity": "Utolsó tevékenység: {{when}}",
+    "counts": "{{sources}} forrás · {{outputs}} eredmény",
+    "menuAria": "Aktuális vita: {{motion}}",
+    "open": "Vita megnyitása",
+    "useOneOff": "Egyszeri mód használata",
+    "oneOffActive": "Az egyszeri mód be van kapcsolva",
+    "returnToDebate": "Vissza a vitához",
+    "continue": "Folytatás",
+    "continueFailed": "Nem sikerült frissíteni a vitát",
+    "gateTitle": "Még mindig erre a vitára készülsz?",
+    "gateDesc": "Utolsó tevékenység: {{when}}. Válaszd ki, hogyan folytatod.",
+    "mismatchTitle": "Ez egy másik tétel",
+    "noDebateTitle": "Melyik vitához tartozik ez?",
+    "mismatchDesc": "Az aktuális vitád: „{{motion}}”.",
+    "createFromMotion": "Új vita létrehozása ehhez a tételhez",
+    "useOnce": "Egyszeri használat vitába mentés nélkül",
+    "useOnceShort": "Egyszeri használat",
+    "workingIn": "Munka ebben:",
+    "change": "Módosítás",
+    "oneOffStrip": "Egyszeri mód: itt semmi nem használ vitát és nem ment vitába.",
+    "noCurrentStrip": "Nincs aktuális vita. Az eredmények egyszeriek maradnak, amíg nem indítasz egyet.",
+    "noCurrentTitle": "Nincs aktuális vita",
+    "noCurrentDesc": "Indíts egy vitát, hogy a tétel, a forrásai és az eredményeid együtt maradjanak.",
+    "editSettings": "Beállítások szerkesztése",
+    "settingsSaved": "Vitabeállítások mentve",
+    "itemCount": "{{count}} elem",
+    "sideEmpty": "Ehhez az oldalhoz még nincs munka.",
+    "sources": "Források",
+    "noSources": "Ebben a vitában még nincs forrás.",
+    "recentWork": "Legutóbbi munka",
+    "noWork": "Bármely eszköz eredményei automatikusan itt jelennek meg.",
+    "tools": "Felkészülés és gyakorlás",
+    "openItemAria": "Megnyitás: {{title}}",
+    "recordFailed": "Nem sikerült menteni az eredményt a vitába",
+    "sourceNeedsDebate": "Indíts vagy válassz egy vitát a források mentése előtt.",
+    "librarySources": "Források ehhez:",
+    "libraryNeedsDebate": "Válassz vagy hozz létre egy vitát, mielőtt forrást adsz hozzá vagy importálsz.",
+    "historyScope": "Munka megjelenítése innen",
+    "outsideDebates": "Egyszeri és rendezetlen munka",
+    "unsortedDesc": "Ezek az eredmények egyetlen vitához sem tartoznak. Semmi sem mozdul, amíg meg nem erősíted.",
+    "unsortedEmpty": "Nincs semmi a vitáidon kívül",
+    "unsortedEmptyDesc": "Itt jelennek meg az egyszeri eredmények és a régebbi rendezetlen munkák.",
+    "suggested": "Javasolt",
+    "attachTo": "Hozzáadás vitához",
+    "chooseDebate": "Válassz vitát",
+    "attachConfirm": "Hozzáadás a vitához",
+    "attached": "Hozzáadva a vitához",
+    "attachFailed": "Nem sikerült hozzáadni a vitához",
+    "side": {
+      "pro": "Mellette",
+      "con": "Ellene",
+      "both": "Mindkét oldal",
+      "neutral": "Semleges"
+    },
+    "kinds": {
+      "case": "Esetépítés",
+      "attack": "Támadás",
+      "brainstorm": "Ötletelés",
+      "factoids": "Tények",
+      "chat": "Kérdező csevegés",
+      "flowchart": "Folyamatábra",
+      "crossfire": "Keresztkérdezés",
+      "sparring": "Edzőmeccs",
+      "source": "Forrás"
+    },
+    "formats": {
+      "custom": "Egyéni",
+      "bp": "Brit parlamenti",
+      "policy": "Szakpolitikai",
+      "classroom": "Tantermi"
+    }
   }
 }
diff --git a/src/pages/AskPage.tsx b/src/pages/AskPage.tsx
index c5ff24b0c..7c89f991f 100644
--- a/src/pages/AskPage.tsx
+++ b/src/pages/AskPage.tsx
@@ -13,6 +13,9 @@ import { AnimatedSection } from '@/components/ui/animated-section';
 import { useCallback, useEffect, useRef } from 'react';
 import type { AskOutput } from '@/lib/ai/schemas/ask';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
+import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
+import { activeDebateId, useDebateStore } from '@/lib/stores/debate-store';
+import { DebateRequiredError } from '@/lib/stores/session-store';
 
 const MAX_AI_INPUT_LENGTH = 50000;
 
@@ -31,7 +34,12 @@ export default function AskPage() {
     loadSavedChat,
     savedChats,
     addSource,
+    askChatId,
+    askChatDebateId,
+    askPersistedCount,
+    syncAskChat,
   } = useSessionStore();
+  const chatScope = useDebateStore((state) => state.oneOff ? null : state.currentDebateId);
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('ask');
   const { toast } = useToast();
@@ -57,6 +65,29 @@ export default function AskPage() {
     abortActiveRequest();
   }, [abortActiveRequest]);
 
+  // A reply still in flight belongs to the scope it was asked in; a new debate
+  // or one-off mode starts a fresh conversation, so drop the late answer.
+  const askedScopeRef = useRef(chatScope);
+  useEffect(() => {
+    if (askedScopeRef.current === chatScope) return;
+    askedScopeRef.current = chatScope;
+    abortActiveRequest();
+  }, [abortActiveRequest, chatScope]);
+
+  // Each finished exchange is recorded into the Current Debate automatically,
+  // including conversations started from another tool's Discuss button.
+  const lastRole = askMessages[askMessages.length - 1]?.role;
+  useEffect(() => {
+    if (workspace.context || askLoading || lastRole !== 'assistant' || askPersistedCount >= askMessages.length) return;
+    // A loaded chat keeps recording where it lives; a new one needs a Current Debate.
+    const debateId = activeDebateId();
+    if (!askChatId && !debateId) return;
+    syncAskChat(debateId).catch((error) => {
+      console.error('Failed to record chat in debate:', error);
+      toast({ title: t('debate.recordFailed', 'Could not save this result to the debate'), variant: 'destructive' });
+    });
+  }, [askChatId, askLoading, askMessages.length, askPersistedCount, lastRole, syncAskChat, t, toast, workspace.context]);
+
   const handleSend = async (
     message: string,
     mode: string,
@@ -129,6 +160,8 @@ export default function AskPage() {
         prosConsMode,
         argumentMapMode,
         workspaceContext: workspace.context ?? undefined,
+        // A loaded chat stays grounded in its own debate's sources.
+        debateId: askChatId ? askChatDebateId : activeDebateId(),
       };
 
       let result: AskOutput;
@@ -283,9 +316,11 @@ export default function AskPage() {
   const handleSaveToLibrary = (title: string, content: string) => {
       const saveResult = addSource({ title, content, type: 'text', folder: 'Ask' });
       const showSuccess = () => toast({ title: t('ask.saved'), description: t('ask.savedDesc') });
-      const showFailure = () => toast({
+      const showFailure = (error?: unknown) => toast({
           title: t('ask.saveFailed', 'Save failed'),
-          description: t('ask.saveFailedDesc', 'The source could not be saved. Please try again.'),
+          description: error instanceof DebateRequiredError
+            ? t('debate.sourceNeedsDebate', 'Start or select a debate before saving sources.')
+            : t('ask.saveFailedDesc', 'The source could not be saved. Please try again.'),
           variant: 'destructive',
         });
       if (saveResult && typeof saveResult.then === 'function') {
@@ -313,14 +348,15 @@ export default function AskPage() {
         <AnimatedSection className="mb-8">
           <h1 className="text-3xl font-bold text-foreground">{t('nav.ask')}</h1>
         </AnimatedSection>
+        <CurrentDebateStrip hidden={Boolean(workspace.context)} />
         <AnimatedSection delay={75}>
           <AskChat
             messages={visibleMessages}
             isLoading={askLoading}
             onSend={handleSend}
             onClear={handleClear}
-            onSaveChat={handleSaveChat}
-            savedChats={savedChats.map((chat) => ({
+            onSaveChat={askChatId ? undefined : handleSaveChat}
+            savedChats={savedChats.filter((chat) => (chat.debateId ?? null) === chatScope).map((chat) => ({
               id: chat.id,
               title: chat.title,
               createdAt: chat.createdAt,
diff --git a/src/pages/AttackPage.tsx b/src/pages/AttackPage.tsx
index 32a90abaf..ca525b1b6 100644
--- a/src/pages/AttackPage.tsx
+++ b/src/pages/AttackPage.tsx
@@ -17,10 +17,13 @@ import { AnimatedSection } from '@/components/ui/animated-section';
 import { prefillFromAttack } from '@/lib/crossfire/prefill';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
 import { workspaceRouteState } from '@/lib/workspace/tool-context';
+import { recordInDebate } from '@/lib/debate/record';
+import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
+import { activeDebateId } from '@/lib/stores/debate-store';
 
 export default function AttackPage() {
   const workspace = useWorkspaceToolScope('attack');
-  const { attackResult, attackLoading, attackForm, setAttackResult, setAttackLoading, addAskMessage, setAskLoading, askMessages } = useSessionStore();
+  const { attackResult, attackLoading, attackForm, setAttackResult, setAttackLoading, addAskMessage, setAskLoading, askMessages, recordResult } = useSessionStore();
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('attack'); // Actually we should use 'ask' config for the chat part
   const askConfig = getFeatureConfig('ask');
@@ -32,11 +35,17 @@ export default function AttackPage() {
 
   const handleSubmit = async (data: AttackInput) => {
     setAttackLoading(true);
+    // Attack critiques pasted text, not a motion, so it follows the Current Debate directly.
+    const debateId = workspace.context ? null : activeDebateId();
     try {
-      const { result, discoveredSources } = await attackCase(data, config, workspace.context ?? undefined);
+      const { result, discoveredSources } = await attackCase(data, config, workspace.context ?? undefined, workspace.context ? undefined : debateId);
       setDiscoveredSources(discoveredSources);
       setAttackResult(result);
       await workspace.attach(data, result);
+      if (debateId) {
+        const title = result.overallAssessment?.summary?.slice(0, 80) || data.caseText.slice(0, 80);
+        await recordInDebate(() => recordResult('attack', { title, input: data, output: result, debateId, side: 'neutral' }));
+      }
       toast({ title: t('attack.complete', 'Attack analysis complete'), description: t('attack.completeDesc', 'The critique is ready.'), variant: 'success' });
     } catch (error) {
       console.error('Failed to attack case:', error);
@@ -116,6 +125,7 @@ export default function AttackPage() {
             <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('nav.attack')}</h1>
           </div>
         </AnimatedSection>
+        <CurrentDebateStrip hidden={Boolean(workspace.context)} />
 
         <div className="grid gap-8 lg:grid-cols-[400px_1fr]">
           {/* Form */}
diff --git a/src/pages/BrainstormPage.tsx b/src/pages/BrainstormPage.tsx
index 1a245b89d..5a5feb756 100644
--- a/src/pages/BrainstormPage.tsx
+++ b/src/pages/BrainstormPage.tsx
@@ -15,10 +15,14 @@ import { useToast } from '@/hooks/use-toast';
 import { StreamingIndicator } from '@/components/ui/streaming-indicator';
 import { AnimatedSection } from '@/components/ui/animated-section';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
+import { recordInDebate } from '@/lib/debate/record';
+import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
+import { useDebateMotionGate } from '@/components/features/debate/DebateMotionGate';
 
 export default function BrainstormPage() {
   const workspace = useWorkspaceToolScope('brainstorm');
-  const { brainstormResult, brainstormLoading, setBrainstormResult, setBrainstormLoading, addAskMessage, setAskLoading, askMessages } = useSessionStore();
+  const { brainstormResult, brainstormLoading, brainstormForm, setBrainstormResult, setBrainstormLoading, addAskMessage, setAskLoading, askMessages, recordResult } = useSessionStore();
+  const debateGate = useDebateMotionGate({ disabled: Boolean(workspace.context) });
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('brainstorm');
   const askConfig = getFeatureConfig('ask');
@@ -28,13 +32,19 @@ export default function BrainstormPage() {
   const [discoveredSources, setDiscoveredSources] = useState<DiscoveredSource[]>([]);
   const { t } = useTranslation();
 
-  const handleSubmit = async (data: BrainstormInput) => {
+  const handleSubmit = (data: BrainstormInput) => debateGate.run(data.motion, (target) => void submitBrainstorm(data, target.debateId));
+
+  const submitBrainstorm = async (data: BrainstormInput, debateId: string | null) => {
+    const target = { debateId };
     setBrainstormLoading(true);
     try {
-      const { result, discoveredSources } = await brainstorm(data, config, workspace.context ?? undefined);
+      const { result, discoveredSources } = await brainstorm(data, config, workspace.context ?? undefined, workspace.context ? undefined : target.debateId);
       setDiscoveredSources(discoveredSources);
       setBrainstormResult(result);
       await workspace.attach(data, result);
+      if (target.debateId) {
+        await recordInDebate(() => recordResult('brainstorm', { title: data.motion, input: data, output: result, debateId: target.debateId, side: data.side }));
+      }
       toast({ title: t('brainstorm.complete', 'Brainstorm complete'), description: t('brainstorm.completeDesc', 'Your argument angles are ready.'), variant: 'success' });
     } catch (error) {
       console.error('Failed to brainstorm:', error);
@@ -103,11 +113,12 @@ export default function BrainstormPage() {
             <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('nav.brainstorm')}</h1>
           </div>
         </AnimatedSection>
+        <CurrentDebateStrip side={brainstormForm?.side} hidden={Boolean(workspace.context)} />
 
         <div className="grid gap-8 lg:grid-cols-[400px_1fr]">
           {/* Form */}
           <AnimatedSection delay={75} className="lg:sticky lg:top-24 lg:self-start">
-            <BrainstormForm onSubmit={handleSubmit} isLoading={brainstormLoading} />
+            <BrainstormForm onSubmit={handleSubmit} isLoading={brainstormLoading} debatePrefill={!workspace.context} />
           </AnimatedSection>
 
           {/* Results */}
@@ -133,6 +144,7 @@ export default function BrainstormPage() {
         </div>
       </div>
 
+      {debateGate.dialog}
       <LimitReachedModal
         open={subError.limitModalOpen}
         onOpenChange={subError.setLimitModalOpen}
diff --git a/src/pages/CrossfirePage.tsx b/src/pages/CrossfirePage.tsx
index 632539698..bfee54d60 100644
--- a/src/pages/CrossfirePage.tsx
+++ b/src/pages/CrossfirePage.tsx
@@ -52,6 +52,10 @@ import { useSettingsStore } from '@/lib/stores/settings-store';
 import { useAuth } from '@/lib/supabase/AuthProvider';
 import { cn } from '@/lib/utils';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
+import { CurrentDebateStrip, useDebateMotionPrefill } from '@/components/features/debate/CurrentDebateStrip';
+import { useDebateMotionGate } from '@/components/features/debate/DebateMotionGate';
+import { activeDebateId, sameMotion, selectCurrentDebate, useDebateStore } from '@/lib/stores/debate-store';
+import { toast } from '@/hooks/use-toast';
 import { saveWorkspaceArtifact } from '@/lib/workspace/practice-client';
 
 const SESSION_ID_PREFIX = 'crossfire';
@@ -282,7 +286,26 @@ export default function CrossfirePage() {
   const artifactRequestIdRef = useRef(workspace.context?.requestId ?? crypto.randomUUID());
   const signalRequestsRef = useRef(new Set<AbortController>());
   const shouldReduceMotion = useReducedMotion();
-  const activeSourceCount = useSessionStore((session) => session.sourceLibrary.filter((source) => source.isActive).length);
+  const sourceDebateId = useDebateStore((debates) => debates.oneOff ? null : debates.currentDebateId);
+  const activeSourceCount = useSessionStore((session) => sourceDebateId
+    ? session.sourceLibrary.filter((source) => source.isActive && source.debateId === sourceDebateId).length
+    : 0);
+  const recordResult = useSessionStore((session) => session.recordResult);
+  const debateGate = useDebateMotionGate({ disabled: Boolean(workspace.context) });
+  // Debate chosen when the round started; undefined after a reload.
+  const debateTargetRef = useRef<string | null | undefined>(undefined);
+  // After a reload, a restored round belongs to the Current Debate only when the
+  // motions match; otherwise it runs one-off so another debate's sources stay out.
+  const roundDebateId = useCallback((resolution: string): string | null => {
+    if (debateTargetRef.current !== undefined) return debateTargetRef.current;
+    const current = selectCurrentDebate(useDebateStore.getState());
+    return sameMotion(current?.motion, resolution) ? activeDebateId() : null;
+  }, []);
+  useDebateMotionPrefill(
+    () => state.phase === 'setup' ? state.config.resolution : undefined,
+    (resolution) => dispatch({ type: 'config-patched', patch: { resolution } }),
+    Boolean(workspace.context) || state.phase !== 'setup',
+  );
   const { getFeatureConfig } = useSettingsStore();
   const modelConfig = getFeatureConfig('ask');
 
@@ -327,6 +350,23 @@ export default function CrossfirePage() {
     });
   }, [state, workspace.context]);
 
+  // A round that finishes on this page is recorded in its debate once.
+  const recordedPhaseRef = useRef(state.phase);
+  useEffect(() => {
+    const finishedHere = recordedPhaseRef.current === 'debriefing' && state.phase === 'complete';
+    recordedPhaseRef.current = state.phase;
+    if (!finishedHere || state.phase !== 'complete' || workspace.context) return;
+    const debateId = roundDebateId(state.config.resolution);
+    if (!debateId) return;
+    void recordResult('crossfire', {
+      title: state.config.resolution,
+      input: state.config,
+      output: { turns: state.turns, debrief: state.debrief, endedReason: state.endedReason },
+      debateId,
+      side: 'neutral',
+    }).catch(() => toast({ title: t('debate.recordFailed', 'Could not save this result to the debate'), variant: 'destructive' }));
+  }, [recordResult, roundDebateId, state, t, workspace.context]);
+
   useEffect(() => {
     if (state.phase !== 'active') return;
     setNow(Date.now());
@@ -347,7 +387,7 @@ export default function CrossfirePage() {
         config: snapshot.config,
         transcript: snapshot.turns,
         expectedReply,
-      }, modelConfig, { signal: controller.signal, workspaceContext: workspace.context ?? undefined });
+      }, modelConfig, { signal: controller.signal, workspaceContext: workspace.context ?? undefined, debateId: workspace.context ? undefined : roundDebateId(snapshot.config.resolution) });
       if (controller.signal.aborted) return;
       if (!('type' in result)) {
         dispatch({
@@ -383,7 +423,7 @@ export default function CrossfirePage() {
       const classified = classifyError(error);
       dispatch({ type: 'request-failed', expectedReply, errorKind: classified.kind, message: classified.message });
     }
-  }, [modelConfig, workspace.context]);
+  }, [modelConfig, roundDebateId, workspace.context]);
 
   const runDebrief = useCallback(async (snapshot: Extract<CrossfireState, { phase: 'debriefing' }>) => {
     requestRef.current?.abort();
@@ -394,7 +434,7 @@ export default function CrossfirePage() {
         operation: 'debrief',
         config: snapshot.config,
         transcript: snapshot.turns,
-      }, modelConfig, { signal: controller.signal, workspaceContext: workspace.context ?? undefined });
+      }, modelConfig, { signal: controller.signal, workspaceContext: workspace.context ?? undefined, debateId: workspace.context ? undefined : roundDebateId(snapshot.config.resolution) });
       if (controller.signal.aborted) return;
       if ('type' in result) {
         dispatch({
@@ -410,7 +450,7 @@ export default function CrossfirePage() {
       const classified = classifyError(error);
       dispatch({ type: 'debrief-failed', errorKind: classified.kind, message: classified.message });
     }
-  }, [modelConfig, workspace.context]);
+  }, [modelConfig, roundDebateId, workspace.context]);
 
   const endSession = useCallback((reason: 'manual' | 'timer') => {
     if (state.phase !== 'active') return;
@@ -444,6 +484,12 @@ export default function CrossfirePage() {
       return;
     }
     setFormError('');
+    debateGate.run(parsed.data.resolution, (target) => beginSession(target.debateId));
+  };
+
+  const beginSession = (debateId: string | null) => {
+    if (state.phase !== 'setup') return;
+    debateTargetRef.current = debateId;
     artifactRequestIdRef.current = crypto.randomUUID();
     const action = {
       type: 'session-started' as const,
@@ -519,6 +565,8 @@ export default function CrossfirePage() {
             </div>
             <h1 className="text-3xl font-bold tracking-tight">{t('crossfire.title')}</h1>
           </header>
+          <CurrentDebateStrip hidden={Boolean(workspace.context)} />
+          {debateGate.dialog}
 
           {(formError || storageError) && (
             <Alert variant="destructive">
diff --git a/src/pages/CurrentDebatePage.tsx b/src/pages/CurrentDebatePage.tsx
new file mode 100644
index 000000000..4679f5f8f
--- /dev/null
+++ b/src/pages/CurrentDebatePage.tsx
@@ -0,0 +1,210 @@
+import { useState } from 'react';
+import { Link } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+import {
+  ArrowRight,
+  BookOpen,
+  Crosshair,
+  Database,
+  Dumbbell,
+  GitBranch,
+  Lightbulb,
+  MessageCircle,
+  Pencil,
+  Sparkles,
+  Swords,
+  type LucideIcon,
+} from 'lucide-react';
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { EmptyState } from '@/components/ui/empty-state';
+import { DebateForm } from '@/components/features/debate/DebateForm';
+import { sideLabelKey } from '@/components/features/debate/CurrentDebateStrip';
+import { useAllDebateItems, useOpenDebateItem, type DebateItem } from '@/components/features/debate/debate-items';
+import { useToast } from '@/hooks/use-toast';
+import { formatEuropeanDateTime, formatRelativeDate } from '@/lib/date-format';
+import { useCurrentDebate, useDebateStore } from '@/lib/stores/debate-store';
+import { useSessionStore } from '@/lib/stores/session-store';
+
+const TOOLS: Array<{ key: string; href: string; icon: LucideIcon }> = [
+  { key: 'generate', href: '/app/generate', icon: Sparkles },
+  { key: 'brainstorm', href: '/app/brainstorm', icon: Lightbulb },
+  { key: 'factoids', href: '/app/factoids', icon: BookOpen },
+  { key: 'flowchart', href: '/app/flowchart', icon: GitBranch },
+  { key: 'attack', href: '/app/attack', icon: Swords },
+  { key: 'ask', href: '/app/ask', icon: MessageCircle },
+  { key: 'crossfire', href: '/app/crossfire', icon: Crosshair },
+  { key: 'sparring', href: '/app/sparring', icon: Dumbbell },
+];
+
+function ItemRow({ item }: { item: DebateItem }) {
+  const { t } = useTranslation();
+  const openItem = useOpenDebateItem();
+  const canOpen = item.kind !== 'crossfire';
+  return (
+    <li className="flex items-center justify-between gap-3 border-b border-border/60 py-2 last:border-b-0">
+      <div className="min-w-0">
+        <p className="truncate text-sm font-medium">{item.title}</p>
+        <p className="text-xs text-muted-foreground">
+          {t(`debate.kinds.${item.kind}`)} · {formatEuropeanDateTime(item.createdAt)}
+        </p>
+      </div>
+      {canOpen && (
+        <Button variant="ghost" size="sm" onClick={() => openItem(item)} aria-label={t('debate.openItemAria', { title: item.title, defaultValue: 'Open {{title}}' })}>
+          {t('historyPage.load', 'Load')}
+        </Button>
+      )}
+    </li>
+  );
+}
+
+function SideSection({ side, items }: { side: 'pro' | 'con'; items: DebateItem[] }) {
+  const { t } = useTranslation();
+  const relevant = items.filter((item) => item.side === side || item.side === 'both');
+  return (
+    <Card className="h-full border-border/70 bg-card/60" data-testid={`debate-side-${side}`}>
+      <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+        <CardTitle className="text-lg">{t(sideLabelKey(side))}</CardTitle>
+        <Badge variant="secondary">{t('debate.itemCount', { count: relevant.length, defaultValue: '{{count}} items' })}</Badge>
+      </CardHeader>
+      <CardContent>
+        {relevant.length === 0
+          ? <p className="text-sm text-muted-foreground">{t('debate.sideEmpty', 'No work for this side yet.')}</p>
+          : <ul>{relevant.slice(0, 4).map((item) => <ItemRow key={`${item.kind}-${item.id}`} item={item} />)}</ul>}
+      </CardContent>
+    </Card>
+  );
+}
+
+export default function CurrentDebatePage() {
+  const { t } = useTranslation();
+  const { toast } = useToast();
+  const debate = useCurrentDebate();
+  const openDialog = useDebateStore((state) => state.openDialog);
+  const updateDebate = useDebateStore((state) => state.updateDebate);
+  const sources = useSessionStore((state) => state.sourceLibrary);
+  const allItems = useAllDebateItems();
+  const [editing, setEditing] = useState(false);
+
+  if (!debate) {
+    return (
+      <div className="container px-4 py-8">
+        <div className="mx-auto max-w-3xl">
+          <EmptyState
+            icon={Sparkles}
+            title={t('debate.noCurrentTitle', 'No current debate')}
+            description={t('debate.noCurrentDesc', 'Start a debate to keep one motion, its sources, and your results together.')}
+            actionLabel={t('debate.startDebate', 'Start debate')}
+            onAction={() => openDialog('create')}
+          />
+        </div>
+      </div>
+    );
+  }
+
+  const items = allItems.filter((item) => item.debateId === debate.id);
+  const debateSources = sources.filter((source) => source.debateId === debate.id);
+
+  return (
+    <div className="container px-4 py-8">
+      <div className="mx-auto max-w-5xl space-y-6">
+        <header className="space-y-3">
+          <p className="text-sm font-medium text-muted-foreground">{t('nav.currentDebate', 'Current debate')}</p>
+          <h1 className="break-words text-3xl font-bold tracking-tight text-foreground" data-testid="current-debate-motion">{debate.motion}</h1>
+          <p className="text-sm text-muted-foreground">
+            {t('debate.lastActivity', { when: formatRelativeDate(debate.lastActivityAt), defaultValue: 'Last activity {{when}}' })}
+            {' · '}
+            {t('debate.counts', { sources: debateSources.length, outputs: items.length, defaultValue: '{{sources}} sources · {{outputs}} outputs' })}
+          </p>
+          <div className="flex flex-wrap gap-2">
+            <Button variant="outline" size="sm" onClick={() => setEditing((value) => !value)}>
+              <Pencil className="mr-1 h-4 w-4" aria-hidden="true" />{t('debate.editSettings', 'Edit settings')}
+            </Button>
+            <Button variant="outline" size="sm" onClick={() => openDialog('switch')}>{t('debate.switch', 'Switch debate')}</Button>
+            <Button variant="outline" size="sm" onClick={() => openDialog('create')}>{t('debate.startNew', 'Start new debate')}</Button>
+          </div>
+        </header>
+
+        {editing ? (
+          <Card>
+            <CardContent className="pt-6">
+              <DebateForm
+                idPrefix="edit-debate"
+                initial={debate}
+                submitLabel={t('common.save', 'Save')}
+                onCancel={() => setEditing(false)}
+                onSubmit={async (values) => {
+                  await updateDebate(debate.id, values);
+                  setEditing(false);
+                  toast({ title: t('debate.settingsSaved', 'Debate settings saved') });
+                }}
+              />
+            </CardContent>
+          </Card>
+        ) : (debate.instructions || debate.settings.format) && (
+          <Card className="border-border/70 bg-card/60">
+            <CardContent className="space-y-2 pt-6 text-sm">
+              {debate.settings.format && (
+                <p><span className="text-muted-foreground">{t('debate.format', 'Format')}: </span>{t(`debate.formats.${debate.settings.format}`, debate.settings.format)}</p>
+              )}
+              {debate.instructions && <p className="whitespace-pre-wrap break-words">{debate.instructions}</p>}
+            </CardContent>
+          </Card>
+        )}
+
+        <div className="grid gap-6 md:grid-cols-2">
+          <SideSection side="pro" items={items} />
+          <SideSection side="con" items={items} />
+        </div>
+
+        <div className="grid gap-6 md:grid-cols-2">
+          <Card className="border-border/70 bg-card/60" data-testid="debate-sources">
+            <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+              <CardTitle className="text-lg">{t('debate.sources', 'Sources')}</CardTitle>
+              <Button asChild variant="ghost" size="sm">
+                <Link to="/app/library"><Database className="mr-1 h-4 w-4" aria-hidden="true" />{t('nav.library', 'Library')}</Link>
+              </Button>
+            </CardHeader>
+            <CardContent>
+              {debateSources.length === 0
+                ? <p className="text-sm text-muted-foreground">{t('debate.noSources', 'No sources in this debate yet.')}</p>
+                : (
+                  <ul className="space-y-1 text-sm">
+                    {debateSources.slice(0, 6).map((source) => <li key={source.id} className="truncate">{source.title}</li>)}
+                  </ul>
+                )}
+            </CardContent>
+          </Card>
+          <Card className="border-border/70 bg-card/60" data-testid="debate-recent">
+            <CardHeader className="pb-2">
+              <CardTitle className="text-lg">{t('debate.recentWork', 'Recent work')}</CardTitle>
+            </CardHeader>
+            <CardContent>
+              {items.length === 0
+                ? <p className="text-sm text-muted-foreground">{t('debate.noWork', 'Results from any tool appear here automatically.')}</p>
+                : <ul>{items.slice(0, 6).map((item) => <ItemRow key={`${item.kind}-${item.id}`} item={item} />)}</ul>}
+            </CardContent>
+          </Card>
+        </div>
+
+        <section aria-labelledby="debate-tools-title">
+          <h2 id="debate-tools-title" className="mb-3 text-lg font-semibold tracking-tight">{t('debate.tools', 'Prepare and practice')}</h2>
+          <div className="grid gap-2 sm:grid-cols-2 lg:grid-cols-4">
+            {TOOLS.map((tool) => (
+              <Link
+                key={tool.key}
+                to={tool.href}
+                className="motion-press group flex items-center gap-2 rounded-md border border-border bg-card px-3 py-2.5 text-sm font-medium hover:border-primary/40 hover:bg-accent focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+              >
+                <tool.icon className="h-4 w-4 text-primary" aria-hidden="true" />
+                <span className="flex-1">{t(`nav.${tool.key}`)}</span>
+                <ArrowRight className="h-4 w-4 text-muted-foreground" aria-hidden="true" />
+              </Link>
+            ))}
+          </div>
+        </section>
+      </div>
+    </div>
+  );
+}
diff --git a/src/pages/FactoidsPage.tsx b/src/pages/FactoidsPage.tsx
index 9e2ab0ca8..62e3ecef2 100644
--- a/src/pages/FactoidsPage.tsx
+++ b/src/pages/FactoidsPage.tsx
@@ -14,10 +14,14 @@ import { useToast } from '@/hooks/use-toast';
 import { StreamingIndicator } from '@/components/ui/streaming-indicator';
 import { AnimatedSection } from '@/components/ui/animated-section';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
+import { recordInDebate } from '@/lib/debate/record';
+import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
+import { activeDebateId } from '@/lib/stores/debate-store';
+import { DebateRequiredError } from '@/lib/stores/session-store';
 
 export default function FactoidsPage() {
   const workspace = useWorkspaceToolScope('factoids');
-  const { factoidsResult, factoidsLoading, factoidsForm, setFactoidsResult, setFactoidsLoading, addAskMessage, setAskLoading, askMessages, addSource, setFactoidsForm } = useSessionStore();
+  const { factoidsResult, factoidsLoading, factoidsForm, setFactoidsResult, setFactoidsLoading, addAskMessage, setAskLoading, askMessages, addSource, setFactoidsForm, recordResult } = useSessionStore();
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('factoids');
   const askConfig = getFeatureConfig('ask');
@@ -30,11 +34,16 @@ export default function FactoidsPage() {
   const handleSubmit = async (data: FactoidsInput) => {
     setDiscoveredSources([]);
     setFactoidsLoading(true);
+    // Factoids research a claim, not the motion, so it follows the Current Debate directly.
+    const debateId = workspace.context ? null : activeDebateId();
     try {
-      const { result, discoveredSources: sources } = await factoids(data, config, workspace.context ?? undefined);
+      const { result, discoveredSources: sources } = await factoids(data, config, workspace.context ?? undefined, workspace.context ? undefined : debateId);
       setDiscoveredSources(sources);
       setFactoidsResult(result);
       await workspace.attach(data, result);
+      if (debateId) {
+        await recordInDebate(() => recordResult('factoids', { title: data.claim, input: data, output: result, debateId, side: 'neutral' }));
+      }
       toast({ title: t('factoids.complete', 'Research complete'), description: t('factoids.completeDesc', 'Verified evidence is ready.'), variant: 'success' });
     } catch (error) {
       console.error('Failed to find factoids:', error);
@@ -67,8 +76,12 @@ export default function FactoidsPage() {
     try {
       await addSource({ title, content, type: 'url', origin: url, folder: 'Factoids' });
       toast({ title: t('factoids.savedToLibrary'), description: t('factoids.savedToLibraryDesc') });
-    } catch {
-      toast({ title: t('common.error', 'Error'), description: t('factoids.saveFailed', 'Could not save source.'), variant: 'destructive' });
+    } catch (error) {
+      toast({
+        title: t('common.error', 'Error'),
+        description: error instanceof DebateRequiredError ? t('debate.sourceNeedsDebate', 'Start or select a debate before saving sources.') : t('factoids.saveFailed', 'Could not save source.'),
+        variant: 'destructive',
+      });
     }
   };
 
@@ -118,6 +131,7 @@ export default function FactoidsPage() {
             <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('nav.factoids')}</h1>
           </div>
         </AnimatedSection>
+        <CurrentDebateStrip hidden={Boolean(workspace.context)} />
 
         <div className="grid gap-8 lg:grid-cols-[400px_1fr]">
           {/* Form */}
diff --git a/src/pages/FlowchartPage.tsx b/src/pages/FlowchartPage.tsx
index b498113a6..d93b02da4 100644
--- a/src/pages/FlowchartPage.tsx
+++ b/src/pages/FlowchartPage.tsx
@@ -68,6 +68,8 @@ import { toPng } from 'html-to-image';
 import { formatRelativeDate } from '@/lib/date-format';
 import { toast } from 'sonner';
 import type { TFunction } from 'i18next';
+import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
+import { useDebateStore } from '@/lib/stores/debate-store';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
 
 // Custom node types
@@ -208,9 +210,12 @@ export default function FlowchartPage() {
         pendingFlowchartData,
         setPendingFlowchartData,
         saveFlowchart,
-        savedFlowcharts,
+        savedFlowcharts: allSavedFlowcharts,
         deleteSavedFlowchart
     } = useSessionStore();
+    // Saved flowcharts follow the Current Debate; one-off mode shows one-off flowcharts.
+    const flowchartScope = useDebateStore((state) => state.oneOff ? null : state.currentDebateId);
+    const savedFlowcharts = allSavedFlowcharts.filter((item) => (item.debateId ?? null) === flowchartScope);
 
     const [nodes, setNodes, onNodesChange] = useNodesState(createInitialNodes(t));
     const [edges, setEdges, onEdgesChange] = useEdgesState(initialEdges);
@@ -303,7 +308,7 @@ export default function FlowchartPage() {
         if (!saveTitle.trim()) return;
 
         try {
-            await saveFlowchart(saveTitle, { nodes, edges });
+            await saveFlowchart(saveTitle, { nodes, edges }, workspace.context ? null : undefined);
             await workspace.attach({ title: saveTitle }, { nodes, edges });
             setIsSaveDialogOpen(false);
             setSaveTitle('');
@@ -632,6 +637,7 @@ export default function FlowchartPage() {
                             </Button>
                         </div>
                     </div>
+                    <CurrentDebateStrip hidden={Boolean(workspace.context)} className="mt-3" />
                 </CardHeader>
                 <CardContent className="p-0">
                     {/* Stats Bar */}
diff --git a/src/pages/GeneratePage.tsx b/src/pages/GeneratePage.tsx
index 55c460373..fdf6e0040 100644
--- a/src/pages/GeneratePage.tsx
+++ b/src/pages/GeneratePage.tsx
@@ -25,10 +25,19 @@ import { prefillFromGenerate } from '@/lib/crossfire/prefill';
 import { useReducedMotion } from 'framer-motion';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
 import { workspaceRouteState } from '@/lib/workspace/tool-context';
+import { activeDebateId, sameMotion, selectCurrentDebate, useDebateStore } from '@/lib/stores/debate-store';
+import { recordInDebate } from '@/lib/debate/record';
+import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
+import { useDebateMotionGate } from '@/components/features/debate/DebateMotionGate';
 
 export default function GeneratePage() {
   const workspace = useWorkspaceToolScope('generate');
-  const { generateResult, generateLoading, generateForm, setGenerateResult, setGenerateLoading, saveCurrentCase, addAskMessage, setAskLoading, askMessages, setPendingFlowchartData, autosavedCases } = useSessionStore();
+  const { generateResult, generateLoading, generateForm, setGenerateResult, setGenerateLoading, saveCurrentCase, addAskMessage, setAskLoading, askMessages, setPendingFlowchartData, autosavedCases, recordResult, updateRecordedResult } = useSessionStore();
+  const debateGate = useDebateMotionGate({ disabled: Boolean(workspace.context) });
+  // The debate row this page's current result was recorded into, if any.
+  const [recordedCaseId, setRecordedCaseId] = useState<string | null>(null);
+  // Debate the current result belongs to (null for one-off); undefined after a reload.
+  const [resultDebateId, setResultDebateId] = useState<string | null | undefined>(undefined);
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('generate');
   const askConfig = getFeatureConfig('ask');
@@ -64,10 +73,13 @@ export default function GeneratePage() {
     }
   };
 
-  const handleSubmit = async (data: GenerateInput) => {
+  const handleSubmit = (data: GenerateInput) => debateGate.run(data.motion, (target) => void submitGenerate(data, target.debateId));
+
+  const submitGenerate = async (data: GenerateInput, debateId: string | null) => {
+    const target = { debateId };
     setGenerateLoading(true);
     try {
-      const { result, discoveredSources: sources } = await generateCase(data, config, workspace.context ?? undefined);
+      const { result, discoveredSources: sources } = await generateCase(data, config, workspace.context ?? undefined, workspace.context ? undefined : target.debateId);
       // Always stamp with real local time and motion
       if (result.metadata) {
         result.metadata.generatedAt = new Date().toISOString();
@@ -75,7 +87,12 @@ export default function GeneratePage() {
       }
       setDiscoveredSources(sources);
       setGenerateResult(result);
+      setRecordedCaseId(null);
+      setResultDebateId(target.debateId);
       await workspace.attach(data, result);
+      if (target.debateId) {
+        setRecordedCaseId(await recordInDebate(() => recordResult('case', { title: data.motion, input: data, output: result, debateId: target.debateId, side: data.side })));
+      }
       setSuccessfulGenerationSequence((sequence) => sequence + 1);
       toast({ title: t('generate.complete', 'Generate complete'), description: t('generate.completeDesc', 'Your debate case is ready.'), variant: 'success' });
     } catch (error) {
@@ -114,8 +131,13 @@ export default function GeneratePage() {
       tone: generateForm.tone || 'formal',
     };
 
+    // Regenerate against the result's own debate, never whichever is current now.
+    const current = selectCurrentDebate(useDebateStore.getState());
+    const debateId = resultDebateId !== undefined
+      ? resultDebateId
+      : sameMotion(current?.motion, data.motion) ? activeDebateId() : null;
     setGenerateLoading(true);
-    void generateCase(data, config, workspace.context ?? undefined)
+    void generateCase(data, config, workspace.context ?? undefined, workspace.context ? undefined : debateId)
       .then(async ({ result: next, discoveredSources: sources }) => {
         const regenerated = {
           ...generateResult,
@@ -129,6 +151,7 @@ export default function GeneratePage() {
         setGenerateResult(regenerated);
         setDiscoveredSources(sources);
         await workspace.attach({ ...data, regeneratedSection: section }, regenerated);
+        if (recordedCaseId) await updateRecordedResult('case', recordedCaseId, regenerated);
         toast({ title: t('generate.regenerated', 'Section regenerated'), description: t('generate.regeneratedDesc', 'The selected section has been refreshed.'), variant: 'success' });
       })
       .catch((error) => {
@@ -342,11 +365,12 @@ export default function GeneratePage() {
             <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('nav.generate')}</h1>
           </div>
         </AnimatedSection>
+        <CurrentDebateStrip side={generateForm?.side} hidden={Boolean(workspace.context)} />
 
         <div className="grid gap-8 grid-cols-1 lg:grid-cols-[440px_1fr]">
           {/* Form */}
           <AnimatedSection delay={75} className="lg:sticky lg:top-24 lg:self-start">
-            <GenerateForm onSubmit={handleSubmit} isLoading={generateLoading} />
+            <GenerateForm onSubmit={handleSubmit} isLoading={generateLoading} debatePrefill={!workspace.context} />
           </AnimatedSection>
 
           {/* Results */}
@@ -362,7 +386,7 @@ export default function GeneratePage() {
                   discoveredSources={discoveredSources}
                   onRegenerateSection={handleRegenerateSection}
                   onDiscuss={handleDiscuss}
-                  onSave={handleSave}
+                  onSave={recordedCaseId ? undefined : handleSave}
                   onUndo={handleUndo}
                   onImportFlowchart={handleImportFlowchart}
                   onPracticeCrossfire={handlePracticeCrossfire}
@@ -382,6 +406,7 @@ export default function GeneratePage() {
       </div>
     </div>
 
+    {debateGate.dialog}
     <LimitReachedModal
       open={subError.limitModalOpen}
       onOpenChange={subError.setLimitModalOpen}
diff --git a/src/pages/HistoryPage.tsx b/src/pages/HistoryPage.tsx
index fec68d59a..d1638566a 100644
--- a/src/pages/HistoryPage.tsx
+++ b/src/pages/HistoryPage.tsx
@@ -22,12 +22,31 @@ import {
 } from '@/components/ui/alert-dialog';
 import { EmptyState } from '@/components/ui/empty-state';
 import { useSparringStore } from '@/lib/stores/sparring-store';
+import { useDebateStore } from '@/lib/stores/debate-store';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { UnsortedWork } from '@/components/features/debate/UnsortedWork';
+
+/** History scope value for work that belongs to no debate. */
+const OUTSIDE_DEBATES = 'outside';
 
 export default function HistoryPage() {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const store = useSessionStore();
-  const sparringSessions = useSparringStore((state) => state.savedSessions);
+  const debates = useDebateStore((state) => state.debates);
+  const currentDebateId = useDebateStore((state) => state.currentDebateId);
+  // History defaults to the Current Debate; other debates and one-off work stay reachable.
+  const [scopeChoice, setScopeChoice] = useState<string | null>(null);
+  const scope = scopeChoice && (scopeChoice === OUTSIDE_DEBATES || debates.some((debate) => debate.id === scopeChoice))
+    ? scopeChoice
+    : currentDebateId ?? OUTSIDE_DEBATES;
+  const inScope = <T extends { debateId?: string | null }>(items: T[]) => items.filter((item) => item.debateId === scope);
+  const savedCases = inScope(store.savedCases);
+  const savedChats = inScope(store.savedChats);
+  const savedAttacks = inScope(store.savedAttacks);
+  const savedBrainstorms = inScope(store.savedBrainstorms);
+  const savedFactoids = inScope(store.savedFactoids);
+  const sparringSessions = inScope(useSparringStore((state) => state.savedSessions));
   const hydrateSparringSessions = useSparringStore((state) => state.hydrateSavedSessions);
   const loadSparringSession = useSparringStore((state) => state.loadSavedSession);
   const deleteSparringSession = useSparringStore((state) => state.deleteSavedSession);
@@ -96,10 +115,24 @@ export default function HistoryPage() {
   return (
     <div className="container py-8 px-4">
       <div className="max-w-5xl mx-auto">
-        <div className="mb-8">
+        <div className="mb-8 space-y-4">
           <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('historyPage.title')}</h1>
+          <Select value={scope} onValueChange={setScopeChoice}>
+            <SelectTrigger className="w-full sm:max-w-xl" aria-label={t('debate.historyScope', 'Show work from')}>
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {debates.map((debate) => (
+                <SelectItem key={debate.id} value={debate.id}>
+                  {debate.id === currentDebateId ? `${t('nav.currentDebate', 'Current debate')}: ` : ''}{debate.motion}
+                </SelectItem>
+              ))}
+              <SelectItem value={OUTSIDE_DEBATES}>{t('debate.outsideDebates', 'One-off and unsorted work')}</SelectItem>
+            </SelectContent>
+          </Select>
         </div>
 
+        {scope === OUTSIDE_DEBATES ? <UnsortedWork /> : (
         <Tabs defaultValue="cases" className="space-y-6">
           <TabsList className="w-full justify-start overflow-x-auto">
             <TabsTrigger value="cases" className="gap-2"><FileText className="h-4 w-4" /> {t('historyPage.tabCases')}</TabsTrigger>
@@ -116,30 +149,12 @@ export default function HistoryPage() {
                 <CardTitle>{t('historyPage.casesTitle')}</CardTitle>
               </CardHeader>
               <CardContent>
-                {(store.autosavedCases?.length ?? 0) > 0 && (
-                  <div className="mb-6">
-                    <p className="text-xs font-medium uppercase tracking-wider text-muted-foreground mb-3">{t('historyPage.autosaved', 'Autosaved')}</p>
-                    <div className="space-y-3">
-                      {(store.autosavedCases || []).map((item) => (
-                        <div key={item.id} className="flex items-center justify-between p-3 border border-dashed rounded-lg bg-muted/30">
-                          <div className="space-y-1">
-                            <h4 className="font-medium text-sm">{item.title}</h4>
-                            <span className="text-xs text-muted-foreground">{formatEuropeanDateTime(item.createdAt)}</span>
-                          </div>
-                          <Button variant="ghost" size="sm" onClick={() => { store.setGenerateResult(item.data); navigate('/app/generate'); }}>
-                            <Eye className="h-4 w-4 mr-1" /> {t('historyPage.load')}
-                          </Button>
-                        </div>
-                      ))}
-                    </div>
-                  </div>
-                )}
-                {store.savedCases.length === 0 && (store.autosavedCases?.length ?? 0) === 0 ? (
+                {savedCases.length === 0 ? (
                   <EmptyState icon={FileText} title={t('historyPage.emptyCases')} description={t('historyPage.emptyCasesDesc', 'Generated cases you save will appear here.')} actionLabel={t('historyPage.createCase', 'Create a case')} onAction={() => navigate('/app/generate')} />
                 ) : (
                   <ScrollArea className="h-[500px] pr-4">
                     <div className="space-y-4 stagger-enter">
-                      {store.savedCases.map((item) => (
+                      {savedCases.map((item) => (
                         <div key={item.id} className="flex items-center justify-between p-4 border rounded-lg bg-card hover:bg-accent/5 transition-colors motion-list-item">
                           <div className="space-y-1">
                             <h4 className="font-semibold">{item.title}</h4>
@@ -171,11 +186,11 @@ export default function HistoryPage() {
                 <CardTitle>{t('historyPage.chatsTitle')}</CardTitle>
               </CardHeader>
               <CardContent>
-                {store.savedChats.length === 0 ? (
+                {savedChats.length === 0 ? (
                   <EmptyState icon={MessageCircle} title={t('historyPage.emptyChats')} description={t('historyPage.emptyChatsDesc', 'Saved coaching chats will appear here.')} actionLabel={t('historyPage.startChat', 'Start a chat')} onAction={() => navigate('/app/ask')} />
                 ) : (
                   <div className="space-y-4">
-                    {store.savedChats.map((item) => (
+                    {savedChats.map((item) => (
                       <div key={item.id} className="flex items-center justify-between p-4 border rounded-lg bg-card hover:bg-accent/5">
                         <div className="space-y-1">
                           <h4 className="font-semibold">{item.title}</h4>
@@ -198,12 +213,12 @@ export default function HistoryPage() {
                 <CardTitle>{t('historyPage.attacksTitle')}</CardTitle>
               </CardHeader>
               <CardContent>
-                {store.savedAttacks.length === 0 ? (
+                {savedAttacks.length === 0 ? (
                   <EmptyState icon={Zap} title={t('historyPage.emptyAttacks')} description={t('historyPage.emptyAttacksDesc', 'Saved attack analyses will appear here.')} actionLabel={t('historyPage.attackCase', 'Attack a case')} onAction={() => navigate('/app/attack')} />
                 ) : (
                   <ScrollArea className="h-[500px] pr-4">
                     <div className="space-y-4">
-                      {store.savedAttacks.map((item) => (
+                      {savedAttacks.map((item) => (
                         <div key={item.id} className="flex items-center justify-between p-4 border rounded-lg bg-card hover:bg-accent/5 transition-colors">
                           <div className="space-y-1">
                             <h4 className="font-semibold">{item.title}</h4>
@@ -228,12 +243,12 @@ export default function HistoryPage() {
                 <CardTitle>{t('historyPage.brainstormsTitle')}</CardTitle>
               </CardHeader>
               <CardContent>
-                {store.savedBrainstorms.length === 0 ? (
+                {savedBrainstorms.length === 0 ? (
                   <EmptyState icon={Brain} title={t('historyPage.emptyBrainstorms')} description={t('historyPage.emptyBrainstormsDesc', 'Saved ideation sessions will appear here.')} actionLabel={t('historyPage.brainstormIdeas', 'Brainstorm ideas')} onAction={() => navigate('/app/brainstorm')} />
                 ) : (
                   <ScrollArea className="h-[500px] pr-4">
                     <div className="space-y-4">
-                      {store.savedBrainstorms.map((item) => (
+                      {savedBrainstorms.map((item) => (
                         <div key={item.id} className="flex items-center justify-between p-4 border rounded-lg bg-card hover:bg-accent/5 transition-colors">
                           <div className="space-y-1">
                             <h4 className="font-semibold">{item.title}</h4>
@@ -258,12 +273,12 @@ export default function HistoryPage() {
                 <CardTitle>{t('historyPage.factoidsTitle')}</CardTitle>
               </CardHeader>
               <CardContent>
-                {store.savedFactoids.length === 0 ? (
+                {savedFactoids.length === 0 ? (
                   <EmptyState icon={BookOpen} title={t('historyPage.emptyFactoids')} description={t('historyPage.emptyFactoidsDesc', 'Saved evidence research will appear here.')} actionLabel={t('historyPage.findEvidence', 'Find evidence')} onAction={() => navigate('/app/factoids')} />
                 ) : (
                   <ScrollArea className="h-[500px] pr-4">
                     <div className="space-y-4">
-                      {store.savedFactoids.map((item) => (
+                      {savedFactoids.map((item) => (
                         <div key={item.id} className="flex items-center justify-between p-4 border rounded-lg bg-card hover:bg-accent/5 transition-colors">
                           <div className="space-y-1">
                             <h4 className="font-semibold">{item.title}</h4>
@@ -333,6 +348,7 @@ export default function HistoryPage() {
             </Card>
           </TabsContent>
         </Tabs>
+        )}
         <AlertDialog open={Boolean(caseToDelete)} onOpenChange={(open) => !open && setCaseToDelete(null)}>
           <AlertDialogContent>
             <AlertDialogHeader>
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index a22ef7743..0cc317a1d 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -17,8 +17,12 @@ import {
 } from 'lucide-react';
 import type { TFunction } from 'i18next';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
 import { useRoutePrefetch } from '@/hooks/use-route-prefetch';
 import { cn } from '@/lib/utils';
+import { formatRelativeDate } from '@/lib/date-format';
+import { useCurrentDebate, useDebateStore } from '@/lib/stores/debate-store';
+import { useDebateCounts } from '@/components/features/debate/CurrentDebateStrip';
 
 type Tool = {
   key: string;
@@ -100,6 +104,47 @@ function ToolGroup({ title, tools, t }: { title: string; tools: readonly Tool[];
   );
 }
 
+function CurrentDebateSummary({ t }: { t: TFunction }) {
+  const debate = useCurrentDebate();
+  const openDialog = useDebateStore((state) => state.openDialog);
+  const oneOff = useDebateStore((state) => state.oneOff);
+  const counts = useDebateCounts(debate?.id);
+
+  if (!debate) {
+    return (
+      <Card className="mb-6 border-dashed border-border bg-card/60" data-testid="home-current-debate">
+        <CardContent className="flex flex-col gap-3 p-5 sm:flex-row sm:items-center sm:justify-between">
+          <div>
+            <p className="font-semibold">{t('debate.noCurrentTitle', 'No current debate')}</p>
+            <p className="text-sm text-muted-foreground">{t('debate.noCurrentDesc', 'Start a debate to keep one motion, its sources, and your results together.')}</p>
+          </div>
+          <Button onClick={() => openDialog('create')}>{t('debate.startDebate', 'Start debate')}</Button>
+        </CardContent>
+      </Card>
+    );
+  }
+
+  return (
+    <Card className="mb-6 border-primary/25 bg-primary/5" data-testid="home-current-debate">
+      <CardContent className="flex flex-col gap-4 p-5 sm:flex-row sm:items-center sm:justify-between">
+        <div className="min-w-0 space-y-1">
+          <p className="text-xs font-medium uppercase tracking-wider text-muted-foreground">{t('nav.currentDebate', 'Current debate')}</p>
+          <p className="break-words text-lg font-semibold leading-snug">{debate.motion}</p>
+          <p className="text-sm text-muted-foreground">
+            {t('debate.lastActivity', { when: formatRelativeDate(debate.lastActivityAt), defaultValue: 'Last activity {{when}}' })}
+            {' · '}
+            {t('debate.counts', { sources: counts.sources, outputs: counts.outputs, defaultValue: '{{sources}} sources · {{outputs}} outputs' })}
+          </p>
+          {oneOff && <p className="text-sm font-medium text-primary">{t('debate.oneOffActive', 'One-off mode is on')}</p>}
+        </div>
+        <Button asChild className="shrink-0">
+          <Link to="/app/debate">{t('debate.open', 'Open debate')}<ArrowRight className="ml-1 h-4 w-4" aria-hidden="true" /></Link>
+        </Button>
+      </CardContent>
+    </Card>
+  );
+}
+
 export default function HomePage() {
   const { t } = useTranslation();
 
@@ -110,6 +155,8 @@ export default function HomePage() {
           <h1 className="text-4xl font-bold tracking-tight text-foreground">{t('home.title')}</h1>
         </div>
 
+        <CurrentDebateSummary t={t} />
+
         <div className="grid gap-6 md:grid-cols-2">
           <ToolGroup title={t('home.prepare', 'Prepare')} tools={prepareTools} t={t} />
           <ToolGroup title={t('home.practice', 'Practice')} tools={practiceTools} t={t} />
diff --git a/src/pages/LibraryPage.tsx b/src/pages/LibraryPage.tsx
index b06ef704d..5389e4b9b 100644
--- a/src/pages/LibraryPage.tsx
+++ b/src/pages/LibraryPage.tsx
@@ -12,6 +12,7 @@ import { Switch } from '@/components/ui/switch';
 import { useToast } from '@/hooks/use-toast';
 import { formatEuropeanDate } from '@/lib/date-format';
 import { importSourceFromUrl } from '@/lib/source-import';
+import { useCurrentDebate, useDebateStore } from '@/lib/stores/debate-store';
 import { importSourceFile, SourceFileImportError } from '@/lib/source-file-import';
 import {
   AlertDialog,
@@ -157,7 +158,7 @@ export default function LibraryPage() {
       ? t('aiClient.autoSavedFolder')
       : folder;
   const {
-    sourceLibrary,
+    sourceLibrary: allSources,
     sourceFolders,
     addSource,
     createSourceFolder,
@@ -170,6 +171,10 @@ export default function LibraryPage() {
     clearLibrary,
   } = useSessionStore();
   const { toast } = useToast();
+  // The Library shows only the Current Debate's sources; switching debates switches the Library.
+  const currentDebate = useCurrentDebate();
+  const openDebateDialog = useDebateStore((state) => state.openDialog);
+  const sourceLibrary = currentDebate ? allSources.filter((source) => source.debateId === currentDebate.id) : [];
 
   const [isAdding, setIsAdding] = useState(false);
   const [isClearing, setIsClearing] = useState(false);
@@ -214,7 +219,8 @@ export default function LibraryPage() {
       toast({ title: t('common.error'), description: t('libraryPage.errorRequired'), variant: "destructive" });
       return;
     }
-    await addSource(newSource);
+    // The Library always shows the Current Debate, even while tools run one-off.
+    await addSource({ ...newSource, debateId: currentDebate?.id ?? null });
     setNewSource({ title: '', content: '', type: 'text', origin: '', folder: newSource.folder });
     setIsAdding(false);
     toast({ title: t('libraryPage.sourceAdded'), description: t('libraryPage.sourceAddedDesc') });
@@ -293,6 +299,7 @@ export default function LibraryPage() {
       type: importPreview.type,
       origin: importPreview.origin,
       folder: newSource.folder,
+      debateId: currentDebate?.id ?? null,
     });
     setImportPreview(null);
     setImportUrl('');
@@ -316,10 +323,18 @@ export default function LibraryPage() {
 
   const activeSourceCount = sourceLibrary.filter(source => source.isActive).length;
   const hasActiveSources = activeSourceCount > 0;
+  // Folder names are account-wide; hide the ones only other debates use, but keep new empty ones.
+  const otherDebateFolders = new Set(allSources.filter((source) => source.debateId !== currentDebate?.id).map((source) => source.folder || 'General'));
+  const thisDebateFolders = sourceLibrary.map(s => s.folder || 'General').filter(Boolean);
   const folders = Array.from(new Set([
-    ...(sourceFolders || ['General']),
-    ...sourceLibrary.map(s => s.folder || 'General').filter(Boolean),
+    ...(sourceFolders || ['General']).filter((folder) => folder === 'General' || !otherDebateFolders.has(folder) || thisDebateFolders.includes(folder)),
+    ...thisDebateFolders,
   ])).sort();
+  const folderKey = folders.join('\n');
+  useEffect(() => {
+    // A folder picked in another debate may not exist here.
+    if (selectedFolder !== 'all' && !folderKey.split('\n').includes(selectedFolder)) setSelectedFolder('all');
+  }, [folderKey, selectedFolder]);
   const visibleSources = sourceLibrary
     .filter((source) => selectedFolder === 'all' || (source.folder || 'General') === selectedFolder)
     .filter((source) => {
@@ -459,9 +474,22 @@ export default function LibraryPage() {
         <div className="mb-6 flex flex-col justify-between gap-4 lg:flex-row lg:items-start">
           <div>
             <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('libraryPage.title')}</h1>
+            {currentDebate ? (
+              <p className="mt-2 text-sm text-muted-foreground" data-testid="library-debate">
+                {t('debate.librarySources', 'Sources for')}{' '}
+                <span className="break-words font-medium text-foreground">{currentDebate.motion}</span>{' '}
+                <Button variant="link" size="sm" className="h-auto p-0" onClick={() => openDebateDialog('switch')}>{t('debate.change', 'Change')}</Button>
+              </p>
+            ) : (
+              <div className="mt-3 flex flex-wrap items-center gap-2 rounded-lg border border-dashed p-3 text-sm" data-testid="library-debate">
+                <span className="text-muted-foreground">{t('debate.libraryNeedsDebate', 'Select or create a debate before adding or importing sources.')}</span>
+                <Button size="sm" onClick={() => openDebateDialog('create')}>{t('debate.startDebate', 'Start debate')}</Button>
+                <Button size="sm" variant="outline" onClick={() => openDebateDialog('switch')}>{t('debate.switch', 'Switch debate')}</Button>
+              </div>
+            )}
           </div>
           <div className="flex flex-wrap gap-2">
-              <Button variant="outline" size="sm" onClick={() => setIsAdding(!isAdding)}>
+              <Button variant="outline" size="sm" disabled={!currentDebate} onClick={() => setIsAdding(!isAdding)}>
                 <Plus className="h-4 w-4 mr-1" /> {isAdding ? t('libraryPage.cancel') : t('libraryPage.addSource')}
               </Button>
               <Select value={selectedFolder} onValueChange={setSelectedFolder}>
@@ -567,7 +595,7 @@ export default function LibraryPage() {
           </div>
         </div>
 
-        {isAdding && (
+        {isAdding && currentDebate && (
           <Card className="mb-8 border-primary/20 bg-primary/5">
             <CardHeader>
               <CardTitle className="flex items-center gap-2">
diff --git a/src/pages/SettingsPage.tsx b/src/pages/SettingsPage.tsx
index 5e84d6666..62cb67155 100644
--- a/src/pages/SettingsPage.tsx
+++ b/src/pages/SettingsPage.tsx
@@ -17,6 +17,7 @@ import {
 import { Badge } from '@/components/ui/badge';
 import { useSettingsStore } from '@/lib/stores/settings-store';
 import { useSessionStore } from '@/lib/stores/session-store';
+import { useDebateStore } from '@/lib/stores/debate-store';
 import { useSparringStore } from '@/lib/stores/sparring-store';
 import { useAuth } from '@/lib/supabase/AuthProvider';
 import { supabase } from '@/lib/supabase/client';
@@ -77,6 +78,7 @@ export default function SettingsPage() {
     void clearAllData().then(() => {
       clearSession();
       resetSparringLocalData();
+      useDebateStore.setState({ debates: [], currentDebateId: null, oneOff: false });
       localStorage.removeItem('debate-trainer-storage');
       setDeleteDialogOpen(false);
       setDeleteEmail('');
diff --git a/src/pages/SparringPage.tsx b/src/pages/SparringPage.tsx
index fffeb1e51..49e65925e 100644
--- a/src/pages/SparringPage.tsx
+++ b/src/pages/SparringPage.tsx
@@ -11,6 +11,9 @@ import { SparringRound } from '@/components/features/sparring/SparringRound';
 import { SparringScorecard } from '@/components/features/sparring/SparringScorecard';
 import { Button } from '@/components/ui/button';
 import { cn } from '@/lib/utils';
+import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
+import { useDebateMotionGate } from '@/components/features/debate/DebateMotionGate';
+import { toast } from '@/hooks/use-toast';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
 import { saveWorkspaceArtifact } from '@/lib/workspace/practice-client';
 
@@ -26,6 +29,7 @@ function estimateAiTimeUsedSeconds(content: string, limit: number) {
 
 export default function SparringPage() {
   const workspace = useWorkspaceToolScope('sparring');
+  const debateGate = useDebateMotionGate({ disabled: Boolean(workspace.context) });
   const { t } = useTranslation();
   const navigate = useNavigate();
   const location = useLocation();
@@ -205,7 +209,12 @@ export default function SparringPage() {
       .then((result) => {
         if (judgeRequestRef.current !== requestKey) return;
         if (useSparringStore.getState().currentSession?.id !== session.id) return;
-        completeSession(result.scorecard);
+        const completed = completeSession(result.scorecard);
+        // The server has now stored the judged round; file it in its debate.
+        if (completed?.debateId && !workspace.context) {
+          useSparringStore.getState().attachSessionToDebate(completed.id, completed.debateId)
+            .catch(() => toast({ title: t('debate.recordFailed', 'Could not save this result to the debate'), variant: 'destructive' }));
+        }
       })
       .catch((error: unknown) => {
         if (judgeRequestRef.current !== requestKey) return;
@@ -231,9 +240,12 @@ export default function SparringPage() {
     });
   }, [session, workspace.context]);
 
-  const handleStart = (values: SparringSetupValues) => {
+  const handleStart = (values: SparringSetupValues) => debateGate.run(values.motion, (target) => beginRound(values, target.debateId));
+
+  const beginRound = (values: SparringSetupValues, debateId: string | null) => {
+    const target = { debateId };
     artifactRequestIdRef.current = crypto.randomUUID();
-    startSession(values);
+    startSession({ ...values, debateId: target.debateId });
     setAiError(null);
     setJudgingError(null);
     setRetryNonce(0);
@@ -277,7 +289,10 @@ export default function SparringPage() {
         <SparringSetup
           initialValues={workspace.context ? { motion: workspace.context.motion, userSide: workspace.context.side } : undefined}
           onStart={handleStart}
+          debatePrefill={!workspace.context}
+          banner={<CurrentDebateStrip hidden={Boolean(workspace.context)} className="" />}
         />
+        {debateGate.dialog}
       </div>
     );
   }
diff --git a/src/test/ai/client-branches.test.ts b/src/test/ai/client-branches.test.ts
index 4e335d805..130b60d0d 100644
--- a/src/test/ai/client-branches.test.ts
+++ b/src/test/ai/client-branches.test.ts
@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { seedCurrentDebate } from '@/test/helpers/debate';
 import type { ProviderConfig } from '@/lib/ai/providers/types';
+import type { WorkspaceToolContext } from '@/lib/workspace/tool-context';
 import type { GenerateInput, GenerateOutput } from '@/lib/ai/schemas/generate';
 
 const {
@@ -16,8 +18,8 @@ const {
   const applySourceAssessmentsMock = vi.fn();
   const sessionState = {
     sourceLibrary: [
-      { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Active source', content: 'Useful evidence', origin: 'https://example.com', type: 'url', isActive: true },
-      { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Inactive source', content: 'Ignore me', origin: 'https://example.com/2', type: 'url', isActive: false },
+      { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Active source', content: 'Useful evidence', origin: 'https://example.com', type: 'url', isActive: true, debateId: '11111111-2222-4333-8444-555555555555' },
+      { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Inactive source', content: 'Ignore me', origin: 'https://example.com/2', type: 'url', isActive: false, debateId: '11111111-2222-4333-8444-555555555555' },
     ],
     addSource: addSourceMock,
     applySourceAssessments: applySourceAssessmentsMock,
@@ -118,10 +120,11 @@ const validGenerateOutput: GenerateOutput = {
 
 describe('AI client branch coverage', () => {
   beforeEach(() => {
+    seedCurrentDebate();
     vi.clearAllMocks();
     sessionState.sourceLibrary = [
-      { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Active source', content: 'Useful evidence', origin: 'https://example.com', type: 'url', isActive: true },
-      { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Inactive source', content: 'Ignore me', origin: 'https://example.com/2', type: 'url', isActive: false },
+      { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Active source', content: 'Useful evidence', origin: 'https://example.com', type: 'url', isActive: true, debateId: '11111111-2222-4333-8444-555555555555' },
+      { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Inactive source', content: 'Ignore me', origin: 'https://example.com/2', type: 'url', isActive: false, debateId: '11111111-2222-4333-8444-555555555555' },
     ];
     getSessionMock.mockResolvedValue({
       data: { session: { access_token: 'token-123' } },
@@ -269,7 +272,7 @@ describe('AI client branch coverage', () => {
       type: 'url',
       origin: 'https://a.com/',
       folder: 'Auto-saved',
-      isActive: true,
+      isActive: true, debateId: '11111111-2222-4333-8444-555555555555',
       metadata: expect.objectContaining({ capturedVia: 'generate', url: 'https://a.com/' }),
     });
   });
@@ -290,6 +293,30 @@ describe('AI client branch coverage', () => {
     expect(sessionState.applySourceAssessments).toHaveBeenCalledWith([expect.objectContaining({ id: sourceId, usedInCase: true })]);
   });
 
+  it('keeps workspace research out of the personal debate', async () => {
+    invokeMock.mockResolvedValueOnce({
+      data: { output: validGenerateOutput, discoveredSources: [{ title: 'Source A', url: 'https://a.com', content: 'A content', qualityLabel: 'strong' }] },
+      error: null,
+    });
+    const workspaceContext: WorkspaceToolContext = {
+      documentEpoch: 1,
+      documentId: '11111111-1111-4111-8111-111111111111',
+      documentIds: ['11111111-1111-4111-8111-111111111111'],
+      documentText: 'Accepted text',
+      documentTitle: 'R1',
+      motion: 'Motion',
+      requestId: '22222222-2222-4222-8222-222222222222',
+      returnUrl: '/app/workspaces/33333333-3333-4333-8333-333333333333',
+      side: 'pro' as const,
+      sourceIds: [],
+      threadRequest: null,
+      threadId: null,
+      workspaceId: '33333333-3333-4333-8333-333333333333',
+    };
+    await generateCase(validGenerateInput, config, workspaceContext);
+    expect(addSourceMock).not.toHaveBeenCalled();
+  });
+
   it('does not autosave a semantically irrelevant discovered source', async () => {
     invokeMock.mockResolvedValueOnce({
       data: {
@@ -364,7 +391,7 @@ describe('AI client branch coverage', () => {
     expect(addSourceMock).toHaveBeenCalledWith(expect.objectContaining({
       title: 'Source with malformed metadata',
       origin: 'https://example.com/source',
-      isActive: false,
+      isActive: false, debateId: '11111111-2222-4333-8444-555555555555',
       metadata: { url: 'https://example.com/source', capturedVia: 'generate' },
     }));
   });
@@ -387,7 +414,7 @@ describe('AI client branch coverage', () => {
 
     expect(addSourceMock).toHaveBeenCalledWith(expect.objectContaining({
       title: 'Weak fallback',
-      isActive: false,
+      isActive: false, debateId: '11111111-2222-4333-8444-555555555555',
       metadata: expect.objectContaining({ qualityLabel: 'weak', qualityScore: 20 }),
     }));
   });
@@ -468,7 +495,7 @@ describe('AI client branch coverage', () => {
       type: 'url',
       origin: 'https://c.com/',
       folder: 'Auto-saved',
-      isActive: true,
+      isActive: true, debateId: '11111111-2222-4333-8444-555555555555',
       metadata: expect.objectContaining({ capturedVia: 'brainstorm', url: 'https://c.com/' }),
     });
   });
@@ -580,7 +607,7 @@ describe('AI client branch coverage', () => {
     expect(addSourceMock).toHaveBeenCalledWith(expect.objectContaining({
       title: 'Factoids source',
       origin: 'https://example.com/factoids',
-      isActive: true,
+      isActive: true, debateId: '11111111-2222-4333-8444-555555555555',
       metadata: expect.objectContaining({ capturedVia: 'factoids', qualityLabel: 'moderate' }),
     }));
   });
@@ -837,6 +864,27 @@ describe('AI client branch coverage', () => {
     }));
   });
 
+  it('never sends another debate\'s sources', async () => {
+    sessionState.sourceLibrary.push({ id: 'cccccccc-cccc-4ccc-8ccc-cccccccccccc', title: 'Zoo source', content: 'Other debate', origin: 'https://zoo.example', type: 'url', isActive: true, debateId: 'other-debate' } as any);
+    invokeMock.mockResolvedValueOnce({ data: { output: validGenerateOutput }, error: null });
+
+    await generateCase(validGenerateInput, config);
+
+    expect(invokeMock.mock.calls[0][1].body.sourceIds).toEqual(['aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa']);
+  });
+
+  it('uses no debate sources and keeps no research for one-off work', async () => {
+    invokeMock.mockResolvedValueOnce({
+      data: { output: validGenerateOutput, discoveredSources: [{ title: 'Source A', url: 'https://a.com', content: 'A content', qualityLabel: 'strong' }] },
+      error: null,
+    });
+
+    await generateCase(validGenerateInput, config, undefined, null);
+
+    expect(invokeMock.mock.calls[0][1].body.sourceIds).toEqual([]);
+    expect(addSourceMock).not.toHaveBeenCalled();
+  });
+
   it('throws generic AIError for edge payload errors that are not classified', async () => {
     invokeMock.mockResolvedValueOnce({
       data: {
diff --git a/src/test/ai/client.test.ts b/src/test/ai/client.test.ts
index 98bdb3253..18188d3e0 100644
--- a/src/test/ai/client.test.ts
+++ b/src/test/ai/client.test.ts
@@ -8,6 +8,7 @@ import type { GenerateInput, GenerateOutput } from '@/lib/ai/schemas/generate';
 import type { AttackInput, AttackOutput } from '@/lib/ai/schemas/attack';
 import type { BrainstormInput } from '@/lib/ai/schemas/brainstorm';
 import i18n from '@/i18n';
+import { seedCurrentDebate } from '@/test/helpers/debate';
 import type { WorkspaceToolContext } from '@/lib/workspace/tool-context';
 
 const clientMocks = vi.hoisted(() => ({
@@ -19,8 +20,8 @@ const clientMocks = vi.hoisted(() => ({
     },
     session: {
         sourceLibrary: [
-            { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Source 1', content: 'Content 1', origin: 'url1', type: 'web', isActive: true },
-            { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Source 2', content: 'Content 2', origin: 'url2', type: 'web', isActive: false },
+            { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Source 1', content: 'Content 1', origin: 'url1', type: 'web', isActive: true, debateId: '11111111-2222-4333-8444-555555555555' },
+            { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Source 2', content: 'Content 2', origin: 'url2', type: 'web', isActive: false, debateId: '11111111-2222-4333-8444-555555555555' },
         ],
         addSource: vi.fn(),
     },
@@ -60,6 +61,7 @@ describe('AI Client Integration', () => {
     };
 
     beforeEach(async () => {
+        seedCurrentDebate();
         resetMockState();
         setMockSessionToken('valid-token');
         vi.clearAllMocks();
diff --git a/src/test/ai/crossfire-client.test.ts b/src/test/ai/crossfire-client.test.ts
index 0208c142f..0d5de1d58 100644
--- a/src/test/ai/crossfire-client.test.ts
+++ b/src/test/ai/crossfire-client.test.ts
@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { seedCurrentDebate } from '@/test/helpers/debate';
 import type { ProviderConfig } from '@/lib/ai/providers/types';
 import type { CrossfireAIInput, CrossfireDebrief } from '@/lib/crossfire/schemas';
 
@@ -11,8 +12,8 @@ const mocks = vi.hoisted(() => ({
   },
   session: {
     sourceLibrary: [
-      { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Active source', content: 'Grounded evidence', origin: 'https://example.com', type: 'url', isActive: true },
-      { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Inactive source', content: 'Do not send', origin: 'https://inactive.example', type: 'url', isActive: false },
+      { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Active source', content: 'Grounded evidence', origin: 'https://example.com', type: 'url', isActive: true, debateId: '11111111-2222-4333-8444-555555555555' },
+      { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Inactive source', content: 'Do not send', origin: 'https://inactive.example', type: 'url', isActive: false, debateId: '11111111-2222-4333-8444-555555555555' },
     ],
   },
 }));
@@ -93,11 +94,12 @@ const validDebrief: CrossfireDebrief = {
 
 describe('Crossfire AI client', () => {
   beforeEach(() => {
+    seedCurrentDebate();
     vi.clearAllMocks();
     mocks.settings.outputLanguage = 'hu';
     mocks.session.sourceLibrary.splice(0, mocks.session.sourceLibrary.length,
-      { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Active source', content: 'Grounded evidence', origin: 'https://example.com', type: 'url', isActive: true },
-      { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Inactive source', content: 'Do not send', origin: 'https://inactive.example', type: 'url', isActive: false },
+      { id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', title: 'Active source', content: 'Grounded evidence', origin: 'https://example.com', type: 'url', isActive: true, debateId: '11111111-2222-4333-8444-555555555555' },
+      { id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', title: 'Inactive source', content: 'Do not send', origin: 'https://inactive.example', type: 'url', isActive: false, debateId: '11111111-2222-4333-8444-555555555555' },
     );
     mocks.getSession.mockResolvedValue({ data: { session: { access_token: 'token' } } });
   });
@@ -149,7 +151,7 @@ describe('Crossfire AI client', () => {
         content: '界'.repeat(9_000),
         origin: `https://example.com/${index}`,
         type: 'text',
-        isActive: true,
+        isActive: true, debateId: '11111111-2222-4333-8444-555555555555',
       })),
     );
     mocks.invoke.mockResolvedValue({ data: { output: { type: 'answer', text: 'A bounded answer.' } }, error: null });
diff --git a/src/test/ai/request-dispatch.test.ts b/src/test/ai/request-dispatch.test.ts
index 683071ef4..52469014a 100644
--- a/src/test/ai/request-dispatch.test.ts
+++ b/src/test/ai/request-dispatch.test.ts
@@ -1,4 +1,5 @@
 import { createElement } from 'react';
+import { seedCurrentDebate } from '@/test/helpers/debate';
 import { render, screen, waitFor } from '@testing-library/react';
 import { afterEach, expect, it, vi } from 'vitest';
 
@@ -111,19 +112,20 @@ it('maps a rejected fetch through the Edge Function error contract', async () =>
 });
 
 it('keeps large Ask context below the Edge Function request limit', async () => {
+  seedCurrentDebate();
   setActiveAccessToken('test-access-token');
   sessionState.sourceLibrary = [{
     id: 'local_source_legacy',
     title: 'Local source',
     content: 'local only',
     type: 'text',
-    isActive: true,
+    isActive: true, debateId: '11111111-2222-4333-8444-555555555555',
   }, ...Array.from({ length: 12 }, (_, index) => ({
     id: `00000000-0000-4000-8000-${String(index).padStart(12, '0')}`,
     title: `Source ${index}`,
     content: 'source context '.repeat(3_000),
     type: 'text',
-    isActive: true,
+    isActive: true, debateId: '11111111-2222-4333-8444-555555555555',
   }))];
   settingsState.customSystemPrompt = '界'.repeat(50_000);
   const history = Array.from({ length: 12 }, (_, index) => ({
diff --git a/src/test/components/AppLayout.test.tsx b/src/test/components/AppLayout.test.tsx
index 272c5f0fd..b81632947 100644
--- a/src/test/components/AppLayout.test.tsx
+++ b/src/test/components/AppLayout.test.tsx
@@ -4,6 +4,7 @@ import { Link, MemoryRouter, Route, Routes } from 'react-router-dom';
 import { AppLayout } from '@/components/layout/AppLayout';
 import type { UserAnnouncement } from '@/lib/announcements';
 import i18n from '@/i18n';
+import { resetDebates, seedCurrentDebate } from '@/test/helpers/debate';
 
 const { mockAuth, mockDismissAnnouncement, mockListActiveAnnouncements } = vi.hoisted(() => ({
   mockAuth: { user: { id: 'user-a' } },
@@ -258,58 +259,36 @@ describe('AppLayout announcements', () => {
     expect(mockListActiveAnnouncements).toHaveBeenCalledTimes(2);
   });
 
-  it('keeps all tool destinations reachable across desktop and mobile navigation', async () => {
+  it('keeps features out of the header and puts Current debate after Home', async () => {
+    seedCurrentDebate({ motion: 'This House would ban homework' });
     renderLayout();
     await screen.findByText('Scheduled maintenance');
 
-    const expectDestinations = (links: HTMLElement[], expected: readonly (readonly [string, string])[]) => {
-      const destinations = links.map((link) => ({
-        name: link.textContent?.trim() ?? '',
-        href: link.getAttribute('href'),
-      }));
-      for (const [label, path] of expected) {
-        expect(destinations).toContainEqual(expect.objectContaining({
-          name: expect.stringContaining(label),
-          href: path,
-        }));
-      }
-    };
-
     const mainNavigation = screen.getByRole('navigation', { name: 'Main navigation' });
-    fireEvent.click(within(mainNavigation).getByText('More'));
-    expectDestinations(within(mainNavigation).getAllByRole('link'), [
-      ['Home', '/app'],
-      ['Generate', '/app/generate'],
-      ['Attack', '/app/attack'],
-      ['Ask', '/app/ask'],
-      ['Crossfire', '/app/crossfire'],
-      ['Sparring', '/app/sparring'],
-      ['Brainstorm', '/app/brainstorm'],
-      ['Factoids', '/app/factoids'],
-      ['Flowchart', '/app/flowchart'],
-      ['Library', '/app/library'],
-      ['Timer', '/app/timer'],
-      ['History', '/app/history'],
-    ]);
-
+    const links = within(mainNavigation).getAllByRole('link').map((link) => [link.textContent?.trim(), link.getAttribute('href')]);
+    expect(links).toEqual([['Home', '/app'], ['Library', '/app/library'], ['History', '/app/history']]);
+    for (const feature of ['Generate', 'Attack', 'Ask', 'Crossfire', 'Sparring', 'More']) {
+      expect(within(mainNavigation).queryByText(feature)).not.toBeInTheDocument();
+    }
+    const control = within(mainNavigation).getByRole('button', { name: 'Current debate: This House would ban homework' });
+    expect(control).toHaveTextContent('Current debate');
+    // Home, then Current debate, then Library.
+    const order = Array.from(mainNavigation.querySelectorAll('a, button')).map((node) => node.textContent?.trim());
+    expect(order.slice(0, 3)).toEqual(['Home', 'Current debate', 'Library']);
     expect(screen.getByRole('link', { name: 'Settings' })).toHaveAttribute('href', '/app/settings');
 
     fireEvent.click(screen.getByRole('button', { name: 'Open menu' }));
     const mobileNavigation = screen.getByRole('navigation', { name: 'Mobile navigation' });
-    expectDestinations(within(mobileNavigation).getAllByRole('link'), [
-      ['Home', '/app'],
-      ['Generate', '/app/generate'],
-      ['Attack', '/app/attack'],
-      ['Brainstorm', '/app/brainstorm'],
-      ['Factoids', '/app/factoids'],
-      ['Ask', '/app/ask'],
-      ['Crossfire', '/app/crossfire'],
-      ['Library', '/app/library'],
-      ['Timer', '/app/timer'],
-      ['Sparring', '/app/sparring'],
-      ['Flowchart', '/app/flowchart'],
-      ['History', '/app/history'],
-    ]);
+    expect(within(mobileNavigation).getAllByRole('link').map((link) => link.getAttribute('href')))
+      .toEqual(['/app', '/app/debate', '/app/library', '/app/history', '/app/settings']);
+  });
+
+  it('offers Start debate when the user has no debate', async () => {
+    resetDebates();
+    renderLayout();
+    await screen.findByText('Scheduled maintenance');
+    const mainNavigation = screen.getByRole('navigation', { name: 'Main navigation' });
+    expect(within(mainNavigation).getByRole('button', { name: 'Start debate' })).toBeInTheDocument();
   });
 
   it('localizes desktop and mobile navigation labels in Hungarian', async () => {
@@ -323,23 +302,14 @@ describe('AppLayout announcements', () => {
     expect(screen.getByAltText('DebateLab logó')).toBeInTheDocument();
   });
 
-  it('closes menus on Escape and returns focus to the trigger', async () => {
+  it('closes the mobile menu on Escape and returns focus to the trigger', async () => {
     renderLayout();
     await screen.findByText('Scheduled maintenance');
 
-    const mainNavigation = screen.getByRole('navigation', { name: 'Main navigation' });
-    const moreSummary = within(mainNavigation).getByText('More');
-    fireEvent.click(moreSummary);
-    within(mainNavigation).getByRole('link', { name: 'Brainstorm' }).focus();
-    fireEvent.keyDown(document, { key: 'Escape' });
-
-    expect(moreSummary.closest('details')).not.toHaveAttribute('open');
-    expect(moreSummary).toHaveFocus();
-
     const menuTrigger = screen.getByRole('button', { name: 'Open menu' });
     fireEvent.click(menuTrigger);
     const mobileNavigation = screen.getByRole('navigation', { name: 'Mobile navigation' });
-    within(mobileNavigation).getByRole('link', { name: /^Brainstorm/ }).focus();
+    within(mobileNavigation).getByRole('link', { name: /^Library/ }).focus();
     fireEvent.keyDown(document, { key: 'Escape' });
 
     expect(screen.queryByRole('navigation', { name: 'Mobile navigation' })).not.toBeInTheDocument();
diff --git a/src/test/components/AutoSavedSourcesUndo.test.tsx b/src/test/components/AutoSavedSourcesUndo.test.tsx
index caf97e3a6..ae726991b 100644
--- a/src/test/components/AutoSavedSourcesUndo.test.tsx
+++ b/src/test/components/AutoSavedSourcesUndo.test.tsx
@@ -10,9 +10,11 @@ const { mockToastError, mockToastSuccess, mockToastWarning, mockRemoveSource } =
 
 const sessionState = {
   sourceLibrary: [
-    { id: 'source-1', folder: 'Auto-saved' },
-    { id: 'source-2', folder: 'Auto-saved', metadata: { capturedVia: 'attack' } },
-    { id: 'source-3', folder: 'Curated', metadata: { capturedVia: 'generate' } },
+    { id: 'source-1', folder: 'Auto-saved', debateId: '11111111-2222-4333-8444-555555555555' },
+    { id: 'source-2', folder: 'Auto-saved', debateId: '11111111-2222-4333-8444-555555555555', metadata: { capturedVia: 'attack' } },
+    { id: 'source-3', folder: 'Curated', debateId: '11111111-2222-4333-8444-555555555555', metadata: { capturedVia: 'generate' } },
+    // Another debate's research is never undone from this one.
+    { id: 'source-4', folder: 'Auto-saved', debateId: 'other-debate' },
   ],
 };
 
@@ -32,10 +34,12 @@ vi.mock('@/lib/stores/session-store', () => ({
 }));
 
 import { AutoSavedSourcesUndo } from '@/components/features/AutoSavedSourcesUndo';
+import { seedCurrentDebate } from '@/test/helpers/debate';
 
 describe('AutoSavedSourcesUndo', () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    seedCurrentDebate();
     mockRemoveSource.mockRejectedValue(new Error('Removal failed'));
   });
 
diff --git a/src/test/debate/debate-gates.test.tsx b/src/test/debate/debate-gates.test.tsx
new file mode 100644
index 000000000..5dcf140d1
--- /dev/null
+++ b/src/test/debate/debate-gates.test.tsx
@@ -0,0 +1,140 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+import { resetMockState, supabaseMock } from '@/test/mocks/supabase';
+
+vi.mock('@/lib/supabase/client', async () => ({ supabase: (await import('@/test/mocks/supabase')).supabaseMock }));
+
+import i18n from '@/i18n';
+import { InactiveDebateGate } from '@/components/features/debate/DebateDialogs';
+import { useDebateMotionGate, type DebateTarget } from '@/components/features/debate/DebateMotionGate';
+import { INACTIVE_DEBATE_MS, useDebateStore } from '@/lib/stores/debate-store';
+import { resetDebates, seedCurrentDebate } from '@/test/helpers/debate';
+
+const DAY = 24 * 60 * 60 * 1000;
+
+describe('five-day Current Debate gate', () => {
+  beforeEach(async () => {
+    resetMockState();
+    await i18n.changeLanguage('en');
+  });
+  afterEach(() => resetDebates());
+
+  const renderGate = () => render(<MemoryRouter><InactiveDebateGate /></MemoryRouter>);
+
+  it('blocks the app after five days without meaningful work, offering only Continue, Start new, or Switch', () => {
+    seedCurrentDebate({ motion: 'This House would ban homework', lastActivityAt: Date.now() - INACTIVE_DEBATE_MS - DAY });
+    renderGate();
+    const dialog = screen.getByRole('alertdialog');
+    expect(dialog).toHaveTextContent('Still preparing this debate?');
+    expect(dialog).toHaveTextContent('This House would ban homework');
+    const buttons = Array.from(dialog.querySelectorAll('button')).map((button) => button.textContent);
+    expect(buttons).toEqual(['Switch debate', 'Start new debate', 'Continue']);
+    // Escape does not dismiss it.
+    fireEvent.keyDown(dialog, { key: 'Escape' });
+    expect(screen.getByRole('alertdialog')).toBeInTheDocument();
+  });
+
+  it('stays out of the way before five days and before the server state loads', () => {
+    seedCurrentDebate({ lastActivityAt: Date.now() - 4 * DAY });
+    const { unmount } = renderGate();
+    expect(screen.queryByRole('alertdialog')).toBeNull();
+    unmount();
+
+    seedCurrentDebate({ lastActivityAt: Date.now() - 6 * DAY });
+    useDebateStore.setState({ hydrated: false });
+    renderGate();
+    expect(screen.queryByRole('alertdialog')).toBeNull();
+  });
+
+  it('Continue resets the inactivity clock on the server and closes the gate', async () => {
+    seedCurrentDebate({ lastActivityAt: Date.now() - 6 * DAY });
+    renderGate();
+    fireEvent.click(screen.getByRole('button', { name: 'Continue' }));
+    await waitFor(() => expect(screen.queryByRole('alertdialog')).toBeNull());
+    expect(supabaseMock.from).toHaveBeenCalledWith('debates');
+    expect(Date.now() - useDebateStore.getState().debates[0].lastActivityAt).toBeLessThan(1000);
+  });
+});
+
+function GateHarness({ motion, onTarget }: { motion: string; onTarget: (target: DebateTarget) => void }) {
+  const gate = useDebateMotionGate();
+  return (
+    <>
+      <button type="button" onClick={() => gate.run(motion, onTarget)}>Submit</button>
+      {gate.dialog}
+    </>
+  );
+}
+
+describe('motion mismatch choice', () => {
+  beforeEach(async () => {
+    resetMockState();
+    await i18n.changeLanguage('en');
+  });
+  afterEach(() => resetDebates());
+
+  it('proceeds immediately into the Current Debate when the motion matches', () => {
+    const debate = seedCurrentDebate({ motion: 'This House would ban homework' });
+    const onTarget = vi.fn();
+    render(<GateHarness motion="this house would ban homework" onTarget={onTarget} />);
+    fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    expect(onTarget).toHaveBeenCalledWith({ debateId: debate.id });
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+
+  it('asks before a different motion and runs it once without a debate when chosen', () => {
+    seedCurrentDebate({ motion: 'This House would ban homework' });
+    const onTarget = vi.fn();
+    render(<GateHarness motion="This House would abolish zoos" onTarget={onTarget} />);
+    fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    expect(onTarget).not.toHaveBeenCalled();
+    const dialog = screen.getByRole('dialog');
+    expect(dialog).toHaveTextContent('This is a different motion');
+    expect(screen.queryByRole('button', { name: 'Switch to this existing debate' })).toBeNull();
+    fireEvent.click(screen.getByRole('button', { name: 'Use once without saving to a debate' }));
+    expect(onTarget).toHaveBeenCalledWith({ debateId: null });
+    // The Current Debate did not change.
+    expect(useDebateStore.getState().debates).toHaveLength(1);
+  });
+
+  it('switches to an existing debate with the same motion', async () => {
+    const homework = seedCurrentDebate({ motion: 'This House would ban homework' });
+    const zoos = { ...homework, id: '22222222-2222-4222-8222-222222222222', motion: 'This House would abolish zoos' };
+    useDebateStore.setState({ debates: [homework, zoos] });
+    const onTarget = vi.fn();
+    render(<GateHarness motion="This House would abolish zoos" onTarget={onTarget} />);
+    fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Switch to this existing debate' }));
+    await waitFor(() => expect(onTarget).toHaveBeenCalledWith({ debateId: zoos.id }));
+    expect(useDebateStore.getState().currentDebateId).toBe(zoos.id);
+  });
+
+  it('creates a new Current Debate from the motion', async () => {
+    seedCurrentDebate({ motion: 'This House would ban homework' });
+    supabaseMock.from.mockImplementationOnce(() => ({
+      insert: () => ({ select: () => ({ single: async () => ({
+        data: { id: 'new-debate', motion: 'This House would abolish zoos', settings: {}, instructions: '', last_activity_at: new Date().toISOString(), created_at: new Date().toISOString() },
+        error: null as unknown,
+      }) }) }),
+    }) as unknown as ReturnType<typeof supabaseMock.from>);
+    const onTarget = vi.fn();
+    render(<GateHarness motion="This House would abolish zoos" onTarget={onTarget} />);
+    fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Create a new debate for this motion' }));
+    });
+    await waitFor(() => expect(onTarget).toHaveBeenCalledWith({ debateId: 'new-debate' }));
+    expect(useDebateStore.getState().currentDebateId).toBe('new-debate');
+    expect(useDebateStore.getState().debates.map((debate) => debate.motion)).toContain('This House would ban homework');
+  });
+
+  it('does nothing when the user dismisses the choice', () => {
+    seedCurrentDebate({ motion: 'This House would ban homework' });
+    const onTarget = vi.fn();
+    render(<GateHarness motion="Other motion" onTarget={onTarget} />);
+    fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    fireEvent.keyDown(screen.getByRole('dialog'), { key: 'Escape' });
+    expect(onTarget).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/test/debate/motion.test.ts b/src/test/debate/motion.test.ts
new file mode 100644
index 000000000..613f5c692
--- /dev/null
+++ b/src/test/debate/motion.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from 'vitest';
+import { decideMotionTarget, shouldPrefillMotion } from '@/lib/debate/motion';
+import type { Debate } from '@/lib/stores/debate-store';
+
+const debate = (id: string, motion: string): Debate => ({ id, motion, settings: {}, instructions: '', lastActivityAt: 0, createdAt: 0 });
+const homework = debate('d1', 'This House would ban homework');
+const zoos = debate('d2', 'This House would abolish zoos');
+
+describe('decideMotionTarget', () => {
+  it('attaches silently when the motion matches the Current Debate, ignoring case and spacing', () => {
+    expect(decideMotionTarget('  this house would   BAN homework ', { debates: [homework, zoos], currentDebateId: 'd1', oneOff: false }))
+      .toEqual({ kind: 'attach', debateId: 'd1' });
+  });
+
+  it('asks before using a different motion and offers only exactly matching debates to switch to', () => {
+    const decision = decideMotionTarget('This House would abolish zoos', { debates: [homework, zoos], currentDebateId: 'd1', oneOff: false });
+    expect(decision).toEqual({ kind: 'ask', matches: [zoos] });
+    expect(decideMotionTarget('A brand new motion', { debates: [homework, zoos], currentDebateId: 'd1', oneOff: false }))
+      .toEqual({ kind: 'ask', matches: [] });
+  });
+
+  it('asks when there is no Current Debate yet', () => {
+    expect(decideMotionTarget('Anything', { debates: [], currentDebateId: null, oneOff: false })).toEqual({ kind: 'ask', matches: [] });
+  });
+
+  it('never attaches in one-off mode', () => {
+    expect(decideMotionTarget('This House would ban homework', { debates: [homework], currentDebateId: 'd1', oneOff: true }))
+      .toEqual({ kind: 'one-off' });
+  });
+});
+
+describe('shouldPrefillMotion', () => {
+  const known = [homework.motion, zoos.motion];
+  it('fills an empty field', () => expect(shouldPrefillMotion('', homework.motion, known)).toBe(true));
+  it('replaces another debate’s motion after a switch', () => expect(shouldPrefillMotion(zoos.motion, homework.motion, known)).toBe(true));
+  it('never overwrites text the user typed', () => expect(shouldPrefillMotion('My own draft motion', homework.motion, known)).toBe(false));
+  it('leaves the current motion alone', () => expect(shouldPrefillMotion(homework.motion, homework.motion, known)).toBe(false));
+});
diff --git a/src/test/helpers/debate.ts b/src/test/helpers/debate.ts
new file mode 100644
index 000000000..7c7c829ba
--- /dev/null
+++ b/src/test/helpers/debate.ts
@@ -0,0 +1,36 @@
+import { useDebateStore, type Debate } from "@/lib/stores/debate-store";
+
+export const TEST_DEBATE_ID = "11111111-2222-4333-8444-555555555555";
+
+/** Makes a Current Debate active, the way a hydrated signed-in user has one. */
+export function seedCurrentDebate(overrides: Partial<Debate> = {}): Debate {
+  const debate: Debate = {
+    id: TEST_DEBATE_ID,
+    motion: "This House would make public transport free",
+    settings: {},
+    instructions: "",
+    lastActivityAt: Date.now(),
+    createdAt: Date.now(),
+    ...overrides,
+  };
+  useDebateStore.setState({
+    ownerUserId: "test-user",
+    debates: [debate],
+    currentDebateId: debate.id,
+    oneOff: false,
+    hydrated: true,
+    dialog: null,
+    dialogMotion: "",
+  });
+  return debate;
+}
+
+export function resetDebates() {
+  useDebateStore.setState({ ownerUserId: null, debates: [], currentDebateId: null, oneOff: false, hydrated: false, dialog: null, dialogMotion: "" });
+}
+
+/** One-off mode: tools neither read from nor save to a debate. */
+export function enableOneOffMode() {
+  resetDebates();
+  useDebateStore.setState({ oneOff: true });
+}
diff --git a/src/test/mocks/supabase.ts b/src/test/mocks/supabase.ts
index 96ef8bb3a..a504726b0 100644
--- a/src/test/mocks/supabase.ts
+++ b/src/test/mocks/supabase.ts
@@ -19,6 +19,24 @@ const defaultInvokeResponse: { data: any; error: unknown } = {
   error: null,
 };
 
+type FilterResult = { data: unknown; error: unknown };
+type FilterChain = PromiseLike<FilterResult> & {
+  eq: (...args: unknown[]) => FilterChain;
+  in: (...args: unknown[]) => FilterChain;
+  neq: (...args: unknown[]) => FilterChain;
+};
+
+/** A filter chain that can be awaited after any number of .eq/.in/.neq calls. */
+const filterChain = (result: () => FilterResult): FilterChain => {
+  const chain: FilterChain = {
+    eq: vi.fn(() => chain),
+    in: vi.fn(() => chain),
+    neq: vi.fn(() => chain),
+    then: (resolve, reject) => Promise.resolve(result()).then(resolve, reject),
+  };
+  return chain;
+};
+
 const createQuery = (table: string) => {
   const responses = tableResponses[table] || {};
 
@@ -39,14 +57,8 @@ const createQuery = (table: string) => {
       })),
     })),
     upsert: vi.fn(async () => ({ data: null, error: null })),
-    update: vi.fn(() => ({
-      eq: vi.fn(async () => ({ data: responses.update ?? null, error: null })),
-    })),
-    delete: vi.fn(() => ({
-      eq: vi.fn(async () => ({ data: null, error: null })),
-      in: vi.fn(async () => ({ data: null, error: null })),
-      neq: vi.fn(async () => ({ data: null, error: null })),
-    })),
+    update: vi.fn(() => filterChain(() => ({ data: responses.update ?? null, error: null }))),
+    delete: vi.fn(() => filterChain(() => ({ data: null, error: null }))),
     eq: vi.fn(async () => ({ data: responses.select ?? null, error: null })),
     neq: vi.fn(async () => ({ data: null, error: null })),
     in: vi.fn(() => ({
diff --git a/src/test/pages/ConversationPages.test.tsx b/src/test/pages/ConversationPages.test.tsx
index c166c0f41..9888769f1 100644
--- a/src/test/pages/ConversationPages.test.tsx
+++ b/src/test/pages/ConversationPages.test.tsx
@@ -158,9 +158,11 @@ vi.mock('@/components/features/factoids/FactoidsResults', () => ({
 import AskPage from '@/pages/AskPage';
 import BrainstormPage from '@/pages/BrainstormPage';
 import FactoidsPage from '@/pages/FactoidsPage';
+import { enableOneOffMode } from '@/test/helpers/debate';
 
 describe('Conversation Pages', () => {
   beforeEach(() => {
+    enableOneOffMode();
     vi.clearAllMocks();
 
     sessionState.askMessages = [];
@@ -201,7 +203,7 @@ describe('Conversation Pages', () => {
       [],
       'general',
       { provider: 'openai', model: 'gpt-4o', temperature: 0.7 },
-      { citationMode: true, webSearch: true, prosConsMode: true, argumentMapMode: true }
+      { citationMode: true, webSearch: true, prosConsMode: true, argumentMapMode: true, debateId: null }
     );
     expect(sessionState.addAskMessage).toHaveBeenCalledWith({ role: 'user', content: 'How do I frame this?' });
     expect(sessionState.addAskMessage).toHaveBeenCalledWith({
@@ -329,7 +331,7 @@ describe('Conversation Pages', () => {
         [],
         'clarify',
         { provider: 'openai', model: 'gpt-4o', temperature: 0.7 },
-        { citationMode: false, webSearch: false, prosConsMode: false, argumentMapMode: false },
+        { citationMode: false, webSearch: false, prosConsMode: false, argumentMapMode: false, debateId: null },
       );
     });
     expect(mockStreamAskChat).not.toHaveBeenCalled();
@@ -411,7 +413,7 @@ describe('Conversation Pages', () => {
       [],
       'clarify',
       { provider: 'openai', model: 'gpt-4o', temperature: 0.7 },
-      { citationMode: false, webSearch: false, prosConsMode: false, argumentMapMode: false },
+      { citationMode: false, webSearch: false, prosConsMode: false, argumentMapMode: false, debateId: null },
     ));
 
     sessionState.setAskLoading.mockClear();
diff --git a/src/test/pages/CrossfirePage.test.tsx b/src/test/pages/CrossfirePage.test.tsx
index c7d6dc7ea..13b7b3ce4 100644
--- a/src/test/pages/CrossfirePage.test.tsx
+++ b/src/test/pages/CrossfirePage.test.tsx
@@ -32,6 +32,7 @@ vi.mock('@/lib/ai/client', () => ({
 import CrossfirePage from '@/pages/CrossfirePage';
 import { createCrossfireSetupState } from '@/lib/crossfire/reducer';
 import { loadCrossfireDraft, saveCrossfireDraft } from '@/lib/crossfire/storage';
+import { enableOneOffMode, seedCurrentDebate, TEST_DEBATE_ID } from '@/test/helpers/debate';
 
 function renderPage() {
   return render(
@@ -43,6 +44,7 @@ function renderPage() {
 
 describe('CrossfirePage', () => {
   beforeEach(() => {
+    enableOneOffMode();
     mocks.userId = 'user-a';
     mocks.crossfire.mockReset();
     mocks.crossfire.mockImplementation(() => new Promise(() => undefined));
@@ -99,6 +101,44 @@ describe('CrossfirePage', () => {
     setItemSpy.mockRestore();
   });
 
+  it('keeps a restored round out of a Current Debate with another motion', async () => {
+    const start = () => {
+      const view = renderPage();
+      fireEvent.change(screen.getByTestId('crossfire-resolution'), { target: { value: 'Resolved: test' } });
+      fireEvent.change(screen.getByTestId('crossfire-argument'), { target: { value: 'Case text' } });
+      fireEvent.click(screen.getByTestId('start-crossfire'));
+      view.unmount();
+    };
+    const sendTurn = () => {
+      renderPage();
+      fireEvent.change(screen.getByTestId('crossfire-input'), { target: { value: 'What is the mechanism?' } });
+      fireEvent.click(screen.getByTestId('submit-turn'));
+    };
+    const lastDebateId = () => (mocks.crossfire.mock.calls.at(-1) as unknown[] | undefined)?.[2] as { debateId?: string | null };
+
+    // Started one-off, then the student opens a debate on another motion and comes back.
+    start();
+    seedCurrentDebate({ motion: 'Resolved: something else' });
+    sendTurn();
+    await waitFor(() => expect(mocks.crossfire).toHaveBeenCalled());
+    expect(lastDebateId().debateId).toBeNull();
+  });
+
+  it('keeps a restored round in the Current Debate when the motion matches', async () => {
+    seedCurrentDebate({ motion: 'Resolved: test' });
+    const view = renderPage();
+    fireEvent.change(screen.getByTestId('crossfire-resolution'), { target: { value: 'Resolved: test' } });
+    fireEvent.change(screen.getByTestId('crossfire-argument'), { target: { value: 'Case text' } });
+    fireEvent.click(screen.getByTestId('start-crossfire'));
+    view.unmount();
+
+    renderPage();
+    fireEvent.change(screen.getByTestId('crossfire-input'), { target: { value: 'What is the mechanism?' } });
+    fireEvent.click(screen.getByTestId('submit-turn'));
+    await waitFor(() => expect(mocks.crossfire).toHaveBeenCalled());
+    expect(((mocks.crossfire.mock.calls.at(-1) as unknown[])[2] as { debateId?: string | null }).debateId).toBe(TEST_DEBATE_ID);
+  });
+
   it('moves an unexpected next-turn variant into the retry state', async () => {
     mocks.crossfire.mockResolvedValueOnce({
       concessionsSecured: [],
diff --git a/src/test/pages/GeneratePage.test.tsx b/src/test/pages/GeneratePage.test.tsx
index fa69dd5ee..b85df04ab 100644
--- a/src/test/pages/GeneratePage.test.tsx
+++ b/src/test/pages/GeneratePage.test.tsx
@@ -32,12 +32,15 @@ vi.mock('react-router-dom', async () => {
 const mockToast = vi.fn();
 vi.mock('@/hooks/use-toast', () => ({
     useToast: () => ({ toast: mockToast }),
+    toast: (...args: unknown[]) => mockToast(...args),
 }));
 
 // Mock stores
 const mockSetGenerateLoading = vi.fn();
 const mockSetGenerateResult = vi.fn();
 const mockSaveCurrentCase = vi.fn();
+const mockRecordResult = vi.fn(async () => 'recorded-case');
+const mockUpdateRecordedResult = vi.fn(async () => undefined);
 const mockAddAskMessage = vi.fn();
 const mockSetAskLoading = vi.fn();
 let mockGenerateResult: any = null;
@@ -56,6 +59,8 @@ vi.mock('@/lib/stores/session-store', () => ({
         setAskLoading: mockSetAskLoading,
         askMessages: [] as any[],
         setPendingFlowchartData: vi.fn(),
+        recordResult: mockRecordResult,
+        updateRecordedResult: mockUpdateRecordedResult,
     }),
 }));
 
@@ -70,7 +75,7 @@ vi.mock('@/components/features/generate/GenerateForm', () => ({
     GenerateForm: ({ onSubmit, isLoading }: { onSubmit: (data: unknown) => void, isLoading: boolean }) => (
         <div data-testid="generate-form">
             <button
-                onClick={() => onSubmit({ topic: 'Test Topic' })}
+                onClick={() => onSubmit({ topic: 'Test Topic', motion: 'Test Topic', side: 'con' })}
                 disabled={isLoading}
                 data-testid="submit-button"
             >
@@ -94,9 +99,11 @@ vi.mock('@/components/features/generate/GenerateResults', () => ({
 }));
 
 import { generateCase } from '@/lib/ai/client';
+import { enableOneOffMode, seedCurrentDebate, TEST_DEBATE_ID } from '@/test/helpers/debate';
 
 describe('GeneratePage Integration', () => {
     beforeEach(() => {
+        enableOneOffMode();
         vi.clearAllMocks();
         mockGenerateResult = null;
         mockGenerateForm = { motion: 'Existing motion', side: 'pro', format: 'bp', role: 'intro', length: 'brief', audience: 'beginner', tone: 'formal' };
@@ -264,4 +271,86 @@ describe('GeneratePage Integration', () => {
         });
         expect(screen.getByTestId('discovered-sources')).not.toHaveTextContent('Old source');
     });
+
+    it('records the case in the Current Debate with its side automatically', async () => {
+        seedCurrentDebate({ motion: 'Test Topic' });
+        const result = { caseStructure: { thesis: 'Debate thesis' }, contentions: [] as any[], predictedOpponentCase: {}, counters: [] as any[] };
+        (generateCase as Mock).mockResolvedValue({ result, discoveredSources: [] });
+
+        render(<BrowserRouter><GeneratePage /></BrowserRouter>);
+        fireEvent.click(screen.getByTestId('submit-button'));
+
+        await waitFor(() => expect(mockRecordResult).toHaveBeenCalledWith('case', expect.objectContaining({
+            title: 'Test Topic',
+            debateId: TEST_DEBATE_ID,
+            side: 'con',
+            output: result,
+        })));
+        // Sources come from the same debate.
+        expect((generateCase as Mock).mock.calls[0][3]).toBe(TEST_DEBATE_ID);
+        expect(screen.getByTestId('current-debate-strip')).toHaveTextContent('Working in: Test Topic');
+    });
+
+    it('keeps one-off results out of every debate', async () => {
+        const result = { caseStructure: { thesis: 'One-off' }, contentions: [] as any[], predictedOpponentCase: {}, counters: [] as any[] };
+        (generateCase as Mock).mockResolvedValue({ result, discoveredSources: [] });
+
+        render(<BrowserRouter><GeneratePage /></BrowserRouter>);
+        fireEvent.click(screen.getByTestId('submit-button'));
+
+        await waitFor(() => expect(mockSetGenerateResult).toHaveBeenCalledWith(result));
+        expect(mockRecordResult).not.toHaveBeenCalled();
+        expect((generateCase as Mock).mock.calls[0][3]).toBeNull();
+    });
+
+    it('regenerates a one-off case without another debate\'s sources', async () => {
+        const result = { caseStructure: { thesis: 'One-off' }, contentions: [] as any[], predictedOpponentCase: {}, counters: [] as any[], metadata: {} };
+        (generateCase as Mock).mockResolvedValue({ result, discoveredSources: [] });
+        const view = render(<BrowserRouter><GeneratePage /></BrowserRouter>);
+        fireEvent.click(screen.getByTestId('submit-button'));
+        await waitFor(() => expect(mockSetGenerateResult).toHaveBeenCalledWith(result));
+
+        // The student then starts a debate on the same motion as the stored form.
+        seedCurrentDebate({ motion: 'Existing motion' });
+        mockGenerateResult = result;
+        view.rerender(<BrowserRouter><GeneratePage /></BrowserRouter>);
+        fireEvent.click(screen.getByTestId('regenerate-section'));
+
+        await waitFor(() => expect(generateCase).toHaveBeenCalledTimes(2));
+        expect((generateCase as Mock).mock.calls[1][3]).toBeNull();
+    });
+
+    it('after a reload, regenerates in the Current Debate only when the motion matches', async () => {
+        const result = { caseStructure: { thesis: 'Restored' }, contentions: [] as any[], predictedOpponentCase: {}, counters: [] as any[], metadata: {} };
+        (generateCase as Mock).mockResolvedValue({ result, discoveredSources: [] });
+        mockGenerateResult = result;
+
+        seedCurrentDebate({ motion: 'Existing motion' });
+        const view = render(<BrowserRouter><GeneratePage /></BrowserRouter>);
+        fireEvent.click(screen.getByTestId('regenerate-section'));
+        await waitFor(() => expect(generateCase).toHaveBeenCalledTimes(1));
+        expect((generateCase as Mock).mock.calls[0][3]).toBe(TEST_DEBATE_ID);
+        view.unmount();
+
+        seedCurrentDebate({ motion: 'A different motion' });
+        render(<BrowserRouter><GeneratePage /></BrowserRouter>);
+        fireEvent.click(screen.getByTestId('regenerate-section'));
+        await waitFor(() => expect(generateCase).toHaveBeenCalledTimes(2));
+        expect((generateCase as Mock).mock.calls[1][3]).toBeNull();
+    });
+
+    it('keeps a successful case on screen when saving it to the debate fails', async () => {
+        seedCurrentDebate({ motion: 'Test Topic' });
+        mockRecordResult.mockRejectedValueOnce(new Error('offline'));
+        const result = { caseStructure: { thesis: 'Kept' }, contentions: [] as any[], predictedOpponentCase: {}, counters: [] as any[] };
+        (generateCase as Mock).mockResolvedValue({ result, discoveredSources: [] });
+
+        render(<BrowserRouter><GeneratePage /></BrowserRouter>);
+        fireEvent.click(screen.getByTestId('submit-button'));
+
+        await waitFor(() => expect(mockToast).toHaveBeenCalledWith(expect.objectContaining({ title: 'Could not save this result to the debate' })));
+        expect(mockSetGenerateResult).toHaveBeenCalledWith(result);
+        expect(mockToast).toHaveBeenCalledWith(expect.objectContaining({ title: 'Generate complete' }));
+        expect(mockToast).not.toHaveBeenCalledWith(expect.objectContaining({ variant: 'destructive', title: expect.stringMatching(/Generation Failed/i) }));
+    });
 });
diff --git a/src/test/pages/HistoryPage.test.tsx b/src/test/pages/HistoryPage.test.tsx
index 6caf933e1..5d4ae0094 100644
--- a/src/test/pages/HistoryPage.test.tsx
+++ b/src/test/pages/HistoryPage.test.tsx
@@ -9,6 +9,9 @@ vi.mock('react-router-dom', () => ({
 }));
 
 const mockStore = {
+  savedFlowcharts: [] as any[],
+  savedCrossfires: [] as any[],
+  sourceLibrary: [] as any[],
   savedCases: [] as any[],
   savedChats: [] as any[],
   savedAttacks: [] as any[],
@@ -22,15 +25,17 @@ const mockStore = {
 };
 
 vi.mock('@/lib/stores/session-store', () => ({
-  useSessionStore: vi.fn(() => mockStore),
+  useSessionStore: vi.fn((selector?: (state: typeof mockStore) => unknown) => selector ? selector(mockStore) : mockStore),
 }));
 
 import HistoryPage from '@/pages/HistoryPage';
+import { resetDebates, seedCurrentDebate, TEST_DEBATE_ID } from '@/test/helpers/debate';
 
 describe('HistoryPage', () => {
   beforeEach(async () => {
     vi.clearAllMocks();
     await i18n.changeLanguage('en');
+    seedCurrentDebate();
     mockStore.savedCases = [];
     mockStore.savedChats = [];
     mockStore.savedAttacks = [];
@@ -92,7 +97,7 @@ describe('HistoryPage', () => {
 
   it('renders saved cases when present', () => {
     mockStore.savedCases = [
-      { id: '1', title: 'Test Case', timestamp: Date.now(), data: {} },
+      { id: '1', title: 'Test Case', timestamp: Date.now(), data: {}, debateId: TEST_DEBATE_ID },
     ];
     render(<HistoryPage />);
     expect(screen.getByText('Test Case')).toBeDefined();
@@ -100,7 +105,7 @@ describe('HistoryPage', () => {
 
   it('renders load button for saved cases', () => {
     mockStore.savedCases = [
-      { id: '1', title: 'My Case', timestamp: Date.now(), data: {} },
+      { id: '1', title: 'My Case', timestamp: Date.now(), data: {}, debateId: TEST_DEBATE_ID },
     ];
     render(<HistoryPage />);
     expect(screen.getByText('Load')).toBeDefined();
@@ -113,6 +118,7 @@ describe('HistoryPage', () => {
       title: 'Teszt eset',
       createdAt: Date.now(),
       data: { metadata: { side: 'pro' } },
+      debateId: TEST_DEBATE_ID,
     }];
 
     render(<HistoryPage />);
@@ -130,4 +136,26 @@ describe('HistoryPage', () => {
     const { container } = render(<HistoryPage />);
     expect(container.querySelector('.max-w-5xl')).not.toBeNull();
   });
+
+  it('defaults to the Current Debate and never mixes in other debates', () => {
+    mockStore.savedCases = [
+      { id: '1', title: 'Homework case', createdAt: Date.now(), data: {}, debateId: TEST_DEBATE_ID },
+      { id: '2', title: 'Zoo case', createdAt: Date.now(), data: {}, debateId: 'other-debate' },
+      { id: '3', title: 'One-off case', createdAt: Date.now(), data: {}, debateId: null },
+    ];
+    render(<HistoryPage />);
+    expect(screen.getByText('Homework case')).toBeInTheDocument();
+    expect(screen.queryByText('Zoo case')).toBeNull();
+    expect(screen.queryByText('One-off case')).toBeNull();
+  });
+
+  it('shows one-off and unsorted work with an exact-match suggestion when there is no current debate scope', () => {
+    resetDebates();
+    mockStore.savedCases = [
+      { id: '3', title: 'One-off case', createdAt: Date.now(), data: {}, debateId: null },
+    ];
+    render(<HistoryPage />);
+    expect(screen.getByText('One-off case')).toBeInTheDocument();
+    expect(screen.getByText('These results are not in any debate. Nothing moves until you confirm.')).toBeInTheDocument();
+  });
 });
diff --git a/src/test/pages/LibraryPage.test.tsx b/src/test/pages/LibraryPage.test.tsx
index 7540beb65..a510f2abe 100644
--- a/src/test/pages/LibraryPage.test.tsx
+++ b/src/test/pages/LibraryPage.test.tsx
@@ -35,10 +35,19 @@ vi.mock('@/lib/source-import', () => ({
 
 import LibraryPage from '@/pages/LibraryPage';
 
+// Fixtures belong to the seeded Current Debate unless a test says otherwise.
+let rawSources: any[] = [];
+Object.defineProperty(mockStore, 'sourceLibrary', {
+  get: () => rawSources,
+  set: (sources: any[]) => { rawSources = sources.map((source) => ({ debateId: TEST_DEBATE_ID, ...source })); },
+});
+import { resetDebates, seedCurrentDebate, TEST_DEBATE_ID } from '@/test/helpers/debate';
+
 describe('LibraryPage', () => {
   beforeEach(async () => {
     vi.clearAllMocks();
     await i18n.changeLanguage('en');
+    seedCurrentDebate({ motion: 'This House would ban homework' });
     mockStore.sourceLibrary = [];
     mockStore.sourceFolders = ['General'];
     mockStore.addSource.mockResolvedValue(undefined);
@@ -184,6 +193,7 @@ describe('LibraryPage', () => {
         type: 'url',
         origin: 'https://example.com/article',
         folder: 'General',
+        debateId: TEST_DEBATE_ID,
       });
     });
   });
@@ -320,4 +330,22 @@ describe('LibraryPage', () => {
       expect(mockStore.setFolderActive).toHaveBeenCalledWith('Round 1', false);
     });
   });
+
+  it('shows only the Current Debate sources', () => {
+    mockStore.sourceLibrary = [
+      { id: 's1', title: 'Homework study', content: 'x', type: 'text', isActive: true, createdAt: 1 },
+      { id: 's2', title: 'Zoo study', content: 'y', type: 'text', isActive: true, createdAt: 2, debateId: 'other-debate' },
+    ];
+    render(<LibraryPage />);
+    expect(screen.getByTestId('library-debate')).toHaveTextContent('This House would ban homework');
+    expect(screen.getAllByText('Homework study').length).toBeGreaterThan(0);
+    expect(screen.queryByText('Zoo study')).toBeNull();
+  });
+
+  it('requires a debate before adding or importing sources', () => {
+    resetDebates();
+    render(<LibraryPage />);
+    expect(screen.getByText('Select or create a debate before adding or importing sources.')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /Add Source/ })).toBeDisabled();
+  });
 });
diff --git a/src/test/pages/SparringPage.test.tsx b/src/test/pages/SparringPage.test.tsx
index fe7304703..6f16481cf 100644
--- a/src/test/pages/SparringPage.test.tsx
+++ b/src/test/pages/SparringPage.test.tsx
@@ -48,6 +48,7 @@ vi.mock('recharts', () => ({
 
 import SparringPage from '@/pages/SparringPage';
 import { useSparringStore } from '@/lib/stores/sparring-store';
+import { enableOneOffMode } from '@/test/helpers/debate';
 
 const SCORECARD: SparringScorecard = {
   userScore: 78,
@@ -99,6 +100,7 @@ function renderPage() {
 
 describe('SparringPage', () => {
   beforeEach(() => {
+    enableOneOffMode();
     vi.clearAllMocks();
     vi.stubGlobal('scrollTo', vi.fn());
     Object.defineProperty(navigator, 'onLine', { configurable: true, value: true });
diff --git a/src/test/stores/session-store.test.ts b/src/test/stores/session-store.test.ts
index c191fdc9e..ca2d8a75c 100644
--- a/src/test/stores/session-store.test.ts
+++ b/src/test/stores/session-store.test.ts
@@ -10,6 +10,8 @@ import {
 vi.mock("@/lib/supabase/client", () => ({ supabase: supabaseMock }));
 
 import { useSessionStore } from "@/lib/stores/session-store";
+import { useDebateStore } from "@/lib/stores/debate-store";
+import { resetDebates as resetDebatesForTest, seedCurrentDebate, TEST_DEBATE_ID } from "@/test/helpers/debate";
 import i18n from "@/i18n";
 
 import type { GenerateOutput } from "@/lib/ai/schemas/generate";
@@ -58,6 +60,7 @@ describe("session-store", () => {
   beforeEach(() => {
     resetMockState();
     localStorage.clear();
+    seedCurrentDebate();
     useSessionStore.setState({
       generateResult: null,
       generateLoading: false,
@@ -69,6 +72,9 @@ describe("session-store", () => {
       factoidsLoading: false,
       askMessages: [],
       askLoading: false,
+      askChatId: null,
+      askChatDebateId: null,
+      askPersistedCount: 0,
       savedCases: [],
       savedAttacks: [],
       savedBrainstorms: [],
@@ -92,6 +98,7 @@ describe("session-store", () => {
   beforeEach(() => {
     resetMockState();
     localStorage.clear();
+    seedCurrentDebate();
     useSessionStore.setState({
       generateResult: null,
       generateLoading: false,
@@ -103,6 +110,9 @@ describe("session-store", () => {
       factoidsLoading: false,
       askMessages: [],
       askLoading: false,
+      askChatId: null,
+      askChatDebateId: null,
+      askPersistedCount: 0,
       savedCases: [],
       savedAttacks: [],
       savedBrainstorms: [],
@@ -473,6 +483,7 @@ describe("session-store", () => {
         type: 'text' as const,
         folder: s.folder,
         isActive: s.isActive ?? true,
+        debateId: TEST_DEBATE_ID,
         createdAt: Date.now(),
       })),
     } as Partial<ReturnType<typeof useSessionStore.getState>>);
@@ -797,7 +808,7 @@ describe("session-store", () => {
     expect(supabaseMock.from).toHaveBeenCalledWith('source_folders');
   });
 
-  it('does not overwrite local state when server has no persisted data', async () => {
+  it('replaces local saved work with the server so purged rows cannot reappear', async () => {
     useSessionStore.setState({
       savedCases: [{ id: 'local-case', title: 'Local', createdAt: Date.now(), data: { x: 1 } as any }],
     } as Partial<ReturnType<typeof useSessionStore.getState>>);
@@ -813,7 +824,7 @@ describe("session-store", () => {
 
     await useSessionStore.getState().hydrateFromServer();
 
-    expect(useSessionStore.getState().savedCases[0].id).toBe('local-case');
+    expect(useSessionStore.getState().savedCases).toEqual([]);
   });
 
   it('hydrates safely when Supabase query responses contain null data arrays', async () => {
@@ -1017,6 +1028,7 @@ describe("session-store", () => {
       origin: "https://example.com/source",
       createdAt: 1,
       isActive: true,
+      debateId: TEST_DEBATE_ID,
       metadata: { url: "https://example.com/source", query: "original query", qualityLabel: "strong" },
     }] });
 
@@ -1038,4 +1050,230 @@ describe("session-store", () => {
       semantic: expect.objectContaining({ useCount: 1, caseUseCount: 1, lastUsedInCase: true }),
     }));
   });
+
+  describe('Current Debate attachment', () => {
+    it('records a result into the debate with its side and newest first', async () => {
+      setMockTableResponse('cases', {
+        insert: { id: 'case-1', title: 'Motion', output: sampleGenerate, created_at: nowIso, debate_id: TEST_DEBATE_ID, side: 'pro' },
+      });
+      const id = await useSessionStore.getState().recordResult('case', {
+        title: 'Motion', input: { motion: 'Motion' }, output: sampleGenerate, debateId: TEST_DEBATE_ID, side: 'pro',
+      });
+      expect(id).toBe('case-1');
+      const insert = supabaseMock.from.mock.results.find((result) => result.value.insert.mock.calls.length > 0)!.value.insert;
+      expect(insert).toHaveBeenCalledWith(expect.objectContaining({ user_id: 'user_1', debate_id: TEST_DEBATE_ID, side: 'pro', title: 'Motion' }));
+      expect(useSessionStore.getState().savedCases[0]).toEqual(expect.objectContaining({ id: 'case-1', debateId: TEST_DEBATE_ID, side: 'pro' }));
+    });
+
+    it('attaches one-off work only through the ownership-checked RPC', async () => {
+      useSessionStore.setState({ savedAttacks: [{ id: 'a1', title: 'One-off', createdAt: 1, data: sampleAttack, debateId: null }] });
+      await useSessionStore.getState().attachItem('attack', 'a1', TEST_DEBATE_ID, 'con');
+      expect(supabaseMock.rpc).toHaveBeenCalledWith('attach_to_debate', { p_kind: 'attack', p_id: 'a1', p_debate_id: TEST_DEBATE_ID, p_side: 'con' });
+      expect(useSessionStore.getState().savedAttacks[0]).toEqual(expect.objectContaining({ debateId: TEST_DEBATE_ID, side: 'con' }));
+    });
+
+    it('records an Ask conversation as one chat and appends later messages to it', async () => {
+      setMockTableResponse('chats', { insert: { id: 'chat-1', title: 'Question', created_at: nowIso, debate_id: TEST_DEBATE_ID, side: 'neutral' } });
+      const store = useSessionStore.getState();
+      store.addAskMessage({ role: 'user', content: 'Question' });
+      store.addAskMessage({ role: 'assistant', content: 'Answer' });
+      await Promise.all([store.syncAskChat(TEST_DEBATE_ID), store.syncAskChat(TEST_DEBATE_ID)]);
+
+      const chatInserts = supabaseMock.from.mock.calls.filter(([table]) => table === 'chats');
+      expect(chatInserts).toHaveLength(1);
+      expect(useSessionStore.getState().askChatId).toBe('chat-1');
+      expect(useSessionStore.getState().askPersistedCount).toBe(2);
+
+      useSessionStore.getState().addAskMessage({ role: 'user', content: 'Follow-up' });
+      useSessionStore.getState().addAskMessage({ role: 'assistant', content: 'More' });
+      await useSessionStore.getState().syncAskChat(TEST_DEBATE_ID);
+      expect(supabaseMock.from.mock.calls.filter(([table]) => table === 'chats')).toHaveLength(1);
+      const messageInserts = supabaseMock.from.mock.results
+        .filter((_, index) => supabaseMock.from.mock.calls[index][0] === 'messages')
+        .map((result) => result.value.insert.mock.calls[0][0]);
+      expect(messageInserts.map((rows: Array<{ content: string }>) => rows.map((row) => row.content)))
+        .toEqual([['Question', 'Answer'], ['Follow-up', 'More']]);
+      expect(useSessionStore.getState().savedChats[0]).toEqual(expect.objectContaining({ id: 'chat-1', debateId: TEST_DEBATE_ID }));
+    });
+
+    it('continues a loaded unsorted chat in place instead of copying it into the debate', async () => {
+      const earlier = [
+        { id: 'm1', role: 'user' as const, content: 'Old question', timestamp: 1 },
+        { id: 'm2', role: 'assistant' as const, content: 'Old answer', timestamp: 2 },
+      ];
+      useSessionStore.setState({ savedChats: [{ id: 'old-chat', title: 'Old', createdAt: 1, data: earlier, debateId: null }] });
+      useSessionStore.getState().loadSavedChat('old-chat');
+      useSessionStore.getState().addAskMessage({ role: 'user', content: 'New question' });
+      useSessionStore.getState().addAskMessage({ role: 'assistant', content: 'New answer' });
+      await useSessionStore.getState().syncAskChat(TEST_DEBATE_ID);
+
+      expect(supabaseMock.from.mock.calls.filter(([table]) => table === 'chats')).toHaveLength(0);
+      const messages = supabaseMock.from.mock.results.find((_, index) => supabaseMock.from.mock.calls[index][0] === 'messages')!.value.insert.mock.calls[0][0];
+      expect(messages.map((row: { chat_id: string; content: string }) => [row.chat_id, row.content]))
+        .toEqual([['old-chat', 'New question'], ['old-chat', 'New answer']]);
+    });
+
+    it('does not hand an in-flight chat to a conversation started after clearing', async () => {
+      setMockTableResponse('chats', { insert: { id: 'chat-1', title: 'First', created_at: nowIso, debate_id: TEST_DEBATE_ID, side: 'neutral' } });
+      useSessionStore.getState().addAskMessage({ role: 'user', content: 'First' });
+      useSessionStore.getState().addAskMessage({ role: 'assistant', content: 'Reply' });
+      let releaseUser!: () => void;
+      supabaseMock.auth.getUser.mockImplementationOnce(() => new Promise((resolve) => {
+        releaseUser = () => resolve({ data: { user: { id: 'user_1' } } } as never);
+      }));
+      const pending = useSessionStore.getState().syncAskChat(TEST_DEBATE_ID);
+      await vi.waitFor(() => expect(releaseUser).toBeTypeOf('function'));
+      // The save has captured the first conversation and is waiting on the server.
+      useSessionStore.getState().clearAskMessages();
+      useSessionStore.getState().addAskMessage({ role: 'user', content: 'Second' });
+      releaseUser();
+      await pending;
+
+      expect(useSessionStore.getState().askChatId).toBeNull();
+      expect(useSessionStore.getState().askPersistedCount).toBe(0);
+      expect(useSessionStore.getState().savedChats[0]).toEqual(expect.objectContaining({ id: 'chat-1' }));
+    });
+
+    it('starts a fresh Ask conversation when the Current Debate changes', () => {
+      useSessionStore.setState({
+        askMessages: [{ id: 'm1', role: 'user', content: 'In A', timestamp: 1 }],
+        askChatId: 'chat-a',
+        askChatDebateId: TEST_DEBATE_ID,
+        askPersistedCount: 1,
+      });
+      const other = { ...useDebateStore.getState().debates[0], id: 'debate-b', motion: 'Other motion' };
+      useDebateStore.setState((state) => ({ debates: [...state.debates, other], currentDebateId: 'debate-b' }));
+
+      expect(useSessionStore.getState()).toEqual(expect.objectContaining({ askMessages: [], askChatId: null, askChatDebateId: null, askPersistedCount: 0 }));
+    });
+
+    it('never carries an Ask conversation across one-off mode', async () => {
+      // A one-off conversation must not be saved into the debate on return.
+      useDebateStore.setState({ oneOff: true });
+      useSessionStore.getState().addAskMessage({ role: 'user', content: 'One-off question' });
+      useSessionStore.getState().addAskMessage({ role: 'assistant', content: 'One-off answer' });
+      useDebateStore.setState({ oneOff: false });
+      expect(useSessionStore.getState().askMessages).toEqual([]);
+
+      // And an open debate chat does not continue in one-off mode.
+      useSessionStore.setState({
+        askMessages: [{ id: 'm1', role: 'user', content: 'In debate', timestamp: 1 }],
+        askChatId: 'chat-a',
+        askChatDebateId: TEST_DEBATE_ID,
+        askPersistedCount: 1,
+      });
+      useDebateStore.setState({ oneOff: true });
+      expect(useSessionStore.getState()).toEqual(expect.objectContaining({ askMessages: [], askChatId: null, askPersistedCount: 0 }));
+    });
+
+    it('drops local work of a deleted debate and keeps unsorted work', () => {
+      useSessionStore.setState({
+        savedCases: [
+          { id: 'in-debate', title: 'A', createdAt: 1, data: sampleGenerate, debateId: TEST_DEBATE_ID },
+          { id: 'unsorted', title: 'B', createdAt: 1, data: sampleGenerate, debateId: null },
+        ],
+      });
+      seedSources({ id: 'src_1', folder: 'General' });
+      useDebateStore.setState({ debates: [], currentDebateId: null });
+
+      expect(useSessionStore.getState().savedCases.map((item) => item.id)).toEqual(['unsorted']);
+      expect(useSessionStore.getState().sourceLibrary).toEqual([]);
+    });
+
+    it('renames and deletes a folder only for the Current Debate', async () => {
+      seedSources({ id: 'mine', folder: 'Auto-saved' });
+      useSessionStore.setState((state) => ({
+        sourceLibrary: [...state.sourceLibrary, { ...state.sourceLibrary[0], id: 'theirs', debateId: 'debate-b' }],
+      }));
+
+      await useSessionStore.getState().renameSourceFolder('Auto-saved', 'Research');
+      const folderOf = (id: string) => useSessionStore.getState().sourceLibrary.find((source) => source.id === id)!.folder;
+      expect([folderOf('mine'), folderOf('theirs')]).toEqual(['Research', 'Auto-saved']);
+      expect(useSessionStore.getState().sourceFolders).toEqual(expect.arrayContaining(['Auto-saved', 'Research']));
+
+      // Empty in this debate, even though another debate still uses the name.
+      await useSessionStore.getState().renameSourceFolder('Research', 'Auto-saved');
+      await expect(useSessionStore.getState().deleteSourceFolder('Research', 'empty-only')).resolves.toBeUndefined();
+      expect(folderOf('theirs')).toBe('Auto-saved');
+    });
+
+    it('refuses to save a source without a debate', async () => {
+      resetDebatesForTest();
+      await expect(useSessionStore.getState().addSource({ title: 'Loose', content: 'x', type: 'text' }))
+        .rejects.toThrow('Select or create a debate before adding sources');
+    });
+
+    it('keeps a tool source out of the retained debate in one-off mode', async () => {
+      useDebateStore.setState({ oneOff: true });
+      await expect(useSessionStore.getState().addSource({ title: 'Loose', content: 'x', type: 'text' }))
+        .rejects.toThrow('Select or create a debate before adding sources');
+      expect(useSessionStore.getState().sourceLibrary).toEqual([]);
+    });
+
+    it('clears the Library of the debate it was confirmed in', async () => {
+      seedSources({ id: 'mine', folder: 'General' });
+      useSessionStore.setState((state) => ({
+        sourceLibrary: [...state.sourceLibrary, { ...state.sourceLibrary[0], id: 'theirs', debateId: 'debate-b' }],
+      }));
+      let releaseUser!: () => void;
+      supabaseMock.auth.getUser.mockImplementationOnce(() => new Promise((resolve) => {
+        releaseUser = () => resolve({ data: { user: { id: 'user_1' } } } as never);
+      }));
+      const pending = useSessionStore.getState().clearLibrary();
+      await vi.waitFor(() => expect(releaseUser).toBeTypeOf('function'));
+      useDebateStore.setState({ currentDebateId: 'debate-b' });
+      releaseUser();
+      await pending;
+
+      expect(useSessionStore.getState().sourceLibrary.map((source) => source.id)).toEqual(['theirs']);
+    });
+
+    it('does not let an older debate load undo a switch made while it ran', async () => {
+      const row = (id: string, motion: string) => ({ id, motion, settings: {}, instructions: '', last_activity_at: nowIso, created_at: nowIso });
+      const server = { debates: [row('debate-a', 'A'), row('debate-b', 'B')], current: 'debate-a' };
+      let releaseFirstLoad!: () => void;
+      const firstLoad = new Promise<void>((resolve) => { releaseFirstLoad = resolve; });
+      let debateLoads = 0;
+      const originalFrom = supabaseMock.from.getMockImplementation();
+      // A chainable query whose result is read when awaited, so it reflects server state at that time.
+      const query = (read: () => unknown, gate?: Promise<void>) => {
+        const builder: Record<string, unknown> = {};
+        for (const method of ['select', 'order', 'eq', 'update', 'upsert', 'maybeSingle']) builder[method] = () => builder;
+        builder.then = (resolve: (value: unknown) => void) => (gate ?? Promise.resolve()).then(() => resolve({ data: read(), error: null }));
+        return builder;
+      };
+      supabaseMock.from.mockImplementation(((table: string) => {
+        if (table === 'debates') {
+          debateLoads += 1;
+          const snapshot = server.debates;
+          return query(() => snapshot, debateLoads === 2 ? firstLoad : undefined);
+        }
+        const snapshot = server.current;
+        return { ...query(() => ({ debate_id: snapshot })), upsert: (value: { debate_id: string }) => { server.current = value.debate_id; return query(() => null); } };
+      }) as never);
+      try {
+        resetDebatesForTest();
+        await useDebateStore.getState().hydrate();
+        expect(useDebateStore.getState().currentDebateId).toBe('debate-a');
+        // A refresh starts, then the user switches before it returns.
+        const loading = useDebateStore.getState().hydrate();
+        await vi.waitFor(() => expect(debateLoads).toBe(2));
+        await useDebateStore.getState().switchDebate('debate-b');
+        releaseFirstLoad();
+        await loading;
+        expect(useDebateStore.getState().currentDebateId).toBe('debate-b');
+      } finally {
+        supabaseMock.from.mockImplementation(originalFrom as never);
+      }
+    });
+
+    it('drops server-backed lists persisted by older clients', () => {
+      const migrate = useSessionStore.persist.getOptions().migrate!;
+      const migrated = migrate({ savedCases: [{ id: 'old' }], sourceLibrary: [{ id: 'legacy' }], askMessages: [{ id: 'm' }], generateForm: { motion: 'kept' } }, 0) as Record<string, unknown>;
+      expect(migrated).not.toHaveProperty('savedCases');
+      expect(migrated).not.toHaveProperty('askMessages');
+      expect(migrated).not.toHaveProperty('sourceLibrary');
+      expect(migrated.generateForm).toEqual({ motion: 'kept' });
+    });
+  });
 });
diff --git a/src/test/stores/sparring-store.test.ts b/src/test/stores/sparring-store.test.ts
index 51ef763a7..cbdfae2ed 100644
--- a/src/test/stores/sparring-store.test.ts
+++ b/src/test/stores/sparring-store.test.ts
@@ -480,9 +480,9 @@ describe('sparring-store', () => {
 
     supabaseMock.from.mockImplementationOnce(() => ({
       delete: () => ({
-        eq: async () => ({ data: null, error: { message: 'delete unavailable' } }),
+        eq: async () => ({ data: null as unknown, error: { message: 'delete unavailable' } }),
       }),
-    } as ReturnType<typeof supabaseMock.from>));
+    } as unknown as ReturnType<typeof supabaseMock.from>));
 
     await expect(useSparringStore.getState().deleteSavedSession(session.id))
       .rejects.toThrow('delete unavailable');
diff --git a/supabase/README.md b/supabase/README.md
index d35c3a832..b58734e9d 100644
--- a/supabase/README.md
+++ b/supabase/README.md
@@ -117,6 +117,8 @@ The stack begins at port `54321` and is not parallel-safe across worktrees. Coor
 
 The database gate proves migration replay and pgTAP assertions locally. It does not prove staging or production state.
 
+`20260926090100_legacy_debate_cleanup.sql` is destructive and one-time: it deletes legacy results, chats, flowcharts, sparring rounds, and sources that belong to no debate and had no activity in the 30 days before `20260926090000_current_debates.sql` recorded its rollout time in `private.current_debate_rollout`. Work created after that time is never touched, however late the cleanup runs. Keep it separate from the additive `20260926090000_current_debates.sql`, and apply it to a remote project only with explicit authorization for that environment.
+
 ## Edge Function tests
 
 Run:
diff --git a/supabase/migrations/20260926090000_current_debates.sql b/supabase/migrations/20260926090000_current_debates.sql
new file mode 100644
index 000000000..634e0d01e
--- /dev/null
+++ b/supabase/migrations/20260926090000_current_debates.sql
@@ -0,0 +1,265 @@
+-- Personal Current Debate: one motion that the signed-in user prepares across
+-- every tool. Results and sources carry the debate they belong to; rows without
+-- a debate are one-off work or legacy material awaiting confirmation.
+
+CREATE TABLE public.debates (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  user_id uuid NOT NULL REFERENCES auth.users(id) ON DELETE CASCADE,
+  motion text NOT NULL CHECK (char_length(btrim(motion)) BETWEEN 1 AND 1200),
+  settings jsonb NOT NULL DEFAULT '{}'::jsonb
+    CHECK (jsonb_typeof(settings) = 'object' AND octet_length(settings::text) <= 4000),
+  instructions text NOT NULL DEFAULT '' CHECK (char_length(instructions) <= 2000),
+  last_activity_at timestamptz NOT NULL DEFAULT now(),
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now(),
+  -- Child tables reference (user_id, id) so a row can only join its owner's debate.
+  CONSTRAINT debates_user_id_id_key UNIQUE (user_id, id)
+);
+
+CREATE INDEX debates_user_activity_idx ON public.debates (user_id, last_activity_at DESC);
+
+ALTER TABLE public.debates ENABLE ROW LEVEL SECURITY;
+CREATE POLICY debates_own ON public.debates
+  FOR ALL TO authenticated
+  USING (user_id = (SELECT auth.uid()))
+  WITH CHECK (user_id = (SELECT auth.uid()));
+
+CREATE TABLE public.current_debates (
+  user_id uuid PRIMARY KEY REFERENCES auth.users(id) ON DELETE CASCADE,
+  debate_id uuid NOT NULL,
+  updated_at timestamptz NOT NULL DEFAULT now(),
+  CONSTRAINT current_debates_debate_fkey FOREIGN KEY (user_id, debate_id)
+    REFERENCES public.debates (user_id, id) ON DELETE CASCADE
+);
+
+CREATE INDEX current_debates_user_debate_idx ON public.current_debates (user_id, debate_id);
+
+ALTER TABLE public.current_debates ENABLE ROW LEVEL SECURITY;
+CREATE POLICY current_debates_own ON public.current_debates
+  FOR ALL TO authenticated
+  USING (user_id = (SELECT auth.uid()))
+  WITH CHECK (user_id = (SELECT auth.uid()));
+
+-- Crossfire previously lived only in the browser; completed rounds now persist
+-- beside the other tool results.
+CREATE TABLE public.crossfires (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  user_id uuid NOT NULL REFERENCES auth.users(id) ON DELETE CASCADE,
+  title text NOT NULL,
+  input jsonb NOT NULL,
+  output jsonb NOT NULL,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+ALTER TABLE public.crossfires ENABLE ROW LEVEL SECURITY;
+CREATE POLICY crossfires_own ON public.crossfires
+  FOR ALL TO authenticated
+  USING (user_id = (SELECT auth.uid()))
+  WITH CHECK (user_id = (SELECT auth.uid()));
+
+DO $$
+DECLARE
+  v_table text;
+BEGIN
+  FOREACH v_table IN ARRAY ARRAY[
+    'cases', 'attacks', 'brainstorms', 'factoids', 'chats',
+    'flowcharts', 'sparring_sessions', 'crossfires', 'sources'
+  ] LOOP
+    EXECUTE format('ALTER TABLE public.%I ADD COLUMN debate_id uuid', v_table);
+    EXECUTE format(
+      'ALTER TABLE public.%I ADD CONSTRAINT %I FOREIGN KEY (user_id, debate_id) REFERENCES public.debates (user_id, id) ON DELETE CASCADE',
+      v_table, v_table || '_debate_fkey'
+    );
+    EXECUTE format(
+      'CREATE INDEX %I ON public.%I (user_id, debate_id, created_at DESC)',
+      v_table || '_user_debate_idx', v_table
+    );
+    IF v_table <> 'sources' THEN
+      EXECUTE format(
+        'ALTER TABLE public.%I ADD COLUMN side text CHECK (side IN (''pro'', ''con'', ''both'', ''neutral''))',
+        v_table
+      );
+    END IF;
+  END LOOP;
+END;
+$$;
+
+-- Every new source belongs to exactly one debate. Legacy rows may stay unsorted
+-- until the user attaches them, but an attached source cannot be detached.
+CREATE FUNCTION private.require_source_debate()
+RETURNS trigger
+LANGUAGE plpgsql
+SET search_path = ''
+AS $$
+BEGIN
+  IF NEW.debate_id IS NULL AND (TG_OP = 'INSERT' OR OLD.debate_id IS NOT NULL) THEN
+    RAISE EXCEPTION 'a source must belong to a debate' USING ERRCODE = '23514';
+  END IF;
+  RETURN NEW;
+END;
+$$;
+REVOKE ALL ON FUNCTION private.require_source_debate() FROM PUBLIC, anon, authenticated;
+
+CREATE TRIGGER sources_require_debate
+  BEFORE INSERT OR UPDATE OF debate_id ON public.sources
+  FOR EACH ROW EXECUTE FUNCTION private.require_source_debate();
+
+-- Meaningful work (a new result, source, or chat message in a debate) resets
+-- the inactivity clock that drives the five-day check-in.
+CREATE FUNCTION private.touch_debate_activity()
+RETURNS trigger
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = ''
+AS $$
+DECLARE
+  v_debate_id uuid;
+BEGIN
+  IF TG_TABLE_NAME = 'messages' THEN
+    SELECT debate_id INTO v_debate_id FROM public.chats WHERE id = NEW.chat_id;
+  ELSIF TG_OP = 'INSERT' OR NEW.debate_id IS DISTINCT FROM OLD.debate_id THEN
+    v_debate_id := NEW.debate_id;
+  END IF;
+  IF v_debate_id IS NOT NULL THEN
+    UPDATE public.debates SET last_activity_at = now() WHERE id = v_debate_id;
+  END IF;
+  RETURN NULL;
+END;
+$$;
+REVOKE ALL ON FUNCTION private.touch_debate_activity() FROM PUBLIC, anon, authenticated;
+
+DO $$
+DECLARE
+  v_table text;
+BEGIN
+  FOREACH v_table IN ARRAY ARRAY[
+    'cases', 'attacks', 'brainstorms', 'factoids', 'chats',
+    'flowcharts', 'sparring_sessions', 'crossfires', 'sources'
+  ] LOOP
+    EXECUTE format(
+      'CREATE TRIGGER %I AFTER INSERT OR UPDATE OF debate_id ON public.%I FOR EACH ROW EXECUTE FUNCTION private.touch_debate_activity()',
+      v_table || '_touch_debate', v_table
+    );
+  END LOOP;
+END;
+$$;
+
+CREATE TRIGGER messages_touch_debate
+  AFTER INSERT ON public.messages
+  FOR EACH ROW EXECUTE FUNCTION private.touch_debate_activity();
+
+-- Attaches one-off or legacy work to one of the caller's debates. Sparring rows
+-- are written only by the server, so the client cannot update them directly.
+CREATE FUNCTION public.attach_to_debate(p_kind text, p_id uuid, p_debate_id uuid, p_side text DEFAULT NULL)
+RETURNS void
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = ''
+AS $$
+DECLARE
+  v_user_id uuid := auth.uid();
+  v_rows integer;
+BEGIN
+  IF v_user_id IS NULL THEN
+    RAISE EXCEPTION 'authentication required' USING ERRCODE = '28000';
+  END IF;
+  IF p_side IS NOT NULL AND p_side NOT IN ('pro', 'con', 'both', 'neutral') THEN
+    RAISE EXCEPTION 'invalid side' USING ERRCODE = '22023';
+  END IF;
+  IF NOT EXISTS (SELECT 1 FROM public.debates WHERE id = p_debate_id AND user_id = v_user_id) THEN
+    RAISE EXCEPTION 'debate not found' USING ERRCODE = 'P0002';
+  END IF;
+
+  CASE p_kind
+    WHEN 'case' THEN
+      UPDATE public.cases SET debate_id = p_debate_id, side = COALESCE(p_side, side)
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    WHEN 'attack' THEN
+      UPDATE public.attacks SET debate_id = p_debate_id, side = COALESCE(p_side, side)
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    WHEN 'brainstorm' THEN
+      UPDATE public.brainstorms SET debate_id = p_debate_id, side = COALESCE(p_side, side)
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    WHEN 'factoids' THEN
+      UPDATE public.factoids SET debate_id = p_debate_id, side = COALESCE(p_side, side)
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    WHEN 'chat' THEN
+      UPDATE public.chats SET debate_id = p_debate_id, side = COALESCE(p_side, side)
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    WHEN 'flowchart' THEN
+      UPDATE public.flowcharts SET debate_id = p_debate_id, side = COALESCE(p_side, side)
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    WHEN 'sparring' THEN
+      UPDATE public.sparring_sessions SET debate_id = p_debate_id, side = COALESCE(p_side, side)
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    WHEN 'crossfire' THEN
+      UPDATE public.crossfires SET debate_id = p_debate_id, side = COALESCE(p_side, side)
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    WHEN 'source' THEN
+      UPDATE public.sources SET debate_id = p_debate_id
+      WHERE id = p_id AND user_id = v_user_id AND debate_id IS NULL;
+    ELSE
+      RAISE EXCEPTION 'unknown item kind' USING ERRCODE = '22023';
+  END CASE;
+
+  GET DIAGNOSTICS v_rows = ROW_COUNT;
+  IF v_rows <> 1 THEN
+    RAISE EXCEPTION 'item not found or already in a debate' USING ERRCODE = 'P0002';
+  END IF;
+END;
+$$;
+
+REVOKE ALL ON FUNCTION public.attach_to_debate(text, uuid, uuid, text) FROM PUBLIC, anon;
+GRANT EXECUTE ON FUNCTION public.attach_to_debate(text, uuid, uuid, text) TO authenticated;
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE public.debates, public.current_debates, public.crossfires
+  TO authenticated, service_role;
+
+-- Account erase also removes debates and persisted Crossfire rounds.
+CREATE OR REPLACE FUNCTION public.clear_current_user_data()
+RETURNS void
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+DECLARE
+  v_user_id uuid := auth.uid();
+BEGIN
+  IF v_user_id IS NULL THEN
+    RAISE EXCEPTION 'authentication required';
+  END IF;
+
+  PERFORM pg_advisory_xact_lock(hashtextextended(v_user_id::text, 0));
+  INSERT INTO public.user_data_clear_markers (user_id, cleared_at)
+  VALUES (v_user_id, clock_timestamp())
+  ON CONFLICT (user_id) DO UPDATE SET cleared_at = EXCLUDED.cleared_at;
+
+  DELETE FROM public.cases WHERE user_id = v_user_id;
+  DELETE FROM public.attacks WHERE user_id = v_user_id;
+  DELETE FROM public.brainstorms WHERE user_id = v_user_id;
+  DELETE FROM public.factoids WHERE user_id = v_user_id;
+  DELETE FROM public.chats WHERE user_id = v_user_id;
+  DELETE FROM public.flowcharts WHERE user_id = v_user_id;
+  DELETE FROM public.sparring_sessions WHERE user_id = v_user_id;
+  DELETE FROM public.crossfires WHERE user_id = v_user_id;
+  DELETE FROM public.evidence_cards WHERE user_id = v_user_id;
+  DELETE FROM public.sources WHERE user_id = v_user_id;
+  DELETE FROM public.source_folders WHERE user_id = v_user_id;
+  DELETE FROM public.api_keys WHERE user_id = v_user_id;
+  DELETE FROM public.current_debates WHERE user_id = v_user_id;
+  DELETE FROM public.debates WHERE user_id = v_user_id;
+END;
+$$;
+
+REVOKE ALL ON FUNCTION public.clear_current_user_data() FROM PUBLIC, anon;
+GRANT EXECUTE ON FUNCTION public.clear_current_user_data() TO authenticated;
+
+-- When Current Debate shipped here. The one-time legacy cleanup measures its
+-- 30-day window back from this moment and never touches anything created
+-- after it, however late that cleanup is applied.
+CREATE TABLE private.current_debate_rollout (
+  singleton boolean PRIMARY KEY DEFAULT true CHECK (singleton),
+  started_at timestamptz NOT NULL DEFAULT now()
+);
+INSERT INTO private.current_debate_rollout DEFAULT VALUES;
+REVOKE ALL ON private.current_debate_rollout FROM PUBLIC, anon, authenticated;
diff --git a/supabase/migrations/20260926090100_legacy_debate_cleanup.sql b/supabase/migrations/20260926090100_legacy_debate_cleanup.sql
new file mode 100644
index 000000000..858e5b704
--- /dev/null
+++ b/supabase/migrations/20260926090100_legacy_debate_cleanup.sql
@@ -0,0 +1,45 @@
+-- DESTRUCTIVE, ONE-TIME: remove legacy material that predates Current Debate
+-- and had no activity in the 30 days before it shipped. Recent legacy material
+-- stays, without a debate, in the Unsorted view until the user confirms where
+-- it belongs.
+--
+-- Only rows with no debate that were created before the rollout are candidates,
+-- so neither debate work nor later one-off work can be removed, however late
+-- this runs. Nothing schedules it; this migration calls it once. Activity is
+-- the latest edit where a table records one (flowcharts, sparring sessions) and
+-- the latest message for chats. Chat messages and source files go with their
+-- parents through ON DELETE CASCADE; evidence cards keep a null source.
+
+CREATE FUNCTION private.purge_legacy_debate_material(p_rollout timestamptz)
+RETURNS void
+LANGUAGE plpgsql
+SET search_path = ''
+AS $$
+DECLARE
+  v_cutoff timestamptz := p_rollout - interval '30 days';
+BEGIN
+  DELETE FROM public.cases WHERE debate_id IS NULL AND created_at < v_cutoff;
+  DELETE FROM public.attacks WHERE debate_id IS NULL AND created_at < v_cutoff;
+  DELETE FROM public.brainstorms WHERE debate_id IS NULL AND created_at < v_cutoff;
+  DELETE FROM public.factoids WHERE debate_id IS NULL AND created_at < v_cutoff;
+  DELETE FROM public.flowcharts
+  WHERE debate_id IS NULL AND created_at < v_cutoff AND updated_at < v_cutoff;
+  DELETE FROM public.sparring_sessions
+  WHERE debate_id IS NULL AND created_at < v_cutoff AND updated_at < v_cutoff;
+  DELETE FROM public.chats AS chat
+  WHERE chat.debate_id IS NULL
+    AND chat.created_at < v_cutoff
+    AND NOT EXISTS (
+      SELECT 1 FROM public.messages AS message
+      WHERE message.chat_id = chat.id AND message.created_at >= v_cutoff
+    );
+  DELETE FROM public.sources WHERE debate_id IS NULL AND created_at < v_cutoff;
+END;
+$$;
+
+REVOKE ALL ON FUNCTION private.purge_legacy_debate_material(timestamptz)
+  FROM PUBLIC, anon, authenticated, service_role;
+
+SELECT private.purge_legacy_debate_material(
+  (SELECT started_at FROM private.current_debate_rollout)
+);
diff --git a/supabase/tests/current_debates_test.sql b/supabase/tests/current_debates_test.sql
new file mode 100644
index 000000000..a7c89c3d6
--- /dev/null
+++ b/supabase/tests/current_debates_test.sql
@@ -0,0 +1,261 @@
+BEGIN;
+SELECT plan(31);
+
+INSERT INTO auth.users (id) VALUES
+  ('d1111111-1111-4111-8111-111111111111'),
+  ('d2222222-2222-4222-8222-222222222222');
+
+SELECT ok(
+  has_table_privilege('authenticated', 'public.debates', 'SELECT,INSERT,UPDATE,DELETE')
+    AND has_table_privilege('authenticated', 'public.current_debates', 'SELECT,INSERT,UPDATE,DELETE')
+    AND has_table_privilege('authenticated', 'public.crossfires', 'SELECT,INSERT,UPDATE,DELETE')
+    AND has_function_privilege('authenticated', 'public.attach_to_debate(text, uuid, uuid, text)', 'EXECUTE')
+    AND NOT has_function_privilege('anon', 'public.attach_to_debate(text, uuid, uuid, text)', 'EXECUTE'),
+  'signed-in clients can manage debates and attach work; anonymous callers cannot'
+);
+SELECT ok(
+  NOT has_function_privilege('authenticated', 'private.purge_legacy_debate_material(timestamptz)', 'EXECUTE')
+    AND NOT has_function_privilege('service_role', 'private.purge_legacy_debate_material(timestamptz)', 'EXECUTE'),
+  'the one-time legacy purge is not callable through the Data API'
+);
+
+-- Owner A: two debates, as a student preparing two different motions.
+SET LOCAL ROLE authenticated;
+SELECT set_config('request.jwt.claim.sub', 'd1111111-1111-4111-8111-111111111111', true);
+INSERT INTO public.debates (id, user_id, motion, last_activity_at) VALUES
+  ('da000000-0000-4000-8000-000000000001', 'd1111111-1111-4111-8111-111111111111', 'This House would ban homework', now() - interval '6 days'),
+  ('da000000-0000-4000-8000-000000000002', 'd1111111-1111-4111-8111-111111111111', 'This House would abolish zoos', now() - interval '6 days');
+
+SELECT lives_ok(
+  $$INSERT INTO public.current_debates (user_id, debate_id)
+    VALUES ('d1111111-1111-4111-8111-111111111111', 'da000000-0000-4000-8000-000000000001')$$,
+  'a user can make their own debate current'
+);
+SELECT lives_ok(
+  $$INSERT INTO public.current_debates (user_id, debate_id)
+    VALUES ('d1111111-1111-4111-8111-111111111111', 'da000000-0000-4000-8000-000000000002')
+    ON CONFLICT (user_id) DO UPDATE SET debate_id = EXCLUDED.debate_id, updated_at = now()$$,
+  'switching replaces the single current debate'
+);
+SELECT is(
+  (SELECT debate_id FROM public.current_debates),
+  'da000000-0000-4000-8000-000000000002'::uuid,
+  'exactly one current debate follows the user after switching'
+);
+
+SELECT throws_ok(
+  $$INSERT INTO public.sources (user_id, title, content, type)
+    VALUES ('d1111111-1111-4111-8111-111111111111', 'Loose', 'No debate', 'text')$$,
+  '23514',
+  'a source must belong to a debate',
+  'new sources cannot be created outside a debate'
+);
+
+INSERT INTO public.sources (user_id, debate_id, title, content, type) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'da000000-0000-4000-8000-000000000001', 'Homework study', 'Homework evidence', 'text'),
+  ('d1111111-1111-4111-8111-111111111111', 'da000000-0000-4000-8000-000000000002', 'Zoo study', 'Zoo evidence', 'text');
+SELECT is(
+  (SELECT array_agg(title) FROM public.sources WHERE debate_id = 'da000000-0000-4000-8000-000000000001'),
+  ARRAY['Homework study'],
+  'each debate sees only its own sources'
+);
+SELECT throws_ok(
+  $$UPDATE public.sources SET debate_id = NULL WHERE title = 'Homework study'$$,
+  '23514',
+  'a source must belong to a debate',
+  'an attached source cannot be detached into a global library'
+);
+SELECT ok(
+  (SELECT last_activity_at > now() - interval '1 minute' FROM public.debates WHERE id = 'da000000-0000-4000-8000-000000000001'),
+  'adding a source counts as meaningful work'
+);
+
+INSERT INTO public.cases (user_id, debate_id, side, title, input, output) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'da000000-0000-4000-8000-000000000002', 'con', 'Zoo case', '{}', '{}');
+SELECT ok(
+  (SELECT last_activity_at > now() - interval '1 minute' FROM public.debates WHERE id = 'da000000-0000-4000-8000-000000000002'),
+  'saving a result counts as meaningful work'
+);
+SELECT throws_ok(
+  $$INSERT INTO public.cases (user_id, debate_id, side, title, input, output)
+    VALUES ('d1111111-1111-4111-8111-111111111111', 'da000000-0000-4000-8000-000000000002', 'sideways', 'Bad', '{}', '{}')$$,
+  '23514',
+  NULL,
+  'results record only A favor, En contra, both, or neutral'
+);
+
+-- Owner B cannot see, reuse, or point at A's debates.
+SELECT set_config('request.jwt.claim.sub', 'd2222222-2222-4222-8222-222222222222', true);
+SELECT is((SELECT count(*) FROM public.debates), 0::bigint, 'debates are private to their owner');
+SELECT is((SELECT count(*) FROM public.sources), 0::bigint, 'sources in another user''s debate stay private');
+SELECT throws_ok(
+  $$INSERT INTO public.current_debates (user_id, debate_id)
+    VALUES ('d2222222-2222-4222-8222-222222222222', 'da000000-0000-4000-8000-000000000001')$$,
+  '23503',
+  NULL,
+  'another user''s debate cannot become current'
+);
+SELECT throws_ok(
+  $$INSERT INTO public.sources (user_id, debate_id, title, content, type)
+    VALUES ('d2222222-2222-4222-8222-222222222222', 'da000000-0000-4000-8000-000000000001', 'Forged', 'x', 'text')$$,
+  '23503',
+  NULL,
+  'a source cannot be filed into another user''s debate'
+);
+SELECT throws_ok(
+  $$INSERT INTO public.cases (user_id, debate_id, title, input, output)
+    VALUES ('d2222222-2222-4222-8222-222222222222', 'da000000-0000-4000-8000-000000000001', 'Forged', '{}', '{}')$$,
+  '23503',
+  NULL,
+  'a result cannot be filed into another user''s debate'
+);
+
+INSERT INTO public.cases (id, user_id, title, input, output) VALUES
+  ('dc000000-0000-4000-8000-000000000009', 'd2222222-2222-4222-8222-222222222222', 'B one-off', '{}', '{}');
+SELECT throws_ok(
+  $$SELECT public.attach_to_debate('case', 'dc000000-0000-4000-8000-000000000009', 'da000000-0000-4000-8000-000000000001')$$,
+  'P0002',
+  'debate not found',
+  'one-off work cannot be attached to another user''s debate'
+);
+
+-- Back to A: attach one-off and legacy work only after explicit confirmation.
+SELECT set_config('request.jwt.claim.sub', 'd1111111-1111-4111-8111-111111111111', true);
+INSERT INTO public.attacks (id, user_id, title, input, output) VALUES
+  ('dc000000-0000-4000-8000-000000000001', 'd1111111-1111-4111-8111-111111111111', 'One-off attack', '{}', '{}');
+SELECT lives_ok(
+  $$SELECT public.attach_to_debate('attack', 'dc000000-0000-4000-8000-000000000001', 'da000000-0000-4000-8000-000000000001', 'pro')$$,
+  'one-off work can be attached to one of the owner''s debates'
+);
+SELECT is(
+  (SELECT debate_id::text || ':' || side FROM public.attacks WHERE id = 'dc000000-0000-4000-8000-000000000001'),
+  'da000000-0000-4000-8000-000000000001:pro',
+  'attachment records the debate and side'
+);
+SELECT throws_ok(
+  $$SELECT public.attach_to_debate('attack', 'dc000000-0000-4000-8000-000000000001', 'da000000-0000-4000-8000-000000000002')$$,
+  'P0002',
+  'item not found or already in a debate',
+  'attached work cannot be silently moved into another debate'
+);
+SELECT throws_ok(
+  $$SELECT public.attach_to_debate('case', 'dc000000-0000-4000-8000-000000000009', 'da000000-0000-4000-8000-000000000001')$$,
+  'P0002',
+  'item not found or already in a debate',
+  'another user''s one-off work cannot be pulled into a debate'
+);
+
+RESET ROLE;
+INSERT INTO public.sparring_sessions (id, user_id, motion, user_side, persona, status) VALUES
+  ('dc000000-0000-4000-8000-000000000002', 'd1111111-1111-4111-8111-111111111111', 'This House would ban homework', 'con', 'coach', 'complete');
+SET LOCAL ROLE authenticated;
+SELECT set_config('request.jwt.claim.sub', 'd1111111-1111-4111-8111-111111111111', true);
+SELECT lives_ok(
+  $$SELECT public.attach_to_debate('sparring', 'dc000000-0000-4000-8000-000000000002', 'da000000-0000-4000-8000-000000000001', 'con')$$,
+  'server-written sparring rounds attach through the RPC'
+);
+
+DELETE FROM public.debates WHERE id = 'da000000-0000-4000-8000-000000000002';
+SELECT ok(
+  NOT EXISTS (SELECT 1 FROM public.sources WHERE title = 'Zoo study')
+    AND NOT EXISTS (SELECT 1 FROM public.cases WHERE title = 'Zoo case')
+    AND NOT EXISTS (SELECT 1 FROM public.current_debates),
+  'deleting a debate removes its sources, results, and current pointer'
+);
+SELECT is(
+  (SELECT count(*) FROM public.sources WHERE debate_id = 'da000000-0000-4000-8000-000000000001'),
+  1::bigint,
+  'deleting one debate leaves the other debate intact'
+);
+RESET ROLE;
+
+-- The one-time cleanup. Pretend Current Debate shipped 60 days ago, so legacy
+-- work is anything created before that and quiet since 90 days ago.
+SELECT is(
+  (SELECT count(*) FROM private.current_debate_rollout),
+  1::bigint,
+  'the schema migration records exactly one rollout time'
+);
+SELECT ok(
+  NOT has_table_privilege('authenticated', 'private.current_debate_rollout', 'SELECT,UPDATE,DELETE'),
+  'clients cannot read or move the rollout time'
+);
+
+INSERT INTO public.cases (user_id, title, input, output, created_at) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'Purge old', '{}', '{}', now() - interval '100 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge recent', '{}', '{}', now() - interval '70 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge after rollout', '{}', '{}', now() - interval '40 days');
+INSERT INTO public.attacks (user_id, title, input, output, created_at) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'Purge old', '{}', '{}', now() - interval '100 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge recent', '{}', '{}', now() - interval '70 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge after rollout', '{}', '{}', now() - interval '40 days');
+INSERT INTO public.brainstorms (user_id, title, input, output, created_at) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'Purge old', '{}', '{}', now() - interval '100 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge recent', '{}', '{}', now() - interval '70 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge after rollout', '{}', '{}', now() - interval '40 days');
+INSERT INTO public.factoids (user_id, title, input, output, created_at) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'Purge old', '{}', '{}', now() - interval '100 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge recent', '{}', '{}', now() - interval '70 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge after rollout', '{}', '{}', now() - interval '40 days');
+INSERT INTO public.cases (user_id, debate_id, title, input, output, created_at) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'da000000-0000-4000-8000-000000000001', 'Purge debate work', '{}', '{}', now() - interval '200 days');
+ALTER TABLE public.sources DISABLE TRIGGER sources_require_debate;
+INSERT INTO public.sources (user_id, title, content, type, created_at) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'Purge old source', 'x', 'text', now() - interval '100 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge recent source', 'x', 'text', now() - interval '70 days');
+ALTER TABLE public.sources ENABLE TRIGGER sources_require_debate;
+INSERT INTO public.flowcharts (user_id, title, created_at, updated_at) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'Purge old flow', now() - interval '100 days', now() - interval '100 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge edited flow', now() - interval '100 days', now() - interval '5 days');
+INSERT INTO public.sparring_sessions (user_id, motion, user_side, persona, status, created_at, updated_at) VALUES
+  ('d1111111-1111-4111-8111-111111111111', 'Purge old round', 'pro', 'coach', 'complete', now() - interval '100 days', now() - interval '100 days'),
+  ('d1111111-1111-4111-8111-111111111111', 'Purge resumed round', 'pro', 'coach', 'complete', now() - interval '100 days', now() - interval '80 days');
+INSERT INTO public.chats (id, user_id, title, created_at) VALUES
+  ('dc000000-0000-4000-8000-000000000003', 'd1111111-1111-4111-8111-111111111111', 'Purge old chat', now() - interval '100 days'),
+  ('dc000000-0000-4000-8000-000000000004', 'd1111111-1111-4111-8111-111111111111', 'Purge active chat', now() - interval '100 days');
+INSERT INTO public.messages (chat_id, role, content, created_at) VALUES
+  ('dc000000-0000-4000-8000-000000000003', 'user', 'old message', now() - interval '95 days'),
+  ('dc000000-0000-4000-8000-000000000004', 'user', 'first message', now() - interval '100 days'),
+  ('dc000000-0000-4000-8000-000000000004', 'user', 'recent message', now() - interval '1 day');
+
+SELECT private.purge_legacy_debate_material(now() - interval '60 days');
+
+SELECT is(
+  (SELECT array_agg(kind || ': ' || title ORDER BY kind, title) FROM (
+    SELECT 'attacks' AS kind, title FROM public.attacks WHERE title LIKE 'Purge %'
+    UNION ALL SELECT 'brainstorms', title FROM public.brainstorms WHERE title LIKE 'Purge %'
+    UNION ALL SELECT 'cases', title FROM public.cases WHERE title LIKE 'Purge %'
+    UNION ALL SELECT 'factoids', title FROM public.factoids WHERE title LIKE 'Purge %'
+  ) AS survivors),
+  ARRAY[
+    'attacks: Purge after rollout', 'attacks: Purge recent',
+    'brainstorms: Purge after rollout', 'brainstorms: Purge recent',
+    'cases: Purge after rollout', 'cases: Purge debate work', 'cases: Purge recent',
+    'factoids: Purge after rollout', 'factoids: Purge recent'
+  ],
+  'only legacy results quiet for 30 days before rollout go; recent, later one-off, and debate work stay'
+);
+SELECT is(
+  (SELECT array_agg(title ORDER BY title) FROM public.sources WHERE title LIKE 'Purge %'),
+  ARRAY['Purge recent source'],
+  'recent unsorted sources remain for the user to confirm'
+);
+SELECT is(
+  (SELECT array_agg(title ORDER BY title) FROM public.flowcharts WHERE title LIKE 'Purge %'),
+  ARRAY['Purge edited flow'],
+  'an old flowchart edited recently is kept'
+);
+SELECT is(
+  (SELECT array_agg(motion ORDER BY motion) FROM public.sparring_sessions WHERE motion LIKE 'Purge %'),
+  ARRAY['Purge resumed round'],
+  'an old sparring round with recent activity is kept'
+);
+SELECT ok(
+  NOT EXISTS (SELECT 1 FROM public.chats WHERE id = 'dc000000-0000-4000-8000-000000000003')
+    AND NOT EXISTS (SELECT 1 FROM public.messages WHERE chat_id = 'dc000000-0000-4000-8000-000000000003')
+    AND (SELECT count(*) FROM public.messages WHERE chat_id = 'dc000000-0000-4000-8000-000000000004') = 2,
+  'quiet old chats go with their messages; an old chat with a recent message stays whole'
+);
+
+SELECT * FROM finish();
+ROLLBACK;