diff --git a/.claude/skills/verify-debatelab/features/README.md b/.claude/skills/verify-debatelab/features/README.md
index 9884fed72..b01e193e6 100644
--- a/.claude/skills/verify-debatelab/features/README.md
+++ b/.claude/skills/verify-debatelab/features/README.md
@@ -49,7 +49,7 @@ Each feature file starts with an H1 title and one paragraph describing the user-
 - [Voice rounds](./voice-rounds.md): spoken Sparring and Crossfire on the browser voice, with no ElevenLabs key (`recipes/voice-rounds.spec.ts`).
 - [Workspace autosave](./workspace-autosave.md): a slow Crossfire or Sparring save from a Workspace never overwrites newer text (`recipes/workspace-autosave.spec.ts`). Needs `up --collab`; skips without it.
 - [Account data](./account-data.md): Download my data and Delete account, each proven against a bystander (`recipes/account-data.spec.ts`); Delete All My Data scoped against a bystander (`e2e/full-stack/account-data.spec.ts`).
-- Account: output language reaching the model from a new device, flowchart node delete, save and load, and the speech timer (`recipes/account.spec.ts`).
+- Account: output language reaching the model from a new device, flowchart node delete (at once, with an `Undo` toast; no confirm dialog), save and load, and the speech timer (`R` resets only while paused) (`recipes/account.spec.ts`).
 - Billing: expired account blocked, promo code restores access (`recipes/billing.spec.ts`); signed, forged, and replayed Stripe webhooks (`e2e/full-stack/billing.spec.ts`).
 - Admin announcements and the non-admin block (`e2e/full-stack/admin.spec.ts`), public share links (`e2e/full-stack/public.spec.ts`), and Workspaces with live collaboration and invites (`e2e/workspace-collaboration.spec.ts`).
 
diff --git a/.claude/skills/verify-debatelab/features/ai-tools.md b/.claude/skills/verify-debatelab/features/ai-tools.md
index 7620bed5a..252a9a568 100644
--- a/.claude/skills/verify-debatelab/features/ai-tools.md
+++ b/.claude/skills/verify-debatelab/features/ai-tools.md
@@ -25,11 +25,14 @@ Preconditions:
 - **Brainstorm.** On `/app/brainstorm`, fill the field labelled `Motion / Topic *` and click `Start Brainstorming`. With no Current Debate, the dialog `Start a debate with this motion?` opens first: `chooseForMotion(page, "create")` (or `"once"`). The text `FAKE-PROVIDER idea 1` appears. `providerCall("brainstorm").user` contains `Motion: <motion>`, and the `brainstorms` row is filed in the new debate. With a Current Debate, the field is prefilled and no dialog opens unless the motion differs.
 - **Factoids.** On `/app/factoids`, fill the field labelled `Statement *` and click `Find Factoids`. The text `FAKE-PROVIDER search suggestion` appears.
 - **Ask, streamed.** On `/app/ask`, fill the placeholder `Ask your debate coach...` and click the button named `Send message`. The text `FAKE-PROVIDER streamed answer: ...` appears. `fake.requests()` features contain `ask-stream` and not `ask`. `ai_requests` gets `{feature: "ask", status: "success"}`.
-- **Ask, cited.** Click `#citation-mode` first, then send. The text `FAKE-PROVIDER answer` appears, and `providerCall("ask")` fired.
+- **Ask, cited.** Open the `Options` button above the message box, click `#citation-mode`, close it with Escape, then send. The text `FAKE-PROVIDER answer` appears, and `providerCall("ask")` fired.
+
+- **Stop and errors.** While Ask answers, the send button becomes `Stop answering`; Stop keeps the partial reply and returns focus to the box, which stays editable throughout. A failed request leaves an `alert` above the box with `Retry`, which asks again without adding the question twice. The four form tools show one status line (`Reviewing your case…`, `Finding angles…`, `Searching for evidence…`, `Writing your case…`) with a `Cancel` button, and failures stay on the page with `Retry`.
+- **Discuss.** A result's `Discuss` button opens Ask, which sends the summary as the user's message through the streaming path.
 
 ## Gotchas
 
 - Ask silently falls back to the non-streaming path if streaming fails, so a visible answer alone does not prove streaming. Check the provider feature list.
 - Factoids evidence locally shows only that the pipeline completes without inventing citations. It does not show real sources.
 - Attack, Factoids, and Ask take no motion, so they open no motion dialog. Brainstorm does (see [current-debate](./current-debate.md)).
-- `ask-web` (`#web-search-mode`) proves web sources only in live mode; fake mode records an `unverified` annotation.
+- `ask-web` (`#web-search-mode`, inside `Options`) proves web sources only in live mode; fake mode records an `unverified` annotation.
diff --git a/.claude/skills/verify-debatelab/features/case-generation.md b/.claude/skills/verify-debatelab/features/case-generation.md
index 0078f0704..aca27a4ff 100644
--- a/.claude/skills/verify-debatelab/features/case-generation.md
+++ b/.claude/skills/verify-debatelab/features/case-generation.md
@@ -28,9 +28,10 @@ Preconditions:
 - **Provider side effect.** `providerCall("generate")`'s `user` contains `Motion: <motion>`. `ai_requests` for the user contains `{feature: "generate", status: "success"}`.
 - **Filed in the debate.** `cases` for the user is one row whose `debates(motion)` is the motion. On a fresh browser context, `/app/history` shows it as a heading in the `Cases` tab panel, and `Load` reopens it.
 - **Save (one-off).** Generate with no debate and choose `chooseForMotion(page, "once")`. Click the button named `Save` (use `exact`), fill the dialog field labelled `Case title`, and click the dialog's `Save` button. `cases` for the user is `[{title, debate_id: null}]`. On a fresh browser context, `/app/history` shows `One-off and unsorted work` with a list item holding the title.
-- **Error.** Call `await fake.fail("generate", 500)`, start the debate, and generate. The text `Generation Failed` (use `exact`) appears. Clicking again then succeeds.
+- **Error.** Call `await fake.fail("generate", 500)`, start the debate, and generate. An `alert` holding `Generation Failed` stays above the results with a `Retry` button; clicking `Retry` succeeds and removes it.
+- **Cancel.** While a generation runs, the results column shows `Writing your case…` and a `Cancel` button. Cancel stops the request and shows no error.
 - **Quota.** Update `user_settings` to set `daily_limit_override: 0` through `admin`, start the debate, then generate. The dialog shows `Daily Access Paused`. `fake.requests()` has no `generate` entry.
-- **Regenerate a section.** After generating, click the button named `Regenerate Arguments` (the section titles are `Case Structure`, `Arguments`, `Predicted Opponent Case`, `Prepared Counters`). Hold the request with `page.route("**/functions/v1/ai", ...)` to check the in-flight state: a `status` with `Regenerating Arguments` is visible and `Regenerate Case Structure` is disabled. The toast `Section regenerated` follows.
+- **Regenerate a section.** After generating, click the button named `Regenerate Arguments` (the section titles are `Case Structure`, `Arguments`, `Predicted Opponent Case`, `Prepared Counters`). Hold the request with `page.route("**/functions/v1/ai", ...)` to check the in-flight state: a `status` with `Regenerating Arguments` is visible and `Regenerate Case Structure` is disabled. The toast `Section regenerated` follows. A full generation shows no toast: the result appears in place (and scrolls into view on phones).
 - **Export.** Wait for `page.waitForEvent("download")` while clicking the button named `PDF` or `DOCX` (use `exact`). Check the suggested filename's extension and the file's magic bytes.
 
 ## Gotchas
diff --git a/.claude/skills/verify-debatelab/recipes/account.spec.ts b/.claude/skills/verify-debatelab/recipes/account.spec.ts
index 28e7cc2e8..dd2467476 100644
--- a/.claude/skills/verify-debatelab/recipes/account.spec.ts
+++ b/.claude/skills/verify-debatelab/recipes/account.spec.ts
@@ -38,11 +38,15 @@ test("flow-edit: a flowchart node is deleted, the chart is saved, and it loads b
   const title = `Verify flow ${Date.now()}`;
   await page.goto("/app/flowchart");
   await page.getByText("Argument 1", { exact: true }).first().click();
+  // A node can be put back exactly, so it deletes at once and the toast offers Undo.
+  await page.getByRole("button", { name: "Delete" }).last().click();
+  await expect(page.getByRole("alertdialog")).toHaveCount(0);
+  await expect(page.getByText("Argument 1", { exact: true })).toHaveCount(0);
+  await page.getByRole("button", { name: "Undo" }).click();
+  await expect(page.getByText("Argument 1", { exact: true })).toHaveCount(1);
+  await evidence.step("Deleted Argument 1, then restored it with Undo");
+  await page.getByText("Argument 1", { exact: true }).first().click();
   await page.getByRole("button", { name: "Delete" }).last().click();
-  const confirm = page.getByRole("alertdialog");
-  await expect(confirm.getByText("Delete node?")).toBeVisible();
-  await confirm.getByRole("button", { name: "Delete node" }).click();
-  await expect(page.getByText("Node deleted").first()).toBeVisible();
   await expect(page.getByText("Argument 1", { exact: true })).toHaveCount(0);
   await evidence.shot("01-node-deleted");
 
diff --git a/.claude/skills/verify-debatelab/recipes/ai-tools.spec.ts b/.claude/skills/verify-debatelab/recipes/ai-tools.spec.ts
index 1fb85bf3a..907fcfb6d 100644
--- a/.claude/skills/verify-debatelab/recipes/ai-tools.spec.ts
+++ b/.claude/skills/verify-debatelab/recipes/ai-tools.spec.ts
@@ -93,7 +93,10 @@ test("ask-stream: Ask streams a coaching answer and records usage", async ({ sig
 
 test("ask-cited: Ask in citation mode uses the structured endpoint", async ({ signedIn: page, evidence }) => {
   await page.goto("/app/ask");
+  // The Ask switches live in the Options popover above the message box.
+  await page.getByRole("button", { name: "Options" }).click();
   await page.locator("#citation-mode").click();
+  await page.keyboard.press("Escape");
   await page.getByPlaceholder("Ask your debate coach...").fill("Which evidence supports fare-free transit?");
   const response = aiResponse(page, "ask");
   await page.getByRole("button", { name: "Send message" }).click();
@@ -106,7 +109,10 @@ test("ask-cited: Ask in citation mode uses the structured endpoint", async ({ si
 
 test("ask-web: Ask with web search shows the sources it used", async ({ signedIn: page, evidence }) => {
   await page.goto("/app/ask");
+  // The Ask switches live in the Options popover above the message box.
+  await page.getByRole("button", { name: "Options" }).click();
   await page.locator("#web-search-mode").click();
+  await page.keyboard.press("Escape");
   await page.getByPlaceholder("Ask your debate coach...").fill("What did recent studies find about fare-free public transport ridership?");
   const response = aiResponse(page, "ask");
   await page.getByRole("button", { name: "Send message" }).click();
diff --git a/.claude/skills/verify-debatelab/recipes/case-generation.spec.ts b/.claude/skills/verify-debatelab/recipes/case-generation.spec.ts
index 1920fe22a..c3f04f707 100644
--- a/.claude/skills/verify-debatelab/recipes/case-generation.spec.ts
+++ b/.claude/skills/verify-debatelab/recipes/case-generation.spec.ts
@@ -192,13 +192,16 @@ test("gen-error: a provider failure shows an error and the retry succeeds", asyn
   await fake.fail("generate", 500);
   await openGenerate(page);
   await page.getByRole("button", { name: "Generate Debate Case" }).click();
-  await expect(page.getByText("Generation Failed", { exact: true })).toBeVisible({ timeout: AI_TIMEOUT });
+  // The failure stays on the page, with Retry, until the next run.
+  const failure = page.getByRole("alert").filter({ hasText: "Generation Failed" });
+  await expect(failure).toBeVisible({ timeout: AI_TIMEOUT });
   await evidence.shot("01-failed");
   await expect(page.getByRole("button", { name: "Generate Debate Case" })).toBeEnabled();
 
   const response = aiResponse(page, "generate");
-  await page.getByRole("button", { name: "Generate Debate Case" }).click();
+  await failure.getByRole("button", { name: "Retry" }).click();
   const body = await response;
+  await expect(failure).toHaveCount(0);
   await expect(page.getByText((body.output as unknown as CaseOutput).caseStructure.thesis).first()).toBeVisible();
   await evidence.shot("02-retried");
 });
diff --git a/agentic/replay/0b6684c4cf8f85ea83d9d2c90b3638a2f99b41bd44866a41d64915470d42a880.json b/agentic/replay/0b6684c4cf8f85ea83d9d2c90b3638a2f99b41bd44866a41d64915470d42a880.json
index 461b8c044..f2a29b384 100644
--- a/agentic/replay/0b6684c4cf8f85ea83d9d2c90b3638a2f99b41bd44866a41d64915470d42a880.json
+++ b/agentic/replay/0b6684c4cf8f85ea83d9d2c90b3638a2f99b41bd44866a41d64915470d42a880.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T09:24:38.325Z",
+  "createdAt": "2026-10-09T12:15:15.386Z",
   "payload": {
     "actions": [
       {
@@ -24,14 +24,6 @@
           }
         }
       },
-      {
-        "name": "tap",
-        "summary": "tap button \"Delete node\"",
-        "target": {
-          "role": "button",
-          "name": "Delete node"
-        }
-      },
       {
         "name": "tap",
         "summary": "tap button \"Save\"",
@@ -41,15 +33,10 @@
         }
       },
       {
-        "name": "type",
-        "summary": "type \"Zoo ban flow\" into textbox \"Node title...\" in \"Save Flowchart\"",
-        "target": {
-          "role": "textbox",
-          "name": "Node title...",
-          "placeholder": "Node title...",
-          "within": "Save Flowchart"
-        },
-        "value": "Zoo ban flow"
+        "name": "typeText",
+        "summary": "type \"Zoo ban flow\" into the focused field",
+        "value": "Zoo ban flow",
+        "replace": false
       },
       {
         "name": "tap",
@@ -72,7 +59,7 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Deleted Argument 1; the flowchart now shows two arguments. Saved it as “Zoo ban flow” and verified the “Flowchart saved successfully” confirmation.",
+    "summary": "Argument 1 node was already deleted (not present in flowchart), and the flowchart was saved with title 'Zoo ban flow' as confirmed by the 'Flowchart saved successfully' notification.",
     "startPath": "/app/flowchart",
     "endPath": "/app/flowchart",
     "endAnchors": [
@@ -109,6 +96,6 @@
         "name": "Opening Flowchart"
       }
     ],
-    "endWaitMs": 13789
+    "endWaitMs": 13064
   }
 }
diff --git a/agentic/replay/126b78cf76461974e31c525473531fea764059779def23ffec087cecc00a0950.json b/agentic/replay/126b78cf76461974e31c525473531fea764059779def23ffec087cecc00a0950.json
index ec8071a47..4bbcaa666 100644
--- a/agentic/replay/126b78cf76461974e31c525473531fea764059779def23ffec087cecc00a0950.json
+++ b/agentic/replay/126b78cf76461974e31c525473531fea764059779def23ffec087cecc00a0950.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:38:04.778Z",
+  "createdAt": "2026-10-09T12:08:00.760Z",
   "payload": {
     "actions": [
       {
@@ -34,19 +34,19 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Entered the provided argument and ran Find Weaknesses. The completed analysis is visible, identifying a major evidential weakness and offering an opponent attack, an improved version, and further critique.",
+    "summary": "The argument was entered into the 'Your Argument' field and 'Find Weaknesses' was tapped. The screen now shows the full critique: an overall assessment (62/100), one major weakness (no comparative evidence for the congestion claim), detected fallacies (hasty generalization), cross-examination quest…",
     "startPath": "/app/attack",
     "endPath": "/app/attack",
     "endAnchors": [
       {
-        "role": "button",
-        "name": "Close"
+        "role": "heading",
+        "name": "Attack"
       },
       {
-        "text": "Attack analysis complete"
+        "text": "No current debate. Results stay one-off until you start one."
       },
       {
-        "text": "The critique is ready."
+        "text": "*"
       },
       {
         "role": "textbox",
@@ -55,36 +55,24 @@
         "value": "Free public transport cuts congestion because more people ride the bus."
       },
       {
-        "role": "heading",
-        "name": "Overall Assessment"
+        "text": "Pro"
       },
       {
-        "text": "FAKE-PROVIDER attack summary: the central warrant is underdefended."
+        "text": "Reasoning"
       },
       {
-        "text": "Case Strength"
+        "text": "Low"
       },
       {
-        "text": "62/100"
+        "text": "Options"
       }
     ],
     "goneAnchors": [
       {
-        "role": "textbox",
-        "name": "Your Argument *",
-        "placeholder": "Paste your debate case or argument here..."
-      },
-      {
-        "text": "⚔️"
-      },
-      {
-        "role": "heading",
-        "name": "No Mercy Mode"
-      },
-      {
-        "text": "Paste your argument to receive ruthless criticism, identify logical fallacies, and get actionable improvements."
+        "role": "status",
+        "name": "Opening Attack"
       }
     ],
-    "endWaitMs": 14918
+    "endWaitMs": 31437
   }
 }
diff --git a/agentic/replay/2296281fbea5e96beb19e409eaaf03e9257953f151152980f9f33713c14bf2c3.json b/agentic/replay/2296281fbea5e96beb19e409eaaf03e9257953f151152980f9f33713c14bf2c3.json
index 87d78c7bd..46a4210a1 100644
--- a/agentic/replay/2296281fbea5e96beb19e409eaaf03e9257953f151152980f9f33713c14bf2c3.json
+++ b/agentic/replay/2296281fbea5e96beb19e409eaaf03e9257953f151152980f9f33713c14bf2c3.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:38:38.089Z",
+  "createdAt": "2026-10-09T12:20:12.998Z",
   "payload": {
     "actions": [
       {
@@ -37,7 +37,7 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Opened History, found the saved PRO case for “This House would replace school exams with continuous assessment,” and selected Load. The app returned to Generate with the saved case displayed, including its thesis, arguments, predicted opponent case, and prepared counters.",
+    "summary": "Opened History and loaded the debate case. The case is now displayed on the Generate page with the 'Working in:' strip showing the motion 'This House would replace school exams with continuous assessment', and the full case content is visible including thesis, framework, 3 arguments, predicted oppo…",
     "startPath": "/app",
     "endPath": "/app/generate",
     "endAnchors": [
@@ -60,17 +60,23 @@
         "name": "Use once"
       },
       {
-        "role": "heading",
-        "name": "Generate Debate Case"
+        "text": "*"
       },
       {
-        "text": "Create structured arguments for any motion"
+        "role": "textbox",
+        "name": "Motion / Topic *",
+        "placeholder": "e.g., This house believes that artificial intelligence will create more jobs than it destroys",
+        "value": "This House would replace school exams with continuous assessment"
       },
       {
-        "text": "*"
+        "text": "Side"
       }
     ],
     "goneAnchors": [
+      {
+        "role": "heading",
+        "name": "What are you working on?"
+      },
       {
         "text": "Last activity less than a minute ago · 0 sources · 1 outputs"
       },
@@ -93,11 +99,8 @@
       },
       {
         "text": "Explore angles for a motion."
-      },
-      {
-        "text": "Factoids"
       }
     ],
-    "endWaitMs": 15541
+    "endWaitMs": 15310
   }
 }
diff --git a/agentic/replay/23755b48030e2ba88ae7593c0e65506ecd8b0b7d98a4006cfda221eda5edb068.json b/agentic/replay/23755b48030e2ba88ae7593c0e65506ecd8b0b7d98a4006cfda221eda5edb068.json
index 1f420f629..bdc7cbbf2 100644
--- a/agentic/replay/23755b48030e2ba88ae7593c0e65506ecd8b0b7d98a4006cfda221eda5edb068.json
+++ b/agentic/replay/23755b48030e2ba88ae7593c0e65506ecd8b0b7d98a4006cfda221eda5edb068.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T10:49:38.577Z",
+  "createdAt": "2026-10-09T12:08:39.285Z",
   "payload": {
     "actions": [
       {
@@ -64,22 +64,17 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "The new debate is active with the motion “This House would replace school exams with continuous assessment.” Generate completed successfully and displayed “Your debate case is ready,” with the generated case structure and arguments visible.",
+    "summary": "Debate started on motion 'This House would replace school exams with continuous assessment' and a debate case was generated on the Generate page, as confirmed by the current debate strip and the displayed case with thesis, arguments, and counters.",
     "startPath": "/app",
     "endPath": "/app/generate",
     "endAnchors": [
       {
-        "role": "button",
-        "name": "Close"
-      },
-      {
-        "text": "Generate complete"
-      },
-      {
-        "text": "Your debate case is ready."
+        "text": "Current debate"
       },
       {
-        "text": "Current debate"
+        "role": "button",
+        "name": "Current debate: This House would replace school exams with continuous assessment",
+        "testId": "current-debate-desktop"
       },
       {
         "role": "heading",
@@ -93,6 +88,14 @@
       },
       {
         "text": "In favor"
+      },
+      {
+        "role": "button",
+        "name": "Change"
+      },
+      {
+        "role": "button",
+        "name": "Use once"
       }
     ],
     "goneAnchors": [
@@ -101,6 +104,10 @@
         "name": "Start debate",
         "testId": "current-debate-desktop"
       },
+      {
+        "role": "heading",
+        "name": "What are you working on?"
+      },
       {
         "text": "No current debate"
       },
@@ -119,11 +126,8 @@
       },
       {
         "text": "Brainstorm"
-      },
-      {
-        "text": "Explore angles for a motion."
       }
     ],
-    "endWaitMs": 15032
+    "endWaitMs": 36219
   }
 }
diff --git a/agentic/replay/495abc7af387dc9131381dcd246cd42ee762f88ed3d578f31d3211625788e805.json b/agentic/replay/495abc7af387dc9131381dcd246cd42ee762f88ed3d578f31d3211625788e805.json
index a9e454ca7..f8ff3d0b9 100644
--- a/agentic/replay/495abc7af387dc9131381dcd246cd42ee762f88ed3d578f31d3211625788e805.json
+++ b/agentic/replay/495abc7af387dc9131381dcd246cd42ee762f88ed3d578f31d3211625788e805.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T09:21:22.438Z",
+  "createdAt": "2026-10-09T12:10:08.347Z",
   "payload": {
     "actions": [
       {
@@ -24,14 +24,6 @@
           }
         }
       },
-      {
-        "name": "tap",
-        "summary": "tap button \"Delete node\"",
-        "target": {
-          "role": "button",
-          "name": "Delete node"
-        }
-      },
       {
         "name": "tap",
         "summary": "tap button \"Save\"",
@@ -72,7 +64,7 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Deleted the Argument 1 node and saved the flowchart as “Zoo ban flow.” The app confirmed “Node deleted” and “Flowchart saved successfully.”.",
+    "summary": "Argument 1 was already deleted (cached replay), and the flowchart was saved with title 'Zoo ban flow'. The screen confirms 'Flowchart saved successfully'.",
     "startPath": "/app/flowchart",
     "endPath": "/app/flowchart",
     "endAnchors": [
@@ -109,6 +101,6 @@
         "name": "Opening Flowchart"
       }
     ],
-    "endWaitMs": 13409
+    "endWaitMs": 14370
   }
 }
diff --git a/agentic/replay/4b19b5a96c8088da6cfdc7035b87036fd9cc0ac6dbdd9fc8d128176a57f60dfd.json b/agentic/replay/4b19b5a96c8088da6cfdc7035b87036fd9cc0ac6dbdd9fc8d128176a57f60dfd.json
index 06642db28..57c8d554e 100644
--- a/agentic/replay/4b19b5a96c8088da6cfdc7035b87036fd9cc0ac6dbdd9fc8d128176a57f60dfd.json
+++ b/agentic/replay/4b19b5a96c8088da6cfdc7035b87036fd9cc0ac6dbdd9fc8d128176a57f60dfd.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:39:34.786Z",
+  "createdAt": "2026-10-09T12:10:07.885Z",
   "payload": {
     "actions": [
       {
@@ -34,7 +34,7 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Asked the debate coach “How do I weigh access against cost in a rebuttal?” and verified a visible answer: “FAKE-PROVIDER streamed answer: weigh access against cost.”",
+    "summary": "The question 'How do I weigh access against cost in a rebuttal?' was successfully asked and the coach answered with 'FAKE-PROVIDER streamed answer: weigh access against cost.' The screen confirms both the user message and the AI response are present.",
     "startPath": "/app/ask",
     "endPath": "/app/ask",
     "endAnchors": [
@@ -59,10 +59,13 @@
         "text": "FAKE-PROVIDER streamed answer: weigh access against cost."
       },
       {
-        "text": "Citations"
+        "role": "button",
+        "name": "Options"
       },
       {
-        "text": "Web search"
+        "role": "textbox",
+        "name": "Ask your debate coach...",
+        "placeholder": "Ask your debate coach..."
       }
     ],
     "goneAnchors": [
@@ -71,6 +74,6 @@
         "name": "Opening Ask"
       }
     ],
-    "endWaitMs": 15156
+    "endWaitMs": 27799
   }
 }
diff --git a/agentic/replay/6944dfabce5ae31228a20c2c28d91e6b10f370683c1bdd64349ee6ebd73846e3.json b/agentic/replay/6944dfabce5ae31228a20c2c28d91e6b10f370683c1bdd64349ee6ebd73846e3.json
index 04876ad16..ce31996ad 100644
--- a/agentic/replay/6944dfabce5ae31228a20c2c28d91e6b10f370683c1bdd64349ee6ebd73846e3.json
+++ b/agentic/replay/6944dfabce5ae31228a20c2c28d91e6b10f370683c1bdd64349ee6ebd73846e3.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:40:56.435Z",
+  "createdAt": "2026-10-09T12:22:43.719Z",
   "payload": {
     "actions": [
       {
@@ -34,7 +34,7 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Opened History, found the saved case for “This House would replace school exams with continuous assessment,” and selected Load. The app returned to Generate with the case loaded, showing the case structure, arguments, predicted opponent case, and prepared counters.",
+    "summary": "Opened History and loaded the generated debate case. The case for 'This House would replace school exams with continuous assessment' was found in History and loaded into Generate, showing the thesis, 3 arguments, predicted opponent case, and prepared counters.",
     "startPath": "/app",
     "endPath": "/app/generate",
     "endAnchors": [
@@ -57,17 +57,23 @@
         "name": "Use once"
       },
       {
-        "role": "heading",
-        "name": "Generate Debate Case"
+        "text": "*"
       },
       {
-        "text": "Create structured arguments for any motion"
+        "role": "textbox",
+        "name": "Motion / Topic *",
+        "placeholder": "e.g., This house believes that artificial intelligence will create more jobs than it destroys",
+        "value": "This House would replace school exams with continuous assessment"
       },
       {
-        "text": "*"
+        "text": "Side"
       }
     ],
     "goneAnchors": [
+      {
+        "role": "heading",
+        "name": "What are you working on?"
+      },
       {
         "text": "Last activity less than a minute ago · 0 sources · 1 outputs"
       },
@@ -90,11 +96,8 @@
       },
       {
         "text": "Explore angles for a motion."
-      },
-      {
-        "text": "Factoids"
       }
     ],
-    "endWaitMs": 14008
+    "endWaitMs": 14908
   }
 }
diff --git a/agentic/replay/729490fb7619dcddf35c0c60cedc58d2bc05aff8f07aad051c9ef2cd457f9799.json b/agentic/replay/729490fb7619dcddf35c0c60cedc58d2bc05aff8f07aad051c9ef2cd457f9799.json
index b9efbbe79..a996208a5 100644
--- a/agentic/replay/729490fb7619dcddf35c0c60cedc58d2bc05aff8f07aad051c9ef2cd457f9799.json
+++ b/agentic/replay/729490fb7619dcddf35c0c60cedc58d2bc05aff8f07aad051c9ef2cd457f9799.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T09:22:24.040Z",
+  "createdAt": "2026-10-09T12:11:44.831Z",
   "payload": {
     "actions": [
       {
@@ -64,26 +64,21 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "The new debate is active for “This House would replace school exams with continuous assessment.” Generate is open, and the visible “Generate complete — Your debate case is ready” confirmation and generated case verify the step succeeded.",
+    "summary": "Debate on",
     "startPath": "/app",
     "endPath": "/app/generate",
     "endAnchors": [
-      {
-        "role": "button",
-        "name": "Close"
-      },
-      {
-        "text": "Generate complete"
-      },
-      {
-        "text": "Your debate case is ready."
-      },
       {
         "text": "Current debate"
       },
       {
         "text": "This House would replace school exams with continuous assessment"
       },
+      {
+        "role": "button",
+        "name": "Current debate: This House would replace school exams with continuous assessment",
+        "testId": "current-debate-mobile"
+      },
       {
         "role": "heading",
         "name": "Generate"
@@ -93,6 +88,14 @@
       },
       {
         "text": "In favor"
+      },
+      {
+        "role": "button",
+        "name": "Change"
+      },
+      {
+        "role": "button",
+        "name": "Use once"
       }
     ],
     "goneAnchors": [
@@ -101,6 +104,10 @@
         "name": "Start debate",
         "testId": "current-debate-mobile"
       },
+      {
+        "role": "heading",
+        "name": "What are you working on?"
+      },
       {
         "text": "No current debate"
       },
@@ -119,11 +126,8 @@
       },
       {
         "text": "Brainstorm"
-      },
-      {
-        "text": "Explore angles for a motion."
       }
     ],
-    "endWaitMs": 14124
+    "endWaitMs": 33894
   }
 }
diff --git a/agentic/replay/79a9ee2259d8d16afd564cc66fa33f4b3906e33910768c64dc5c2d643baa1ea1.json b/agentic/replay/79a9ee2259d8d16afd564cc66fa33f4b3906e33910768c64dc5c2d643baa1ea1.json
index 6c57d4360..ac9660b25 100644
--- a/agentic/replay/79a9ee2259d8d16afd564cc66fa33f4b3906e33910768c64dc5c2d643baa1ea1.json
+++ b/agentic/replay/79a9ee2259d8d16afd564cc66fa33f4b3906e33910768c64dc5c2d643baa1ea1.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:46:53.105Z",
+  "createdAt": "2026-10-09T12:09:24.322Z",
   "payload": {
     "actions": [
       {
@@ -34,36 +34,37 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Submitted the factoid search for “Cities with free buses have fewer cars downtown.” Research completed and the results screen shows “Found 0 Factoids” with a no-matching-sources message.",
+    "summary": "Factoid search for 'Cities with free buses have fewer cars downtown.' was executed and completed. The search finished with 0 factoids found, showing 'No verified matching sources were found' — which satisfies the step goal since completion matters regardless of results.",
     "startPath": "/app/factoids",
     "endPath": "/app/factoids",
     "endAnchors": [
       {
-        "role": "button",
-        "name": "Close"
+        "role": "heading",
+        "name": "Factoids"
       },
       {
-        "text": "Research complete"
+        "text": "No current debate. Results stay one-off until you start one."
       },
       {
-        "text": "Verified evidence is ready."
+        "text": "*"
       },
       {
-        "role": "heading",
-        "name": "Factoids"
+        "role": "textbox",
+        "name": "Statement *",
+        "placeholder": "e.g., Renewable energy is more cost-effective than fossil fuels",
+        "value": "Cities with free buses have fewer cars downtown."
       },
       {
-        "text": "No current debate. Results stay one-off until you start one."
+        "text": "Position"
       },
       {
-        "role": "heading",
-        "name": "Find Evidence"
+        "text": "In favor"
       },
       {
-        "text": "Get debate-ready factoids with verified citations"
+        "text": "Source Type"
       },
       {
-        "text": "*"
+        "text": "Any Reputable Source"
       }
     ],
     "goneAnchors": [
@@ -72,6 +73,6 @@
         "name": "Opening Factoids"
       }
     ],
-    "endWaitMs": 14699
+    "endWaitMs": 29486
   }
 }
diff --git a/agentic/replay/d636e78bd57e1346e9ad878bdd394cbf70ccb746bdcfcc35af4c0a7d2cf6795e.json b/agentic/replay/d636e78bd57e1346e9ad878bdd394cbf70ccb746bdcfcc35af4c0a7d2cf6795e.json
index f0c6b8875..ea2c6442a 100644
--- a/agentic/replay/d636e78bd57e1346e9ad878bdd394cbf70ccb746bdcfcc35af4c0a7d2cf6795e.json
+++ b/agentic/replay/d636e78bd57e1346e9ad878bdd394cbf70ccb746bdcfcc35af4c0a7d2cf6795e.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:41:41.696Z",
+  "createdAt": "2026-10-09T12:13:49.892Z",
   "payload": {
     "actions": [
       {
@@ -34,7 +34,7 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Asked the debate coach, “How do I weigh access against cost in a rebuttal?” The conversation displays the question and a response: “FAKE-PROVIDER streamed answer: weigh access against cost.”",
+    "summary": "The question",
     "startPath": "/app/ask",
     "endPath": "/app/ask",
     "endAnchors": [
@@ -62,7 +62,8 @@
         "text": "FAKE-PROVIDER streamed answer: weigh access against cost."
       },
       {
-        "text": "Citations"
+        "role": "button",
+        "name": "Options"
       }
     ],
     "goneAnchors": [
@@ -71,6 +72,6 @@
         "name": "Opening Ask"
       }
     ],
-    "endWaitMs": 12792
+    "endWaitMs": 48628
   }
 }
diff --git a/agentic/replay/d73284119fd8669a81b6ad8f2680b21f11103285e5b28beed208c736f63fd98c.json b/agentic/replay/d73284119fd8669a81b6ad8f2680b21f11103285e5b28beed208c736f63fd98c.json
index 942a2d496..49a355a0d 100644
--- a/agentic/replay/d73284119fd8669a81b6ad8f2680b21f11103285e5b28beed208c736f63fd98c.json
+++ b/agentic/replay/d73284119fd8669a81b6ad8f2680b21f11103285e5b28beed208c736f63fd98c.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:44:38.227Z",
+  "createdAt": "2026-10-09T12:12:49.396Z",
   "payload": {
     "actions": [
       {
@@ -34,36 +34,37 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Searched factoids for “Cities with free buses have fewer cars downtown.” Research completed; the results screen confirms “Found 0 Factoids” and reports no verified matching sources.",
+    "summary": "Factoid search completed for the statement",
     "startPath": "/app/factoids",
     "endPath": "/app/factoids",
     "endAnchors": [
       {
-        "role": "button",
-        "name": "Close"
+        "role": "heading",
+        "name": "Factoids"
       },
       {
-        "text": "Research complete"
+        "text": "No current debate. Results stay one-off until you start one."
       },
       {
-        "text": "Verified evidence is ready."
+        "text": "*"
       },
       {
-        "role": "heading",
-        "name": "Factoids"
+        "role": "textbox",
+        "name": "Statement *",
+        "placeholder": "e.g., Renewable energy is more cost-effective than fossil fuels",
+        "value": "Cities with free buses have fewer cars downtown."
       },
       {
-        "text": "No current debate. Results stay one-off until you start one."
+        "text": "Position"
       },
       {
-        "role": "heading",
-        "name": "Find Evidence"
+        "text": "In favor"
       },
       {
-        "text": "Get debate-ready factoids with verified citations"
+        "text": "Source Type"
       },
       {
-        "text": "*"
+        "text": "Any Reputable Source"
       }
     ],
     "goneAnchors": [
@@ -72,6 +73,6 @@
         "name": "Opening Factoids"
       }
     ],
-    "endWaitMs": 14622
+    "endWaitMs": 29790
   }
 }
diff --git a/agentic/replay/d837eeb2b0665a23180f65fb205e2ea67f8b44f1a1a6a400067d474f1b21cb5f.json b/agentic/replay/d837eeb2b0665a23180f65fb205e2ea67f8b44f1a1a6a400067d474f1b21cb5f.json
index f13c2f6ca..8a541bf7b 100644
--- a/agentic/replay/d837eeb2b0665a23180f65fb205e2ea67f8b44f1a1a6a400067d474f1b21cb5f.json
+++ b/agentic/replay/d837eeb2b0665a23180f65fb205e2ea67f8b44f1a1a6a400067d474f1b21cb5f.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:38:37.416Z",
+  "createdAt": "2026-10-09T12:08:46.651Z",
   "payload": {
     "actions": [
       {
@@ -43,13 +43,18 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Started a Current Debate for “This House would ban zoos” and brainstormed angles. The screen confirms “Brainstorm complete” and shows the saved Top 5 Argument Angles result.",
+    "summary": "Brainstorming on 'This House would ban zoos' completed — motion entered, Start Brainstorming tapped, and the app offered to start a debate which was confirmed. The current screen shows generated brainstorm results (Top 5 Argument Angles), a 'Working in: This House would ban zoos' strip, and 'Curren…",
     "startPath": "/app/brainstorm",
     "endPath": "/app/brainstorm",
     "endAnchors": [
       {
         "text": "Current debate"
       },
+      {
+        "role": "button",
+        "name": "Current debate: This House would ban zoos",
+        "testId": "current-debate-desktop"
+      },
       {
         "role": "heading",
         "name": "Brainstorm"
@@ -70,10 +75,6 @@
       {
         "role": "button",
         "name": "Use once"
-      },
-      {
-        "role": "heading",
-        "name": "Brainstorm Ideas"
       }
     ],
     "goneAnchors": [
@@ -87,6 +88,6 @@
         "testId": "current-debate-desktop"
       }
     ],
-    "endWaitMs": 17658
+    "endWaitMs": 35418
   }
 }
diff --git a/agentic/replay/e0c912b52a6de1dadb5287bb54346d1fac813a9d7ac70a1742898dc3abdf4a99.json b/agentic/replay/e0c912b52a6de1dadb5287bb54346d1fac813a9d7ac70a1742898dc3abdf4a99.json
index 569dada6e..5f01ae9e7 100644
--- a/agentic/replay/e0c912b52a6de1dadb5287bb54346d1fac813a9d7ac70a1742898dc3abdf4a99.json
+++ b/agentic/replay/e0c912b52a6de1dadb5287bb54346d1fac813a9d7ac70a1742898dc3abdf4a99.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:40:42.795Z",
+  "createdAt": "2026-10-09T12:22:15.982Z",
   "payload": {
     "actions": [
       {
@@ -15,19 +15,42 @@
       },
       {
         "name": "tap",
-        "summary": "tap button \"Start Brainstorming\"",
+        "summary": "tap button \"Start debate\" (2 of 2)",
         "target": {
           "role": "button",
-          "name": "Start Brainstorming"
+          "name": "Start debate",
+          "position": {
+            "index": 1,
+            "of": 2
+          }
         }
       },
+      {
+        "name": "type",
+        "summary": "type \"This House would ban zoos\" into textbox \"Motion\" in \"Start new debate\"",
+        "target": {
+          "role": "textbox",
+          "name": "Motion",
+          "placeholder": "This House would…",
+          "within": "Start new debate"
+        },
+        "value": "This House would ban zoos"
+      },
       {
         "name": "tap",
-        "summary": "tap button \"Start debate\" in \"Start a debate with this motion?\"",
+        "summary": "tap button \"Start debate\" in \"Start new debate\"",
         "target": {
           "role": "button",
           "name": "Start debate",
-          "within": "Start a debate with this motion?"
+          "within": "Start new debate"
+        }
+      },
+      {
+        "name": "tap",
+        "summary": "tap button \"Start Brainstorming\"",
+        "target": {
+          "role": "button",
+          "name": "Start Brainstorming"
         }
       }
     ],
@@ -43,7 +66,7 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Started a debate for “This House would ban zoos” and brainstormed angles. The page shows the current debate set to that motion and a saved Brainstorm result with five argument angles.",
+    "summary": "The brainstorm step was completed successfully: (1) navigated to /app/brainstorm, (2) entered motion 'This House would ban zoos', (3) when the app offered to start a new debate with this motion, clicked 'Start debate' to confirm, (4) clicked 'Start Brainstorming' which generated 5 argument angles (…",
     "startPath": "/app/brainstorm",
     "endPath": "/app/brainstorm",
     "endAnchors": [
@@ -53,6 +76,11 @@
       {
         "text": "This House would ban zoos"
       },
+      {
+        "role": "button",
+        "name": "Current debate: This House would ban zoos",
+        "testId": "current-debate-mobile"
+      },
       {
         "role": "heading",
         "name": "Brainstorm"
@@ -60,9 +88,6 @@
       {
         "text": "Working in:"
       },
-      {
-        "text": "Both sides"
-      },
       {
         "role": "button",
         "name": "Change"
@@ -72,8 +97,7 @@
         "name": "Use once"
       },
       {
-        "role": "heading",
-        "name": "Brainstorm Ideas"
+        "text": "*"
       }
     ],
     "goneAnchors": [
@@ -87,6 +111,6 @@
         "testId": "current-debate-mobile"
       }
     ],
-    "endWaitMs": 24713
+    "endWaitMs": 14778
   }
 }
diff --git a/agentic/replay/e753f1e71c4d4ed90310f668e44ebdc847f876ca5ec6d2ade3d672c29aedcaf9.json b/agentic/replay/e753f1e71c4d4ed90310f668e44ebdc847f876ca5ec6d2ade3d672c29aedcaf9.json
index 6abd19266..ac59f14df 100644
--- a/agentic/replay/e753f1e71c4d4ed90310f668e44ebdc847f876ca5ec6d2ade3d672c29aedcaf9.json
+++ b/agentic/replay/e753f1e71c4d4ed90310f668e44ebdc847f876ca5ec6d2ade3d672c29aedcaf9.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "trace-1",
-  "createdAt": "2026-10-06T08:40:03.869Z",
+  "createdAt": "2026-10-09T12:10:40.226Z",
   "payload": {
     "actions": [
       {
@@ -34,36 +34,37 @@
       "callIndex": 0,
       "agent": "default"
     },
-    "summary": "Entered the argument and selected Find Weaknesses. The attack analysis completed and shows an identified major evidential weakness: the congestion claim lacks comparative evidence, with criticism and improvement suggestions displayed.",
+    "summary": "Argument entered and weaknesses found successfully. The critique shows 1 major weakness (evidential gap on congestion claim), a hasty generalization fallacy, cross-examination questions, weighing analysis, and improvement suggestions. The Find Weaknesses action produced the expected analysis output.",
     "startPath": "/app/attack",
     "endPath": "/app/attack",
     "endAnchors": [
       {
-        "role": "button",
-        "name": "Close"
+        "role": "heading",
+        "name": "Attack"
       },
       {
-        "text": "Attack analysis complete"
+        "text": "No current debate. Results stay one-off until you start one."
       },
       {
-        "text": "The critique is ready."
+        "text": "*"
       },
       {
-        "role": "heading",
-        "name": "Attack"
+        "role": "textbox",
+        "name": "Your Argument *",
+        "placeholder": "Paste your debate case or argument here...",
+        "value": "Free public transport cuts congestion because more people ride the bus."
       },
       {
-        "text": "No current debate. Results stay one-off until you start one."
+        "text": "Pro"
       },
       {
-        "role": "heading",
-        "name": "Attack My Case"
+        "text": "Reasoning"
       },
       {
-        "text": "Find weaknesses and get improvement suggestions"
+        "text": "Low"
       },
       {
-        "text": "*"
+        "text": "Options"
       }
     ],
     "goneAnchors": [
@@ -72,6 +73,6 @@
         "name": "Opening Attack"
       }
     ],
-    "endWaitMs": 13006
+    "endWaitMs": 27713
   }
 }
diff --git a/e2e/animation-polish.spec.ts b/e2e/animation-polish.spec.ts
index 750ff2cdf..dbd6990e9 100644
--- a/e2e/animation-polish.spec.ts
+++ b/e2e/animation-polish.spec.ts
@@ -54,11 +54,11 @@ async function generateMockCase(page: Page) {
   await page.getByLabel('Motion / Topic').fill('This House would make public transport free.');
   await page.getByRole('button', { name: 'Generate Debate Case' }).click();
   await page.mouse.move(0, 0);
-  await expect(page.getByText('Reading the motion...')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
+  await expect(page.getByText('Writing your case…')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await expect(page.getByText(/We support the motion/)).toBeVisible({ timeout: STATE_TIMEOUT_MS });
 }
 
-/** Tools open from Home, which is reached from the header. */
+/** Tools open from the Tools page, which is reached from the header. */
 async function openFeatureRoute(page: Page, route: 'brainstorm' | 'factoids' | 'ask') {
   await page.locator('header a[href="/app"]').first().click();
   await page.locator('main').locator(`a[href="/app/${route}"]`).click();
@@ -77,9 +77,9 @@ test('removes non-essential route and state movement for reduced motion', async
 
   await generateMockCase(page);
   await expect(page.locator('#generate-results')).toBeVisible();
-  await expect.poll(() => page.evaluate(() => window.scrollY)).toBeGreaterThan(0);
+  // Phones scroll the results into view; wide screens show them beside the form.
+  if ((page.viewportSize()?.width ?? 1280) < 1024) await expect.poll(() => page.evaluate(() => window.scrollY)).toBeGreaterThan(0);
   await expect.poll(() => page.evaluate(() => document.getAnimations().filter((animation) => animation.playState === 'running').length)).toBe(0);
-  await expect(page.getByText('Generate complete', { exact: true })).toBeHidden({ timeout: 10_000 });
   await page.screenshot({ path: testInfo.outputPath('reduced-result.png'), fullPage: true });
 });
 
@@ -127,7 +127,7 @@ test('audits applicable empty, loading, result, and option states across feature
   expect(await attackOptions.evaluate((element) => (element as HTMLElement).inert)).toBe(true);
   await page.getByLabel('Your Argument').fill('Universal transit improves access, reduces congestion, and strengthens civic participation.');
   await page.getByRole('button', { name: 'Find Weaknesses' }).click();
-  await expect(page.getByText('Analyzing the case structure...')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
+  await expect(page.getByText('Reviewing your case…')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await expect(page.getByRole('heading', { name: 'Overall Assessment' })).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.screenshot({ path: testInfo.outputPath('attack-result.png'), fullPage: true });
 
@@ -135,20 +135,20 @@ test('audits applicable empty, loading, result, and option states across feature
   await expect(page.getByText('Unlock Creative Angles')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.getByLabel('Motion / Topic').fill('This House would make public transport free.');
   await page.getByRole('button', { name: 'Start Brainstorming' }).click();
-  await expect(page.getByText('Exploring angles...')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
+  await expect(page.getByText('Finding angles…')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await expect(page.getByRole('heading', { name: 'Top 5 Argument Angles' })).toBeVisible({ timeout: STATE_TIMEOUT_MS });
 
   await openFeatureRoute(page, 'factoids');
   await expect(page.getByText('Evidence That Wins')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.getByLabel('Statement').fill('Free public transport reduces urban congestion.');
   await page.getByRole('button', { name: 'Find Factoids' }).click();
-  await expect(page.getByText('Searching databases...')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
+  await expect(page.getByText('Searching for evidence…')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await expect(page.getByRole('heading', { name: 'Factoids' })).toBeVisible({ timeout: STATE_TIMEOUT_MS });
 
   await openFeatureRoute(page, 'ask');
   await expect(page.getByText('Start a conversation')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await page.getByPlaceholder('Ask your debate coach...').fill('How should I weigh access against cost?');
   await page.getByRole('button', { name: 'Send message' }).click();
-  await expect(page.getByText('Thinking...')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
+  await expect(page.getByText('Working…')).toBeVisible({ timeout: STATE_TIMEOUT_MS });
   await expect(page.getByText(/Great question about/)).toBeVisible({ timeout: STATE_TIMEOUT_MS });
 });
diff --git a/e2e/authed-pages.spec.ts b/e2e/authed-pages.spec.ts
index cd85d9540..5d6771c2a 100644
--- a/e2e/authed-pages.spec.ts
+++ b/e2e/authed-pages.spec.ts
@@ -130,9 +130,11 @@ test('visible Ask advanced controls use the non-streaming contract', async ({ pa
 
   await page.goto('/app/ask', { waitUntil: 'domcontentloaded' });
   await page.getByRole('button', { name: 'Clarify' }).click();
+  await page.getByRole('button', { name: 'Options' }).click();
   for (const name of ['Citations', 'Web search', 'Pros/Cons', 'Arg Map']) {
     await page.getByRole('switch', { name }).click();
   }
+  await page.keyboard.press('Escape');
   await page.getByPlaceholder('Ask your debate coach...').fill('Which assumptions should I define?');
   await page.getByRole('button', { name: 'Send message' }).click();
 
diff --git a/e2e/full-stack/ai-tools.spec.ts b/e2e/full-stack/ai-tools.spec.ts
index 49416c04d..2cc276a53 100644
--- a/e2e/full-stack/ai-tools.spec.ts
+++ b/e2e/full-stack/ai-tools.spec.ts
@@ -53,7 +53,10 @@ test("Ask streams a coaching answer and records usage", async ({ signedIn: page,
 
 test("Ask with citations uses the structured endpoint", async ({ signedIn: page }) => {
   await page.goto("/app/ask");
+  // The Ask switches live in the Options popover above the message box.
+  await page.getByRole("button", { name: "Options" }).click();
   await page.locator("#citation-mode").click();
+  await page.keyboard.press("Escape");
   await page.getByPlaceholder("Ask your debate coach...").fill("Which evidence supports fare-free transit?");
   await page.getByRole("button", { name: "Send message" }).click();
 
diff --git a/e2e/live/research.spec.ts b/e2e/live/research.spec.ts
index 85b0f8d85..cd0981f33 100644
--- a/e2e/live/research.spec.ts
+++ b/e2e/live/research.spec.ts
@@ -49,7 +49,10 @@ test("Factoids returns verified evidence with working citations", async ({ signe
 
 test("Ask with web search shows the sources it used", async ({ signedIn: page }) => {
   await page.goto("/app/ask");
+  // The Ask switches live in the Options popover above the message box.
+  await page.getByRole("button", { name: "Options" }).click();
   await page.locator("#web-search-mode").click();
+  await page.keyboard.press("Escape");
   await page.getByPlaceholder("Ask your debate coach...").fill("What did recent studies find about fare-free public transport ridership?");
   const response = aiResponse(page, "ask");
   await page.getByRole("button", { name: "Send message" }).click();
diff --git a/e2e/navigation-performance.spec.ts b/e2e/navigation-performance.spec.ts
index 2f0b0e273..74aa3e07a 100644
--- a/e2e/navigation-performance.spec.ts
+++ b/e2e/navigation-performance.spec.ts
@@ -24,7 +24,7 @@ const privateRoutes = [
   ['/app', { selector: 'main h1', text: 'What are you working on?' }],
   ['/app/generate', { selector: 'main h1', text: 'Generate' }],
   ['/app/attack', { selector: 'main h1', text: 'Attack' }],
-  ['/app/flowchart', { selector: 'main h3', text: 'Argument Flowchart' }],
+  ['/app/flowchart', { selector: 'main h1', text: 'Argument Flowchart' }],
   ['/app/history', { selector: 'main h1', text: 'History' }],
   ['/app/admin', { selector: 'main h3', text: 'Access Denied' }],
 ] as const;
@@ -194,7 +194,7 @@ test('a failed route chunk recovers after the offered reload', async ({ page })
   await page.getByRole('button', { name: 'Reload' }).click();
   await expect.poll(() => attempts).toBe(2);
   await waitForContent(page, attackContent);
-  await expect(page.locator('header')).toBeVisible();
+  await expect(page.getByRole('banner')).toBeVisible();
 });
 
 async function gotoHome(page: Page) {
diff --git a/e2e/quality-backlog.spec.ts b/e2e/quality-backlog.spec.ts
index 4154a0a7d..3221683bc 100644
--- a/e2e/quality-backlog.spec.ts
+++ b/e2e/quality-backlog.spec.ts
@@ -83,23 +83,24 @@ test('Factoids names the save action with its claim', async ({ page }) => {
   })).toBeVisible();
 });
 
-test('Flowchart confirms selected-node deletion and reports success', async ({ page }, testInfo) => {
+test('Flowchart deletes a selected node at once and Undo puts it back', async ({ page }, testInfo) => {
   await setLocale(page, 'en');
   await stubSupabaseSession(page);
   await page.goto('/app/flowchart');
 
   await page.getByText('Argument 1', { exact: true }).click();
-  await page.getByRole('button', { name: 'Delete' }).last().click();
-  await expect(page.getByRole('alertdialog', { name: 'Delete node?' })).toBeVisible();
-  const confirm = page.getByRole('button', { name: 'Delete node' });
+  const remove = page.getByRole('button', { name: 'Delete' }).last();
   if (testInfo.project.name === 'mobile-chromium') {
-    const box = await confirm.boundingBox();
+    const box = await remove.boundingBox();
     expect(box).not.toBeNull();
     await page.touchscreen.tap(box!.x + box!.width / 2, box!.y + box!.height / 2);
   } else {
-    await confirm.click();
+    await remove.click();
   }
 
-  await expect(page.getByText('Node deleted', { exact: true })).toBeVisible();
+  // No confirmation: the node goes, and the toast offers Undo.
+  await expect(page.getByRole('alertdialog')).toHaveCount(0);
   await expect(page.getByText('Argument 1', { exact: true })).toHaveCount(0);
+  await page.getByRole('button', { name: 'Undo' }).click();
+  await expect(page.getByText('Argument 1', { exact: true })).toHaveCount(1);
 });
diff --git a/e2e/sparring.spec.ts b/e2e/sparring.spec.ts
index 8facd239c..059ed6004 100644
--- a/e2e/sparring.spec.ts
+++ b/e2e/sparring.spec.ts
@@ -83,7 +83,9 @@ test('completes an LD sparring round through mocked opponent turns and judging',
     await draft.fill(content);
     await page.getByRole('button', { name: 'Submit speech' }).click();
     if (turnLabel !== 'Second affirmative rebuttal') {
-      await expect(page.getByText(`Opponent response ${index + 1}:`)).toBeVisible();
+      // The reply lands in the transcript and is pinned above the composer for the next speech.
+      await expect(page.getByRole('region', { name: 'Transcript' }).getByText(`Opponent response ${index + 1}:`)).toBeVisible();
+      await expect(page.getByRole('article', { name: 'Opponent’s last speech' })).toContainText(`Opponent response ${index + 1}:`);
     }
   }
 
@@ -122,7 +124,7 @@ test('uses the school 4-6-6-3 roles and coaching in the default round', async ({
   await introductor.fill('Our framework is civic responsibility. We define service as supervised work that directly benefits the local community.');
   await page.getByRole('button', { name: 'Submit speech' }).click();
 
-  await expect(page.getByText('Opponent response 1:')).toBeVisible();
+  await expect(page.getByRole('region', { name: 'Transcript' }).getByText('Opponent response 1:')).toBeVisible();
   await expect(page.getByRole('textbox', { name: 'Draft for Pro R1' })).toBeVisible();
   await expect(page.getByText(/Build the core arguments with claims, warrants, support, and impacts/)).toBeVisible();
   expect(actions).toEqual(['respond']);
diff --git a/e2e/voice-rounds.spec.ts b/e2e/voice-rounds.spec.ts
index 6912fd813..22a9ed7ab 100644
--- a/e2e/voice-rounds.spec.ts
+++ b/e2e/voice-rounds.spec.ts
@@ -144,14 +144,14 @@ test('a spoken sparring round works on the browser voice when the server has no
   await startVoiceSparring(page);
 
   await speakSpeech(page, 'Affirmative constructive', 'Um, universal access removes the price barrier for every rider.');
-  await expect(page.getByText('Opponent reply 1:')).toBeVisible();
+  await expect(page.getByRole('region', { name: 'Transcript' }).getByText('Opponent reply 1:')).toBeVisible();
   // The browser voice reads the reply, without the audio tag.
   await expect.poll(() => spokenByBrowser(page)).toBe('Opponent reply 1: a narrower pass reaches the same riders for less.');
   expect(voiceRequests).toHaveLength(1);
   expect(voiceRequests[0]).toEqual({ feature: 'sparring', text: '[sighs] Opponent reply 1: a narrower pass reaches the same riders for less.', token: 'token-1' });
 
   await speakSpeech(page, 'First affirmative rebuttal', 'A pass still leaves an eligibility gap, you know.');
-  await expect(page.getByText('Opponent reply 2:')).toBeVisible();
+  await expect(page.getByRole('region', { name: 'Transcript' }).getByText('Opponent reply 2:')).toBeVisible();
   await expect.poll(() => spokenByBrowser(page)).toContain('Opponent reply 2:');
   // After the missing-key answer the page does not ask the voice function again.
   expect(voiceRequests).toHaveLength(1);
diff --git a/plans/2026-10-09-design-audit.md b/plans/2026-10-09-design-audit.md
index d8b1a999c..c0e5a97d3 100644
--- a/plans/2026-10-09-design-audit.md
+++ b/plans/2026-10-09-design-audit.md
@@ -55,8 +55,8 @@ These are ordered by impact per line changed.
 5. ✅ PR1. Replace the blanket reduced-motion kill (`src/index.css:1071-1098`) with one that keeps opacity and colour transitions and turns spinners into an opacity pulse.
 6. ✅ PR1. Add `origin-[--radix-…-content-transform-origin]` to Popover, Select and Tooltip, and set exits shorter than enters.
 7. ✅ PR2. Wayfinding: make "Current debate" a link that is active on `/app/debate` and every tool route. Rename "Home". Make the brand a `<span>`.
-8. One delete rule: reversible deletes act at once and show an Undo toast; irreversible bulk deletes use an AlertDialog with a destructive-styled confirm.
-9. Ask: scroll only when the user is at the bottom, keep the input editable while streaming, add Stop. Give the four form tools a Cancel.
+8. ✅ PR2–3. One delete rule: reversible deletes act at once and show an Undo toast; irreversible bulk deletes use an AlertDialog with a destructive-styled confirm.
+9. ✅ PR3. Ask: scroll only when the user is at the bottom, keep the input editable while streaming, add Stop. Give the four form tools a Cancel.
 10. Landing: remove the infinite loops and shimmer, split the framer reveal from the hover onto separate elements, and switch the `x`/`y` shorthands to full `transform` strings.
 
 ## Findings
@@ -77,10 +77,10 @@ Rows follow Emil Kowalski's required Before / After / Why format. The tiers foll
 | ✅ PR1 · `index.css:604-607` | `[role=progressbar] > div { transition: width .5s }` | Delete it; `progress.tsx:16` `transition-transform duration-300 ease-out-strong`; clocks `transform 1000ms linear` | Radix moves the bar with `transform`, so every progress bar jumps (Timer, Sparring, Attack, Factoids). |
 | ✅ PR2 · `AppLayout.tsx:196`, `:209`, `index.css:569-595` | Active nav underline animates `scaleX(0)→1` with a glow on every navigation, on top of `bg-primary/10` | Static `bg-primary/10 text-primary` only | Starts from scale 0, fires tens of times a day including from the keyboard, and doubles the active signal. |
 | ✅ PR2 · `AppLayout.tsx:249-250` | Mobile menu `motion-reveal` 420ms, rising upward while it drops down below the header, no exit | No animation, or opacity plus `translateY(-4px)` at 180ms with a matching exit | Over budget, wrong direction, asymmetric path (Apple §7). |
-| `AskChat.tsx:380-382`, `AskPage.tsx:334-343` | `scrollIntoView({behavior:'smooth'})` on every 30ms stream flush; it also scrolls the window | Track `atBottom` (within 80px); scroll instantly only then; otherwise show a "Jump to latest" pill | It pulls the user down when they scroll up to read (Apple §3: never lock out input). |
-| `AskPage.tsx:176`, `session-store.ts:944` | The streaming bubble is keyed by request id; the stored message gets a new id, so it remounts and `message-enter` replays | Reuse the streaming id for the stored message | The answer jumps and fades in again as the user reads it. |
-| `AskChat.tsx:88`, `index.css:654-667` | 300ms `message-enter` keyframe on every bubble, including the user's own message sent with Enter | No entry animation on user bubbles; assistant bubbles get opacity plus `translateY(4px)` at 150ms | Keyboard-initiated and frequent. |
-| `TimerPage.tsx:330` | Ring `transition-all duration-1000` with the default ease | `transition-[clip-path] duration-1000 ease-linear` | Constant motion is linear (measured surge-and-stop). |
+| ✅ PR3 · `AskChat.tsx:380-382`, `AskPage.tsx:334-343` | `scrollIntoView({behavior:'smooth'})` on every 30ms stream flush; it also scrolls the window | Track `atBottom` (within 80px); scroll instantly only then; otherwise show a "Jump to latest" pill | It pulls the user down when they scroll up to read (Apple §3: never lock out input). |
+| ✅ PR3 · `AskPage.tsx:176`, `session-store.ts:944` | The streaming bubble is keyed by request id; the stored message gets a new id, so it remounts and `message-enter` replays | Reuse the streaming id for the stored message | The answer jumps and fades in again as the user reads it. |
+| ✅ PR3 · `AskChat.tsx:88`, `index.css:654-667` | 300ms `message-enter` keyframe on every bubble, including the user's own message sent with Enter | No entry animation on user bubbles; assistant bubbles get opacity plus `translateY(4px)` at 150ms | Keyboard-initiated and frequent. |
+| ✅ PR3 · `TimerPage.tsx:330` | Ring `transition-all duration-1000` with the default ease | `transition-[clip-path] duration-1000 ease-linear` | Constant motion is linear (measured surge-and-stop). |
 | ✅ PR2 · `HistoryPage.tsx:156`, `tabs.tsx:45` | Each tab switch replays a slide-in plus a 350ms `stagger-enter` plus the empty state's blur swap | 150ms fade on the tab content only; no stagger | Tens of times a day, and Radix tabs switch on arrow keys. |
 | ✅ PR2 · `HomePage.tsx:61`, `CurrentDebatePage.tsx:198`, `AppLayout.tsx:44`, `:259`, `:300-301`, `CurrentDebateMenu.tsx:27` | `.motion-press` button lift on list rows, nav links and footer text links | `hover:bg-accent` only on rows and links | Hairline rows lift and cast shadows like cards. |
 | `landing/WhatsNew.tsx:41-47`, `Pricing.tsx:48-53`, `:81-86`, `Features.tsx:56-62`, `UseCases.tsx:49-55` | Framer `whileInView` `y` on the same node as `hover:-translate-y-1` and `transition-all duration-300/500` | Reveal on an outer `motion.div`, hover on an inner div; drop the lift and tilt; transition only `box-shadow` and `border-color` | Confirmed above: the hovers never render, and `transition-all` drags out framer's own reveal. |
@@ -93,21 +93,21 @@ Rows follow Emil Kowalski's required Before / After / Why format. The tiers foll
 | --- | --- | --- | --- |
 | `index.css:203-254`; `Hero.tsx:26-29`, `Features.tsx:37-38`, `Pricing.tsx:29`, `FinalCTA.tsx:14-17` | Infinite aurora (14s), orbs (8s and 10s), full-bleed grid drift (20s) on five sections | Static backgrounds | Apple §14 flags full-viewport moving backgrounds and slow oscillations (0.07–0.125 Hz). |
 | `index.css:207-213`; `Navbar.tsx:57`, `:98`, `Hero.tsx:74`, `Pricing.tsx:113`, `FinalCTA.tsx:45`, `GenerateForm.tsx:286` | `shimmer 3s infinite` on CTAs, including the app's Generate button | Delete it, or run once on gated hover at 700ms | Perpetual decoration on the most-watched element. |
-| `streaming-indicator.tsx:25-63`; wrappers at `AttackPage.tsx:139`, `BrainstormPage.tsx:127`, `GeneratePage.tsx:384`, `FactoidsPage.tsx:145` | Five simultaneous loops: wrapper shimmer, inner swap, ping ring, shimmer bar, and a fake progress bar that fills to 100% every 3s via a 50ms `setInterval` | One spinner (`spin 600ms linear infinite`) plus one honest status line | Decorative loops, a dishonest determinate bar, and 20 renders a second. |
-| `loading-spinner.tsx:18-20` | Ping ring plus static ring plus a 1s spin | One ring at `spin 700ms linear` | A faster linear spin reads as a faster load. |
+| ✅ PR3 · `streaming-indicator.tsx:25-63`; wrappers at `AttackPage.tsx:139`, `BrainstormPage.tsx:127`, `GeneratePage.tsx:384`, `FactoidsPage.tsx:145` | Five simultaneous loops: wrapper shimmer, inner swap, ping ring, shimmer bar, and a fake progress bar that fills to 100% every 3s via a 50ms `setInterval` | One spinner (`spin 600ms linear infinite`) plus one honest status line | Decorative loops, a dishonest determinate bar, and 20 renders a second. |
+| ✅ PR3 · `loading-spinner.tsx:18-20` | Ping ring plus static ring plus a 1s spin | One ring at `spin 700ms linear` | A faster linear spin reads as a faster load. |
 | ✅ PR1 · `index.css:724-738` | `[data-radix-collection-item]` menu-item-in keyframe | Delete it | Every SelectItem, TabsTrigger and AccordionTrigger slides 4px on every open. |
 | ✅ PR1 · `index.css:760-779` | Second active-tab indicator: an `::after` underline from `scaleX(0)` | Delete it; the TabsTrigger pill already marks active | Two indicators, grows from zero, keyboard-triggered (also visible on Login). |
 | ✅ PR1 · `index.css:782-827` | Icon-name hijacks: refresh spins and trash shakes on hover, copy and heart scale on `:active` | Delete them | Global Lucide class-name selectors; a shaking trash makes deletion look playful. |
 | ✅ PR1 · `index.css:296-299`, `:510-520`, `section-card.tsx:33`, `badge.tsx:8` | Button icon `scale(1.04)` on hover; non-clickable SectionCards lift 2px; Badge `hover:scale-105 transition-all` | Delete all three | Lift implies clickability that isn't there (Apple Familiarity). |
 | ✅ PR1 · `index.css:682-701`, `:829-842` | Switch squash-and-stretch keyframe; a `check-draw` that's a no-op (no dasharray); infinite slider pulse while dragging | Switch `transition-transform duration-200 ease-out-strong`; delete the rest | Replays on mount, not interruptible, noise under the finger. |
-| `animated-section.tsx:14`, `:21`; used on Ask, Attack, Brainstorm, Generate, Factoids | `transition-all duration-300` fade-up on a timeout every time a tool opens | Delete it, or opacity only at 150ms with no delay | Tens of times a day. |
-| `TimerPage.tsx:334` | `animate-pulse` on the digits in the last 30s | Static `text-destructive` | Pulses the number the speaker is watching. |
-| `FlowchartPage.tsx:251-253`, `:305` | `animated: true` marching edges | Static edges; a dashed stroke for rebuttals | Constant motion on a work canvas. |
-| `CrossfirePage.tsx:865-1021`, `SparringRound.tsx:192`, `:249-254` | The transcript remounts per phase and all turns replay; the AI wait shows a pulsing background plus bouncing dots plus text | Hoist the transcript and animate only the newest turn; one indicator | A wall of cards fades in on each phase. |
+| ✅ PR3 · `animated-section.tsx:14`, `:21`; used on Ask, Attack, Brainstorm, Generate, Factoids | `transition-all duration-300` fade-up on a timeout every time a tool opens | Delete it, or opacity only at 150ms with no delay | Tens of times a day. |
+| ✅ PR3 · `TimerPage.tsx:334` | `animate-pulse` on the digits in the last 30s | Static `text-destructive` | Pulses the number the speaker is watching. |
+| ✅ PR3 · `FlowchartPage.tsx:251-253`, `:305` | `animated: true` marching edges | Static edges; a dashed stroke for rebuttals | Constant motion on a work canvas. |
+| ✅ PR3 · `CrossfirePage.tsx:865-1021`, `SparringRound.tsx:192`, `:249-254` | The transcript remounts per phase and all turns replay; the AI wait shows a pulsing background plus bouncing dots plus text | Hoist the transcript and animate only the newest turn; one indicator | A wall of cards fades in on each phase. |
 | ✅ PR2 · `AppLayout.tsx:44`, `:218-219` | `nav-glow` radial hover on top of `hover:bg-accent`; theme toggle in the mobile header and again in Settings | Remove `nav-glow`; drop ThemeToggle from the mobile header | Doubled hover effects; a crowded sticky header. |
 | ✅ PR2 · `LibraryPage.tsx:495-506` vs `:777-790`; `:675-684` vs `:723-733`; `:583-596` | Two folder filters; two Folder selects in one form; three stat tiles repeating a badge count | One chip row; one Folder select; one meta line under the h1 | Duplicate controls bound to the same state. |
-| `LibraryPage.tsx:248`, `:404-407`, `:435-438` and success toasts at `AttackPage.tsx:49`, `BrainstormPage.tsx:48`, `GeneratePage.tsx:97`, `FactoidsPage.tsx:47` | Toasts confirming things already visible | Drop them; keep toasts for off-screen or irreversible results | Over-feedback trains people to ignore feedback (Apple §13). |
-| `ExportToolbar.tsx:15`, `:54`, `AutoSavedSourcesUndo.tsx` | `showUndo` is never passed by any caller | Delete both | Dead code with a misleading label. |
+| ✅ PR3 · `LibraryPage.tsx:248`, `:404-407`, `:435-438` and success toasts at `AttackPage.tsx:49`, `BrainstormPage.tsx:48`, `GeneratePage.tsx:97`, `FactoidsPage.tsx:47` | Toasts confirming things already visible | Drop them; keep toasts for off-screen or irreversible results | Over-feedback trains people to ignore feedback (Apple §13). |
+| ✅ PR3 · `ExportToolbar.tsx:15`, `:54`, `AutoSavedSourcesUndo.tsx` | `showUndo` is never passed by any caller | Delete both | Dead code with a misleading label. |
 | `landing/WhatsNew.tsx:27-33`, `SocialProof.tsx:7-11` | Pill and h2 both say "What's New"; "2 Plans / 1 Unified Workspace" styled as metrics | Remove the pill; remove the section or use real facts | Repetition; pseudo social proof (Apple Responsibility). |
 
 ### 3. Performance
@@ -118,21 +118,21 @@ Rows follow Emil Kowalski's required Before / After / Why format. The tiers foll
 | `index.css:1-3`, `:57` | Three render-blocking Google Fonts `@import`s, including Lora (0 uses) | Drop Lora and Space Mono, or self-host Inter variable with a metric-matched fallback; or use `system-ui` (Apple §15) | A chained blocking request and a visible font swap: the startup shell renders in `system-ui`. |
 | `Hero.tsx:36-161`, `Navbar.tsx:24`, `DeepDive.tsx:20`, `:55`, every `whileInView y` | Framer `x`/`y`/`scale` shorthands at 0.5–0.8s, delays to 0.5s, during page load | `transform: "translateY(12px)"` strings, `duration: 0.35, ease: [0.23,1,0.32,1]`, hero delays 0–0.15s, `viewport: { once: true, margin: "0px 0px -15% 0px" }` | Shorthands run on the main thread and drop frames while loading; the CTA is held back about a second. |
 | `Hero.tsx:167-178`, `WhatsNew.tsx:47`, `Pricing.tsx:53`, `:86`, `index.css:165`, `:220`, `:271` | Nested translucent blur layers over animated backgrounds; grid animates `background-position` | Solid cards; blur only on the nav; static grid | Never stack light translucent surfaces (Apple §12); full-section repaints every frame. |
-| `AskPage.tsx:25-42`, `:334-340`, `AskChat.tsx:82`; `AttackPage.tsx:26`, `BrainstormPage.tsx:24`, `GeneratePage.tsx:35`, `FactoidsPage.tsx:24` | `useSessionStore()` with no selector; Ask remaps messages so `React.memo` never holds | `useShallow` selectors; pass messages through; a separate `StreamingBubble` | Every bubble re-parses Markdown on every 30ms flush. |
-| `index.css:984-1001`, `:1052-1061`; `CrossfirePage.tsx:421-426` | Caret blink animates `box-shadow`; dead `max-height`/`padding` transition; `setNow` every 500ms re-renders the whole Crossfire page | Opacity-only caret with `steps(2)`; delete the dead rule; a `<CrossfireClock>` with its own interval | Repaints while streaming; full renders during a live round. |
+| ✅ PR3 · `AskPage.tsx:25-42`, `:334-340`, `AskChat.tsx:82`; `AttackPage.tsx:26`, `BrainstormPage.tsx:24`, `GeneratePage.tsx:35`, `FactoidsPage.tsx:24` | `useSessionStore()` with no selector; Ask remaps messages so `React.memo` never holds | `useShallow` selectors; pass messages through; a separate `StreamingBubble` | Every bubble re-parses Markdown on every 30ms flush. |
+| ✅ PR3 · `index.css:984-1001`, `:1052-1061`; `CrossfirePage.tsx:421-426` | Caret blink animates `box-shadow`; dead `max-height`/`padding` transition; `setNow` every 500ms re-renders the whole Crossfire page | Opacity-only caret with `steps(2)`; delete the dead rule; a `<CrossfireClock>` with its own interval | Repaints while streaming; full renders during a live round. |
 | ✅ PR2 · `SettingsPage.tsx:324-326`, `AppLayout.tsx:276-285` | A 160px pulsing block for every user while the admin check runs; the announcement banner pushes content down after a fetch | Render nothing while pending; overlay the banner or render it from cache | Layout shift for 100% of users. |
 
 ### 4. Interruptibility and timing
 
 | Where | Before | After | Why |
 | --- | --- | --- | --- |
-| `AskChat.tsx:703`, `:706`; `CrossfirePage.tsx:968`; `AttackPage.tsx:36-62`, `BrainstormPage.tsx:37-61`, `GeneratePage.tsx:78-116`, `FactoidsPage.tsx:34-60` | The input is disabled while the AI works; no Stop; the form tools have no AbortController | Keep composers editable and disable only submit; a Stop button that aborts and returns focus; Cancel under the tool status | Apple §3: thought and gesture run in parallel. |
+| ✅ PR3 · `AskChat.tsx:703`, `:706`; `CrossfirePage.tsx:968`; `AttackPage.tsx:36-62`, `BrainstormPage.tsx:37-61`, `GeneratePage.tsx:78-116`, `FactoidsPage.tsx:34-60` | The input is disabled while the AI works; no Stop; the form tools have no AbortController | Keep composers editable and disable only submit; a Stop button that aborts and returns focus; Cancel under the tool status | Apple §3: thought and gesture run in parallel. |
 | ✅ PR2 · `sheet.tsx:33`, `:37-42` | Open 500ms, close 300ms, bare `transition ease-in-out`; full-width right sheet on phones; no drag | Open 300ms, close 200ms, `ease-drawer`; on mobile a bottom sheet (Vaul) with velocity dismiss above about 0.11 px/ms and rubber-banding | Over budget; a sheet you can't grab doesn't feel physical (Apple §2–6, §9). |
 | ✅ PR1 · `dialog.tsx:42`, `alert-dialog.tsx:37`, `popover.tsx:20`, `select.tsx:69`, `tooltip.tsx:20` | Symmetric 150ms keyframes, `zoom-out-95` on exit | Enter 200ms, exit 120ms fade only | A reopen during the close doesn't visibly jump; exit faster than enter. |
 | ✅ PR1 · `index.css:741-743` | `[role=option]` background fades 100ms | Instant highlight; keep only the `:active` transform | Arrow-key list navigation shouldn't fade. |
 | ✅ PR1 · `accordion.tsx:31` vs `tailwind.config.ts:77-78`; `index.css:355-370`, `AttackForm.tsx:121`, `GenerateForm.tsx:220` | Chevron 300ms against content 200ms; options expand 260ms plus translateY with a 300ms chevron | Everything at 200ms on one curve; chevron 150ms | Coordinated motions finish out of sync. |
-| `TimerPage.tsx:183` | Resume uses whole seconds rounded up | Store the remaining milliseconds on pause | Each pause gives the speaker up to a second. |
-| `FlowchartPage.tsx:442-444`, `:749-762`, `:343` | Auto layout clicks a fit-view button that doesn't exist; wheel zoom captures page scroll; new nodes at random positions | `rf.fitView({ duration: 250, padding: 0.2 })` with a temporary node transform transition; `zoomOnScroll={false} preventScrolling={false}`; place at the pane centre | Teleporting nodes; trapped scroll; things appearing from nowhere. |
+| ✅ PR3 · `TimerPage.tsx:183` | Resume uses whole seconds rounded up | Store the remaining milliseconds on pause | Each pause gives the speaker up to a second. |
+| ✅ PR3 · `FlowchartPage.tsx:442-444`, `:749-762`, `:343` | Auto layout clicks a fit-view button that doesn't exist; wheel zoom captures page scroll; new nodes at random positions | `rf.fitView({ duration: 250, padding: 0.2 })` with a temporary node transform transition; `zoomOnScroll={false} preventScrolling={false}`; place at the pane centre | Teleporting nodes; trapped scroll; things appearing from nowhere. |
 | ✅ PR2 · `AppLayout.tsx:155-173`; `SettingsPage.tsx:89-104`, `:143-150`; `DebateDialogs.tsx:53-70`; `LibraryPage.tsx:260-283` | Announcement dismiss waits for the server; no pending state on delete-all, switch or delete debate, sign out, or file import | Optimistic dismiss; per-action busy labels and disabled state; reset the file input | A tap with no visible response (Apple §1). |
 | ✅ PR2 · `OnboardingTour.tsx:105-111` | A fixed 500ms start delay | Start once the target exists (rAF or MutationObserver, 500ms cap) | An artificial delay. |
 | ✅ PR1 · `index.css:1065-1068` | The transition is declared only inside `:hover`, so leaving snaps back | Transition on the base rule; gate the hover | An asymmetric snap. PR1 deleted the rule instead, with the other icon hijacks. |
@@ -145,8 +145,8 @@ Rows follow Emil Kowalski's required Before / After / Why format. The tiers foll
 | ✅ PR2 · `index.css:153`, `:271`, `AppLayout.tsx:178` | Sticky translucent header with a hard 1px border and a shadow | A scroll-edge fade, or a border only when `scrollY > 0` | Apple §12. |
 | `index.css:491-847` overall | About 20 unlayered global selectors keyed on Radix internals | Move what's worth keeping into the primitives and delete the layer | They break silently on upgrades and override primitive classes. |
 | ✅ PR1 · `index.css:156-159`, `ThemeProvider.tsx:8-23` | `html`/`body` ease over 420ms, components at 160 or 260ms, everything else snaps | `document.startViewTransition` with a 200ms crossfade, or suppress transitions for one frame | The theme change ripples at three speeds. |
-| `AskChat.tsx:693`, `GenerateForm.tsx:142-154`, `VoiceMicControl.tsx:41`; `TimerPage.tsx:334`, `SparringRound.tsx:150`, `:157`, `CrossfirePage.tsx:924-926` | Three listening indicators and three countdown urgency treatments; the Timer goes calm again at 0:00 | One `<ListeningIndicator>` and one `<RoundClock>`: amber at 30s or less, destructive at 0:00 | Things that look the same should behave the same. |
-| `TimerPage.tsx:334` | `font-mono` (Space Mono) with `tracking-tighter` on the digits | Inter with `tabular-nums` and `tracking-[-0.02em]` | The wide colon reads "4 : 00"; negative tracking on a monospace face fights its design. |
+| ✅ PR3 · `AskChat.tsx:693`, `GenerateForm.tsx:142-154`, `VoiceMicControl.tsx:41`; `TimerPage.tsx:334`, `SparringRound.tsx:150`, `:157`, `CrossfirePage.tsx:924-926` | Three listening indicators and three countdown urgency treatments; the Timer goes calm again at 0:00 | One `<ListeningIndicator>` and one `<RoundClock>`: amber at 30s or less, destructive at 0:00 | Things that look the same should behave the same. |
+| ✅ PR3 · `TimerPage.tsx:334` | `font-mono` (Space Mono) with `tracking-tighter` on the digits | Inter with `tabular-nums` and `tracking-[-0.02em]` | The wide colon reads "4 : 00"; negative tracking on a monospace face fights its design. |
 | `landing/*` section h2s; `Features.tsx:37` | Different sizes and tracking per section; the orb's `-translate-y-1/2` is overridden by its keyframe | One `.section-heading`; position the orb with `top` | Cohesion; the orb jumps under reduced motion. |
 | ➖ PR2 · Login (`LoginPage.tsx:157-161`), app header logo | The login card shows a generic sparkle tile; the app shows the tree-and-scales logo in a white tile in both themes | The real mark on Login; a dark-mode variant of the logo tile | Brand consistency across surfaces. PR2 puts the real mark on Login and the public pages. The dark-mode tile is not done: `favicon-72.png` is RGB with no alpha, so the white is baked into the mark and a dark variant needs a new asset. |
 
@@ -164,7 +164,7 @@ Rows follow Emil Kowalski's required Before / After / Why format. The tiers foll
 | `SettingsPage.tsx:37-42`, `:206`; `DeepDive.tsx:63`, `:78`; `LoginPage.tsx:268`, `:273` | White on amber or green-500 tier badges (about 2:1); near-white `text-accent` on a light card (about 2.5:1); hard-coded `text-green-600` (3.15:1) | Tinted badges (`bg-amber-500/15 text-amber-800 dark:text-amber-300`); `text-foreground`; a `--success` token | Contrast failures. |
 | ✅ PR2 · `LibraryPage.tsx:69-147`, `:627-638`, `:705-975` | A `role=button` row containing a link, a button and a switch; an invisible file input with no focus ring; labels without `htmlFor` | The title is the button; `has-[:focus-visible]:ring-2` on the label; matching `id`/`htmlFor` pairs | Nested interactive controls; invisible focus; detached labels. |
 | ✅ PR1 · `AskChat.tsx:102`, `FactoidsResults.tsx:59` | The bookmark and external-link icons appear only on hover | Always visible at 60% opacity, full on focus | Invisible on touch and to the keyboard. |
-| `TimerPage.tsx:329`, `SparringRound.tsx:157`, `streaming-indicator.tsx:56` | `aria-live` on a clock that ticks every second; fake stage text announced every 3s | Announce 1:00, 0:30 and 0:00 only; `role="timer"`; announce only real status changes | Constant screen-reader chatter. |
+| ✅ PR3 · `TimerPage.tsx:329`, `SparringRound.tsx:157`, `streaming-indicator.tsx:56` | `aria-live` on a clock that ticks every second; fake stage text announced every 3s | Announce 1:00, 0:30 and 0:00 only; `role="timer"`; announce only real status changes | Constant screen-reader chatter. |
 | ✅ PR2 · `LibraryPage.tsx:95-124`, `ModelSelector.tsx:76-86` (about 30 `text-[9-11px]` uses) | 9–11px text in px | `text-xs` (0.75rem) as the floor | Below a legible floor; doesn't scale with the user's font size. |
 | ✅ PR2 · `ThemeToggle.tsx:21`, `tooltip.tsx` (0 importers) | Icon-only header controls use `title`; the theme icon is a laptop in "system" mode | Wrap them in Tooltip, which gets an instant skip delay inside the provider | `title` doesn't show on touch or focus; the laptop icon is ambiguous. |
 
@@ -176,14 +176,14 @@ Rows follow Emil Kowalski's required Before / After / Why format. The tiers foll
 | ✅ PR2 · `NotFound.tsx:11-13`, `SourcesPage.tsx:129-162`, `App.tsx:153-158`, `PrivacyPage.tsx`, `TermsPage.tsx`, `LoginPage.tsx:150-284` | The 404 reloads to the marketing page; Sources, Legal and Login have no way home; the route error offers only Reload | `<Link to={user ? '/app' : '/'}>`; a header or back link on public pages; "Go to Home" on the error | Never trap the user. |
 | `LibraryPage.tsx:129-140` vs `:1025-1044`; `DebateDialogs.tsx:104-110`; `HistoryPage.tsx:352-379`; `SettingsPage.tsx:386-454`; `LibraryPage.tsx:421`; `FlowchartPage.tsx:382-390` vs `:784-804`; `AdminPage.tsx:997-1012` | Five confirmation models. A source row deletes instantly, while the same source in the sheet asks. Saved flowcharts delete instantly, while nodes ask. `window.confirm`. Admin Ban and Make admin are one click | Reversible deletes act at once with `toast({ action: { label: 'Undo' } })`; irreversible ones get an AlertDialog with `buttonVariants({ variant: 'destructive' })`; admin role changes use the existing `pendingAction` dialog | Apple §16 Agency: undo for slips, confirmations used sparingly and consistently. PR2 draws the line at whether the app can put the item back exactly: Library sources delete at once with Undo (the flowchart's nodes and saved flowcharts follow in PR3); saved cases, sparring rounds, Clear Library and the Settings deletes use a destructive-styled confirm; a debate keeps its inline confirm, which already names what goes with it; admin role changes confirm through a dialog. |
 | ✅ PR2 · `LibraryPage.tsx:218-233`, `:442-444`; `LoginPage.tsx:74-133`, `:277-281`, `:57-143` | Required-field errors arrive as toasts after submit; login errors appear below the tabs, not tied to the field; raw backend `error.message` in English | Inline `role="alert"` under the field with `aria-describedby` and focus moved to it (as `DebateForm.tsx:115-118` already does); map Supabase error codes to i18n | Validate inline; localized errors. |
-| `GenerateResults.tsx:55-57`, Attack, Brainstorm, Ask without citations | No AI caveat anywhere; Generate evidence reads as fact unless `needsSource` is set | One line under every result header: "AI-generated. Check facts and sources before using them in a round."; label evidence "Unverified" unless a researched source backs it | Apple §16.3 Responsibility. |
-| `AskChat.tsx:64-70`, `:384-394`, `:118`; `streaming-indicator.tsx` | Timed status copy cycles ("Almost there…" back to "Thinking…"); "Typing" shows while web research runs | Real phases ("Searching the web…", "Writing"); otherwise "Working…" plus elapsed time after 5s | Status should be true. |
-| Error handling in Attack, Brainstorm, Factoids and Generate; `error-display.ts:31`, `:41`; `SparringPage.tsx:26-29`, `:297-307`; `AskPage.tsx:155`, `:280`; `AskChat.tsx:405-407` | Toast-only errors with no Retry; hard-coded English; Retry duplicates the user's bubble; oversized input is cleared before it's rejected | An inline error panel with Retry, like `CrossfirePage.tsx:943-958`; i18n; retry without re-adding the message; clear only on accept | Recoverable feedback; forgiveness. |
-| `AttackPage.tsx:67-92`, `GeneratePage.tsx:195-214`, `FactoidsPage.tsx:91-108`; `markdown.tsx:7-13` | "Discuss" prompts are indented template literals that render as a code block, and send non-streaming; `className="inline"` lands on a block wrapper; no link renderer | Build prompts with `join('\n')` through i18n and the streaming path; an `inline` prop mapping `p` to `span`; links with `target="_blank" rel="noopener noreferrer"` and `overflow-wrap:anywhere` | Broken rendering of the user's own message and of label/value rows. |
-| Page headers: `HomePage.tsx:154`, `CurrentDebatePage.tsx:112`, `SettingsPage.tsx:182`, `LibraryPage.tsx:474`, `HistoryPage.tsx:118`, `AskPage.tsx:350`, `SparringSetup.tsx:78`, `FlowchartPage.tsx:479-491`; card titles `card.tsx:19`, `dialog.tsx:74` | Eight header patterns; h1 weight and tracking vary; Flowchart has no h1; card titles `text-xl`, `text-lg` or `text-2xl` with `tracking-tight leading-none` | One `PageHeader`: h1 `text-3xl font-bold tracking-tight leading-tight`, optional eyebrow, meta line and actions slot. Card titles `text-lg font-semibold` with size-specific tracking (24px −0.019em, 18px −0.014em, 16px −0.011em) and `leading-tight` | Apple §15: tracking depends on size; Familiarity. |
-| Results in Attack, Brainstorm, Generate and Factoids; `HomePage.tsx:53-73` vs `CurrentDebatePage.tsx:194-204` | The export toolbar sits in a different place per tool; copy exists only in Generate; only Generate scrolls to results; the tool list is built twice with different labels | One `<ResultHeader>` (meta row, actions row, sources disclosure); `useRevealResults()` on mobile; one shared `ToolLink` | The same tool family should share a layout. |
-| `GeneratePage.tsx` (screenshot) | "No current debate" appears twice (page banner and form notice); h1 "Generate", card title "Generate Debate Case" and button "Generate Debate Case"; an emoji 🎯 as the empty-state art next to Lucide icons elsewhere | One debate notice; drop the card title; use the `EmptyState` Lucide component everywhere | Redundant copy; mixed iconography. |
-| `AskChat.tsx:517`, `:582-637`; `CrossfirePage.tsx:915-932`, `:679`, `:693`; `SparringRound.tsx:203-295`; `TimerPage.tsx:87`, `:203`, `:258-261`, `:378-382` | Chat height `100vh`; four switches above the input; the live Crossfire header never shows the resolution; the opponent's latest speech sits below a 240px composer; no wake lock; R and Escape reset the timer with no undo; keyboard hints shown on touch | `100dvh` and an Options popover; show the resolution; pin the last speech above the composer; `navigator.wakeLock` while running, with vibration and sound on the same frame at 0:00; reset only while paused or with Undo; hide kbd hints under `pointer:coarse` | Wayfinding, Apple §13 harmony, forgiveness. |
+| ✅ PR3 · `GenerateResults.tsx:55-57`, Attack, Brainstorm, Ask without citations | No AI caveat anywhere; Generate evidence reads as fact unless `needsSource` is set | One line under every result header: "AI-generated. Check facts and sources before using them in a round."; label evidence "Unverified" unless a researched source backs it | Apple §16.3 Responsibility. |
+| ✅ PR3 · `AskChat.tsx:64-70`, `:384-394`, `:118`; `streaming-indicator.tsx` | Timed status copy cycles ("Almost there…" back to "Thinking…"); "Typing" shows while web research runs | Real phases ("Searching the web…", "Writing"); otherwise "Working…" plus elapsed time after 5s | Status should be true. |
+| ✅ PR3 · Error handling in Attack, Brainstorm, Factoids and Generate; `error-display.ts:31`, `:41`; `SparringPage.tsx:26-29`, `:297-307`; `AskPage.tsx:155`, `:280`; `AskChat.tsx:405-407` | Toast-only errors with no Retry; hard-coded English; Retry duplicates the user's bubble; oversized input is cleared before it's rejected | An inline error panel with Retry, like `CrossfirePage.tsx:943-958`; i18n; retry without re-adding the message; clear only on accept | Recoverable feedback; forgiveness. |
+| ✅ PR3 · `AttackPage.tsx:67-92`, `GeneratePage.tsx:195-214`, `FactoidsPage.tsx:91-108`; `markdown.tsx:7-13` | "Discuss" prompts are indented template literals that render as a code block, and send non-streaming; `className="inline"` lands on a block wrapper; no link renderer | Build prompts with `join('\n')` through i18n and the streaming path; an `inline` prop mapping `p` to `span`; links with `target="_blank" rel="noopener noreferrer"` and `overflow-wrap:anywhere` | Broken rendering of the user's own message and of label/value rows. |
+| ✅ PR2–3 · Page headers: `HomePage.tsx:154`, `CurrentDebatePage.tsx:112`, `SettingsPage.tsx:182`, `LibraryPage.tsx:474`, `HistoryPage.tsx:118`, `AskPage.tsx:350`, `SparringSetup.tsx:78`, `FlowchartPage.tsx:479-491`; card titles `card.tsx:19`, `dialog.tsx:74` | Eight header patterns; h1 weight and tracking vary; Flowchart has no h1; card titles `text-xl`, `text-lg` or `text-2xl` with `tracking-tight leading-none` | One `PageHeader`: h1 `text-3xl font-bold tracking-tight leading-tight`, optional eyebrow, meta line and actions slot. Card titles `text-lg font-semibold` with size-specific tracking (24px −0.019em, 18px −0.014em, 16px −0.011em) and `leading-tight` | Apple §15: tracking depends on size; Familiarity. |
+| ✅ PR3 · Results in Attack, Brainstorm, Generate and Factoids; `HomePage.tsx:53-73` vs `CurrentDebatePage.tsx:194-204` | The export toolbar sits in a different place per tool; copy exists only in Generate; only Generate scrolls to results; the tool list is built twice with different labels | One `<ResultHeader>` (meta row, actions row, sources disclosure); `useRevealResults()` on mobile; one shared `ToolLink` | The same tool family should share a layout. |
+| ✅ PR3 · `GeneratePage.tsx` (screenshot) | "No current debate" appears twice (page banner and form notice); h1 "Generate", card title "Generate Debate Case" and button "Generate Debate Case"; an emoji 🎯 as the empty-state art next to Lucide icons elsewhere | One debate notice; drop the card title; use the `EmptyState` Lucide component everywhere | Redundant copy; mixed iconography. |
+| ✅ PR3 · `AskChat.tsx:517`, `:582-637`; `CrossfirePage.tsx:915-932`, `:679`, `:693`; `SparringRound.tsx:203-295`; `TimerPage.tsx:87`, `:203`, `:258-261`, `:378-382` | Chat height `100vh`; four switches above the input; the live Crossfire header never shows the resolution; the opponent's latest speech sits below a 240px composer; no wake lock; R and Escape reset the timer with no undo; keyboard hints shown on touch | `100dvh` and an Options popover; show the resolution; pin the last speech above the composer; `navigator.wakeLock` while running, with vibration and sound on the same frame at 0:00; reset only while paused or with Undo; hide kbd hints under `pointer:coarse` | Wayfinding, Apple §13 harmony, forgiveness. |
 | ✅ PR2 · `HistoryPage.tsx:136-379`, `LibraryPage.tsx:39`, `:880`, `CurrentDebatePage.tsx:69-206` | The tab resets after Back; fixed 500–600px inner scroll boxes trap scrolling on phones; lists are cut at 4 or 6 with no "View all"; three equal outline buttons and no primary action on the debate page | The tab in `useSearchParams`; `max-h` with page scroll on mobile; "View all (N)"; move the tools up and make them primary | "What's there?" and hierarchy. |
 | ✅ PR2 · `DebateDialogs.tsx:167-225`, `PricingModal.tsx:96`, `LimitReachedModal.tsx:39-47` | The 5-day idle gate blocks Escape on every route including Settings; "Current" is always on Free; the limit modal offers only Upgrade | Allow Escape to mean "Continue"; badge the real tier; add "Not now" | Never trap; true status; agency. |
 | ✅ PR2 · `SharedPage.tsx:75-148`, legal pages | Shared items render as raw JSON in a 600px scroll box; "Import to Account" is a dead end that also loses the item on sign-in; legal text at 14px and about 100 characters per line | Render with the result components at `max-w-[65ch] text-base leading-7`; remove Import until it exists; legal pages at `text-base leading-7 max-w-[65ch]` | Recipients get developer output; reading measure. |
diff --git a/src/components/features/AutoSavedSourcesUndo.tsx b/src/components/features/AutoSavedSourcesUndo.tsx
deleted file mode 100644
index 2e8470d0c..000000000
--- a/src/components/features/AutoSavedSourcesUndo.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Undo2 } from 'lucide-react';
-import { useState } from 'react';
-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 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;
-
-  const handleUndo = async () => {
-    setRemoving(true);
-    try {
-      const results = await Promise.allSettled(autoSavedSources.map((source) => removeSource(source.id)));
-      const succeeded = results.filter((result) => result.status === 'fulfilled').length;
-      const failed = results.length - succeeded;
-
-      if (failed === 0) {
-        toast.success(t('autoSavedSources.removedTitle'), { description: t('autoSavedSources.removedDesc', { count: succeeded }) });
-      } else if (succeeded === 0) {
-        toast.error(t('autoSavedSources.removeFailed', 'Could not remove auto-saved sources.'), {
-          description: t('autoSavedSources.removeFailedDesc', { succeeded, failed }),
-        });
-      } else {
-        toast.warning(t('autoSavedSources.removedPartialTitle'), {
-          description: t('autoSavedSources.removedPartialDesc', { succeeded, failed }),
-        });
-      }
-    } catch {
-      toast.error(t('autoSavedSources.removeFailed', 'Could not remove auto-saved sources.'));
-    } finally {
-      setRemoving(false);
-    }
-  };
-
-  return (
-    <Button variant="outline" size="sm" onClick={() => void handleUndo()} title={t('autoSavedSources.undo')} disabled={removing}>
-      <Undo2 className="h-4 w-4 mr-2" />
-      {t('autoSavedSources.undo')}
-    </Button>
-  );
-}
diff --git a/src/components/features/ExportToolbar.tsx b/src/components/features/ExportToolbar.tsx
index 96b5d7d20..2c7b36607 100644
--- a/src/components/features/ExportToolbar.tsx
+++ b/src/components/features/ExportToolbar.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next';
 import { FileText, FileDown, Loader2, MessageSquare } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import GoogleDocsIcon from '@/components/icons/GoogleDocsIcon';
-import { AutoSavedSourcesUndo } from '@/components/features/AutoSavedSourcesUndo';
 
 interface ExportToolbarProps {
   onPdf: () => void;
@@ -12,7 +11,6 @@ interface ExportToolbarProps {
   isExportingGDocs?: boolean;
   onDiscuss?: () => void;
   discussLabel?: string;
-  showUndo?: boolean;
   /** Buttons that appear on the export row, between the EXPORT tag and PDF/DOCX/Google Docs (e.g. Clipboard). */
   extraExports?: ReactNode;
   /** Buttons that appear on the top row (Save, Discuss, Flowcharts, Undo, etc.). */
@@ -21,7 +19,7 @@ interface ExportToolbarProps {
 
 // Unified export bar used by every feature's results view.
 // Two explicit rows, both left-aligned:
-//   Row 1 (top):    secondary actions — Save, Discuss, Flowcharts, Undo, AutoSavedSourcesUndo
+//   Row 1 (top):    secondary actions — Save, Discuss, Flowcharts, Undo
 //   Row 2 (bottom): EXPORT tag, extra export buttons (e.g. Clipboard), PDF, DOCX, Google Docs
 // Layout chosen by user 2026-05-27; see feedback-exports memory.
 export function ExportToolbar({
@@ -31,14 +29,13 @@ export function ExportToolbar({
   isExportingGDocs = false,
   onDiscuss,
   discussLabel,
-  showUndo = false,
   extraExports,
   secondaryActions,
 }: ExportToolbarProps) {
   const { t } = useTranslation();
 
   const hasSecondaryActions = Children.toArray(secondaryActions).filter(Boolean).length > 0;
-  const hasTopRow = hasSecondaryActions || showUndo || !!onDiscuss;
+  const hasTopRow = hasSecondaryActions || !!onDiscuss;
 
   return (
     <div className="flex w-full flex-col items-start gap-2">
@@ -51,7 +48,6 @@ export function ExportToolbar({
               {discussLabel || t('common.discuss', 'Discuss')}
             </Button>
           )}
-          {showUndo && <AutoSavedSourcesUndo />}
         </div>
       )}
       <div className="flex w-full flex-wrap items-center justify-start gap-2">
diff --git a/src/components/features/ask/AskChat.tsx b/src/components/features/ask/AskChat.tsx
index e04323beb..8c4816cb6 100644
--- a/src/components/features/ask/AskChat.tsx
+++ b/src/components/features/ask/AskChat.tsx
@@ -1,6 +1,6 @@
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useRef, useEffect, useLayoutEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { MessageCircle, Send, RotateCcw, Quote, Map, List, HelpCircle, Paperclip, X, Bookmark, Mic, MicOff, Search, Save, PanelLeftOpen, PlusCircle } from 'lucide-react';
+import { MessageCircle, Send, RotateCcw, Quote, Map, List, HelpCircle, Paperclip, X, Bookmark, Mic, MicOff, Search, Save, PanelLeftOpen, PlusCircle, Square, SlidersHorizontal, ArrowDown, AlertCircle } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Markdown } from '@/components/ui/markdown';
@@ -16,7 +16,8 @@ import { validateFileUpload, MAX_FILE_COUNT, formatFileSize } from '@/lib/valida
 import { formatEuropeanDate, formatEuropeanTime } from '@/lib/date-format';
 import { ModelSelector } from '@/components/ModelSelector';
 import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from '@/components/ui/sheet';
-import { useReducedMotion } from 'framer-motion';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import { ListeningIndicator } from '@/components/features/voice/ListeningIndicator';
 
 interface Message {
   id: string;
@@ -28,9 +29,23 @@ interface Message {
   output?: any;
 }
 
+/** A failed or rejected send, shown in the chat above the composer. */
+export interface AskChatError {
+  title: string;
+  description?: string;
+  onRetry?: () => void;
+}
+
 interface AskChatProps {
   messages: Message[];
+  /** The reply being streamed, rendered after the stored messages. */
+  streamingMessage?: Message | null;
   isLoading: boolean;
+  error?: AskChatError | null;
+  onDismissError?: () => void;
+  /** Stops the reply in progress. */
+  onStop?: () => void;
+  /** Resolves false when the message was rejected, so the composer keeps the text. */
   onSend: (
     message: string,
     mode: string,
@@ -39,7 +54,7 @@ interface AskChatProps {
     prosConsMode: boolean,
     argumentMapMode: boolean,
     files?: File[]
-  ) => void;
+  ) => boolean | void | Promise<boolean | void>;
   onClear: () => void;
   onSaveChat?: () => void;
   savedChats?: SavedChatSummary[];
@@ -61,13 +76,23 @@ const modeOptions = [
   { id: 'clarify', labelKey: 'askChat.modeClarify', icon: HelpCircle },
 ];
 
-const LOADING_MESSAGES_KEYS = [
-  'askChat.thinking',
-  'askChat.researching',
-  'askChat.analyzing',
-  'askChat.generatingResponse',
-  'askChat.almostThere',
-];
+// Within this distance of the bottom, new text keeps the view pinned to the latest message.
+const AT_BOTTOM_PX = 80;
+
+/** Seconds since `since`, ticking once a second while `active`. */
+function useElapsedSeconds(active: boolean) {
+  const [elapsed, setElapsed] = useState(0);
+  useEffect(() => {
+    if (!active) {
+      setElapsed(0);
+      return;
+    }
+    const startedAt = Date.now();
+    const timer = window.setInterval(() => setElapsed(Math.floor((Date.now() - startedAt) / 1000)), 1000);
+    return () => window.clearInterval(timer);
+  }, [active]);
+  return elapsed;
+}
 
 function getFirstUrl(text?: string) {
   return text?.match(/https?:\/\/[^\s]+/i)?.[0]?.replace(/[),.;!?]+$/g, '');
@@ -85,7 +110,7 @@ const MessageBubble = React.memo(function MessageBubble({ message, onSave }: { m
   const output = message.output;
 
   return (
-    <div className={cn('flex gap-3 message-enter', isUser ? 'justify-end' : 'justify-start')}>
+    <div className={cn('flex gap-3', isUser ? 'justify-end' : 'animate-in fade-in-0 slide-in-from-bottom-1 duration-150 ease-out-strong justify-start')}>
       <div
         className={cn(
           'max-w-[85%] rounded-2xl px-4 py-3 space-y-3 relative group',
@@ -113,11 +138,7 @@ const MessageBubble = React.memo(function MessageBubble({ message, onSave }: { m
           </Button>
         )}
         <div className="text-sm">
-          {message.content ? (
-            <Markdown>{message.content}</Markdown>
-          ) : message.isStreaming ? (
-            <span className="text-muted-foreground">{t('askChat.typing', 'Typing')}</span>
-          ) : null}
+          {message.content ? <Markdown>{message.content}</Markdown> : null}
           {message.isStreaming && (
             <span className="streaming-caret" aria-hidden="true" />
           )}
@@ -356,7 +377,7 @@ function SavedChatsPanel({
   );
 }
 
-export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, savedChats = [], onLoadChat, onSaveSource, contextControl }: AskChatProps) {
+export function AskChat({ messages, streamingMessage, isLoading, error, onDismissError, onStop, onSend, onClear, onSaveChat, savedChats = [], onLoadChat, onSaveSource, contextControl }: AskChatProps) {
   const { t } = useTranslation();
   const [input, setInput] = useState('');
   const [mode, setMode] = useState('general');
@@ -365,33 +386,44 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
   const [prosConsMode, setProsConsMode] = useState(false);
   const [argumentMapMode, setArgumentMapMode] = useState(false);
   const [files, setFiles] = useState<File[]>([]);
-  const [loadingMessageIndex, setLoadingMessageIndex] = useState(0);
+  const [searchingWeb, setSearchingWeb] = useState(false);
+  const [showJump, setShowJump] = useState(false);
   const [desktopSidebarOpen, setDesktopSidebarOpen] = useState(false);
   const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false);
   const fileInputRef = useRef<HTMLInputElement>(null);
-  const messagesEndRef = useRef<HTMLDivElement>(null);
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+  // Starts pinned; scrolling up to read unpins until the user returns to the bottom.
+  const atBottomRef = useRef(true);
   const { toast } = useToast();
-  const shouldReduceMotion = useReducedMotion();
 
   const { isListening, transcript, error: voiceError, startListening, stopListening, resetTranscript, hasSupport } = useSpeechToText();
-  const hasStreamingMessage = messages.some((message) => message.isStreaming);
+  const waitingForText = isLoading && !streamingMessage?.content;
+  const elapsed = useElapsedSeconds(waitingForText);
+
+  const handleScroll = () => {
+    const el = scrollRef.current;
+    if (!el) return;
+    atBottomRef.current = el.scrollHeight - el.scrollTop - el.clientHeight <= AT_BOTTOM_PX;
+    if (atBottomRef.current) setShowJump(false);
+  };
 
-  // Auto-scroll to bottom on new messages or streaming content
-  useEffect(() => {
-    messagesEndRef.current?.scrollIntoView?.({ behavior: shouldReduceMotion ? 'auto' : 'smooth' });
-  }, [messages, shouldReduceMotion]);
+  const jumpToLatest = () => {
+    const el = scrollRef.current;
+    if (!el) return;
+    el.scrollTop = el.scrollHeight;
+    atBottomRef.current = true;
+    setShowJump(false);
+  };
 
-  // Cycle through loading messages
-  useEffect(() => {
-    if (!isLoading) {
-      setLoadingMessageIndex(0);
-      return;
-    }
-    const interval = setInterval(() => {
-      setLoadingMessageIndex(prev => (prev + 1) % LOADING_MESSAGES_KEYS.length);
-    }, 3000);
-    return () => clearInterval(interval);
-  }, [isLoading]);
+  // New text follows only a reader who is already at the bottom, and only inside the
+  // chat, never the window. Otherwise a "Jump to latest" pill appears.
+  useLayoutEffect(() => {
+    const el = scrollRef.current;
+    if (!el) return;
+    if (atBottomRef.current) el.scrollTop = el.scrollHeight;
+    else setShowJump(true);
+  }, [messages, streamingMessage?.content, waitingForText, error]);
 
   useEffect(() => {
     if (transcript) {
@@ -399,13 +431,28 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
     }
   }, [transcript]);
 
-  const handleSubmit = (e: React.FormEvent) => {
+  const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     if ((!input.trim() && files.length === 0) || isLoading) return;
-    onSend(input.trim(), mode, citationMode, webSearch, prosConsMode, argumentMapMode, files);
+    const sent = input;
+    const sentFiles = files;
+    setSearchingWeb(webSearch);
+    // Sending scrolls to the new question.
+    atBottomRef.current = true;
     setInput('');
     setFiles([]);
     resetTranscript();
+    const accepted = await onSend(sent.trim(), mode, citationMode, webSearch, prosConsMode, argumentMapMode, sentFiles);
+    // A rejected message comes back into the box so the user can shorten it.
+    if (accepted === false) {
+      setInput((current) => current || sent);
+      setFiles((current) => (current.length ? current : sentFiles));
+    }
+  };
+
+  const handleStop = () => {
+    onStop?.();
+    inputRef.current?.focus();
   };
 
   const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -471,7 +518,7 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
             <SheetTitle>{t('askChat.savedChats', 'Saved chats')}</SheetTitle>
             <SheetDescription>{t('askChat.savedChatsDesc', 'Resume prior coaching conversations.')}</SheetDescription>
           </SheetHeader>
-          <div className="mt-4 h-[calc(100vh-8rem)]">
+          <div className="mt-4 h-[60dvh] sm:h-[calc(100dvh-8rem)]">
             <SavedChatsPanel
               savedChats={savedChats}
               onLoadChat={onLoadChat}
@@ -485,7 +532,7 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
       <div className={cn('grid gap-3', desktopSidebarOpen ? 'lg:grid-cols-[280px_minmax(0,1fr)]' : 'lg:grid-cols-[auto_minmax(0,1fr)]')}>
         <aside className="hidden lg:block">
           {desktopSidebarOpen ? (
-            <Card className="flex h-[calc(100vh-14rem)] min-h-[400px] max-h-[800px] flex-col border-primary/20">
+            <Card className="flex h-[calc(100dvh-14rem)] min-h-[400px] max-h-[800px] flex-col border-primary/20">
               <CardHeader className="shrink-0 pb-3">
                 <div className="flex items-center justify-between gap-2">
                   <div>
@@ -505,7 +552,7 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
             <Button
               variant="outline"
               size="icon"
-              className="h-[calc(100vh-14rem)] min-h-[400px] max-h-[800px] w-12 border-primary/20"
+              className="h-[calc(100dvh-14rem)] min-h-[400px] max-h-[800px] w-12 border-primary/20"
               onClick={() => setDesktopSidebarOpen(true)}
               aria-label={t('askChat.openSavedChats', 'Open saved chats')}
             >
@@ -514,7 +561,7 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
           )}
         </aside>
 
-    <Card className="flex flex-col h-[calc(100vh-14rem)] min-h-[400px] max-h-[800px] border-primary/20">
+    <Card className="flex flex-col h-[calc(100dvh-14rem)] min-h-[400px] max-h-[800px] border-primary/20">
       <CardHeader className="bg-gradient-to-br from-primary/5 to-transparent shrink-0">
         <div className="flex items-center justify-between">
           <div className="flex items-center gap-3">
@@ -542,9 +589,9 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
       </CardHeader>
 
       {/* Messages */}
-      <CardContent className="flex-1 overflow-hidden p-0">
-        <ScrollArea className="h-full p-4">
-          {messages.length === 0 ? (
+      <CardContent className="relative flex-1 overflow-hidden p-0">
+        <div ref={scrollRef} onScroll={handleScroll} className="h-full overflow-y-auto overscroll-contain p-4">
+          {messages.length === 0 && !streamingMessage ? (
             <div className="flex flex-col items-center justify-center h-full text-center p-6">
               <MessageCircle className="h-12 w-12 text-muted-foreground/30 mb-4" />
               <h3 className="font-medium text-foreground mb-1">{t('askChat.startConversation')}</h3>
@@ -554,29 +601,33 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
             </div>
           ) : (
             <div className="space-y-4">
-              {messages.map((message) => (
-                <MessageBubble key={message.id} message={message} onSave={onSaveSource} />
+              {/* One keyed list: the finished reply keeps the streaming bubble's id and position, so it isn't remounted. */}
+              {(streamingMessage && !messages.some((message) => message.id === streamingMessage.id) ? [...messages, streamingMessage] : messages).map((message) => (
+                <MessageBubble key={message.id} message={message} onSave={message === streamingMessage ? undefined : onSaveSource} />
               ))}
-              {isLoading && !hasStreamingMessage && (
-                <div className="motion-swap flex gap-3" role="status" aria-live="polite" aria-atomic="true">
-                  <div className="motion-shimmer bg-card border border-border rounded-2xl rounded-bl-sm px-4 py-3">
-                    <div className="flex items-center gap-2">
-                      <span className="typing-indicator">
-                        <span className="typing-dot" />
-                        <span className="typing-dot" />
-                        <span className="typing-dot" />
-                      </span>
-                      <span className="text-sm text-muted-foreground">
-                        {t(LOADING_MESSAGES_KEYS[loadingMessageIndex])}
-                      </span>
-                    </div>
-                  </div>
-                </div>
+              {waitingForText && (
+                // One true status line: what is happening, and how long it has taken once that matters.
+                <p className="flex items-center gap-2 text-sm text-muted-foreground" role="status" aria-live="polite">
+                  <span className="h-3.5 w-3.5 shrink-0 animate-spin rounded-full border-2 border-muted-foreground/30 border-t-muted-foreground [animation-duration:600ms]" aria-hidden="true" />
+                  {searchingWeb ? t('askChat.searchingWeb', 'Searching the web…') : t('askChat.working', 'Working…')}
+                  {elapsed >= 5 && <span className="tabular-nums">{t('askChat.elapsed', { seconds: elapsed, defaultValue: '{{seconds}}s' })}</span>}
+                </p>
               )}
-              <div ref={messagesEndRef} />
             </div>
           )}
-        </ScrollArea>
+        </div>
+        {showJump && (
+          <Button
+            type="button"
+            size="sm"
+            variant="secondary"
+            onClick={jumpToLatest}
+            className="absolute bottom-3 left-1/2 -translate-x-1/2 rounded-full shadow-md"
+          >
+            <ArrowDown className="h-4 w-4" aria-hidden="true" />
+            {t('askChat.jumpToLatest', 'Jump to latest')}
+          </Button>
+        )}
       </CardContent>
 
       <div className="shrink-0 border-t border-border p-4 space-y-2">
@@ -596,45 +647,50 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
             ))}
           </div>
         </div>
-        <div className="flex items-center gap-2 flex-wrap">
-            <div className="flex min-w-0 items-center gap-2 rounded-md border border-border/60 px-2 py-1.5 transition-all duration-200 hover:border-primary/30">
-              <Quote className="h-4 w-4 text-muted-foreground" />
-              <Label htmlFor="citation-mode" className="text-xs">{t('askChat.citations')}</Label>
-              <Switch
-                id="citation-mode"
-                checked={citationMode}
-                onCheckedChange={setCitationMode}
-              />
-            </div>
-            <div className="flex min-w-0 items-center gap-2 rounded-md border border-border/60 px-2 py-1.5 transition-all duration-200 hover:border-primary/30">
-              <Search className="h-4 w-4 text-muted-foreground" />
-              <Label htmlFor="web-search-mode" className="text-xs">{t('askChat.webSearch')}</Label>
-              <Switch
-                id="web-search-mode"
-                checked={webSearch}
-                onCheckedChange={setWebSearch}
-              />
-            </div>
-            <div className="flex min-w-0 items-center gap-2 rounded-md border border-border/60 px-2 py-1.5 transition-all duration-200 hover:border-primary/30">
-              <List className="h-4 w-4 text-muted-foreground" />
-              <Label htmlFor="pros-cons-mode" className="text-xs">{t('askChat.modeProsCons')}</Label>
-              <Switch
-                id="pros-cons-mode"
-                checked={prosConsMode}
-                onCheckedChange={setProsConsMode}
-              />
-            </div>
-            <div className="flex min-w-0 items-center gap-2 rounded-md border border-border/60 px-2 py-1.5 transition-all duration-200 hover:border-primary/30">
-              <Map className="h-4 w-4 text-muted-foreground" />
-              <Label htmlFor="argument-map-mode" className="text-xs">{t('askChat.modeArgMap')}</Label>
-              <Switch
-                id="argument-map-mode"
-                checked={argumentMapMode}
-                onCheckedChange={setArgumentMapMode}
-              />
+        <Popover>
+          <PopoverTrigger asChild>
+            <Button type="button" variant="outline" size="sm" className="gap-2">
+              <SlidersHorizontal className="h-4 w-4" aria-hidden="true" />
+              {t('askChat.options', 'Options')}
+              {[citationMode, webSearch, prosConsMode, argumentMapMode].filter(Boolean).length > 0 && (
+                <span className="rounded-full bg-primary/10 px-1.5 text-xs font-medium text-primary tabular-nums">{[citationMode, webSearch, prosConsMode, argumentMapMode].filter(Boolean).length}</span>
+              )}
+            </Button>
+          </PopoverTrigger>
+          <PopoverContent align="start" className="w-72 space-y-1 p-3">
+              <div className="flex items-center justify-between gap-3 rounded-md px-1 py-1.5 pointer-coarse:min-h-11">
+                <Label htmlFor="citation-mode" className="flex items-center gap-2 text-sm font-normal">
+                  <Quote className="h-4 w-4 text-muted-foreground" aria-hidden="true" />
+                  {t('askChat.citations')}
+                </Label>
+                <Switch id="citation-mode" checked={citationMode} onCheckedChange={setCitationMode} />
+              </div>
+              <div className="flex items-center justify-between gap-3 rounded-md px-1 py-1.5 pointer-coarse:min-h-11">
+                <Label htmlFor="web-search-mode" className="flex items-center gap-2 text-sm font-normal">
+                  <Search className="h-4 w-4 text-muted-foreground" aria-hidden="true" />
+                  {t('askChat.webSearch')}
+                </Label>
+                <Switch id="web-search-mode" checked={webSearch} onCheckedChange={setWebSearch} />
+              </div>
+              <div className="flex items-center justify-between gap-3 rounded-md px-1 py-1.5 pointer-coarse:min-h-11">
+                <Label htmlFor="pros-cons-mode" className="flex items-center gap-2 text-sm font-normal">
+                  <List className="h-4 w-4 text-muted-foreground" aria-hidden="true" />
+                  {t('askChat.modeProsCons')}
+                </Label>
+                <Switch id="pros-cons-mode" checked={prosConsMode} onCheckedChange={setProsConsMode} />
+              </div>
+              <div className="flex items-center justify-between gap-3 rounded-md px-1 py-1.5 pointer-coarse:min-h-11">
+                <Label htmlFor="argument-map-mode" className="flex items-center gap-2 text-sm font-normal">
+                  <Map className="h-4 w-4 text-muted-foreground" aria-hidden="true" />
+                  {t('askChat.modeArgMap')}
+                </Label>
+                <Switch id="argument-map-mode" checked={argumentMapMode} onCheckedChange={setArgumentMapMode} />
+              </div>
+            <div className="border-t pt-2">
+              <ModelSelector feature="ask" className="w-full" />
             </div>
-            <ModelSelector feature="ask" className="w-44 shrink-0" />
-        </div>
+          </PopoverContent>
+        </Popover>
 
         {files.length > 0 && (
           <div className="flex flex-wrap gap-2">
@@ -653,6 +709,7 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
             ))}
           </div>
         )}
+        {isListening && <ListeningIndicator label={t('askChat.placeholderListening')} />}
         {voiceError && (
           <p className="text-sm text-destructive">
             {voiceError === 'not-allowed'
@@ -661,9 +718,29 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
           </p>
         )}
 
+        {error && (
+          <div role="alert" className="flex items-start gap-3 rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm">
+            <AlertCircle className="mt-0.5 h-4 w-4 shrink-0 text-destructive" aria-hidden="true" />
+            <div className="min-w-0 flex-1">
+              <p className="font-medium text-foreground">{error.title}</p>
+              {error.description && <p className="text-muted-foreground">{error.description}</p>}
+            </div>
+            <div className="flex shrink-0 gap-1">
+              {error.onRetry && (
+                <Button type="button" size="sm" variant="outline" onClick={error.onRetry}>{t('common.retry', 'Retry')}</Button>
+              )}
+              {onDismissError && (
+                <Button type="button" size="icon" variant="ghost" className="h-9 w-9" onClick={onDismissError} aria-label={t('common.close', 'Close')}>
+                  <X className="h-4 w-4" />
+                </Button>
+              )}
+            </div>
+          </div>
+        )}
+
         {contextControl}
 
-        <form onSubmit={handleSubmit} className="flex gap-2">
+        <form onSubmit={(event) => void handleSubmit(event)} className="flex gap-2">
           <Input
             type="file"
             multiple
@@ -690,22 +767,28 @@ export function AskChat({ messages, isLoading, onSend, onClear, onSaveChat, save
               onClick={toggleListening}
               title={isListening ? t('askChat.stopListening') : t('askChat.startVoice')}
               aria-label={isListening ? t('askChat.stopListening') : t('askChat.startVoice')}
-              className={isListening ? "animate-pulse" : ""}
             >
               {isListening ? <MicOff className="h-4 w-4" /> : <Mic className="h-4 w-4" />}
             </Button>
           )}
 
+          {/* The box stays editable while a reply streams, so the next question can be typed. */}
           <Input
+            ref={inputRef}
             value={input}
             onChange={(e) => setInput(e.target.value)}
             placeholder={isListening ? t('askChat.placeholderListening') : t('askChat.placeholder')}
-            disabled={isLoading}
             className="flex-1"
           />
-          <Button type="submit" disabled={(!input.trim() && files.length === 0) || isLoading} aria-label={t('askChat.send')}>
-            <Send className="h-4 w-4" />
-          </Button>
+          {isLoading && onStop ? (
+            <Button type="button" variant="outline" onClick={handleStop} aria-label={t('askChat.stop', 'Stop answering')}>
+              <Square className="h-3.5 w-3.5 fill-current" />
+            </Button>
+          ) : (
+            <Button type="submit" disabled={(!input.trim() && files.length === 0) || isLoading} aria-label={t('askChat.send')}>
+              <Send className="h-4 w-4" />
+            </Button>
+          )}
         </form>
       </div>
     </Card>
diff --git a/src/components/features/attack/AttackForm.tsx b/src/components/features/attack/AttackForm.tsx
index 61c47c05b..c14d08d26 100644
--- a/src/components/features/attack/AttackForm.tsx
+++ b/src/components/features/attack/AttackForm.tsx
@@ -15,7 +15,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Card, CardContent } from '@/components/ui/card';
 import { AttackInputSchema, type AttackInput } from '@/lib/ai/schemas/attack';
 import { LoadingSpinner } from '@/components/ui/loading-spinner';
 
@@ -72,17 +72,6 @@ export function AttackForm({ onSubmit, isLoading, importedCase, debateContext =
 
   return (
     <Card className="border-destructive/20">
-      <CardHeader className="bg-gradient-to-br from-destructive/5 to-transparent">
-        <div className="flex items-center gap-3">
-          <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-destructive/10">
-            <Swords className="h-5 w-5 text-destructive" />
-          </div>
-          <div>
-            <CardTitle>{t('attackForm.title')}</CardTitle>
-            <CardDescription>{t('attackForm.subtitle')}</CardDescription>
-          </div>
-        </div>
-      </CardHeader>
       <CardContent className="pt-6">
         <form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
           {/* Case Text Input */}
@@ -201,7 +190,7 @@ export function AttackForm({ onSubmit, isLoading, importedCase, debateContext =
           {/* Submit Button */}
           <Button type="submit" className="w-full h-12" disabled={isLoading}>
             {isLoading ? (
-              <span className="motion-reveal inline-flex items-center">
+              <span className="inline-flex items-center">
                 <LoadingSpinner size="sm" className="mr-2" />
                 {t('attackForm.analyzing')}
               </span>
diff --git a/src/components/features/attack/AttackResults.tsx b/src/components/features/attack/AttackResults.tsx
index 7301a46ac..9607fa657 100644
--- a/src/components/features/attack/AttackResults.tsx
+++ b/src/components/features/attack/AttackResults.tsx
@@ -8,10 +8,11 @@ import { Progress } from '@/components/ui/progress';
 import { Separator } from '@/components/ui/separator';
 import { Markdown } from '@/components/ui/markdown';
 import type { AttackOutput, Weakness } from '@/lib/ai/schemas/attack';
-import { StaggeredContainer } from '@/components/ui/animated-section';
 import { cn } from '@/lib/utils';
 import { toast } from 'sonner';
 import { ExportToolbar } from '@/components/features/ExportToolbar';
+import { ResultHeader } from '@/components/features/tools/ResultHeader';
+import { ResearchedSources } from '@/components/features/tools/ResearchedSources';
 import { GoogleDriveAuthModal } from '@/components/features/export/GoogleDriveAuthModal';
 import { SourceQualityList } from '@/components/features/shared/SourceQualityList';
 import type { DiscoveredSource } from '@/lib/ai/client';
@@ -66,7 +67,7 @@ function WeaknessCard({ weakness }: { weakness: Weakness }) {
       <div className="space-y-2 text-sm">
         <div>
           <span className="font-medium text-muted-foreground">{t('attackResults.whyWeak')} </span>
-          <Markdown className="inline">{weakness.whyWeak}</Markdown>
+          <Markdown inline>{weakness.whyWeak}</Markdown>
         </div>
         <div>
           <span className="font-medium text-muted-foreground">{t('attackResults.opponentAttack')} </span>
@@ -159,18 +160,28 @@ export function AttackResults({ result, discoveredSources, onDiscuss, onPractice
   };
 
   return (
-    <StaggeredContainer className="space-y-6">
+    <div className="space-y-6">
       <GoogleDriveAuthModal open={showDriveAuth} onOpenChange={setShowDriveAuth} />
-      {/* Researched sources with quality provenance */}
-      {discoveredSources && discoveredSources.length > 0 && (
-        <div className="rounded-lg border bg-card/50 p-4">
-          <h4 className="mb-2 text-sm font-medium">{t('sourceQuality.researchedSources')}</h4>
-          <SourceQualityList sources={discoveredSources} />
-          <p className="mt-2 text-xs text-muted-foreground">
-            {t('sourceQuality.fallbackNote')}
-          </p>
-        </div>
-      )}
+      <ResultHeader
+        title={t('attackResults.resultTitle', 'Critique')}
+        actions={(
+          <ExportToolbar
+            onPdf={handlePdfExport}
+            onDocx={handleDocxExport}
+            onGoogleDocs={handleGoogleDocsExport}
+            isExportingGDocs={isExportingGDocs}
+            onDiscuss={onDiscuss}
+            discussLabel={t('attackResults.discuss')}
+            secondaryActions={onPracticeCrossfire ? (
+              <Button variant="outline" size="sm" onClick={onPracticeCrossfire}>
+                <Flame className="mr-2 h-4 w-4" />
+                {t('crossfire.openFromResult', 'Open in Crossfire')}
+              </Button>
+            ) : undefined}
+          />
+        )}
+      />
+      <ResearchedSources sources={discoveredSources} />
       {/* Overall Assessment */}
       <SectionCard
         title={t('attackResults.overall')}
@@ -192,22 +203,6 @@ export function AttackResults({ result, discoveredSources, onDiscuss, onPractice
               value={overallAssessment.score}
               className="h-3"
             />
-            <div className="mt-3">
-              <ExportToolbar
-                onPdf={handlePdfExport}
-                onDocx={handleDocxExport}
-                onGoogleDocs={handleGoogleDocsExport}
-                isExportingGDocs={isExportingGDocs}
-                onDiscuss={onDiscuss}
-                discussLabel={t('attackResults.discuss')}
-                secondaryActions={onPracticeCrossfire ? (
-                  <Button variant="outline" size="sm" onClick={onPracticeCrossfire}>
-                    <Flame className="mr-2 h-4 w-4" />
-                    {t('crossfire.openFromResult', 'Open in Crossfire')}
-                  </Button>
-                ) : undefined}
-              />
-            </div>
           </div>
 
           <div className="flex gap-4 text-sm">
@@ -338,6 +333,6 @@ export function AttackResults({ result, discoveredSources, onDiscuss, onPractice
           </div>
         </SectionCard>
       )}
-    </StaggeredContainer >
+    </div>
   );
 }
diff --git a/src/components/features/brainstorm/BrainstormForm.tsx b/src/components/features/brainstorm/BrainstormForm.tsx
index 7c62e4eb1..564f0172c 100644
--- a/src/components/features/brainstorm/BrainstormForm.tsx
+++ b/src/components/features/brainstorm/BrainstormForm.tsx
@@ -13,7 +13,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Card, CardContent } from '@/components/ui/card';
 import { BrainstormInputSchema, type BrainstormInput } from '@/lib/ai/schemas/brainstorm';
 import { LoadingSpinner } from '@/components/ui/loading-spinner';
 
@@ -60,17 +60,6 @@ export function BrainstormForm({ onSubmit, isLoading, debatePrefill = true }: Br
 
   return (
     <Card className="border-amber-500/20">
-      <CardHeader className="bg-gradient-to-br from-amber-500/5 to-transparent">
-        <div className="flex items-center gap-3">
-          <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-amber-500/10">
-            <Lightbulb className="h-5 w-5 text-amber-500" />
-          </div>
-          <div>
-            <CardTitle>{t('brainstormForm.title')}</CardTitle>
-            <CardDescription>{t('brainstormForm.subtitle')}</CardDescription>
-          </div>
-        </div>
-      </CardHeader>
       <CardContent className="pt-6">
         <form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
           {/* Motion Input */}
diff --git a/src/components/features/brainstorm/BrainstormResults.tsx b/src/components/features/brainstorm/BrainstormResults.tsx
index 8dc95ae84..1a968aea9 100644
--- a/src/components/features/brainstorm/BrainstormResults.tsx
+++ b/src/components/features/brainstorm/BrainstormResults.tsx
@@ -5,11 +5,12 @@ import { TrendingUp, ArrowRight, AlertTriangle, Lightbulb } from 'lucide-react';
 import { Badge } from '@/components/ui/badge';
 import { SectionCard } from '@/components/ui/section-card';
 import type { BrainstormOutput, Idea } from '@/lib/ai/schemas/brainstorm';
-import { StaggeredContainer } from '@/components/ui/animated-section';
 import { cn } from '@/lib/utils';
 import { toast } from 'sonner';
 import { EmptyState } from '@/components/ui/empty-state';
 import { ExportToolbar } from '@/components/features/ExportToolbar';
+import { ResultHeader } from '@/components/features/tools/ResultHeader';
+import { ResearchedSources } from '@/components/features/tools/ResearchedSources';
 import { GoogleDriveAuthModal } from '@/components/features/export/GoogleDriveAuthModal';
 import { SourceQualityList } from '@/components/features/shared/SourceQualityList';
 import type { DiscoveredSource } from '@/lib/ai/client';
@@ -142,26 +143,22 @@ export function BrainstormResults({ result, discoveredSources, onDiscuss }: Brai
   }
 
   return (
-    <StaggeredContainer className="space-y-6">
+    <div className="space-y-6">
       <GoogleDriveAuthModal open={showDriveAuth} onOpenChange={setShowDriveAuth} />
-      {/* Researched sources with quality provenance */}
-      {discoveredSources && discoveredSources.length > 0 && (
-        <div className="rounded-lg border bg-card/50 p-4">
-          <h4 className="mb-2 text-sm font-medium">{t('sourceQuality.researchedSources')}</h4>
-          <SourceQualityList sources={discoveredSources} />
-          <p className="mt-2 text-xs text-muted-foreground">
-            {t('sourceQuality.fallbackNote')}
-          </p>
-        </div>
-      )}
-      <ExportToolbar
-        onPdf={handlePdfExport}
-        onDocx={handleDocxExport}
-        onGoogleDocs={handleGoogleDocsExport}
-        isExportingGDocs={isExportingGDocs}
-        onDiscuss={onDiscuss}
-        discussLabel={t('brainstormResults.discuss')}
+      <ResultHeader
+        title={t('brainstormResults.resultTitle', 'Angles')}
+        actions={(
+          <ExportToolbar
+            onPdf={handlePdfExport}
+            onDocx={handleDocxExport}
+            onGoogleDocs={handleGoogleDocsExport}
+            isExportingGDocs={isExportingGDocs}
+            onDiscuss={onDiscuss}
+            discussLabel={t('brainstormResults.discuss')}
+          />
+        )}
       />
+      <ResearchedSources sources={discoveredSources} />
 
       {!result.topFive?.length && !result.mindmap?.length && !result.buckets?.length && (
         <EmptyState
@@ -275,6 +272,6 @@ export function BrainstormResults({ result, discoveredSources, onDiscuss }: Brai
           </ul>
         </SectionCard>
       )}
-    </StaggeredContainer>
+    </div>
   );
 }
diff --git a/src/components/features/debate/DebateContextControl.tsx b/src/components/features/debate/DebateContextControl.tsx
index 904334843..23fd0bd01 100644
--- a/src/components/features/debate/DebateContextControl.tsx
+++ b/src/components/features/debate/DebateContextControl.tsx
@@ -84,11 +84,11 @@ export function DebateContextControl({ feature, side, includeSources = true, deb
   const base = `flex flex-wrap items-center gap-x-3 gap-y-1 rounded-lg border px-3 py-2 text-sm ${className}`;
 
   if (!debateId || !plan || !summary) {
+    // With no Current Debate the page's debate strip already says so; one notice is enough.
+    if (!(oneOff && debateIdOverride === undefined)) return null;
     return (
       <p className={`${base} border-dashed border-border bg-muted/40 text-muted-foreground`} data-testid="debate-context-control">
-        {oneOff && debateIdOverride === undefined
-          ? t('debateContext.oneOff', 'One-off mode: no Current Debate material will be used or saved.')
-          : t('debateContext.noDebate', 'No Current Debate, so no debate material will be used.')}
+        {t('debateContext.oneOff', 'One-off mode: no Current Debate material will be used or saved.')}
       </p>
     );
   }
diff --git a/src/components/features/factoids/FactoidsForm.tsx b/src/components/features/factoids/FactoidsForm.tsx
index 6de12e403..e1da6582e 100644
--- a/src/components/features/factoids/FactoidsForm.tsx
+++ b/src/components/features/factoids/FactoidsForm.tsx
@@ -15,7 +15,7 @@ import {
   SelectValue,
 } from '@/components/ui/select';
 import { Slider } from '@/components/ui/slider';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Card, CardContent } from '@/components/ui/card';
 import { FactoidsInputSchema, type FactoidsInput } from '@/lib/ai/schemas/factoids';
 import { LoadingSpinner } from '@/components/ui/loading-spinner';
 
@@ -63,17 +63,6 @@ export function FactoidsForm({ onSubmit, isLoading, debateContext = true }: Fact
 
   return (
     <Card className="border-secondary/30">
-      <CardHeader className="bg-gradient-to-br from-secondary/10 to-transparent">
-        <div className="flex items-center gap-3">
-          <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-secondary/20">
-            <BookOpen className="h-5 w-5 text-secondary-foreground" />
-          </div>
-          <div>
-            <CardTitle>{t('factoidsForm.title')}</CardTitle>
-            <CardDescription>{t('factoidsForm.subtitle')}</CardDescription>
-          </div>
-        </div>
-      </CardHeader>
       <CardContent className="pt-6">
         <form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
           {/* Claim Input */}
diff --git a/src/components/features/factoids/FactoidsResults.tsx b/src/components/features/factoids/FactoidsResults.tsx
index 462e347ca..8ba14ec74 100644
--- a/src/components/features/factoids/FactoidsResults.tsx
+++ b/src/components/features/factoids/FactoidsResults.tsx
@@ -7,11 +7,12 @@ import { Button } from '@/components/ui/button';
 import { SectionCard } from '@/components/ui/section-card';
 import { Progress } from '@/components/ui/progress';
 import type { FactoidsOutput, Factoid } from '@/lib/ai/schemas/factoids';
-import { StaggeredContainer } from '@/components/ui/animated-section';
 import { cn } from '@/lib/utils';
 import { validateUrl } from '@/lib/validation/url';
 import { toast } from 'sonner';
 import { ExportToolbar } from '@/components/features/ExportToolbar';
+import { ResultHeader } from '@/components/features/tools/ResultHeader';
+import { ResearchedSources } from '@/components/features/tools/ResearchedSources';
 import { GoogleDriveAuthModal } from '@/components/features/export/GoogleDriveAuthModal';
 import { openExternalUrl } from '@/lib/native';
 import { SourceQualityList } from '@/components/features/shared/SourceQualityList';
@@ -201,31 +202,22 @@ export function FactoidsResults({ result, discoveredSources, onDiscuss, onSaveSo
   };
 
   return (
-    <StaggeredContainer className="space-y-6">
+    <div className="space-y-6">
       <GoogleDriveAuthModal open={showDriveAuth} onOpenChange={setShowDriveAuth} />
-      <ExportToolbar
-        onPdf={handlePdfExport}
-        onDocx={handleDocxExport}
-        onGoogleDocs={handleGoogleDocsExport}
-        isExportingGDocs={isExportingGDocs}
-        onDiscuss={onDiscuss}
-        discussLabel={t('factoidsResults.discuss')}
+      <ResultHeader
+        title={t('factoidsResults.resultTitle', 'Evidence')}
+        actions={(
+          <ExportToolbar
+            onPdf={handlePdfExport}
+            onDocx={handleDocxExport}
+            onGoogleDocs={handleGoogleDocsExport}
+            isExportingGDocs={isExportingGDocs}
+            onDiscuss={onDiscuss}
+            discussLabel={t('factoidsResults.discuss')}
+          />
+        )}
       />
-
-      {discoveredSources && discoveredSources.length > 0 && (
-        <section
-          aria-labelledby="factoids-consulted-sources"
-          className="rounded-lg border bg-card/50 p-4 sm:p-5"
-        >
-          <h3 id="factoids-consulted-sources" className="mb-2 text-sm font-medium">
-            {t('sourceQuality.researchedSources')}
-          </h3>
-          <SourceQualityList sources={discoveredSources} className="[&_a]:break-words" />
-          <p className="mt-3 text-xs text-muted-foreground">
-            {t('sourceQuality.fallbackNote')}
-          </p>
-        </section>
-      )}
+      <ResearchedSources sources={discoveredSources} />
 
       {/* Verification Status */}
       <SectionCard
@@ -304,6 +296,6 @@ export function FactoidsResults({ result, discoveredSources, onDiscuss, onSaveSo
           ))}
         </div>
       </SectionCard>
-    </StaggeredContainer>
+    </div>
   );
 }
diff --git a/src/components/features/generate/GenerateForm.tsx b/src/components/features/generate/GenerateForm.tsx
index 32dfd3681..f9d65e64a 100644
--- a/src/components/features/generate/GenerateForm.tsx
+++ b/src/components/features/generate/GenerateForm.tsx
@@ -14,9 +14,10 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Card, CardContent } from '@/components/ui/card';
 import { GenerateInputSchema, type GenerateInput } from '@/lib/ai/schemas/generate';
 import { LoadingSpinner } from '@/components/ui/loading-spinner';
+import { ListeningIndicator } from '@/components/features/voice/ListeningIndicator';
 import { useDebateMotionPrefill } from '@/components/features/debate/CurrentDebateStrip';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useSpeechToText } from '@/hooks/use-speech-to-text';
@@ -109,18 +110,7 @@ export function GenerateForm({ onSubmit, isLoading, debatePrefill = true }: Gene
 
   return (
     <Card className="border-primary/20">
-      <CardHeader className="bg-gradient-to-br from-primary/5 to-transparent">
-        <div className="flex items-center gap-3">
-          <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-primary/10">
-            <Sparkles className="h-5 w-5 text-primary" />
-          </div>
-          <div>
-            <CardTitle>{t('generateForm.title')}</CardTitle>
-            <CardDescription>{t('generateForm.subtitle')}</CardDescription>
-          </div>
-        </div>
-      </CardHeader>
-      <CardContent className="pt-4">
+      <CardContent className="pt-6">
         <form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
           {/* Motion Input with Voice */}
           <div className="space-y-2">
@@ -139,7 +129,7 @@ export function GenerateForm({ onSubmit, isLoading, debatePrefill = true }: Gene
                   type="button"
                   variant={isListening ? "destructive" : "outline"}
                   size="icon"
-                  className={`h-12 w-12 shrink-0 ${isListening ? 'animate-pulse' : ''}`}
+                  className="h-12 w-12 shrink-0"
                   onClick={toggleVoice}
                   title={isListening ? t('generateForm.stopListening') : t('generateForm.dictate')}
                   aria-label={isListening ? t('generateForm.stopVoice') : t('generateForm.startVoice')}
@@ -149,13 +139,7 @@ export function GenerateForm({ onSubmit, isLoading, debatePrefill = true }: Gene
               )}
             </div>
             {isListening && (
-              <div className="flex items-center gap-2 text-sm text-primary animate-pulse">
-                <span className="relative flex h-2 w-2">
-                  <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-400 opacity-75"></span>
-                  <span className="relative inline-flex rounded-full h-2 w-2 bg-red-500"></span>
-                </span>
-                {t('generateForm.listening')}
-              </div>
+              <ListeningIndicator label={t('generateForm.listening')} />
             )}
             {voiceError && (
               <p className="text-sm text-destructive">
@@ -282,10 +266,9 @@ export function GenerateForm({ onSubmit, isLoading, debatePrefill = true }: Gene
           <DebateContextControl feature="generate" side={requestSide('generate', currentValues)} hidden={!debatePrefill} />
 
           {/* Submit Button */}
-          <Button type="submit" className="w-full h-12 relative overflow-hidden group" disabled={isLoading} aria-busy={isLoading} data-tour="generate-button">
-            {!isLoading && <span className="absolute inset-0 -translate-x-full group-hover:translate-x-0 bg-gradient-to-r from-transparent via-white/10 to-transparent animate-[shimmer_3s_infinite] pointer-events-none" />}
+          <Button type="submit" className="w-full h-12" disabled={isLoading} aria-busy={isLoading} data-tour="generate-button">
             {isLoading ? (
-              <span className="motion-reveal inline-flex items-center">
+              <span className="inline-flex items-center">
                 <LoadingSpinner size="sm" className="mr-2" />
                 {t('generateForm.generating')}
               </span>
diff --git a/src/components/features/generate/GenerateResults.tsx b/src/components/features/generate/GenerateResults.tsx
index ef91f1611..50a962168 100644
--- a/src/components/features/generate/GenerateResults.tsx
+++ b/src/components/features/generate/GenerateResults.tsx
@@ -7,10 +7,11 @@ import { SectionCard } from '@/components/ui/section-card';
 import { Separator } from '@/components/ui/separator';
 import { Markdown } from '@/components/ui/markdown';
 import type { GenerateOutput, Contention } from '@/lib/ai/schemas/generate';
-import { StaggeredContainer } from '@/components/ui/animated-section';
 import { toast } from 'sonner';
 import { formatEuropeanDateTime } from '@/lib/date-format';
 import { ExportToolbar } from '@/components/features/ExportToolbar';
+import { ResultHeader } from '@/components/features/tools/ResultHeader';
+import { ResearchedSources } from '@/components/features/tools/ResearchedSources';
 import { GoogleDriveAuthModal } from '@/components/features/export/GoogleDriveAuthModal';
 import { SourceQualityList } from '@/components/features/shared/SourceQualityList';
 import type { DiscoveredSource } from '@/lib/ai/client';
@@ -29,7 +30,7 @@ interface GenerateResultsProps {
   onPracticeCrossfire?: () => void;
 }
 
-function ArgumentCard({ contention, index }: { contention: Contention; index: number }) {
+function ArgumentCard({ contention, index, unverified }: { contention: Contention; index: number; unverified: boolean }) {
   const { t } = useTranslation();
   return (
     <div className="rounded-lg border border-border bg-card p-4 space-y-3 motion-list-item">
@@ -49,11 +50,16 @@ function ArgumentCard({ contention, index }: { contention: Contention; index: nu
       <div className="space-y-2 text-sm">
         <div>
           <span className="font-medium text-muted-foreground">{t('generateResults.reasoning')} </span>
-          <Markdown className="inline">{contention.reasoning}</Markdown>
+          <Markdown inline>{contention.reasoning}</Markdown>
         </div>
         <div>
           <span className="font-medium text-muted-foreground">{t('generateResults.evidence')} </span>
-          <Markdown className="inline">{contention.evidence}</Markdown>
+          {unverified && !contention.needsSource && (
+            <Badge variant="outline" className="mr-1 border-amber-500/40 bg-amber-500/10 py-0 align-middle text-amber-800 dark:text-amber-300">
+              {t('generateResults.unverified', 'Unverified')}
+            </Badge>
+          )}
+          <Markdown inline>{contention.evidence}</Markdown>
         </div>
         {contention.sourceQuery && (
           <div className="rounded-md bg-muted/50 p-2 text-xs">
@@ -63,7 +69,7 @@ function ArgumentCard({ contention, index }: { contention: Contention; index: nu
         )}
         <div>
           <span className="font-medium text-muted-foreground">{t('generateResults.impact')} </span>
-          <Markdown className="inline">{contention.impact}</Markdown>
+          <Markdown inline>{contention.impact}</Markdown>
         </div>
       </div>
     </div>
@@ -176,33 +182,27 @@ export function GenerateResults({ result, discoveredSources, onRegenerateSection
   }
 
   const durationText = formatDuration(result.metadata?.durationMs, t);
+  // Without web research, evidence is the model's own claim and is labelled that way.
+  const researched = Boolean(discoveredSources?.length);
   const modelName = result.metadata?.model || result.metadata?.provider;
   const modelText = modelName ? t('generateResults.modelLabel', { value: modelName }) : null;
 
   return (
-    <StaggeredContainer className="space-y-6">
+    <div className="space-y-6">
       <GoogleDriveAuthModal open={showDriveAuth} onOpenChange={setShowDriveAuth} />
-      {/* Researched sources with quality provenance */}
-      {discoveredSources && discoveredSources.length > 0 && (
-        <div className="rounded-lg border bg-card/50 p-4">
-          <h4 className="mb-2 text-sm font-medium">{t('sourceQuality.researchedSources')}</h4>
-          <SourceQualityList sources={discoveredSources} />
-          <p className="mt-2 text-xs text-muted-foreground">
-            {t('sourceQuality.fallbackNote')}
-          </p>
-        </div>
-      )}
-      {/* Metadata */}
-      <div className="space-y-3">
-        <div className="flex items-center gap-2 flex-wrap text-xs text-muted-foreground">
+      <ResultHeader
+        title={t('generateResults.resultTitle', 'Your case')}
+        meta={<>
           <Badge variant={result.metadata?.side === 'pro' ? 'default' : 'secondary'}>
             {result.metadata?.side === 'pro' ? t('generateResults.proposition') : t('generateResults.opposition')}
-          </Badge>          <span>•</span>
-          <span>{result.metadata?.generatedAt ? formatEuropeanDateTime(result.metadata.generatedAt) : ''}</span>
+          </Badge>
+          {result.metadata?.generatedAt && <><span>•</span><span>{formatEuropeanDateTime(result.metadata.generatedAt)}</span></>}
           {modelText && <><span>•</span><span>{modelText}</span></>}
           {durationText && <><span>•</span><span>{durationText}</span></>}
-        </div>
-        <div data-tour="export-section">
+        </>}
+        caveat={researched ? undefined : t('generateResults.unresearchedCaveat', 'AI-generated, and no web research backs this evidence. Check facts and sources before using them in a round.')}
+        actions={(
+        <div data-tour="export-section" className="w-full">
           <ExportToolbar
             onPdf={handlePdfExport}
             onDocx={handleDocxExport}
@@ -250,7 +250,9 @@ export function GenerateResults({ result, discoveredSources, onRegenerateSection
             ) : undefined}
           />
         </div>
-      </div>
+        )}
+      />
+      <ResearchedSources sources={discoveredSources} />
 
       {/* Exordio (Introductor only) */}
       {result.exordio && (result.exordio.hook || result.exordio.transition) && (
@@ -319,7 +321,7 @@ export function GenerateResults({ result, discoveredSources, onRegenerateSection
       >
         <div className="space-y-4">
           {result.contentions?.map((contention, index) => (
-            <ArgumentCard key={contention.id} contention={contention} index={index} />
+            <ArgumentCard key={contention.id} contention={contention} index={index} unverified={!researched} />
           ))}
         </div>
       </SectionCard>
@@ -394,6 +396,6 @@ export function GenerateResults({ result, discoveredSources, onRegenerateSection
           ))}
         </div>
       </SectionCard>
-    </StaggeredContainer>
+    </div>
   );
 }
diff --git a/src/components/features/practice/RoundClock.tsx b/src/components/features/practice/RoundClock.tsx
new file mode 100644
index 000000000..a40da3f87
--- /dev/null
+++ b/src/components/features/practice/RoundClock.tsx
@@ -0,0 +1,62 @@
+import { useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { cn } from '@/lib/utils';
+
+export type ClockTone = 'normal' | 'warning' | 'over';
+
+/** One urgency rule for every speaking clock: amber in the last 30 seconds, red at zero. */
+// eslint-disable-next-line react-refresh/only-export-components
+export function clockTone(secondsLeft: number): ClockTone {
+  if (secondsLeft <= 0) return 'over';
+  if (secondsLeft <= 30) return 'warning';
+  return 'normal';
+}
+
+// eslint-disable-next-line react-refresh/only-export-components
+export const CLOCK_TONE_TEXT: Record<ClockTone, string> = {
+  normal: 'text-foreground',
+  warning: 'text-amber-700 dark:text-amber-400',
+  over: 'text-destructive',
+};
+
+// eslint-disable-next-line react-refresh/only-export-components
+export function formatClock(secondsLeft: number) {
+  const total = Math.max(0, Math.ceil(secondsLeft));
+  return `${Math.floor(total / 60)}:${String(total % 60).padStart(2, '0')}`;
+}
+
+const ANNOUNCE_AT = [60, 30, 0];
+
+/**
+ * A visually hidden live region that speaks only at 1:00, 0:30 and 0:00, so a screen
+ * reader isn't read every second of a running clock.
+ */
+export function ClockAnnouncer({ secondsLeft, running }: { secondsLeft: number; running: boolean }) {
+  const { t } = useTranslation();
+  const [message, setMessage] = useState('');
+  const previous = useRef(secondsLeft);
+  useEffect(() => {
+    const before = previous.current;
+    previous.current = secondsLeft;
+    if (!running && secondsLeft > 0) return;
+    const crossed = ANNOUNCE_AT.find((mark) => before > mark && secondsLeft <= mark);
+    if (crossed === undefined) return;
+    setMessage(crossed === 0
+      ? t('clock.timeUp', 'Time is up.')
+      : t('clock.remaining', { time: formatClock(crossed), defaultValue: '{{time}} left.' }));
+  }, [running, secondsLeft, t]);
+  return <span className="sr-only" role="status" aria-live="polite">{message}</span>;
+}
+
+/** The speaking clock: tabular figures in the UI face, coloured by how much time is left. */
+export function RoundClock({ secondsLeft, className, label }: { secondsLeft: number; className?: string; label?: string }) {
+  return (
+    <span
+      role="timer"
+      aria-label={label}
+      className={cn('font-sans font-semibold tabular-nums tracking-[-0.02em] transition-colors duration-300', CLOCK_TONE_TEXT[clockTone(secondsLeft)], className)}
+    >
+      {formatClock(secondsLeft)}
+    </span>
+  );
+}
diff --git a/src/components/features/sparring/SparringRound.tsx b/src/components/features/sparring/SparringRound.tsx
index 42c3ec944..099f24c85 100644
--- a/src/components/features/sparring/SparringRound.tsx
+++ b/src/components/features/sparring/SparringRound.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useOnlineStatus } from '@/hooks/use-online-status';
-import { AlertCircle, Bot, Check, ChevronRight, CirclePause, CirclePlay, Clock3, CloudOff, RotateCcw, Send, UserRound, Wifi } from 'lucide-react';
+import { AlertCircle, Bot, Check, ChevronRight, CirclePause, CirclePlay, Clock3, CloudOff, Loader2, RotateCcw, Send, UserRound, Wifi } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { Textarea } from '@/components/ui/textarea';
@@ -17,6 +17,7 @@ import { VoiceMicControl } from '@/components/features/voice/VoiceMicControl';
 import { measureDelivery, type SpeechDelivery } from '@/lib/voice/delivery';
 import { opponentVoice } from '@/lib/voice/opponent-voice';
 import type { AppLanguage } from '@/lib/languages';
+import { ClockAnnouncer, RoundClock, clockTone } from '@/components/features/practice/RoundClock';
 
 const MAX_SPEECH_CHARS = 6_000;
 
@@ -73,7 +74,9 @@ export function SparringRound({
     ? t(`sparring.roleGuidance.${currentTurn.kind}`, SCHOOL_ROLE_GUIDANCE[currentTurn.kind])
     : t('sparring.round.yourSpeechDescription', 'Make the case in the time you have. The opponent will respond to this text.');
   const timerProgress = currentTurn?.timeLimitSeconds ? Math.max(0, Math.min(100, (session.timerRemainingSeconds / currentTurn.timeLimitSeconds) * 100)) : 0;
-  const isUrgent = session.timerRemainingSeconds <= 30 && session.timerRemainingSeconds > 0;
+  const tone = clockTone(session.timerRemainingSeconds);
+  const isUrgent = tone === 'warning';
+  const latestOpponentSpeech = session.speeches.at(-1)?.speaker === 'ai' ? session.speeches.at(-1) : undefined;
   const timeExpired = session.timerRemainingSeconds <= 0
     || (session.timerDeadline !== null && session.timerDeadline <= Date.now());
 
@@ -154,12 +157,15 @@ export function SparringRound({
                   <p className="text-xs font-semibold uppercase tracking-[0.16em] text-muted-foreground">{judging ? t('sparring.round.complete', 'Round complete') : currentTurn ? t('sparring.round.turnOf', 'Turn {{current}} of {{total}}', { current: session.currentTurnIndex + 1, total: session.turns.length }) : t('sparring.round.preparingResult', 'Preparing your result')}</p>
                   <p className="mt-1 text-lg font-semibold text-foreground">{judging ? t('sparring.round.judgeReading', 'The judge is reading the transcript.') : currentTurn ? t(`sparring.turns.${currentTurn.id}`, currentTurn.label) : t('sparring.round.scoring', 'Scoring the round')}</p>
                 </div>
-                <div className={cn('flex items-center gap-2 font-mono text-3xl font-semibold tabular-nums tracking-tight', isUrgent ? 'text-amber-600 dark:text-amber-400' : 'text-foreground')} aria-label={judging ? t('sparring.round.noTimer', 'No timer while judging') : t('sparring.round.timeRemaining', '{{time}} remaining', { time: formatRoundTime(session.timerRemainingSeconds) })}>
-                  <Clock3 className="h-6 w-6" aria-hidden="true" />
-                  <span>{judging ? '--:--' : formatRoundTime(session.timerRemainingSeconds)}</span>
+                <div className="flex items-center gap-2 text-3xl">
+                  <Clock3 className="h-6 w-6 text-muted-foreground" aria-hidden="true" />
+                  {judging
+                    ? <span className="font-semibold tabular-nums text-muted-foreground" aria-label={t('sparring.round.noTimer', 'No timer while judging')}>--:--</span>
+                    : <RoundClock secondsLeft={session.timerRemainingSeconds} label={t('sparring.round.timeRemaining', '{{time}} remaining', { time: formatRoundTime(session.timerRemainingSeconds) })} />}
+                  {!judging && <ClockAnnouncer secondsLeft={session.timerRemainingSeconds} running={session.timerRunning} />}
                 </div>
               </div>
-              <Progress value={judging ? 0 : timerProgress} className={cn('mt-5 h-2', isUrgent ? '[&>div]:bg-amber-500' : '[&>div]:bg-primary')} aria-label={t('sparring.round.timeRemaining', 'Time remaining')} />
+              <Progress value={judging ? 0 : timerProgress} className={cn('mt-5 h-2', tone === 'over' ? '[&>div]:bg-destructive' : isUrgent ? '[&>div]:bg-amber-500' : '[&>div]:bg-primary')} aria-label={t('sparring.round.timeRemaining', 'Time remaining')} />
               {!judging && userTurn && (
                 <div className="mt-4 flex flex-wrap items-center gap-2">
                   <Button type="button" variant="outline" size="sm" onClick={() => session.timerRunning ? pauseTimer() : resumeTimer()} disabled={session.timerRemainingSeconds <= 0}>
@@ -188,10 +194,7 @@ export function SparringRound({
                   </>
                 ) : (
                   <>
-                    <div className="relative flex h-14 w-14 items-center justify-center rounded-2xl bg-primary/10 text-primary" aria-hidden="true">
-                      <span className="absolute inset-0 animate-ping rounded-2xl bg-primary/10 motion-reduce:animate-none" />
-                      <Bot className="relative h-7 w-7" />
-                    </div>
+                    <Loader2 className="h-7 w-7 animate-spin text-primary [animation-duration:700ms]" aria-hidden="true" />
                     <h2 className="mt-5 text-lg font-semibold">{t('sparring.round.judgeWeighing', 'Judge is weighing the round')}</h2>
                     <p className="mt-2 max-w-md text-sm leading-6 text-muted-foreground">{t('sparring.round.judgeDescription', 'Reading the claims, responses, and strategic choices. This usually takes one request.')}</p>
                   </>
@@ -200,6 +203,17 @@ export function SparringRound({
             </Card>
           ) : (
             <>
+              {userTurn && latestOpponentSpeech && (
+                // What you're answering stays in view above the composer, not below it in the transcript.
+                <article className="rounded-xl border border-border bg-card p-4 sm:p-5" aria-labelledby="sparring-latest-opponent">
+                  <div className="flex items-center gap-2">
+                    <Bot className="h-4 w-4 text-muted-foreground" aria-hidden="true" />
+                    <h2 id="sparring-latest-opponent" className="text-sm font-semibold">{t('sparring.round.latestOpponent', 'Opponent’s last speech')}</h2>
+                    <span className="truncate text-xs text-muted-foreground">{t(`sparring.turns.${latestOpponentSpeech.turnId}`, latestOpponentSpeech.role)}</span>
+                  </div>
+                  <div className="mt-3 max-h-60 overflow-y-auto text-sm leading-7 text-foreground/90"><Markdown>{latestOpponentSpeech.content}</Markdown></div>
+                </article>
+              )}
               {userTurn ? (
                 <Card className="border-primary/30 shadow-sm">
                   <CardHeader className="pb-4">
@@ -224,7 +238,7 @@ export function SparringRound({
                       disabled={judging}
                     />
                     <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-                      <p className="text-xs text-muted-foreground">{isOnline ? <><kbd className="rounded border border-border bg-muted px-1.5 py-0.5 font-mono">⌘</kbd> {t('common.or')} <kbd className="rounded border border-border bg-muted px-1.5 py-0.5 font-mono">Ctrl</kbd> + <kbd className="rounded border border-border bg-muted px-1.5 py-0.5 font-mono">Enter</kbd> {t('sparring.round.toSubmit', 'to submit')}</> : t('sparring.round.offlineCannotSubmit', 'Reconnect to submit this speech.')}</p>
+                      <p className="text-xs text-muted-foreground">{isOnline ? <span className="pointer-coarse:hidden"><kbd className="rounded border border-border bg-muted px-1.5 py-0.5 font-mono">⌘</kbd> {t('common.or')} <kbd className="rounded border border-border bg-muted px-1.5 py-0.5 font-mono">Ctrl</kbd> + <kbd className="rounded border border-border bg-muted px-1.5 py-0.5 font-mono">Enter</kbd> {t('sparring.round.toSubmit', 'to submit')}</span> : t('sparring.round.offlineCannotSubmit', 'Reconnect to submit this speech.')}</p>
                       <Button type="button" onClick={() => void submitSpeech()} disabled={!canSubmit} className="sm:min-w-36">
                         {t('sparring.round.submitSpeech', 'Submit speech')} <Send className="h-4 w-4" aria-hidden="true" />
                       </Button>
@@ -245,13 +259,12 @@ export function SparringRound({
                       </>
                     ) : (
                       <>
-                        <div className="relative flex h-14 w-14 items-center justify-center rounded-2xl bg-muted text-foreground" aria-hidden="true">
-                          <span className={cn('absolute inset-0 rounded-2xl bg-primary/10', aiLoading && 'animate-pulse motion-reduce:animate-none')} />
-                          <Bot className="relative h-7 w-7" />
-                        </div>
+                        {/* One indicator: a spinner while the opponent works, its icon otherwise. */}
+                        {aiLoading
+                          ? <Loader2 className="h-7 w-7 animate-spin text-primary [animation-duration:700ms]" aria-hidden="true" />
+                          : <Bot className="h-7 w-7 text-muted-foreground" aria-hidden="true" />}
                         <h2 className="mt-5 text-lg font-semibold">{aiLoading ? t('sparring.round.opponentThinking', 'Opponent is thinking') : t('sparring.round.opponentUpNext', 'Opponent is up next')}</h2>
                         <p className="mt-2 max-w-md text-sm leading-6 text-muted-foreground">{aiLoading ? t('sparring.round.opponentThinkingDescription', 'It is reading the motion and your speeches before choosing a response.') : t('sparring.round.opponentUpNextDescription', 'The next response will appear here.')}</p>
-                        {aiLoading && <div className="mt-5 flex items-center gap-1.5" aria-label={t('sparring.round.aiThinking', 'AI is thinking')}><span className="h-1.5 w-1.5 animate-bounce rounded-full bg-primary [animation-delay:-0.2s] motion-reduce:animate-none" /><span className="h-1.5 w-1.5 animate-bounce rounded-full bg-primary [animation-delay:-0.1s] motion-reduce:animate-none" /><span className="h-1.5 w-1.5 animate-bounce rounded-full bg-primary motion-reduce:animate-none" /></div>}
                       </>
                     )}
                   </CardContent>
diff --git a/src/components/features/sparring/SparringSetup.tsx b/src/components/features/sparring/SparringSetup.tsx
index 6961dbef2..ada909e88 100644
--- a/src/components/features/sparring/SparringSetup.tsx
+++ b/src/components/features/sparring/SparringSetup.tsx
@@ -12,6 +12,7 @@ import { useDebateMotionPrefill } from '@/components/features/debate/CurrentDeba
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import { ModelSelector } from '@/components/ModelSelector';
 import { cn } from '@/lib/utils';
+import { PageHeader } from '@/components/layout/PageHeader';
 import {
   SPARRING_FORMATS,
   buildSparringTurns,
@@ -75,7 +76,7 @@ export function SparringSetup({ onStart, isStarting = false, initialValues, bann
 
   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>
+      <PageHeader className="mb-0" title={t('nav.sparring', 'Sparring')} />
       {banner}
 
       <form onSubmit={handleSubmit} className="grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_300px]">
diff --git a/src/components/features/tools/ResearchedSources.tsx b/src/components/features/tools/ResearchedSources.tsx
new file mode 100644
index 000000000..008e31b17
--- /dev/null
+++ b/src/components/features/tools/ResearchedSources.tsx
@@ -0,0 +1,22 @@
+import { useTranslation } from 'react-i18next';
+import { ChevronDown } from 'lucide-react';
+import type { DiscoveredSource } from '@/lib/ai/client';
+import { SourceQualityList } from '@/components/features/shared/SourceQualityList';
+
+/** The web sources a result was researched from, folded under the result header. */
+export function ResearchedSources({ sources }: { sources?: DiscoveredSource[] }) {
+  const { t } = useTranslation();
+  if (!sources?.length) return null;
+  return (
+    <details className="group rounded-lg border bg-card/50 p-4 sm:p-5">
+      <summary className="flex cursor-pointer list-none items-center justify-between gap-2 text-sm font-medium [&::-webkit-details-marker]:hidden">
+        {t('tools.researchedSources', { total: sources.length, defaultValue: 'Researched sources ({{total}})' })}
+        <ChevronDown className="h-4 w-4 shrink-0 transition-transform duration-150 ease-out-strong group-open:rotate-180" aria-hidden="true" />
+      </summary>
+      <div className="mt-3">
+        <SourceQualityList sources={sources} className="[&_a]:break-words" />
+        <p className="mt-3 text-xs text-muted-foreground">{t('sourceQuality.fallbackNote')}</p>
+      </div>
+    </details>
+  );
+}
diff --git a/src/components/features/tools/ResultHeader.tsx b/src/components/features/tools/ResultHeader.tsx
new file mode 100644
index 000000000..18d72b240
--- /dev/null
+++ b/src/components/features/tools/ResultHeader.tsx
@@ -0,0 +1,31 @@
+import type { ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Info } from 'lucide-react';
+
+interface ResultHeaderProps {
+  title: ReactNode;
+  /** One line under the title: model, time, counts. */
+  meta?: ReactNode;
+  /** Export, copy, discuss and practice actions, in one row. */
+  actions?: ReactNode;
+  /** Generate marks evidence that no researched source backs; others leave this off. */
+  caveat?: ReactNode;
+}
+
+/** The same header on every tool result: what it is, what you can do with it, and how far to trust it. */
+export function ResultHeader({ title, meta, actions, caveat }: ResultHeaderProps) {
+  const { t } = useTranslation();
+  return (
+    <header className="mb-4 space-y-3">
+      <div className="space-y-1">
+        <h2 className="text-lg font-semibold leading-tight tracking-[-0.014em] text-foreground">{title}</h2>
+        {meta && <div className="flex flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground">{meta}</div>}
+      </div>
+      {actions && <div className="flex flex-wrap items-center gap-2">{actions}</div>}
+      <p className="flex items-start gap-1.5 text-xs text-muted-foreground">
+        <Info className="mt-px h-3.5 w-3.5 shrink-0" aria-hidden="true" />
+        <span>{caveat ?? t('tools.aiCaveat', 'AI-generated. Check facts and sources before using them in a round.')}</span>
+      </p>
+    </header>
+  );
+}
diff --git a/src/components/features/tools/discuss.ts b/src/components/features/tools/discuss.ts
new file mode 100644
index 000000000..35cc4912e
--- /dev/null
+++ b/src/components/features/tools/discuss.ts
@@ -0,0 +1,65 @@
+import type { TFunction } from 'i18next';
+import type { NavigateFunction } from 'react-router-dom';
+import type { AttackOutput } from '@/lib/ai/schemas/attack';
+import type { BrainstormOutput } from '@/lib/ai/schemas/brainstorm';
+import type { FactoidsOutput } from '@/lib/ai/schemas/factoids';
+import type { GenerateOutput } from '@/lib/ai/schemas/generate';
+
+// "Discuss" prompts are built line by line, so no source indentation turns them into a
+// Markdown code block, and they are sent from Ask itself, through its streaming path.
+
+export function attackDiscussPrompt(result: AttackOutput, t: TFunction) {
+  return [
+    t('discuss.attack.intro', "I'd like to discuss the critique of my case."),
+    '',
+    `**${t('discuss.attack.assessment', 'Overall assessment')}:** ${result.overallAssessment.summary}`,
+    `**${t('discuss.attack.score', 'Score')}:** ${result.overallAssessment.score}/100`,
+    '',
+    `**${t('discuss.attack.weaknesses', 'Top weaknesses')}:**`,
+    ...result.weaknesses.slice(0, 3).map((weakness) => `- ${weakness.description} (${t(`attackResults.${weakness.severity}`, weakness.severity)})`),
+    '',
+    t('discuss.attack.ask', 'Can you help me improve this?'),
+  ].join('\n');
+}
+
+export function brainstormDiscussPrompt(result: BrainstormOutput, t: TFunction) {
+  const lines = [t('discuss.brainstorm.intro', "I'd like to discuss these brainstormed ideas."), ''];
+  if (result.topFive?.length) {
+    lines.push(`**${t('discuss.brainstorm.topIdeas', 'Top ideas')}:**`);
+    lines.push(...result.topFive.map((item) => `- ${item.idea.title}${item.idea.side ? ` (${t(`brainstormResults.${item.idea.side}`, item.idea.side)})` : ''}`));
+  } else if (result.buckets?.length) {
+    lines.push(`**${t('discuss.brainstorm.buckets', 'Key buckets')}:**`);
+    lines.push(...result.buckets.map((bucket) => `- ${bucket.name}: ${bucket.keyInsight}`));
+  }
+  lines.push('', t('discuss.brainstorm.ask', 'Can you help me expand on one of these?'));
+  return lines.join('\n');
+}
+
+export function generateDiscussPrompt(result: GenerateOutput, t: TFunction) {
+  return [
+    t('discuss.generate.intro', "I'd like to discuss the case we just generated."),
+    '',
+    `**${t('discuss.generate.thesis', 'Thesis')}:** ${result.caseStructure.thesis}`,
+    '',
+    `**${t('discuss.generate.arguments', 'Arguments')}:**`,
+    ...result.contentions.map((contention, index) => `${index + 1}. ${contention.claim}`),
+    '',
+    t('discuss.generate.ask', 'Can we refine this?'),
+  ].join('\n');
+}
+
+export function factoidsDiscussPrompt(result: FactoidsOutput, t: TFunction) {
+  return [
+    t('discuss.factoids.intro', "I'd like to discuss the evidence I found."),
+    '',
+    `**${t('discuss.factoids.factoids', 'Evidence')}:**`,
+    ...result.factoids.slice(0, 3).map((factoid) => `- ${factoid.shortClaim} (${factoid.citation.publisher})`),
+    '',
+    t('discuss.factoids.ask', 'How can I best use this evidence?'),
+  ].join('\n');
+}
+
+/** Opens Ask, which sends the prompt as the user's next message. */
+export function openDiscussion(navigate: NavigateFunction, prompt: string) {
+  navigate('/app/ask', { state: { discussPrompt: prompt } });
+}
diff --git a/src/components/features/tools/tool-run.tsx b/src/components/features/tools/tool-run.tsx
new file mode 100644
index 000000000..33c6c8bab
--- /dev/null
+++ b/src/components/features/tools/tool-run.tsx
@@ -0,0 +1,108 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { AlertCircle, X } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+
+export interface ToolRunError {
+  title: string;
+  description?: string;
+}
+
+// The page can unmount mid-run (results still land in the store), so the request
+// belongs to the tool, not to one mount of its page: Cancel works after coming back.
+const controllers = new Map<string, AbortController>();
+
+/** One run of a form tool: a cancellable request and the error it ended with. */
+// eslint-disable-next-line react-refresh/only-export-components
+export function useToolRun(tool: string) {
+  const [error, setError] = useState<ToolRunError | null>(null);
+
+  const start = useCallback(() => {
+    controllers.get(tool)?.abort();
+    const controller = new AbortController();
+    controllers.set(tool, controller);
+    setError(null);
+    return controller.signal;
+  }, [tool]);
+
+  const cancel = useCallback(() => {
+    controllers.get(tool)?.abort();
+    controllers.delete(tool);
+  }, [tool]);
+
+  return { start, cancel, error, setError, clearError: () => setError(null) };
+}
+
+function useElapsedSeconds() {
+  const [elapsed, setElapsed] = useState(0);
+  useEffect(() => {
+    const startedAt = Date.now();
+    const timer = window.setInterval(() => setElapsed(Math.floor((Date.now() - startedAt) / 1000)), 1000);
+    return () => window.clearInterval(timer);
+  }, []);
+  return elapsed;
+}
+
+/** One spinner, one true status line, elapsed time once it matters, and a way out. */
+export function ToolRunStatus({ label, onCancel }: { label: string; onCancel?: () => void }) {
+  const { t } = useTranslation();
+  const elapsed = useElapsedSeconds();
+  return (
+    <div className="flex min-h-[400px] flex-col items-center justify-center gap-4 rounded-lg border-2 border-dashed border-border bg-card/50 p-8 text-center">
+      <span className="h-8 w-8 animate-spin rounded-full border-2 border-primary/25 border-t-primary [animation-duration:600ms]" aria-hidden="true" />
+      <p className="text-sm font-medium text-muted-foreground">
+        <span role="status" aria-live="polite">{label}</span>
+        {elapsed >= 5 && <span className="ml-2 tabular-nums">{t('tools.elapsed', { seconds: elapsed, defaultValue: '{{seconds}}s' })}</span>}
+      </p>
+      {onCancel && (
+        <Button type="button" variant="outline" size="sm" onClick={onCancel}>
+          {t('common.cancel', 'Cancel')}
+        </Button>
+      )}
+    </div>
+  );
+}
+
+/** A failed run stays on the page with Retry, instead of a toast that disappears. */
+export function ToolRunErrorPanel({ error, onRetry, onDismiss }: { error: ToolRunError; onRetry?: () => void; onDismiss?: () => void }) {
+  const { t } = useTranslation();
+  return (
+    <div role="alert" className="mb-4 flex items-start gap-3 rounded-lg border border-destructive/30 bg-destructive/5 p-4 text-sm">
+      <AlertCircle className="mt-0.5 h-4 w-4 shrink-0 text-destructive" aria-hidden="true" />
+      <div className="min-w-0 flex-1">
+        <p className="font-medium text-foreground">{error.title}</p>
+        {error.description && <p className="mt-0.5 text-muted-foreground">{error.description}</p>}
+      </div>
+      <div className="flex shrink-0 gap-1">
+        {onRetry && <Button type="button" size="sm" variant="outline" onClick={onRetry}>{t('common.retry', 'Retry')}</Button>}
+        {onDismiss && (
+          <Button type="button" size="icon" variant="ghost" className="h-9 w-9" onClick={onDismiss} aria-label={t('common.close', 'Close')}>
+            <X className="h-4 w-4" />
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
+
+/** Whether an error is the user's own Cancel, which needs no message. */
+// eslint-disable-next-line react-refresh/only-export-components
+export function isCanceled(error: unknown, signal: AbortSignal) {
+  return signal.aborted || (error instanceof DOMException && error.name === 'AbortError');
+}
+
+/**
+ * On phones the results sit below the form, so a finished run scrolls them into view.
+ * Wide screens show both side by side and stay put.
+ */
+// eslint-disable-next-line react-refresh/only-export-components
+export function useRevealResults() {
+  const ref = useRef<HTMLDivElement>(null);
+  const reveal = useCallback(() => {
+    if (!window.matchMedia('(max-width: 1023px)').matches) return;
+    const reduce = window.matchMedia('(prefers-reduced-motion: reduce)').matches;
+    // After the result renders.
+    requestAnimationFrame(() => ref.current?.scrollIntoView({ behavior: reduce ? 'auto' : 'smooth', block: 'start' }));
+  }, []);
+  return { ref, reveal };
+}
diff --git a/src/components/features/voice/ListeningIndicator.tsx b/src/components/features/voice/ListeningIndicator.tsx
new file mode 100644
index 000000000..24cf308d9
--- /dev/null
+++ b/src/components/features/voice/ListeningIndicator.tsx
@@ -0,0 +1,9 @@
+/** The one "listening" signal: a steady red dot and a label. The button beside it never pulses. */
+export function ListeningIndicator({ label }: { label: string }) {
+  return (
+    <span className="flex items-center gap-2 text-sm text-muted-foreground" role="status">
+      <span className="h-2 w-2 shrink-0 rounded-full bg-destructive" aria-hidden="true" />
+      {label}
+    </span>
+  );
+}
diff --git a/src/components/features/voice/VoiceMicControl.tsx b/src/components/features/voice/VoiceMicControl.tsx
index 463966eb6..310bbeaf9 100644
--- a/src/components/features/voice/VoiceMicControl.tsx
+++ b/src/components/features/voice/VoiceMicControl.tsx
@@ -3,6 +3,7 @@ import { Mic, MicOff } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import type { SpeechCapture, SpeechCaptureError } from '@/hooks/use-speech-capture';
 import { cn } from '@/lib/utils';
+import { ListeningIndicator } from './ListeningIndicator';
 
 const ERROR_KEYS: Record<SpeechCaptureError, string> = {
   'not-allowed': 'voiceRound.mic.notAllowed',
@@ -37,10 +38,7 @@ export function VoiceMicControl({ capture, onStart, onStop, disabled = false, cl
           {capture.listening ? t('voiceRound.mic.stop') : t('voiceRound.mic.start')}
         </Button>
         {capture.listening && (
-          <span className="flex items-center gap-2 text-sm text-muted-foreground" role="status">
-            <span className="h-2 w-2 animate-pulse rounded-full bg-destructive motion-reduce:animate-none" aria-hidden="true" />
-            {t('voiceRound.mic.listening')}
-          </span>
+          <ListeningIndicator label={t('voiceRound.mic.listening')} />
         )}
       </div>
       {capture.listening && capture.interim && (
diff --git a/src/components/ui/animated-section.tsx b/src/components/ui/animated-section.tsx
deleted file mode 100644
index 2cc7a0d38..000000000
--- a/src/components/ui/animated-section.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useEffect, useId, useState, type ReactNode } from 'react';
-import { cn } from '@/lib/utils';
-
-interface AnimatedSectionProps {
-  delay?: number;
-  children: ReactNode;
-  className?: string;
-}
-
-export function AnimatedSection({ delay = 0, children, className }: AnimatedSectionProps) {
-  const [visible, setVisible] = useState(false);
-
-  useEffect(() => {
-    const timer = setTimeout(() => setVisible(true), delay);
-    return () => clearTimeout(timer);
-  }, [delay]);
-
-  return (
-    <div
-      className={cn(
-        'transition-all duration-300 ease-out motion-reduce:transition-none motion-reduce:transform-none',
-        visible ? 'opacity-100 translate-y-0' : 'opacity-0 translate-y-2 motion-reduce:opacity-100',
-        className
-      )}
-    >
-      {children}
-    </div>
-  );
-}
-
-interface StaggeredContainerProps {
-  children: ReactNode;
-  staggerMs?: number;
-  className?: string;
-}
-
-export function StaggeredContainer({ children, staggerMs = 60, className }: StaggeredContainerProps) {
-  // Unique per-instance class so the generated nth-child animation-delay
-  // rules below don't leak across multiple StaggeredContainers on one page.
-  const instanceClass = `staggered-container-${useId().replace(/:/g, '')}`;
-
-  return (
-    <div className={cn('staggered-container', instanceClass, className)} style={{ '--stagger-ms': `${staggerMs}ms` } as React.CSSProperties}>
-      {children}
-      <style>{`
-        .${instanceClass} > * {
-          opacity: 0;
-          transform: translateY(8px);
-          animation: stagger-in 0.2s ease-out forwards;
-        }
-        ${Array.from({ length: 10 }, (_, i) => `.${instanceClass} > *:nth-child(${i + 1}) { animation-delay: ${i * staggerMs}ms; }`).join('\n')}
-        @keyframes stagger-in {
-          to {
-            opacity: 1;
-            transform: translateY(0);
-          }
-        }
-        @media (prefers-reduced-motion: reduce) {
-          .${instanceClass} > * {
-            opacity: 1;
-            transform: none;
-            animation: none;
-          }
-        }
-      `}</style>
-    </div>
-  );
-}
diff --git a/src/components/ui/empty-state.tsx b/src/components/ui/empty-state.tsx
index 910d0e30d..228edc272 100644
--- a/src/components/ui/empty-state.tsx
+++ b/src/components/ui/empty-state.tsx
@@ -11,7 +11,7 @@ interface EmptyStateProps {
 
 export function EmptyState({ icon: Icon, title, description, actionLabel, onAction }: EmptyStateProps) {
   return (
-    <div className="motion-swap flex flex-col items-center justify-center rounded-lg border-2 border-dashed border-border bg-card/50 px-6 py-12 text-center">
+    <div className="flex flex-col items-center justify-center rounded-lg border-2 border-dashed border-border bg-card/50 px-6 py-12 text-center">
       <Icon className="mb-4 h-10 w-10 text-muted-foreground/40" />
       <h3 className="text-base font-semibold text-foreground">{title}</h3>
       {description && <p className="mt-1 max-w-sm text-sm text-muted-foreground">{description}</p>}
diff --git a/src/components/ui/loading-spinner.tsx b/src/components/ui/loading-spinner.tsx
index 4f2deb3d2..9e13d76f6 100644
--- a/src/components/ui/loading-spinner.tsx
+++ b/src/components/ui/loading-spinner.tsx
@@ -6,6 +6,7 @@ interface LoadingSpinnerProps {
   size?: 'sm' | 'md' | 'lg';
 }
 
+/** One ring on a fast linear spin; a quicker spin reads as a quicker load. */
 export function LoadingSpinner({ className, size = 'md' }: LoadingSpinnerProps) {
   const sizeClasses = {
     sm: 'h-4 w-4',
@@ -14,11 +15,10 @@ export function LoadingSpinner({ className, size = 'md' }: LoadingSpinnerProps)
   };
 
   return (
-    <div className={cn('relative inline-flex items-center justify-center', sizeClasses[size], className)}>
-      <span className="motion-ping-ring absolute inset-0 rounded-full border border-current opacity-40" />
-      <span className="absolute inset-0 rounded-full border border-current opacity-20" />
-      <span className="h-full w-full animate-spin rounded-full border-2 border-current border-t-transparent text-primary" />
-    </div>
+    <span
+      className={cn('inline-block shrink-0 animate-spin rounded-full border-2 border-current border-t-transparent text-primary [animation-duration:700ms]', sizeClasses[size], className)}
+      aria-hidden="true"
+    />
   );
 }
 
@@ -28,14 +28,9 @@ interface LoadingOverlayProps {
 
 export function LoadingOverlay({ message = 'Processing...' }: LoadingOverlayProps) {
   return (
-    <div className="motion-swap absolute inset-0 z-10 flex flex-col items-center justify-center gap-4 rounded-lg bg-background/80 backdrop-blur-sm">
-      <div>
-        <LoadingSpinner size="lg" />
-      </div>
+    <div className="absolute inset-0 z-10 flex flex-col items-center justify-center gap-4 rounded-lg bg-background/90">
+      <LoadingSpinner size="lg" />
       <p className="text-sm font-medium text-muted-foreground" role="status" aria-live="polite">{message}</p>
-      <div className="h-1 w-40 overflow-hidden rounded-full bg-muted">
-        <div className="motion-loading-bar h-full rounded-full bg-primary" />
-      </div>
     </div>
   );
 }
diff --git a/src/components/ui/markdown.tsx b/src/components/ui/markdown.tsx
index 8fda6b947..07fe49133 100644
--- a/src/components/ui/markdown.tsx
+++ b/src/components/ui/markdown.tsx
@@ -1,12 +1,19 @@
 import ReactMarkdown from 'react-markdown';
 import { cn } from '@/lib/utils';
 
-export function Markdown({ children, className }: { children: string; className?: string }) {
+interface MarkdownProps {
+  children: string;
+  className?: string;
+  /** Render inside a line of text (label: value rows): paragraphs become spans. */
+  inline?: boolean;
+}
+
+export function Markdown({ children, className, inline = false }: MarkdownProps) {
   return (
     <ReactMarkdown
-      className={cn('prose prose-sm dark:prose-invert max-w-none break-words', className)}
+      className={cn(inline ? 'inline [overflow-wrap:anywhere]' : 'prose prose-sm dark:prose-invert max-w-none break-words [overflow-wrap:anywhere]', className)}
       components={{
-        p: ({ children }) => <p className="mb-2 last:mb-0">{children}</p>,
+        p: ({ children }) => inline ? <span>{children}</span> : <p className="mb-2 last:mb-0">{children}</p>,
         strong: ({ children }) => <strong className="font-semibold">{children}</strong>,
         em: ({ children }) => <em className="italic">{children}</em>,
         ul: ({ children }) => <ul className="list-disc list-inside mb-2 space-y-1">{children}</ul>,
@@ -17,6 +24,12 @@ export function Markdown({ children, className }: { children: string; className?
         h3: ({ children }) => <h3 className="text-sm font-bold mb-1">{children}</h3>,
         code: ({ children }) => <code className="bg-muted px-1 py-0.5 rounded text-xs">{children}</code>,
         blockquote: ({ children }) => <blockquote className="border-l-2 border-primary/40 pl-3 italic">{children}</blockquote>,
+        // Model output links open beside the app and never leak the referrer.
+        a: ({ children, href }) => (
+          <a href={href} target="_blank" rel="noopener noreferrer" className="text-primary underline underline-offset-2 [overflow-wrap:anywhere]">
+            {children}
+          </a>
+        ),
       }}
     >
       {children}
diff --git a/src/components/ui/streaming-indicator.tsx b/src/components/ui/streaming-indicator.tsx
deleted file mode 100644
index d766b2aa3..000000000
--- a/src/components/ui/streaming-indicator.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useEffect, useState } from 'react';
-import { cn } from '@/lib/utils';
-import { useTranslation } from 'react-i18next';
-
-interface StreamingIndicatorProps {
-  messages: string[];
-  intervalMs?: number;
-  className?: string;
-}
-
-// Guard against 0/negative/NaN intervals causing a runaway timer.
-const MIN_INTERVAL_MS = 200;
-
-export function StreamingIndicator({ messages, intervalMs = 3000, className }: StreamingIndicatorProps) {
-  const { t } = useTranslation();
-  const [index, setIndex] = useState(0);
-  const [progress, setProgress] = useState(0);
-  const [fading, setFading] = useState(false);
-  const safeIntervalMs = Number.isFinite(intervalMs) ? Math.max(intervalMs, MIN_INTERVAL_MS) : MIN_INTERVAL_MS;
-
-  useEffect(() => {
-    if (messages.length === 0) return;
-    setIndex((current) => Math.min(current, messages.length - 1));
-    const timeouts = new Set<ReturnType<typeof setTimeout>>();
-    const interval = setInterval(() => {
-      setFading(true);
-      const timeout = setTimeout(() => {
-        setIndex((prev) => (prev + 1) % messages.length);
-        setFading(false);
-        timeouts.delete(timeout);
-      }, 200);
-      timeouts.add(timeout);
-    }, safeIntervalMs);
-    return () => {
-      clearInterval(interval);
-      timeouts.forEach(clearTimeout);
-    };
-  }, [messages.length, safeIntervalMs]);
-
-  useEffect(() => {
-    setProgress(0);
-    const step = 100 / (safeIntervalMs / 50);
-    const timer = setInterval(() => {
-      setProgress((prev) => Math.min(prev + step, 100));
-    }, 50);
-    return () => clearInterval(timer);
-  }, [index, safeIntervalMs]);
-
-  return (
-    <div className={cn('motion-swap flex flex-col items-center justify-center gap-5 py-12', className)} role="status" aria-label={t('common.loading')}>
-      <div className="relative flex h-16 w-16 items-center justify-center">
-        <span className="motion-ping-ring absolute h-full w-full rounded-full border border-primary/35" />
-        <span className="absolute h-10 w-10 rounded-full bg-primary/10" />
-        <span className="h-4 w-4 rounded-full bg-primary shadow-[0_0_24px_hsl(var(--primary)/0.55)]" />
-      </div>
-      <div key={index} className={cn('text-sm font-medium text-muted-foreground transition-opacity duration-200', fading ? 'opacity-0' : 'opacity-100')} aria-live="polite">
-        {messages[index] ?? ''}
-      </div>
-      <div className="motion-shimmer h-1.5 w-56 overflow-hidden rounded-full bg-muted" aria-hidden="true">
-        <div
-          className="h-full bg-primary/60 rounded-full transition-[width] duration-100 ease-linear"
-          style={{ width: `${progress}%` }}
-        />
-      </div>
-    </div>
-  );
-}
diff --git a/src/index.css b/src/index.css
index 05b900c35..fc939bd7d 100644
--- a/src/index.css
+++ b/src/index.css
@@ -355,38 +355,11 @@ All colors MUST be HSL.
   }
 
 
-  .motion-reveal {
-    animation: motion-reveal var(--motion-duration-slow) var(--motion-ease-fluid) both;
-  }
-
   .motion-swap {
     animation: motion-swap var(--motion-duration-normal) var(--motion-ease-fluid) both;
   }
 
 
-  .motion-loading-bar {
-    animation: motion-loading-bar 1.35s var(--motion-ease-fluid) infinite;
-    transform-origin: left center;
-  }
-
-  .motion-ping-ring {
-    animation: motion-ping-ring 1.6s var(--motion-ease-fluid) infinite;
-  }
-
-  .motion-shimmer {
-    position: relative;
-    overflow: hidden;
-  }
-
-  .motion-shimmer::after {
-    content: '';
-    position: absolute;
-    inset: 0;
-    background: linear-gradient(90deg, transparent, hsl(var(--primary) / 0.14), transparent);
-    transform: translateX(-120%);
-    animation: motion-shimmer 1.8s var(--motion-ease-fluid) infinite;
-  }
-
   .motion-expand {
     display: grid;
     grid-template-rows: 0fr;
@@ -507,6 +480,21 @@ All colors MUST be HSL.
   animation-duration: 200ms;
 }
 
+/* Flowchart auto layout: nodes glide to their new lanes; outside a layout they follow the pointer directly. */
+.flow-layout-animating .react-flow__node {
+  transition: transform 250ms var(--motion-ease-out-strong);
+}
+
+/* React Flow's 26px canvas controls grow to touch size on phones. Its stylesheet loads
+   after this one with a content-box 16px + padding, so this needs the extra class. */
+@media (pointer: coarse) {
+  .react-flow .react-flow__controls-button {
+    box-sizing: border-box;
+    width: 44px;
+    height: 44px;
+  }
+}
+
 /* Sonner's mobile toaster sets width: 100% plus a left offset, which pushes
    it past the viewport and widens the whole page on phones. */
 @media (max-width: 600px) {
@@ -519,23 +507,6 @@ All colors MUST be HSL.
   }
 }
 
-/* Message bubble entrance */
-.message-enter {
-  animation: message-enter 0.3s var(--motion-ease-fluid) both;
-}
-
-@keyframes message-enter {
-  from {
-    opacity: 0;
-    transform: translateY(12px) scale(0.97);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0) scale(1);
-  }
-}
-
-
 @keyframes shimmer {
   0% {
     transform: translateX(-100%);
@@ -594,17 +565,6 @@ All colors MUST be HSL.
   }
 }
 
-@keyframes motion-reveal {
-  from {
-    opacity: 0;
-    transform: translateY(8px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
 @keyframes motion-swap {
   from {
     opacity: 0;
@@ -627,58 +587,6 @@ All colors MUST be HSL.
   }
 }
 
-@keyframes motion-loading-bar {
-  0% {
-    transform: translateX(-45%) scaleX(0.2);
-  }
-  45% {
-    transform: translateX(25%) scaleX(0.65);
-  }
-  100% {
-    transform: translateX(115%) scaleX(0.25);
-  }
-}
-
-@keyframes motion-ping-ring {
-  0% {
-    opacity: 0.7;
-    transform: scale(0.75);
-  }
-  100% {
-    opacity: 0;
-    transform: scale(1.35);
-  }
-}
-
-@keyframes motion-shimmer {
-  100% {
-    transform: translateX(120%);
-  }
-}
-
-/* Typing indicator */
-.typing-indicator {
-  display: inline-flex;
-  align-items: center;
-  gap: 3px;
-}
-
-.typing-dot {
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  background-color: hsl(var(--muted-foreground));
-  animation: typing-bounce 1.4s ease-in-out infinite;
-}
-
-.typing-dot:nth-child(2) {
-  animation-delay: 0.2s;
-}
-
-.typing-dot:nth-child(3) {
-  animation-delay: 0.4s;
-}
-
 .streaming-caret {
   display: inline-block;
   width: 2px;
@@ -687,78 +595,19 @@ All colors MUST be HSL.
   border-radius: 1px;
   background: hsl(var(--primary));
   vertical-align: -0.15em;
-  animation: streaming-caret-blink 1s ease-in-out infinite;
-  box-shadow: 0 0 6px 2px hsl(var(--primary) / 0.4);
-}
-
-/* Smooth height transition for streaming message bubbles */
-[data-streaming="true"] {
-  transition: max-height 0.2s ease-out, padding 0.2s ease-out;
-  overflow: hidden;
-  word-break: break-word;
-}
-
-/* Glow on the bottom edge of the bubble while streaming */
-[data-streaming="true"]::after {
-  content: '';
-  position: absolute;
-  bottom: 0;
-  left: 10%;
-  right: 10%;
-  height: 2px;
-  border-radius: 1px;
-  background: linear-gradient(90deg, transparent, hsl(var(--primary) / 0.6), transparent);
-  animation: streaming-glow-pulse 1.5s ease-in-out infinite;
-}
-
-/* New tokens fade in */
-[data-streaming="true"] .text-sm p:last-child,
-[data-streaming="true"] .text-sm li:last-child,
-[data-streaming="true"] .text-sm > :last-child {
-  animation: token-fade-in 0.3s ease-out;
-}
-
-@keyframes token-fade-in {
-  from {
-    opacity: 0.4;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-@keyframes streaming-glow-pulse {
-  0%, 100% {
-    opacity: 0.3;
-    transform: scaleX(0.8);
-  }
-  50% {
-    opacity: 1;
-    transform: scaleX(1);
-  }
-}
-
-@keyframes typing-bounce {
-  0%, 60%, 100% {
-    transform: translateY(0);
-  }
-  30% {
-    transform: translateY(-4px);
-  }
+  /* Opacity only, in two steps: a blink that never repaints a glow. */
+  animation: streaming-caret-blink 1s steps(2, jump-none) infinite;
 }
 
 @keyframes streaming-caret-blink {
-  0%, 100% {
+  from {
     opacity: 1;
-    box-shadow: 0 0 6px 2px hsl(var(--primary) / 0.4);
   }
-  50% {
-    opacity: 0.2;
-    box-shadow: 0 0 2px 1px hsl(var(--primary) / 0.1);
+  to {
+    opacity: 0;
   }
 }
 
-
 /* Reduced motion is gentler, not zero: opacity and colour still ease, nothing travels
    or scales, overlays fade, and loading indicators pulse instead of freezing. */
 @media (prefers-reduced-motion: reduce) {
@@ -780,9 +629,7 @@ All colors MUST be HSL.
   [data-state='delayed-open'][class*='animate-in'],
   [data-state='instant-open'][class*='animate-in'],
   [data-state='active'][class*='animate-in'],
-  .motion-reveal,
-  .motion-swap,
-  .message-enter {
+  .motion-swap {
     animation-name: motion-fade-in !important;
   }
 
@@ -792,8 +639,6 @@ All colors MUST be HSL.
 
   /* Spinners and live indicators become a slow opacity pulse so they never look hung. */
   .animate-spin,
-  .motion-ping-ring,
-  .typing-dot,
   .streaming-caret {
     animation-name: motion-pulse !important;
     animation-duration: 1.2s !important;
diff --git a/src/lib/ai/client.ts b/src/lib/ai/client.ts
index d955fb405..c8a1d6a6f 100644
--- a/src/lib/ai/client.ts
+++ b/src/lib/ai/client.ts
@@ -1287,11 +1287,12 @@ function expectedContentionCount(length: GenerateInput['length']): number {
   }
 }
 
-export async function generateCase(input: GenerateInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null): Promise<ResultWithSources<GenerateOutput>> {
+export async function generateCase(input: GenerateInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null, signal?: AbortSignal): Promise<ResultWithSources<GenerateOutput>> {
   const inputWithLanguage = withOutputLanguage(input as unknown as Record<string, unknown>);
   const response = await callSupabaseAI<ResultWithSources<GenerateOutput>>('generate', inputWithLanguage, config, {
     workspaceContext,
     debateId,
+    signal,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown; discoveredSources?: unknown };
       const result = validateGenerateOutput(transformGenerateResponse(data.output as Record<string, unknown>));
@@ -1308,10 +1309,11 @@ export async function generateCase(input: GenerateInput, config: ProviderConfig,
   return response;
 }
 
-export async function attackCase(input: AttackInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null): Promise<ResultWithSources<AttackOutput>> {
+export async function attackCase(input: AttackInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null, signal?: AbortSignal): Promise<ResultWithSources<AttackOutput>> {
   const response = await callSupabaseAI<ResultWithSources<AttackOutput>>('attack', withOutputLanguage(input as unknown as Record<string, unknown>), config, {
     workspaceContext,
     debateId,
+    signal,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown; discoveredSources?: unknown };
       return {
@@ -1324,10 +1326,11 @@ export async function attackCase(input: AttackInput, config: ProviderConfig, wor
   return response;
 }
 
-export async function brainstorm(input: BrainstormInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null): Promise<ResultWithSources<BrainstormOutput>> {
+export async function brainstorm(input: BrainstormInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null, signal?: AbortSignal): Promise<ResultWithSources<BrainstormOutput>> {
   const response = await callSupabaseAI<ResultWithSources<BrainstormOutput>>('brainstorm', withOutputLanguage(input as unknown as Record<string, unknown>), config, {
     workspaceContext,
     debateId,
+    signal,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown; discoveredSources?: unknown };
       return {
@@ -1340,7 +1343,7 @@ export async function brainstorm(input: BrainstormInput, config: ProviderConfig,
   return response;
 }
 
-export async function factoids(input: FactoidsInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null): Promise<ResultWithSources<FactoidsOutput>> {
+export async function factoids(input: FactoidsInput, config: ProviderConfig, workspaceContext?: WorkspaceToolContext, debateId?: string | null, signal?: AbortSignal): Promise<ResultWithSources<FactoidsOutput>> {
   const inputWithLanguage = withOutputLanguage({
     ...input,
     region: input.region?.trim() || 'Global',
@@ -1349,6 +1352,7 @@ export async function factoids(input: FactoidsInput, config: ProviderConfig, wor
   const response = await callSupabaseAI<ResultWithSources<FactoidsOutput>>('factoids', inputWithLanguage, config, {
     workspaceContext,
     debateId,
+    signal,
     transformResponse: (rawData) => {
       const data = rawData as { output: unknown; discoveredSources?: unknown };
       const parsed = FactoidsOutputSchema.safeParse(data.output);
diff --git a/src/lib/ai/error-display.ts b/src/lib/ai/error-display.ts
index 2e1ff9068..1289949a1 100644
--- a/src/lib/ai/error-display.ts
+++ b/src/lib/ai/error-display.ts
@@ -1,3 +1,4 @@
+import i18n from '@/i18n';
 import { AIProviderError } from './client';
 
 const PROVIDER_LABELS: Record<string, string> = {
@@ -12,7 +13,7 @@ function providerLabel(provider?: string, message = ''): string {
   if (/openai/i.test(message)) return 'OpenAI';
   if (/anthropic|claude/i.test(message)) return 'Anthropic';
   if (/google|gemini/i.test(message)) return 'Google';
-  return 'AI provider';
+  return i18n.t('aiErrors.genericProvider', 'AI provider');
 }
 
 export function getUserFacingAIError(error: unknown): string {
@@ -28,7 +29,7 @@ export function getUserFacingAIError(error: unknown): string {
       normalized.includes('quota') ||
       normalized.includes('billing details')
     ) {
-      return `${provider} quota exceeded. Please inform the site admin.`;
+      return i18n.t('aiErrors.quota', { provider, defaultValue: '{{provider}} quota exceeded. Please inform the site admin.' });
     }
 
     if (
@@ -38,11 +39,11 @@ export function getUserFacingAIError(error: unknown): string {
       normalized.includes('api key') ||
       normalized.includes('unauthorized')
     ) {
-      return `${provider} is not configured correctly. Please inform the site admin.`;
+      return i18n.t('aiErrors.config', { provider, defaultValue: '{{provider}} is not configured correctly. Please inform the site admin.' });
     }
 
     if (normalized.includes('rate limit') || normalized.includes('rate_limit') || normalized.includes('too many requests')) {
-      return `${provider} rate limit exceeded. Please try again later.`;
+      return i18n.t('aiErrors.rateLimit', { provider, defaultValue: '{{provider}} rate limit exceeded. Please try again later.' });
     }
 
     if (
@@ -51,15 +52,15 @@ export function getUserFacingAIError(error: unknown): string {
       normalized.includes('service unavailable') ||
       normalized.includes('503')
     ) {
-      return `${provider} is temporarily unavailable. Please try again later.`;
+      return i18n.t('aiErrors.unavailable', { provider, defaultValue: '{{provider}} is temporarily unavailable. Please try again later.' });
     }
 
     if (normalized.includes('content policy') || normalized.includes('safety') || normalized.includes('blocked')) {
-      return `${provider} blocked this request for safety reasons. Try rephrasing your input.`;
+      return i18n.t('aiErrors.safety', { provider, defaultValue: '{{provider}} blocked this request for safety reasons. Try rephrasing your input.' });
     }
 
-    return 'The AI provider returned an unexpected error. Please try again later.';
+    return i18n.t('aiErrors.unexpectedProvider', 'The AI provider returned an unexpected error. Please try again later.');
   }
 
-  return error instanceof Error ? error.message : 'An unexpected error occurred';
+  return error instanceof Error ? error.message : i18n.t('aiErrors.unexpected', 'An unexpected error occurred');
 }
diff --git a/src/lib/stores/session-store.ts b/src/lib/stores/session-store.ts
index b69b4a866..7c4fe24ca 100644
--- a/src/lib/stores/session-store.ts
+++ b/src/lib/stores/session-store.ts
@@ -191,7 +191,8 @@ export interface SessionState {
   saveCurrentFactoids: (title: string) => Promise<void>;
   loadSavedFactoids: (id: string) => void;
 
-  addAskMessage: (message: Omit<Message, 'id' | 'timestamp'>) => void;
+  /** Pass the streaming bubble's id so the stored reply keeps its identity and doesn't remount. */
+  addAskMessage: (message: Omit<Message, 'id' | 'timestamp'> & { id?: string }) => void;
   setAskLoading: (loading: boolean) => void;
   setAskStreamingAssistant: (message: StreamingAskMessage | null) => void;
   appendAskStreamingDelta: (text: string) => void;
@@ -946,7 +947,7 @@ export const useSessionStore = create<SessionState>()(
       addAskMessage: (message) => set((state) => ({
         askMessages: [
           ...state.askMessages,
-          { ...message, id: generateId(), timestamp: Date.now() },
+          { ...message, id: message.id ?? generateId(), timestamp: Date.now() },
         ],
       })),
       setAskLoading: (loading) => set({ askLoading: loading }),
@@ -1079,9 +1080,18 @@ export const useSessionStore = create<SessionState>()(
       },
 
       deleteSavedFlowchart: async (id) => {
+        // Write first: the page offers Undo (a fresh save) only once the row is really gone.
+        // Signed out, charts are local only; signed in, a failed user lookup fails the delete
+        // instead of quietly skipping the server row.
+        const { data: { session }, error: sessionError } = await supabase.auth.getSession();
+        if (sessionError) throw sessionError;
+        if (session) {
+          const userId = await getUserId();
+          if (!userId) throw new Error('[SessionStore] Could not confirm the signed-in user to delete a flowchart');
+          const result = await applyUserScopedIdFilter(supabase.from('flowcharts').delete(), userId, id);
+          throwOnWriteError(result, 'delete flowchart');
+        }
         set((state) => ({ savedFlowcharts: state.savedFlowcharts.filter((c) => c.id !== id) }));
-        const userId = await getUserId();
-        await applyUserScopedIdFilter(supabase.from('flowcharts').delete(), userId, id);
       },
 
       hydrateFromServer: async () => {
diff --git a/src/lib/timer-clock.ts b/src/lib/timer-clock.ts
new file mode 100644
index 000000000..c563bdb01
--- /dev/null
+++ b/src/lib/timer-clock.ts
@@ -0,0 +1,29 @@
+/**
+ * Speech clock arithmetic in milliseconds. Pausing keeps the exact remainder, so a
+ * pause never hands the speaker the rest of the current second.
+ */
+export interface ClockState {
+  /** Milliseconds left while paused; ignored while running. */
+  remainingMs: number;
+  /** When the speech ends, while running. */
+  deadline: number | null;
+}
+
+export function startClock(state: ClockState, now: number): ClockState {
+  if (state.deadline !== null || state.remainingMs <= 0) return state;
+  return { remainingMs: state.remainingMs, deadline: now + state.remainingMs };
+}
+
+export function pauseClock(state: ClockState, now: number): ClockState {
+  if (state.deadline === null) return state;
+  return { remainingMs: Math.max(0, state.deadline - now), deadline: null };
+}
+
+export function remainingMs(state: ClockState, now: number): number {
+  return state.deadline === null ? state.remainingMs : Math.max(0, state.deadline - now);
+}
+
+/** Whole seconds shown on the clock face: 0.2s left still reads 0:01. */
+export function displaySeconds(ms: number): number {
+  return Math.ceil(ms / 1000);
+}
diff --git a/src/locales/en.json b/src/locales/en.json
index c19ae9b69..262be4c6a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -375,8 +375,6 @@
     "flowchartImportFailedDesc": "Could not build flowchart from case data.",
     "flowchartNoData": "No valid case data to import.",
     "caseTitle": "Case title",
-    "complete": "Generate complete",
-    "completeDesc": "Your debate case is ready.",
     "noUndo": "Nothing to undo",
     "regenerated": "Section regenerated",
     "regeneratedDesc": "The selected section has been refreshed.",
@@ -385,21 +383,20 @@
     "saveCase": "Save case",
     "undone": "Reverted",
     "undoneDesc": "Loaded previous generation.",
-    "saveFailedDesc": "The case could not be saved. Please try again."
+    "saveFailedDesc": "The case could not be saved. Please try again.",
+    "working": "Writing your case…"
   },
   "attack": {
     "emptyTitle": "No Mercy Mode",
     "emptyDesc": "Paste your argument to receive ruthless criticism, identify logical fallacies, and get actionable improvements.",
     "failed": "Attack Analysis Failed",
-    "complete": "Attack analysis complete",
-    "completeDesc": "The critique is ready."
+    "working": "Reviewing your case…"
   },
   "brainstorm": {
     "emptyTitle": "Unlock Creative Angles",
     "emptyDesc": "Describe your motion to explore unconventional argument angles, identify tradeoffs, and find your strongest positions.",
     "failed": "Brainstorming Failed",
-    "complete": "Brainstorm complete",
-    "completeDesc": "Your argument angles are ready."
+    "working": "Finding angles…"
   },
   "factoids": {
     "emptyTitle": "Evidence That Wins",
@@ -407,9 +404,8 @@
     "failed": "Research Failed",
     "savedToLibrary": "Saved to Library",
     "savedToLibraryDesc": "This evidence is now available for grounding.",
-    "complete": "Research complete",
-    "completeDesc": "Verified evidence is ready.",
-    "saveFailed": "Could not save source."
+    "saveFailed": "Could not save source.",
+    "working": "Searching for evidence…"
   },
   "ask": {
     "failed": "Error",
@@ -426,12 +422,10 @@
     "retryableFailedDesc": "Couldn't reach the AI. Check your connection and retry.",
     "saveFailed": "Save failed",
     "saveFailedDesc": "The chat could not be saved. Please try again.",
-    "sourceSaveFailedDesc": "The source could not be saved. Please try again."
-  },
-  "chat": {
-    "error": "Chat Error",
-    "errorDesc": "Failed to generate response."
+    "sourceSaveFailedDesc": "The source could not be saved. Please try again.",
+    "stopped": "You stopped this answer before it finished."
   },
+  "chat": {},
   "settings": {
     "title": "Settings",
     "aiOutputLanguage": "Language (UI + AI Output)",
@@ -1040,8 +1034,6 @@
     "title": "Rate Limit Exceeded"
   },
   "generateForm": {
-    "title": "Generate Debate Case",
-    "subtitle": "Create structured arguments for any motion",
     "motion": "Motion / Topic",
     "motionPlaceholder": "e.g., This house believes that artificial intelligence will create more jobs than it destroys",
     "side": "Side",
@@ -1073,11 +1065,6 @@
     "startVoice": "Start voice input",
     "stopVoice": "Stop voice input",
     "dictate": "Dictate your motion",
-    "loadingMsg1": "Reading the motion...",
-    "loadingMsg2": "Building warrant chains...",
-    "loadingMsg3": "Writing speech-ready impacts...",
-    "loadingMsg4": "Preparing counters...",
-    "loadingMsg5": "Finalizing the case...",
     "styleNote": "Guides writing style; it does not change research."
   },
   "generateResults": {
@@ -1126,11 +1113,12 @@
     "exportError": "An unexpected error occurred during export",
     "copiedToClipboard": "Copied to clipboard",
     "copyFailed": "Unable to copy to clipboard",
-    "undo": "Undo"
+    "undo": "Undo",
+    "resultTitle": "Your case",
+    "unverified": "Unverified",
+    "unresearchedCaveat": "AI-generated, and no web research backs this evidence. Check facts and sources before using them in a round."
   },
   "attackForm": {
-    "title": "Attack My Case",
-    "subtitle": "Find weaknesses and get improvement suggestions",
     "argument": "Your Argument",
     "argumentPlaceholder": "Paste your debate case or argument here...",
     "options": "Options",
@@ -1148,12 +1136,7 @@
     "analyzeWeighing": "Analyze Weighing",
     "analyzeWeighingDesc": "Evaluate impact comparison and prioritization",
     "analyzing": "Analyzing Case...",
-    "submit": "Find Weaknesses",
-    "loadingMsg1": "Analyzing the case structure...",
-    "loadingMsg2": "Finding logical gaps...",
-    "loadingMsg3": "Crafting rebuttals...",
-    "loadingMsg4": "Stress-testing assumptions...",
-    "loadingMsg5": "Finalizing the critique..."
+    "submit": "Find Weaknesses"
   },
   "attackResults": {
     "overall": "Overall Assessment",
@@ -1195,11 +1178,10 @@
     "exportFailedGdocs": "Failed to export to Google Docs",
     "exportError": "An unexpected error occurred during export",
     "weaknessesCount_one": "{{count}} issue found, sorted by severity",
-    "weaknessesCount_other": "{{count}} issues found, sorted by severity"
+    "weaknessesCount_other": "{{count}} issues found, sorted by severity",
+    "resultTitle": "Critique"
   },
   "brainstormForm": {
-    "title": "Brainstorm Ideas",
-    "subtitle": "Explore argument angles collaboratively",
     "motion": "Motion / Topic",
     "motionPlaceholder": "e.g., Universal Basic Income should be implemented globally",
     "side": "Side to Explore",
@@ -1213,12 +1195,7 @@
     "existing": "What You Already Have (Optional)",
     "existingPlaceholder": "Share any ideas or angles you've already considered...",
     "generating": "Generating Ideas...",
-    "submit": "Start Brainstorming",
-    "loadingMsg1": "Exploring angles...",
-    "loadingMsg2": "Connecting ideas...",
-    "loadingMsg3": "Finding unconventional paths...",
-    "loadingMsg4": "Ranking by originality...",
-    "loadingMsg5": "Finalizing brainstorm..."
+    "submit": "Start Brainstorming"
   },
   "brainstormResults": {
     "clarification": "Clarification Needed",
@@ -1242,11 +1219,10 @@
     "exportFailedGdocs": "Failed to export to Google Docs",
     "exportError": "An unexpected error occurred during export",
     "noIdeasDesc": "Try a more specific motion or switch the output format, then brainstorm again.",
-    "noIdeasTitle": "No ideas returned"
+    "noIdeasTitle": "No ideas returned",
+    "resultTitle": "Angles"
   },
   "factoidsForm": {
-    "title": "Find Evidence",
-    "subtitle": "Get debate-ready factoids with verified citations",
     "claim": "Statement",
     "claimPlaceholder": "e.g., Renewable energy is more cost-effective than fossil fuels",
     "direction": "Position",
@@ -1263,12 +1239,7 @@
     "sourceGovernment": "Government Sources",
     "sourceNews": "Major News",
     "finding": "Finding Evidence...",
-    "submit": "Find Factoids",
-    "loadingMsg1": "Searching databases...",
-    "loadingMsg2": "Verifying citations...",
-    "loadingMsg3": "Cross-referencing sources...",
-    "loadingMsg4": "Ranking by reliability...",
-    "loadingMsg5": "Finalizing evidence..."
+    "submit": "Find Factoids"
   },
   "factoidsResults": {
     "verificationStatus": "Verification Status",
@@ -1300,12 +1271,12 @@
     "exportFailedGdocs": "Failed to export to Google Docs",
     "exportError": "An unexpected error occurred during export",
     "noVerified": "No verified matching sources were found. Try a broader source type or timeframe.",
-    "useSuggestion": "Search this"
+    "useSuggestion": "Search this",
+    "resultTitle": "Evidence"
   },
   "askChat": {
     "title": "Ask Your Coach",
     "subtitle": "Get answers to debate questions",
-    "typing": "Typing",
     "startConversation": "Start a conversation",
     "startDesc": "Ask anything about debate strategy, arguments, or get help with your case.",
     "modeGeneral": "General",
@@ -1349,16 +1320,17 @@
     "tooManyFiles": "Too many files",
     "tooManyFilesDesc": "You can only upload up to {{max}} files at once.",
     "fileValidationFailed": "File validation failed",
-    "thinking": "Thinking...",
-    "researching": "Researching...",
-    "analyzing": "Analyzing...",
-    "generatingResponse": "Generating response...",
-    "almostThere": "Almost there...",
     "save": "Save",
     "messageCount_one": "{{count}} message",
     "messageCount_other": "{{count}} messages",
     "savedCount_one": "{{count}} saved",
-    "savedCount_other": "{{count}} saved"
+    "savedCount_other": "{{count}} saved",
+    "working": "Working…",
+    "searchingWeb": "Searching the web…",
+    "elapsed": "{{seconds}}s",
+    "jumpToLatest": "Jump to latest",
+    "stop": "Stop answering",
+    "options": "Options"
   },
   "limitModal": {
     "trialEnded": "Free Trial Ended",
@@ -1446,6 +1418,7 @@
     "timeUpSignal": "Time's up signal",
     "twoBeeps": "Two beeps",
     "spaceStartStop": "Space to start/stop",
+    "reset": "Reset timer",
     "resetKey": "R to reset",
     "arrowsChange": "Arrows to change speaker",
     "speeches": {
@@ -1484,7 +1457,8 @@
       }
     },
     "disableSound": "Disable sound",
-    "enableSound": "Enable sound"
+    "enableSound": "Enable sound",
+    "resetDone": "Timer reset"
   },
   "flowchart": {
     "title": "Argument Flowchart",
@@ -1529,13 +1503,7 @@
     "savedToast": "Flowchart saved successfully",
     "saveFailedToast": "Failed to save flowchart",
     "loadedToast": "Flowchart loaded",
-    "deletedToast": "Flowchart deleted",
     "deleteFailedToast": "Failed to delete flowchart",
-    "deleteNodeTitle": "Delete node?",
-    "deleteNodeDescription": "{{label}} and all of its connections will be removed. This cannot be undone.",
-    "deleteNodeConfirm": "Delete node",
-    "deleteNodeCancel": "Cancel",
-    "nodeDeletedToast": "Node deleted",
     "starter": {
       "thesisLabel": "Your Thesis",
       "thesisDesc": "Click to edit or add new nodes",
@@ -1560,7 +1528,11 @@
     "zoomOut": "Zoom out",
     "fitView": "Fit view",
     "toggleInteractivity": "Lock or unlock the canvas",
-    "miniMap": "Flowchart overview"
+    "miniMap": "Flowchart overview",
+    "deletedNamed": "Deleted {{title}}",
+    "deleteNamed": "Delete {{title}}",
+    "restoreFailed": "Could not restore the flowchart",
+    "nodeDeletedNamed": "Deleted {{label}}"
   },
   "historyPage": {
     "title": "History",
@@ -2026,7 +1998,6 @@
       "opponentUpNext": "Opponent is up next",
       "opponentThinkingDescription": "It is reading the motion and your speeches before choosing a response.",
       "opponentUpNextDescription": "The next response will appear here.",
-      "aiThinking": "AI is thinking",
       "transcript": "Transcript",
       "transcriptDescription": "Every submitted speech stays here for the judge.",
       "submittedCount": "{{count}} submitted",
@@ -2042,7 +2013,8 @@
       "totalWords_one": "{{count}} word",
       "totalWords_other": "{{count}} words",
       "wordCount_one": "{{count}} word",
-      "wordCount_other": "{{count}} words"
+      "wordCount_other": "{{count}} words",
+      "latestOpponent": "Opponent’s last speech"
     },
     "scorecard": {
       "eyebrow": "Round review",
@@ -2350,7 +2322,6 @@
     "leftOut_other": "{{count}} items are left out to fit the request.",
     "review": "Review",
     "oneOff": "One-off mode: no Current Debate material will be used or saved.",
-    "noDebate": "No Current Debate, so no debate material will be used.",
     "reviewTitle": "What this request will use",
     "reviewDesc": "Changes here apply to your next request only. Pinned results stay included until you unpin them.",
     "debateHeading": "Debate",
@@ -2398,5 +2369,50 @@
   },
   "offlineIndicator": {
     "label": "Offline mode"
+  },
+  "tools": {
+    "elapsed": "{{seconds}}s",
+    "aiCaveat": "AI-generated. Check facts and sources before using them in a round.",
+    "researchedSources": "Researched sources ({{total}})"
+  },
+  "discuss": {
+    "attack": {
+      "intro": "I'd like to discuss the critique of my case.",
+      "assessment": "Overall assessment",
+      "score": "Score",
+      "weaknesses": "Top weaknesses",
+      "ask": "Can you help me improve this?"
+    },
+    "brainstorm": {
+      "intro": "I'd like to discuss these brainstormed ideas.",
+      "topIdeas": "Top ideas",
+      "buckets": "Key buckets",
+      "ask": "Can you help me expand on one of these?"
+    },
+    "generate": {
+      "intro": "I'd like to discuss the case we just generated.",
+      "thesis": "Thesis",
+      "arguments": "Arguments",
+      "ask": "Can we refine this?"
+    },
+    "factoids": {
+      "intro": "I'd like to discuss the evidence I found.",
+      "factoids": "Evidence",
+      "ask": "How can I best use this evidence?"
+    }
+  },
+  "aiErrors": {
+    "genericProvider": "AI provider",
+    "quota": "{{provider}} quota exceeded. Please inform the site admin.",
+    "config": "{{provider}} is not configured correctly. Please inform the site admin.",
+    "rateLimit": "{{provider}} rate limit exceeded. Please try again later.",
+    "unavailable": "{{provider}} is temporarily unavailable. Please try again later.",
+    "safety": "{{provider}} blocked this request for safety reasons. Try rephrasing your input.",
+    "unexpectedProvider": "The AI provider returned an unexpected error. Please try again later.",
+    "unexpected": "An unexpected error occurred"
+  },
+  "clock": {
+    "timeUp": "Time is up.",
+    "remaining": "{{time}} left."
   }
 }
diff --git a/src/locales/es.json b/src/locales/es.json
index 4d339a815..b8545889e 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -375,8 +375,6 @@
     "flowchartImportFailedDesc": "No se pudo construir el diagrama con los datos del caso.",
     "flowchartNoData": "No hay datos de caso válidos para importar.",
     "caseTitle": "Título del caso",
-    "complete": "Caso generado",
-    "completeDesc": "Tu caso de debate está listo.",
     "noUndo": "No hay nada que deshacer",
     "regenerated": "Sección regenerada",
     "regeneratedDesc": "La sección seleccionada se ha actualizado.",
@@ -385,21 +383,20 @@
     "saveCase": "Guardar caso",
     "undone": "Cambio deshecho",
     "undoneDesc": "Se cargó la generación anterior.",
-    "saveFailedDesc": "No se pudo guardar el caso. Inténtalo de nuevo."
+    "saveFailedDesc": "No se pudo guardar el caso. Inténtalo de nuevo.",
+    "working": "Escribiendo tu caso…"
   },
   "attack": {
     "emptyTitle": "Modo Sin Piedad",
     "emptyDesc": "Pega tu argumento para recibir críticas despiadadas, identificar falacias lógicas y obtener mejoras accionables.",
     "failed": "Error en el Análisis de Ataque",
-    "complete": "Análisis de ataque completado",
-    "completeDesc": "La crítica está lista."
+    "working": "Revisando tu caso…"
   },
   "brainstorm": {
     "emptyTitle": "Desbloquea Ángulos Creativos",
     "emptyDesc": "Describe tu moción para explorar ángulos de argumentación no convencionales, identificar compromisos y encontrar tus posiciones más fuertes.",
     "failed": "Error en la Lluvia de Ideas",
-    "complete": "Lluvia de ideas completada",
-    "completeDesc": "Tus enfoques de argumentación están listos."
+    "working": "Buscando enfoques…"
   },
   "factoids": {
     "emptyTitle": "Evidencia Que Gana",
@@ -407,9 +404,8 @@
     "failed": "Error en la Investigación",
     "savedToLibrary": "Guardado en Biblioteca",
     "savedToLibraryDesc": "Esta evidencia ahora está disponible para fundamentación.",
-    "complete": "Investigación completada",
-    "completeDesc": "La evidencia verificada está lista.",
-    "saveFailed": "No se pudo guardar la fuente."
+    "saveFailed": "No se pudo guardar la fuente.",
+    "working": "Buscando evidencia…"
   },
   "ask": {
     "failed": "Error",
@@ -426,12 +422,10 @@
     "retryableFailedDesc": "No se pudo conectar con la IA. Comprueba tu conexión e inténtalo de nuevo.",
     "saveFailed": "No se pudo guardar",
     "saveFailedDesc": "No se pudo guardar el chat. Inténtalo de nuevo.",
-    "sourceSaveFailedDesc": "No se pudo guardar la fuente. Inténtalo de nuevo."
-  },
-  "chat": {
-    "error": "Error de Chat",
-    "errorDesc": "No se pudo generar la respuesta."
+    "sourceSaveFailedDesc": "No se pudo guardar la fuente. Inténtalo de nuevo.",
+    "stopped": "Detuviste esta respuesta antes de que terminara."
   },
+  "chat": {},
   "settings": {
     "title": "Ajustes",
     "aiOutputLanguage": "Idioma (Interfaz + Salida IA)",
@@ -1040,8 +1034,6 @@
     "title": "Límite de Solicitudes Excedido"
   },
   "generateForm": {
-    "title": "Generar Caso de Debate",
-    "subtitle": "Crea argumentos estructurados para cualquier moción",
     "motion": "Moción / Tema",
     "motionPlaceholder": "ej., Esta cámara cree que la inteligencia artificial creará más empleos de los que destruirá",
     "side": "Lado",
@@ -1073,11 +1065,6 @@
     "startVoice": "Iniciar entrada de voz",
     "stopVoice": "Detener entrada de voz",
     "dictate": "Dicta tu moción",
-    "loadingMsg1": "Leyendo la moción...",
-    "loadingMsg2": "Construyendo cadenas de razonamiento...",
-    "loadingMsg3": "Escribiendo impactos para el discurso...",
-    "loadingMsg4": "Preparando contraargumentos...",
-    "loadingMsg5": "Finalizando el caso...",
     "styleNote": "Guía el estilo de escritura; no cambia la investigación."
   },
   "generateResults": {
@@ -1126,11 +1113,12 @@
     "exportError": "Ocurrió un error inesperado durante la exportación",
     "copiedToClipboard": "Copiado al portapapeles",
     "copyFailed": "No se pudo copiar al portapapeles",
-    "undo": "Deshacer"
+    "undo": "Deshacer",
+    "resultTitle": "Tu caso",
+    "unverified": "Sin verificar",
+    "unresearchedCaveat": "Generado por IA, y ninguna búsqueda web respalda esta evidencia. Comprueba los datos y las fuentes antes de usarlos en una ronda."
   },
   "attackForm": {
-    "title": "Atacar Mi Caso",
-    "subtitle": "Encuentra debilidades y obtén sugerencias de mejora",
     "argument": "Tu Argumento",
     "argumentPlaceholder": "Pega tu caso o argumento de debate aquí...",
     "options": "Opciones",
@@ -1148,12 +1136,7 @@
     "analyzeWeighing": "Analizar Ponderación",
     "analyzeWeighingDesc": "Evaluar la comparación y priorización de impactos",
     "analyzing": "Analizando Caso...",
-    "submit": "Encontrar Debilidades",
-    "loadingMsg1": "Analizando la estructura del caso...",
-    "loadingMsg2": "Buscando vacíos lógicos...",
-    "loadingMsg3": "Elaborando refutaciones...",
-    "loadingMsg4": "Probando suposiciones...",
-    "loadingMsg5": "Finalizando la crítica..."
+    "submit": "Encontrar Debilidades"
   },
   "attackResults": {
     "overall": "Evaluación General",
@@ -1195,11 +1178,10 @@
     "exportFailedGdocs": "Error al exportar a Google Docs",
     "exportError": "Ocurrió un error inesperado durante la exportación",
     "weaknessesCount_one": "{{count}} problema encontrado, ordenado por gravedad",
-    "weaknessesCount_other": "{{count}} problemas encontrados, ordenados por gravedad"
+    "weaknessesCount_other": "{{count}} problemas encontrados, ordenados por gravedad",
+    "resultTitle": "Crítica"
   },
   "brainstormForm": {
-    "title": "Lluvia de Ideas",
-    "subtitle": "Explora ángulos de argumentación de forma colaborativa",
     "motion": "Moción / Tema",
     "motionPlaceholder": "ej., La Renta Básica Universal debería implementarse globalmente",
     "side": "Lado a Explorar",
@@ -1213,12 +1195,7 @@
     "existing": "Lo Que Ya Tienes (Opcional)",
     "existingPlaceholder": "Comparte ideas o ángulos que ya hayas considerado...",
     "generating": "Generando Ideas...",
-    "submit": "Comenzar Lluvia de Ideas",
-    "loadingMsg1": "Explorando ángulos...",
-    "loadingMsg2": "Conectando ideas...",
-    "loadingMsg3": "Buscando caminos no convencionales...",
-    "loadingMsg4": "Clasificando por originalidad...",
-    "loadingMsg5": "Finalizando lluvia de ideas..."
+    "submit": "Comenzar Lluvia de Ideas"
   },
   "brainstormResults": {
     "clarification": "Aclaración Necesaria",
@@ -1242,11 +1219,10 @@
     "exportFailedGdocs": "Error al exportar a Google Docs",
     "exportError": "Ocurrió un error inesperado durante la exportación",
     "noIdeasDesc": "Prueba con una moción más concreta o cambia el formato de salida y vuelve a generar ideas.",
-    "noIdeasTitle": "No se generaron ideas"
+    "noIdeasTitle": "No se generaron ideas",
+    "resultTitle": "Enfoques"
   },
   "factoidsForm": {
-    "title": "Buscar Evidencia",
-    "subtitle": "Obtén datos listos para el debate con citas verificadas",
     "claim": "Declaración",
     "claimPlaceholder": "ej., La energía renovable es más rentable que los combustibles fósiles",
     "direction": "Postura",
@@ -1263,12 +1239,7 @@
     "sourceGovernment": "Fuentes Gubernamentales",
     "sourceNews": "Noticias Principales",
     "finding": "Buscando Evidencia...",
-    "submit": "Buscar Datos",
-    "loadingMsg1": "Buscando en bases de datos...",
-    "loadingMsg2": "Verificando citas...",
-    "loadingMsg3": "Cruzando referencias...",
-    "loadingMsg4": "Clasificando por fiabilidad...",
-    "loadingMsg5": "Finalizando evidencia..."
+    "submit": "Buscar Datos"
   },
   "factoidsResults": {
     "verificationStatus": "Estado de Verificación",
@@ -1300,12 +1271,12 @@
     "exportFailedGdocs": "Error al exportar a Google Docs",
     "exportError": "Ocurrió un error inesperado durante la exportación",
     "noVerified": "No se encontraron fuentes verificadas que coincidan. Prueba con otro tipo de fuente o un período más amplio.",
-    "useSuggestion": "Buscar esto"
+    "useSuggestion": "Buscar esto",
+    "resultTitle": "Evidencia"
   },
   "askChat": {
     "title": "Pregunta a Tu Coach",
     "subtitle": "Obtén respuestas a preguntas de debate",
-    "typing": "Escribiendo",
     "startConversation": "Inicia una conversación",
     "startDesc": "Pregunta lo que sea sobre estrategia de debate, argumentos o pide ayuda con tu caso.",
     "modeGeneral": "General",
@@ -1340,11 +1311,6 @@
     "tooManyFiles": "Demasiados archivos",
     "tooManyFilesDesc": "Solo puedes subir hasta {{max}} archivos a la vez.",
     "fileValidationFailed": "Validación de archivo fallida",
-    "thinking": "Pensando...",
-    "researching": "Investigando...",
-    "analyzing": "Analizando...",
-    "generatingResponse": "Generando respuesta...",
-    "almostThere": "Casi listo...",
     "savedChats": "Chats guardados",
     "savedChatsDesc": "Retoma conversaciones anteriores con tu coach.",
     "openSavedChats": "Abrir chats guardados",
@@ -1358,7 +1324,13 @@
     "messageCount_one": "{{count}} mensaje",
     "messageCount_other": "{{count}} mensajes",
     "savedCount_one": "{{count}} guardado",
-    "savedCount_other": "{{count}} guardados"
+    "savedCount_other": "{{count}} guardados",
+    "working": "Trabajando…",
+    "searchingWeb": "Buscando en la web…",
+    "elapsed": "{{seconds}} s",
+    "jumpToLatest": "Ir al final",
+    "stop": "Detener la respuesta",
+    "options": "Opciones"
   },
   "limitModal": {
     "trialEnded": "Prueba Gratuita Finalizada",
@@ -1446,6 +1418,7 @@
     "timeUpSignal": "Señal de tiempo agotado",
     "twoBeeps": "Dos pitidos",
     "spaceStartStop": "Espacio para iniciar/detener",
+    "reset": "Reiniciar temporizador",
     "resetKey": "R para reiniciar",
     "arrowsChange": "Flechas para cambiar orador",
     "speeches": {
@@ -1484,7 +1457,8 @@
       }
     },
     "disableSound": "Desactivar sonido",
-    "enableSound": "Activar sonido"
+    "enableSound": "Activar sonido",
+    "resetDone": "Temporizador reiniciado"
   },
   "flowchart": {
     "title": "Diagrama de Argumentos",
@@ -1529,13 +1503,7 @@
     "savedToast": "Diagrama guardado exitosamente",
     "saveFailedToast": "Error al guardar diagrama",
     "loadedToast": "Diagrama cargado",
-    "deletedToast": "Diagrama eliminado",
     "deleteFailedToast": "Error al eliminar diagrama",
-    "deleteNodeTitle": "¿Eliminar nodo?",
-    "deleteNodeDescription": "Se eliminarán «{{label}}» y todas sus conexiones. Esta acción no se puede deshacer.",
-    "deleteNodeConfirm": "Eliminar nodo",
-    "deleteNodeCancel": "Cancelar",
-    "nodeDeletedToast": "Nodo eliminado",
     "starter": {
       "thesisLabel": "Tu tesis",
       "thesisDesc": "Haz clic para editar o añadir nuevos nodos",
@@ -1560,7 +1528,11 @@
     "zoomOut": "Alejar",
     "fitView": "Ajustar a la vista",
     "toggleInteractivity": "Bloquear o desbloquear el lienzo",
-    "miniMap": "Vista general del diagrama"
+    "miniMap": "Vista general del diagrama",
+    "deletedNamed": "Se eliminó {{title}}",
+    "deleteNamed": "Eliminar {{title}}",
+    "restoreFailed": "No se pudo restaurar el diagrama",
+    "nodeDeletedNamed": "Se eliminó {{label}}"
   },
   "historyPage": {
     "title": "Historial",
@@ -2026,7 +1998,6 @@
       "opponentUpNext": "El oponente va ahora",
       "opponentThinkingDescription": "Está leyendo la moción y tus intervenciones antes de elegir una respuesta.",
       "opponentUpNextDescription": "La siguiente respuesta aparecerá aquí.",
-      "aiThinking": "La IA está pensando",
       "transcript": "Transcripción",
       "transcriptDescription": "Cada intervención enviada se queda aquí para el juez.",
       "submittedCount": "{{count}} enviadas",
@@ -2042,7 +2013,8 @@
       "totalWords_one": "{{count}} palabra",
       "totalWords_other": "{{count}} palabras",
       "wordCount_one": "{{count}} palabra",
-      "wordCount_other": "{{count}} palabras"
+      "wordCount_other": "{{count}} palabras",
+      "latestOpponent": "Último discurso del oponente"
     },
     "scorecard": {
       "eyebrow": "Revisión de la ronda",
@@ -2350,7 +2322,6 @@
     "leftOut_other": "{{count}} elementos quedan fuera para que la solicitud quepa.",
     "review": "Revisar",
     "oneOff": "Modo puntual: no se usará ni se guardará material del debate actual.",
-    "noDebate": "No hay debate actual, así que no se usará material del debate.",
     "reviewTitle": "Qué usará esta solicitud",
     "reviewDesc": "Estos cambios solo se aplican a tu próxima solicitud. Los resultados fijados siguen incluidos hasta que los sueltes.",
     "debateHeading": "Debate",
@@ -2398,5 +2369,50 @@
   },
   "offlineIndicator": {
     "label": "Modo sin conexión"
+  },
+  "tools": {
+    "elapsed": "{{seconds}} s",
+    "aiCaveat": "Generado por IA. Comprueba los datos y las fuentes antes de usarlos en una ronda.",
+    "researchedSources": "Fuentes investigadas ({{total}})"
+  },
+  "discuss": {
+    "attack": {
+      "intro": "Quiero hablar de la crítica de mi caso.",
+      "assessment": "Valoración general",
+      "score": "Puntuación",
+      "weaknesses": "Debilidades principales",
+      "ask": "¿Me ayudas a mejorarlo?"
+    },
+    "brainstorm": {
+      "intro": "Quiero hablar de estas ideas.",
+      "topIdeas": "Ideas principales",
+      "buckets": "Grupos clave",
+      "ask": "¿Me ayudas a desarrollar alguna?"
+    },
+    "generate": {
+      "intro": "Quiero hablar del caso que acabamos de generar.",
+      "thesis": "Tesis",
+      "arguments": "Argumentos",
+      "ask": "¿Podemos pulirlo?"
+    },
+    "factoids": {
+      "intro": "Quiero hablar de la evidencia que encontré.",
+      "factoids": "Evidencia",
+      "ask": "¿Cómo puedo usar mejor esta evidencia?"
+    }
+  },
+  "aiErrors": {
+    "genericProvider": "El proveedor de IA",
+    "quota": "{{provider}} superó su cuota. Avisa al administrador del sitio.",
+    "config": "{{provider}} no está bien configurado. Avisa al administrador del sitio.",
+    "rateLimit": "{{provider}} superó el límite de solicitudes. Inténtalo más tarde.",
+    "unavailable": "{{provider}} no está disponible por ahora. Inténtalo más tarde.",
+    "safety": "{{provider}} bloqueó esta solicitud por seguridad. Prueba a reformularla.",
+    "unexpectedProvider": "El proveedor de IA devolvió un error inesperado. Inténtalo más tarde.",
+    "unexpected": "Se produjo un error inesperado"
+  },
+  "clock": {
+    "timeUp": "Se acabó el tiempo.",
+    "remaining": "Queda {{time}}."
   }
 }
diff --git a/src/locales/hu.json b/src/locales/hu.json
index 5f75d4035..0698e6a9b 100644
--- a/src/locales/hu.json
+++ b/src/locales/hu.json
@@ -375,8 +375,6 @@
     "flowchartImportFailedDesc": "Nem sikerült folyamatábrát építeni az eset adataiból.",
     "flowchartNoData": "Nincs érvényes esetadat az importhoz.",
     "caseTitle": "Az eset címe",
-    "complete": "A generálás elkészült",
-    "completeDesc": "Elkészült a vitaeseted.",
     "noUndo": "Nincs mit visszavonni",
     "regenerated": "A szakasz újragenerálva",
     "regeneratedDesc": "A kiválasztott szakasz frissült.",
@@ -385,21 +383,20 @@
     "saveCase": "Eset mentése",
     "undone": "Visszaállítva",
     "undoneDesc": "Az előző generálás betöltve.",
-    "saveFailedDesc": "Nem sikerült menteni az esetet. Próbáld újra."
+    "saveFailedDesc": "Nem sikerült menteni az esetet. Próbáld újra.",
+    "working": "Az eseted megírása…"
   },
   "attack": {
     "emptyTitle": "Kegyetlen Mód",
     "emptyDesc": "Illeszd be az érvedet kíméletlen kritikáért, logikai hibák azonosításáért és megvalósítható javításokért.",
     "failed": "Támadás Elemzés Sikertelen",
-    "complete": "A támadáselemzés elkészült",
-    "completeDesc": "Elkészült a kritika."
+    "working": "Az eseted átnézése…"
   },
   "brainstorm": {
     "emptyTitle": "Kreatív Szögek Feloldása",
     "emptyDesc": "Írd le az indítványodat szokatlan érvelési szögek felfedezéséhez, kompromisszumok azonosításához és legerősebb pozícióid megtalálásához.",
     "failed": "Ötletelés Sikertelen",
-    "complete": "Az ötletelés elkészült",
-    "completeDesc": "Elkészültek az érvelési ötleteid."
+    "working": "Szempontok keresése…"
   },
   "factoids": {
     "emptyTitle": "Győztes Bizonyítékok",
@@ -407,9 +404,8 @@
     "failed": "Kutatás Sikertelen",
     "savedToLibrary": "Mentve a Könyvtárba",
     "savedToLibraryDesc": "Ez a bizonyíték mostantól elérhető megalapozáshoz.",
-    "complete": "A kutatás elkészült",
-    "completeDesc": "Elkészültek az ellenőrzött bizonyítékok.",
-    "saveFailed": "Nem sikerült menteni a forrást."
+    "saveFailed": "Nem sikerült menteni a forrást.",
+    "working": "Bizonyítékok keresése…"
   },
   "ask": {
     "failed": "Hiba",
@@ -426,12 +422,10 @@
     "retryableFailedDesc": "Nem sikerült elérni az MI-t. Ellenőrizd a kapcsolatot, majd próbáld újra.",
     "saveFailed": "A mentés sikertelen",
     "saveFailedDesc": "Nem sikerült menteni a chatet. Próbáld újra.",
-    "sourceSaveFailedDesc": "Nem sikerült menteni a forrást. Próbáld újra."
-  },
-  "chat": {
-    "error": "Chat Hiba",
-    "errorDesc": "Nem sikerült választ generálni."
+    "sourceSaveFailedDesc": "Nem sikerült menteni a forrást. Próbáld újra.",
+    "stopped": "Leállítottad ezt a választ, mielőtt elkészült volna."
   },
+  "chat": {},
   "settings": {
     "title": "Beállítások",
     "aiOutputLanguage": "Nyelv (Felület + MI Kimenet)",
@@ -1040,8 +1034,6 @@
     "title": "Kéréslimit Túllépve"
   },
   "generateForm": {
-    "title": "Vitaeset Generálása",
-    "subtitle": "Készíts strukturált érveket bármilyen indítványhoz",
     "motion": "Indítvány / Téma",
     "motionPlaceholder": "pl. Ez a ház úgy véli, hogy a mesterséges intelligencia több munkahelyet teremt, mint amennyit megszüntet",
     "side": "Oldal",
@@ -1073,11 +1065,6 @@
     "startVoice": "Hangbevitel indítása",
     "stopVoice": "Hangbevitel leállítása",
     "dictate": "Diktáld az indítványt",
-    "loadingMsg1": "Indítvány olvasása...",
-    "loadingMsg2": "Érvelési láncok építése...",
-    "loadingMsg3": "Beszédre kész hatások írása...",
-    "loadingMsg4": "Ellenérvek előkészítése...",
-    "loadingMsg5": "Eset véglegesítése...",
     "styleNote": "A írásstílust befolyásolja; a kutatást nem változtatja meg."
   },
   "generateResults": {
@@ -1126,11 +1113,12 @@
     "exportError": "Váratlan hiba történt az exportálás során",
     "copiedToClipboard": "Vágólapra másolva",
     "copyFailed": "Nem sikerült a vágólapra másolni",
-    "undo": "Visszavonás"
+    "undo": "Visszavonás",
+    "resultTitle": "Az eseted",
+    "unverified": "Ellenőrizetlen",
+    "unresearchedCaveat": "MI által készült, és ezt a bizonyítékot nem támasztja alá webes kutatás. Ellenőrizd a tényeket és a forrásokat, mielőtt egy fordulóban használod."
   },
   "attackForm": {
-    "title": "Támadás az Esetem Ellen",
-    "subtitle": "Találd meg a gyengeségeket és kapj javítási javaslatokat",
     "argument": "Az Érved",
     "argumentPlaceholder": "Illeszd be a vitaesetedet vagy érvedet ide...",
     "options": "Beállítások",
@@ -1148,12 +1136,7 @@
     "analyzeWeighing": "Súlyozás Elemzése",
     "analyzeWeighingDesc": "Hatás-összehasonlítás és prioritizálás értékelése",
     "analyzing": "Eset Elemzése...",
-    "submit": "Gyengeségek Keresése",
-    "loadingMsg1": "Esetstruktúra elemzése...",
-    "loadingMsg2": "Logikai rések keresése...",
-    "loadingMsg3": "Cáfolatok kidolgozása...",
-    "loadingMsg4": "Feltételezések tesztelése...",
-    "loadingMsg5": "Kritika véglegesítése..."
+    "submit": "Gyengeségek Keresése"
   },
   "attackResults": {
     "overall": "Összesített Értékelés",
@@ -1195,11 +1178,10 @@
     "exportFailedGdocs": "Nem sikerült exportálni Google Docs-ba",
     "exportError": "Váratlan hiba történt az exportálás során",
     "weaknessesCount_one": "{{count}} probléma található, súlyosság szerint rendezve",
-    "weaknessesCount_other": "{{count}} probléma található, súlyosság szerint rendezve"
+    "weaknessesCount_other": "{{count}} probléma található, súlyosság szerint rendezve",
+    "resultTitle": "Kritika"
   },
   "brainstormForm": {
-    "title": "Ötletelés",
-    "subtitle": "Fedezz fel érvelési szögeket együttműködve",
     "motion": "Indítvány / Téma",
     "motionPlaceholder": "pl. Az Univerzális Alapjövedelmet globálisan be kellene vezetni",
     "side": "Vizsgálandó Oldal",
@@ -1213,12 +1195,7 @@
     "existing": "Ami Már Megvan (Opcionális)",
     "existingPlaceholder": "Oszd meg az ötleteidet vagy szögeket, amiket már fontolóra vettél...",
     "generating": "Ötletek Generálása...",
-    "submit": "Ötletelés Indítása",
-    "loadingMsg1": "Szögek feltárása...",
-    "loadingMsg2": "Ötletek összekapcsolása...",
-    "loadingMsg3": "Szokatlan utak keresése...",
-    "loadingMsg4": "Rangsorolás eredetiség szerint...",
-    "loadingMsg5": "Ötletelés véglegesítése..."
+    "submit": "Ötletelés Indítása"
   },
   "brainstormResults": {
     "clarification": "Pontosítás Szükséges",
@@ -1242,11 +1219,10 @@
     "exportFailedGdocs": "Nem sikerült exportálni Google Docs-ba",
     "exportError": "Váratlan hiba történt az exportálás során",
     "noIdeasDesc": "Próbálj pontosabb tételt vagy más kimeneti formátumot, majd ötletelj újra.",
-    "noIdeasTitle": "Nem születtek ötletek"
+    "noIdeasTitle": "Nem születtek ötletek",
+    "resultTitle": "Szempontok"
   },
   "factoidsForm": {
-    "title": "Bizonyítékok Keresése",
-    "subtitle": "Találj vitakész tényeket ellenőrzött hivatkozásokkal",
     "claim": "Állítás",
     "claimPlaceholder": "pl. A megújuló energia költséghatékonyabb, mint a fosszilis tüzelőanyagok",
     "direction": "Álláspont",
@@ -1263,12 +1239,7 @@
     "sourceGovernment": "Kormányzati Források",
     "sourceNews": "Fő Hírek",
     "finding": "Bizonyítékok Keresése...",
-    "submit": "Tények Keresése",
-    "loadingMsg1": "Adatbázisok keresése...",
-    "loadingMsg2": "Hivatkozások ellenőrzése...",
-    "loadingMsg3": "Források keresztellenőrzése...",
-    "loadingMsg4": "Rangsorolás megbízhatóság szerint...",
-    "loadingMsg5": "Bizonyítékok véglegesítése..."
+    "submit": "Tények Keresése"
   },
   "factoidsResults": {
     "verificationStatus": "Ellenőrzési Állapot",
@@ -1300,12 +1271,12 @@
     "exportFailedGdocs": "Nem sikerült exportálni Google Docs-ba",
     "exportError": "Váratlan hiba történt az exportálás során",
     "noVerified": "Nem találtunk megfelelő, ellenőrzött forrásokat. Próbálj más forrástípust vagy hosszabb időszakot.",
-    "useSuggestion": "Keresés erre"
+    "useSuggestion": "Keresés erre",
+    "resultTitle": "Bizonyítékok"
   },
   "askChat": {
     "title": "Kérdezd az Edződ",
     "subtitle": "Kapj válaszokat vitakérdésekre",
-    "typing": "Gépelés",
     "startConversation": "Indíts beszélgetést",
     "startDesc": "Kérdezz bármit vitastratégiáról, érvekről, vagy kérj segítséget az esetedhez.",
     "modeGeneral": "Általános",
@@ -1340,11 +1311,6 @@
     "tooManyFiles": "Túl sok fájl",
     "tooManyFilesDesc": "Egyszerre legfeljebb {{max}} fájlt tölthetsz fel.",
     "fileValidationFailed": "Fájl érvényesítés sikertelen",
-    "thinking": "Gondolkodás...",
-    "researching": "Kutatás...",
-    "analyzing": "Elemzés...",
-    "generatingResponse": "Válasz generálása...",
-    "almostThere": "Mindjárt kész...",
     "savedChats": "Mentett beszélgetések",
     "savedChatsDesc": "Folytasd a korábbi edzői beszélgetéseket.",
     "openSavedChats": "Mentett beszélgetések megnyitása",
@@ -1358,7 +1324,13 @@
     "messageCount_one": "{{count}} üzenet",
     "messageCount_other": "{{count}} üzenet",
     "savedCount_one": "{{count}} mentve",
-    "savedCount_other": "{{count}} mentve"
+    "savedCount_other": "{{count}} mentve",
+    "working": "Dolgozom…",
+    "searchingWeb": "Keresés a weben…",
+    "elapsed": "{{seconds}} mp",
+    "jumpToLatest": "Ugrás a legújabbra",
+    "stop": "Válasz leállítása",
+    "options": "Beállítások"
   },
   "limitModal": {
     "trialEnded": "Ingyenes Próba Lejárt",
@@ -1446,6 +1418,7 @@
     "timeUpSignal": "Idő lejárt jelzés",
     "twoBeeps": "Két sípolás",
     "spaceStartStop": "Szóköz az indításhoz/megállításhoz",
+    "reset": "Időmérő visszaállítása",
     "resetKey": "R az újraindításhoz",
     "arrowsChange": "Nyilak a beszélő váltásához",
     "speeches": {
@@ -1484,7 +1457,8 @@
       }
     },
     "disableSound": "Hang kikapcsolása",
-    "enableSound": "Hang bekapcsolása"
+    "enableSound": "Hang bekapcsolása",
+    "resetDone": "Időmérő visszaállítva"
   },
   "flowchart": {
     "title": "Érvelési Folyamatábra",
@@ -1529,13 +1503,7 @@
     "savedToast": "Folyamatábra sikeresen mentve",
     "saveFailedToast": "Nem sikerült menteni a folyamatábrát",
     "loadedToast": "Folyamatábra betöltve",
-    "deletedToast": "Folyamatábra törölve",
     "deleteFailedToast": "Nem sikerült törölni a folyamatábrát",
-    "deleteNodeTitle": "Csomópont törlése?",
-    "deleteNodeDescription": "A(z) „{{label}}” csomópont és minden kapcsolata törlődik. Ez a művelet nem vonható vissza.",
-    "deleteNodeConfirm": "Csomópont törlése",
-    "deleteNodeCancel": "Mégse",
-    "nodeDeletedToast": "Csomópont törölve",
     "starter": {
       "thesisLabel": "A tézised",
       "thesisDesc": "Kattints a szerkesztéshez vagy új csomópont hozzáadásához",
@@ -1560,7 +1528,11 @@
     "zoomOut": "Kicsinyítés",
     "fitView": "Teljes nézet",
     "toggleInteractivity": "Vászon zárolása vagy feloldása",
-    "miniMap": "Folyamatábra áttekintése"
+    "miniMap": "Folyamatábra áttekintése",
+    "deletedNamed": "Törölve: {{title}}",
+    "deleteNamed": "{{title}} törlése",
+    "restoreFailed": "Nem sikerült visszaállítani a folyamatábrát",
+    "nodeDeletedNamed": "Törölve: {{label}}"
   },
   "historyPage": {
     "title": "Előzmények",
@@ -2026,7 +1998,6 @@
       "opponentUpNext": "Az ellenfél következik",
       "opponentThinkingDescription": "A válasz előtt elolvassa az indítványt és a beszédeidet.",
       "opponentUpNextDescription": "A következő válasz itt jelenik meg.",
-      "aiThinking": "Az MI gondolkodik",
       "transcript": "Átirat",
       "transcriptDescription": "Minden beküldött beszéd itt marad a bíró számára.",
       "submittedCount": "{{count}} beküldve",
@@ -2042,7 +2013,8 @@
       "totalWords_one": "{{count}} szó",
       "totalWords_other": "{{count}} szó",
       "wordCount_one": "{{count}} szó",
-      "wordCount_other": "{{count}} szó"
+      "wordCount_other": "{{count}} szó",
+      "latestOpponent": "Az ellenfél utolsó beszéde"
     },
     "scorecard": {
       "eyebrow": "Forduló értékelése",
@@ -2350,7 +2322,6 @@
     "leftOut_other": "{{count}} elem kimarad, hogy a kérés beleférjen a keretbe.",
     "review": "Áttekintés",
     "oneOff": "Egyszeri mód: az aktuális vita anyagai nem kerülnek felhasználásra és mentésre.",
-    "noDebate": "Nincs aktuális vita, ezért vitaanyag sem kerül felhasználásra.",
     "reviewTitle": "Mit használ ez a kérés",
     "reviewDesc": "Az itteni változtatások csak a következő kérésre érvényesek. A kitűzött eredmények addig maradnak benne, amíg le nem veszed őket.",
     "debateHeading": "Vita",
@@ -2398,5 +2369,50 @@
   },
   "offlineIndicator": {
     "label": "Offline mód"
+  },
+  "tools": {
+    "elapsed": "{{seconds}} mp",
+    "aiCaveat": "MI által készült. Ellenőrizd a tényeket és a forrásokat, mielőtt egy fordulóban használod.",
+    "researchedSources": "Felkutatott források ({{total}})"
+  },
+  "discuss": {
+    "attack": {
+      "intro": "Szeretném megbeszélni az esetem kritikáját.",
+      "assessment": "Összegzés",
+      "score": "Pontszám",
+      "weaknesses": "Fő gyengeségek",
+      "ask": "Segítesz javítani rajta?"
+    },
+    "brainstorm": {
+      "intro": "Szeretném megbeszélni ezeket az ötleteket.",
+      "topIdeas": "Legjobb ötletek",
+      "buckets": "Fő csoportok",
+      "ask": "Segítesz kifejteni valamelyiket?"
+    },
+    "generate": {
+      "intro": "Szeretném megbeszélni az imént elkészült esetet.",
+      "thesis": "Tézis",
+      "arguments": "Érvek",
+      "ask": "Finomíthatunk rajta?"
+    },
+    "factoids": {
+      "intro": "Szeretném megbeszélni a talált bizonyítékokat.",
+      "factoids": "Bizonyítékok",
+      "ask": "Hogyan használhatom a legjobban ezeket a bizonyítékokat?"
+    }
+  },
+  "aiErrors": {
+    "genericProvider": "Az MI-szolgáltató",
+    "quota": "{{provider}}: elfogyott a keret. Szólj az oldal adminisztrátorának.",
+    "config": "{{provider}}: hibás beállítás. Szólj az oldal adminisztrátorának.",
+    "rateLimit": "{{provider}}: túl sok kérés. Próbáld újra később.",
+    "unavailable": "{{provider}}: átmenetileg nem érhető el. Próbáld újra később.",
+    "safety": "{{provider}}: biztonsági okokból elutasította a kérést. Próbáld másképp megfogalmazni.",
+    "unexpectedProvider": "Az MI-szolgáltató váratlan hibát adott. Próbáld újra később.",
+    "unexpected": "Váratlan hiba történt"
+  },
+  "clock": {
+    "timeUp": "Lejárt az idő.",
+    "remaining": "Még {{time}}."
   }
 }
diff --git a/src/pages/AskPage.tsx b/src/pages/AskPage.tsx
index 4b05c6815..8b7883057 100644
--- a/src/pages/AskPage.tsx
+++ b/src/pages/AskPage.tsx
@@ -1,4 +1,4 @@
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useSettingsStore } from '@/lib/stores/settings-store';
@@ -9,14 +9,16 @@ import { useSubscriptionError } from '@/hooks/use-subscription-error';
 import { getUserFacingAIError } from '@/lib/ai/error-display';
 import { LimitReachedModal, ModelRestrictedModal, PricingModal } from '@/components/features/subscription';
 import { useToast } from '@/hooks/use-toast';
-import { AnimatedSection } from '@/components/ui/animated-section';
-import { useCallback, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { useShallow } from 'zustand/react/shallow';
 import type { AskOutput } from '@/lib/ai/schemas/ask';
 import { DebateContextControl } from '@/components/features/debate/DebateContextControl';
 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';
+import { PageHeader } from '@/components/layout/PageHeader';
+import type { AskChatError } from '@/components/features/ask/AskChat';
 
 const MAX_AI_INPUT_LENGTH = 50000;
 
@@ -39,7 +41,25 @@ export default function AskPage() {
     askChatDebateId,
     askPersistedCount,
     syncAskChat,
-  } = useSessionStore();
+  } = useSessionStore(useShallow((state) => ({
+    askMessages: state.askMessages,
+    askLoading: state.askLoading,
+    askStreamingAssistant: state.askStreamingAssistant,
+    addAskMessage: state.addAskMessage,
+    setAskLoading: state.setAskLoading,
+    setAskStreamingAssistant: state.setAskStreamingAssistant,
+    appendAskStreamingDelta: state.appendAskStreamingDelta,
+    clearAskMessages: state.clearAskMessages,
+    saveCurrentChat: state.saveCurrentChat,
+    loadSavedChat: state.loadSavedChat,
+    savedChats: state.savedChats,
+    addSource: state.addSource,
+    askChatId: state.askChatId,
+    askChatDebateId: state.askChatDebateId,
+    askPersistedCount: state.askPersistedCount,
+    syncAskChat: state.syncAskChat,
+  })));
+  const [chatError, setChatError] = useState<AskChatError | null>(null);
   const chatScope = useDebateStore((state) => state.oneOff ? null : state.currentDebateId);
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('ask');
@@ -89,6 +109,10 @@ export default function AskPage() {
     });
   }, [askChatId, askLoading, askMessages.length, askPersistedCount, lastRole, syncAskChat, t, toast, workspace.context]);
 
+  /**
+   * Sends a question. Returns false when the message is rejected before sending, so the
+   * composer keeps the text. A retry re-asks the last question without adding it again.
+   */
   const handleSend = async (
     message: string,
     mode: string,
@@ -96,9 +120,11 @@ export default function AskPage() {
     webSearch: boolean,
     prosConsMode: boolean,
     argumentMapMode: boolean,
-    files?: File[]
-  ) => {
+    files?: File[],
+    retry = false,
+  ): Promise<boolean> => {
     invalidateActiveRequest();
+    setChatError(null);
     const requestId = requestIdRef.current;
     const isCurrentRequest = () => requestIdRef.current === requestId;
 
@@ -140,19 +166,20 @@ export default function AskPage() {
         fileContext = contents.join('\n');
       }
 
-      const history = workspace.context ? [] : askMessages.map(m => ({ role: m.role, content: m.content }));
+      // A retry's question is already in the chat; it is the message, not part of the history.
+      const priorMessages = retry && askMessages[askMessages.length - 1]?.role === 'user' ? askMessages.slice(0, -1) : askMessages;
+      const history = workspace.context ? [] : priorMessages.map(m => ({ role: m.role, content: m.content }));
       const fullMessage = fileContext ? `CONTEXT:\n${fileContext}\n\nQUESTION: ${message}` : message;
       if (fullMessage.length > MAX_AI_INPUT_LENGTH || !isAskMessageWithinBudget(fullMessage)) {
-        toast({
+        setChatError({
           title: t('ask.inputTooLargeTitle', 'Message is too large'),
           description: t('ask.inputTooLargeDesc', 'Remove some attachment text or shorten your question before sending.'),
-          variant: "destructive"
         });
-        return;
+        return false;
       }
-      if (!isCurrentRequest()) return;
+      if (!isCurrentRequest()) return false;
 
-      addAskMessage({ role: 'user', content: displayContent });
+      if (!retry) addAskMessage({ role: 'user', content: displayContent });
       setAskLoading(true);
 
       const options = {
@@ -166,13 +193,15 @@ export default function AskPage() {
       };
 
       let result: AskOutput;
+      let streamedId: string | null = null;
       const askStartTime = Date.now();
 
       if (!workspace.context && isAskStreamingSupported(config, { ...options, mode })) {
         let receivedStreamText = false;
         let partialResponse = '';
         const streamingMessage = {
-          id: `stream_${requestId}`,
+          // The stored reply reuses this id, so the bubble the user is reading never remounts.
+          id: crypto.randomUUID(),
           role: 'assistant' as const,
           content: '',
           timestamp: Date.now(),
@@ -181,6 +210,7 @@ export default function AskPage() {
         const controller = new AbortController();
         streamAbortRef.current = controller;
         setAskStreamingAssistant(streamingMessage);
+        streamedId = streamingMessage.id;
         let pendingText = '';
         let flushTimer: ReturnType<typeof setTimeout> | null = null;
 
@@ -209,8 +239,8 @@ export default function AskPage() {
           if (ownsStream) setAskStreamingAssistant(null);
           const aborted = streamError instanceof DOMException && streamError.name === 'AbortError';
           if (aborted || !isCurrentRequest()) {
-            // A newer request replaced this one. Drop the partial silently.
-            return;
+            // A newer request or Stop replaced this one; Stop keeps the partial itself.
+            return true;
           }
           if (receivedStreamText) {
             toast({
@@ -244,8 +274,9 @@ export default function AskPage() {
         result = await askChat(fullMessage, history, mode, config, options);
       }
 
-      if (!isCurrentRequest()) return;
+      if (!isCurrentRequest()) return true;
       addAskMessage({
+        id: streamedId ?? undefined,
         role: 'assistant',
         content: result.response,
         output: {
@@ -257,30 +288,26 @@ export default function AskPage() {
         }
       });
       await workspace.attach({ fullMessage, history, mode }, result);
+      return true;
     } catch (error) {
-      if (!isCurrentRequest()) return;
+      if (!isCurrentRequest()) return true;
       setAskStreamingAssistant(null);
       console.error(error);
 
+      // Failures stay in the chat with a Retry that re-asks without duplicating the question.
+      const retryAsk = (): void => { void handleSend(message, mode, citationMode, webSearch, prosConsMode, argumentMapMode, files, true); };
       if (subError.handleSubscriptionError(error)) {
         // Subscription error handled by modal
       } else if (isTimeoutError(error)) {
-        toast({
-          title: t('ask.timeout'),
-          description: t('ask.timeoutDesc'),
-          variant: "destructive"
-        });
+        setChatError({ title: t('ask.timeout'), description: t('ask.timeoutDesc'), onRetry: retryAsk });
       } else {
-        toast({
+        setChatError({
           title: t('ask.failed'),
           description: getUserFacingAIError(error) || t('ask.retryableFailedDesc', "Couldn't reach the AI. Check your connection and retry."),
-          variant: "destructive",
-          action: {
-            label: t('common.retry', 'Retry'),
-            onClick: () => void handleSend(message, mode, citationMode, webSearch, prosConsMode, argumentMapMode, files),
-          },
+          onRetry: retryAsk,
         });
       }
+      return true;
     } finally {
       if (isCurrentRequest()) {
         setAskStreamingAssistant(null);
@@ -289,8 +316,36 @@ export default function AskPage() {
     }
   };
 
+  // Stop keeps whatever has streamed so far as the reply, marked as stopped.
+  const handleStop = () => {
+    const partial = useSessionStore.getState().askStreamingAssistant;
+    invalidateActiveRequest();
+    if (partial?.content.trim()) {
+      addAskMessage({
+        id: partial.id,
+        role: 'assistant',
+        content: partial.content.trim(),
+        output: { response: partial.content.trim(), followUpQuestions: [], uncertainties: [t('ask.stopped', 'You stopped this answer before it finished.')] },
+      });
+    }
+  };
+
+  // "Discuss" on a tool result opens Ask with its prompt, sent here like a typed question.
+  const location = useLocation();
+  const discussPrompt = (location.state as { discussPrompt?: string } | null)?.discussPrompt;
+  const sendRef = useRef(handleSend);
+  sendRef.current = handleSend;
+  const discussedKey = useRef<string | null>(null);
+  useEffect(() => {
+    if (!discussPrompt || discussedKey.current === location.key) return;
+    discussedKey.current = location.key;
+    navigate(location.pathname, { replace: true, state: null });
+    void sendRef.current(discussPrompt, 'general', false, false, false, false);
+  }, [discussPrompt, location.key, location.pathname, navigate]);
+
   const handleClear = () => {
     invalidateActiveRequest();
+    setChatError(null);
     clearAskMessages();
   };
 
@@ -331,29 +386,21 @@ export default function AskPage() {
       }
   };
 
-  const formattedMessages = askMessages.map(m => ({
-    id: m.id,
-    role: m.role,
-    content: m.content,
-    timestamp: m.timestamp,
-    output: m.output
-  }));
-  const visibleMessages = askStreamingAssistant
-    ? [...formattedMessages, askStreamingAssistant]
-    : formattedMessages;
 
   return (
     <div className="container py-8 px-4">
       <WorkspaceToolScope context={workspace.context} />
       <div className="max-w-5xl mx-auto">
-        <AnimatedSection className="mb-8">
-          <h1 className="text-3xl font-bold text-foreground">{t('nav.ask')}</h1>
-        </AnimatedSection>
+        <PageHeader title={t('nav.ask')} />
         <CurrentDebateStrip hidden={Boolean(workspace.context)} />
-        <AnimatedSection delay={75}>
+        <div>
           <AskChat
-            messages={visibleMessages}
+            messages={askMessages}
+            streamingMessage={askStreamingAssistant}
             isLoading={askLoading}
+            error={chatError}
+            onDismissError={() => setChatError(null)}
+            onStop={handleStop}
             onSend={handleSend}
             onClear={handleClear}
             onSaveChat={askChatId ? undefined : handleSaveChat}
@@ -374,7 +421,7 @@ export default function AskPage() {
               />
             )}
           />
-        </AnimatedSection>
+        </div>
       </div>
 
       <LimitReachedModal
diff --git a/src/pages/AttackPage.tsx b/src/pages/AttackPage.tsx
index 3929c3803..40e8a12c5 100644
--- a/src/pages/AttackPage.tsx
+++ b/src/pages/AttackPage.tsx
@@ -1,19 +1,22 @@
 // src/pages/AttackPage.tsx
-import { useState } from 'react';
+import { useRef, useState } from 'react';
+import { useShallow } from 'zustand/react/shallow';
+import { Swords } from 'lucide-react';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useSettingsStore } from '@/lib/stores/settings-store';
 import { useTranslation } from 'react-i18next';
 import { AttackForm } from '@/components/features/attack/AttackForm';
 import { AttackResults } from '@/components/features/attack/AttackResults';
-import { attackCase, askChat, type DiscoveredSource } from '@/lib/ai/client';
+import { attackCase, type DiscoveredSource } from '@/lib/ai/client';
 import { useSubscriptionError } from '@/hooks/use-subscription-error';
 import { getUserFacingAIError } from '@/lib/ai/error-display';
 import { LimitReachedModal, ModelRestrictedModal, PricingModal } from '@/components/features/subscription';
 import type { AttackInput } from '@/lib/ai/schemas/attack';
-import { useToast } from '@/hooks/use-toast';
 import { useNavigate } from 'react-router-dom';
-import { StreamingIndicator } from '@/components/ui/streaming-indicator';
-import { AnimatedSection } from '@/components/ui/animated-section';
+import { EmptyState } from '@/components/ui/empty-state';
+import { PageHeader } from '@/components/layout/PageHeader';
+import { ToolRunErrorPanel, ToolRunStatus, isCanceled, useRevealResults, useToolRun } from '@/components/features/tools/tool-run';
+import { attackDiscussPrompt, openDiscussion } from '@/components/features/tools/discuss';
 import { prefillFromAttack } from '@/lib/crossfire/prefill';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
 import { workspaceRouteState } from '@/lib/workspace/tool-context';
@@ -23,22 +26,34 @@ import { activeDebateId } from '@/lib/stores/debate-store';
 
 export default function AttackPage() {
   const workspace = useWorkspaceToolScope('attack');
-  const { attackResult, attackLoading, attackForm, setAttackResult, setAttackLoading, addAskMessage, setAskLoading, askMessages, recordResult } = useSessionStore();
+  const { attackResult, attackLoading, attackForm, setAttackResult, setAttackLoading, recordResult } = useSessionStore(useShallow((state) => ({
+    attackResult: state.attackResult,
+    attackLoading: state.attackLoading,
+    attackForm: state.attackForm,
+    setAttackResult: state.setAttackResult,
+    setAttackLoading: state.setAttackLoading,
+    recordResult: state.recordResult,
+  })));
   const { getFeatureConfig } = useSettingsStore();
-  const config = getFeatureConfig('attack'); // Actually we should use 'ask' config for the chat part
-  const askConfig = getFeatureConfig('ask');
-  const { toast } = useToast();
+  const config = getFeatureConfig('attack');
+  const run = useToolRun('attack');
+  const results = useRevealResults();
+  const lastInput = useRef<AttackInput | null>(null);
   const navigate = useNavigate();
   const subError = useSubscriptionError();
   const { t } = useTranslation();
   const [discoveredSources, setDiscoveredSources] = useState<DiscoveredSource[]>([]);
 
   const handleSubmit = async (data: AttackInput) => {
+    lastInput.current = data;
+    const signal = run.start();
     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, workspace.context ? undefined : debateId);
+      const { result, discoveredSources } = await attackCase(data, config, workspace.context ?? undefined, workspace.context ? undefined : debateId, signal);
+      // A canceled request can still resolve (its last step ignores the signal); never publish it.
+      if (signal.aborted) return;
       setDiscoveredSources(discoveredSources);
       setAttackResult(result);
       await workspace.attach(data, result);
@@ -46,64 +61,20 @@ export default function AttackPage() {
         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' });
+      results.reveal();
     } catch (error) {
+      if (isCanceled(error, signal)) return;
       console.error('Failed to attack case:', error);
       if (!subError.handleSubscriptionError(error)) {
-        toast({
-          title: t('attack.failed'),
-          description: getUserFacingAIError(error),
-          variant: "destructive",
-        });
+        run.setError({ title: t('attack.failed'), description: getUserFacingAIError(error) });
       }
     } finally {
       setAttackLoading(false);
     }
   };
 
-  const handleDiscuss = async () => {
-    if (!attackResult) return;
-
-    const summary = `I'd like to discuss the critique of my case.
-    
-    **Overall Assessment:** ${attackResult.overallAssessment.summary}
-    **Score:** ${attackResult.overallAssessment.score}/100
-    
-    **Top Weaknesses:**
-    ${attackResult.weaknesses.slice(0, 3).map(w => `- ${w.description} (${w.severity})`).join('\n')}
-    
-    Can you help me improve this?`;
-
-    // 1. Add User Message
-    addAskMessage({ role: 'user', content: summary });
-
-    // 2. Navigate immediately so user sees the chat
-    navigate('/app/ask');
-
-    // 3. Trigger AI (This runs in background even after nav)
-    setAskLoading(true);
-    try {
-      // Construct history including the new message
-      const history = [...askMessages, { role: 'user', content: summary }].map(m => ({
-        role: m.role as 'user' | 'assistant',
-        content: m.content
-      }));
-
-      const result = await askChat(summary, history, 'general', askConfig);
-
-      addAskMessage({
-        role: 'assistant',
-        content: result.response,
-        output: result
-      });
-    } catch (error) {
-      console.error('Failed to discuss result:', error);
-      if (!subError.handleSubscriptionError(error)) {
-        toast({ title: t('chat.error'), description: t('chat.errorDesc'), variant: "destructive" });
-      }
-    } finally {
-      setAskLoading(false);
-    }
+  const handleDiscuss = () => {
+    if (attackResult) openDiscussion(navigate, attackDiscussPrompt(attackResult, t));
   };
 
   const handlePracticeCrossfire = () => {
@@ -120,25 +91,26 @@ export default function AttackPage() {
     <div className="container py-8 px-4">
       <WorkspaceToolScope context={workspace.context} />
       <div className="max-w-6xl mx-auto">
-        <AnimatedSection className="mb-8 flex flex-col sm:flex-row sm:items-end justify-between gap-4">
-          <div>
-            <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('nav.attack')}</h1>
-          </div>
-        </AnimatedSection>
+        <PageHeader title={t('nav.attack')} />
         <CurrentDebateStrip hidden={Boolean(workspace.context)} />
 
         <div className="grid gap-8 lg:grid-cols-[400px_minmax(0,1fr)]">
           {/* Form */}
-          <AnimatedSection delay={75} className="lg:sticky lg:top-24 lg:self-start">
+          <div className="lg:sticky lg:top-24 lg:self-start">
             <AttackForm onSubmit={handleSubmit} isLoading={attackLoading} debateContext={!workspace.context} />
-          </AnimatedSection>
+          </div>
 
           {/* Results */}
-          <div>
+          <div ref={results.ref} className="scroll-mt-24">
+            {run.error && (
+              <ToolRunErrorPanel
+                error={run.error}
+                onRetry={lastInput.current ? () => void handleSubmit(lastInput.current!) : undefined}
+                onDismiss={run.clearError}
+              />
+            )}
             {attackLoading ? (
-              <div key="attack-loading" className="motion-swap motion-shimmer flex min-h-[400px] flex-col items-center justify-center rounded-lg border-2 border-dashed border-destructive/30 bg-destructive/5 p-8">
-                <StreamingIndicator messages={[t('attackForm.loadingMsg1'), t('attackForm.loadingMsg2'), t('attackForm.loadingMsg3'), t('attackForm.loadingMsg4'), t('attackForm.loadingMsg5')]} />
-              </div>
+              <ToolRunStatus label={t('attack.working', 'Reviewing your case…')} onCancel={run.cancel} />
             ) : attackResult ? (
               <div key="attack-results">
                 <AttackResults
@@ -149,13 +121,7 @@ export default function AttackPage() {
                 />
               </div>
             ) : (
-              <div key="attack-empty" className="motion-swap flex min-h-[400px] flex-col items-center justify-center rounded-lg border-2 border-dashed border-destructive/30 bg-destructive/5 p-8 text-center">
-                <div className="text-6xl mb-4">⚔️</div>
-                <h3 className="text-lg font-semibold text-foreground mb-2">{t('attack.emptyTitle')}</h3>
-                <p className="text-sm text-muted-foreground max-w-sm">
-                  {t('attack.emptyDesc')}
-                </p>
-              </div>
+              <EmptyState icon={Swords} title={t('attack.emptyTitle')} description={t('attack.emptyDesc')} />
             )}
           </div>
         </div>
diff --git a/src/pages/BrainstormPage.tsx b/src/pages/BrainstormPage.tsx
index c342b7e1a..9bcb2468c 100644
--- a/src/pages/BrainstormPage.tsx
+++ b/src/pages/BrainstormPage.tsx
@@ -1,19 +1,22 @@
 // src/pages/BrainstormPage.tsx
-import { useState } from 'react';
+import { useRef, useState } from 'react';
+import { useShallow } from 'zustand/react/shallow';
+import { Lightbulb } from 'lucide-react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useSettingsStore } from '@/lib/stores/settings-store';
 import { BrainstormForm } from '@/components/features/brainstorm/BrainstormForm';
 import { BrainstormResults } from '@/components/features/brainstorm/BrainstormResults';
-import { brainstorm, askChat, type DiscoveredSource } from '@/lib/ai/client';
+import { brainstorm, type DiscoveredSource } from '@/lib/ai/client';
 import { useSubscriptionError } from '@/hooks/use-subscription-error';
 import { getUserFacingAIError } from '@/lib/ai/error-display';
 import { LimitReachedModal, ModelRestrictedModal, PricingModal } from '@/components/features/subscription';
 import type { BrainstormInput } from '@/lib/ai/schemas/brainstorm';
-import { useToast } from '@/hooks/use-toast';
-import { StreamingIndicator } from '@/components/ui/streaming-indicator';
-import { AnimatedSection } from '@/components/ui/animated-section';
+import { EmptyState } from '@/components/ui/empty-state';
+import { PageHeader } from '@/components/layout/PageHeader';
+import { ToolRunErrorPanel, ToolRunStatus, isCanceled, useRevealResults, useToolRun } from '@/components/features/tools/tool-run';
+import { brainstormDiscussPrompt, openDiscussion } from '@/components/features/tools/discuss';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
 import { recordInDebate } from '@/lib/debate/record';
 import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
@@ -21,12 +24,20 @@ import { useDebateMotionGate } from '@/components/features/debate/DebateMotionGa
 
 export default function BrainstormPage() {
   const workspace = useWorkspaceToolScope('brainstorm');
-  const { brainstormResult, brainstormLoading, brainstormForm, setBrainstormResult, setBrainstormLoading, addAskMessage, setAskLoading, askMessages, recordResult } = useSessionStore();
+  const { brainstormResult, brainstormLoading, brainstormForm, setBrainstormResult, setBrainstormLoading, recordResult } = useSessionStore(useShallow((state) => ({
+    brainstormResult: state.brainstormResult,
+    brainstormLoading: state.brainstormLoading,
+    brainstormForm: state.brainstormForm,
+    setBrainstormResult: state.setBrainstormResult,
+    setBrainstormLoading: state.setBrainstormLoading,
+    recordResult: state.recordResult,
+  })));
   const debateGate = useDebateMotionGate({ disabled: Boolean(workspace.context) });
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('brainstorm');
-  const askConfig = getFeatureConfig('ask');
-  const { toast } = useToast();
+  const run = useToolRun('brainstorm');
+  const results = useRevealResults();
+  const lastRun = useRef<{ data: BrainstormInput; debateId: string | null } | null>(null);
   const navigate = useNavigate();
   const subError = useSubscriptionError();
   const [discoveredSources, setDiscoveredSources] = useState<DiscoveredSource[]>([]);
@@ -36,109 +47,65 @@ export default function BrainstormPage() {
 
   const submitBrainstorm = async (data: BrainstormInput, debateId: string | null) => {
     const target = { debateId };
+    lastRun.current = { data, debateId };
+    const signal = run.start();
     setBrainstormLoading(true);
     try {
-      const { result, discoveredSources } = await brainstorm(data, config, workspace.context ?? undefined, workspace.context ? undefined : target.debateId);
+      const { result, discoveredSources } = await brainstorm(data, config, workspace.context ?? undefined, workspace.context ? undefined : target.debateId, signal);
+      // A canceled request can still resolve (its last step ignores the signal); never publish it.
+      if (signal.aborted) return;
       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' });
+      results.reveal();
     } catch (error) {
+      if (isCanceled(error, signal)) return;
       console.error('Failed to brainstorm:', error);
       if (!subError.handleSubscriptionError(error)) {
-        toast({
-          title: t('brainstorm.failed'),
-          description: getUserFacingAIError(error),
-          variant: "destructive",
-        });
+        run.setError({ title: t('brainstorm.failed'), description: getUserFacingAIError(error) });
       }
     } finally {
       setBrainstormLoading(false);
     }
   };
 
-  const handleDiscuss = async () => {
-    if (!brainstormResult) return;
-
-    // Construct summary based on available output
-    let summary = "I'd like to discuss these brainstormed ideas.\n\n";
-
-    if (brainstormResult.topFive) {
-      summary += "**Top Ideas:**\n" + brainstormResult.topFive.map((i) => {
-        const side = i.idea.side ? t(`brainstormResults.${i.idea.side}`, i.idea.side) : 'N/A';
-        return `- ${i.idea.title} (${side})`;
-      }).join('\n');
-    } else if (brainstormResult.buckets) {
-      summary += "**Key Buckets:**\n" + brainstormResult.buckets.map(b => `- ${b.name}: ${b.keyInsight}`).join('\n');
-    }
-
-    summary += "\n\nCan you help me expand on one of these?";
-
-    addAskMessage({ role: 'user', content: summary });
-    navigate('/app/ask');
-
-    setAskLoading(true);
-    try {
-      const history = [...askMessages, { role: 'user', content: summary }].map(m => ({
-        role: m.role as 'user' | 'assistant',
-        content: m.content
-      }));
-
-      const result = await askChat(summary, history, 'general', askConfig);
-
-      addAskMessage({
-        role: 'assistant',
-        content: result.response,
-        output: result
-      });
-    } catch (error) {
-      console.error('Failed to discuss result:', error);
-      if (!subError.handleSubscriptionError(error)) {
-        toast({ title: t('chat.error'), description: t('chat.errorDesc'), variant: "destructive" });
-      }
-    } finally {
-      setAskLoading(false);
-    }
+  const handleDiscuss = () => {
+    if (brainstormResult) openDiscussion(navigate, brainstormDiscussPrompt(brainstormResult, t));
   };
 
   return (
     <div className="container py-8 px-4">
       <WorkspaceToolScope context={workspace.context} />
       <div className="max-w-6xl mx-auto">
-        <AnimatedSection className="mb-8 flex flex-col sm:flex-row sm:items-end justify-between gap-4">
-          <div>
-            <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('nav.brainstorm')}</h1>
-          </div>
-        </AnimatedSection>
+        <PageHeader title={t('nav.brainstorm')} />
         <CurrentDebateStrip side={brainstormForm?.side} hidden={Boolean(workspace.context)} />
 
         <div className="grid gap-8 lg:grid-cols-[400px_minmax(0,1fr)]">
           {/* Form */}
-          <AnimatedSection delay={75} className="lg:sticky lg:top-24 lg:self-start">
+          <div className="lg:sticky lg:top-24 lg:self-start">
             <BrainstormForm onSubmit={handleSubmit} isLoading={brainstormLoading} debatePrefill={!workspace.context} />
-          </AnimatedSection>
+          </div>
 
           {/* Results */}
-          <div>
+          <div ref={results.ref} className="scroll-mt-24">
+            {run.error && (
+              <ToolRunErrorPanel
+                error={run.error}
+                onRetry={lastRun.current ? () => void submitBrainstorm(lastRun.current!.data, lastRun.current!.debateId) : undefined}
+                onDismiss={run.clearError}
+              />
+            )}
             {brainstormLoading ? (
-              <div key="brainstorm-loading" className="motion-swap motion-shimmer flex min-h-[400px] flex-col items-center justify-center rounded-lg border-2 border-dashed border-amber-500/30 bg-amber-500/5 p-8">
-                <StreamingIndicator messages={[t('brainstormForm.loadingMsg1'), t('brainstormForm.loadingMsg2'), t('brainstormForm.loadingMsg3'), t('brainstormForm.loadingMsg4'), t('brainstormForm.loadingMsg5')]} />
-              </div>
+              <ToolRunStatus label={t('brainstorm.working', 'Finding angles…')} onCancel={run.cancel} />
             ) : brainstormResult ? (
               <div key="brainstorm-results">
                 <BrainstormResults result={brainstormResult} discoveredSources={discoveredSources} onDiscuss={handleDiscuss} />
               </div>
             ) : (
-              <div key="brainstorm-empty" className="motion-swap flex min-h-[400px] flex-col items-center justify-center rounded-lg border-2 border-dashed border-amber-500/30 bg-amber-500/5 p-8 text-center">
-                <div className="text-6xl mb-4">💡</div>
-                <h3 className="text-lg font-semibold text-foreground mb-2">{t('brainstorm.emptyTitle')}</h3>
-                <p className="text-sm text-muted-foreground max-w-sm">
-                  {t('brainstorm.emptyDesc')}
-                </p>
-              </div>
+              <EmptyState icon={Lightbulb} title={t('brainstorm.emptyTitle')} description={t('brainstorm.emptyDesc')} />
             )}
           </div>
         </div>
diff --git a/src/pages/CrossfirePage.tsx b/src/pages/CrossfirePage.tsx
index 5365847ac..adc488ce4 100644
--- a/src/pages/CrossfirePage.tsx
+++ b/src/pages/CrossfirePage.tsx
@@ -52,6 +52,7 @@ import { useSessionStore } from '@/lib/stores/session-store';
 import { useSettingsStore } from '@/lib/stores/settings-store';
 import { useAuth } from '@/lib/supabase/AuthProvider';
 import { cn } from '@/lib/utils';
+import { ClockAnnouncer, RoundClock } from '@/components/features/practice/RoundClock';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
 import { CurrentDebateStrip, useDebateMotionPrefill } from '@/components/features/debate/CurrentDebateStrip';
 import { DebateContextControl } from '@/components/features/debate/DebateContextControl';
@@ -114,11 +115,38 @@ function restoreState(userId: string | undefined, prefill: CrossfirePrefill | un
   } : undefined));
 }
 
-function formatRemaining(milliseconds: number): string {
-  const totalSeconds = Math.max(0, Math.ceil(milliseconds / 1_000));
-  const minutes = Math.floor(totalSeconds / 60);
-  const seconds = totalSeconds % 60;
-  return `${minutes}:${String(seconds).padStart(2, '0')}`;
+/**
+ * The live round clock ticks on its own, so the page doesn't re-render twice a second
+ * during a round. It calls onExpire once when time runs out.
+ */
+function CrossfireClock({ endsAt, onExpire }: { endsAt: number; onExpire: () => void }) {
+  const { t } = useTranslation();
+  const [now, setNow] = useState(() => Date.now());
+  const expireRef = useRef(onExpire);
+  expireRef.current = onExpire;
+  const firedRef = useRef(false);
+  useEffect(() => {
+    firedRef.current = false;
+    const tick = () => {
+      const current = Date.now();
+      setNow(current);
+      if (current >= endsAt && !firedRef.current) {
+        firedRef.current = true;
+        expireRef.current();
+      }
+    };
+    tick();
+    const interval = window.setInterval(tick, 250);
+    return () => window.clearInterval(interval);
+  }, [endsAt]);
+  const seconds = Math.max(0, Math.ceil((endsAt - now) / 1_000));
+  return (
+    <div className="rounded-lg border border-border bg-card px-4 py-2 text-center">
+      <span className="flex items-center gap-2 text-xs text-muted-foreground"><Clock3 className="h-3.5 w-3.5" aria-hidden="true" />{t('crossfire.timerLabel')}</span>
+      <RoundClock secondsLeft={seconds} label={t('crossfire.timerLabel')} className="mt-0.5 block text-xl" />
+      <ClockAnnouncer secondsLeft={seconds} running />
+    </div>
+  );
 }
 
 function handleRadioKeys<T extends string>(
@@ -313,7 +341,6 @@ export default function CrossfirePage() {
   }, []);
   const stateRef = useRef(state);
   stateRef.current = state;
-  const [now, setNow] = useState(Date.now());
   const [formError, setFormError] = useState('');
   const [storageError, setStorageError] = useState(false);
   const [stateOwnerId, setStateOwnerId] = useState(user?.id);
@@ -418,12 +445,6 @@ export default function CrossfirePage() {
     }).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());
-    const interval = window.setInterval(() => setNow(Date.now()), 500);
-    return () => window.clearInterval(interval);
-  }, [state.phase]);
 
   const runNextTurn = useCallback(async (
     snapshot: Extract<CrossfireState, { phase: 'active' }>,
@@ -526,9 +547,6 @@ export default function CrossfirePage() {
     if (next.phase === 'debriefing') void runDebrief(next);
   }, [runDebrief, state, t]);
 
-  useEffect(() => {
-    if (state.phase === 'active' && now >= state.endsAt) endSession('timer');
-  }, [endSession, now, state]);
 
   const startSession = () => {
     if (state.phase !== 'setup') return;
@@ -907,7 +925,8 @@ export default function CrossfirePage() {
   }
 
   const inputKind = expectedUserTurnKind(state);
-  const remaining = state.endsAt - now;
+  // The composer stays open while the AI works, so the next turn can be drafted; only sending waits.
+  const composerKind = inputKind ?? (state.config.mode === 'question-ai' ? 'question' : state.turns.length > 0 ? 'answer' : null);
   return (
     <div className={cn(stateMotionClass, 'container px-4 py-6 md:py-8')}>
       <WorkspaceToolScope context={workspace.context} />
@@ -919,12 +938,10 @@ export default function CrossfirePage() {
               <Badge variant="secondary">{t(`crossfire.style${state.config.style[0].toUpperCase()}${state.config.style.slice(1)}`)}</Badge>
             </div>
             <h1 className="mt-3 text-2xl font-bold tracking-tight">{t('crossfire.title')}</h1>
+            <p className="mt-1 max-w-3xl break-words text-sm text-muted-foreground">{state.config.resolution}</p>
           </div>
           <div className="flex items-center gap-3">
-            <div className="rounded-lg border border-border bg-card px-4 py-2 text-center" role="timer" aria-label={t('crossfire.timerLabel')}>
-              <span className="flex items-center gap-2 text-xs text-muted-foreground"><Clock3 className="h-3.5 w-3.5" />{t('crossfire.timerLabel')}</span>
-              <span className="mt-0.5 block font-mono text-xl font-semibold tabular-nums">{formatRemaining(remaining)}</span>
-            </div>
+            <CrossfireClock endsAt={state.endsAt} onExpire={() => endSession('timer')} />
             <Button data-testid="end-crossfire" variant="outline" disabled={!canEndCrossfireSession(state)} onClick={() => endSession('manual')}>
               {t('crossfire.endSession')}
             </Button>
@@ -965,10 +982,10 @@ export default function CrossfirePage() {
           </div>
         )}
 
-        {inputKind && (
+        {composerKind && (
           <Card>
             <CardContent className="space-y-3 p-4 sm:p-5">
-              <Label htmlFor="crossfire-input">{inputKind === 'question' ? t('crossfire.questionLabel') : t('crossfire.answerLabel')}</Label>
+              <Label htmlFor="crossfire-input">{composerKind === 'question' ? t('crossfire.questionLabel') : t('crossfire.answerLabel')}</Label>
               {voiceActive && <VoiceMicControl capture={capture} onStart={startSpeaking} onStop={() => void stopCapture()} />}
               <Textarea
                 id="crossfire-input"
@@ -982,14 +999,14 @@ export default function CrossfirePage() {
                     void submitTurn();
                   }
                 }}
-                placeholder={voiceActive ? t('voiceRound.mic.draftPlaceholder') : inputKind === 'question' ? t('crossfire.questionPlaceholder') : t('crossfire.answerPlaceholder')}
+                placeholder={voiceActive ? t('voiceRound.mic.draftPlaceholder') : composerKind === 'question' ? t('crossfire.questionPlaceholder') : t('crossfire.answerPlaceholder')}
                 className="min-h-28 resize-y"
               />
               <div className="flex flex-col-reverse gap-2 sm:flex-row sm:items-center sm:justify-between">
                 <span className="text-xs text-muted-foreground">{t('crossfire.charactersRemaining', { count: MAX_CROSSFIRE_TURN_CHARS - draftTurn.length })}</span>
-                <Button data-testid="submit-turn" onClick={() => void submitTurn()} disabled={!draftTurn.trim() && !listening}>
+                <Button data-testid="submit-turn" onClick={() => void submitTurn()} disabled={!inputKind || (!draftTurn.trim() && !listening)}>
                   <Send className="mr-2 h-4 w-4" />
-                  {inputKind === 'question' ? t('crossfire.submitQuestion') : t('crossfire.submitAnswer')}
+                  {composerKind === 'question' ? t('crossfire.submitQuestion') : t('crossfire.submitAnswer')}
                 </Button>
               </div>
             </CardContent>
@@ -1000,6 +1017,8 @@ export default function CrossfirePage() {
   );
 }
 
+const NEW_TURN_MS = 1_000;
+
 function Transcript({ turns, reduceMotion }: { turns: CrossfireTurn[]; reduceMotion: boolean | null }) {
   const { t } = useTranslation();
   return (
@@ -1016,9 +1035,11 @@ function Transcript({ turns, reduceMotion }: { turns: CrossfireTurn[]; reduceMot
             <motion.article
               key={turn.id}
               id={`crossfire-turn-${turn.id}`}
-              initial={reduceMotion ? false : { opacity: 0, y: 8 }}
-              animate={{ opacity: 1, y: 0 }}
-              transition={{ duration: reduceMotion ? 0 : 0.18 }}
+              // Only a turn that just arrived fades in; a phase change re-renders the
+              // transcript without replaying every card.
+              initial={reduceMotion || Date.now() - turn.createdAt > NEW_TURN_MS ? false : { opacity: 0, transform: 'translateY(4px)' }}
+              animate={{ opacity: 1, transform: 'translateY(0px)' }}
+              transition={{ duration: 0.15, ease: [0.23, 1, 0.32, 1] }}
               className={cn(
                 'scroll-mt-24 rounded-lg border p-4',
                 turn.speaker === 'user' ? 'ml-auto max-w-[92%] border-primary/25 bg-primary/5' : 'mr-auto max-w-[92%] border-border bg-card',
diff --git a/src/pages/FactoidsPage.tsx b/src/pages/FactoidsPage.tsx
index 0431c0d1f..fd5a86e43 100644
--- a/src/pages/FactoidsPage.tsx
+++ b/src/pages/FactoidsPage.tsx
@@ -1,18 +1,22 @@
-import { useState } from 'react';
+import { useRef, useState } from 'react';
+import { useShallow } from 'zustand/react/shallow';
+import { BookOpen } from 'lucide-react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useSettingsStore } from '@/lib/stores/settings-store';
 import { FactoidsForm } from '@/components/features/factoids/FactoidsForm';
 import { FactoidsResults } from '@/components/features/factoids/FactoidsResults';
-import { factoids, askChat, type DiscoveredSource } from '@/lib/ai/client';
+import { factoids, type DiscoveredSource } from '@/lib/ai/client';
 import { useSubscriptionError } from '@/hooks/use-subscription-error';
 import { getUserFacingAIError } from '@/lib/ai/error-display';
 import { LimitReachedModal, ModelRestrictedModal, PricingModal } from '@/components/features/subscription';
 import type { FactoidsInput } from '@/lib/ai/schemas/factoids';
 import { useToast } from '@/hooks/use-toast';
-import { StreamingIndicator } from '@/components/ui/streaming-indicator';
-import { AnimatedSection } from '@/components/ui/animated-section';
+import { EmptyState } from '@/components/ui/empty-state';
+import { PageHeader } from '@/components/layout/PageHeader';
+import { ToolRunErrorPanel, ToolRunStatus, isCanceled, useRevealResults, useToolRun } from '@/components/features/tools/tool-run';
+import { factoidsDiscussPrompt, openDiscussion } from '@/components/features/tools/discuss';
 import { WorkspaceToolScope, useWorkspaceToolScope } from '@/components/features/workspace/WorkspaceToolScope';
 import { recordInDebate } from '@/lib/debate/record';
 import { CurrentDebateStrip } from '@/components/features/debate/CurrentDebateStrip';
@@ -21,38 +25,50 @@ 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, recordResult } = useSessionStore();
+  const { factoidsResult, factoidsLoading, factoidsForm, setFactoidsResult, setFactoidsLoading, addSource, setFactoidsForm, recordResult } = useSessionStore(useShallow((state) => ({
+    factoidsResult: state.factoidsResult,
+    factoidsLoading: state.factoidsLoading,
+    factoidsForm: state.factoidsForm,
+    setFactoidsResult: state.setFactoidsResult,
+    setFactoidsLoading: state.setFactoidsLoading,
+    addSource: state.addSource,
+    setFactoidsForm: state.setFactoidsForm,
+    recordResult: state.recordResult,
+  })));
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('factoids');
-  const askConfig = getFeatureConfig('ask');
   const { toast } = useToast();
+  const run = useToolRun('factoids');
+  const results = useRevealResults();
+  const lastInput = useRef<FactoidsInput | null>(null);
   const navigate = useNavigate();
   const subError = useSubscriptionError();
   const { t } = useTranslation();
   const [discoveredSources, setDiscoveredSources] = useState<DiscoveredSource[]>([]);
 
   const handleSubmit = async (data: FactoidsInput) => {
+    lastInput.current = data;
+    const signal = run.start();
     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, workspace.context ? undefined : debateId);
+      const { result, discoveredSources: sources } = await factoids(data, config, workspace.context ?? undefined, workspace.context ? undefined : debateId, signal);
+      // A canceled request can still resolve (its last step ignores the signal); never publish it.
+      if (signal.aborted) return;
       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' });
+      results.reveal();
     } catch (error) {
+      if (isCanceled(error, signal)) return;
       console.error('Failed to find factoids:', error);
       if (!subError.handleSubscriptionError(error)) {
-        toast({
-          title: t('factoids.failed'),
-          description: getUserFacingAIError(error),
-          variant: "destructive",
-        });
+        run.setError({ title: t('factoids.failed'), description: getUserFacingAIError(error) });
       }
     } finally {
       setFactoidsLoading(false);
@@ -85,66 +101,34 @@ export default function FactoidsPage() {
     }
   };
 
-  const handleDiscuss = async () => {
-    if (!factoidsResult) return;
-
-    const summary = `I'd like to discuss the evidence I found.
-    
-    **Factoids:**
-    ${factoidsResult.factoids.slice(0, 3).map(f => `- ${f.shortClaim} (${f.citation.publisher})`).join('\n')}
-    
-    How can I best use this evidence?`;
-
-    addAskMessage({ role: 'user', content: summary });
-    navigate('/app/ask');
-
-    setAskLoading(true);
-    try {
-      const history = [...askMessages, { role: 'user', content: summary }].map(m => ({
-        role: m.role as 'user' | 'assistant',
-        content: m.content
-      }));
-
-      const result = await askChat(summary, history, 'general', askConfig);
-
-      addAskMessage({
-        role: 'assistant',
-        content: result.response,
-        output: result
-      });
-    } catch (error) {
-      console.error('Failed to discuss result:', error);
-      if (!subError.handleSubscriptionError(error)) {
-        toast({ title: t('chat.error'), description: t('chat.errorDesc'), variant: "destructive" });
-      }
-    } finally {
-      setAskLoading(false);
-    }
+  const handleDiscuss = () => {
+    if (factoidsResult) openDiscussion(navigate, factoidsDiscussPrompt(factoidsResult, t));
   };
 
   return (
     <div className="container py-8 px-4">
       <WorkspaceToolScope context={workspace.context} />
       <div className="max-w-6xl mx-auto">
-        <AnimatedSection className="mb-8 flex flex-col sm:flex-row sm:items-end justify-between gap-4">
-          <div>
-            <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('nav.factoids')}</h1>
-          </div>
-        </AnimatedSection>
+        <PageHeader title={t('nav.factoids')} />
         <CurrentDebateStrip hidden={Boolean(workspace.context)} />
 
         <div className="grid gap-8 lg:grid-cols-[400px_minmax(0,1fr)]">
           {/* Form */}
-          <AnimatedSection delay={75} className="lg:sticky lg:top-24 lg:self-start">
+          <div className="lg:sticky lg:top-24 lg:self-start">
             <FactoidsForm onSubmit={handleSubmit} isLoading={factoidsLoading} debateContext={!workspace.context} />
-          </AnimatedSection>
+          </div>
 
           {/* Results */}
-          <div>
+          <div ref={results.ref} className="scroll-mt-24">
+            {run.error && (
+              <ToolRunErrorPanel
+                error={run.error}
+                onRetry={lastInput.current ? () => void handleSubmit(lastInput.current!) : undefined}
+                onDismiss={run.clearError}
+              />
+            )}
             {factoidsLoading ? (
-              <div key="factoids-loading" className="motion-swap motion-shimmer flex min-h-[400px] flex-col items-center justify-center rounded-lg border-2 border-dashed border-secondary/30 bg-secondary/5 p-8">
-                <StreamingIndicator messages={[t('factoidsForm.loadingMsg1'), t('factoidsForm.loadingMsg2'), t('factoidsForm.loadingMsg3'), t('factoidsForm.loadingMsg4'), t('factoidsForm.loadingMsg5')]} />
-              </div>
+              <ToolRunStatus label={t('factoids.working', 'Searching for evidence…')} onCancel={run.cancel} />
             ) : factoidsResult ? (
               <div key="factoids-results">
                 <FactoidsResults
@@ -156,13 +140,7 @@ export default function FactoidsPage() {
                 />
               </div>
             ) : (
-              <div key="factoids-empty" className="motion-swap flex min-h-[400px] flex-col items-center justify-center rounded-lg border-2 border-dashed border-secondary/30 bg-secondary/5 p-8 text-center">
-                <div className="text-6xl mb-4">📚</div>
-                <h3 className="text-lg font-semibold text-foreground mb-2">{t('factoids.emptyTitle')}</h3>
-                <p className="text-sm text-muted-foreground max-w-sm">
-                  {t('factoids.emptyDesc')}
-                </p>
-              </div>
+              <EmptyState icon={BookOpen} title={t('factoids.emptyTitle')} description={t('factoids.emptyDesc')} />
             )}
           </div>
         </div>
diff --git a/src/pages/FlowchartPage.tsx b/src/pages/FlowchartPage.tsx
index 077ca55b3..97239ef82 100644
--- a/src/pages/FlowchartPage.tsx
+++ b/src/pages/FlowchartPage.tsx
@@ -1,5 +1,5 @@
 // src/pages/FlowchartPage.tsx
-import { useCallback, useMemo, useState, useEffect } from 'react';
+import { useCallback, useMemo, useRef, useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import ReactFlow, {
     Node,
@@ -19,10 +19,12 @@ import ReactFlow, {
     useReactFlow,
     useStore,
     useStoreApi,
+    type ReactFlowInstance,
 } from 'reactflow';
 import 'reactflow/dist/style.css';
 import { useSessionStore, FlowchartData } from '@/lib/stores/session-store';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { PageHeader } from '@/components/layout/PageHeader';
 import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
 import { Input } from '@/components/ui/input';
@@ -44,16 +46,6 @@ import {
     DialogTitle,
     DialogTrigger,
 } from '@/components/ui/dialog';
-import {
-    AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
 import {
     Plus,
     Download,
@@ -151,6 +143,12 @@ function LocalizedControls() {
     );
 }
 
+// 12px handles get an invisible 44px hit area on touch.
+const HANDLE_CLASS = "!bg-white/50 !w-3 !h-3 !border-2 !border-white/80 pointer-coarse:after:absolute pointer-coarse:after:-inset-4 pointer-coarse:after:content-['']";
+
+// Edges are static; rebuttals are dashed so they read apart from support without motion.
+const REBUTTAL_DASH = '6 4';
+
 // Custom node component
 function CustomNode({ data }: { data: FlowNodeData }) {
     const { t } = useTranslation();
@@ -166,7 +164,7 @@ function CustomNode({ data }: { data: FlowNodeData }) {
         <div
             className={`px-4 py-3 shadow-lg rounded-lg border-2 ${colors.border} ${colors.bg} ${colors.text} min-w-[150px] max-w-[250px] relative`}
         >
-            <Handle type="target" position={Position.Top} className="!bg-white/50 !w-3 !h-3 !border-2 !border-white/80" />
+            <Handle type="target" position={Position.Top} className={HANDLE_CLASS} />
             <div className="flex items-center gap-2 mb-1">
                 {nodeIcons[data.type]}
                 <Badge variant="secondary" className="text-xs uppercase bg-white/20">
@@ -190,7 +188,7 @@ function CustomNode({ data }: { data: FlowNodeData }) {
                     {t(strengthTranslationKeys[data.strength])}
                 </Badge>
             )}
-            <Handle type="source" position={Position.Bottom} className="!bg-white/50 !w-3 !h-3 !border-2 !border-white/80" />
+            <Handle type="source" position={Position.Bottom} className={HANDLE_CLASS} />
         </div>
     );
 }
@@ -199,10 +197,10 @@ const nodeTypes = {
     custom: CustomNode,
 };
 
-const edgeStyles: Record<EdgeKind, { label: string; stroke: string }> = {
+const edgeStyles: Record<EdgeKind, { label: string; stroke: string; dash?: string }> = {
     support: { label: 'Support', stroke: '#10b981' },
     attack: { label: 'Attack', stroke: '#ef4444' },
-    rebuttal: { label: 'Rebuttal', stroke: '#3b82f6' },
+    rebuttal: { label: 'Rebuttal', stroke: '#3b82f6', dash: REBUTTAL_DASH },
 };
 
 // Initial sample data
@@ -248,11 +246,11 @@ function createInitialNodes(t: TFunction): Node<FlowNodeData>[] {
 }
 
 const initialEdges: Edge[] = [
-    { id: 'e-thesis-c1', source: 'thesis', target: 'c1', animated: true, markerEnd: { type: MarkerType.ArrowClosed } },
-    { id: 'e-thesis-c2', source: 'thesis', target: 'c2', animated: true, markerEnd: { type: MarkerType.ArrowClosed } },
-    { id: 'e-thesis-c3', source: 'thesis', target: 'c3', animated: true, markerEnd: { type: MarkerType.ArrowClosed } },
+    { id: 'e-thesis-c1', source: 'thesis', target: 'c1', markerEnd: { type: MarkerType.ArrowClosed } },
+    { id: 'e-thesis-c2', source: 'thesis', target: 'c2', markerEnd: { type: MarkerType.ArrowClosed } },
+    { id: 'e-thesis-c3', source: 'thesis', target: 'c3', markerEnd: { type: MarkerType.ArrowClosed } },
     { id: 'e-c1-a1', source: 'c1', target: 'a1', style: { stroke: '#ef4444' }, markerEnd: { type: MarkerType.ArrowClosed } },
-    { id: 'e-a1-r1', source: 'a1', target: 'r1', style: { stroke: '#3b82f6' }, markerEnd: { type: MarkerType.ArrowClosed } },
+    { id: 'e-a1-r1', source: 'a1', target: 'r1', style: { stroke: '#3b82f6', strokeDasharray: REBUTTAL_DASH }, markerEnd: { type: MarkerType.ArrowClosed } },
 ];
 
 export default function FlowchartPage() {
@@ -277,13 +275,24 @@ export default function FlowchartPage() {
     const [saveTitle, setSaveTitle] = useState('');
     const [isLoadDialogOpen, setIsLoadDialogOpen] = useState(false);
 
+    // Node ids repeat across charts, so a node's Undo belongs to the chart it was deleted
+    // from: loading another chart retires that Undo.
+    const chartVersion = useRef(0);
+    const nodeUndoToast = useRef<string | number | null>(null);
+    const replaceChart = useCallback((data: FlowchartData) => {
+        chartVersion.current += 1;
+        if (nodeUndoToast.current !== null) toast.dismiss(nodeUndoToast.current);
+        nodeUndoToast.current = null;
+        setNodes(data.nodes);
+        setEdges(data.edges);
+    }, [setNodes, setEdges]);
+
     useEffect(() => {
         if (pendingFlowchartData) {
-            setNodes(pendingFlowchartData.nodes);
-            setEdges(pendingFlowchartData.edges);
+            replaceChart(pendingFlowchartData);
             setPendingFlowchartData(null);
         }
-    }, [pendingFlowchartData, setNodes, setEdges, setPendingFlowchartData]);
+    }, [pendingFlowchartData, replaceChart, setPendingFlowchartData]);
 
     const [isAddDialogOpen, setIsAddDialogOpen] = useState(false);
     const [newNodeLabel, setNewNodeLabel] = useState('');
@@ -291,7 +300,9 @@ export default function FlowchartPage() {
     const [newNodeType, setNewNodeType] = useState<NodeType>('contention');
     const [newNodeStrength, setNewNodeStrength] = useState<'strong' | 'moderate' | 'weak'>('moderate');
     const [selectedNode, setSelectedNode] = useState<string | null>(null);
-    const [isDeleteNodeDialogOpen, setIsDeleteNodeDialogOpen] = useState(false);
+    const [flowInstance, setFlowInstance] = useState<ReactFlowInstance | null>(null);
+    const canvasRef = useRef<HTMLDivElement>(null);
+    const [layoutAnimating, setLayoutAnimating] = useState(false);
     const [editingNodeId, setEditingNodeId] = useState<string | null>(null);
     const [selectedEdgeType, setSelectedEdgeType] = useState<EdgeKind>('support');
 
@@ -302,9 +313,8 @@ export default function FlowchartPage() {
                 addEdge(
                     {
                         ...connection,
-                        animated: true,
                         label: edgeStyle.label,
-                        style: { stroke: edgeStyle.stroke, strokeWidth: 2 },
+                        style: { stroke: edgeStyle.stroke, strokeWidth: 2, ...(edgeStyle.dash ? { strokeDasharray: edgeStyle.dash } : {}) },
                         markerEnd: { type: MarkerType.ArrowClosed },
                     },
                     eds
@@ -337,10 +347,15 @@ export default function FlowchartPage() {
             );
             setEditingNodeId(null);
         } else {
+            // A new node appears in the middle of what the user is looking at.
+            const rect = canvasRef.current?.getBoundingClientRect();
+            const centre = rect && flowInstance
+                ? flowInstance.screenToFlowPosition({ x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 })
+                : { x: 400, y: 250 };
             const newNode: Node<FlowNodeData> = {
                 id: `node-${Date.now()}`,
                 type: 'custom',
-                position: { x: Math.random() * 400 + 100, y: Math.random() * 300 + 100 },
+                position: { x: centre.x - 100, y: centre.y - 40 },
                 data: {
                     label: newNodeLabel,
                     description: newNodeDescription,
@@ -354,7 +369,7 @@ export default function FlowchartPage() {
         setNewNodeLabel('');
         setNewNodeDescription('');
         setIsAddDialogOpen(false);
-    }, [newNodeLabel, newNodeDescription, newNodeType, newNodeStrength, editingNodeId, setNodes]);
+    }, [newNodeLabel, newNodeDescription, newNodeType, newNodeStrength, editingNodeId, setNodes, flowInstance]);
 
     const handleSaveFlowchart = async () => {
         if (!saveTitle.trim()) return;
@@ -372,20 +387,39 @@ export default function FlowchartPage() {
     };
 
     const handleLoadFlowchart = (data: FlowchartData) => {
-        setNodes(data.nodes);
-        setEdges(data.edges);
+        replaceChart(data);
         setSelectedNode(null);
         setIsLoadDialogOpen(false);
         toast.success(t('flowchart.loadedToast'));
     };
 
-    const handleDeleteFlowchart = async (id: string, e: React.MouseEvent) => {
+    // A saved flowchart can be saved again exactly, so delete acts at once and offers Undo.
+    // One delete per chart at a time: a second click while the first is in flight would
+    // offer a second Undo, and two Undos would save two copies.
+    const [deletingFlowchartIds, setDeletingFlowchartIds] = useState<ReadonlySet<string>>(new Set());
+    const handleDeleteFlowchart = async (item: (typeof savedFlowcharts)[number], e: React.MouseEvent) => {
         e.stopPropagation();
+        if (deletingFlowchartIds.has(item.id)) return;
+        setDeletingFlowchartIds((ids) => new Set(ids).add(item.id));
         try {
-            await deleteSavedFlowchart(id);
-            toast.success(t('flowchart.deletedToast'));
-        } catch (error) {
+            await deleteSavedFlowchart(item.id);
+            toast(t('flowchart.deletedNamed', { title: item.title, defaultValue: 'Deleted {{title}}' }), {
+                action: {
+                    label: t('common.undo', 'Undo'),
+                    onClick: () => {
+                        void saveFlowchart(item.title, item.data, item.debateId ?? null)
+                            .catch(() => toast.error(t('flowchart.restoreFailed', 'Could not restore the flowchart')));
+                    },
+                },
+            });
+        } catch {
             toast.error(t('flowchart.deleteFailedToast'));
+        } finally {
+            setDeletingFlowchartIds((ids) => {
+                const next = new Set(ids);
+                next.delete(item.id);
+                return next;
+            });
         }
     };
 
@@ -409,14 +443,27 @@ export default function FlowchartPage() {
         setIsAddDialogOpen(true);
     }, []);
 
+    // Deleting a node acts at once; Undo puts the node and its edges back.
     const deleteSelectedNode = useCallback(() => {
         if (!selectedNode || selectedNode === 'thesis') return;
+        const removedNode = nodes.find((n) => n.id === selectedNode);
+        if (!removedNode) return;
+        const removedEdges = edges.filter((e) => e.source === selectedNode || e.target === selectedNode);
         setNodes((nds) => nds.filter((n) => n.id !== selectedNode));
         setEdges((eds) => eds.filter((e) => e.source !== selectedNode && e.target !== selectedNode));
         setSelectedNode(null);
-        setIsDeleteNodeDialogOpen(false);
-        toast.success(t('flowchart.nodeDeletedToast'));
-    }, [selectedNode, setNodes, setEdges, t]);
+        const version = chartVersion.current;
+        nodeUndoToast.current = toast(t('flowchart.nodeDeletedNamed', { label: removedNode.data.label, defaultValue: 'Deleted {{label}}' }), {
+            action: {
+                label: t('common.undo', 'Undo'),
+                onClick: () => {
+                    if (chartVersion.current !== version) return;
+                    setNodes((nds) => (nds.some((n) => n.id === removedNode.id) ? nds : [...nds, removedNode]));
+                    setEdges((eds) => [...eds, ...removedEdges.filter((edge) => !eds.some((e) => e.id === edge.id))]);
+                },
+            },
+        });
+    }, [selectedNode, nodes, edges, setNodes, setEdges, t]);
 
     const autoLayout = useCallback(() => {
         const lanes: Record<NodeType, number> = {
@@ -432,6 +479,9 @@ export default function FlowchartPage() {
             return acc;
         }, {} as Record<NodeType, string[]>);
 
+        // Nodes glide to their lanes (a transition only while laying out, so dragging stays direct),
+        // and the view fits the result in step.
+        setLayoutAnimating(true);
         setNodes((currentNodes) => currentNodes.map((node) => {
             const group = grouped[node.data.type] || [node.id];
             const index = group.indexOf(node.id);
@@ -439,10 +489,9 @@ export default function FlowchartPage() {
             const x = 400 + (index - (group.length - 1) / 2) * spacing;
             return { ...node, position: { x, y: lanes[node.data.type] } };
         }));
-        window.setTimeout(() => {
-            document.querySelector('.react-flow__controls-fitview')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
-        }, 80);
-    }, [nodes, setNodes]);
+        requestAnimationFrame(() => void flowInstance?.fitView({ duration: 250, padding: 0.2 }));
+        window.setTimeout(() => setLayoutAnimating(false), 300);
+    }, [nodes, setNodes, flowInstance]);
 
     const exportToPng = useCallback(() => {
         const flowElement = document.querySelector('.react-flow') as HTMLElement;
@@ -476,19 +525,12 @@ export default function FlowchartPage() {
     }, [nodes]);
 
     return (
-        <div className="space-y-6">
+        <div className="container space-y-6 px-4 py-8">
             <WorkspaceToolScope context={workspace.context} />
+            <PageHeader className="mb-0" title={t('flowchart.title')} />
             <Card>
-                <CardHeader className="bg-gradient-to-br from-primary/5 to-transparent">
+                <CardHeader className="pb-4">
                     <div className="flex flex-wrap items-center justify-between gap-3">
-                        <div className="flex items-center gap-3">
-                            <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-primary/10">
-                                <GitBranch className="h-5 w-5 text-primary" />
-                            </div>
-                            <div>
-                                <CardTitle>{t('flowchart.title')}</CardTitle>
-                            </div>
-                        </div>
                         <div className="flex flex-wrap gap-2">
                             {/* Load Dialog */}
                             <Dialog open={isLoadDialogOpen} onOpenChange={setIsLoadDialogOpen}>
@@ -512,35 +554,32 @@ export default function FlowchartPage() {
                                             </div>
                                         ) : (
                                             savedFlowcharts.map((item) => (
+                                                // Load and Delete are sibling buttons, not a button inside a clickable row,
+                                                // so no click or key press on one can reach the other.
                                                 <div
                                                     key={item.id}
-                                                    className="flex items-center justify-between p-3 rounded-lg border bg-card hover:bg-accent/50 cursor-pointer transition-colors"
-                                                    onClick={() => handleLoadFlowchart(item.data)}
-                                                    role="button"
-                                                    tabIndex={0}
-                                                    onKeyDown={(event) => {
-                                                        if (event.key === 'Enter' || event.key === ' ') {
-                                                            event.preventDefault();
-                                                            handleLoadFlowchart(item.data);
-                                                        }
-                                                    }}
+                                                    className="flex items-center gap-2 rounded-lg border bg-card p-1 pr-2 transition-colors hover:bg-accent/50"
                                                 >
-                                                    <div className="space-y-1">
-                                                        <div className="font-medium">{item.title}</div>
+                                                    <button
+                                                        type="button"
+                                                        className="min-w-0 flex-1 space-y-1 rounded-md p-2 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                                                        onClick={() => handleLoadFlowchart(item.data)}
+                                                    >
+                                                        <div className="font-medium break-words">{item.title}</div>
                                                         <div className="text-xs text-muted-foreground flex items-center gap-1">
                                                             <Clock className="h-3 w-3" />
                                                             {formatRelativeDate(item.createdAt)}
                                                         </div>
-                                                    </div>
+                                                    </button>
                                                     <Button
                                                         variant="ghost"
                                                         size="icon"
-                                                        className="h-8 w-8 text-destructive opacity-70 hover:opacity-100"
+                                                        className="h-9 w-9 shrink-0 text-destructive"
+                                                        disabled={deletingFlowchartIds.has(item.id)}
                                                         onClick={(e) => {
-                                                            e.stopPropagation();
-                                                            void handleDeleteFlowchart(item.id, e);
+                                                            void handleDeleteFlowchart(item, e);
                                                         }}
-                                                        aria-label={t('common.delete', 'Delete')}
+                                                        aria-label={t('flowchart.deleteNamed', { title: item.title, defaultValue: 'Delete {{title}}' })}
                                                     >
                                                         <Trash2 className="h-4 w-4" />
                                                     </Button>
@@ -660,7 +699,7 @@ export default function FlowchartPage() {
                                         <GitBranch className="h-4 w-4 mr-2" />
                                         {t('flowchart.edit')}
                                     </Button>
-                                    <Button variant="destructive" size="sm" onClick={() => setIsDeleteNodeDialogOpen(true)}>
+                                    <Button variant="destructive" size="sm" onClick={deleteSelectedNode}>
                                         <Trash2 className="h-4 w-4 mr-2" />
                                         {t('flowchart.delete')}
                                     </Button>
@@ -733,7 +772,7 @@ export default function FlowchartPage() {
                                                 {t('flowchart.edit')}
                                             </Button>
                                             {selectedNode !== 'thesis' && (
-                                                <Button variant="destructive" size="sm" onClick={() => setIsDeleteNodeDialogOpen(true)}>
+                                                <Button variant="destructive" size="sm" onClick={deleteSelectedNode}>
                                                     <Trash2 className="h-4 w-4 mr-2" />
                                                     {t('flowchart.delete')}
                                                 </Button>
@@ -746,8 +785,12 @@ export default function FlowchartPage() {
                     )}
 
                     {/* Flow Canvas */}
-                    <div className="h-[50vh] min-h-[400px] w-full">
+                    <div ref={canvasRef} className={`h-[50vh] min-h-[400px] w-full${layoutAnimating ? ' flow-layout-animating' : ''}`}>
                         <ReactFlow
+                            onInit={setFlowInstance}
+                            // The page scrolls under the wheel; zoom uses pinch, the controls, or Ctrl+wheel.
+                            zoomOnScroll={false}
+                            preventScrolling={false}
                             nodes={nodes}
                             edges={edges}
                             onNodesChange={onNodesChange}
@@ -781,27 +824,6 @@ export default function FlowchartPage() {
                 </CardContent>
             </Card>
 
-            <AlertDialog open={isDeleteNodeDialogOpen} onOpenChange={setIsDeleteNodeDialogOpen}>
-                <AlertDialogContent style={{ zIndex: 51 }}>
-                    <AlertDialogHeader>
-                        <AlertDialogTitle>{t('flowchart.deleteNodeTitle')}</AlertDialogTitle>
-                        <AlertDialogDescription>
-                            {t('flowchart.deleteNodeDescription', {
-                                label: nodes.find((node) => node.id === selectedNode)?.data.label,
-                            })}
-                        </AlertDialogDescription>
-                    </AlertDialogHeader>
-                    <AlertDialogFooter>
-                        <AlertDialogCancel>{t('flowchart.deleteNodeCancel')}</AlertDialogCancel>
-                        <AlertDialogAction
-                            onClick={deleteSelectedNode}
-                            className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
-                        >
-                            {t('flowchart.deleteNodeConfirm')}
-                        </AlertDialogAction>
-                    </AlertDialogFooter>
-                </AlertDialogContent>
-            </AlertDialog>
 
             {/* Legend */}
             <Card>
diff --git a/src/pages/GeneratePage.tsx b/src/pages/GeneratePage.tsx
index d92b4a7bf..3819c6220 100644
--- a/src/pages/GeneratePage.tsx
+++ b/src/pages/GeneratePage.tsx
@@ -1,12 +1,13 @@
 // src/pages/GeneratePage.tsx
-import { useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
+import { useShallow } from 'zustand/react/shallow';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useSessionStore } from '@/lib/stores/session-store';
 import { useSettingsStore } from '@/lib/stores/settings-store';
 import { GenerateForm } from '@/components/features/generate/GenerateForm';
 import { GenerateResults } from '@/components/features/generate/GenerateResults';
-import { generateCase, askChat, isAIAuthError, isAIRateLimitError, isTimeoutError, type DiscoveredSource } from '@/lib/ai/client';
+import { generateCase, isAIAuthError, isAIRateLimitError, isTimeoutError, type DiscoveredSource } from '@/lib/ai/client';
 import type { GenerateInput } from '@/lib/ai/schemas/generate';
 import { useToast } from '@/hooks/use-toast';
 import { useSubscriptionError } from '@/hooks/use-subscription-error';
@@ -18,11 +19,12 @@ import { Button } from '@/components/ui/button';
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
-import { Save } from 'lucide-react';
-import { StreamingIndicator } from '@/components/ui/streaming-indicator';
-import { AnimatedSection } from '@/components/ui/animated-section';
+import { Save, Target } from 'lucide-react';
+import { EmptyState } from '@/components/ui/empty-state';
+import { PageHeader } from '@/components/layout/PageHeader';
+import { ToolRunErrorPanel, ToolRunStatus, isCanceled, useRevealResults, useToolRun } from '@/components/features/tools/tool-run';
+import { generateDiscussPrompt, openDiscussion } from '@/components/features/tools/discuss';
 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';
@@ -32,7 +34,20 @@ import { useDebateMotionGate } from '@/components/features/debate/DebateMotionGa
 
 export default function GeneratePage() {
   const workspace = useWorkspaceToolScope('generate');
-  const { generateResult, generateLoading, generateRegeneratingSection: regeneratingSection, generateForm, setGenerateResult, setGenerateLoading, setGenerateRegeneratingSection, saveCurrentCase, addAskMessage, setAskLoading, askMessages, setPendingFlowchartData, autosavedCases, recordResult, updateRecordedResult } = useSessionStore();
+  const { generateResult, generateLoading, generateRegeneratingSection: regeneratingSection, generateForm, setGenerateResult, setGenerateLoading, setGenerateRegeneratingSection, saveCurrentCase, setPendingFlowchartData, autosavedCases, recordResult, updateRecordedResult } = useSessionStore(useShallow((state) => ({
+    generateResult: state.generateResult,
+    generateLoading: state.generateLoading,
+    generateRegeneratingSection: state.generateRegeneratingSection,
+    generateForm: state.generateForm,
+    setGenerateResult: state.setGenerateResult,
+    setGenerateLoading: state.setGenerateLoading,
+    setGenerateRegeneratingSection: state.setGenerateRegeneratingSection,
+    saveCurrentCase: state.saveCurrentCase,
+    setPendingFlowchartData: state.setPendingFlowchartData,
+    autosavedCases: state.autosavedCases,
+    recordResult: state.recordResult,
+    updateRecordedResult: state.updateRecordedResult,
+  })));
   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);
@@ -40,23 +55,14 @@ export default function GeneratePage() {
   const [resultDebateId, setResultDebateId] = useState<string | null | undefined>(undefined);
   const { getFeatureConfig } = useSettingsStore();
   const config = getFeatureConfig('generate');
-  const askConfig = getFeatureConfig('ask');
   const { toast } = useToast();
   const navigate = useNavigate();
   const subError = useSubscriptionError();
   const { t } = useTranslation();
-  const shouldReduceMotion = useReducedMotion();
   const [saveDialogOpen, setSaveDialogOpen] = useState(false);
-  const [successfulGenerationSequence, setSuccessfulGenerationSequence] = useState(0);
-  const resultsAnchorRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    if (successfulGenerationSequence === 0) return;
-    const timer = window.setTimeout(() => {
-      resultsAnchorRef.current?.scrollIntoView({ behavior: shouldReduceMotion ? 'auto' : 'smooth', block: 'start' });
-    }, 100);
-    return () => window.clearTimeout(timer);
-  }, [shouldReduceMotion, successfulGenerationSequence]);
+  const run = useToolRun('generate');
+  const results = useRevealResults();
+  const lastRun = useRef<{ data: GenerateInput; debateId: string | null } | null>(null);
   const [saveTitle, setSaveTitle] = useState('');
   const [discoveredSources, setDiscoveredSources] = useState<DiscoveredSource[]>([]);
 
@@ -77,9 +83,13 @@ export default function GeneratePage() {
 
   const submitGenerate = async (data: GenerateInput, debateId: string | null) => {
     const target = { debateId };
+    lastRun.current = { data, debateId };
+    const signal = run.start();
     setGenerateLoading(true);
     try {
-      const { result, discoveredSources: sources } = await generateCase(data, config, workspace.context ?? undefined, workspace.context ? undefined : target.debateId);
+      const { result, discoveredSources: sources } = await generateCase(data, config, workspace.context ?? undefined, workspace.context ? undefined : target.debateId, signal);
+      // A canceled request can still resolve (its last step ignores the signal); never publish it.
+      if (signal.aborted) return;
       // Always stamp with real local time and motion
       if (result.metadata) {
         result.metadata.generatedAt = new Date().toISOString();
@@ -93,22 +103,22 @@ export default function GeneratePage() {
       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' });
+      results.reveal();
     } catch (error) {
+      if (isCanceled(error, signal)) return;
       console.error('Failed to generate case:', error);
 
       // Handle subscription errors with modals
       if (subError.handleSubscriptionError(error)) return;
 
       if (isAIAuthError(error)) {
-        toast({ title: t('generate.authRequired'), description: error.message, variant: "destructive" });
+        run.setError({ title: t('generate.authRequired'), description: getUserFacingAIError(error) });
       } else if (isAIRateLimitError(error)) {
-        toast({ title: t('rateLimit.title'), description: `${error.message}${error.limit ? ` (${error.current}/${error.limit} uses)` : ''}`, variant: "destructive" });
+        run.setError({ title: t('rateLimit.title'), description: getUserFacingAIError(error) });
       } else if (isTimeoutError(error)) {
-        toast({ title: t('generate.timeout'), description: t('generate.timeoutDesc'), variant: "destructive" });
+        run.setError({ title: t('generate.timeout'), description: t('generate.timeoutDesc') });
       } else {
-        toast({ title: t('generate.failed'), description: getUserFacingAIError(error), variant: "destructive" });
+        run.setError({ title: t('generate.failed'), description: getUserFacingAIError(error) });
       }
     } finally {
       setGenerateLoading(false);
@@ -189,43 +199,8 @@ export default function GeneratePage() {
     }
   };
 
-  const handleDiscuss = async () => {
-    if (!generateResult) return;
-
-    const summary = `I'd like to discuss the case we just generated.
-    
-    **Thesis:** ${generateResult.caseStructure.thesis}
-    
-    **Arguments:**
-    ${generateResult.contentions.map((c, i) => `${i + 1}. ${c.claim}`).join('\n')}
-    
-    Can we refine this?`;
-
-    addAskMessage({ role: 'user', content: summary });
-    navigate('/app/ask');
-
-    setAskLoading(true);
-    try {
-      const history = [...askMessages, { role: 'user', content: summary }].map(m => ({
-        role: m.role as 'user' | 'assistant',
-        content: m.content
-      }));
-
-      const result = await askChat(summary, history, 'general', askConfig);
-
-      addAskMessage({
-        role: 'assistant',
-        content: result.response,
-        output: result
-      });
-    } catch (error) {
-      console.error('Failed to discuss result:', error);
-      if (!subError.handleSubscriptionError(error)) {
-        toast({ title: t('chat.error'), description: t('chat.errorDesc'), variant: "destructive" });
-      }
-    } finally {
-      setAskLoading(false);
-    }
+  const handleDiscuss = () => {
+    if (generateResult) openDiscussion(navigate, generateDiscussPrompt(generateResult, t));
   };
 
   const handlePracticeCrossfire = () => {
@@ -283,7 +258,6 @@ export default function GeneratePage() {
           id: `e-thesis-${id}`,
           source: 'thesis',
           target: id,
-          animated: true,
           markerEnd: { type: MarkerType.ArrowClosed }
         });
       });
@@ -345,7 +319,7 @@ export default function GeneratePage() {
             id: `e-${parentId}-${id}`,
             source: parentId,
             target: id,
-            style: { stroke: '#3b82f6' },
+            style: { stroke: '#3b82f6', strokeDasharray: '6 4' },
             markerEnd: { type: MarkerType.ArrowClosed }
           });
         });
@@ -365,27 +339,28 @@ export default function GeneratePage() {
     <div className="container py-8 px-4">
       <WorkspaceToolScope context={workspace.context} />
       <div className="max-w-6xl mx-auto">
-        <AnimatedSection className="mb-8 flex flex-col sm:flex-row sm:items-end justify-between gap-4">
-          <div>
-            <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('nav.generate')}</h1>
-          </div>
-        </AnimatedSection>
+        <PageHeader title={t('nav.generate')} />
         <CurrentDebateStrip side={generateForm?.side} hidden={Boolean(workspace.context)} />
 
         <div className="grid gap-8 grid-cols-1 lg:grid-cols-[440px_minmax(0,1fr)]">
           {/* Form */}
-          <AnimatedSection delay={75} className="lg:sticky lg:top-24 lg:self-start">
+          <div className="lg:sticky lg:top-24 lg:self-start">
             <GenerateForm onSubmit={handleSubmit} isLoading={generateLoading || regeneratingSection !== null} debatePrefill={!workspace.context} />
-          </AnimatedSection>
+          </div>
 
           {/* Results */}
-          <div>
+          <div ref={results.ref} className="scroll-mt-24">
+            {run.error && (
+              <ToolRunErrorPanel
+                error={run.error}
+                onRetry={lastRun.current ? () => void submitGenerate(lastRun.current!.data, lastRun.current!.debateId) : undefined}
+                onDismiss={run.clearError}
+              />
+            )}
             {generateLoading ? (
-              <div key="generate-loading" className="motion-swap motion-shimmer flex min-h-[400px] flex-col items-center justify-center rounded-lg border-2 border-dashed border-border bg-card/50 p-8">
-                <StreamingIndicator messages={[t('generateForm.loadingMsg1'), t('generateForm.loadingMsg2'), t('generateForm.loadingMsg3'), t('generateForm.loadingMsg4'), t('generateForm.loadingMsg5')]} />
-              </div>
+              <ToolRunStatus label={t('generate.working', 'Writing your case…')} onCancel={run.cancel} />
             ) : generateResult ? (
-              <div ref={resultsAnchorRef} key="generate-results" id="generate-results" className="space-y-4">
+              <div key="generate-results" id="generate-results" className="space-y-4">
                 <GenerateResults
                   result={generateResult}
                   discoveredSources={discoveredSources}
@@ -399,13 +374,7 @@ export default function GeneratePage() {
                 />
               </div>
             ) : (
-              <div key="generate-empty" className="motion-swap flex min-h-[400px] flex-col items-center justify-center rounded-lg border-2 border-dashed border-border bg-card/50 p-8 text-center">
-                <div className="mb-4 text-6xl">🎯</div>
-                <h3 className="text-lg font-semibold text-foreground mb-2">{t('generate.emptyTitle')}</h3>
-                <p className="text-sm text-muted-foreground max-w-sm">
-                  {t('generate.emptyDesc')}
-                </p>
-              </div>
+              <EmptyState icon={Target} title={t('generate.emptyTitle')} description={t('generate.emptyDesc')} />
             )}
           </div>
         </div>
diff --git a/src/pages/TimerPage.tsx b/src/pages/TimerPage.tsx
index fc14b7304..88b762938 100644
--- a/src/pages/TimerPage.tsx
+++ b/src/pages/TimerPage.tsx
@@ -5,6 +5,10 @@ import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
 import { Play, Pause, RotateCcw, Bell, Volume2, VolumeX, Keyboard } from 'lucide-react';
 import { Progress } from '@/components/ui/progress';
+import { PageHeader } from '@/components/layout/PageHeader';
+import { ClockAnnouncer, RoundClock, clockTone } from '@/components/features/practice/RoundClock';
+import { displaySeconds, pauseClock, remainingMs, startClock, type ClockState } from '@/lib/timer-clock';
+import { toast } from '@/hooks/use-toast';
 import {
   Select,
   SelectContent,
@@ -140,109 +144,129 @@ export default function TimerPage() {
   const [isFinished, setIsFinished] = useState(false);
   const [soundEnabled, setSoundEnabled] = useState(true);
 
+  // The clock is kept in milliseconds; the face shows whole seconds.
+  const clockRef = useRef<ClockState>({ remainingMs: currentSpeech.minutes * 60_000, deadline: null });
   const timerRef = useRef<ReturnType<typeof setInterval> | null>(null);
-  const deadlineRef = useRef<number | null>(null);
-  const timeLeftRef = useRef(timeLeft);
   const previousTimeLeftRef = useRef(timeLeft);
 
-  useEffect(() => {
-    timeLeftRef.current = timeLeft;
-  }, [timeLeft]);
+  const loadSpeech = useCallback((minutes: number) => {
+    clockRef.current = { remainingMs: minutes * 60_000, deadline: null };
+    setIsRunning(false);
+    setIsFinished(false);
+    setTimeLeft(minutes * 60);
+  }, []);
 
   // Reset when format changes
   useEffect(() => {
     setCurrentSpeechIdx(0);
-    setIsRunning(false);
-    setIsFinished(false);
-    const firstSpeech = currentFormat.speeches[0];
-    setTimeLeft(firstSpeech.minutes * 60);
+    loadSpeech(currentFormat.speeches[0].minutes);
   }, [formatId]); // eslint-disable-line react-hooks/exhaustive-deps
 
   // Safety check if index is out of bounds for new format
   useEffect(() => {
     if (!currentFormat.speeches[currentSpeechIdx]) {
       setCurrentSpeechIdx(0);
-      setIsRunning(false);
-      setIsFinished(false);
-      setTimeLeft(currentFormat.speeches[0].minutes * 60);
+      loadSpeech(currentFormat.speeches[0].minutes);
     }
-  }, [currentFormat, currentSpeechIdx]);
+  }, [currentFormat, currentSpeechIdx, loadSpeech]);
 
-  // Drives the countdown off a deadline timestamp (self-correcting against
-  // setInterval drift/throttling) and only recreates the interval when
-  // isRunning changes, not on every tick. The updater stays pure — no
-  // side effects here; see the effect below for signals/completion.
+  // Counts down against a deadline (self-correcting against interval drift and
+  // throttling). Pausing stores the exact remainder, so pauses never add time.
   useEffect(() => {
-    if (!isRunning || timeLeftRef.current <= 0) {
-      if (timerRef.current) clearInterval(timerRef.current);
-      timerRef.current = null;
-      deadlineRef.current = null;
+    if (!isRunning) {
+      clockRef.current = pauseClock(clockRef.current, Date.now());
       return;
     }
-
-    deadlineRef.current = Date.now() + timeLeftRef.current * 1000;
-    timerRef.current = setInterval(() => {
-      if (deadlineRef.current === null) return;
-      const remaining = Math.max(0, Math.ceil((deadlineRef.current - Date.now()) / 1000));
-      setTimeLeft(remaining);
-    }, 1000);
-
+    clockRef.current = startClock(clockRef.current, Date.now());
+    const tick = () => setTimeLeft(displaySeconds(remainingMs(clockRef.current, Date.now())));
+    tick();
+    timerRef.current = setInterval(tick, 250);
     return () => {
       if (timerRef.current) clearInterval(timerRef.current);
       timerRef.current = null;
     };
   }, [isRunning]);
 
-  // Reacts to the countdown value to trigger signals and mark completion.
+  // Keep the screen awake while a speech runs.
+  useEffect(() => {
+    if (!isRunning || !('wakeLock' in navigator)) return;
+    let lock: WakeLockSentinel | null = null;
+    let released = false;
+    const acquire = () => {
+      if (document.visibilityState !== 'visible') return;
+      navigator.wakeLock.request('screen').then((sentinel) => {
+        if (released) void sentinel.release();
+        else lock = sentinel;
+      }).catch(() => { /* Not allowed here (battery saver, iframe): the timer still works. */ });
+    };
+    acquire();
+    // The browser drops the lock when the tab hides; take it again on return.
+    document.addEventListener('visibilitychange', acquire);
+    return () => {
+      released = true;
+      document.removeEventListener('visibilitychange', acquire);
+      void lock?.release().catch(() => {});
+    };
+  }, [isRunning]);
+
+  // Signals and completion. The time-up sound and vibration fire in the same frame.
   useEffect(() => {
     const previousTimeLeft = previousTimeLeftRef.current;
     previousTimeLeftRef.current = timeLeft;
     if (!isRunning) return;
-    if (soundEnabled) {
-      if (previousTimeLeft > 60 && timeLeft <= 60 && timeLeft > 0) void playSignal('beep');
-      if (timeLeft === 0) void playSignal('double-beep');
-    }
+    if (soundEnabled && previousTimeLeft > 60 && timeLeft <= 60 && timeLeft > 0) void playSignal('beep');
     if (timeLeft === 0) {
+      if (soundEnabled) void playSignal('double-beep');
+      navigator.vibrate?.([200, 100, 200]);
       setIsRunning(false);
       setIsFinished(true);
     }
   }, [timeLeft, isRunning, soundEnabled]);
 
-  const toggleTimer = useCallback(() => setIsRunning(prev => !prev), []);
+  const toggleTimer = useCallback(() => {
+    if (isFinished) return;
+    setIsRunning(prev => !prev);
+  }, [isFinished]);
 
+  // Reset discards progress, so a reset of a started speech offers Undo.
   const resetTimer = useCallback(() => {
-    setIsRunning(false);
-    setIsFinished(false);
     const speech = currentFormat.speeches[currentSpeechIdx] || currentFormat.speeches[0];
-    setTimeLeft(speech.minutes * 60);
-  }, [currentFormat, currentSpeechIdx]);
+    const before = { ms: remainingMs(clockRef.current, Date.now()), finished: isFinished };
+    loadSpeech(speech.minutes);
+    if (before.ms < speech.minutes * 60_000) {
+      toast({
+        title: t('timer.resetDone', 'Timer reset'),
+        action: {
+          label: t('common.undo', 'Undo'),
+          onClick: () => {
+            // Undo returns to the paused remainder, even if the reset clock was started since.
+            setIsRunning(false);
+            clockRef.current = { remainingMs: before.ms, deadline: null };
+            setTimeLeft(displaySeconds(before.ms));
+            setIsFinished(before.finished);
+          },
+        },
+      });
+    }
+  }, [currentFormat, currentSpeechIdx, isFinished, loadSpeech, t]);
 
   const nextSpeech = useCallback(() => {
     if (currentSpeechIdx < currentFormat.speeches.length - 1) {
       setCurrentSpeechIdx(prev => prev + 1);
-      setIsRunning(false);
-      setIsFinished(false);
-      const nextSpeechObj = currentFormat.speeches[currentSpeechIdx + 1];
-      setTimeLeft(nextSpeechObj.minutes * 60);
+      loadSpeech(currentFormat.speeches[currentSpeechIdx + 1].minutes);
     }
-  }, [currentSpeechIdx, currentFormat]);
+  }, [currentSpeechIdx, currentFormat, loadSpeech]);
 
   const prevSpeech = useCallback(() => {
     if (currentSpeechIdx > 0) {
       setCurrentSpeechIdx(prev => prev - 1);
-      setIsRunning(false);
-      setIsFinished(false);
-      const prevSpeechObj = currentFormat.speeches[currentSpeechIdx - 1];
-      setTimeLeft(prevSpeechObj.minutes * 60);
+      loadSpeech(currentFormat.speeches[currentSpeechIdx - 1].minutes);
     }
-  }, [currentSpeechIdx, currentFormat]);
+  }, [currentSpeechIdx, currentFormat, loadSpeech]);
 
   const handleSpeechSelect = (idx: number) => {
     setCurrentSpeechIdx(idx);
-    setIsRunning(false);
-    setIsFinished(false);
-    const speech = currentFormat.speeches[idx];
-    setTimeLeft(speech.minutes * 60);
+    loadSpeech(currentFormat.speeches[idx].minutes);
   };
 
   // Keyboard shortcuts
@@ -257,7 +281,8 @@ export default function TimerPage() {
           break;
         case 'KeyR':
         case 'Escape':
-          resetTimer();
+          // A stray key never wipes a running speech; pause first.
+          if (!isRunning) resetTimer();
           break;
         case 'ArrowRight':
           nextSpeech();
@@ -270,7 +295,7 @@ export default function TimerPage() {
 
     window.addEventListener('keydown', handleKeyDown);
     return () => window.removeEventListener('keydown', handleKeyDown);
-  }, [toggleTimer, resetTimer, nextSpeech, prevSpeech]);
+  }, [toggleTimer, resetTimer, nextSpeech, prevSpeech, isRunning]);
 
   const totalDuration = (currentSpeech.minutes || 0) * 60;
   const progress = Math.min(100, Math.max(0, ((totalDuration - timeLeft) / totalDuration) * 100));
@@ -278,9 +303,7 @@ export default function TimerPage() {
   return (
     <div className="container py-8 px-4">
       <div className="max-w-3xl mx-auto text-center">
-        <div className="mb-8">
-          <h1 className="text-3xl font-bold tracking-tight text-foreground">{t('timer.title')}</h1>
-        </div>
+        <PageHeader className="mb-8 sm:justify-center" title={t('timer.title')} />
 
         <div className="flex justify-between items-center mb-6 max-w-xl mx-auto">
           <Select value={formatId} onValueChange={(val) => {
@@ -306,7 +329,7 @@ export default function TimerPage() {
           </Button>
         </div>
 
-        <Card className="border-primary/20 bg-card/50 backdrop-blur-sm shadow-xl">
+        <Card className="border-primary/20 shadow-xl">
           <CardHeader>
             <div className="flex justify-center gap-2 mb-4 flex-wrap">
               {currentFormat.speeches.map((s, idx) => (
@@ -326,14 +349,14 @@ export default function TimerPage() {
           </CardHeader>
           <CardContent className="space-y-8">
             {/* Timer Display */}
-            <div className="relative flex items-center justify-center h-64 w-64 sm:h-72 sm:w-72 mx-auto rounded-full border-8 border-muted bg-background/50 shadow-inner transition-all" role="timer" aria-label={t('timer.displayLabel')} aria-live="polite" aria-atomic="true">
-              <div className={`absolute inset-0 rounded-full border-8 border-primary transition-all duration-1000`}
+            {/* The ring sweeps at a constant rate (linear); the clock is not a live region, the announcer is. */}
+            <div className="relative flex items-center justify-center h-64 w-64 sm:h-72 sm:w-72 mx-auto rounded-full border-8 border-muted bg-background shadow-inner">
+              <div className={`absolute inset-0 rounded-full border-8 transition-[clip-path,border-color] duration-1000 ease-linear ${clockTone(timeLeft) === 'normal' ? 'border-primary' : clockTone(timeLeft) === 'warning' ? 'border-amber-500' : 'border-destructive'}`}
                 style={{ clipPath: `inset(${100 - progress}% 0 0 0)` }} />
 
               <div className="text-center z-10 flex flex-col items-center justify-center">
-                <div className={`text-6xl sm:text-7xl font-mono font-bold tracking-tighter tabular-nums transition-colors duration-300 ${timeLeft < 30 && timeLeft > 0 ? 'text-destructive animate-pulse' : 'text-foreground'}`}>
-                  {Math.floor(timeLeft / 60)}:{(timeLeft % 60).toString().padStart(2, '0')}
-                </div>
+                <RoundClock secondsLeft={timeLeft} label={t('timer.displayLabel')} className="text-6xl sm:text-7xl font-bold" />
+                <ClockAnnouncer secondsLeft={timeLeft} running={isRunning || isFinished} />
                 <div className="text-sm text-muted-foreground mt-4 font-medium uppercase tracking-widest flex items-center gap-2">
                   {isFinished ? t('timer.timeUp') : isRunning ? t('timer.speaking') : t('timer.paused')}
                   {soundEnabled && <Bell className="h-3 w-3" />}
@@ -353,6 +376,7 @@ export default function TimerPage() {
                 variant={isRunning ? "secondary" : "default"}
                 className="h-16 w-32 text-xl shadow-lg"
                 onClick={toggleTimer}
+                disabled={isFinished}
               >
                 {isRunning ? (
                   <>
@@ -369,13 +393,14 @@ export default function TimerPage() {
                 variant="outline"
                 className="h-16 w-16 shadow-sm"
                 onClick={resetTimer}
-                aria-label={t('timer.resetKey', 'Reset timer')}
+                aria-label={t('timer.reset', 'Reset timer')}
               >
                 <RotateCcw className="h-6 w-6" />
               </Button>
             </div>
 
-            <div className="text-xs text-muted-foreground pt-4 flex flex-col sm:flex-row items-center justify-center gap-2 sm:gap-4">
+            {/* Keyboard hints only where there is a keyboard. */}
+            <div className="text-xs text-muted-foreground pt-4 flex flex-col sm:flex-row items-center justify-center gap-2 sm:gap-4 pointer-coarse:hidden">
               <span className="flex items-center gap-1"><Keyboard className="h-3 w-3" /> {t('timer.spaceStartStop')}</span>
               <span className="flex items-center gap-1"><Keyboard className="h-3 w-3" /> {t('timer.resetKey')}</span>
               <span className="flex items-center gap-1"><Keyboard className="h-3 w-3" /> {t('timer.arrowsChange')}</span>
diff --git a/src/test/pages/GeneratePage.test.tsx b/src/test/pages/GeneratePage.test.tsx
index 46d90150d..d2cd306ec 100644
--- a/src/test/pages/GeneratePage.test.tsx
+++ b/src/test/pages/GeneratePage.test.tsx
@@ -361,7 +361,8 @@ describe('GeneratePage Integration', () => {
 
         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' }));
+        // The run itself succeeded: no failure panel and no failure toast.
+        expect(screen.queryByText(/Generation Failed/i)).toBeNull();
         expect(mockToast).not.toHaveBeenCalledWith(expect.objectContaining({ variant: 'destructive', title: expect.stringMatching(/Generation Failed/i) }));
     });
 });
diff --git a/src/test/pages/SparringVoice.test.tsx b/src/test/pages/SparringVoice.test.tsx
index 8536100ee..376b8e359 100644
--- a/src/test/pages/SparringVoice.test.tsx
+++ b/src/test/pages/SparringVoice.test.tsx
@@ -236,7 +236,9 @@ describe('SparringPage voice rounds', () => {
     const aiSpeech = useSparringStore.getState().currentSession!.speeches[1];
     expect(aiSpeech.content).toBe('A narrower policy does the same for less.');
     expect(JSON.stringify(useSparringStore.getState().currentSession)).not.toContain('[sighs]');
-    expect(screen.getByText('A narrower policy does the same for less.')).toBeInTheDocument();
+    // The reply is in the transcript, and pinned above the composer while the user answers it.
+    expect(within(screen.getByRole('region', { name: 'Transcript' })).getByText('A narrower policy does the same for less.')).toBeInTheDocument();
+    expect(within(screen.getByRole('article', { name: 'Opponent’s last speech' })).getByText('A narrower policy does the same for less.')).toBeInTheDocument();
     expect(screen.queryByText(/\[sighs\]/)).not.toBeInTheDocument();
 
     // The student's clock waits for the opponent to finish, then runs.
diff --git a/src/test/timer/timer-clock.test.ts b/src/test/timer/timer-clock.test.ts
new file mode 100644
index 000000000..ac7d207d7
--- /dev/null
+++ b/src/test/timer/timer-clock.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest';
+import { displaySeconds, pauseClock, remainingMs, startClock } from '@/lib/timer-clock';
+
+describe('speech clock', () => {
+  it('pausing keeps the exact remainder instead of rounding up to the next second', () => {
+    let clock = startClock({ remainingMs: 60_000, deadline: null }, 0);
+    clock = pauseClock(clock, 10_400);
+    expect(clock).toEqual({ remainingMs: 49_600, deadline: null });
+
+    // Pause and resume ten times at 0.9s into a second: the speaker gains nothing.
+    let now = 10_400;
+    for (let i = 0; i < 10; i++) {
+      clock = startClock(clock, now);
+      now += 900;
+      clock = pauseClock(clock, now);
+    }
+    expect(clock.remainingMs).toBe(40_600);
+    expect(displaySeconds(clock.remainingMs)).toBe(41);
+  });
+
+  it('never runs below zero', () => {
+    const running = startClock({ remainingMs: 1_000, deadline: null }, 0);
+    expect(remainingMs(running, 5_000)).toBe(0);
+    expect(pauseClock(running, 5_000).remainingMs).toBe(0);
+    expect(startClock({ remainingMs: 0, deadline: null }, 9_000).deadline).toBeNull();
+  });
+});
diff --git a/src/test/tools/tool-run.test.tsx b/src/test/tools/tool-run.test.tsx
new file mode 100644
index 000000000..12bf175e2
--- /dev/null
+++ b/src/test/tools/tool-run.test.tsx
@@ -0,0 +1,22 @@
+import { renderHook } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import { useToolRun } from '@/components/features/tools/tool-run';
+
+describe('useToolRun', () => {
+  it('cancels a run started by an earlier mount of the same tool', () => {
+    // Start a run, leave the page, come back, press Cancel.
+    const first = renderHook(() => useToolRun('generate'));
+    const signal = first.result.current.start();
+    first.unmount();
+    const second = renderHook(() => useToolRun('generate'));
+    second.result.current.cancel();
+    expect(signal.aborted).toBe(true);
+  });
+
+  it('leaves other tools running', () => {
+    const generate = renderHook(() => useToolRun('generate'));
+    const signal = generate.result.current.start();
+    renderHook(() => useToolRun('attack')).result.current.cancel();
+    expect(signal.aborted).toBe(false);
+  });
+});