diff --git a/.env.example b/.env.example
index 4a1c23597b..ea0054bf66 100644
--- a/.env.example
+++ b/.env.example
@@ -23,19 +23,21 @@ INDEXING_V3_AGENT_SECRET=your-long-random-cron-shared-secret
 # to OpenAI for embeddings, captioning, and grounded answer generation.
 OPENAI_API_KEY=replace-with-openai-api-key
 OPENAI_EMBEDDING_MODEL=text-embedding-3-small
-OPENAI_ANSWER_MODEL=gpt-5.4-mini
-OPENAI_FAST_ANSWER_MODEL=gpt-5.4-mini
-OPENAI_STRONG_ANSWER_MODEL=gpt-5.4
-OPENAI_MAX_OUTPUT_TOKENS=1400
+OPENAI_ANSWER_MODEL=gpt-5.5
+OPENAI_FAST_ANSWER_MODEL=gpt-5.5
+OPENAI_STRONG_ANSWER_MODEL=gpt-5.5-pro
+OPENAI_MAX_OUTPUT_TOKENS=4000
 OPENAI_QUERY_CACHE_SIZE=200
-OPENAI_VISION_MODEL=gpt-5.4-mini
+OPENAI_VISION_MODEL=gpt-5.5
+OPENAI_VISION_IMAGE_DETAIL=auto
 OPENAI_REQUEST_TIMEOUT_MS=45000
 OPENAI_MAX_RETRIES=2
-OPENAI_PROMPT_CACHE_RETENTION=in_memory
+OPENAI_GENERATION_MAX_RETRIES=0
+OPENAI_PROMPT_CACHE_RETENTION=24h
 OPENAI_STORE_RESPONSES=false
 OPENAI_FAST_REASONING_EFFORT=low
-OPENAI_STRONG_REASONING_EFFORT=medium
-OPENAI_SUMMARY_REASONING_EFFORT=low
+OPENAI_STRONG_REASONING_EFFORT=high
+OPENAI_SUMMARY_REASONING_EFFORT=medium
 OPENAI_VISION_REASONING_EFFORT=low
 OPENAI_TEXT_VERBOSITY=low
 RAG_ANSWER_CACHE_TTL_MS=300000
@@ -65,6 +67,7 @@ WORKER_MAX_CLAIM_FAILURES=3
 WORKER_PROGRESS_UPDATE_MIN_INTERVAL_MS=60000
 WORKER_MAX_CAPTIONED_IMAGES_PER_DOCUMENT=15
 WORKER_MAX_CAPTIONED_IMAGES_PER_PAGE=4
+WORKER_VISION_CONCURRENCY=4
 WORKER_INLINE_ENRICHMENT=false
 PYTHON_BIN=python
 # Optional when Tesseract is installed outside PATH on Windows.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 21aacb0b77..380965d49c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,8 +49,8 @@ jobs:
       - name: Typecheck
         run: npm run typecheck
 
-      - name: Unit tests
-        run: npm run test
+      - name: Unit tests (with coverage gate)
+        run: npm run test:coverage
 
       - name: Build
         run: npm run build
diff --git a/TOOLS_CONTEXT_FOR_NEW_CHAT.md b/TOOLS_CONTEXT_FOR_NEW_CHAT.md
new file mode 100644
index 0000000000..6855ec1105
--- /dev/null
+++ b/TOOLS_CONTEXT_FOR_NEW_CHAT.md
@@ -0,0 +1,60 @@
+# Context handoff: Tools / Applications UX task
+
+## Purpose
+I’m creating this file so a new chat can continue the exact task with full context, including screenshots referenced so far.
+
+## Scope of this side conversation
+- This side conversation is separate from the main thread after a side boundary.
+- Pre-boundary history is reference-only and should not be treated as active instructions unless explicitly restated.
+- Active request in this side conversation was focused on design iteration and mockup direction for the Tools experience.
+- User now requested: create a context file with this chat + main run chat context including all images.
+
+## Current repository/workspace
+- Working directory: `C:\Dev\Apps\Database`
+- No explicit code mutation request was made in this side chat beyond creating this handoff file.
+
+## Latest user intent (current side thread)
+1. User asked to remove unimportant fields from the selected tool detail UI (examples: scope, source type, last use, etc.).
+2. User requested three new mockups in a better, more compact, polished style with stronger UX/UI treatment.
+3. User emphasized optimizing for popup/detail panel UX and improving design quality/compactness.
+
+## Key visual/UX direction already established
+- Remove low-value fields from selected-tool details.
+- Keep focused content: identity/status, launch action, concise overview/description, primary actions, minimal context.
+- Preserve mobile-first detail presentation quality (slide-up/detail sheet style).
+- Keep tools functionality, improve layout density and hierarchy.
+- Keep design intentional and “best UX” style rather than boilerplate.
+
+## What was done in this side thread (summary)
+- Read local frontend design skill file (non-mutating exploration only).
+- Generated three mockup designs:
+  1. Compact action panel
+  2. Bottom command sheet
+  3. Row-attached mini inspector
+- Each mockup was framed as desktop + iPhone in one image.
+- Shared recommendations to prefer concise, practical selected-tool detail content and keep popup behavior robust.
+
+## Files/attachments referenced by user (screenshots)
+- `C:\Users\joshs\AppData\Local\Temp\codex-clipboard-79c36fc1-c28a-435c-bb2d-6988f78f89e1.png`
+- `C:\Users\joshs\AppData\Local\Temp\codex-clipboard-0c947a77-a138-4762-8152-441be907d12b.png`
+- `C:\Users\joshs\AppData\Local\Temp\codex-clipboard-8060b302-8f9b-4ae4-8f51-a3e7bfb51bac.png`
+- `C:\Users\joshs\AppData\Local\Temp\codex-clipboard-c496ebea-7c2c-4e27-a1e4-693bb494bdc9.png`
+- `C:\Users\joshs\AppData\Local\Temp\codex-clipboard-8b3b0d40-2e87-4870-abc8-cf5ecad3d94b.png`
+- `C:\Users\joshs\AppData\Local\Temp\codex-clipboard-0b05c4e9-1715-47c2-bd70-ed93133384ae.png`
+
+## Inherited “main run chat” context (pre-boundary)
+- Earlier thread work focused on Tools/Applications navigation and behavior in the app.
+- User wanted the standalone `/applications` page preserved and restored.
+- User then asked to embed Applications launcher content into `/?mode=tools` while renaming visible copy to Tools.
+- The user requested sidebar/floating action updates to treat the surface as Tools, and icon/title updates.
+- They repeatedly reported selected tool desktop popup behavior needs fixing and asked for a design upgrade.
+- The side-thread task proceeded from this context but now is narrowed to design direction + new mockups.
+
+## Notes for continuation in new chat
+- This file is only a handoff context snapshot; it does not include any uncommitted design/code changes in this side thread.
+- If continuing implementation, likely first action is reconciling existing Tools detail component with the above compact popup/content model.
+- Use the images above to ground visual expectations.
+- Keep `/applications` and `/?mode=tools` behavior requirements from the parent context in mind.
+
+## Suggested prompt for new chat
+“Please continue from this context file. We need to implement the improved tools selected-item popup/detail view to remove low-value metadata (scope/source type/last use), keep core actions and context, and apply one of the three compact mockup directions (or a refinement). Preserve standalone `/applications` behavior and ensure `/ ?mode=tools` still works in desktop + mobile.”
diff --git a/docs/clinical-badge-system-guide.md b/docs/clinical-badge-system-guide.md
new file mode 100644
index 0000000000..947f7f564b
--- /dev/null
+++ b/docs/clinical-badge-system-guide.md
@@ -0,0 +1,502 @@
+# Clinical Badge System Guide
+
+This guide defines the badge, chip, and compact label system for Clinical KB. Use it as context for future UI, medication, source, document, evidence, answer, and labelling tasks.
+
+This document is governance only. It does not grant approval to apply badges across clinical content. Apply this system to a content area only when that area is explicitly approved for redesign or labelling work.
+
+## Core Principles
+
+Badges should make clinical screens faster to scan. They are not decoration, not a substitute for readable clinical text, and not a way to make every fact look important.
+
+Default to no badge. Add a badge only when removing it would make the screen less scannable, less safe, or less clear.
+
+Badges should answer one of these questions:
+
+| Question | Badge role |
+| --- | --- |
+| What is this? | Metadata or type |
+| What should I do? | Clinical action |
+| Can I trust or use this? | Trust, currentness, availability, or source support |
+| Should I pause and check? | Caution, adjustment, uncertainty, or review needed |
+| Should I stop or avoid? | Contraindication, failure, unsafe state |
+| Is the system doing something? | Process or system state |
+
+## Badge Versus Label Versus Chip
+
+Use these terms consistently.
+
+| Term | Meaning | Interaction |
+| --- | --- | --- |
+| Badge | Compact, static visual marker for state or metadata | Not clickable |
+| Chip | Interactive filter, selected token, query token, or mode selector | Clickable/removable/selectable |
+| Label | Data classification attached to content, documents, concepts, or rows | May be rendered as text or badge, but is not automatically a UI badge |
+| Tag | User-facing classification label, especially for document/manual tagging | May be interactive when used for search/filtering |
+| Status | Operational state such as current, processing, failed, reviewed | Usually rendered as a badge |
+
+Static badges must not look clickable. Interactive chips must use proper button or link semantics.
+
+## Master Palette
+
+Use six top-level tones only. Do not add more badge colours.
+
+| Tone | Meaning | Examples | Do not use for |
+| --- | --- | --- | --- |
+| Neutral / slate | Reference metadata and passive facts | `333 mg EC tablet`, `Item 8357W`, `Campral`, `p.4`, `PDF`, `Max 1,998 mg/day` | Urgent risks, actions, or trust state |
+| Clinical / teal | Action to take | `666 mg TID`, `Monitor renal`, `Take with food`, `Check baseline` | Verified/current/source-backed state |
+| Success / green | Confirmed, current, available, source-backed | `Reviewed`, `Current`, `Source-backed`, `PBS streamlined`, `Completed` | Clinical safety decisions |
+| Warning / amber | Pause, check, adjust, uncertain, limited | `Reduce <60 kg`, `Review due`, `Partial support`, `Limited evidence`, `Avoid >65` | Hard stops or contraindications |
+| Danger / red | Stop, avoid, failed, unsafe | `Cr >120 avoid`, `Contraindicated`, `Outdated`, `Failed`, `Do not use` | Routine adverse effects or mild cautions |
+| Info / blue | System or process information | `Processing`, `Syncing`, `Pending`, `Importing` | Core clinical meaning |
+
+Do not add purple, pink, orange, cyan, or extra medication-specific badge colours. Orange collapses into amber. Purple should not be used for clinical badges because it reads as product or AI styling rather than clinical meaning.
+
+## Tone Rules
+
+Green means trusted, current, reviewed, available, or source-backed. It does not mean clinically safe.
+
+Teal means a clinical action or instruction. It does not mean good, safe, or verified.
+
+Amber means pause, check, adjust, review, or interpret with caution.
+
+Red means stop, avoid, contraindicated, failed, outdated, or unsafe.
+
+Blue is reserved for system and process state. It should be rare in clinical content.
+
+Neutral is the default for facts that do not require action, caution, trust signalling, or alarm.
+
+## Visual Variants
+
+Use variants within the six tones instead of adding new colours.
+
+| Variant | Use | Visual weight |
+| --- | --- | --- |
+| Quiet | Default static badge | Lowest |
+| Standard | Normal clinical/status badge | Low-medium |
+| Strong | Major warning, hard stop, selected interactive chip | High, rare |
+| Count | `4 matches`, `12 sources`, `+2` | Compact |
+| Dot + label | Very dense status rows | Minimal |
+
+Default badge styling should be quiet.
+
+## Shape And Size
+
+Badges should be compact and stable.
+
+Recommended static badge shape:
+
+- `inline-flex`
+- `rounded-md`
+- subtle `border`
+- low-contrast background tint
+- `10-11px` text
+- compact horizontal padding
+- one line only
+- optional icon only when it improves recognition
+
+Avoid:
+
+- oversized pill badges
+- heavy shadows
+- hover lift on static badges
+- button-like padding
+- full sentence labels
+- wrapping badges across several lines
+- icon on every badge
+
+## Interaction Rules
+
+Static badges:
+
+- no pointer cursor
+- no hover lift
+- no active state
+- no button role
+- no click handler
+- no keyboard focus
+
+Interactive chips:
+
+- use `button`, `a`, or the correct interactive primitive
+- have hover and focus-visible states
+- have accessible names
+- show selected/removable state clearly
+- may use larger padding than static badges
+
+Do not use the same component for static badges and interactive chips unless it has explicit modes and safe defaults.
+
+## Density Rules
+
+Badges are easy to overuse. Apply hard limits.
+
+| Context | Limit |
+| --- | --- |
+| Desktop detail row | 3 visible badges |
+| Mobile detail row | 2 visible badges |
+| Search result row/card | 2-3 visible badges |
+| Top summary tile | 0 badges |
+| Hard-stop safety row | Up to 4 red badges if each is a separate contraindication |
+| Source/evidence row | 2-3 badges |
+| Document tag cloud | Use tag limits and show-more behaviour |
+
+When there are too many badges, show the highest-priority badges first and move the rest into expanded detail or a quiet count such as `+2`.
+
+Priority order:
+
+1. Danger
+2. Warning
+3. Clinical
+4. Success
+5. Neutral
+6. Info
+
+## Placement Rules
+
+Do not put badges in top medication summary tiles. Those should use icon, label, value, and muted subline only.
+
+Use badges inside:
+
+- medication detail rows
+- medication search result metadata
+- source and evidence state
+- document search result metadata
+- answer grounding state
+- admin/import/indexing status
+- compact count areas
+
+Avoid badges inside:
+
+- prose paragraphs
+- every bullet
+- headings already visible nearby
+- primary navigation
+- buttons that already have clear labels
+- hero/home prompt areas unless representing a selected token or filter chip
+
+## Badge Text Rules
+
+Badge labels must be short, clinical, and scannable.
+
+Good labels:
+
+- `666 mg TID`
+- `Max 1,998 mg/day`
+- `Reduce <60 kg`
+- `Cr >120 avoid`
+- `Reviewed`
+- `PBS streamlined`
+- `Current`
+- `Source-backed`
+- `Review due`
+- `Partial support`
+
+Poor labels:
+
+- `This medication should not be used in patients with renal impairment`
+- `The document appears to be source backed by the uploaded guideline`
+- `You should check renal function before prescribing this medication`
+- `This is probably relevant`
+
+Prefer nouns and concise clinical phrases. Use full prose in the row body, not in the badge.
+
+## Clinical Safety Rules
+
+Critical clinical information must not be badge-only. If a contraindication is shown as a red badge, it must also appear in readable text.
+
+Badges highlight. They do not replace:
+
+- prescribing answer text
+- contraindication detail
+- dose adjustment instructions
+- monitoring requirements
+- source provenance
+- patient-specific context
+
+Use red only for true stop or failure states. Routine side effects are not red unless they imply stop/avoid/escalation.
+
+## Medication Rules
+
+Medication pages may use badges only where they improve scanning.
+
+| Medication content | Tone |
+| --- | --- |
+| Formulation | Neutral |
+| Brand | Neutral |
+| PBS item | Neutral |
+| PBS availability/streamlined | Success |
+| Reviewed/source-backed medication state | Success |
+| Usual dose as an instruction | Clinical |
+| Administration instruction | Clinical |
+| Monitoring action | Clinical |
+| Dose ceiling/reference max dose | Neutral |
+| Dose adjustment | Warning |
+| Renal/hepatic caution | Warning |
+| Population not established | Warning |
+| Contraindication/do not use | Danger |
+| Routine adverse effect | Neutral |
+| High/common adverse effect needing attention | Warning |
+| Serious adverse effect/stop state | Danger |
+
+Acamprosate examples:
+
+| Label | Tone | Reason |
+| --- | --- | --- |
+| `333 mg EC tablet` | Neutral | Formulation |
+| `PBS streamlined` | Success | Access/status |
+| `Reviewed` | Success | Trust/status |
+| `666 mg TID` | Clinical | Dosing instruction |
+| `2 x 333 mg` | Neutral | Dose detail |
+| `Max 1,998 mg/day` | Neutral | Reference ceiling |
+| `Reduce <60 kg` | Warning | Dose adjustment |
+| `Take with food` | Clinical | Administration instruction |
+| `Do not crush` | Warning | Administration caution |
+| `Cr >120 avoid` | Danger | Contraindication |
+| `Child-Pugh C` | Danger | Contraindication |
+
+## Search Result Rules
+
+Medication and document search results should stay search-focused.
+
+Use at most:
+
+- one match/relevance badge
+- one clinical metadata badge
+- one caution/action badge if needed
+
+Do not show a large badge cluster in a result row. If every result has many badges, the page becomes a detail page instead of search results.
+
+Search match examples:
+
+| Label | Tone |
+| --- | --- |
+| `Exact match` | Success |
+| `Source-backed` | Success |
+| `Partial support` | Warning |
+| `Nearby only` | Warning |
+| `No direct support` | Warning or danger depending on context |
+| `Dose match` | Clinical or success depending on whether it is an action or evidence state |
+
+## Answer And Evidence Rules
+
+Answer badges should clarify grounding and evidence strength.
+
+| Evidence state | Tone |
+| --- | --- |
+| Direct source-backed support | Success |
+| Strong source | Success |
+| Partial support | Warning |
+| Nearby only | Warning |
+| No direct support where direct support is required | Danger |
+| Source current | Success |
+| Source review due | Warning |
+| Source outdated | Danger |
+| Page/source metadata | Neutral |
+
+Do not use badges to decorate answer prose. Use them at the answer header, source rows, evidence panels, and compact provenance areas.
+
+## Source And Document Rules
+
+Document labels and document badges are related but not the same.
+
+Document labels classify the document. UI badges render only selected labels or states that help the user scan.
+
+| Source/document item | Tone |
+| --- | --- |
+| Site/organisation metadata | Neutral or info if operationally helpful |
+| Document type | Neutral |
+| Manual override | Info |
+| Needs review | Warning |
+| Ambiguous site | Warning |
+| Current source | Success |
+| Review due | Warning |
+| Outdated source | Danger |
+| Processing/indexing | Info |
+| Failed ingestion | Danger |
+| Indexed/completed | Success |
+
+Limit visible tags. Use show-more behaviour for document tag clouds.
+
+## Admin And Ingestion Rules
+
+Operational status badges should be simple and consistent.
+
+| State | Tone |
+| --- | --- |
+| Queued | Neutral |
+| Processing | Info |
+| Completed/indexed | Success |
+| Needs review | Warning |
+| Low confidence | Warning or info depending on severity |
+| Duplicate/noisy | Warning |
+| Failed | Danger |
+
+Do not make operational process badges look like clinical safety badges. Keep copy explicit.
+
+## Labelling Task Guide
+
+When performing a labelling task, decide whether each item is:
+
+1. A data label.
+2. A UI badge.
+3. A search/filter chip.
+4. Plain text.
+5. Not needed.
+
+Use this decision path:
+
+1. Is the label needed for retrieval, grouping, or data governance?
+   - If yes, create or update a data label.
+2. Is the label needed for fast visual scanning in the UI?
+   - If yes, render a badge or chip.
+3. Is it interactive?
+   - If yes, it is a chip/filter/tag button, not a static badge.
+4. Is it critical clinical information?
+   - If yes, include readable text first; badge may supplement it.
+5. Is it only decorative or repeating nearby text?
+   - If yes, do not badge it.
+
+Labelling tasks must not infer permission to redesign every content area. Apply badge rendering only to explicitly approved screens or content types.
+
+## Approval Scope Rules
+
+Allowed without additional approval:
+
+- Create or update this guide.
+- Propose badge mappings.
+- Apply badge improvements to a content area the user explicitly names and approves.
+- Refactor shared badge primitives if the user asks to implement the guide.
+
+Not allowed without explicit approval:
+
+- Broadly relabel all clinical content.
+- Apply badge mappings to all existing medication/source/answer content.
+- Change clinical facts or source meaning.
+- Promote generated labels into clinical decisions.
+- Add new badge colours.
+- Make static badges interactive.
+
+## Component Guidance
+
+The app should move toward two shared primitives:
+
+1. `SemanticBadge`
+   - static
+   - semantic tone
+   - quiet/standard/strong/count/dot variants
+   - safe truncation
+   - optional icon
+
+2. `InteractiveChip`
+   - interactive
+   - selected/removable/filter modes
+   - focus-visible state
+   - keyboard accessible
+
+Recommended semantic tone names:
+
+```ts
+type BadgeTone = "neutral" | "clinical" | "success" | "warning" | "danger" | "info";
+type BadgeVariant = "quiet" | "standard" | "strong" | "count" | "dot";
+```
+
+Avoid code-facing colour names such as `green`, `red`, `amber`, or `slate` for new badge APIs. Use semantic names so future contributors select tone by meaning, not hue.
+
+Map semantic tones to existing tokens:
+
+| Semantic tone | Existing style direction |
+| --- | --- |
+| `neutral` | `toneNeutral` / metadata pill |
+| `clinical` | clinical teal token |
+| `success` | `toneSuccess` |
+| `warning` | `toneWarning` or `toneWarningQuiet` |
+| `danger` | `toneDanger` |
+| `info` | `toneInfo` |
+
+## Accessibility Requirements
+
+Badges must remain understandable without colour.
+
+Requirements:
+
+- clear text label
+- colour plus text, not colour alone
+- icon only when useful
+- high enough contrast in light and dark mode
+- forced-colors support
+- no clipped critical labels
+- no badge-only clinical risks
+- static badges should not receive keyboard focus
+- interactive chips must be keyboard accessible
+
+## Content Quality Checklist
+
+Before adding a badge, ask:
+
+- Is this fact important enough to scan visually?
+- Is the same text already obvious nearby?
+- Is the tone based on meaning, not visual preference?
+- Would this badge still make sense without colour?
+- Can it fit on a phone?
+- Is the label under 18-22 characters where possible?
+- Does the row stay readable if the badge is removed?
+- Is critical clinical content also present in prose?
+- Is this badge static, or should it be an interactive chip?
+- Has this content area been approved for badge implementation?
+
+## Visual QA Checklist
+
+Check every badge implementation at:
+
+- narrow phone width
+- desktop width
+- dark mode
+- forced-colors mode
+- long labels
+- empty/missing values
+- high badge counts
+- row hover/focus states
+- keyboard navigation for chips
+- screen-reader names for interactive chips
+
+Failures to fix:
+
+- text clipped in a clinically unsafe way
+- badge wraps into awkward multi-line clusters
+- static badge looks clickable
+- row height increases because of low-priority badges
+- red/amber overused
+- green implies safety
+- blue used for clinical meaning
+- content depends on colour alone
+
+## Anti-Patterns
+
+Avoid:
+
+- badge every medication fact
+- badge every answer bullet
+- use green for "safe"
+- use red for routine side effects
+- use teal for verified/current
+- use blue for clinical action
+- add purple for AI
+- add orange beside amber
+- put badges in top decision tiles
+- use badges as buttons
+- use full sentences in badges
+- show five or more badges in a mobile row
+- let badge clusters turn search results into detail pages
+
+## Quick Reference
+
+Use this mapping by default:
+
+| If the label means... | Use tone |
+| --- | --- |
+| Passive fact | Neutral |
+| Clinical instruction | Clinical |
+| Current/reviewed/source-backed/available | Success |
+| Adjustment/caution/review/partial | Warning |
+| Avoid/contraindicated/failed/unsafe | Danger |
+| Processing/pending/system | Info |
+
+Use fewer badges than feels tempting. The goal is clinical scanning, not visual decoration.
diff --git a/docs/process-hardening.md b/docs/process-hardening.md
index 448874a2f0..927d663c94 100644
--- a/docs/process-hardening.md
+++ b/docs/process-hardening.md
@@ -9,7 +9,7 @@ This document turns the current process review into phased, durable repo practic
 - `npm run verify:release` is the release-confidence gate: lint, typecheck, unit tests, build, and the full Playwright browser project set.
 - CI now installs Chromium and runs the Chromium UI gate after build on all branches; a gated release-browser job runs the full Playwright browser matrix on `main`, `release/*`, manual dispatch, and the weekly schedule.
 - `tests/ui-accessibility.spec.ts` covers reduced-motion and forced-colors dashboard usability so those modes are no longer only reviewed by inspection.
-- `tests/ui-tools.spec.ts` covers the `/applications` launcher at mobile and desktop sizes.
+- `tests/ui-tools.spec.ts` covers the Applications dashboard mode at mobile and desktop sizes, including the `/applications` compatibility redirect.
 - `AGENTS.md` now points future agents to these gates and to this document.
 
 ## Phase 2 - Active now
@@ -17,7 +17,7 @@ This document turns the current process review into phased, durable repo practic
 - Previous deterministic smoke failures are reclassified as resolved in the current Chromium UI gate: `npm run verify:ui` passed 26/26 on June 23, 2026.
 - Local scratch and visual-capture output are excluded from Prettier through `.prettierignore` so generated investigation files do not block the format gate.
 - Pull requests now include a clinical governance preflight for ingestion, answer generation, source rendering, privacy, production environment, and clinical-output changes.
-- `/applications` now has dedicated Playwright coverage in the UI gate.
+- Applications mode now has dedicated Playwright coverage in the UI gate.
 
 ## Phase 3 - Structural cleanup
 
diff --git a/scripts/classify-documents.ts b/scripts/classify-documents.ts
index 1340885e97..7498d2eb4e 100644
--- a/scripts/classify-documents.ts
+++ b/scripts/classify-documents.ts
@@ -110,7 +110,7 @@ async function loadDocuments(supabase: SupabaseAdmin, args: ClassifyArgs) {
     .from("documents")
     .select("id,owner_id,title,file_name,source_path,status,metadata")
     .eq("status", "indexed")
-    .order("created_at", { ascending: true })
+    .order("id", { ascending: true })
     .range(args.documentId ? 0 : args.offset, args.documentId ? 0 : args.offset + args.limit - 1);
 
   if (args.documentId) query = query.eq("id", args.documentId);
@@ -165,7 +165,7 @@ async function writeClassification(
     .delete()
     .eq("document_id", document.id)
     .eq("source", "generated")
-    .in("label_type", ["site", "document_type", "population", "topic", "setting", "service", "workflow"]);
+    .in("label_type", ["site", "document_type", "population", "topic", "setting", "service", "workflow", "medication"]);
   if (deleteError) throw new Error(deleteError.message);
 
   // Write site labels (confident only, >= 0.75)
@@ -176,10 +176,10 @@ async function writeClassification(
     (label) => label.label_type === "document_type" && label.confidence >= 0.5,
   );
 
-  // Write all secondary facet labels (population, topic, setting, service, workflow)
+  // Write all secondary facet labels (population, topic, setting, service, workflow, medication)
   const secondaryLabels = classification.labels.filter(
     (label) =>
-      ["population", "topic", "setting", "service", "workflow"].includes(label.label_type) && label.confidence >= 0.5,
+      ["population", "topic", "setting", "service", "workflow", "medication"].includes(label.label_type) && label.confidence >= 0.5,
   );
 
   const generatedLabels = [...siteLabels, ...typeLabels, ...secondaryLabels];
diff --git a/scripts/production-readiness.ts b/scripts/production-readiness.ts
index 1030fb4bd1..dd80bce994 100644
--- a/scripts/production-readiness.ts
+++ b/scripts/production-readiness.ts
@@ -81,6 +81,15 @@ function recordNoAuthProductionCheck() {
   }
 }
 
+function recordDemoModeProductionCheck() {
+  if (
+    (process.env.NODE_ENV === "production" || process.env.VERCEL_ENV === "production") &&
+    process.env.NEXT_PUBLIC_DEMO_MODE === "true"
+  ) {
+    result.failures.push("Demo mode (NEXT_PUBLIC_DEMO_MODE=true) is enabled in a production-like environment.");
+  }
+}
+
 async function checkFileForServiceRoleExposure() {
   const envFiles = [".env", ".env.local", ".env.production", ".env.development"];
   for (const fileName of envFiles) {
@@ -103,6 +112,7 @@ async function checkFileForServiceRoleExposure() {
 async function main() {
   checkNodeRuntime();
   recordNoAuthProductionCheck();
+  recordDemoModeProductionCheck();
   await checkFileForServiceRoleExposure();
 
   if (!(await checkRequiredFile(path.join(process.cwd(), "package-lock.json"), "package-lock.json is required"))) {
diff --git a/src/app/api/answer/route.ts b/src/app/api/answer/route.ts
index 7c7c2935a0..c1eb1bec37 100644
--- a/src/app/api/answer/route.ts
+++ b/src/app/api/answer/route.ts
@@ -91,12 +91,15 @@ export async function POST(request: Request) {
       ownerId: user.id,
       queryMode: body.queryMode,
       skipCache: body.skipCache,
+      signal: request.signal,
     });
     const warnings = sourceGovernanceWarnings({
       results: answer.sources ?? [],
       relevance: answer.relevance ?? answer.smartPanel?.relevance ?? null,
     });
-    if (hasDangerSourceGovernanceWarning(warnings)) {
+    const shouldUseSourceGovernanceRefusal =
+      answer.grounded !== false && answer.confidence !== "unsupported" && answer.responseMode !== "evidence_gap";
+    if (shouldUseSourceGovernanceRefusal && hasDangerSourceGovernanceWarning(warnings)) {
       // Build the refusal explicitly — never spread ...answer here, or the original
       // (refused) sources/smartPanel/smartApiPlan would still reach the client and
       // defeat the refusal. Keep only the safe "unsupported" contract fields, matching
diff --git a/src/app/api/answer/stream/route.ts b/src/app/api/answer/stream/route.ts
index ecff1dcd3c..a54203f5f3 100644
--- a/src/app/api/answer/stream/route.ts
+++ b/src/app/api/answer/stream/route.ts
@@ -16,6 +16,7 @@ import {
 } from "@/lib/source-governance";
 import { createAdminClient } from "@/lib/supabase/admin";
 import { AuthenticationError, requireAuthenticatedUser, unauthorizedResponse } from "@/lib/supabase/auth";
+import { logger } from "@/lib/logger";
 
 export const runtime = "nodejs";
 
@@ -78,14 +79,14 @@ function streamErrorPayload(error: unknown) {
 }
 
 function logStreamError(error: unknown) {
-  console.error("Search stream failed", {
+  logger.error("Search stream failed", {
     name: error instanceof Error ? error.name : typeof error,
     message: error instanceof Error ? error.message : String(error),
     stack: error instanceof Error ? error.stack : undefined,
   });
 }
 
-function streamAnswer(body: AnswerBody, ownerId?: string) {
+function streamAnswer(body: AnswerBody, ownerId?: string, signal?: AbortSignal) {
   const encoder = new TextEncoder();
 
   return new Response(
@@ -155,12 +156,15 @@ function streamAnswer(body: AnswerBody, ownerId?: string) {
                 queryMode: body.queryMode,
                 skipCache: body.skipCache,
                 onProgress,
+                signal,
               });
           const warnings = sourceGovernanceWarnings({
             results: answer.sources ?? [],
             relevance: answer.relevance ?? answer.smartPanel?.relevance ?? null,
           });
-          if (hasDangerSourceGovernanceWarning(warnings)) {
+          const shouldUseSourceGovernanceRefusal =
+            answer.grounded !== false && answer.confidence !== "unsupported" && answer.responseMode !== "evidence_gap";
+          if (shouldUseSourceGovernanceRefusal && hasDangerSourceGovernanceWarning(warnings)) {
             // Explicit refusal payload — do not spread ...answer (see /api/answer):
             // the refused sources/smartPanel/smartApiPlan must not reach the client.
             send("final", {
@@ -202,7 +206,7 @@ function streamAnswer(body: AnswerBody, ownerId?: string) {
 export async function POST(request: Request) {
   try {
     const body = answerSchema.parse(await request.json());
-    if (isDemoMode()) return streamAnswer(body);
+    if (isDemoMode()) return streamAnswer(body, undefined, request.signal);
 
     const supabase = createAdminClient();
     const user = await requireAuthenticatedUser(request, supabase);
@@ -215,7 +219,7 @@ export async function POST(request: Request) {
     });
     if (rateLimit.limited) return rateLimitStream(rateLimit);
 
-    return streamAnswer(body, user.id);
+    return streamAnswer(body, user.id, request.signal);
   } catch (error) {
     if (error instanceof AuthenticationError) {
       return unauthorizedResponse(error);
diff --git a/src/app/api/documents/[id]/route.ts b/src/app/api/documents/[id]/route.ts
index 95799522de..b8d8483c7e 100644
--- a/src/app/api/documents/[id]/route.ts
+++ b/src/app/api/documents/[id]/route.ts
@@ -7,6 +7,7 @@ import { invalidateRagCachesForDocumentMutation } from "@/lib/rag";
 import { committedIndexGeneration, isCommittedGenerationMetadata } from "@/lib/reindex-pipeline";
 import { createAdminClient } from "@/lib/supabase/admin";
 import { AuthenticationError, requireAuthenticatedUser, unauthorizedResponse } from "@/lib/supabase/auth";
+import { writeAuditLog } from "@/lib/audit";
 
 export const runtime = "nodejs";
 
@@ -460,6 +461,13 @@ export async function PATCH(request: Request, { params }: { params: Promise<{ id
 
     if (updateError) throw new Error(updateError.message);
     invalidateRagCachesForDocumentMutation(user.id);
+    await writeAuditLog(supabase, {
+      ownerId: user.id,
+      action: "document_rename",
+      resourceType: "document",
+      resourceId: id,
+      metadata: { previousTitle: document.title, newTitle: parsed.data.title },
+    });
     return NextResponse.json({ document: updated });
   } catch (error) {
     if (error instanceof AuthenticationError) {
@@ -568,6 +576,13 @@ export async function DELETE(request: Request, { params }: { params: Promise<{ i
     if (ledgerWarning) cleanup.storageWarnings.push(ledgerWarning);
 
     invalidateRagCachesForDocumentMutation(user.id);
+    await writeAuditLog(supabase, {
+      ownerId: user.id,
+      action: "document_delete",
+      resourceType: "document",
+      resourceId: id,
+      metadata: { title: document.title, storageRemoved: cleanup.storageRemoved },
+    });
     return NextResponse.json({
       deleted: true,
       documentId: id,
diff --git a/src/app/api/health/route.ts b/src/app/api/health/route.ts
new file mode 100644
index 0000000000..f70d0264b1
--- /dev/null
+++ b/src/app/api/health/route.ts
@@ -0,0 +1,49 @@
+import { NextResponse } from "next/server";
+import { env, isDemoMode } from "@/lib/env";
+
+export const runtime = "nodejs";
+export const dynamic = "force-dynamic";
+
+// Liveness/readiness probe for load balancers and uptime monitors. It reports
+// whether the server is configured to operate for real (Supabase + OpenAI present)
+// and, with ?deep=1, whether Supabase is actually reachable. The payload exposes only
+// boolean configuration presence and operational status — never secret values.
+export async function GET(request: Request) {
+  const deep = new URL(request.url).searchParams.get("deep") === "1";
+  const supabaseConfigured = Boolean(env.NEXT_PUBLIC_SUPABASE_URL && env.SUPABASE_SERVICE_ROLE_KEY);
+
+  const checks: Record<string, "ok" | "missing" | "error" | "skipped"> = {
+    supabaseConfig: supabaseConfigured ? "ok" : "missing",
+    openaiConfig: env.OPENAI_API_KEY ? "ok" : "missing",
+  };
+
+  if (deep) {
+    if (supabaseConfigured && !isDemoMode()) {
+      try {
+        const [{ createAdminClient }, { probeSupabaseHealth }] = await Promise.all([
+          import("@/lib/supabase/admin"),
+          import("@/lib/supabase/health"),
+        ]);
+        const health = await probeSupabaseHealth(createAdminClient());
+        checks.supabase = health.ok ? "ok" : "error";
+      } catch {
+        checks.supabase = "error";
+      }
+    } else {
+      checks.supabase = "skipped";
+    }
+  }
+
+  const ready = !Object.values(checks).includes("missing") && !Object.values(checks).includes("error");
+
+  return NextResponse.json(
+    {
+      status: ready ? "ok" : "degraded",
+      demoMode: isDemoMode(),
+      timestamp: new Date().toISOString(),
+      uptimeSeconds: Math.round(process.uptime()),
+      checks,
+    },
+    { status: ready ? 200 : 503, headers: { "Cache-Control": "no-store" } },
+  );
+}
diff --git a/src/app/api/upload/route.ts b/src/app/api/upload/route.ts
index b3f3188c7d..dc2730df6e 100644
--- a/src/app/api/upload/route.ts
+++ b/src/app/api/upload/route.ts
@@ -2,7 +2,9 @@ import { randomUUID } from "node:crypto";
 import { createHash } from "node:crypto";
 import { NextResponse } from "next/server";
 import { env } from "@/lib/env";
-import { assertAllowedFile, jsonError } from "@/lib/http";
+import { assertAllowedFile, assertFileContentSignature, jsonError } from "@/lib/http";
+import { logger } from "@/lib/logger";
+import { writeAuditLog } from "@/lib/audit";
 import { planDocumentName, type SupabaseLike } from "@/lib/document-naming";
 import { createAdminClient } from "@/lib/supabase/admin";
 import { AuthenticationError, requireAuthenticatedUser, unauthorizedResponse } from "@/lib/supabase/auth";
@@ -29,6 +31,9 @@ export async function POST(request: Request) {
     const safeName = file.name.replace(/[^\w.\-() ]+/g, "_");
     const storagePath = `${user.id}/documents/${documentId}/${safeName}`;
     const buffer = Buffer.from(await file.arrayBuffer());
+    // The declared MIME type is client-supplied; verify the real byte signature
+    // before persisting a clinical document.
+    assertFileContentSignature(file.type, buffer);
     const contentHash = createHash("sha256").update(buffer).digest("hex");
 
     const { data: duplicate, error: duplicateError } = await supabase
@@ -128,13 +133,26 @@ export async function POST(request: Request) {
 
     if (jobError) throw new Error(jobError.message);
 
+    await writeAuditLog(supabase, {
+      ownerId: user.id,
+      action: "document_upload",
+      resourceType: "document",
+      resourceId: documentId,
+      metadata: { fileName: file.name, fileType: file.type, fileSize: file.size, contentHash },
+    });
+
     return NextResponse.json({ document, job }, { status: 201 });
   } catch (error) {
     if (uploadedPath && supabase) {
       try {
         await supabase.storage.from(env.SUPABASE_DOCUMENT_BUCKET).remove([uploadedPath]);
-      } catch {
-        // Preserve the original upload error response; cleanup is best-effort.
+      } catch (cleanupError) {
+        // Cleanup is best-effort, but a silent failure leaves an orphaned storage
+        // object. Record the path so it can be reconciled instead of dropping it.
+        logger.error("Upload cleanup failed; storage object may be orphaned", {
+          storagePath: uploadedPath,
+          message: cleanupError instanceof Error ? cleanupError.message : String(cleanupError),
+        });
       }
     }
 
diff --git a/src/app/globals.css b/src/app/globals.css
index e4137b84d9..1bf8d2c5ac 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -33,6 +33,7 @@
   --animate-sheet-up: sheet-up 250ms cubic-bezier(0.22, 1, 0.36, 1) both;
   --animate-sheet-left: sheet-left 220ms cubic-bezier(0.22, 1, 0.36, 1) both;
   --animate-pop-in: pop-in 180ms cubic-bezier(0.34, 1.3, 0.64, 1) both;
+  --animate-action-tray-in: action-tray-in 160ms cubic-bezier(0.22, 1, 0.36, 1) both;
   --animate-shimmer: shimmer 1.4s linear infinite;
 }
 
@@ -473,6 +474,17 @@ summary::-webkit-details-marker {
   }
 }
 
+@keyframes action-tray-in {
+  from {
+    opacity: 0;
+    transform: translateY(6px) scale(0.985);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+
 @keyframes shimmer {
   from {
     background-position: -150% 0;
diff --git a/src/app/mockups/evidence-option/page.tsx b/src/app/mockups/evidence-option/page.tsx
index 1c1108b856..1c70d20ede 100644
--- a/src/app/mockups/evidence-option/page.tsx
+++ b/src/app/mockups/evidence-option/page.tsx
@@ -1,769 +1,694 @@
 import Image from "next/image";
 import type { Metadata } from "next";
 import {
-  ArrowRight,
+  Activity,
   BadgeCheck,
   BookOpen,
-  CheckCircle2,
+  Check,
+  ChevronDown,
   ChevronRight,
+  ClipboardCheck,
   Copy,
   ExternalLink,
-  Eye,
   FileImage,
   FileSearch,
   FileText,
   Filter,
+  Image as ImageIcon,
   Layers3,
-  Library,
-  ListChecks,
-  PanelRightOpen,
+  Link2,
+  Menu,
+  Mic,
+  Plus,
   Quote,
   Search,
+  Send,
   ShieldCheck,
-  Sparkles,
-  SplitSquareHorizontal,
   Table2,
-  Target,
+  X,
   type LucideIcon,
 } from "lucide-react";
 import type { ReactNode } from "react";
 
 export const metadata: Metadata = {
-  title: "Premium Evidence Mockups - Clinical KB",
-  description: "Premium ChatGPT-style evidence workspace mockups.",
+  title: "Evidence Option Mockups - Clinical KB",
+  description: "Premium Clinical KB evidence mockups for desktop and mobile.",
 };
 
-type Tone = "green" | "amber" | "blue" | "graphite";
+type EvidenceObject = {
+  title: string;
+  type: "Table" | "Quote" | "Image" | "PDF region";
+  source: string;
+  page: string;
+  support: string;
+  detail: string;
+  icon: LucideIcon;
+};
 
-const evidenceItems = [
+const objects: EvidenceObject[] = [
   {
     title: "ANC monitoring frequency table",
-    kind: "Table",
+    type: "Table",
     source: "Clozapine physical health protocol",
-    meta: "p. 12 - 97% direct support",
-    summary: "Baseline and ongoing blood monitoring cadence with hold thresholds.",
+    page: "p.12",
+    support: "97% direct",
+    detail: "Baseline checks, weekly cadence, and escalation thresholds.",
     icon: Table2,
-    tone: "green",
   },
   {
     title: "Constipation escalation passage",
-    kind: "Quote",
+    type: "Quote",
     source: "Clozapine safety bulletin",
-    meta: "p. 4 - exact quote",
-    summary: "Same-day review wording for severe constipation and abdominal symptoms.",
+    page: "p.4",
+    support: "Exact quote",
+    detail: "Same-day review wording for severe constipation symptoms.",
     icon: Quote,
-    tone: "blue",
   },
   {
     title: "Observation pathway crop",
-    kind: "Image",
+    type: "Image",
     source: "Acute behavioural disturbance pathway",
-    meta: "p. 8 - visual extraction",
-    summary: "Diagram labels, observation frequency, and escalation checkpoints.",
+    page: "p.8",
+    support: "Visual evidence",
+    detail: "Flow diagram, labels, and adjacent explanatory text.",
     icon: FileImage,
-    tone: "graphite",
-  },
-  {
-    title: "Lithium toxicity threshold span",
-    kind: "Document span",
-    source: "Lithium monitoring guideline",
-    meta: "p. 6 - review due",
-    summary: "Older local passage retained with date and governance warning.",
-    icon: FileText,
-    tone: "amber",
   },
+];
+
+const objectCounts = [
+  ["Tables", "621", Table2],
+  ["Quotes", "8,904", Quote],
+  ["Images", "2,840", ImageIcon],
+  ["PDF regions", "4,221", FileSearch],
+  ["Documents", "1,834", FileText],
 ] as const;
 
 const tableRows = [
   ["Baseline", "FBC, LFT, U&E, lipids, glucose", "Before initiation"],
-  ["Weekly", "FBC/ANC", "Initial titration phase"],
-  ["Escalate", "Chest pain, fever, severe constipation", "Urgent medical review"],
+  ["Weekly", "FBC/ANC", "Initial titration"],
+  ["Escalate", "Chest pain, fever, constipation", "Urgent review"],
 ] as const;
 
-const sourceKinds = [
-  ["Tables", "621", Table2],
-  ["Quotes", "8,904", Quote],
-  ["Images", "2,840", FileImage],
-  ["PDF regions", "4,221", FileSearch],
-  ["Document pages", "1,834", FileText],
-] as const;
+const focusRing =
+  "focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]";
 
-function tone(t: Tone) {
-  if (t === "green") return "border-emerald-200 bg-emerald-50 text-emerald-800";
-  if (t === "amber") return "border-amber-200 bg-amber-50 text-amber-800";
-  if (t === "blue") return "border-sky-200 bg-sky-50 text-sky-800";
-  return "border-zinc-200 bg-zinc-100 text-zinc-700";
+function cn(...classes: Array<string | false | null | undefined>) {
+  return classes.filter(Boolean).join(" ");
 }
 
-function Badge({ children, variant = "graphite" }: { children: ReactNode; variant?: Tone }) {
+function IconTile({ icon: Icon, strong = false }: { icon: LucideIcon; strong?: boolean }) {
   return (
     <span
-      className={`inline-flex min-h-7 items-center gap-1.5 rounded-full border px-2.5 text-xs font-medium ${tone(variant)}`}
+      className={cn(
+        "grid shrink-0 place-items-center rounded-lg shadow-[var(--shadow-inset)]",
+        strong
+          ? "h-11 w-11 bg-[color:var(--clinical-chat-teal)] text-white"
+          : "h-10 w-10 border border-[color:var(--clinical-chat-teal)]/15 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+      )}
     >
-      {children}
+      <Icon className="h-5 w-5" />
     </span>
   );
 }
 
-function Glyph({ icon: Icon, variant = "graphite" }: { icon: LucideIcon; variant?: Tone }) {
+function Pill({
+  children,
+  active = false,
+  tone = "neutral",
+}: {
+  children: ReactNode;
+  active?: boolean;
+  tone?: "neutral" | "success" | "warning";
+}) {
   return (
-    <span className={`grid h-10 w-10 shrink-0 place-items-center rounded-full border ${tone(variant)}`}>
-      <Icon className="h-4 w-4" />
+    <span
+      className={cn(
+        "inline-flex min-h-7 max-w-full items-center gap-1.5 rounded-md border px-2 text-xs font-bold shadow-[var(--shadow-inset)]",
+        active && "border-[color:var(--clinical-chat-teal)]/25 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+        !active &&
+          tone === "success" &&
+          "border-[color:var(--success-border)] bg-[color:var(--success-soft)] text-[color:var(--success)]",
+        !active &&
+          tone === "warning" &&
+          "border-[color:var(--warning-border)] bg-[color:var(--warning-soft)] text-[color:var(--warning)]",
+        !active &&
+          tone === "neutral" &&
+          "border-[color:var(--border)] bg-[color:var(--surface-raised)] text-[color:var(--text-muted)]",
+      )}
+    >
+      {children}
     </span>
   );
 }
 
-function GhostButton({
+function ActionButton({
   children,
   icon: Icon,
   primary = false,
 }: {
   children: ReactNode;
-  icon?: LucideIcon;
+  icon: LucideIcon;
   primary?: boolean;
 }) {
   return (
     <button
       type="button"
-      className={
+      className={cn(
+        "inline-flex min-h-11 min-w-0 items-center justify-center gap-2 rounded-lg px-3 text-sm font-semibold shadow-[var(--shadow-inset)] transition",
+        focusRing,
         primary
-          ? "inline-flex min-h-10 items-center justify-center gap-2 rounded-full bg-[#101010] px-4 text-sm font-semibold text-white shadow-[0_10px_30px_rgb(0_0_0_/_14%)]"
-          : "inline-flex min-h-10 items-center justify-center gap-2 rounded-full border border-zinc-200 bg-white px-4 text-sm font-semibold text-zinc-700 shadow-[0_1px_0_rgb(0_0_0_/_4%)]"
-      }
+          ? "bg-[color:var(--clinical-chat-teal)] text-white shadow-[var(--shadow-tight)]"
+          : "border border-[color:var(--border-lux)] bg-[color:var(--surface-raised)] text-[color:var(--text)]",
+      )}
     >
-      {Icon ? <Icon className="h-4 w-4" /> : null}
-      {children}
+      <Icon className="h-4 w-4 shrink-0" />
+      <span className="truncate">{children}</span>
     </button>
   );
 }
 
-function Section({ title, body, children }: { title: string; body: string; children: ReactNode }) {
+function Composer({ placeholder = "Ask a clinical question..." }: { placeholder?: string }) {
   return (
-    <section className="space-y-4">
-      <div className="mx-auto max-w-4xl text-center">
-        <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Premium evidence direction</p>
-        <h2 className="mt-2 text-2xl font-semibold text-zinc-950">{title}</h2>
-        <p className="mt-2 text-sm leading-6 text-zinc-600">{body}</p>
-      </div>
-      <div className="grid gap-5">{children}</div>
-    </section>
+    <div className="flex min-h-[56px] items-center gap-2 rounded-full border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] px-2 shadow-[var(--shadow-lux)] ring-1 ring-white/35 backdrop-blur-xl">
+      <button type="button" aria-label="Add" className="grid h-11 w-11 shrink-0 place-items-center rounded-full text-[color:var(--text-muted)]">
+        <Plus className="h-5 w-5" />
+      </button>
+      <span className="min-w-0 flex-1 truncate px-1 text-base font-medium text-[color:var(--text-soft)]">{placeholder}</span>
+      <Mic className="h-5 w-5 shrink-0 text-[color:var(--text-muted)]" />
+      <button type="button" aria-label="Send" className="grid h-11 w-11 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal)] text-white shadow-[var(--shadow-tight)]">
+        <Send className="h-5 w-5" />
+      </button>
+    </div>
   );
 }
 
-function Frame({ label, title, children }: { label: string; title: string; children: ReactNode }) {
+function DesktopChrome({ children, mode = "Evidence" }: { children: ReactNode; mode?: string }) {
   return (
-    <article className="overflow-hidden rounded-[1.35rem] border border-zinc-200 bg-white shadow-[0_24px_80px_rgb(15_15_15_/_8%)]">
-      <div className="flex flex-wrap items-center justify-between gap-3 border-b border-zinc-100 px-5 py-4">
-        <div>
-          <p className="text-xs font-semibold uppercase tracking-[0.12em] text-zinc-500">{label}</p>
-          <h3 className="mt-1 text-lg font-semibold text-zinc-950">{title}</h3>
+    <div className="relative h-[620px] overflow-hidden rounded-[1.35rem] border border-[color:var(--border-lux)] bg-[color:var(--surface)] text-[color:var(--text)] shadow-[0_24px_70px_rgb(15_31_38_/_14%)]">
+      <header className="flex h-16 items-center border-b border-[color:var(--border)] bg-[color:var(--surface-lux)] px-4 shadow-[var(--shadow-tight)]">
+        <button type="button" aria-label="Menu" className="grid h-11 w-11 place-items-center rounded-lg text-[color:var(--text-muted)]">
+          <Menu className="h-5 w-5" />
+        </button>
+        <div className="ml-3 inline-grid h-11 min-w-56 grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 rounded-full border border-[color:var(--border)] bg-[color:var(--surface)] px-2.5 shadow-[var(--shadow-inset)]">
+          <span className="grid h-8 w-8 place-items-center rounded-full bg-[color:var(--clinical-chat-teal)] text-white">
+            <Layers3 className="h-4 w-4" />
+          </span>
+          <span className="min-w-0">
+            <span className="block text-[10px] font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">Mode</span>
+            <span className="block truncate text-sm font-semibold text-[color:var(--text-heading)]">{mode}</span>
+          </span>
+          <ChevronDown className="h-4 w-4 text-[color:var(--text-soft)]" />
         </div>
-        <Badge variant="green">
-          <Eye className="h-3.5 w-3.5" />
-          Premium mockup
-        </Badge>
-      </div>
-      <div className="bg-[radial-gradient(circle_at_top_left,rgb(16_163_127_/_0.08),transparent_34%),linear-gradient(180deg,#ffffff,#f8f9f8)] p-5">
-        {children}
+        <div className="ml-auto flex items-center gap-2">
+          <button type="button" className="inline-flex h-10 items-center gap-2 rounded-full border border-[color:var(--border)] bg-[color:var(--surface)] px-3 text-sm font-semibold text-[color:var(--text-muted)]">
+            <BookOpen className="h-4 w-4" /> All sources
+          </button>
+          <button type="button" className="inline-flex h-10 items-center gap-2 rounded-full border border-[color:var(--border)] bg-[color:var(--surface)] px-3 text-sm font-semibold text-[color:var(--text-heading)]">
+            <Plus className="h-4 w-4" /> New chat
+          </button>
+          <span className="grid h-10 w-10 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-xs font-bold text-[color:var(--clinical-chat-teal)]">
+            AK
+          </span>
+        </div>
+      </header>
+      <div className="grid h-[calc(100%-4rem)] grid-cols-[14rem_minmax(0,1fr)]">
+        <aside className="border-r border-[color:var(--border)] bg-[color:var(--surface-raised)] px-3 py-4">
+          <div className="flex items-center gap-3">
+            <IconTile icon={ShieldCheck} />
+            <div>
+              <p className="font-semibold text-[color:var(--text-heading)]">Clinical Guide</p>
+              <p className="text-xs text-[color:var(--text-muted)]">Source-backed workspace</p>
+            </div>
+          </div>
+          <button type="button" className="mt-4 inline-flex h-11 w-full items-center justify-center gap-2 rounded-lg bg-[color:var(--clinical-chat-teal)] text-sm font-semibold text-white shadow-[var(--shadow-tight)]">
+            <Plus className="h-4 w-4" /> New chat
+          </button>
+          <div className="mt-5 space-y-1">
+            {[
+              ["Answer", Activity],
+              ["Documents", FileText],
+              ["Evidence", Layers3],
+              ["Favourites", ClipboardCheck],
+            ].map(([label, Icon]) => (
+              <div
+                key={label as string}
+                className={cn(
+                  "flex min-h-10 items-center gap-2 rounded-lg px-2.5 text-sm font-semibold",
+                  label === "Evidence"
+                    ? "bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]"
+                    : "text-[color:var(--text-muted)]",
+                )}
+              >
+                <Icon className="h-4 w-4" />
+                {label as string}
+              </div>
+            ))}
+          </div>
+          <div className="absolute bottom-4 left-3 right-[calc(100%-14rem+0.75rem)] rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] p-3 shadow-[var(--shadow-inset)]">
+            <p className="text-xs font-bold text-[color:var(--text-soft)]">Indexed evidence</p>
+            <p className="mt-1 text-lg font-semibold text-[color:var(--text-heading)]">18,420</p>
+          </div>
+        </aside>
+        <main className="relative min-w-0 overflow-hidden px-6 py-5">
+          {children}
+          <div className="absolute inset-x-8 bottom-4">
+            <Composer placeholder="Search evidence objects..." />
+          </div>
+        </main>
       </div>
-    </article>
-  );
-}
-
-function SearchBar({ placeholder }: { placeholder: string }) {
-  return (
-    <div className="flex min-h-13 items-center gap-3 rounded-full border border-zinc-200 bg-white px-4 shadow-[0_14px_50px_rgb(15_15_15_/_8%)]">
-      <Search className="h-4 w-4 shrink-0 text-emerald-700" />
-      <span className="min-w-0 flex-1 truncate text-sm font-medium text-zinc-600">{placeholder}</span>
-      <span className="hidden rounded-full bg-[#101010] px-3 py-1.5 text-xs font-semibold text-white sm:inline-flex">
-        Ask evidence
-      </span>
     </div>
   );
 }
 
-function EvidenceCard({ item, compact = false }: { item: (typeof evidenceItems)[number]; compact?: boolean }) {
+function PhoneChrome({ children, sheet = false }: { children: ReactNode; sheet?: boolean }) {
   return (
-    <div className="rounded-2xl border border-zinc-200 bg-white p-4 shadow-[0_10px_40px_rgb(0_0_0_/_5%)]">
-      <div className="grid gap-3 sm:grid-cols-[auto_minmax(0,1fr)_auto] sm:items-start">
-        <Glyph icon={item.icon} variant={item.tone as Tone} />
-        <div className="min-w-0">
-          <div className="flex flex-wrap gap-2">
-            <Badge>{item.kind}</Badge>
-            <Badge variant={item.tone as Tone}>{item.meta}</Badge>
-          </div>
-          <h4 className="mt-3 text-sm font-semibold text-zinc-950">{item.title}</h4>
-          <p className="mt-1 text-sm leading-6 text-zinc-600">{item.summary}</p>
-          {!compact ? <p className="mt-2 text-xs font-semibold text-zinc-500">{item.source}</p> : null}
+    <div className="relative h-[620px] overflow-hidden rounded-[2rem] border border-[color:var(--border-lux)] bg-[color:var(--surface)] text-[color:var(--text)] shadow-[0_24px_70px_rgb(15_31_38_/_18%)]">
+      <header className="flex h-[4.5rem] items-center justify-between border-b border-[color:var(--border)] bg-[color:var(--surface-lux)] px-4 shadow-[var(--shadow-tight)]">
+        <Menu className="h-6 w-6 text-[color:var(--text-muted)]" />
+        <div className="inline-grid h-12 min-w-40 grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 rounded-full border border-[color:var(--border)] bg-[color:var(--surface)] px-2 shadow-[var(--shadow-inset)]">
+          <span className="grid h-8 w-8 place-items-center rounded-full bg-[color:var(--clinical-chat-teal)] text-white">
+            <Layers3 className="h-4 w-4" />
+          </span>
+          <span>
+            <span className="block text-[10px] font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">Mode</span>
+            <span className="block text-sm font-semibold text-[color:var(--text-heading)]">Evidence</span>
+          </span>
+          <ChevronDown className="h-4 w-4 text-[color:var(--text-soft)]" />
         </div>
-        <button
-          type="button"
-          className="grid h-10 w-10 place-items-center rounded-full border border-zinc-200 bg-zinc-50 text-zinc-700"
-        >
-          <ArrowRight className="h-4 w-4" />
-        </button>
+        <Plus className="h-6 w-6 text-[color:var(--text-muted)]" />
+      </header>
+      <main className={cn("h-[calc(100%-4.5rem)] overflow-hidden", sheet && "bg-[color:var(--text-heading)]/30")}>{children}</main>
+      <div className="absolute inset-x-3 bottom-3">
+        <Composer placeholder="Search evidence..." />
       </div>
     </div>
   );
 }
 
-function EvidenceTable() {
+function MockupPair({
+  id,
+  title,
+  description,
+  desktop,
+  phone,
+}: {
+  id: string;
+  title: string;
+  description: string;
+  desktop: ReactNode;
+  phone: ReactNode;
+}) {
   return (
-    <div className="overflow-hidden rounded-2xl border border-zinc-200 bg-white">
-      <div className="grid grid-cols-[0.8fr_1.3fr_1fr] bg-zinc-950 text-xs font-semibold text-white">
-        <span className="border-r border-white/10 p-3">Stage</span>
-        <span className="border-r border-white/10 p-3">Evidence</span>
-        <span className="p-3">Action</span>
-      </div>
-      {tableRows.map(([stage, evidence, action]) => (
-        <div key={stage} className="grid grid-cols-[0.8fr_1.3fr_1fr] border-t border-zinc-100 text-xs text-zinc-600">
-          <span className="border-r border-zinc-100 p-3 font-semibold text-zinc-950">{stage}</span>
-          <span className="border-r border-zinc-100 p-3">{evidence}</span>
-          <span className="p-3">{action}</span>
+    <section data-mockup={id} className="rounded-[1.5rem] border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] p-4 shadow-[var(--shadow-soft)]">
+      <div className="mb-4 flex flex-wrap items-end justify-between gap-3">
+        <div>
+          <p className="text-xs font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">Evidence option</p>
+          <h2 className="mt-1 text-xl font-semibold text-[color:var(--text-heading)]">{title}</h2>
+          <p className="mt-1 max-w-3xl text-sm leading-6 text-[color:var(--text-muted)]">{description}</p>
         </div>
-      ))}
-    </div>
-  );
-}
-
-function TopNav() {
-  return (
-    <div className="flex flex-wrap items-center justify-between gap-3 rounded-full border border-zinc-200 bg-white/90 px-3 py-2 shadow-[0_12px_50px_rgb(0_0_0_/_7%)]">
-      <div className="flex items-center gap-2">
-        <span className="grid h-9 w-9 place-items-center rounded-full bg-[#101010] text-white">
-          <Sparkles className="h-4 w-4" />
-        </span>
-        <span className="text-sm font-semibold text-zinc-950">Clinical KB Evidence</span>
+        <Pill active>PC + phone</Pill>
       </div>
-      <div className="flex flex-wrap gap-1">
-        {["Home", "Search", "Tables", "Images", "Quotes"].map((item, index) => (
-          <span
-            key={item}
-            className={`rounded-full px-3 py-1.5 text-xs font-semibold ${index === 0 ? "bg-zinc-950 text-white" : "text-zinc-600"}`}
-          >
-            {item}
-          </span>
-        ))}
+      <div className="grid items-start gap-4 xl:grid-cols-[minmax(0,1fr)_320px]">
+        {desktop}
+        <div className="mx-auto w-full max-w-[320px]">{phone}</div>
       </div>
-    </div>
+    </section>
   );
 }
 
-function HomeOne() {
+function EvidenceObjectRow({ item, selected = false }: { item: EvidenceObject; selected?: boolean }) {
+  const Icon = item.icon;
   return (
-    <Frame label="Home 1" title="AI evidence studio">
-      <div className="space-y-5">
-        <TopNav />
-        <div className="grid grid-cols-1 gap-5 xl:grid-cols-[minmax(0,1fr)_20rem]">
-          <div className="space-y-4">
-            <div className="rounded-[1.6rem] bg-[#101010] p-6 text-white shadow-[0_24px_90px_rgb(0_0_0_/_18%)]">
-              <p className="text-xs font-semibold uppercase tracking-[0.15em] text-white/55">Evidence workspace</p>
-              <h4 className="mt-3 max-w-2xl text-3xl font-semibold tracking-normal">
-                Ask across every document part with source-grade confidence.
-              </h4>
-              <p className="mt-3 max-w-2xl text-sm leading-6 text-white/68">
-                Search images, extracted tables, exact quotes, PDF regions, and source spans without leaving the answer
-                workflow.
-              </p>
-              <div className="mt-5">
-                <SearchBar placeholder="Find the exact table, quote, or image behind clozapine monitoring..." />
-              </div>
-            </div>
-            <div className="grid gap-3 md:grid-cols-3">
-              {sourceKinds.slice(0, 3).map(([label, count, Icon], index) => (
-                <div key={label} className="rounded-2xl border border-zinc-200 bg-white p-4">
-                  <Glyph icon={Icon} variant={index === 0 ? "green" : index === 1 ? "blue" : "graphite"} />
-                  <p className="mt-3 text-sm font-semibold text-zinc-950">{label}</p>
-                  <p className="mt-1 text-2xl font-semibold text-zinc-950">{count}</p>
-                </div>
-              ))}
-            </div>
-          </div>
-          <aside className="rounded-[1.4rem] border border-zinc-200 bg-white p-4 shadow-[0_12px_50px_rgb(0_0_0_/_6%)]">
-            <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Priority review</p>
-            <div className="mt-4 space-y-3">
-              {evidenceItems.map((item) => (
-                <EvidenceCard key={item.title} item={item} compact />
-              ))}
-            </div>
-          </aside>
+    <div
+      className={cn(
+        "grid min-h-[76px] grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 rounded-lg border px-3 py-2 shadow-[var(--shadow-inset)]",
+        selected
+          ? "border-[color:var(--clinical-chat-teal)]/30 bg-[color:var(--clinical-chat-teal-soft)]/45"
+          : "border-[color:var(--border)] bg-[color:var(--surface)]",
+      )}
+    >
+      <IconTile icon={Icon} />
+      <div className="min-w-0">
+        <div className="flex min-w-0 flex-wrap items-center gap-2">
+          <p className="truncate text-sm font-semibold text-[color:var(--text-heading)]">{item.title}</p>
+          <Pill active={selected}>{item.type}</Pill>
         </div>
+        <p className="mt-1 truncate text-xs text-[color:var(--text-muted)]">
+          {item.source} - {item.page} - {item.support}
+        </p>
+        <p className="mt-0.5 truncate text-xs text-[color:var(--text-soft)]">{item.detail}</p>
       </div>
-    </Frame>
+      <ChevronRight className="h-5 w-5 text-[color:var(--text-soft)]" />
+    </div>
   );
 }
 
-function HomeTwo() {
+function EvidenceHomeDesktop() {
   return (
-    <Frame label="Home 2" title="Object-first evidence library">
-      <div className="grid grid-cols-1 gap-5 xl:grid-cols-[18rem_minmax(0,1fr)]">
-        <aside className="rounded-[1.4rem] bg-zinc-950 p-4 text-white">
-          <p className="text-xs font-semibold uppercase tracking-[0.14em] text-white/45">Library objects</p>
-          <div className="mt-4 grid gap-2">
-            {sourceKinds.map(([label, count, Icon], index) => (
-              <div
-                key={label}
-                className={`flex items-center justify-between rounded-2xl px-3 py-3 ${index === 0 ? "bg-white text-zinc-950" : "bg-white/6 text-white/75"}`}
-              >
-                <span className="flex items-center gap-2 text-sm font-semibold">
-                  <Icon className="h-4 w-4" />
-                  {label}
-                </span>
-                <span className="text-xs font-semibold">{count}</span>
-              </div>
-            ))}
-          </div>
-        </aside>
-        <div className="space-y-4">
-          <SearchBar placeholder="Search across tables, figures, document text, images, and citations..." />
-          <div className="grid gap-4 md:grid-cols-2">
-            <div className="rounded-[1.4rem] border border-zinc-200 bg-white p-5">
-              <Glyph icon={Table2} variant="green" />
-              <h4 className="mt-4 text-xl font-semibold text-zinc-950">Tables as first-class evidence</h4>
-              <p className="mt-2 text-sm leading-6 text-zinc-600">
-                Extracted rows, image crop, source page, confidence, and quote-level provenance in one place.
-              </p>
-              <div className="mt-4">
-                <EvidenceTable />
+    <DesktopChrome>
+      <div className="mx-auto max-w-3xl pt-12 text-center">
+        <IconTile icon={Layers3} strong />
+        <h3 className="mt-5 text-3xl font-semibold text-[color:var(--text-heading)]">Evidence</h3>
+        <p className="mx-auto mt-2 max-w-xl text-sm leading-6 text-[color:var(--text-muted)]">
+          Find, inspect, and reuse exact tables, images, quotes, PDF regions, and document spans.
+        </p>
+        <div className="mx-auto mt-7 overflow-hidden rounded-xl border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] text-left shadow-[var(--shadow-soft)]">
+          {[
+            ["Search evidence objects", "Search every extracted table, quote, figure, and page region", Search],
+            ["Review recent evidence", "Continue checking the objects used in recent answers", ClipboardCheck],
+            ["Open source map", "Follow an evidence object back through document, section, and page", Link2],
+          ].map(([title, body, Icon]) => (
+            <div key={title as string} className="grid min-h-[78px] grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-b border-[color:var(--border)] px-4 last:border-b-0">
+              <IconTile icon={Icon as LucideIcon} />
+              <div className="min-w-0">
+                <p className="text-sm font-semibold text-[color:var(--text-heading)]">{title as string}</p>
+                <p className="mt-1 text-xs text-[color:var(--text-muted)]">{body as string}</p>
               </div>
+              <ChevronRight className="h-5 w-5 text-[color:var(--text-soft)]" />
             </div>
-            <div className="rounded-[1.4rem] border border-zinc-200 bg-white p-5">
-              <Glyph icon={FileImage} variant="graphite" />
-              <h4 className="mt-4 text-xl font-semibold text-zinc-950">Images with inspection tools</h4>
-              <p className="mt-2 text-sm leading-6 text-zinc-600">
-                Page crops, figure labels, region highlights, and source text shown together.
-              </p>
-              <Image
-                src="/demo-documents/risk-flow.png"
-                alt="Risk flow evidence preview"
-                width={240}
-                height={72}
-                loading="eager"
-                unoptimized
-                className="mt-4 w-full rounded-2xl border border-zinc-200 object-contain"
-              />
-            </div>
-          </div>
+          ))}
         </div>
-      </div>
-    </Frame>
-  );
-}
-
-function HomeThree() {
-  return (
-    <Frame label="Home 3" title="Conversation-led evidence home">
-      <div className="grid grid-cols-1 gap-5 xl:grid-cols-[minmax(0,1fr)_22rem]">
-        <div className="rounded-[1.6rem] border border-zinc-200 bg-white p-5 shadow-[0_18px_70px_rgb(0_0_0_/_7%)]">
-          <div className="flex items-start gap-3">
-            <span className="grid h-10 w-10 place-items-center rounded-full bg-[#101010] text-white">
-              <Sparkles className="h-4 w-4" />
-            </span>
-            <div className="min-w-0 flex-1">
-              <p className="text-sm font-semibold text-zinc-950">What evidence do you need?</p>
-              <p className="mt-1 text-sm leading-6 text-zinc-600">
-                Ask for a document part directly, then refine by source, date, type, confidence, or clinical domain.
-              </p>
-              <div className="mt-4 grid gap-2">
-                {[
-                  "Show the table behind ANC monitoring",
-                  "Find the exact constipation quote",
-                  "Open the pathway image and neighbouring text",
-                ].map((prompt) => (
-                  <button
-                    key={prompt}
-                    type="button"
-                    className="flex min-h-11 items-center justify-between rounded-2xl border border-zinc-200 bg-zinc-50 px-4 text-left text-sm font-semibold text-zinc-800"
-                  >
-                    {prompt}
-                    <ArrowRight className="h-4 w-4" />
-                  </button>
-                ))}
+        <div className="mt-5 grid grid-cols-3 gap-2 text-left">
+          {objectCounts.slice(0, 3).map(([label, count, Icon]) => (
+            <div key={label} className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-3 shadow-[var(--shadow-inset)]">
+              <div className="flex items-center justify-between gap-2">
+                <Icon className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" />
+                <span className="text-xs font-bold text-[color:var(--clinical-chat-teal)]">{count}</span>
               </div>
+              <p className="mt-2 text-sm font-semibold text-[color:var(--text-heading)]">{label}</p>
             </div>
-          </div>
+          ))}
         </div>
-        <aside className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-          <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Quality signal</p>
-          <div className="mt-4 space-y-3">
-            {[
-              ["Extraction", "Strong", "green"],
-              ["Lineage", "Complete", "green"],
-              ["Currency", "6 review due", "amber"],
-              ["Answer use", "High", "blue"],
-            ].map(([label, value, variant]) => (
-              <div
-                key={label}
-                className="flex items-center justify-between border-b border-zinc-100 pb-3 last:border-b-0 last:pb-0"
-              >
-                <span className="text-sm font-medium text-zinc-600">{label}</span>
-                <Badge variant={variant as Tone}>{value}</Badge>
-              </div>
-            ))}
-          </div>
-        </aside>
       </div>
-    </Frame>
+    </DesktopChrome>
   );
 }
 
-function SearchOne() {
+function EvidenceHomePhone() {
   return (
-    <Frame label="Search 1" title="Premium ranked search">
-      <div className="space-y-5">
-        <SearchBar placeholder="clozapine myocarditis monitoring table" />
-        <div className="flex flex-wrap gap-2">
-          {sourceKinds.map(([label, count, Icon], index) => (
-            <button
-              key={label}
-              type="button"
-              className={`inline-flex min-h-10 items-center gap-2 rounded-full border px-3 text-sm font-semibold ${index === 0 ? "border-zinc-950 bg-zinc-950 text-white" : "border-zinc-200 bg-white text-zinc-700"}`}
-            >
-              <Icon className="h-4 w-4" />
-              {label}
-              <span className="text-xs opacity-65">{count}</span>
-            </button>
+    <PhoneChrome>
+      <div className="px-4 py-5">
+        <IconTile icon={Layers3} strong />
+        <h3 className="mt-4 text-2xl font-semibold text-[color:var(--text-heading)]">Evidence</h3>
+        <p className="mt-2 text-sm leading-6 text-[color:var(--text-muted)]">Open the exact object behind an answer.</p>
+        <div className="mt-5 overflow-hidden rounded-xl border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-soft)]">
+          {[
+            ["Search evidence", Search],
+            ["Recent objects", ClipboardCheck],
+            ["Source map", Link2],
+          ].map(([label, Icon]) => (
+            <div key={label as string} className="grid min-h-[64px] grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-b border-[color:var(--border)] px-3 last:border-b-0">
+              <IconTile icon={Icon as LucideIcon} />
+              <p className="font-semibold text-[color:var(--text-heading)]">{label as string}</p>
+              <ChevronRight className="h-5 w-5 text-[color:var(--text-soft)]" />
+            </div>
           ))}
         </div>
-        <div className="grid grid-cols-1 gap-5 xl:grid-cols-[minmax(0,1fr)_22rem]">
-          <div className="space-y-3">
-            {evidenceItems.map((item) => (
-              <EvidenceCard key={item.title} item={item} />
-            ))}
-          </div>
-          <aside className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-            <div className="flex items-center gap-2">
-              <Glyph icon={PanelRightOpen} variant="green" />
-              <div>
-                <p className="text-sm font-semibold text-zinc-950">Live preview</p>
-                <p className="text-xs text-zinc-500">ANC monitoring frequency table</p>
-              </div>
-            </div>
-            <div className="mt-4">
-              <EvidenceTable />
-            </div>
-          </aside>
+        <div className="mt-5 rounded-xl border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-3 shadow-[var(--shadow-inset)]">
+          <p className="text-xs font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">Recent</p>
+          <p className="mt-2 text-sm font-semibold text-[color:var(--text-heading)]">ANC monitoring frequency table</p>
+          <p className="mt-1 text-xs text-[color:var(--text-muted)]">p.12 - 97% direct</p>
         </div>
       </div>
-    </Frame>
+    </PhoneChrome>
   );
 }
 
-function SearchTwo() {
+function EvidenceSearchDesktop() {
   return (
-    <Frame label="Search 2" title="Filter-led source finding">
-      <div className="grid grid-cols-1 gap-5 xl:grid-cols-[18rem_minmax(0,1fr)]">
-        <aside className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-          <div className="flex items-center justify-between">
-            <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Filters</p>
-            <Filter className="h-4 w-4 text-zinc-500" />
+    <DesktopChrome>
+      <div className="grid h-[calc(100%-5rem)] grid-cols-[minmax(0,1fr)_22rem] gap-4 pb-16">
+        <section className="min-w-0 space-y-3">
+          <div className="flex min-h-14 items-center gap-3 rounded-full border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] px-4 shadow-[var(--shadow-soft)]">
+            <Search className="h-5 w-5 text-[color:var(--clinical-chat-teal)]" />
+            <span className="min-w-0 flex-1 truncate text-sm font-semibold text-[color:var(--text-heading)]">clozapine constipation monitoring table</span>
+            <Filter className="h-4 w-4 text-[color:var(--text-muted)]" />
           </div>
-          <div className="mt-4 grid gap-2">
-            {["Evidence type", "Clinical topic", "Source status", "Document family", "Confidence"].map((item) => (
-              <button
-                key={item}
-                type="button"
-                className="flex min-h-11 items-center justify-between rounded-2xl border border-zinc-200 bg-zinc-50 px-3 text-sm font-semibold text-zinc-700"
-              >
-                {item}
-                <ChevronRight className="h-4 w-4" />
-              </button>
-            ))}
+          <div className="flex flex-wrap gap-2">
+            <Pill active>All objects</Pill>
+            <Pill>Tables</Pill>
+            <Pill>Quotes</Pill>
+            <Pill>Images</Pill>
+            <Pill>Reviewed only</Pill>
           </div>
-        </aside>
-        <div className="space-y-4">
-          <SearchBar placeholder="Find evidence for constipation escalation in clozapine" />
-          <div className="grid gap-3 lg:grid-cols-2">
-            {evidenceItems.map((item) => (
-              <EvidenceCard key={item.title} item={item} compact />
+          <div className="space-y-2">
+            {objects.map((item, index) => (
+              <EvidenceObjectRow key={item.title} item={item} selected={index === 0} />
             ))}
           </div>
-        </div>
+          <div className="rounded-xl border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-3 shadow-[var(--shadow-inset)]">
+            <p className="text-xs font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">Source trail</p>
+            <div className="mt-3 flex flex-wrap items-center gap-2 text-xs font-semibold text-[color:var(--text-muted)]">
+              <Pill active>Clozapine protocol</Pill>
+              <ChevronRight className="h-4 w-4" />
+              <Pill>Monitoring</Pill>
+              <ChevronRight className="h-4 w-4" />
+              <Pill>Table 2</Pill>
+            </div>
+          </div>
+        </section>
+        <aside className="overflow-hidden rounded-xl border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-soft)]">
+          <div className="border-b border-[color:var(--border)] p-4">
+            <div className="flex items-start justify-between gap-3">
+              <IconTile icon={Table2} />
+              <Pill tone="success">97% direct</Pill>
+            </div>
+            <h3 className="mt-3 text-base font-semibold text-[color:var(--text-heading)]">ANC monitoring frequency table</h3>
+            <p className="mt-1 text-xs leading-5 text-[color:var(--text-muted)]">Clozapine physical health protocol - p.12</p>
+          </div>
+          <div className="p-4">
+            <div className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] shadow-[var(--shadow-inset)]">
+              <table className="w-full text-left text-xs">
+                <thead className="bg-[color:var(--clinical-chat-table-header)] text-[color:var(--text-muted)]">
+                  <tr>
+                    <th className="px-3 py-2 font-bold">Stage</th>
+                    <th className="px-3 py-2 font-bold">Evidence</th>
+                  </tr>
+                </thead>
+                <tbody className="divide-y divide-[color:var(--border)]">
+                  {tableRows.map(([stage, evidence]) => (
+                    <tr key={stage}>
+                      <td className="px-3 py-2 font-semibold text-[color:var(--text-heading)]">{stage}</td>
+                      <td className="px-3 py-2 text-[color:var(--text-muted)]">{evidence}</td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+            <div className="mt-4 grid grid-cols-2 gap-2">
+              <ActionButton icon={ExternalLink}>Open source</ActionButton>
+              <ActionButton icon={Copy}>Copy citation</ActionButton>
+            </div>
+          </div>
+        </aside>
       </div>
-    </Frame>
+    </DesktopChrome>
   );
 }
 
-function SearchThree() {
+function EvidenceSearchPhone() {
   return (
-    <Frame label="Search 3" title="Answer-support clustering">
-      <div className="space-y-5">
-        <div className="rounded-[1.4rem] bg-zinc-950 p-5 text-white">
-          <p className="text-xs font-semibold uppercase tracking-[0.15em] text-white/45">Evidence query</p>
-          <div className="mt-3 grid gap-4 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-center">
-            <h4 className="text-2xl font-semibold">What supports weekly ANC monitoring during clozapine initiation?</h4>
-            <GhostButton primary icon={Sparkles}>
-              Build evidence pack
-            </GhostButton>
-          </div>
+    <PhoneChrome sheet>
+      <div className="h-full px-4 py-4 blur-[1px]">
+        <div className="flex min-h-12 items-center gap-2 rounded-full border border-[color:var(--border)] bg-[color:var(--surface-lux)] px-3">
+          <Search className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" />
+          <span className="truncate text-sm font-semibold text-[color:var(--text-heading)]">clozapine table</span>
         </div>
-        <div className="grid gap-4 md:grid-cols-3">
-          {[
-            { label: "Direct support", count: "9 items", icon: Target, tone: "green" },
-            { label: "Nearby context", count: "11 items", icon: Layers3, tone: "blue" },
-            { label: "Conflicts / gaps", count: "3 items", icon: ShieldCheck, tone: "amber" },
-          ].map(({ label, count, icon, tone: variant }) => (
-            <div key={label} className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-              <Glyph icon={icon} variant={variant as Tone} />
-              <p className="mt-3 text-sm font-semibold text-zinc-950">{label}</p>
-              <p className="mt-1 text-2xl font-semibold text-zinc-950">{count}</p>
-            </div>
+        <div className="mt-4 space-y-2">
+          {objects.slice(0, 2).map((item) => (
+            <EvidenceObjectRow key={item.title} item={item} />
           ))}
         </div>
       </div>
-    </Frame>
-  );
-}
-
-function DetailHeader({
-  title,
-  kind,
-  icon,
-  variant,
-}: {
-  title: string;
-  kind: string;
-  icon: LucideIcon;
-  variant: Tone;
-}) {
-  return (
-    <div className="flex flex-wrap items-start justify-between gap-4">
-      <div className="grid gap-3 sm:grid-cols-[auto_minmax(0,1fr)]">
-        <Glyph icon={icon} variant={variant} />
-        <div>
-          <div className="flex flex-wrap gap-2">
-            <Badge variant={variant}>{kind}</Badge>
-            <Badge variant="green">
-              <CheckCircle2 className="h-3.5 w-3.5" />
-              Source-backed
-            </Badge>
-            <Badge>p. 12</Badge>
+      <div className="absolute inset-x-0 bottom-0 z-10 max-h-[72%] rounded-t-[1.75rem] border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] p-4 shadow-[0_28px_90px_rgb(4_24_35_/_36%)]">
+        <span className="mx-auto block h-1 w-12 rounded-full bg-[color:var(--border-strong)]/60" />
+        <div className="mt-4 flex items-start gap-3">
+          <IconTile icon={Table2} />
+          <div className="min-w-0 flex-1">
+            <h3 className="text-lg font-semibold text-[color:var(--text-heading)]">ANC monitoring table</h3>
+            <p className="mt-1 text-sm font-semibold text-[color:var(--clinical-chat-teal)]">p.12 - 97% direct</p>
           </div>
-          <h4 className="mt-3 text-2xl font-semibold text-zinc-950">{title}</h4>
-          <p className="mt-2 max-w-3xl text-sm leading-6 text-zinc-600">
-            Clozapine physical health protocol - indexed June 2026 - locally reviewed source.
-          </p>
+          <X className="h-5 w-5 text-[color:var(--text-muted)]" />
         </div>
-      </div>
-      <div className="flex flex-wrap gap-2">
-        <GhostButton icon={Copy}>Copy citation</GhostButton>
-        <GhostButton primary icon={ExternalLink}>
-          Open source
-        </GhostButton>
-      </div>
-    </div>
-  );
-}
-
-function DetailTable() {
-  return (
-    <Frame label="Detail 1" title="Table evidence detail">
-      <div className="space-y-5">
-        <DetailHeader title="ANC monitoring frequency table" kind="Table evidence" icon={Table2} variant="green" />
-        <div className="grid grid-cols-1 gap-5 xl:grid-cols-[minmax(0,1fr)_19rem]">
-          <div className="space-y-4">
-            <EvidenceTable />
-            <div className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-              <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Extracted source image</p>
-              <Image
-                src="/demo-documents/clozapine-table.png"
-                alt="Extracted clozapine monitoring table evidence"
-                width={240}
-                height={208}
-                loading="eager"
-                unoptimized
-                className="mt-4 max-h-[21rem] w-full rounded-2xl border border-zinc-200 object-contain"
-              />
+        <div className="mt-4 overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)]">
+          {tableRows.map(([stage, evidence]) => (
+            <div key={stage} className="grid grid-cols-[5.75rem_minmax(0,1fr)] border-b border-[color:var(--border)] last:border-b-0">
+              <span className="bg-[color:var(--clinical-chat-table-header)] px-3 py-2 text-xs font-bold text-[color:var(--text-muted)]">{stage}</span>
+              <span className="px-3 py-2 text-xs font-semibold text-[color:var(--text-heading)]">{evidence}</span>
             </div>
-          </div>
-          <aside className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-            <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Why it ranks</p>
-            <div className="mt-4 space-y-3">
-              {[
-                "Direct table match",
-                "Medication + monitoring terms",
-                "Current local policy",
-                "High OCR confidence",
-              ].map((item) => (
-                <p key={item} className="flex items-center gap-2 text-sm font-medium text-zinc-700">
-                  <BadgeCheck className="h-4 w-4 text-emerald-700" />
-                  {item}
-                </p>
-              ))}
-            </div>
-          </aside>
+          ))}
+        </div>
+        <div className="mt-4 grid grid-cols-2 gap-2">
+          <ActionButton icon={ExternalLink}>Open</ActionButton>
+          <ActionButton icon={Copy} primary>Copy</ActionButton>
         </div>
       </div>
-    </Frame>
+    </PhoneChrome>
   );
 }
 
-function DetailImage() {
+function EvidenceDetailDesktop() {
   return (
-    <Frame label="Detail 2" title="Image evidence detail">
-      <div className="space-y-5">
-        <DetailHeader
-          title="Rapid tranquillisation observation pathway"
-          kind="Image evidence"
-          icon={FileImage}
-          variant="graphite"
-        />
-        <div className="grid grid-cols-1 gap-5 xl:grid-cols-[minmax(0,1fr)_21rem]">
-          <div className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-            <div className="flex flex-wrap items-center justify-between gap-2">
-              <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Page crop and labels</p>
-              <Badge variant="blue">Visual extraction</Badge>
+    <DesktopChrome>
+      <div className="h-[calc(100%-5rem)] pb-16">
+        <section className="min-w-0 overflow-hidden rounded-xl border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-soft)]">
+          <header className="border-b border-[color:var(--border)] p-4">
+            <div className="flex items-start justify-between gap-3">
+              <div className="flex min-w-0 items-start gap-3">
+                <IconTile icon={Quote} />
+                <div className="min-w-0">
+                  <h3 className="text-lg font-semibold text-[color:var(--text-heading)]">Constipation escalation passage</h3>
+                  <p className="mt-1 text-xs font-semibold text-[color:var(--clinical-chat-teal)]">Clozapine safety bulletin - p.4 - exact extracted quote</p>
+                </div>
+              </div>
+              <Pill tone="success">
+                <BadgeCheck className="h-3.5 w-3.5" /> Reviewed
+              </Pill>
             </div>
-            <Image
-              src="/demo-documents/risk-flow.png"
-              alt="Extracted risk flow image evidence"
-              width={240}
-              height={72}
-              loading="eager"
-              unoptimized
-              className="mt-4 max-h-[30rem] w-full rounded-2xl border border-zinc-200 object-contain"
-            />
-          </div>
-          <aside className="space-y-3">
-            <div className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-              <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Extracted labels</p>
-              <div className="mt-4 flex flex-wrap gap-2">
-                {[
-                  "Observation frequency",
-                  "Escalation",
-                  "Senior review",
-                  "Vital signs",
-                  "Sedation score",
-                  "Document dose",
-                ].map((label) => (
-                  <Badge key={label}>{label}</Badge>
-                ))}
+            <div className="mt-4 flex flex-wrap gap-2">
+              <Pill active>Quote</Pill>
+              <Pill>Table</Pill>
+              <Pill>Image</Pill>
+              <Pill>PDF region</Pill>
+              <Pill>Document context</Pill>
+            </div>
+          </header>
+          <div className="space-y-3 p-3">
+            <div className="grid grid-cols-[minmax(0,1fr)_15rem] gap-3">
+              <figure className="rounded-xl border border-[color:var(--border-lux)] border-l-4 border-l-[color:var(--clinical-chat-teal)] bg-[color:var(--surface)] p-4 shadow-[var(--shadow-inset)]">
+                <blockquote className="text-sm font-semibold leading-6 text-[color:var(--text-heading)]">
+                  &quot;Patients reporting severe constipation, abdominal pain, vomiting, or reduced bowel motions require same-day clinical review.&quot;
+                </blockquote>
+                <figcaption className="mt-2 text-xs font-semibold text-[color:var(--text-muted)]">Direct wording used in answer support.</figcaption>
+              </figure>
+              <div className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] p-3 shadow-[var(--shadow-inset)]">
+                <p className="text-xs font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">Citation packet</p>
+                <div className="mt-2 space-y-1.5">
+                  {["Document", "Page", "Section", "Quote span", "Reviewed"].map((item) => (
+                    <div key={item} className="flex items-center justify-between rounded-md bg-[color:var(--surface-raised)] px-2 py-1.5 text-[11px] font-semibold text-[color:var(--text-muted)]">
+                      {item}
+                      <Check className="h-3.5 w-3.5 text-[color:var(--clinical-chat-teal)]" />
+                    </div>
+                  ))}
+                </div>
               </div>
             </div>
-            <GhostButton icon={SplitSquareHorizontal}>Compare to page text</GhostButton>
-          </aside>
-        </div>
+            <div className="grid grid-cols-3 gap-2">
+              <div className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] shadow-[var(--shadow-inset)]">
+                <Image src="/demo-documents/clozapine-table.png" alt="Clozapine monitoring table evidence crop" width={560} height={320} className="h-24 w-full object-cover object-top" />
+                <p className="px-2 py-1.5 text-xs font-bold text-[color:var(--text-heading)]">Linked table</p>
+              </div>
+              <div className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] shadow-[var(--shadow-inset)]">
+                <Image src="/demo-documents/risk-flow.png" alt="Risk flow evidence image crop" width={560} height={320} className="h-24 w-full object-cover object-center" />
+                <p className="px-2 py-1.5 text-xs font-bold text-[color:var(--text-heading)]">Linked image</p>
+              </div>
+              <div className="rounded-lg border border-[color:var(--clinical-chat-teal)]/25 bg-[color:var(--clinical-chat-teal-soft)] p-3">
+                <p className="text-xs font-bold text-[color:var(--text-heading)]">Document context</p>
+                <p className="mt-1 text-xs leading-5 text-[color:var(--text-muted)]">Previous and next paragraphs retained with page coordinates.</p>
+              </div>
+            </div>
+          </div>
+        </section>
       </div>
-    </Frame>
+    </DesktopChrome>
   );
 }
 
-function DetailQuote() {
+function EvidenceDetailPhone() {
   return (
-    <Frame label="Detail 3" title="Quote and document-span detail">
-      <div className="space-y-5">
-        <DetailHeader title="Constipation escalation passage" kind="Quote evidence" icon={Quote} variant="blue" />
-        <div className="grid grid-cols-1 gap-5 xl:grid-cols-[minmax(0,1fr)_19rem]">
-          <div className="space-y-3">
-            {[
-              "Patients reporting severe constipation, abdominal pain, vomiting, or reduced bowel motions require same-day clinical review.",
-              "Monitoring frequency should be increased where clinical status changes, supply is interrupted, or blood results approach action thresholds.",
-            ].map((quote, index) => (
-              <figure
-                key={quote}
-                className={`rounded-[1.4rem] border bg-white p-5 shadow-[0_12px_45px_rgb(0_0_0_/_5%)] ${index === 0 ? "border-zinc-950" : "border-zinc-200"}`}
-              >
-                <blockquote className="text-lg font-semibold leading-8 text-zinc-950">&quot;{quote}&quot;</blockquote>
-                <figcaption className="mt-4 text-xs font-semibold text-zinc-500">
-                  Clozapine safety bulletin, p. {index === 0 ? "4" : "12"}
-                </figcaption>
-              </figure>
-            ))}
-          </div>
-          <aside className="rounded-[1.4rem] border border-zinc-200 bg-white p-4">
-            <p className="text-xs font-semibold uppercase tracking-[0.14em] text-zinc-500">Citation packet</p>
-            <div className="mt-4 space-y-3">
-              {["Document title", "Page number", "Section heading", "Quote span", "Review status"].map((item) => (
-                <div
-                  key={item}
-                  className="flex items-center justify-between border-b border-zinc-100 pb-3 last:border-b-0"
-                >
-                  <span className="text-sm font-medium text-zinc-600">{item}</span>
-                  <CheckCircle2 className="h-4 w-4 text-emerald-700" />
-                </div>
-              ))}
+    <PhoneChrome sheet>
+      <div className="h-full px-4 py-4 blur-[1px]">
+        <p className="text-sm font-semibold text-[color:var(--text-heading)]">Clozapine evidence</p>
+        <div className="mt-3 space-y-2">
+          {objects.map((item) => (
+            <EvidenceObjectRow key={item.title} item={item} selected={item.type === "Quote"} />
+          ))}
+        </div>
+      </div>
+      <div className="absolute inset-x-0 bottom-0 z-10 max-h-[78%] overflow-hidden rounded-t-[1.75rem] border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[0_28px_90px_rgb(4_24_35_/_36%)]">
+        <div className="border-b border-[color:var(--border)] px-4 pb-3 pt-3">
+          <span className="mx-auto block h-1 w-12 rounded-full bg-[color:var(--border-strong)]/60" />
+          <div className="mt-4 flex items-start gap-3">
+            <IconTile icon={Quote} />
+            <div className="min-w-0 flex-1">
+              <h3 className="text-lg font-semibold text-[color:var(--text-heading)]">Constipation escalation passage</h3>
+              <p className="mt-1 text-xs font-semibold text-[color:var(--clinical-chat-teal)]">Exact quote - p.4</p>
             </div>
-          </aside>
+            <X className="h-5 w-5 text-[color:var(--text-muted)]" />
+          </div>
+          <div className="mt-3 flex gap-2 overflow-hidden">
+            <Pill active>Quote</Pill>
+            <Pill>Image</Pill>
+            <Pill>Context</Pill>
+          </div>
+        </div>
+        <div className="max-h-[22rem] space-y-3 overflow-hidden p-4">
+          <figure className="rounded-xl border border-[color:var(--border-lux)] border-l-4 border-l-[color:var(--clinical-chat-teal)] bg-[color:var(--surface)] p-4">
+            <blockquote className="text-base font-semibold leading-7 text-[color:var(--text-heading)]">
+              &quot;Patients reporting severe constipation, abdominal pain, vomiting, or reduced bowel motions require same-day clinical review.&quot;
+            </blockquote>
+          </figure>
+          <div className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)]">
+            <Image src="/demo-documents/risk-flow.png" alt="Risk flow evidence image crop" width={560} height={320} className="h-32 w-full object-cover object-center" />
+          </div>
         </div>
+        <footer className="grid grid-cols-2 gap-2 border-t border-[color:var(--border)] bg-[color:var(--surface-lux)]/96 p-3">
+          <ActionButton icon={ExternalLink}>Open</ActionButton>
+          <ActionButton icon={Copy} primary>Copy quote</ActionButton>
+        </footer>
       </div>
-    </Frame>
+    </PhoneChrome>
   );
 }
 
 export default function EvidenceOptionMockupsPage() {
   return (
-    <main className="min-h-screen bg-[#f6f7f5] px-4 py-6 text-zinc-950 sm:px-6 lg:px-8">
-      <div className="mx-auto max-w-7xl space-y-9">
-        <header className="overflow-hidden rounded-[1.75rem] bg-[#101010] p-6 text-white shadow-[0_30px_120px_rgb(0_0_0_/_22%)]">
-          <div className="grid grid-cols-1 gap-6 xl:grid-cols-[minmax(0,1fr)_23rem]">
+    <main className="min-h-screen bg-[color:var(--background)] px-4 py-6 text-[color:var(--text)] sm:px-6 lg:px-8">
+      <div className="mx-auto max-w-[1500px] space-y-6">
+        <header className="rounded-[1.5rem] border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] p-5 shadow-[var(--shadow-soft)]">
+          <div className="flex flex-wrap items-start justify-between gap-4">
             <div>
-              <div className="flex flex-wrap items-center gap-2">
-                <span className="grid h-10 w-10 place-items-center rounded-full bg-white text-zinc-950">
-                  <ListChecks className="h-4 w-4" />
-                </span>
-                <p className="text-xs font-semibold uppercase tracking-[0.16em] text-white/50">
-                  Clinical KB evidence option
-                </p>
+              <div className="flex items-center gap-3">
+                <IconTile icon={Layers3} />
+                <p className="text-xs font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">Clinical KB evidence option</p>
               </div>
-              <h1 className="mt-5 max-w-4xl text-4xl font-semibold tracking-normal text-white sm:text-5xl">
-                Premium mockups for document evidence
-              </h1>
-              <p className="mt-4 max-w-3xl text-base leading-7 text-white/68">
-                A completely new ChatGPT premium direction for tables, images, quotes, PDF regions, source packs, and
-                document spans.
+              <h1 className="mt-3 text-3xl font-semibold tracking-normal text-[color:var(--text-heading)]">Premium evidence mockups</h1>
+              <p className="mt-2 max-w-3xl text-sm leading-6 text-[color:var(--text-muted)]">
+                Three product-native mockups for evidence home, evidence search, and individual evidence review. Each pairs the PC layout with the phone bottom-sheet treatment.
               </p>
-              <div className="mt-6 flex flex-wrap gap-2">
-                <GhostButton primary icon={Search}>
-                  Search evidence
-                </GhostButton>
-                <GhostButton icon={Library}>Browse library</GhostButton>
-                <GhostButton icon={BookOpen}>Review sources</GhostButton>
-              </div>
             </div>
-            <div className="rounded-[1.4rem] border border-white/10 bg-white/8 p-4">
-              <p className="text-xs font-semibold uppercase tracking-[0.14em] text-white/45">Included</p>
-              <div className="mt-4 grid gap-3">
-                {[
-                  ["Home", "3 premium entry directions"],
-                  ["Search", "3 result workflows"],
-                  ["Detail", "3 evidence-type pages"],
-                ].map(([label, body]) => (
-                  <div key={label} className="rounded-2xl bg-white px-4 py-3 text-zinc-950">
-                    <p className="text-sm font-semibold">{label}</p>
-                    <p className="text-xs text-zinc-500">{body}</p>
-                  </div>
-                ))}
-              </div>
+            <div className="flex flex-wrap gap-2">
+              <Pill active>Source-backed</Pill>
+              <Pill>Tables</Pill>
+              <Pill>Images</Pill>
+              <Pill>Quotes</Pill>
             </div>
           </div>
         </header>
 
-        <Section
-          title="Home Page Directions"
-          body="Three premium home concepts for entering the evidence system: studio, object library, and conversation-led workspace."
-        >
-          <HomeOne />
-          <HomeTwo />
-          <HomeThree />
-        </Section>
+        <MockupPair
+          id="home"
+          title="1. Evidence home"
+          description="A focused mode home: search evidence, review recent objects, or open the source map without turning the feature into a dashboard."
+          desktop={<EvidenceHomeDesktop />}
+          phone={<EvidenceHomePhone />}
+        />
 
-        <Section
-          title="Search Page Directions"
-          body="Three search patterns for source discovery, filtered retrieval, and evidence-pack creation."
-        >
-          <SearchOne />
-          <SearchTwo />
-          <SearchThree />
-        </Section>
+        <MockupPair
+          id="search"
+          title="2. Evidence search"
+          description="Search results prioritise clinical objects with provenance, confidence, and immediate inspection actions."
+          desktop={<EvidenceSearchDesktop />}
+          phone={<EvidenceSearchPhone />}
+        />
 
-        <Section
-          title="Individual Evidence Page Directions"
-          body="Three detail pages designed around document object types: table, image, and exact quote/span evidence."
-        >
-          <DetailTable />
-          <DetailImage />
-          <DetailQuote />
-        </Section>
+        <MockupPair
+          id="detail"
+          title="3. Individual evidence"
+          description="A premium evidence detail view for quotes, tables, images, PDF regions, and document context with citation actions."
+          desktop={<EvidenceDetailDesktop />}
+          phone={<EvidenceDetailPhone />}
+        />
       </div>
     </main>
   );
diff --git a/src/app/mockups/settings-search-privacy/page.tsx b/src/app/mockups/settings-search-privacy/page.tsx
index 5e7c50c9bc..f29dd5d2ae 100644
--- a/src/app/mockups/settings-search-privacy/page.tsx
+++ b/src/app/mockups/settings-search-privacy/page.tsx
@@ -3,10 +3,10 @@ import type { Metadata } from "next";
 import { SettingsSearchMockupPage } from "@/components/settings-search-mockups";
 
 export const metadata: Metadata = {
-  title: "Search Settings Privacy Mockup - Clinical KB",
-  description: "Search-first ChatGPT-style privacy and personalization settings mockup for Clinical KB.",
+  title: "Premium Account Hub Mockup - Clinical KB",
+  description: "Premium ChatGPT-style account and app hub settings mockup for Clinical KB.",
 };
 
-export default function SettingsSearchPrivacyMockupRoute() {
-  return <SettingsSearchMockupPage variant="privacy" />;
+export default function PremiumAccountHubMockupRoute() {
+  return <SettingsSearchMockupPage variant="premium" />;
 }
diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 68f6f29753..be179c5bb8 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -7,31 +7,34 @@ import { useRouter } from "next/navigation";
 import {
   Activity,
   AlertCircle,
+  Bell,
   BookOpen,
-  Brain,
   CheckCircle2,
   ChevronDown,
+  CircleUserRound,
   ClipboardCheck,
-  ClipboardList,
   Copy,
   ExternalLink,
   FileImage,
   FileText,
   Filter,
+  Globe2,
   Heart,
-  HeartHandshake,
+  HelpCircle,
+  Keyboard,
   Layers,
-  LayoutList,
   ListChecks,
   Loader2,
   LogIn,
   LogOut,
+  LockKeyhole,
   Mail,
   MessageSquare,
   MoreHorizontal,
-  Network,
+  Palette,
   PanelLeftClose,
   PanelLeftOpen,
+  PanelTop,
   Pill,
   Plus,
   Quote,
@@ -42,10 +45,12 @@ import {
   ShieldCheck,
   SlidersHorizontal,
   Sparkles,
+  Stethoscope,
   Table2,
   Tag,
   Target,
   UploadCloud,
+  UserRound,
   WifiOff,
   Wrench,
   X,
@@ -68,6 +73,7 @@ import {
 } from "@/components/DocumentOrganizationBadges";
 import { DocumentTagCloud } from "@/components/DocumentTagCloud";
 import { DocumentManagementActions, type DocumentDeleteResult } from "@/components/DocumentManagementActions";
+import { useDismissableLayer } from "@/components/use-dismissable-layer";
 import { documentCitationHref, formatCompactCitationLabel, formatCitationLabel } from "@/lib/citations";
 import { extractSafetyFindings, formatSafetyFindingLabel } from "@/lib/clinical-safety";
 import { clearCachedSignedUrl, getCachedSignedUrl, setCachedSignedUrl } from "@/lib/signed-url-cache";
@@ -111,7 +117,6 @@ import {
   tableCardHeader,
   tableMicroActionRow,
   textMuted,
-  toolbarButton,
   toneDanger,
   toneInfo,
   toneNeutral,
@@ -142,6 +147,7 @@ import { MasterSearchHeader } from "@/components/clinical-dashboard/master-searc
 import { FavouritesHub } from "@/components/clinical-dashboard/favourites-hub";
 import { favouritePrototypeCount } from "@/components/clinical-dashboard/favourites-prototype-data";
 import { MedicationPrescribingWorkspace } from "@/components/clinical-dashboard/medication-prescribing-workspace";
+import { ApplicationsLauncherWorkspace, applicationsLauncherItemCount } from "@/components/applications-launcher-page";
 import {
   DocumentSearchResultsPanel,
   MatchExplanationChips,
@@ -181,7 +187,6 @@ import { logSourceOpen, SourceActionRow, sourceResultHref } from "@/components/c
 import { clinicalProseUsefulness, sourceTextForCompactDisplay } from "@/lib/source-text-sanitizer";
 import { groupSourceGovernanceWarnings, type SourceGovernanceWarning } from "@/lib/source-governance";
 import { smartEvidenceTags } from "@/lib/evidence-tags";
-import { toolCatalog, type ToolItem } from "@/lib/tools";
 import {
   reviewDocumentTagQuality,
   tagSearchText,
@@ -1235,40 +1240,135 @@ function compactClinicalNoteText(value: string) {
     .trim();
 }
 
+function stripClinicalNoteLeadIn(value: string) {
+  let text = compactClinicalNoteText(value);
+  let previous = "";
+  while (text !== previous) {
+    previous = text;
+    text = text
+      .replace(/^(the\s+same\s+)?synthetic\s+source\s+says\s+/i, "")
+      .replace(/^the\s+(indexed\s+)?source\s+says\s+/i, "")
+      .replace(/^source\s+text\s+says\s+/i, "")
+      .replace(/^according\s+to\s+[^,]+,\s*/i, "")
+      .trim();
+  }
+  return text;
+}
+
+function titleCaseClinicalNote(value: string) {
+  return value
+    .replace(/\b\w[\w/-]*/g, (word) => {
+      if (/[A-Z]{2,}|\/|\d/.test(word)) return word;
+      return `${word.charAt(0).toUpperCase()}${word.slice(1).toLowerCase()}`;
+    })
+    .replace(/\bAnd\b/g, "and")
+    .replace(/\bOr\b/g, "or")
+    .replace(/\bTo\b/g, "to");
+}
+
+function sentenceCaseClinicalNoteDetail(value: string) {
+  const text = stripClinicalNoteLeadIn(value);
+  return text ? `${text.charAt(0).toUpperCase()}${text.slice(1)}` : text;
+}
+
+function clinicalNoteHeuristicTitle(value: string) {
+  const text = stripClinicalNoteLeadIn(value);
+  const lower = text.toLowerCase();
+
+  if (/\bbaseline checklist\b/.test(lower) && /\bconfirm indication\b/.test(lower)) return "Indication";
+  if (/\b(vomiting|diarrhoea|diarrhea|dehydration|acute kidney injury|tremor|confusion|ataxia)\b/.test(lower)) {
+    return "Toxicity review triggers";
+  }
+  if (
+    /\b(escalate|urgent review|urgent|red flag|seizures?|severe constipation|chest pain|dyspnoea|tachycardia)\b/.test(
+      lower,
+    )
+  ) {
+    return "Escalation triggers";
+  }
+  if (/\blithium levels?\b/.test(lower) && /\b(5\s*(?:to|-|–)\s*7|dose change|stable|days?)\b/.test(lower)) {
+    return "Lithium level timing";
+  }
+  if (/\b(lithium level|serum lithium|trough level)\b/.test(lower)) return "Lithium level check";
+  if (/\b(fbc|anc)\b/.test(lower)) return "FBC/ANC monitoring";
+  if (/\bmyocarditis\b/.test(lower)) return "Myocarditis screening";
+  if (/\b(metabolic|weight|lipids?|glucose|hba1c|waist)\b/.test(lower)) return "Metabolic monitoring";
+  if (/\b(constipation|bowel)\b/.test(lower)) return "Constipation prevention";
+  if (/\b(shared-care|shared care|communication|handover)\b/.test(lower)) return "Shared-care communication";
+  if (/\b(renal|kidney|creatinine|egfr)\b/.test(lower)) return "Renal function";
+  if (/\b(thyroid|tsh)\b/.test(lower)) return "Thyroid monitoring";
+  if (/\bcalcium\b/.test(lower)) return "Calcium monitoring";
+  if (/\b(nsaid|ace inhibitor|diuretic|interacting medicine|medicine reconciliation)\b/.test(lower)) {
+    return "Interacting medicines";
+  }
+
+  return null;
+}
+
 function clinicalNoteTitleFromItem(item: string, section: ClinicalDetailSection, index: number) {
-  const text = compactClinicalNoteText(item);
+  const text = stripClinicalNoteLeadIn(item);
+  const heuristicTitle = clinicalNoteHeuristicTitle(text);
+  if (heuristicTitle) return heuristicTitle;
   const colonIndex = text.indexOf(":");
-  if (colonIndex > 8 && colonIndex < 54) return text.slice(0, colonIndex).trim();
+  if (colonIndex > 8 && colonIndex < 54) {
+    const title = text.slice(0, colonIndex).trim();
+    const detailStart = text
+      .slice(colonIndex + 1)
+      .split(/[,;]/)[0]
+      ?.trim();
+    if (/\b(checklist|checkpoint|points?)\b/i.test(title) && detailStart) {
+      return clinicalNoteTitleFromFragment(detailStart);
+    }
+    return title;
+  }
   const dashIndex = text.search(/\s[-–]\s/);
   if (dashIndex > 8 && dashIndex < 54) return text.slice(0, dashIndex).trim();
   if (section.items.length === 1 && section.title.length <= 42) return section.title;
-  const words = text.split(" ").filter(Boolean);
+  const words = text
+    .replace(/^(confirm|check|review|record|document)\s+/i, "")
+    .split(" ")
+    .filter(Boolean);
   return words.slice(0, Math.min(words.length, index === 0 ? 5 : 4)).join(" ") || section.title;
 }
 
 function clinicalNoteDetailFromItem(item: string, title: string) {
-  const text = compactClinicalNoteText(item);
+  const text = stripClinicalNoteLeadIn(item);
   const normalizedTitle = title.toLowerCase();
   const lowerText = text.toLowerCase();
-  if (lowerText.startsWith(`${normalizedTitle}:`)) return text.slice(title.length + 1).trim();
+  const colonIndex = text.indexOf(":");
+  if (colonIndex > 8 && colonIndex < 64) {
+    const beforeColon = text.slice(0, colonIndex);
+    const afterColon = text.slice(colonIndex + 1).trim();
+    if (/\b(checklist|checkpoint|points?)\b/i.test(beforeColon) && afterColon) {
+      return sentenceCaseClinicalNoteDetail(afterColon);
+    }
+  }
+  if (lowerText.startsWith(`${normalizedTitle}:`)) {
+    return sentenceCaseClinicalNoteDetail(text.slice(title.length + 1).trim());
+  }
   if (lowerText.startsWith(`${normalizedTitle} -`) || lowerText.startsWith(`${normalizedTitle} –`)) {
-    return text.slice(title.length + 2).trim();
+    return sentenceCaseClinicalNoteDetail(text.slice(title.length + 2).trim());
   }
-  return text === title ? "Review linked source context before using this note." : text;
+  if (text === title) return "Review linked source context before using this note.";
+  return sentenceCaseClinicalNoteDetail(text);
 }
 
 function clinicalNoteTitleFromFragment(fragment: string) {
-  const text = compactClinicalNoteText(fragment)
+  const text = stripClinicalNoteLeadIn(fragment)
     .replace(/^(and|or)\s+/i, "")
+    .replace(/^(confirm|check|review|record|document)\s+/i, "")
     .replace(/[.;:,]+$/g, "");
   if (!text) return "Clinical note";
-  return text.replace(/\b\w/g, (letter) => letter.toUpperCase());
+  return clinicalNoteHeuristicTitle(text) ?? titleCaseClinicalNote(text);
 }
 
 function splitClinicalNoteFragments(item: string, section: ClinicalDetailSection, title: string) {
   const detail = clinicalNoteDetailFromItem(item, title);
   const titleLooksGeneric = /\b(checkpoint|checklist|item|point|monitoring|safety)\b/i.test(title);
-  if (!titleLooksGeneric && section.items.length > 1) return null;
+  const itemLooksGeneric = /\b(checkpoint|checklist|item|point|monitoring|safety)\b/i.test(
+    stripClinicalNoteLeadIn(item),
+  );
+  if (!titleLooksGeneric && !itemLooksGeneric && section.items.length > 1) return null;
 
   const fragments = detail
     .replace(/\band\s+/gi, "")
@@ -1292,6 +1392,28 @@ function clinicalNoteHasDistinctDetail(row: ClinicalNotesRow) {
   return Boolean(detail) && detail !== title;
 }
 
+function clinicalNoteDetailLabel(row: ClinicalNotesRow) {
+  const text = `${row.title} ${row.detail}`.toLowerCase();
+  if (/\b(timing|level|schedule|dose change|stable|days?)\b/.test(text)) return "Timing";
+  if (/\b(escalation|escalate|urgent|toxicity|trigger|vomiting|confusion|ataxia|tremor)\b/.test(text)) {
+    return "Escalate";
+  }
+  if (/\b(baseline|confirm|record|document|check|review)\b/.test(text)) return "Action";
+  return "Note";
+}
+
+function ClinicalNoteDetailCard({ row }: { row: ClinicalNotesRow }) {
+  const detail = sentenceCaseClinicalNoteDetail(row.detail);
+  return (
+    <div className="mt-2 rounded-md border border-[color:var(--border)] bg-[color:var(--surface-subtle)] px-2.5 py-2 shadow-[var(--shadow-inset)]">
+      <p className="text-[12px] leading-[1.5] text-[color:var(--text)]">
+        <span className="mr-1.5 font-semibold text-[color:var(--text-muted)]">{clinicalNoteDetailLabel(row)}:</span>
+        {detail}
+      </p>
+    </div>
+  );
+}
+
 function clinicalNotesTableEvidenceCount(answer: RagAnswer) {
   return (answer.visualEvidence ?? answer.smartPanel?.visualEvidence ?? []).filter(
     (item) => item.accessibleTableMarkdown || item.tableRows?.length,
@@ -1396,6 +1518,7 @@ function ClinicalNotesChecklistPanel({
   const firstExpandableRow = rows.find(clinicalNoteHasDistinctDetail) ?? null;
   const activeRow = rows.find((row) => row.id === expandedRowId) ?? firstExpandableRow;
   const [added, setAdded] = useState(false);
+  const warningCount = rows.filter((row) => row.tone === "warn").length;
   const toggles: Array<{
     id: ClinicalNotesTabId | "table";
     label: string;
@@ -1416,165 +1539,165 @@ function ClinicalNotesChecklistPanel({
   }
 
   const ActiveIcon = clinicalNotesTabMeta[activeTab].icon;
+  const showToggleBar = toggles.length > 1;
 
   return (
-    <section data-testid="clinical-notes-checklist" className="min-w-0">
-      <div className="sticky top-0 z-10 -mx-5 -mt-5 border-b border-[color:var(--border)] bg-[color:var(--surface-raised)]/98 px-5 pt-3 backdrop-blur sm:static sm:mx-0 sm:mt-0 sm:bg-transparent sm:px-0 sm:pt-0 sm:backdrop-blur-0">
-        <div
-          role="tablist"
-          aria-label="Clinical notes categories"
-          className="grid grid-cols-[repeat(auto-fit,minmax(5.75rem,1fr))] gap-1"
-        >
-          {toggles.map((tab) => {
-            const Icon = tab.icon;
-            const selected = !tab.popout && tab.id === activeTab;
-            return (
-              <button
-                key={tab.id}
-                type="button"
-                role="tab"
-                aria-selected={selected}
-                aria-label={`${tab.label} (${tab.count})`}
-                data-testid={tab.popout ? "clinical-notes-table-popout-toggle" : undefined}
-                onClick={() => {
-                  if (tab.popout) {
-                    onOpenTables?.();
-                    return;
-                  }
-                  setRequestedTab(tab.id as ClinicalNotesTabId);
-                  setExpandedRowId(null);
-                }}
-                className={cn(
-                  "relative inline-flex min-h-14 min-w-0 items-center justify-center gap-2 rounded-none px-1 text-[15px] font-semibold transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
-                  selected
-                    ? "text-[color:var(--warning)]"
-                    : "text-[color:var(--text-muted)] hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)]",
-                )}
-              >
-                <Icon className="h-5 w-5 shrink-0" />
-                <span>{tab.label}</span>
-                {selected ? (
-                  <span className="absolute inset-x-0 -bottom-px h-[3px] rounded-full bg-[color:var(--warning)]" />
-                ) : null}
-              </button>
-            );
-          })}
+    <section data-testid="clinical-notes-checklist" className="flex min-h-0 min-w-0 flex-1 flex-col">
+      {showToggleBar ? (
+        <div className="sticky top-0 z-10 -mx-3 -mt-2 border-b border-[color:var(--border)] bg-[color:var(--surface-raised)]/98 px-3 py-1.5 backdrop-blur sm:static sm:mx-0 sm:mt-0 sm:bg-transparent sm:px-0 sm:pt-0 sm:backdrop-blur-0">
+          <div
+            role="tablist"
+            aria-label="Clinical notes categories"
+            className="flex min-w-0 items-center gap-1 overflow-x-auto"
+          >
+            {toggles.map((tab) => {
+              const Icon = tab.icon;
+              const selected = !tab.popout && tab.id === activeTab;
+              return (
+                <button
+                  key={tab.id}
+                  type="button"
+                  role="tab"
+                  aria-selected={selected}
+                  aria-label={`${tab.label} (${tab.count})`}
+                  data-testid={tab.popout ? "clinical-notes-table-popout-toggle" : undefined}
+                  onClick={() => {
+                    if (tab.popout) {
+                      onOpenTables?.();
+                      return;
+                    }
+                    setRequestedTab(tab.id as ClinicalNotesTabId);
+                    setExpandedRowId(null);
+                  }}
+                  className={cn(
+                    "inline-flex h-8 shrink-0 items-center gap-1.5 rounded-full border px-2.5 text-[11px] font-semibold leading-none transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
+                    selected
+                      ? "border-[color:var(--warning-border)] bg-[color:var(--warning-soft)] text-[color:var(--warning)]"
+                      : "border-transparent text-[color:var(--text-muted)] hover:border-[color:var(--border)] hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)]",
+                  )}
+                >
+                  <Icon className="h-3.5 w-3.5 shrink-0" />
+                  <span>{tab.label}</span>
+                  {tab.count ? <span className="nums text-[10px] opacity-70">{tab.count}</span> : null}
+                </button>
+              );
+            })}
+          </div>
         </div>
-      </div>
+      ) : null}
 
-      <div className="mt-6 flex min-w-0 items-start gap-4">
+      <div className="mt-3 flex min-w-0 items-start gap-2.5 border-b border-[color:var(--border)] pb-3">
         <span
           className={cn(
-            "grid h-12 w-12 shrink-0 place-items-center rounded-xl border shadow-[var(--shadow-inset)]",
+            "mt-0.5 grid h-7 w-7 shrink-0 place-items-center rounded-md border shadow-[var(--shadow-inset)]",
             activeTab === "safety" ? toneWarning : toneSuccess,
           )}
           aria-hidden="true"
         >
-          <ActiveIcon className="h-5 w-5" />
+          <ActiveIcon className="h-3.5 w-3.5" />
         </span>
         <div className="min-w-0">
-          <h3 className="text-xl font-semibold leading-7 text-[color:var(--text-heading)]">
+          <h3 className="text-[14px] font-semibold leading-[1.35] text-[color:var(--text-heading)]">
             {activeTab === "safety" ? "Safety checklist" : "Monitoring checklist"}
           </h3>
-          <p className={cn("mt-1 text-base leading-6", textMuted)}>
+          <p className={cn("mt-0.5 text-[12px] leading-[1.45]", textMuted)}>
             {activeTab === "safety"
-              ? "Key actions to start and continue safely."
+              ? warningCount > 0
+                ? `${warningCount} caution ${warningCount === 1 ? "item" : "items"} prioritised from the answer.`
+                : "Key actions to start and continue safely."
               : "Monitoring and medication follow-up items."}
           </p>
         </div>
       </div>
 
-      <div className="mt-5 divide-y divide-[color:var(--border)] border-y border-[color:var(--border)]">
+      <div className="divide-y divide-[color:var(--border)]">
         {rows.map((row) => {
           const expanded = row.id === activeRow?.id;
           const hasDistinctDetail = clinicalNoteHasDistinctDetail(row);
           const RowIcon = row.tone === "warn" ? AlertCircle : CheckCircle2;
           return (
-            <article key={row.id} data-testid="clinical-note-row" className={cn("relative py-4", expanded && "pl-4")}>
-              {expanded ? (
-                <span className="absolute bottom-4 left-0 top-4 w-1 rounded-full bg-[color:var(--primary)]" />
-              ) : null}
+            <article key={row.id} data-testid="clinical-note-row" className="relative py-2">
               <button
                 type="button"
                 onClick={() => {
                   if (hasDistinctDetail) setExpandedRowId(expanded ? null : row.id);
                 }}
-                className="grid w-full min-w-0 grid-cols-[auto_minmax(0,1fr)_auto_auto] items-start gap-3 text-left focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
+                className="w-full min-w-0 text-left focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
                 aria-expanded={hasDistinctDetail ? expanded : undefined}
               >
-                <span
-                  className={cn(
-                    "mt-0.5 grid h-11 w-11 shrink-0 place-items-center rounded-full border-2 bg-[color:var(--surface)]",
-                    row.tone === "warn"
-                      ? "border-[color:var(--warning-border)] bg-[color:var(--warning-soft)] text-[color:var(--warning)]"
-                      : "border-[color:var(--primary)]/25 bg-[color:var(--primary-soft)] text-[color:var(--primary)]",
-                  )}
-                  aria-hidden="true"
-                >
-                  <RowIcon className="h-5 w-5" />
-                </span>
-                <span className="min-w-0">
-                  <span className="block text-[18px] font-semibold leading-6 text-[color:var(--text-heading)]">
-                    {row.title}
-                  </span>
-                  {hasDistinctDetail ? (
-                    <span className={cn("mt-1 block text-base leading-6", textMuted)}>{row.detail}</span>
-                  ) : null}
-                </span>
-                <span className="nums mt-0.5 grid h-9 min-w-9 place-items-center rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-1 text-sm font-bold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)]">
-                  {row.sourceIndex}
-                </span>
-                {hasDistinctDetail ? (
-                  <ChevronDown
+                <span className="flex min-w-0 items-start gap-2">
+                  <span
                     className={cn(
-                      "mt-2.5 h-5 w-5 shrink-0 text-[color:var(--text-muted)] transition",
-                      expanded && "rotate-180",
+                      "mt-0.5 inline-flex h-4.5 w-4.5 shrink-0 items-center justify-center rounded-full border bg-[color:var(--surface)]",
+                      row.tone === "warn"
+                        ? "border-[color:var(--warning-border)] bg-[color:var(--warning-soft)] text-[color:var(--warning)]"
+                        : "border-[color:var(--primary)]/25 bg-[color:var(--primary-soft)] text-[color:var(--primary)]",
                     )}
-                  />
-                ) : (
-                  <span className="mt-2.5 h-5 w-5 shrink-0" aria-hidden="true" />
-                )}
+                    aria-hidden="true"
+                  >
+                    <RowIcon className="h-3 w-3" />
+                  </span>
+                  <span className="min-w-0 flex-1">
+                    <span className="flex min-w-0 items-start gap-1.5">
+                      <span className="line-clamp-2 min-w-0 flex-1 text-[13px] font-semibold leading-[1.35] text-[color:var(--text-heading)]">
+                        {row.title}
+                      </span>
+                      <span className="nums grid h-5 min-w-5 shrink-0 place-items-center rounded border border-[color:var(--border)] bg-[color:var(--surface)] px-1 text-[10px] font-bold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)]">
+                        {row.sourceIndex}
+                      </span>
+                      {hasDistinctDetail ? (
+                        <ChevronDown
+                          className={cn(
+                            "mt-0.5 h-3.5 w-3.5 shrink-0 text-[color:var(--text-muted)] transition",
+                            expanded && "rotate-180",
+                          )}
+                        />
+                      ) : null}
+                    </span>
+                    {hasDistinctDetail ? (
+                      <span className={cn("mt-0.5 line-clamp-1 text-[12px] leading-[1.45]", textMuted)}>
+                        {row.detail}
+                      </span>
+                    ) : null}
+                  </span>
+                </span>
               </button>
-              {expanded && hasDistinctDetail ? (
-                <div className="ml-14 mt-4 rounded-xl border border-[color:var(--border)] bg-[color:var(--surface)] p-4">
-                  <p className="text-base font-medium leading-7 text-[color:var(--text)]">{row.detail}</p>
-                </div>
-              ) : null}
+              {expanded && hasDistinctDetail ? <ClinicalNoteDetailCard row={row} /> : null}
             </article>
           );
         })}
       </div>
 
-      <div className="sticky bottom-0 -mx-5 mt-5 border-t border-[color:var(--border)] bg-[color:var(--surface-raised)]/98 px-4 py-3 backdrop-blur sm:mx-0 sm:rounded-lg sm:border sm:px-2">
+      <div className="sticky bottom-0 -mx-3 mt-auto border-t border-[color:var(--border)] bg-[color:var(--surface-raised)]/98 px-2.5 py-1.5 backdrop-blur sm:mx-0 sm:rounded-lg sm:border sm:px-2">
         <div className="grid grid-cols-3 divide-x divide-[color:var(--border)] bg-[color:var(--surface)]">
           {bestSource ? (
             <Link
               href={bestSource.viewer_href}
-              className="inline-flex min-h-12 items-center justify-center gap-2 px-2 text-base font-semibold text-[color:var(--primary)]"
+              className="inline-flex min-h-9 items-center justify-center gap-1.5 px-2 text-[11px] font-semibold text-[color:var(--primary)]"
             >
-              <ExternalLink className="h-5 w-5" />
+              <ExternalLink className="h-3.5 w-3.5" />
               Source
             </Link>
           ) : (
-            <span className="inline-flex min-h-12 items-center justify-center gap-2 px-2 text-base font-semibold text-[color:var(--text-soft)]">
-              <ExternalLink className="h-5 w-5" />
+            <span className="inline-flex min-h-9 items-center justify-center gap-1.5 px-2 text-[11px] font-semibold text-[color:var(--text-soft)]">
+              <ExternalLink className="h-3.5 w-3.5" />
               Source
             </span>
           )}
           <button
             type="button"
             onClick={onCopy}
-            className="inline-flex min-h-12 items-center justify-center gap-2 px-2 text-base font-semibold text-[color:var(--text)]"
+            className="inline-flex min-h-9 items-center justify-center gap-1.5 px-2 text-[11px] font-semibold text-[color:var(--text)]"
           >
-            <Copy className="h-5 w-5" />
+            <Copy className="h-3.5 w-3.5" />
             {copied ? "Copied" : "Copy"}
           </button>
           <button
             type="button"
             onClick={() => setAdded(true)}
-            className="inline-flex min-h-12 items-center justify-center gap-2 px-2 text-base font-semibold text-[color:var(--primary)]"
+            className="inline-flex min-h-9 items-center justify-center gap-1.5 px-2 text-[11px] font-semibold text-[color:var(--primary)]"
           >
-            <Plus className="h-5 w-5" />
+            <Plus className="h-3.5 w-3.5" />
             {added ? "Added" : "Add"}
           </button>
         </div>
@@ -3747,20 +3870,23 @@ function StagedAnswerResultSurface({
             mobileSummary={`${clinicalNoteDisplayCount} note${clinicalNoteDisplayCount === 1 ? "" : "s"} · Source-backed`}
             className={clinicalNotesRow}
             open={clinicalNotesOpen}
-            onOpenChange={setClinicalNotesOpen}
+            onOpenChange={(open) => {
+              if (open) setEvidenceOpen(false);
+              setClinicalNotesOpen(open);
+            }}
             sheetHeaderLeading={
-              <span className={cn(iconTilePremium, "h-11 w-11 text-[color:var(--primary)]")}>
-                <ClipboardCheck className="h-5 w-5" />
+              <span className={cn(iconTilePremium, "h-8 w-8 rounded-lg text-[color:var(--primary)]")}>
+                <ClipboardCheck className="h-3.5 w-3.5" />
               </span>
             }
             sheetTitleAccessory={
-              <span className="nums grid h-8 min-w-8 place-items-center rounded-lg border border-[color:var(--primary)]/20 bg-[color:var(--primary-soft)] px-2 text-base font-semibold text-[color:var(--text-heading)] shadow-[var(--shadow-inset)]">
+              <span className="nums grid h-5 min-w-5 place-items-center rounded border border-[color:var(--primary)]/20 bg-[color:var(--primary-soft)] px-1 text-[11px] font-semibold text-[color:var(--text-heading)] shadow-[var(--shadow-inset)]">
                 {clinicalNoteDisplayCount}
               </span>
             }
             sheetDescriptionContent={
-              <span className="inline-flex min-h-6 items-center gap-1.5 text-sm font-semibold text-[color:var(--primary)]">
-                <ShieldCheck className="h-4 w-4" />
+              <span className="inline-flex min-h-5 items-center gap-1.5 text-[11px] font-semibold text-[color:var(--primary)]">
+                <ShieldCheck className="h-3 w-3" />
                 Source-backed
               </span>
             }
@@ -3768,17 +3894,21 @@ function StagedAnswerResultSurface({
               bestSource ? (
                 <Link
                   href={bestSource.viewer_href}
-                  className={cn(toolbarButton, "text-[color:var(--text-muted)]")}
+                  className="inline-flex h-8 w-8 items-center justify-center rounded-full text-[color:var(--text-muted)] transition hover:bg-[color:var(--surface-subtle)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
                   aria-label="Open clinical notes source"
                 >
-                  <ExternalLink className="h-4.5 w-4.5" />
+                  <ExternalLink className="h-4 w-4" />
                 </Link>
               ) : null
             }
             sheetDescription={null}
+            sheetHeaderClassName="gap-2 p-2.5 sm:p-3"
+            sheetTitleClassName="text-[15px] leading-5"
+            sheetCloseButtonClassName="inline-flex h-8 w-8 items-center justify-center rounded-full text-[color:var(--text-muted)] transition hover:bg-[color:var(--surface-subtle)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
+            sheetChildrenClassName="flex min-h-0 flex-1 flex-col"
             sheetContentClassName="max-h-[92dvh] translate-y-0 bg-[color:var(--surface-raised)] motion-safe:animate-none sm:h-auto sm:max-h-[88dvh] sm:max-w-lg"
             sheetContentStyle={{ height: "80dvh" }}
-            sheetBodyClassName="bg-[color:var(--surface-raised)] px-5 pb-0 pt-5 sm:p-5"
+            sheetBodyClassName="flex flex-col bg-[color:var(--surface-raised)] px-3 pb-0 pt-2 sm:p-3"
           >
             <ClinicalNotesChecklistPanel
               answer={answer}
@@ -3801,6 +3931,7 @@ function StagedAnswerResultSurface({
           className={evidenceRow}
           open={evidenceOpen}
           onOpenChange={(open) => {
+            if (open) setClinicalNotesOpen(false);
             setEvidenceOpen(open);
             if (!open) setEvidenceInitialTab(null);
           }}
@@ -5330,12 +5461,19 @@ function DrawerGroupLabel({ title }: { title: string }) {
 }
 
 const sidebarToolItems = [
-  { label: "Answer", icon: Sparkles, href: "/?mode=answer" },
-  { label: "Documents", icon: FileText, href: "/?mode=documents" },
-  { label: "Meds", icon: Pill, href: "/?mode=prescribing" },
-  { label: "Applications", icon: ListChecks, href: "/applications" },
+  { id: "answer", label: "Answer", icon: Sparkles, href: "/?mode=answer" },
+  { id: "documents", label: "Documents", icon: FileText, href: "/?mode=documents" },
+  { id: "prescribing", label: "Meds", icon: Pill, href: "/?mode=prescribing" },
+  { id: "tools", label: "Tools", icon: Wrench, href: "/?mode=tools" },
 ] as const;
 
+const collapsedSidebarButton =
+  "grid h-11 w-11 shrink-0 place-items-center rounded-xl border border-transparent text-[color:var(--text-muted)] transition hover:border-[color:var(--border)] hover:bg-[color:var(--surface)] hover:text-[color:var(--text)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]";
+const collapsedSidebarActiveButton =
+  "border-[color:var(--clinical-chat-teal)]/22 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]";
+const collapsedSidebarPrimaryButton =
+  "border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] hover:border-[color:var(--clinical-chat-teal)]/35 hover:text-[color:var(--clinical-chat-teal)]";
+
 type SidebarIdentity = {
   displayName: string;
   initials: string;
@@ -5359,6 +5497,7 @@ function deriveSidebarIdentity(email: string | null | undefined): SidebarIdentit
 function ClinicalSidebarContent({
   recentQueries,
   identity,
+  activeMode,
   onNewChat,
   onPickRecent,
   onOpenGuide,
@@ -5370,6 +5509,7 @@ function ClinicalSidebarContent({
 }: {
   recentQueries: string[];
   identity: SidebarIdentity;
+  activeMode: AppModeId;
   onNewChat: () => void;
   onPickRecent: (query: string) => void;
   onOpenGuide: () => void;
@@ -5477,22 +5617,26 @@ function ClinicalSidebarContent({
 
       <section>
         <div className="mb-2 flex items-center justify-between gap-2 px-1">
-          <p className="text-[11px] font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">
-            Applications
-          </p>
+          <p className="text-[11px] font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">Tools</p>
         </div>
         <div className="grid grid-cols-2 gap-2">
           {sidebarToolItems.map((item) => {
             const Icon = item.icon;
+            const active = activeMode === item.id;
             return (
               <Link
                 key={item.label}
                 href={item.href}
-                prefetch={item.href === "/applications" ? true : undefined}
-                onFocus={onPrefetchApplications}
-                onPointerEnter={onPrefetchApplications}
+                prefetch={item.href === "/?mode=tools" ? true : undefined}
+                onFocus={item.href === "/?mode=tools" ? onPrefetchApplications : undefined}
+                onPointerEnter={item.href === "/?mode=tools" ? onPrefetchApplications : undefined}
                 onClick={onNavigate}
-                className={sidebarToolTile}
+                aria-current={active ? "page" : undefined}
+                className={cn(
+                  sidebarToolTile,
+                  active &&
+                    "border-[color:var(--clinical-chat-teal)]/28 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-tight)]",
+                )}
               >
                 <Icon className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" />
                 <span>{item.label}</span>
@@ -5501,14 +5645,14 @@ function ClinicalSidebarContent({
           })}
         </div>
         <Link
-          href="/applications"
+          href="/?mode=tools"
           prefetch
           onFocus={onPrefetchApplications}
           onPointerEnter={onPrefetchApplications}
           onClick={onNavigate}
           className="mt-2 inline-flex min-h-10 w-full items-center justify-between rounded-lg border border-[color:var(--clinical-chat-teal)]/16 bg-[color:var(--clinical-chat-teal-soft)]/70 px-3 text-sm font-semibold text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]"
         >
-          View applications
+          View tools
           <ChevronDown className="-rotate-90 h-4 w-4" />
         </Link>
       </section>
@@ -5536,7 +5680,16 @@ function ClinicalSidebarContent({
           <SettingsIcon className="h-4 w-4 shrink-0" />
           <span>Settings</span>
         </button>
-        <div className="mt-2 flex items-center gap-3 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 py-2 shadow-[var(--shadow-inset)]">
+        <button
+          type="button"
+          onClick={() => {
+            onNavigate?.();
+            window.requestAnimationFrame(onOpenSettings);
+          }}
+          data-testid="sidebar-account-settings"
+          className="mt-2 flex w-full items-center gap-3 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 py-2 text-left shadow-[var(--shadow-inset)] transition hover:border-[color:var(--clinical-chat-teal)]/24 hover:bg-[color:var(--clinical-chat-teal-soft)]/40 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
+          aria-label={identity.signedIn ? `Open account profile for ${identity.detail}` : "Open account profile"}
+        >
           <span className="grid h-9 w-9 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-xs font-bold text-[color:var(--clinical-chat-teal)]">
             {identity.initials}
           </span>
@@ -5549,7 +5702,7 @@ function ClinicalSidebarContent({
               <span className="truncate">{identity.detail}</span>
             </span>
           </span>
-        </div>
+        </button>
       </div>
     </div>
   );
@@ -5559,6 +5712,7 @@ function ClinicalDesktopSidebar({
   collapsed,
   recentQueries,
   identity,
+  activeMode,
   onCollapsedChange,
   onNewChat,
   onPickRecent,
@@ -5569,6 +5723,7 @@ function ClinicalDesktopSidebar({
   collapsed: boolean;
   recentQueries: string[];
   identity: SidebarIdentity;
+  activeMode: AppModeId;
   onCollapsedChange: (collapsed: boolean) => void;
   onNewChat: () => void;
   onPickRecent: (query: string) => void;
@@ -5580,53 +5735,81 @@ function ClinicalDesktopSidebar({
     return (
       <aside
         aria-label="Clinical Guide collapsed sidebar"
-        className="hidden min-h-0 border-r border-[color:var(--border)] bg-[color:var(--surface-lux)] px-3 py-4 shadow-[var(--shadow-soft)] lg:flex lg:flex-col lg:items-center lg:gap-3"
+        className="hidden min-h-0 border-r border-[color:var(--border)] bg-[color:var(--surface-lux)] py-4 shadow-[var(--shadow-soft)] lg:flex lg:w-[5.25rem] lg:flex-col lg:items-center"
       >
+        <div className="grid w-full justify-items-center gap-2 px-3">
+          <button
+            type="button"
+            onClick={() => onCollapsedChange(false)}
+            className={cn(collapsedSidebarButton, collapsedSidebarPrimaryButton)}
+            aria-label="Expand sidebar"
+            title="Expand sidebar"
+          >
+            <PanelLeftOpen className="h-4.5 w-4.5" />
+          </button>
+        </div>
+
+        <div className="mt-4 grid w-full justify-items-center gap-2 px-3">
+          <button
+            type="button"
+            onClick={onNewChat}
+            className={collapsedSidebarButton}
+            aria-label="New chat"
+            title="New chat"
+          >
+            <Plus className="h-4 w-4" />
+          </button>
+          <button
+            type="button"
+            onClick={() => onCollapsedChange(false)}
+            className={cn(collapsedSidebarButton, activeMode === "answer" && collapsedSidebarActiveButton)}
+            aria-label="Search chats"
+            title="Search chats"
+            aria-current={activeMode === "answer" ? "page" : undefined}
+          >
+            <Search className="h-4 w-4" />
+          </button>
+          <Link
+            href="/?mode=tools"
+            prefetch
+            onFocus={onPrefetchApplications}
+            onPointerEnter={onPrefetchApplications}
+            className={cn(collapsedSidebarButton, activeMode === "tools" && collapsedSidebarActiveButton)}
+            aria-label="Tools"
+            title="Tools"
+            aria-current={activeMode === "tools" ? "page" : undefined}
+          >
+            <Wrench className="h-4 w-4" />
+          </Link>
+          <button
+            type="button"
+            onClick={onOpenGuide}
+            className={collapsedSidebarButton}
+            aria-label="Guide and help"
+            title="Guide"
+          >
+            <BookOpen className="h-4 w-4" />
+          </button>
+          <button
+            type="button"
+            onClick={onOpenSettings}
+            className={collapsedSidebarButton}
+            aria-label="Settings"
+            title="Settings"
+          >
+            <SettingsIcon className="h-4 w-4" />
+          </button>
+        </div>
         <button
           type="button"
-          onClick={() => onCollapsedChange(false)}
-          className="grid h-11 w-11 place-items-center rounded-xl border border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]"
-          aria-label="Expand sidebar"
-          title="Expand sidebar"
-        >
-          <PanelLeftOpen className="h-4.5 w-4.5" />
-        </button>
-        <button type="button" onClick={onNewChat} className={sidebarItem} aria-label="New chat" title="New chat">
-          <Plus className="h-4 w-4" />
-        </button>
-        <button
-          type="button"
-          onClick={() => onCollapsedChange(false)}
-          className={sidebarItem}
-          aria-label="Search chats"
-          title="Search chats"
-        >
-          <Search className="h-4 w-4" />
-        </button>
-        <Link
-          href="/applications"
-          prefetch
-          onFocus={onPrefetchApplications}
-          onPointerEnter={onPrefetchApplications}
-          className={sidebarItem}
-          aria-label="Applications"
-          title="Applications"
-        >
-          <ListChecks className="h-4 w-4" />
-        </Link>
-        <button type="button" onClick={onOpenGuide} className={sidebarItem} aria-label="Guide and help" title="Guide">
-          <BookOpen className="h-4 w-4" />
-        </button>
-        <button type="button" onClick={onOpenSettings} className={sidebarItem} aria-label="Settings" title="Settings">
-          <SettingsIcon className="h-4 w-4" />
-        </button>
-        <div
-          className="mt-auto grid h-11 w-11 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-xs font-bold text-[color:var(--clinical-chat-teal)]"
+          onClick={onOpenSettings}
+          data-testid="collapsed-account-settings"
+          className="mt-auto grid h-11 w-11 place-items-center rounded-full border border-[color:var(--clinical-chat-teal)]/14 bg-[color:var(--clinical-chat-teal-soft)] text-xs font-bold text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] transition hover:border-[color:var(--clinical-chat-teal)]/35 hover:bg-[color:var(--clinical-chat-teal-soft)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
           title={identity.detail}
-          aria-label={identity.signedIn ? `Signed in as ${identity.detail}` : "Not signed in"}
+          aria-label={identity.signedIn ? `Open account profile for ${identity.detail}` : "Open account profile"}
         >
           {identity.initials}
-        </div>
+        </button>
       </aside>
     );
   }
@@ -5640,6 +5823,7 @@ function ClinicalDesktopSidebar({
       <ClinicalSidebarContent
         recentQueries={recentQueries}
         identity={identity}
+        activeMode={activeMode}
         onCollapsedChange={onCollapsedChange}
         onNewChat={onNewChat}
         onPickRecent={onPickRecent}
@@ -5655,6 +5839,7 @@ function ClinicalMobileSidebar({
   open,
   recentQueries,
   identity,
+  activeMode,
   onOpenChange,
   onNewChat,
   onPickRecent,
@@ -5665,6 +5850,7 @@ function ClinicalMobileSidebar({
   open: boolean;
   recentQueries: string[];
   identity: SidebarIdentity;
+  activeMode: AppModeId;
   onOpenChange: (open: boolean) => void;
   onNewChat: () => void;
   onPickRecent: (query: string) => void;
@@ -5686,6 +5872,7 @@ function ClinicalMobileSidebar({
         showHeader={false}
         recentQueries={recentQueries}
         identity={identity}
+        activeMode={activeMode}
         onNewChat={onNewChat}
         onPickRecent={onPickRecent}
         onOpenGuide={onOpenGuide}
@@ -5714,318 +5901,324 @@ function SettingsDialog({
   onSignOut: () => void;
   onOpenGuide: () => void;
 }) {
-  const themeOptions: Array<{ value: "light" | "dark"; label: string }> = [
-    { value: "light", label: "Light" },
-    { value: "dark", label: "Dark" },
+  const closeButtonRef = useRef<HTMLButtonElement | null>(null);
+  const currentThemeLabel = theme === "dark" ? "Dark" : "Light";
+  const settingSections = [
+    {
+      title: "Account",
+      rows: [
+        { icon: UserRound, label: "Profile", value: identity.displayName },
+        { icon: Stethoscope, label: "Clinical role", value: "Consultant psychiatrist" },
+      ],
+    },
+    {
+      title: "Clinical defaults",
+      rows: [
+        { icon: Globe2, label: "Jurisdiction", value: "Western Australia", active: true },
+        { icon: CircleUserRound, label: "Default population", value: "Adults" },
+        { icon: SlidersHorizontal, label: "Answer style", value: "Conservative" },
+      ],
+    },
+    {
+      title: "App preferences",
+      rows: [
+        {
+          icon: Palette,
+          label: "Appearance",
+          value: currentThemeLabel,
+          onClick: onToggleTheme,
+          actionLabel: `Switch to ${theme === "dark" ? "light" : "dark"} mode`,
+        },
+        { icon: SettingsIcon, label: "Interface density", value: "Comfortable" },
+      ],
+    },
+  ];
+  const navItems = [
+    { icon: SettingsIcon, label: "General" },
+    { icon: Stethoscope, label: "Clinical defaults" },
+    { icon: Sparkles, label: "Personalisation" },
+    { icon: Bell, label: "Notifications" },
+    { icon: LockKeyhole, label: "Security" },
+    { icon: CircleUserRound, label: "Account", active: true },
+    { icon: Keyboard, label: "Keyboard" },
+    {
+      icon: HelpCircle,
+      label: "Help & About",
+      onClick: () => {
+        onClose();
+        onOpenGuide();
+      },
+    },
   ];
 
+  const closeButton = (
+    <button
+      ref={closeButtonRef}
+      type="button"
+      onClick={onClose}
+      aria-label="Close settings"
+      className="absolute right-3 top-3 z-10 grid h-10 w-10 place-items-center rounded-full text-[color:var(--text-muted)] transition hover:bg-[color:var(--surface)] hover:text-[color:var(--text-heading)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:left-4 sm:right-auto sm:top-4"
+    >
+      <X className="h-4.5 w-4.5" />
+    </button>
+  );
+
   return (
     <Sheet
       open={open}
       onClose={onClose}
-      title="Settings"
-      description="Appearance, account, and help for the Clinical KB workspace."
       closeLabel="Close settings"
-      contentClassName="sm:max-w-lg"
+      labelledBy="account-settings-title"
+      initialFocusRef={closeButtonRef}
+      mobilePlacement="top"
+      contentClassName="w-full max-w-[calc(100vw-1.5rem)] border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-lux)] sm:max-w-[880px]"
+      bodyClassName="p-0 sm:p-0"
     >
-      <div className="grid gap-4">
-        <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] p-3 shadow-[var(--shadow-inset)]">
-          <div className="flex items-center gap-2">
-            <SlidersHorizontal className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" />
-            <h3 className="text-sm font-semibold text-[color:var(--text-heading)]">Appearance</h3>
-          </div>
-          <p className={cn("mt-1 text-xs", textMuted)}>Choose the workspace theme. Saved to this browser.</p>
-          <div
-            role="group"
-            aria-label="Theme"
-            className="mt-3 inline-grid grid-cols-2 gap-1 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-subtle)] p-1"
-          >
-            {themeOptions.map((option) => {
-              const active = option.value === theme;
+      <div className="relative grid max-h-[calc(100dvh-1.5rem)] min-h-0 overflow-hidden sm:max-h-[min(82dvh,720px)] sm:grid-cols-[248px_minmax(0,1fr)]">
+        {closeButton}
+        <aside className="hidden border-r border-[color:var(--border-lux)] bg-[color:var(--surface)]/62 px-4 pb-5 pt-16 sm:flex sm:flex-col">
+          <nav aria-label="Settings sections" className="grid gap-1">
+            {navItems.map((item) => {
+              const Icon = item.icon;
+              const active = item.active;
               return (
                 <button
-                  key={option.value}
+                  key={item.label}
                   type="button"
-                  aria-pressed={active}
-                  onClick={() => {
-                    if (!active) onToggleTheme();
-                  }}
+                  onClick={item.onClick}
+                  aria-current={active ? "page" : undefined}
                   className={cn(
-                    "min-h-9 rounded-md px-4 text-sm font-semibold transition",
+                    "flex min-h-11 items-center gap-3 rounded-lg px-3 text-sm font-medium transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
                     active
-                      ? "bg-[color:var(--clinical-chat-teal)] text-white shadow-[var(--shadow-tight)]"
-                      : "text-[color:var(--text-muted)] hover:text-[color:var(--text)]",
+                      ? "bg-[color:var(--surface-lux)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]"
+                      : "text-[color:var(--text-muted)] hover:bg-[color:var(--surface-lux)]/80 hover:text-[color:var(--text-heading)]",
                   )}
                 >
-                  {option.label}
+                  <Icon className="h-4 w-4 shrink-0" />
+                  <span>{item.label}</span>
                 </button>
               );
             })}
-          </div>
-        </section>
+          </nav>
+        </aside>
 
-        <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] p-3 shadow-[var(--shadow-inset)]">
-          <div className="flex items-center gap-2">
-            <ShieldCheck className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" />
-            <h3 className="text-sm font-semibold text-[color:var(--text-heading)]">Account</h3>
-          </div>
-          <div className="mt-2 flex items-center gap-3">
-            <span className="grid h-9 w-9 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-xs font-bold text-[color:var(--clinical-chat-teal)]">
-              {identity.initials}
+        <div className="min-h-0 overflow-y-auto px-4 pb-5 pt-14 polished-scroll sm:px-6 sm:pb-6 sm:pt-5">
+          <div className="mb-4 flex items-center justify-between gap-4 sm:mb-5">
+            <div className="min-w-0">
+              <p className="hidden text-[11px] font-bold uppercase tracking-[0.11em] text-[color:var(--clinical-chat-teal)] sm:block">
+                Refined settings
+              </p>
+              <h2
+                id="account-settings-title"
+                className="truncate text-xl font-semibold tracking-[-0.01em] text-[color:var(--text-heading)] sm:text-2xl"
+              >
+                Account &amp; app
+              </h2>
+            </div>
+            <span className="hidden shrink-0 rounded-full border border-[color:var(--border-lux)] bg-[color:var(--surface)] px-3 py-1 text-xs font-semibold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] sm:inline-flex">
+              Clinician account
             </span>
-            <span className="min-w-0 flex-1">
-              <span className="block truncate text-sm font-semibold text-[color:var(--text)]">
-                {identity.displayName}
-              </span>
-              <span className={cn("flex items-center gap-1.5 truncate text-xs", textMuted)}>
-                <Mail className="h-3.5 w-3.5 shrink-0" />
-                <span className="truncate">{identity.detail}</span>
+          </div>
+
+          <section className="rounded-xl border border-[color:var(--border-lux)] bg-[color:var(--surface)] p-4 shadow-[var(--shadow-inset)]">
+            <div className="flex items-center gap-3">
+              <span className="relative grid h-12 w-12 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-sm font-bold text-[color:var(--clinical-chat-teal)] sm:h-14 sm:w-14">
+                {identity.initials}
+                {identity.signedIn ? (
+                  <span className="absolute bottom-0.5 right-0.5 h-3 w-3 rounded-full border-2 border-[color:var(--surface)] bg-[color:var(--clinical-chat-ready)]" />
+                ) : null}
               </span>
-            </span>
+              <div className="min-w-0 flex-1">
+                <p className="truncate text-base font-semibold text-[color:var(--text-heading)]">
+                  {identity.displayName}
+                </p>
+                <p className="truncate text-sm text-[color:var(--text-muted)]">
+                  Consultant psychiatrist, Western Australia
+                </p>
+              </div>
+              <div className="hidden shrink-0 items-center gap-2 sm:flex">
+                <SettingsChip label="Private" />
+                <SettingsChip label="No PHI" />
+              </div>
+            </div>
+            <div className="mt-3 flex flex-wrap gap-2 sm:hidden">
+              <SettingsChip label="Private" />
+              <SettingsChip label="WA" />
+              <SettingsChip label="No PHI" />
+            </div>
+          </section>
+
+          <div className="mt-4 grid gap-3 sm:grid-cols-3">
+            <SettingsSummaryTile icon={UserRound} label="Profile" value={identity.displayName} />
+            <SettingsSummaryTile icon={Stethoscope} label="Clinical setup" value="WA, adults" emphasized />
+            <SettingsSummaryTile icon={PanelTop} label="Default view" value="Ask" />
           </div>
-          {identity.signedIn ? (
+
+          <section className="mt-4 rounded-xl border border-[color:var(--border-lux)] bg-[color:var(--surface)] p-3 shadow-[var(--shadow-inset)] sm:p-5">
+            <div className="grid gap-5">
+              {settingSections.map((section) => (
+                <div key={section.title} className="min-w-0">
+                  <h3 className="mb-2 px-1 text-sm font-semibold text-[color:var(--text-heading)]">{section.title}</h3>
+                  <div className="overflow-hidden rounded-xl border border-[color:var(--border)] bg-[color:var(--surface-lux)] sm:rounded-none sm:border-0 sm:bg-transparent">
+                    {section.rows.map((row) => (
+                      <SettingsRow key={`${section.title}-${row.label}`} {...row} />
+                    ))}
+                    {section.title === "Account" && identity.signedIn ? (
+                      <SettingsRow
+                        icon={LogOut}
+                        label="Sign out"
+                        value=""
+                        onClick={() => {
+                          onSignOut();
+                          onClose();
+                        }}
+                        actionLabel="Sign out"
+                      />
+                    ) : null}
+                  </div>
+                </div>
+              ))}
+            </div>
             <button
               type="button"
               onClick={() => {
-                onSignOut();
                 onClose();
+                onOpenGuide();
               }}
-              className={cn(floatingControl, "mt-3 w-full")}
+              className="mt-5 flex min-h-11 w-full items-center justify-between rounded-xl border border-[color:var(--border)] bg-[color:var(--surface-lux)] px-3 text-sm font-semibold text-[color:var(--text)] shadow-[var(--shadow-inset)] transition hover:border-[color:var(--clinical-chat-teal)]/24 hover:text-[color:var(--clinical-chat-teal)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:hidden"
             >
-              <LogOut className="h-4 w-4" />
-              Sign out
+              <span className="flex items-center gap-3">
+                <BookOpen className="h-4 w-4 text-[color:var(--text-muted)]" />
+                Guide &amp; help
+              </span>
+              <ChevronDown className="-rotate-90 h-4 w-4 text-[color:var(--text-muted)]" />
             </button>
-          ) : (
-            <p className={cn("mt-3 text-xs", textMuted)}>
-              Sign in from the search header to access private documents and saved reviews.
-            </p>
-          )}
-        </section>
-
-        <button
-          type="button"
-          onClick={() => {
-            onClose();
-            onOpenGuide();
-          }}
-          className={cn(floatingControl, "w-full justify-between")}
-        >
-          <span className="flex items-center gap-2">
-            <BookOpen className="h-4 w-4" />
-            Guide &amp; help
-          </span>
-          <ChevronDown className="-rotate-90 h-4 w-4" />
-        </button>
+          </section>
+        </div>
       </div>
     </Sheet>
   );
 }
 
-function toolMatchesQuery(tool: ToolItem, query: string) {
-  const normalized = query.trim().toLowerCase();
-  if (!normalized) return true;
-  return [tool.title, tool.description, tool.category, tool.status, tool.id]
-    .join(" ")
-    .toLowerCase()
-    .includes(normalized);
-}
-
-function toolStatusLabel(tool: ToolItem) {
-  if (tool.status === "coming-soon") return "Soon";
-  if (tool.status === "offline") return "Paused";
-  if (tool.status === "beta") return "Preview";
-  return "Ready";
-}
-
-const TOOL_ICON_MAP: Record<string, React.ComponentType<{ className?: string }>> = {
-  Brain,
-  ClipboardList,
-  Search,
-  FileImage,
-  FileText,
-  HeartHandshake,
-  Network,
-  Pill,
-  UploadCloud,
-  BookOpen,
-  Quote,
-  ShieldAlert,
-  Target,
-  ClipboardCheck,
-  ListChecks,
-  Sparkles,
-  Clipboard: ClipboardCheck,
-  ExternalLink,
-};
-
-function getToolIcon(iconName: string) {
-  return TOOL_ICON_MAP[iconName] || Wrench;
-}
-
-function cleanToolHrefLabel(href: string) {
-  try {
-    if (href.startsWith("/")) return href;
-    const url = new URL(href);
-    return url.host;
-  } catch {
-    return href;
-  }
+function SettingsChip({ label }: { label: string }) {
+  return (
+    <span className="inline-flex min-h-7 items-center rounded-full border border-[color:var(--clinical-chat-teal)]/18 bg-[color:var(--clinical-chat-teal-soft)] px-3 text-xs font-semibold text-[color:var(--clinical-chat-teal)]">
+      {label}
+    </span>
+  );
 }
 
-function ToolsHub({ query, onClearQuery }: { query: string; onClearQuery: () => void }) {
-  const normalizedQuery = query.trim();
-  const visibleTools = toolCatalog.filter((tool) => toolMatchesQuery(tool, normalizedQuery));
-  const onlineTools = toolCatalog.filter((tool) => tool.status === "online" || tool.status === "beta").length;
-  const internalTools = toolCatalog.filter((tool) => tool.target === "internal").length;
-  const activeFilterCount = normalizedQuery ? 1 : 0;
-
+function SettingsSummaryTile({
+  icon: Icon,
+  label,
+  value,
+  emphasized = false,
+}: {
+  icon: typeof UserRound;
+  label: string;
+  value: string;
+  emphasized?: boolean;
+}) {
   return (
-    <div data-testid="tools-hub" className="mx-auto w-full max-w-6xl space-y-4 overflow-x-hidden sm:space-y-5">
-      <div className="mx-auto grid w-full max-w-5xl gap-4 pt-4 sm:pt-7 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-end">
-        <div className="grid justify-items-center gap-3 text-center lg:justify-items-start lg:text-left">
-          <span className="grid h-14 w-14 place-items-center rounded-lg border border-[color:var(--clinical-chat-teal)]/15 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
-            <Wrench className="h-6 w-6 sm:h-7 sm:w-7" />
-          </span>
-          <div className="max-w-2xl space-y-2">
-            <h2 className="text-3xl font-bold tracking-normal text-[color:var(--text-heading)] sm:text-4xl">Tools</h2>
-            <p className="text-sm leading-6 text-[color:var(--text-muted)] sm:text-[15px]">
-              Search the existing clinical applications registry and launch the right workflow without leaving the
-              dashboard shell.
-            </p>
-          </div>
-        </div>
-
-        <div className="grid grid-cols-3 gap-2 text-left sm:mx-auto sm:w-full sm:max-w-md lg:mx-0 lg:w-[24rem]">
-          {[
-            { label: "Tools", value: toolCatalog.length, icon: Wrench },
-            { label: "Ready", value: onlineTools, icon: CheckCircle2 },
-            { label: "In-app", value: internalTools, icon: LayoutList },
-          ].map((stat) => {
-            const Icon = stat.icon;
-            return (
-              <div
-                key={stat.label}
-                className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] px-3 py-2 shadow-[var(--shadow-inset)]"
-              >
-                <div className="flex items-center gap-1.5 text-[11px] font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">
-                  <Icon className="h-3.5 w-3.5 text-[color:var(--clinical-chat-teal)]" />
-                  <span className="truncate">{stat.label}</span>
-                </div>
-                <p className="nums mt-1 text-lg font-bold leading-none text-[color:var(--text-heading)]">
-                  {stat.value}
-                </p>
-              </div>
-            );
-          })}
-        </div>
-      </div>
-
-      <div className="mx-auto flex w-full max-w-5xl flex-wrap items-center justify-between gap-2 px-0.5 text-xs font-semibold text-[color:var(--text-muted)]">
-        <span>
-          Showing {visibleTools.length} of {toolCatalog.length} tools
-        </span>
-        <div className="flex flex-wrap items-center gap-2">
-          {activeFilterCount > 0 && (
-            <button type="button" onClick={onClearQuery} className={cn(floatingControl, "min-h-9 px-2.5 text-xs")}>
-              <X className="h-3.5 w-3.5" />
-              Clear search
-            </button>
+    <div
+      className={cn(
+        "min-w-0 rounded-xl border p-3 shadow-[var(--shadow-inset)] sm:p-4",
+        emphasized
+          ? "border-[color:var(--clinical-chat-teal)]/28 bg-[color:var(--clinical-chat-teal-soft)]"
+          : "border-[color:var(--border-lux)] bg-[color:var(--surface)]",
+      )}
+    >
+      <div className="flex min-w-0 items-center gap-3">
+        <span
+          className={cn(
+            "grid h-9 w-9 shrink-0 place-items-center rounded-lg border shadow-[var(--shadow-inset)]",
+            emphasized
+              ? "border-[color:var(--clinical-chat-teal)] bg-[color:var(--clinical-chat-teal)] text-white"
+              : "border-[color:var(--border)] bg-[color:var(--surface-lux)] text-[color:var(--text-muted)]",
           )}
-          <Link href="/applications" className={cn(floatingControl, "min-h-9 px-2.5 text-xs")}>
-            <LayoutList className="h-3.5 w-3.5" />
-            Full launcher
-          </Link>
-        </div>
+        >
+          <Icon className="h-4.5 w-4.5" />
+        </span>
+        <span className="min-w-0">
+          <span className="block truncate text-xs font-semibold text-[color:var(--text-muted)]">{label}</span>
+          <span className="block truncate text-sm font-semibold text-[color:var(--text-heading)]">{value}</span>
+        </span>
       </div>
+    </div>
+  );
+}
 
-      {visibleTools.length === 0 ? (
-        <EmptyState
-          icon={Wrench}
-          title="No tools match"
-          body="Clear the search or try a clinical workflow, app name, category, or status."
-        />
-      ) : (
-        <div className="mx-auto grid w-full max-w-5xl gap-2 sm:grid-cols-2 xl:grid-cols-3">
-          {visibleTools.map((tool) => {
-            const disabled = tool.status === "offline" || tool.status === "coming-soon";
-            const launchLabel = `Launch ${tool.title}`;
-            const launchClassName = cn(
-              "inline-flex min-h-10 items-center justify-center gap-2 rounded-lg px-3 text-sm font-bold shadow-[var(--shadow-inset)] transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
-              disabled
-                ? "border border-[color:var(--border)] bg-[color:var(--surface-subtle)] text-[color:var(--text-soft)]"
-                : "bg-[color:var(--clinical-chat-teal)] text-white hover:bg-[color:var(--clinical-chat-teal-strong)]",
-            );
-            const ToolIcon = getToolIcon(tool.icon);
-            const isOnline = tool.status === "online" || tool.status === "beta";
-            const statusColorClass =
-              tool.status === "online"
-                ? "bg-emerald-500 shadow-[0_0_8px_#10b981]"
-                : tool.status === "beta"
-                  ? "bg-amber-500 shadow-[0_0_8px_#f59e0b]"
-                  : "bg-slate-400";
+function SettingsRow({
+  icon: Icon,
+  label,
+  value,
+  active = false,
+  onClick,
+  actionLabel,
+}: {
+  icon: typeof UserRound;
+  label: string;
+  value: string;
+  active?: boolean;
+  onClick?: () => void;
+  actionLabel?: string;
+}) {
+  const content = (
+    <>
+      <span
+        className={cn(
+          "grid h-9 w-9 shrink-0 place-items-center rounded-lg border shadow-[var(--shadow-inset)]",
+          active
+            ? "border-[color:var(--clinical-chat-teal)] bg-[color:var(--clinical-chat-teal)] text-white"
+            : "border-[color:var(--border)] bg-[color:var(--surface-lux)] text-[color:var(--text-muted)]",
+        )}
+      >
+        <Icon className="h-4.5 w-4.5" />
+      </span>
+      <span className="min-w-0 flex-1 sm:flex sm:items-center sm:justify-between sm:gap-3">
+        <span className="block truncate text-sm font-semibold text-[color:var(--text-heading)]">{label}</span>
+        {value ? (
+          <span className="mt-0.5 block truncate text-sm font-medium text-[color:var(--text)] sm:mt-0 sm:max-w-[50%] sm:text-right">
+            {value}
+          </span>
+        ) : null}
+      </span>
+      <ChevronDown className="-rotate-90 h-4 w-4 shrink-0 text-[color:var(--text-soft)]" />
+    </>
+  );
 
-            return (
-              <article
-                key={tool.id}
-                data-testid={`tool-mode-result-${tool.id}`}
-                className="group grid min-h-48 grid-rows-[auto_1fr_auto] gap-3 rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] p-4 shadow-[var(--shadow-tight)] transition-all duration-200 hover:border-[color:var(--primary)]/40 hover:shadow-[var(--shadow-hover)]"
-              >
-                <div className="flex items-start justify-between gap-3">
-                  <span className={cn(iconTilePremium, "group-hover:scale-105 transition-transform duration-200")}>
-                    <ToolIcon className="h-4 w-4" />
-                  </span>
-                  <span className="inline-flex min-h-7 items-center rounded-md border border-[color:var(--border)] bg-[color:var(--surface-subtle)] px-2 text-[11px] font-bold text-[color:var(--text-muted)]">
-                    {toolStatusLabel(tool)}
-                  </span>
-                </div>
+  const className =
+    "flex min-h-12 w-full items-center gap-3 border-b border-[color:var(--border)] px-3 text-left last:border-b-0 transition hover:bg-[color:var(--surface)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-[-2px] focus-visible:outline-[color:var(--focus)] sm:px-0 sm:hover:bg-transparent";
+  const testId = `settings-row-${label
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/(^-|-$)/g, "")}`;
 
-                <div className="min-w-0">
-                  <h3 className="truncate text-base font-bold text-[color:var(--text-heading)]">{tool.title}</h3>
-                  <p className="mt-1 line-clamp-3 text-sm leading-6 text-[color:var(--text-muted)]">
-                    {tool.description}
-                  </p>
-                  <div className="mt-2 flex flex-wrap gap-1.5 text-[11px] font-bold text-[color:var(--text-soft)]">
-                    <span className="rounded-md bg-[color:var(--surface-subtle)] px-1.5 py-0.5">{tool.category}</span>
-                    <span className="rounded-md bg-[color:var(--surface-subtle)] px-1.5 py-0.5">
-                      {tool.target === "internal" ? "In-app" : "Connected"}
-                    </span>
-                  </div>
-                  <div className="mt-3 flex items-center gap-1.5 rounded-md bg-[color:var(--surface-subtle)] px-2 py-1 text-[10px] font-medium text-[color:var(--text-muted)] border border-[color:var(--border)] w-fit group-hover:border-[color:var(--primary)]/20 transition-colors">
-                    <span className={cn("h-1.5 w-1.5 rounded-full", statusColorClass, isOnline && "animate-pulse")} />
-                    <span className="font-mono text-[10px] text-[color:var(--text-soft)]">
-                      {cleanToolHrefLabel(tool.href)}
-                    </span>
-                  </div>
-                </div>
+  if (onClick) {
+    return (
+      <button
+        type="button"
+        onClick={onClick}
+        aria-label={actionLabel ?? label}
+        className={className}
+        data-testid={testId}
+      >
+        {content}
+      </button>
+    );
+  }
 
-                {disabled ? (
-                  <span className={launchClassName}>{tool.disabledHint ?? "Unavailable"}</span>
-                ) : tool.target === "internal" ? (
-                  <Link href={tool.href} aria-label={launchLabel} className={launchClassName}>
-                    Launch
-                    <ChevronDown className="-rotate-90 h-4 w-4" />
-                  </Link>
-                ) : (
-                  <a
-                    href={tool.href}
-                    target={tool.openInNewTab ? "_blank" : undefined}
-                    rel="noopener noreferrer"
-                    aria-label={launchLabel}
-                    className={launchClassName}
-                  >
-                    Launch
-                    <ExternalLink className="h-4 w-4" />
-                  </a>
-                )}
-              </article>
-            );
-          })}
-        </div>
-      )}
+  return (
+    <div className={className} data-testid={testId}>
+      {content}
     </div>
   );
 }
 
+function ToolsHub({ query, onQueryChange }: { query: string; onQueryChange: (nextQuery: string) => void }) {
+  return <ApplicationsLauncherWorkspace variant="dashboard-tools" query={query} onQueryChange={onQueryChange} />;
+}
+
 type MobileSectionFabItem = {
   label: string;
   description: string;
@@ -6172,6 +6365,7 @@ function MobileSectionFab({
   const [open, setOpen] = useState(false);
   const [active, setActive] = useState(false);
   const buttonRef = useRef<HTMLButtonElement>(null);
+  const panelRef = useRef<HTMLElement | null>(null);
   const panelId = "mobile-section-fab-menu";
   const labelId = "mobile-section-fab-label";
   const activeItem = items.find((item) => item.href === activeHash) ?? items[0];
@@ -6184,20 +6378,14 @@ function MobileSectionFab({
       window.requestAnimationFrame(() => buttonRef.current?.focus());
     }
   }, []);
+  const dismissMobileSectionMenu = useCallback(() => closeMenu(), [closeMenu]);
 
-  useEffect(() => {
-    if (!open) return;
-
-    function handleKeyDown(event: KeyboardEvent) {
-      if (event.key === "Escape") {
-        event.preventDefault();
-        closeMenu();
-      }
-    }
-
-    window.addEventListener("keydown", handleKeyDown);
-    return () => window.removeEventListener("keydown", handleKeyDown);
-  }, [closeMenu, open]);
+  useDismissableLayer({
+    enabled: open,
+    refs: [buttonRef, panelRef],
+    restoreFocusRef: buttonRef,
+    onDismiss: dismissMobileSectionMenu,
+  });
 
   useEffect(() => {
     const mediaQuery = window.matchMedia(mobileSectionFabMediaQuery);
@@ -6274,6 +6462,7 @@ function MobileSectionFab({
       </button>
 
       <section
+        ref={panelRef}
         id={panelId}
         data-testid="mobile-section-fab-menu"
         role="region"
@@ -6561,45 +6750,67 @@ export function ClinicalDashboard({
       authStatus === "authenticated" ||
       (supabaseEnvStatus === "ready" && storedSessionExists));
   const canRunSearch = explicitDemoMode || (hasReadyPublicSearchSetup(setupChecks) && canUsePrivateApis);
-  const openGuide = useCallback(() => setGuideOpen(true), []);
+  const closeDashboardTransientSurfaces = useCallback(
+    (except?: "guide" | "settings" | "mobileSidebar" | "documents" | "upload") => {
+      if (except !== "guide") setGuideOpen(false);
+      if (except !== "settings") setSettingsOpen(false);
+      if (except !== "mobileSidebar") setMobileSidebarOpen(false);
+      if (except !== "documents") setDocumentsDrawerOpen(false);
+      if (except !== "upload") setUploadDrawerOpen(false);
+    },
+    [],
+  );
+  const openGuide = useCallback(() => {
+    closeDashboardTransientSurfaces("guide");
+    setGuideOpen(true);
+  }, [closeDashboardTransientSurfaces]);
   const closeGuide = useCallback(() => setGuideOpen(false), []);
-  const openSettings = useCallback(() => setSettingsOpen(true), []);
+  const openSettings = useCallback(() => {
+    closeDashboardTransientSurfaces("settings");
+    setSettingsOpen(true);
+  }, [closeDashboardTransientSurfaces]);
   const closeSettings = useCallback(() => setSettingsOpen(false), []);
   const sidebarIdentity = useMemo(() => deriveSidebarIdentity(auth.session?.user.email), [auth.session?.user.email]);
   const prefetchApplications = useCallback(() => {
-    router.prefetch("/applications");
-    void import("@/components/applications-launcher-page");
+    router.prefetch("/?mode=tools");
   }, [router]);
-  const openLibraryHealthTarget = useCallback((target: LibraryHealthTarget) => {
-    const targetId =
-      target === "documents"
-        ? "dashboard-documents-drawer"
-        : target === "setup"
-          ? "dashboard-setup-section"
-          : "dashboard-indexing-section";
-
-    if (target === "documents") {
-      setDocumentDrawerStatusFilter("indexed");
-      setDocumentsDrawerMode("admin");
-      setDocumentsDrawerOpen(true);
-    } else if (target === "indexing") {
-      setUploadMobileTab("jobs");
-      setIndexingMonitorFilter("active");
-      setUploadDrawerOpen(true);
-    } else if (target === "failures") {
-      setUploadMobileTab("jobs");
-      setIndexingMonitorFilter("failed");
-      setUploadDrawerOpen(true);
-    } else {
-      setUploadMobileTab("setup");
-      setIndexingMonitorFilter("all");
-      setUploadDrawerOpen(true);
-    }
+  const openLibraryHealthTarget = useCallback(
+    (target: LibraryHealthTarget) => {
+      const targetId =
+        target === "documents"
+          ? "dashboard-documents-drawer"
+          : target === "setup"
+            ? "dashboard-setup-section"
+            : "dashboard-indexing-section";
+
+      if (target === "documents") {
+        closeDashboardTransientSurfaces("documents");
+        setDocumentDrawerStatusFilter("indexed");
+        setDocumentsDrawerMode("admin");
+        setDocumentsDrawerOpen(true);
+      } else if (target === "indexing") {
+        closeDashboardTransientSurfaces("upload");
+        setUploadMobileTab("jobs");
+        setIndexingMonitorFilter("active");
+        setUploadDrawerOpen(true);
+      } else if (target === "failures") {
+        closeDashboardTransientSurfaces("upload");
+        setUploadMobileTab("jobs");
+        setIndexingMonitorFilter("failed");
+        setUploadDrawerOpen(true);
+      } else {
+        closeDashboardTransientSurfaces("upload");
+        setUploadMobileTab("setup");
+        setIndexingMonitorFilter("all");
+        setUploadDrawerOpen(true);
+      }
 
-    window.setTimeout(() => {
-      document.getElementById(targetId)?.scrollIntoView({ behavior: "smooth", block: "start" });
-    }, 0);
-  }, []);
+      window.setTimeout(() => {
+        document.getElementById(targetId)?.scrollIntoView({ behavior: "smooth", block: "start" });
+      }, 0);
+    },
+    [closeDashboardTransientSurfaces],
+  );
 
   useEffect(() => {
     const timeoutId = window.setTimeout(prefetchApplications, 250);
@@ -7644,6 +7855,7 @@ export function ClinicalDashboard({
   }
 
   function openDocumentsDrawer(mode: DocumentDrawerMode) {
+    closeDashboardTransientSurfaces("documents");
     setSearchMode("documents");
     setDocumentDrawerStatusFilter("indexed");
     setDocumentsDrawerMode(mode);
@@ -7674,6 +7886,7 @@ export function ClinicalDashboard({
       });
       return;
     }
+    closeDashboardTransientSurfaces("upload");
     setSearchMode("documents");
     setDocumentsDrawerMode("admin");
     setUploadDrawerOpen(true);
@@ -7687,6 +7900,7 @@ export function ClinicalDashboard({
   }
 
   function openEvidenceDrawer() {
+    closeDashboardTransientSurfaces();
     const drawer = document.getElementById("answer-evidence-drawer") as HTMLDetailsElement | null;
     if (!drawer) {
       setActionNotice({
@@ -7895,7 +8109,7 @@ export function ClinicalDashboard({
         activeModeResultKind === "favourites"
           ? favouritePrototypeCount
           : activeModeResultKind === "tools"
-            ? toolCatalog.length
+            ? applicationsLauncherItemCount
             : activeModeResultKind === "documents"
               ? documentMatches.length
               : null,
@@ -8066,6 +8280,7 @@ export function ClinicalDashboard({
         collapsed={sidebarCollapsed}
         recentQueries={recentQueries}
         identity={sidebarIdentity}
+        activeMode={searchMode}
         onCollapsedChange={setSidebarCollapsed}
         onNewChat={startNewChat}
         onPickRecent={pickRecentQuery}
@@ -8096,8 +8311,16 @@ export function ClinicalDashboard({
           onToggleScope={toggleDocumentScope}
           onOpenUpload={openUploadDrawer}
           onOpenEvidence={openEvidenceDrawer}
+          onOpenRecentDocuments={openRecentDocuments}
+          onOpenLibrary={openSourceLibrary}
+          onOpenSourcePdf={openSourcePdfBrowser}
           onNewChat={startNewChat}
-          onOpenMobileSidebar={() => setMobileSidebarOpen(true)}
+          onOpenMobileSidebar={() => {
+            closeDashboardTransientSurfaces("mobileSidebar");
+            setMobileSidebarOpen(true);
+          }}
+          onOpenSettings={openSettings}
+          identity={sidebarIdentity}
           onToggleTheme={toggleTheme}
           queryModeOptions={clinicalQueryModeOptions}
           queryInputRef={composerInputRef}
@@ -8185,7 +8408,7 @@ export function ClinicalDashboard({
                   }
                 />
               ) : activeModeResultKind === "tools" ? (
-                <ToolsHub query={query} onClearQuery={() => setQuery("")} />
+                <ToolsHub query={query} onQueryChange={setQuery} />
               ) : activeModeResultKind === "documents" ? (
                 searchMode === "prescribing" ? (
                   <MedicationPrescribingWorkspace
@@ -8473,6 +8696,7 @@ export function ClinicalDashboard({
           open={mobileSidebarOpen}
           recentQueries={recentQueries}
           identity={sidebarIdentity}
+          activeMode={searchMode}
           onOpenChange={setMobileSidebarOpen}
           onNewChat={startNewChat}
           onPickRecent={pickRecentQuery}
diff --git a/src/components/DashboardFloatingFab.tsx b/src/components/DashboardFloatingFab.tsx
index 7b16a19440..10c62831e1 100644
--- a/src/components/DashboardFloatingFab.tsx
+++ b/src/components/DashboardFloatingFab.tsx
@@ -2,13 +2,16 @@
 
 import Link from "next/link";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { ArrowUp, ClipboardCopy, ExternalLink, Plus, Search, X } from "lucide-react";
+import { ArrowUp, ClipboardCopy, Plus, Search, Wrench, X } from "lucide-react";
 import { cn, floatingControl } from "@/components/ui-primitives";
+import { useDismissableLayer } from "@/components/use-dismissable-layer";
 
 export function DashboardFloatingFab() {
   const [open, setOpen] = useState(false);
   const [copyNotice, setCopyNotice] = useState<string | null>(null);
   const timeoutRef = useRef<number | null>(null);
+  const rootRef = useRef<HTMLDivElement | null>(null);
+  const triggerRef = useRef<HTMLButtonElement | null>(null);
 
   const clearNotice = useCallback(() => {
     if (timeoutRef.current) {
@@ -56,8 +59,17 @@ export function DashboardFloatingFab() {
   // component is gone (leaked timer / stray setState).
   useEffect(() => clearNotice, [clearNotice]);
 
+  const dismissQuickActions = useCallback(() => setOpen(false), []);
+
+  useDismissableLayer({
+    enabled: open,
+    refs: [rootRef],
+    restoreFocusRef: triggerRef,
+    onDismiss: dismissQuickActions,
+  });
+
   return (
-    <div className="pointer-events-none fixed inset-x-0 bottom-0 z-40 px-4 pb-6">
+    <div ref={rootRef} className="pointer-events-none fixed inset-x-0 bottom-0 z-40 px-4 pb-6">
       <div className="mx-auto flex w-full max-w-7xl justify-end">
         <div
           id="dashboard-fab-panel"
@@ -92,12 +104,12 @@ export function DashboardFloatingFab() {
             Copy link
           </button>
           <Link
-            href="/applications"
+            href="/?mode=tools"
             onClick={() => setOpen(false)}
             className={cn(floatingControl, "h-9 min-h-9 px-3 text-xs", !open && "hidden")}
           >
-            <ExternalLink className="h-3.5 w-3.5" />
-            Applications
+            <Wrench className="h-3.5 w-3.5" />
+            Tools
           </Link>
           {copyNotice && (
             <p className="rounded-md border border-white/20 bg-[color:var(--surface-raised)] px-3 py-2 text-xs text-[color:var(--text-muted)] shadow-[var(--shadow-soft)]">
@@ -106,6 +118,7 @@ export function DashboardFloatingFab() {
           )}
         </div>
         <button
+          ref={triggerRef}
           type="button"
           aria-expanded={open}
           aria-controls="dashboard-fab-panel"
diff --git a/src/components/applications-launcher-page.tsx b/src/components/applications-launcher-page.tsx
index 8c5772ceff..b2d54bafff 100644
--- a/src/components/applications-launcher-page.tsx
+++ b/src/components/applications-launcher-page.tsx
@@ -180,6 +180,69 @@ const recentActivity = [
   { id: "favourites", label: "Favourites reviewed", date: "Today, 8:45 AM", icon: Star },
 ] as const;
 
+export const applicationsLauncherItemCount = launcherApps.length;
+
+type LauncherVariant = "standalone" | "dashboard-tools";
+
+type LauncherCopy = {
+  heading: string;
+  description: string;
+  searchAriaLabel: string;
+  searchPlaceholder: string;
+  actionsAriaLabel: string;
+  openSelectedAriaLabel: string;
+  selectedLabel: string;
+  closeSelectedLabel: string;
+  optionsAriaLabel: string;
+  pinnedAriaLabel: string;
+  allSectionLabel: string;
+  allColumnLabel: string;
+  countNoun: string;
+  relatedHeading: string;
+  emptyTitle: string;
+  emptyBody: string;
+};
+
+const standaloneLauncherCopy: LauncherCopy = {
+  heading: "Applications",
+  description:
+    "Open the clinical applications and connected workflows you use for assessment, formulation, prescribing, documents, and saved workflows.",
+  searchAriaLabel: "Search applications",
+  searchPlaceholder: "Search applications...",
+  actionsAriaLabel: "Open application actions",
+  openSelectedAriaLabel: "Open selected application",
+  selectedLabel: "Selected application",
+  closeSelectedLabel: "Close selected application",
+  optionsAriaLabel: "Open application options",
+  pinnedAriaLabel: "Pinned applications",
+  allSectionLabel: "All applications",
+  allColumnLabel: "Application",
+  countNoun: "applications",
+  relatedHeading: "Related apps",
+  emptyTitle: "No applications match",
+  emptyBody: "Clear the search or try another clinical workflow, app name, or category.",
+};
+
+const dashboardToolsLauncherCopy: LauncherCopy = {
+  heading: "Tools",
+  description:
+    "Open the clinical tools and connected workflows you use for assessment, prescribing, documents, and saved work.",
+  searchAriaLabel: "Search tools",
+  searchPlaceholder: "Search tools...",
+  actionsAriaLabel: "Open tool actions",
+  openSelectedAriaLabel: "Open selected tool",
+  selectedLabel: "Selected tool",
+  closeSelectedLabel: "Close selected tool",
+  optionsAriaLabel: "Open tool options",
+  pinnedAriaLabel: "Pinned tools",
+  allSectionLabel: "All tools",
+  allColumnLabel: "Tool",
+  countNoun: "tools",
+  relatedHeading: "Related tools",
+  emptyTitle: "No tools match",
+  emptyBody: "Clear the search or try another clinical workflow, tool name, or category.",
+};
+
 function appById(id: string) {
   return launcherApps.find((app) => app.id === id) ?? launcherApps[0];
 }
@@ -273,15 +336,17 @@ function PinnedSection({
   selectedId,
   onSelect,
   onTogglePin,
+  copy,
 }: {
   pinnedApps: LauncherApp[];
   selectedId: string;
   onSelect: (id: string) => void;
   onTogglePin: (id: string) => void;
+  copy: LauncherCopy;
 }) {
   return (
     <section
-      aria-label="Pinned applications"
+      aria-label={copy.pinnedAriaLabel}
       className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-inset)]"
     >
       <div className="flex min-h-10 items-center justify-between border-b border-[color:var(--border)] px-3">
@@ -420,6 +485,7 @@ function DetailPanel({
   onTogglePin,
   onClose,
   headingId,
+  copy,
   testId = "selected-application-panel",
   variant = "inline",
 }: {
@@ -428,6 +494,7 @@ function DetailPanel({
   onTogglePin: (id: string) => void;
   onClose?: () => void;
   headingId?: string;
+  copy: LauncherCopy;
   testId?: string;
   variant?: "inline" | "sheet";
 }) {
@@ -441,11 +508,11 @@ function DetailPanel({
           ? "rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] p-4 shadow-[var(--shadow-soft)] lg:sticky lg:top-4"
           : "bg-transparent p-0",
       )}
-      aria-label="Selected application"
+      aria-label={copy.selectedLabel}
     >
       <div className="flex items-start justify-between gap-3">
         <p id={headingId} className="text-sm font-semibold text-[color:var(--text-heading)]">
-          Selected application
+          {copy.selectedLabel}
         </p>
         <div className="flex items-center gap-1">
           <button
@@ -460,7 +527,7 @@ function DetailPanel({
             <button
               type="button"
               onClick={onClose}
-              aria-label="Close selected application"
+              aria-label={copy.closeSelectedLabel}
               className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-muted)] hover:bg-[color:var(--surface-subtle)]"
             >
               <X className="h-4 w-4" />
@@ -468,7 +535,7 @@ function DetailPanel({
           ) : (
             <button
               type="button"
-              aria-label="Open application options"
+              aria-label={copy.optionsAriaLabel}
               className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-muted)] hover:bg-[color:var(--surface-subtle)]"
             >
               <MoreVertical className="h-4 w-4" />
@@ -551,7 +618,7 @@ function DetailPanel({
       </section>
 
       <section className="mt-5">
-        <h3 className="text-sm font-semibold text-[color:var(--clinical-chat-teal)]">Related apps</h3>
+        <h3 className="text-sm font-semibold text-[color:var(--clinical-chat-teal)]">{copy.relatedHeading}</h3>
         <div className="mt-3 grid grid-cols-2 gap-2">
           {related.map((relatedApp) => {
             const Icon = relatedApp.icon;
@@ -825,14 +892,29 @@ function ApplicationsHeader({
   );
 }
 
-export function ApplicationsLauncherPage() {
-  const [query, setQuery] = useState("");
+type ApplicationsLauncherWorkspaceProps = {
+  variant?: LauncherVariant;
+  query?: string;
+  onQueryChange?: (query: string) => void;
+  className?: string;
+};
+
+export function ApplicationsLauncherWorkspace({
+  variant = "standalone",
+  query: controlledQuery,
+  onQueryChange,
+  className,
+}: ApplicationsLauncherWorkspaceProps) {
+  const [uncontrolledQuery, setUncontrolledQuery] = useState("");
   const [activeFilter, setActiveFilter] = useState<(typeof filterOptions)[number]["id"]>("all");
   const [selectedId, setSelectedId] = useState("clinical-kb-search");
   const [pinnedIds, setPinnedIds] = useState(seedPinnedIds);
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
   const [modeMenuOpen, setModeMenuOpen] = useState(false);
   const [mobileDetailOpen, setMobileDetailOpen] = useState(false);
+  const isDashboardTools = variant === "dashboard-tools";
+  const copy = isDashboardTools ? dashboardToolsLauncherCopy : standaloneLauncherCopy;
+  const query = controlledQuery ?? uncontrolledQuery;
 
   const normalizedQuery = query.trim().toLowerCase();
   const pinnedApps = pinnedIds.map(appById);
@@ -865,33 +947,61 @@ export function ApplicationsLauncherPage() {
     }
   }
 
+  function updateQuery(nextQuery: string) {
+    if (controlledQuery === undefined) {
+      setUncontrolledQuery(nextQuery);
+    }
+    onQueryChange?.(nextQuery);
+  }
+
   function submitFooterSearch(event: FormEvent<HTMLFormElement>) {
     event.preventDefault();
     const firstMatch = filteredApps[0];
     if (firstMatch) selectApplication(firstMatch.id);
   }
 
-  return (
-    <div className="min-h-screen bg-[color:var(--surface)] text-[color:var(--text)]">
-      <ApplicationsHeader
-        mobileMenuOpen={mobileMenuOpen}
-        modeMenuOpen={modeMenuOpen}
-        onMobileMenuOpenChange={setMobileMenuOpen}
-        onModeMenuOpenChange={setModeMenuOpen}
-      />
-      <ApplicationsMobileMenu open={mobileMenuOpen} onOpenChange={setMobileMenuOpen} />
+  const workspace = (
+    <>
+      {isDashboardTools ? (
+        <section className="mx-auto grid w-full max-w-5xl gap-4 pt-4 sm:pt-7 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-end">
+          <div className="grid justify-items-center gap-3 text-center lg:justify-items-start lg:text-left">
+            <span className="grid h-14 w-14 place-items-center rounded-lg border border-[color:var(--clinical-chat-teal)]/15 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
+              <Grid2X2 className="h-6 w-6 sm:h-7 sm:w-7" aria-hidden />
+            </span>
+            <div className="max-w-2xl space-y-2">
+              <h2 className="text-3xl font-bold tracking-normal text-[color:var(--text-heading)] sm:text-4xl">
+                {copy.heading}
+              </h2>
+              <p className="text-sm leading-6 text-[color:var(--text-muted)] sm:text-[15px]">
+                {copy.description}
+              </p>
+            </div>
+          </div>
 
-      <main id="main-content" className="min-w-0 pb-8 lg:pb-10">
+          <div className="flex flex-col items-center gap-3 lg:items-end">
+            <HeaderFilter activeFilter={activeFilter} onFilterChange={setActiveFilter} />
+            {normalizedQuery ? (
+              <button
+                type="button"
+                onClick={() => updateQuery("")}
+                className="inline-flex min-h-9 items-center justify-center gap-2 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] px-3 text-xs font-semibold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)]"
+              >
+                <X className="h-3.5 w-3.5" aria-hidden />
+                Clear search
+              </button>
+            ) : null}
+          </div>
+        </section>
+      ) : (
         <section className="mx-auto flex min-h-[14rem] max-w-3xl flex-col items-center justify-center px-5 py-7 text-center sm:min-h-[16rem] sm:py-8 lg:min-h-[17rem]">
           <span className="grid h-14 w-14 place-items-center rounded-2xl border border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
             <Grid2X2 className="h-6 w-6 sm:h-7 sm:w-7" aria-hidden />
           </span>
           <h1 className="mt-4 text-3xl font-semibold tracking-normal text-[color:var(--text-heading)] sm:mt-5 sm:text-4xl">
-            Applications
+            {copy.heading}
           </h1>
           <p className="mt-3 max-w-xl text-[15px] leading-6 text-[color:var(--text-muted)] sm:text-base sm:leading-7">
-            Open the clinical applications and connected workflows you use for assessment, formulation, prescribing,
-            documents, and saved workflows.
+            {copy.description}
           </p>
           <div className="mt-6">
             <HeaderFilter activeFilter={activeFilter} onFilterChange={setActiveFilter} />
@@ -900,17 +1010,17 @@ export function ApplicationsLauncherPage() {
             <button
               type="button"
               className={chatComposerIconButton}
-              aria-label="Open application actions"
-              title="Open application actions"
+              aria-label={copy.actionsAriaLabel}
+              title={copy.actionsAriaLabel}
             >
               <Plus className="h-5 w-5" />
             </button>
             <label className="relative flex min-w-0 flex-1 items-center overflow-hidden">
               <input
                 value={query}
-                onChange={(event) => setQuery(event.target.value)}
-                aria-label="Search applications"
-                placeholder="Search applications..."
+                onChange={(event) => updateQuery(event.target.value)}
+                aria-label={copy.searchAriaLabel}
+                placeholder={copy.searchPlaceholder}
                 className={cn(chatComposerInput, "w-full min-w-0")}
               />
             </label>
@@ -921,112 +1031,129 @@ export function ApplicationsLauncherPage() {
               type="submit"
               disabled={filteredApps.length === 0}
               className={chatSendButton}
-              aria-label="Open selected application"
+              aria-label={copy.openSelectedAriaLabel}
             >
               <Send className="h-4 w-4" />
               <span className="sr-only">Open</span>
             </button>
           </form>
         </section>
+      )}
 
-        <div className="mx-auto grid max-w-7xl gap-4 px-4 pb-6 sm:px-6 lg:grid-cols-[minmax(0,1fr)_24rem] lg:items-start">
-          <div className="min-w-0 space-y-4">
-            <PinnedSection
-              pinnedApps={pinnedApps}
-              selectedId={selectedId}
-              onSelect={selectApplication}
-              onTogglePin={togglePin}
-            />
+      <div
+        className={cn(
+          "mx-auto grid gap-4 pb-6 lg:items-start",
+          isDashboardTools
+            ? "w-full max-w-6xl lg:grid-cols-[minmax(0,1fr)_23rem]"
+            : "max-w-7xl px-4 sm:px-6 lg:grid-cols-[minmax(0,1fr)_24rem]",
+        )}
+      >
+        <div className="min-w-0 space-y-4">
+          <PinnedSection
+            pinnedApps={pinnedApps}
+            selectedId={selectedId}
+            onSelect={selectApplication}
+            onTogglePin={togglePin}
+            copy={copy}
+          />
 
-            <section
-              aria-label="All applications"
-              className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-inset)]"
-            >
-              <div className="flex min-h-12 items-center gap-2 border-b border-[color:var(--border)] px-3">
-                <BookOpen className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" aria-hidden />
-                <h2 className="text-sm font-semibold text-[color:var(--text-heading)]">All applications</h2>
-              </div>
+          <section
+            aria-label={copy.allSectionLabel}
+            className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-inset)]"
+          >
+            <div className="flex min-h-12 items-center gap-2 border-b border-[color:var(--border)] px-3">
+              <BookOpen className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" aria-hidden />
+              <h2 className="text-sm font-semibold text-[color:var(--text-heading)]">{copy.allSectionLabel}</h2>
+            </div>
 
-              <div className="hidden grid-cols-[auto_minmax(0,1fr)_7rem_6rem_5.5rem_auto] gap-3 px-3 py-2 text-xs font-semibold text-[color:var(--text-muted)] lg:grid">
-                <span className="col-span-2">Application</span>
-                <span>Last used</span>
-                <span>Status</span>
-                <span>Action</span>
-                <span />
-              </div>
+            <div className="hidden grid-cols-[auto_minmax(0,1fr)_7rem_6rem_5.5rem_auto] gap-3 px-3 py-2 text-xs font-semibold text-[color:var(--text-muted)] lg:grid">
+              <span className="col-span-2">{copy.allColumnLabel}</span>
+              <span>Last used</span>
+              <span>Status</span>
+              <span>Action</span>
+              <span />
+            </div>
 
-              <div className="hidden lg:block">
-                {filteredApps.map((app) => (
-                  <ApplicationRow
-                    key={app.id}
-                    app={app}
-                    selected={selectedId === app.id}
-                    pinned={pinnedIds.includes(app.id)}
-                    onSelect={selectApplication}
-                    onTogglePin={togglePin}
-                  />
-                ))}
+            {filteredApps.length === 0 ? (
+              <div className="border-t border-[color:var(--border)] px-3 py-8 text-center">
+                <p className="text-sm font-semibold text-[color:var(--text-heading)]">{copy.emptyTitle}</p>
+                <p className={cn("mx-auto mt-1 max-w-md text-sm leading-6", textMuted)}>{copy.emptyBody}</p>
               </div>
+            ) : (
+              <>
+                <div className="hidden lg:block">
+                  {filteredApps.map((app) => (
+                    <ApplicationRow
+                      key={app.id}
+                      app={app}
+                      selected={selectedId === app.id}
+                      pinned={pinnedIds.includes(app.id)}
+                      onSelect={selectApplication}
+                      onTogglePin={togglePin}
+                    />
+                  ))}
+                </div>
 
-              <div className="lg:hidden">
-                {filteredApps.map((app) => (
-                  <MobileApplicationRow
-                    key={app.id}
-                    app={app}
-                    selected={selectedId === app.id}
-                    onSelect={selectApplication}
-                  />
-                ))}
-              </div>
+                <div className="lg:hidden">
+                  {filteredApps.map((app) => (
+                    <MobileApplicationRow
+                      key={app.id}
+                      app={app}
+                      selected={selectedId === app.id}
+                      onSelect={selectApplication}
+                    />
+                  ))}
+                </div>
+              </>
+            )}
 
-              <p className="border-t border-[color:var(--border)] px-3 py-3 text-xs font-medium text-[color:var(--text-muted)]">
-                Showing {filteredApps.length > 0 ? "1" : "0"} to {filteredApps.length} of {launcherApps.length}{" "}
-                applications
-              </p>
-            </section>
-
-            <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] p-3 shadow-[var(--shadow-inset)]">
-              <div className="mb-2 flex items-center justify-between gap-2">
-                <h2 className="text-sm font-semibold text-[color:var(--text-heading)]">Recent activity</h2>
-                <button type="button" className="text-xs font-semibold text-[color:var(--clinical-chat-teal)]">
-                  View all
-                </button>
-              </div>
-              <div className="grid gap-2 md:grid-cols-3">
-                {recentActivity.slice(0, 3).map((item) => {
-                  const Icon = item.icon;
-                  return (
-                    <button
-                      key={item.label}
-                      type="button"
-                      onClick={() => selectApplication(item.id)}
-                      className="grid min-h-14 grid-cols-[auto_minmax(0,1fr)] items-center gap-2 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 py-2 text-left shadow-[var(--shadow-inset)] hover:bg-[color:var(--surface-subtle)]"
-                    >
-                      <Icon className="h-5 w-5 text-[color:var(--clinical-chat-teal)]" aria-hidden />
-                      <span className="min-w-0">
-                        <span className="block truncate text-sm font-semibold text-[color:var(--text-heading)]">
-                          {item.label}
-                        </span>
-                        <span className="nums block truncate text-xs text-[color:var(--text-soft)]">{item.date}</span>
+            <p className="border-t border-[color:var(--border)] px-3 py-3 text-xs font-medium text-[color:var(--text-muted)]">
+              Showing {filteredApps.length > 0 ? "1" : "0"} to {filteredApps.length} of {launcherApps.length}{" "}
+              {copy.countNoun}
+            </p>
+          </section>
+
+          <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] p-3 shadow-[var(--shadow-inset)]">
+            <div className="mb-2 flex items-center justify-between gap-2">
+              <h2 className="text-sm font-semibold text-[color:var(--text-heading)]">Recent activity</h2>
+              <button type="button" className="text-xs font-semibold text-[color:var(--clinical-chat-teal)]">
+                View all
+              </button>
+            </div>
+            <div className="grid gap-2 md:grid-cols-3">
+              {recentActivity.slice(0, 3).map((item) => {
+                const Icon = item.icon;
+                return (
+                  <button
+                    key={item.label}
+                    type="button"
+                    onClick={() => selectApplication(item.id)}
+                    className="grid min-h-14 grid-cols-[auto_minmax(0,1fr)] items-center gap-2 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 py-2 text-left shadow-[var(--shadow-inset)] hover:bg-[color:var(--surface-subtle)]"
+                  >
+                    <Icon className="h-5 w-5 text-[color:var(--clinical-chat-teal)]" aria-hidden />
+                    <span className="min-w-0">
+                      <span className="block truncate text-sm font-semibold text-[color:var(--text-heading)]">
+                        {item.label}
                       </span>
-                    </button>
-                  );
-                })}
-              </div>
-            </section>
-          </div>
+                      <span className="nums block truncate text-xs text-[color:var(--text-soft)]">{item.date}</span>
+                    </span>
+                  </button>
+                );
+              })}
+            </div>
+          </section>
+        </div>
 
-          <div className="hidden lg:block">
-            <DetailPanel app={selectedApp} pinned={pinnedIds.includes(selectedId)} onTogglePin={togglePin} />
-          </div>
+        <div className="hidden lg:block">
+          <DetailPanel app={selectedApp} pinned={pinnedIds.includes(selectedId)} onTogglePin={togglePin} copy={copy} />
         </div>
-      </main>
+      </div>
 
       <Sheet
         open={mobileDetailOpen}
         onClose={() => setMobileDetailOpen(false)}
         labelledBy="selected-application-sheet-heading"
-        closeLabel="Close selected application"
+        closeLabel={copy.closeSelectedLabel}
         contentClassName="lg:hidden rounded-t-[1.75rem] bg-[color:var(--surface-lux)]"
         bodyClassName="px-5 pb-6 pt-4 sm:px-5"
         portal
@@ -1037,11 +1164,42 @@ export function ApplicationsLauncherPage() {
           onTogglePin={togglePin}
           onClose={() => setMobileDetailOpen(false)}
           headingId="selected-application-sheet-heading"
+          copy={copy}
           testId="selected-application-sheet-panel"
           variant="sheet"
         />
       </Sheet>
+    </>
+  );
 
+  if (isDashboardTools) {
+    return (
+      <div
+        data-testid="tools-hub"
+        className={cn("mx-auto w-full max-w-6xl space-y-4 overflow-x-hidden sm:space-y-5", className)}
+      >
+        {workspace}
+      </div>
+    );
+  }
+
+  return (
+    <div className={cn("min-h-screen bg-[color:var(--surface)] text-[color:var(--text)]", className)}>
+      <ApplicationsHeader
+        mobileMenuOpen={mobileMenuOpen}
+        modeMenuOpen={modeMenuOpen}
+        onMobileMenuOpenChange={setMobileMenuOpen}
+        onModeMenuOpenChange={setModeMenuOpen}
+      />
+      <ApplicationsMobileMenu open={mobileMenuOpen} onOpenChange={setMobileMenuOpen} />
+
+      <main id="main-content" className="min-w-0 pb-8 lg:pb-10">
+        {workspace}
+      </main>
     </div>
   );
 }
+
+export function ApplicationsLauncherPage() {
+  return <ApplicationsLauncherWorkspace variant="standalone" />;
+}
diff --git a/src/components/clinical-dashboard/dashboard-shell.tsx b/src/components/clinical-dashboard/dashboard-shell.tsx
index 5a9a573858..6dc65e9c73 100644
--- a/src/components/clinical-dashboard/dashboard-shell.tsx
+++ b/src/components/clinical-dashboard/dashboard-shell.tsx
@@ -80,6 +80,10 @@ export function UtilityDrawer({
   sheetTitleAccessory,
   sheetDescriptionContent,
   sheetHeaderActions,
+  sheetHeaderClassName,
+  sheetTitleClassName,
+  sheetCloseButtonClassName,
+  sheetChildrenClassName,
   sheetContentClassName,
   sheetContentStyle,
   sheetBodyClassName,
@@ -100,6 +104,10 @@ export function UtilityDrawer({
   sheetTitleAccessory?: ReactNode;
   sheetDescriptionContent?: ReactNode;
   sheetHeaderActions?: ReactNode;
+  sheetHeaderClassName?: string;
+  sheetTitleClassName?: string;
+  sheetCloseButtonClassName?: string;
+  sheetChildrenClassName?: string;
   sheetContentClassName?: string;
   sheetContentStyle?: CSSProperties;
   sheetBodyClassName?: string;
@@ -203,13 +211,16 @@ export function UtilityDrawer({
         titleAccessory={sheetTitleAccessory}
         descriptionContent={sheetDescriptionContent}
         headerActions={sheetHeaderActions}
+        headerClassName={sheetHeaderClassName}
+        titleClassName={sheetTitleClassName}
+        closeButtonClassName={sheetCloseButtonClassName}
         contentClassName={sheetContentClassName}
         contentStyle={sheetContentStyle}
         bodyClassName={sheetBodyClassName}
         returnFocusRef={mobileTriggerRef}
         portal
       >
-        <div className="space-y-3">{children}</div>
+        <div className={cn("space-y-3", sheetChildrenClassName)}>{children}</div>
       </Sheet>
     </>
   );
diff --git a/src/components/clinical-dashboard/favourites-hub.tsx b/src/components/clinical-dashboard/favourites-hub.tsx
index 8aa0a0742e..48bc60c18f 100644
--- a/src/components/clinical-dashboard/favourites-hub.tsx
+++ b/src/components/clinical-dashboard/favourites-hub.tsx
@@ -1,7 +1,8 @@
 "use client";
 
 import { ArrowUpDown, ChevronDown, Filter, Folder, FolderInput, Heart, Plus, Search, X } from "lucide-react";
-import { useEffect, useRef, useState, type KeyboardEvent as ReactKeyboardEvent } from "react";
+import { useRef, useState, type KeyboardEvent as ReactKeyboardEvent } from "react";
+import { useDismissableLayer } from "@/components/use-dismissable-layer";
 import { cn, floatingControl, iconTilePremium, panelSubtle, primaryControl } from "@/components/ui-primitives";
 import {
   favouriteItems,
@@ -103,30 +104,12 @@ export function FavouritesHub({
     }
   }
 
-  useEffect(() => {
-    if (!tabMenuOpen) return undefined;
-
-    function handlePointerDown(event: PointerEvent) {
-      const target = event.target;
-      if (!(target instanceof Node)) return;
-      if (!tabMenuRef.current?.contains(target)) setTabMenuOpen(false);
-    }
-
-    function handleKeyDown(event: KeyboardEvent) {
-      if (event.key === "Escape") {
-        event.preventDefault();
-        setTabMenuOpen(false);
-        window.requestAnimationFrame(() => tabButtonRef.current?.focus());
-      }
-    }
-
-    document.addEventListener("pointerdown", handlePointerDown);
-    document.addEventListener("keydown", handleKeyDown);
-    return () => {
-      document.removeEventListener("pointerdown", handlePointerDown);
-      document.removeEventListener("keydown", handleKeyDown);
-    };
-  }, [tabMenuOpen]);
+  useDismissableLayer({
+    enabled: tabMenuOpen,
+    refs: [tabMenuRef],
+    restoreFocusRef: tabButtonRef,
+    onDismiss: () => setTabMenuOpen(false),
+  });
 
   return (
     <div data-testid="favourites-hub" className="mx-auto w-full max-w-6xl space-y-4 overflow-x-hidden sm:space-y-5">
diff --git a/src/components/clinical-dashboard/global-mockup-search-shell.tsx b/src/components/clinical-dashboard/global-mockup-search-shell.tsx
index 10390b6727..c8721753f7 100644
--- a/src/components/clinical-dashboard/global-mockup-search-shell.tsx
+++ b/src/components/clinical-dashboard/global-mockup-search-shell.tsx
@@ -116,6 +116,8 @@ export function GlobalMockupSearchShell({ children }: { children: ReactNode }) {
         onOpenEvidence={() => navigateToMode("evidence", { focus: true })}
         onNewChat={startNewChat}
         onOpenMobileSidebar={() => setMobileMenuOpen(true)}
+        onOpenSettings={() => setMobileMenuOpen(true)}
+        identity={{ displayName: "Guest", initials: "G", detail: "Not signed in", signedIn: false }}
         onToggleTheme={toggleTheme}
         queryModeOptions={mockupQueryModeOptions}
         scopeVariant="placeholder"
diff --git a/src/components/clinical-dashboard/master-search-header.tsx b/src/components/clinical-dashboard/master-search-header.tsx
index 2f2f773824..3863475276 100644
--- a/src/components/clinical-dashboard/master-search-header.tsx
+++ b/src/components/clinical-dashboard/master-search-header.tsx
@@ -18,7 +18,6 @@ import {
   CheckCircle2,
   ChevronDown,
   FileText,
-  Filter,
   Globe2,
   Heart,
   ListChecks,
@@ -39,6 +38,14 @@ import {
 } from "lucide-react";
 
 import { DocumentTagCloud } from "@/components/DocumentTagCloud";
+import { useDismissableLayer } from "@/components/use-dismissable-layer";
+import {
+  ModeActionPopup,
+  modeActionItemsFor,
+  type ModeActionId,
+  type ModeActionItem,
+  type ModeActionSetId,
+} from "@/components/clinical-dashboard/mode-action-popup";
 import {
   cn,
   chatComposerIconButton,
@@ -75,6 +82,25 @@ const appModeIcons: Record<AppModeId, typeof Search> = {
   tools: Wrench,
 };
 
+const medicationModeActionItems: readonly ModeActionItem[] = [
+  {
+    id: "medication-dose",
+    label: "Dose",
+    description: "Check dosing and thresholds",
+    icon: CalendarDays,
+    primary: true,
+  },
+  { id: "medication-safety", label: "Safety", description: "Contraindications and cautions", icon: ShieldCheck },
+  {
+    id: "medication-monitoring",
+    label: "Monitoring",
+    shortLabel: "Monitor",
+    description: "Baseline and ongoing checks",
+    icon: Activity,
+  },
+  { id: "medication-access", label: "Access", description: "Documentation and eligibility", icon: Lock },
+];
+
 function splitFilterText(value: string) {
   return value
     .split(",")
@@ -98,6 +124,13 @@ function documentScopeMeta(document: ClinicalDocument) {
   return `${fileName} · ${document.page_count ?? "?"} pages`;
 }
 
+type HeaderIdentity = {
+  displayName: string;
+  initials: string;
+  detail: string;
+  signedIn: boolean;
+};
+
 export function MasterSearchHeader({
   documents,
   documentTotal,
@@ -120,8 +153,13 @@ export function MasterSearchHeader({
   onScopeOpenChange,
   onOpenUpload,
   onOpenEvidence,
+  onOpenRecentDocuments,
+  onOpenLibrary,
+  onOpenSourcePdf,
   onNewChat,
   onOpenMobileSidebar,
+  onOpenSettings,
+  identity,
   onToggleTheme,
   queryModeOptions,
   scopeVariant = "full",
@@ -150,8 +188,13 @@ export function MasterSearchHeader({
   onScopeOpenChange?: (open: boolean) => void;
   onOpenUpload?: () => void;
   onOpenEvidence?: () => void;
+  onOpenRecentDocuments?: () => void;
+  onOpenLibrary?: () => void;
+  onOpenSourcePdf?: () => void;
   onNewChat?: () => void;
   onOpenMobileSidebar?: () => void;
+  onOpenSettings: () => void;
+  identity: HeaderIdentity;
   onToggleTheme: () => void;
   queryModeOptions: Array<{ value: ClinicalQueryMode; label: string }>;
   scopeVariant?: "full" | "placeholder";
@@ -174,12 +217,9 @@ export function MasterSearchHeader({
   const [scopeFilter, setScopeFilter] = useState("");
   const [scopeOpen, setScopeOpen] = useState(false);
   const [scopeSheetOpen, setScopeSheetOpen] = useState(false);
-  const [dailyActionsOpen, setDailyActionsOpen] = useState(false);
+  const [actionMenuOpen, setActionMenuOpen] = useState(false);
   const [modeMenuOpen, setModeMenuOpen] = useState(false);
   const [usesScopeSheet, setUsesScopeSheet] = useState(false);
-  const dailyActionButtonRef = useRef<HTMLButtonElement | null>(null);
-  const dailyActionsMenuRef = useRef<HTMLDivElement | null>(null);
-  const firstDailyActionRef = useRef<HTMLButtonElement | null>(null);
   const modeMenuRef = useRef<HTMLDivElement | null>(null);
   const modeButtonRef = useRef<HTMLButtonElement | null>(null);
   const modeOptionRefs = useRef<Array<HTMLButtonElement | null>>([]);
@@ -220,81 +260,105 @@ export function MasterSearchHeader({
   const submitLabel = trimmedQuery ? selectedSearch.submitBusyLabel : selectedSearch.submitIdleLabel;
   const queryPlaceholder = selectedSearch.placeholder;
   const SelectedAppModeIcon = appModeIcons[selectedAppMode.id];
-  const dailyActions =
-    searchMode === "prescribing"
-      ? ([
-          { label: "Dose", icon: CalendarDays },
-          { label: "Safety", icon: ShieldCheck },
-          { label: "Monitoring", icon: Activity },
-          { label: "Access", icon: Lock },
-        ] as const)
-      : ([
-          { label: "Search library", icon: Search },
-          { label: "Add document", icon: FileText },
-          { label: "Scope", icon: Filter },
-          { label: "Evidence", icon: ListChecks },
-          { label: "Tools", icon: Wrench },
-        ] as const);
-  const dailyActionsTitle = searchMode === "prescribing" ? "Medication checks" : "Daily actions";
-  const dailyActionsButtonLabel = searchMode === "prescribing" ? "Open medication checks" : "Open daily actions";
-  const dailyActionsDescription =
-    searchMode === "prescribing"
-      ? "Choose a dose, safety, monitoring, or access focus."
-      : "Search, add, scope, evidence, or tools.";
+  const actionMenuSetId: ModeActionSetId =
+    searchMode === "documents" || searchMode === "evidence" ? "documents" : searchMode === "tools" ? "tools" : "answer";
+  const actionMenuItems =
+    searchMode === "prescribing" ? medicationModeActionItems : modeActionItemsFor(actionMenuSetId);
+  const actionMenuTitle = selectedAppMode.label;
+  const actionMenuButtonLabel = `Open ${selectedAppMode.label.toLowerCase()} options`;
 
   function currentUsesScopeSheet() {
     return window.matchMedia(mobileSheetMediaQuery).matches;
   }
 
-  function runDailyAction(label: (typeof dailyActions)[number]["label"]) {
-    if (searchMode === "prescribing") {
+  function openScopePicker() {
+    setActionMenuOpen(false);
+    setModeMenuOpen(false);
+    const nextUsesScopeSheet = currentUsesScopeSheet();
+    setUsesScopeSheet(nextUsesScopeSheet);
+    if (nextUsesScopeSheet) {
+      setScopeSheetOpen(true);
+    } else {
+      setScopeOpen(true);
+      onScopeOpenChange?.(true);
+      window.requestAnimationFrame(() => scopeFilterInputRef.current?.focus());
+    }
+  }
+
+  function runModeAction(actionId: ModeActionId) {
+    if (actionId === "medication-dose") {
       const medicationQuery = trimmedQuery || "acamprosate renal dose";
-      if (label === "Dose") {
-        onQueryModeChange("dose_threshold_lookup");
-        onQueryChange(medicationQuery);
-        return;
-      }
-      if (label === "Safety") {
-        onQueryModeChange("contraindications_cautions");
-        onQueryChange(trimmedQuery || "acamprosate contraindications");
-        return;
-      }
-      if (label === "Monitoring") {
-        onQueryModeChange("monitoring_schedule");
-        onQueryChange(trimmedQuery || "acamprosate monitoring");
-        return;
-      }
-      if (label === "Access") {
-        onQueryModeChange("required_documentation");
-        onQueryChange(trimmedQuery || "acamprosate PBS access");
-        return;
-      }
+      onQueryModeChange("dose_threshold_lookup");
+      onQueryChange(medicationQuery);
+      return;
+    }
+    if (actionId === "medication-safety") {
+      onQueryModeChange("contraindications_cautions");
+      onQueryChange(trimmedQuery || "acamprosate contraindications");
+      return;
     }
-    if (label === "Search library") {
+    if (actionId === "medication-monitoring") {
+      onQueryModeChange("monitoring_schedule");
+      onQueryChange(trimmedQuery || "acamprosate monitoring");
+      return;
+    }
+    if (actionId === "medication-access") {
+      onQueryModeChange("required_documentation");
+      onQueryChange(trimmedQuery || "acamprosate PBS access");
+      return;
+    }
+
+    if (actionId === "documents-search" || actionId === "answer-documents") {
       onSearchModeChange("documents");
       return;
     }
-    if (label === "Add document") {
+    if (actionId === "documents-upload") {
       onOpenUpload?.();
       return;
     }
-    if (label === "Scope") {
-      const nextUsesScopeSheet = currentUsesScopeSheet();
-      setUsesScopeSheet(nextUsesScopeSheet);
-      if (nextUsesScopeSheet) {
-        setScopeSheetOpen(true);
-      } else {
-        setScopeOpen(true);
-        onScopeOpenChange?.(true);
-        window.requestAnimationFrame(() => scopeFilterInputRef.current?.focus());
-      }
+    if (actionId === "documents-scope") {
+      openScopePicker();
       return;
     }
-    if (label === "Evidence") {
+    if (actionId === "answer-evidence") {
       onOpenEvidence?.();
       return;
     }
-    onSearchModeChange("tools");
+    if (actionId === "documents-tables") {
+      onSearchModeChange("documents");
+      onQueryChange(trimmedQuery || "table evidence");
+      return;
+    }
+    if (actionId === "documents-recent") {
+      onSearchModeChange("documents");
+      onOpenRecentDocuments?.();
+      return;
+    }
+    if (actionId === "documents-status" || actionId === "documents-collections") {
+      onSearchModeChange("documents");
+      onOpenLibrary?.();
+      return;
+    }
+    if (actionId === "documents-viewer") {
+      onSearchModeChange("documents");
+      onOpenSourcePdf?.();
+      return;
+    }
+    if (actionId === "answer-new" || actionId === "tools-new") {
+      onNewChat?.();
+      return;
+    }
+    if (actionId === "answer-clinical" || actionId === "favourites-answer") {
+      onSearchModeChange("answer");
+      return;
+    }
+    if (actionId === "tools-browse" || actionId === "favourites-tools") {
+      onSearchModeChange("tools");
+      return;
+    }
+    if (actionId === "tools-favourites" || actionId === "favourites-browse") {
+      onSearchModeChange("favourites");
+    }
   }
 
   function selectAppMode(mode: (typeof appModeDefinitions)[number]) {
@@ -317,6 +381,8 @@ export function MasterSearchHeader({
   }
 
   function openModeMenuWithFocus(index: number) {
+    setActionMenuOpen(false);
+    closeScope(false);
     setModeMenuOpen(true);
     window.requestAnimationFrame(() => focusModeOption(index));
   }
@@ -350,6 +416,7 @@ export function MasterSearchHeader({
       window.requestAnimationFrame(() => modeButtonRef.current?.focus());
     }
   }
+
   const collectionOptions = useMemo(() => {
     const values = new Set<string>();
     for (const document of documents) {
@@ -388,84 +455,28 @@ export function MasterSearchHeader({
     onScopeOpenChange?.(scopeOpen || scopeSheetOpen);
   }, [onScopeOpenChange, scopeOpen, scopeSheetOpen]);
 
-  useEffect(() => {
-    if (!dailyActionsOpen || usesScopeSheet) return undefined;
-
-    function handlePointerDown(event: PointerEvent) {
-      const target = event.target;
-      if (!(target instanceof Node)) return;
-      if (!dailyActionsMenuRef.current?.contains(target)) setDailyActionsOpen(false);
-    }
-
-    function handleKeyDown(event: KeyboardEvent) {
-      if (event.key === "Escape") {
-        event.preventDefault();
-        setDailyActionsOpen(false);
-        window.requestAnimationFrame(() => dailyActionButtonRef.current?.focus());
-      }
-    }
-
-    document.addEventListener("pointerdown", handlePointerDown);
-    document.addEventListener("keydown", handleKeyDown);
-    return () => {
-      document.removeEventListener("pointerdown", handlePointerDown);
-      document.removeEventListener("keydown", handleKeyDown);
-    };
-  }, [dailyActionsOpen, usesScopeSheet]);
-
-  useEffect(() => {
-    if (!modeMenuOpen) return undefined;
-
-    function handlePointerDown(event: PointerEvent) {
-      const target = event.target;
-      if (!(target instanceof Node)) return;
-      if (!modeMenuRef.current?.contains(target)) setModeMenuOpen(false);
-    }
-
-    function handleKeyDown(event: KeyboardEvent) {
-      if (event.key === "Escape") {
-        event.preventDefault();
-        setModeMenuOpen(false);
-        window.requestAnimationFrame(() => modeButtonRef.current?.focus());
-      }
-    }
-
-    document.addEventListener("pointerdown", handlePointerDown);
-    document.addEventListener("keydown", handleKeyDown);
-    return () => {
-      document.removeEventListener("pointerdown", handlePointerDown);
-      document.removeEventListener("keydown", handleKeyDown);
-    };
-  }, [modeMenuOpen]);
-
-  useEffect(() => {
-    const details = scopeDetailsRef.current;
-    if (!scopeOpen || !details?.open) return undefined;
-
-    function handlePointerDown(event: PointerEvent) {
-      const target = event.target;
-      if (!(target instanceof Node)) return;
-      if (!scopeDetailsRef.current?.contains(target)) closeScope(false);
-    }
+  const dismissModeMenu = useCallback(() => setModeMenuOpen(false), []);
+  function dismissScope(reason: "outside" | "escape") {
+    closeScope(reason === "escape");
+  }
 
-    function handleKeyDown(event: KeyboardEvent) {
-      if (event.key === "Escape") {
-        event.preventDefault();
-        closeScope(true);
-      }
-    }
+  useDismissableLayer({
+    enabled: modeMenuOpen,
+    refs: [modeMenuRef],
+    restoreFocusRef: modeButtonRef,
+    onDismiss: dismissModeMenu,
+  });
 
-    document.addEventListener("pointerdown", handlePointerDown);
-    document.addEventListener("keydown", handleKeyDown);
-    return () => {
-      document.removeEventListener("pointerdown", handlePointerDown);
-      document.removeEventListener("keydown", handleKeyDown);
-    };
-  }, [closeScope, scopeOpen]);
+  useDismissableLayer({
+    enabled: scopeOpen,
+    refs: [scopeDetailsRef],
+    restoreFocusRef: scopeSummaryRef,
+    onDismiss: dismissScope,
+  });
 
   function submit(event: FormEvent<HTMLFormElement>) {
     event.preventDefault();
-    setDailyActionsOpen(false);
+    setActionMenuOpen(false);
     onAsk();
   }
 
@@ -702,7 +713,11 @@ export function MasterSearchHeader({
             <button
               ref={modeButtonRef}
               type="button"
-              onClick={() => setModeMenuOpen((open) => !open)}
+              onClick={() => {
+                setActionMenuOpen(false);
+                closeScope(false);
+                setModeMenuOpen((open) => !open);
+              }}
               onKeyDown={handleModeTriggerKeyDown}
               className="inline-grid h-11 min-w-[10rem] grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 rounded-full border border-[color:var(--border)] bg-[color:var(--surface)] px-2.5 text-left shadow-[var(--shadow-inset)] transition hover:border-[color:var(--border-strong)] hover:bg-[color:var(--surface-subtle)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:min-w-[14rem]"
               aria-haspopup="menu"
@@ -805,7 +820,11 @@ export function MasterSearchHeader({
                   scopeSummaryRef.current = element;
                 }}
                 data-testid="scope-trigger"
-                onClick={() => setScopeSheetOpen(true)}
+                onClick={() => {
+                  setActionMenuOpen(false);
+                  setModeMenuOpen(false);
+                  setScopeSheetOpen(true);
+                }}
                 className="grid h-11 w-11 shrink-0 place-items-center rounded-full text-[color:var(--text-muted)] transition hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
                 aria-label="Open document scope"
                 aria-expanded={scopeSheetOpen}
@@ -824,6 +843,10 @@ export function MasterSearchHeader({
                 open={scopeOpen}
                 onToggle={(event) => {
                   const open = event.currentTarget.open;
+                  if (open) {
+                    setActionMenuOpen(false);
+                    setModeMenuOpen(false);
+                  }
                   setScopeOpen(open);
                   if (open) window.setTimeout(() => scopeFilterInputRef.current?.focus(), 0);
                 }}
@@ -881,10 +904,19 @@ export function MasterSearchHeader({
             >
               {theme === "dark" ? <Sun className="h-4 w-4" /> : <Moon className="h-4 w-4" />}
             </button>
-            <span className="relative hidden h-10 w-10 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-xs font-bold text-[color:var(--clinical-chat-teal)] sm:grid">
-              AK
-              <span className="absolute bottom-0 right-0 h-2.5 w-2.5 rounded-full border-2 border-[color:var(--surface)] bg-[color:var(--clinical-chat-ready)]" />
-            </span>
+            <button
+              type="button"
+              onClick={onOpenSettings}
+              data-testid="header-account-settings"
+              className="relative hidden h-10 w-10 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-xs font-bold text-[color:var(--clinical-chat-teal)] transition hover:bg-[color:var(--clinical-chat-teal-soft)]/80 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:grid"
+              aria-label={identity.signedIn ? `Open settings for ${identity.detail}` : "Open account settings"}
+              title={identity.detail}
+            >
+              {identity.initials}
+              {identity.signedIn ? (
+                <span className="absolute bottom-0 right-0 h-2.5 w-2.5 rounded-full border-2 border-[color:var(--surface)] bg-[color:var(--clinical-chat-ready)]" />
+              ) : null}
+            </button>
           </div>
         </div>
       </header>
@@ -896,49 +928,20 @@ export function MasterSearchHeader({
           "fixed inset-x-3 bottom-3 z-40 mx-auto max-w-3xl sm:bottom-4 lg:left-[calc(var(--clinical-sidebar-width,20rem)+2rem)] lg:right-8 lg:max-w-4xl",
         )}
       >
-        <div ref={dailyActionsMenuRef} className="relative shrink-0">
-          <button
-            type="button"
-            ref={dailyActionButtonRef}
-            className={chatComposerIconButton}
-            aria-label={dailyActionsButtonLabel}
-            aria-controls={dailyActionsOpen ? "daily-actions-sheet" : undefined}
-            aria-expanded={dailyActionsOpen}
-            title={dailyActionsButtonLabel}
-            onClick={() => {
-              setUsesScopeSheet(currentUsesScopeSheet());
-              setDailyActionsOpen((open) => !open);
-            }}
-          >
-            <Plus className="h-5 w-5" />
-          </button>
-          {dailyActionsOpen && !usesScopeSheet ? (
-            <div
-              id="daily-actions-sheet"
-              data-testid="daily-actions-menu"
-              aria-label={dailyActionsTitle}
-              className="absolute bottom-[calc(100%+0.75rem)] left-0 z-50 hidden max-h-none w-64 overflow-y-auto rounded-2xl border border-[color:var(--border)] bg-[color:var(--surface-lux)] p-2 shadow-[var(--shadow-elevated)] sm:block"
-            >
-              {dailyActions.map((item) => {
-                const Icon = item.icon;
-                return (
-                  <button
-                    key={item.label}
-                    type="button"
-                    onClick={() => {
-                      setDailyActionsOpen(false);
-                      runDailyAction(item.label);
-                    }}
-                    className="flex min-h-[44px] w-full items-center gap-3 rounded-xl px-3 text-left text-sm font-semibold text-[color:var(--text-muted)] hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
-                  >
-                    <Icon className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" />
-                    {item.label}
-                  </button>
-                );
-              })}
-            </div>
-          ) : null}
-        </div>
+        <ModeActionPopup
+          open={actionMenuOpen}
+          title={actionMenuTitle}
+          titleIcon={SelectedAppModeIcon}
+          buttonLabel={actionMenuButtonLabel}
+          items={actionMenuItems}
+          onOpenChange={setActionMenuOpen}
+          onBeforeOpen={() => {
+            setUsesScopeSheet(currentUsesScopeSheet());
+            setModeMenuOpen(false);
+            closeScope(false);
+          }}
+          onAction={runModeAction}
+        />
 
         <label className="relative flex min-w-0 flex-1 items-center overflow-hidden">
           <input
@@ -1008,41 +1011,6 @@ export function MasterSearchHeader({
           </div>
         </Sheet>
       </form>
-      <Sheet
-        open={usesScopeSheet && dailyActionsOpen}
-        onClose={() => setDailyActionsOpen(false)}
-        title={dailyActionsTitle}
-        description={dailyActionsDescription}
-        closeLabel="Close daily actions"
-        initialFocusRef={firstDailyActionRef}
-        returnFocusRef={dailyActionButtonRef}
-        contentClassName="sm:max-w-sm"
-      >
-        <div id="daily-actions-sheet" data-testid="daily-actions-sheet" className="grid grid-cols-2 gap-2">
-          {dailyActions.map((item, index) => {
-            const Icon = item.icon;
-            return (
-              <button
-                key={item.label}
-                type="button"
-                ref={index === 0 ? firstDailyActionRef : undefined}
-                onClick={() => {
-                  setDailyActionsOpen(false);
-                  runDailyAction(item.label);
-                }}
-                className={cn(
-                  "grid min-h-[72px] place-items-center gap-2 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-2 py-3 text-center text-xs font-semibold text-[color:var(--text)] shadow-[var(--shadow-inset)]",
-                  "hover:border-[color:var(--border-strong)] hover:bg-[color:var(--surface-subtle)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
-                  dailyActions.length % 2 === 1 && index === dailyActions.length - 1 && "col-span-2",
-                )}
-              >
-                <Icon className="h-4.5 w-4.5 text-[color:var(--clinical-chat-teal)]" />
-                {item.label}
-              </button>
-            );
-          })}
-        </div>
-      </Sheet>
     </>
   );
 }
diff --git a/src/components/clinical-dashboard/medication-prescribing-workspace.tsx b/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
index d60a621eb6..f23b4efb3c 100644
--- a/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
+++ b/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
@@ -8,7 +8,7 @@ import {
   BadgeCheck,
   Brain,
   CalendarDays,
-  ChartNoAxesColumnIncreasing,
+  Gauge,
   CheckCircle2,
   ChevronDown,
   ChevronRight,
@@ -26,7 +26,7 @@ import {
 import Link from "next/link";
 import { useState } from "react";
 
-import { cn } from "@/components/ui-primitives";
+import { cn, toneDanger, toneInfo, toneNeutral, toneSuccess, toneWarning } from "@/components/ui-primitives";
 
 type MedicationPrescribingWorkspaceProps = {
   query: string;
@@ -56,11 +56,22 @@ type MedicationResult = {
   href?: string;
 };
 
+// Badge tone key: clinical = action/instruction, success = verified/access, danger = stop/avoid, warning = adjust/check, neutral = passive metadata, info = process.
+type ClinicalBadgeTone = "clinical" | "success" | "danger" | "warning" | "neutral" | "info";
+
+type ClinicalBadgeItem = {
+  label: string;
+  tone?: ClinicalBadgeTone;
+  icon?: LucideIcon;
+};
+
 type DetailRow = {
   label: string;
   icon: LucideIcon;
+  summary?: string;
   body?: string | string[];
   columns?: Array<{ label: string; value: string; meta?: string }>;
+  badges?: ClinicalBadgeItem[];
   tone?: "default" | "danger";
   compact?: boolean;
 };
@@ -109,6 +120,18 @@ const medicationPrompts = [
   { label: "sertraline max dose", icon: ShieldCheck },
 ];
 
+const medicationIdentityBadges: ClinicalBadgeItem[] = [
+  { label: "333 mg EC tablet", tone: "neutral" },
+  { label: "PBS streamlined", tone: "success" },
+  { label: "Reviewed", tone: "success", icon: BadgeCheck },
+];
+
+const accessBadges: ClinicalBadgeItem[] = [
+  { label: "Campral", tone: "neutral", icon: Pill },
+  { label: "PBS streamlined", tone: "success" },
+  { label: "Item 8357W", tone: "neutral" },
+];
+
 const medicationResults: MedicationResult[] = [
   {
     id: "acamprosate",
@@ -157,56 +180,104 @@ const detailRows: DetailRow[] = [
   {
     label: "Prescribing answer",
     icon: ClipboardList,
+    summary: "Maintenance of alcohol abstinence after withdrawal, with renal function checked and support in place.",
     body: [
-      "Use for maintenance of abstinence after detox when renal function is acceptable and psychosocial support is in place.",
-      "Start after withdrawal and continue if relapse occurs. Not for use in acute withdrawal.",
+      "Use for maintenance of alcohol abstinence once withdrawal is complete and the patient is abstinent.",
+      "Use alongside psychosocial support and relapse prevention. Not for acute alcohol withdrawal.",
+    ],
+    badges: [
+      { label: "Abstinence maintenance", tone: "clinical", icon: CheckCircle2 },
+      { label: "After withdrawal", tone: "neutral" },
+      { label: "Psychosocial support", tone: "neutral" },
     ],
   },
   {
     label: "Dosing",
     icon: CalendarDays,
+    summary: "666 mg TID with meals. Dose ceiling 1,998 mg/day.",
     columns: [
       { label: "Usual dose", value: "666 mg (2 x 333 mg) TID with meals" },
       { label: "Dose ceiling", value: "1,998 mg/day", meta: "MAX" },
       { label: "Under 60 kg", value: "2 tablets morning, 1 midday, 1 night" },
       { label: "Treatment duration", value: "Around 1 year" },
     ],
+    badges: [
+      { label: "666 mg TID", tone: "clinical", icon: CalendarDays },
+      { label: "Max 1,998 mg/day", tone: "neutral", icon: Gauge },
+      { label: "Reduce <60 kg", tone: "warning", icon: UserRound },
+      { label: "Around 1 year", tone: "neutral" },
+    ],
   },
   {
     label: "Administration",
     icon: Pill,
+    summary: "Take with food. Swallow enteric-coated tablets whole.",
     body: ["Take with food. Swallow EC tablets whole with water.", "Do not crush or chew."],
+    badges: [
+      { label: "Take with food", tone: "clinical" },
+      { label: "Swallow whole", tone: "clinical" },
+      { label: "Do not crush", tone: "warning" },
+    ],
   },
   {
     label: "Do not use",
     icon: AlertTriangle,
     tone: "danger",
+    summary: "Avoid if serum creatinine >120 micromol/L, Child-Pugh C, pregnancy, or breastfeeding.",
     body: [
+      "Known hypersensitivity to acamprosate or excipients.",
       "Renal insufficiency: serum creatinine >120 micromol/L (contraindicated)",
       "Severe hepatic failure (Child-Pugh C) (contraindicated)",
       "Pregnancy (DO NOT USE)",
       "Breastfeeding (DO NOT USE)",
     ],
+    badges: [
+      { label: "Cr >120 avoid", tone: "danger", icon: Droplet },
+      { label: "Child-Pugh C", tone: "danger", icon: ShieldCheck },
+      { label: "Pregnancy", tone: "danger" },
+      { label: "Breastfeeding", tone: "danger" },
+    ],
   },
   {
     label: "Populations",
     icon: UserRound,
-    body: "Avoid in children/adolescents under 18 years and in adults over 65 years: safety and efficacy not established.",
+    summary: "Avoid under 18 years and over 65 years because safety and efficacy are not established.",
+    body: "Avoid use in children/adolescents under 18 years and adults over 65 years: safety and efficacy are not established.",
+    badges: [
+      { label: "Avoid <18 years", tone: "warning", icon: UserRound },
+      { label: "Avoid >65 years", tone: "warning" },
+    ],
   },
   {
     label: "Key risks",
     icon: ShieldCheck,
+    summary: "Main risks are GI effects, rash/pruritus, mood change, and depression/suicidality monitoring.",
     columns: [
-      { label: "GI", value: "Diarrhea, nausea, flatulence (high)" },
+      { label: "GI", value: "Diarrhoea, nausea, flatulence" },
       { label: "Dermatologic", value: "Rash, pruritus" },
-      { label: "Neuropsychiatric", value: "Mood swings, depression" },
+      { label: "Neuropsychiatric", value: "Mood change, depression, suicidality monitoring" },
+    ],
+    badges: [
+      { label: "GI effects", tone: "warning" },
+      { label: "Mood monitor", tone: "clinical" },
+      { label: "Rash/pruritus", tone: "neutral" },
     ],
   },
   {
     label: "Pearls / PK",
     icon: FlaskConical,
     compact: true,
-    body: "Mechanism not fully established  -  Not metabolized; excreted unchanged in urine  -  Half-life 13-28.4 h  -  Minimal protein binding",
+    summary: "Renally excreted unchanged; half-life 13-28.4 hours.",
+    body: [
+      "Mechanism is not fully established.",
+      "Not metabolised; excreted unchanged in urine.",
+      "Apparent half-life 13-28.4 h; minimal plasma protein binding.",
+    ],
+    badges: [
+      { label: "Renal excretion", tone: "neutral" },
+      { label: "Half-life 13-28.4 h", tone: "neutral" },
+      { label: "Low protein binding", tone: "neutral" },
+    ],
   },
 ];
 
@@ -215,10 +286,10 @@ const sideSections: SideSection[] = [
     title: "Checks and monitoring",
     icon: Activity,
     items: [
-      { label: "Renal", body: "Check baseline and periodically", icon: Droplet },
-      { label: "Hepatic (severe disease)", body: "Assess if severe liver disease suspected", icon: ShieldCheck },
-      { label: "Mood / suicidality", body: "Monitor, especially early treatment", icon: Brain },
-      { label: "Adherence", body: "Reinforce adherence and support", icon: ClipboardCheck },
+      { label: "Renal function", body: "Check baseline and periodically.", icon: Droplet },
+      { label: "Hepatic status", body: "Avoid in severe hepatic failure; assess if suspected.", icon: ShieldCheck },
+      { label: "Mood / suicidality", body: "Monitor, especially early in treatment.", icon: Brain },
+      { label: "Adherence", body: "Reinforce regular dosing and psychosocial support.", icon: ClipboardCheck },
     ],
   },
   {
@@ -227,7 +298,7 @@ const sideSections: SideSection[] = [
     items: [
       { label: "Diazepam, disulfiram, imipramine", body: "No major PK interactions." },
       { label: "Naltrexone", body: "Increases acamprosate exposure; no dose adjustment required." },
-      { label: "Other psychotropics", body: "Not well studied." },
+      { label: "Other psychotropics", body: "Evidence is limited; monitor clinically." },
     ],
   },
 ];
@@ -251,18 +322,6 @@ function medicationSectionIdForLabel(label: string): MedicationSectionId {
   return "summary";
 }
 
-function scrollToMedicationSection(section: MedicationSectionId) {
-  if (typeof document === "undefined") return;
-  const targets = Array.from(document.querySelectorAll<HTMLElement>(`[data-medication-section="${section}"]`));
-  const target = targets.find((item) => item.offsetParent !== null) ?? targets[0];
-  if (!target) return;
-  const stickyOffset = window.innerWidth < 640 ? 118 : 72;
-  const rect = target.getBoundingClientRect();
-  if (rect.top >= stickyOffset && rect.bottom <= window.innerHeight - 16) return;
-  const top = Math.max(0, rect.top + window.scrollY - stickyOffset);
-  window.scrollTo({ top, behavior: "auto" });
-}
-
 function IconTile({
   icon: Icon,
   tone = "teal",
@@ -290,6 +349,77 @@ function IconTile({
   );
 }
 
+function ClinicalBadge({
+  label,
+  tone = "neutral",
+  icon: Icon,
+  compact = false,
+}: ClinicalBadgeItem & { compact?: boolean }) {
+  const toneClassName: Record<ClinicalBadgeTone, string> = {
+    clinical:
+      "border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+    success: toneSuccess,
+    danger: toneDanger,
+    warning: toneWarning,
+    neutral: toneNeutral,
+    info: toneInfo,
+  };
+
+  return (
+    <span
+      title={label}
+      className={cn(
+        "inline-flex h-[1.375rem] max-w-full shrink-0 items-center gap-1 rounded-md border px-1.5 text-[10px] font-semibold leading-none shadow-[var(--shadow-inset)]",
+        compact && "h-5 px-1.5 text-[9.5px]",
+        toneClassName[tone],
+      )}
+    >
+      {Icon ? <Icon className="h-2.5 w-2.5 shrink-0" aria-hidden="true" /> : null}
+      <span className="truncate">{label}</span>
+    </span>
+  );
+}
+
+const clinicalBadgeTonePriority: Record<ClinicalBadgeTone, number> = {
+  danger: 6,
+  warning: 5,
+  clinical: 4,
+  success: 3,
+  neutral: 2,
+  info: 1,
+};
+
+function BadgeCluster({
+  items,
+  compact = false,
+  limit,
+  className,
+}: {
+  items?: ClinicalBadgeItem[];
+  compact?: boolean;
+  limit?: number;
+  className?: string;
+}) {
+  if (!items?.length) return null;
+  const orderedItems =
+    typeof limit === "number"
+      ? [...items].sort(
+          (a, b) => clinicalBadgeTonePriority[b.tone ?? "neutral"] - clinicalBadgeTonePriority[a.tone ?? "neutral"],
+        )
+      : items;
+  const visibleItems = typeof limit === "number" ? orderedItems.slice(0, limit) : orderedItems;
+  const hiddenCount = typeof limit === "number" ? Math.max(0, items.length - visibleItems.length) : 0;
+
+  return (
+    <div className={cn("flex min-w-0 flex-wrap gap-1", className)}>
+      {visibleItems.map((item, index) => (
+        <ClinicalBadge key={`${item.label}-${item.tone ?? "neutral"}-${index}`} compact={compact} {...item} />
+      ))}
+      {hiddenCount ? <ClinicalBadge label={`+${hiddenCount}`} tone="neutral" compact={compact} /> : null}
+    </div>
+  );
+}
+
 function StatusNotice({
   realDataReady,
   authUnavailable,
@@ -670,33 +800,26 @@ function DetailTile({
   return (
     <div
       className={cn(
-        "min-h-[5rem] rounded-lg border bg-[color:var(--surface-raised)] p-3 shadow-[var(--shadow-inset)] sm:min-h-[5.45rem] sm:p-3.5",
+        "min-h-[4rem] rounded-lg border bg-[color:var(--surface-raised)] p-2.5 shadow-[var(--shadow-inset)] sm:min-h-[4.25rem] sm:p-3",
         danger
           ? "border-red-500/35 bg-red-50/30 dark:bg-red-950/10"
           : "border-[color:var(--border)] hover:border-[color:var(--border-strong)]",
       )}
     >
-      <div className="flex items-start gap-2.5">
-        <IconTile icon={icon} tone={danger ? "danger" : "teal"} className="h-8 w-8 sm:h-9 sm:w-9" />
+      <div className="flex items-start gap-2">
+        <IconTile icon={icon} tone={danger ? "danger" : "teal"} className="h-7 w-7" />
         <div className="min-w-0 space-y-1">
           <p
             className={cn(
-              "text-xs font-semibold leading-4 sm:text-sm sm:leading-5",
+              "text-[11px] font-semibold leading-4",
               danger ? "text-red-600 dark:text-red-300" : "text-[color:var(--text-heading)]",
             )}
           >
             {label}
           </p>
-          <p className="text-xs leading-5 text-[color:var(--text-heading)] sm:text-sm">{value}</p>
+          <p className="text-[13px] font-semibold leading-5 text-[color:var(--text-heading)] sm:text-sm">{value}</p>
           {meta ? (
-            <p
-              className={cn(
-                "text-xs font-medium leading-4 text-[color:var(--text-muted)]",
-                meta === "MAX" && "text-[0.66rem] uppercase tracking-[0.08em]",
-              )}
-            >
-              {meta}
-            </p>
+            <p className="text-[11px] font-medium leading-4 text-[color:var(--text-muted)]">{meta}</p>
           ) : null}
         </div>
       </div>
@@ -712,22 +835,23 @@ function DetailRowBlock({ row }: { row: DetailRow }) {
     <div
       data-medication-section={medicationSectionIdForLabel(row.label)}
       className={cn(
-        "scroll-mt-16 grid gap-3 border-b border-[color:var(--border)] px-4 py-2.5 last:border-b-0 sm:grid-cols-[12.5rem_minmax(0,1fr)] sm:px-5",
+        "scroll-mt-16 grid gap-3 border-b border-[color:var(--border)] px-4 py-3 last:border-b-0 sm:grid-cols-[11.75rem_minmax(0,1fr)] sm:px-5",
         row.compact && "items-center",
       )}
     >
       <div className="flex items-center gap-3">
-        <IconTile icon={Icon} tone={row.tone === "danger" ? "danger" : "teal"} className="h-9 w-9" />
+        <IconTile icon={Icon} tone={row.tone === "danger" ? "danger" : "teal"} className="h-8 w-8" />
         <p
           className={cn(
-            "text-sm font-semibold",
+            "text-[13px] font-semibold sm:text-sm",
             row.tone === "danger" ? "text-red-600 dark:text-red-300" : "text-[color:var(--text-heading)]",
           )}
         >
           {row.label}
         </p>
       </div>
-      <div className="min-w-0 text-sm leading-6 text-[color:var(--text-heading)]">
+      <div className="min-w-0 text-[13px] leading-5 text-[color:var(--text-heading)] sm:text-sm">
+        <BadgeCluster items={row.badges} compact limit={row.tone === "danger" ? 4 : 3} className="mb-2" />
         {row.columns ? (
           <div className={cn("grid gap-3", row.columns.length >= 4 ? "md:grid-cols-4" : "md:grid-cols-3")}>
             {row.columns.map((column) => (
@@ -735,13 +859,11 @@ function DetailRowBlock({ row }: { row: DetailRow }) {
                 key={column.label}
                 className="border-t border-[color:var(--border)] pt-2 md:border-l md:border-t-0 md:pl-4 md:pt-0 first:md:border-l-0 first:md:pl-0"
               >
-                <p className="text-xs font-semibold text-[color:var(--text-heading)]">{column.label}</p>
-                <p className="mt-1 text-sm leading-5 text-[color:var(--text-heading)]">{column.value}</p>
-                {column.meta ? (
-                  <p className="mt-1 text-[0.68rem] font-semibold uppercase tracking-[0.08em] text-[color:var(--text-muted)]">
-                    {column.meta}
-                  </p>
-                ) : null}
+                <p className="text-[11px] font-semibold text-[color:var(--text-muted)]">{column.label}</p>
+                <p className="mt-1 text-[13px] font-semibold leading-5 text-[color:var(--text-heading)] sm:text-sm">
+                  {column.value}
+                </p>
+                {column.meta ? <ClinicalBadge label={column.meta} tone="neutral" compact /> : null}
               </div>
             ))}
           </div>
@@ -866,10 +988,10 @@ function DetailLedger({
 function SidePanel({ section }: { section: SideSection }) {
   const Icon = section.icon;
   return (
-    <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-4 shadow-[var(--shadow-inset)]">
-      <div className="mb-3 flex items-center gap-2">
+    <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-3.5 shadow-[var(--shadow-inset)]">
+      <div className="mb-2.5 flex items-center gap-2">
         <Icon className="h-4.5 w-4.5 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
-        <h4 className="text-base font-semibold text-[color:var(--text-heading)]">{section.title}</h4>
+        <h4 className="text-sm font-semibold text-[color:var(--text-heading)]">{section.title}</h4>
       </div>
       <div className="divide-y divide-[color:var(--border)]">
         {section.items.map((item) => {
@@ -886,7 +1008,7 @@ function SidePanel({ section }: { section: SideSection }) {
                   />
                 )}
                 <div className="min-w-0">
-                  <p className="text-sm font-semibold text-[color:var(--text-heading)]">{item.label}</p>
+                  <p className="text-[13px] font-semibold leading-5 text-[color:var(--text-heading)]">{item.label}</p>
                   <p className="mt-0.5 text-xs leading-5 text-[color:var(--text-muted)]">{item.body}</p>
                 </div>
               </div>
@@ -906,17 +1028,15 @@ function MedicationSummaryTabs({
   onSectionChange: (section: MedicationSectionId) => void;
 }) {
   return (
-    <div className="sticky top-0 z-10 -mx-3 mb-3 border-y border-[color:var(--border)] bg-[color:var(--surface)] px-3 sm:hidden">
-      <div className="grid grid-cols-4 text-center">
+    <div className="sticky top-[3.55rem] z-10 mb-3 border-y border-[color:var(--border)] bg-[color:var(--surface)]/95 backdrop-blur-xl sm:hidden">
+      <div className="grid grid-cols-4 text-center" role="tablist" aria-label="Medication detail sections">
         {medicationSummaryTabs.map((item) => (
           <button
             key={item.label}
             type="button"
-            aria-pressed={activeSection === item.target}
-            onClick={() => {
-              onSectionChange(item.target);
-              scrollToMedicationSection(item.target);
-            }}
+            role="tab"
+            aria-selected={activeSection === item.target}
+            onClick={() => onSectionChange(item.target)}
             className={cn(
               "relative min-h-10 px-2 py-3 text-xs font-semibold text-[color:var(--text-muted)] transition hover:text-[color:var(--text-heading)]",
               activeSection === item.target &&
@@ -932,34 +1052,18 @@ function MedicationSummaryTabs({
 }
 
 function MedicationBadges() {
-  return (
-    <div className="mt-3 flex flex-wrap gap-1.5 sm:gap-2">
-      {["333 mg EC tablet", "PBS streamlined", "Reviewed"].map((badge, index) => (
-        <span
-          key={badge}
-          className={cn(
-            "inline-flex min-h-6 shrink-0 items-center gap-1.5 rounded-md border px-2 text-[11px] font-semibold shadow-[var(--shadow-inset)] sm:min-h-7 sm:text-xs",
-            index === 2
-              ? "border-emerald-500/20 bg-emerald-50 text-emerald-700 dark:bg-emerald-950/30 dark:text-emerald-300"
-              : "border-[color:var(--border)] bg-[color:var(--surface-subtle)] text-[color:var(--text-muted)]",
-          )}
-        >
-          {index === 2 ? <BadgeCheck className="h-3.5 w-3.5" aria-hidden="true" /> : null}
-          {badge}
-        </span>
-      ))}
-    </div>
-  );
+  return <BadgeCluster items={medicationIdentityBadges} className="mt-2" />;
 }
 
 function AccessPanel() {
   return (
-    <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-4 shadow-[var(--shadow-inset)]">
-      <div className="mb-3 flex items-center gap-2">
+    <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-3.5 shadow-[var(--shadow-inset)]">
+      <div className="mb-2.5 flex items-center gap-2">
         <Lock className="h-4.5 w-4.5 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
-        <h4 className="text-base font-semibold text-[color:var(--text-heading)]">Access</h4>
+        <h4 className="text-sm font-semibold text-[color:var(--text-heading)]">Access</h4>
       </div>
-      <dl className="grid gap-2 text-sm">
+      <BadgeCluster items={accessBadges} compact limit={3} className="mb-2.5" />
+      <dl className="grid gap-2 text-[13px]">
         {[
           ["Brand", "Campral"],
           ["PBS status", "PBS streamlined"],
@@ -994,19 +1098,15 @@ function SourcesDisclosure({ mobile = false }: { mobile?: boolean }) {
         <ChevronDown className="h-4 w-4 text-[color:var(--text-soft)]" aria-hidden="true" />
       </summary>
       <div className="border-t border-[color:var(--border)] px-4 py-3 text-xs leading-5 text-[color:var(--text-muted)]">
-        Australian PI, PBS, DACAS, Australian Prescriber.
+        Australian Product Information, PBS, DACAS, Australian Prescriber.
       </div>
     </details>
   );
 }
 
-function MobileDetailCard({ row }: { row: DetailRow }) {
+function MobileDetailCard({ row, compact = false }: { row: DetailRow; compact?: boolean }) {
   const Icon = row.icon;
-  const firstColumn = row.columns?.[0];
-  const summary =
-    row.columns
-      ?.map((column) => `${column.label}: ${column.value}${column.meta ? ` ${column.meta}` : ""}`)
-      .join("; ") ?? (Array.isArray(row.body) ? row.body.join(" ") : (row.body ?? ""));
+  const body = row.body ? (Array.isArray(row.body) ? row.body : [row.body]) : [];
 
   return (
     <article
@@ -1014,81 +1114,136 @@ function MobileDetailCard({ row }: { row: DetailRow }) {
       className="flex scroll-mt-16 w-full items-start gap-3 border-b border-[color:var(--border)] bg-[color:var(--surface-raised)] px-3 py-2.5 text-left last:border-b-0"
     >
       <IconTile icon={Icon} tone={row.tone === "danger" ? "danger" : "teal"} className="h-7 w-7" />
-      <span className="min-w-0 flex-1">
-        <span
+      <div className="min-w-0 flex-1">
+        <p
           className={cn(
-            "block text-xs font-semibold",
+            "text-[13px] font-semibold leading-4",
             row.tone === "danger" ? "text-red-600 dark:text-red-300" : "text-[color:var(--text-heading)]",
           )}
         >
           {row.label}
-        </span>
-        <span className="mt-1 block text-[11px] leading-[1.45] text-[color:var(--text-muted)]">
-          {row.label === "Dosing" && firstColumn ? summary.replace("Usual dose: ", "") : summary}
-        </span>
-      </span>
+        </p>
+        <BadgeCluster items={row.badges} compact limit={row.tone === "danger" ? 4 : 2} className="mt-1.5" />
+        {compact && row.summary ? (
+          <p className="mt-1.5 text-xs leading-5 text-[color:var(--text-muted)]">{row.summary}</p>
+        ) : null}
+        {row.columns && !compact ? (
+          <div className="mt-2 grid gap-1.5 min-[420px]:grid-cols-2">
+            {row.columns.map((column) => (
+              <div
+                key={column.label}
+                className="rounded-md border border-[color:var(--border)] bg-[color:var(--surface-subtle)]/55 px-2 py-1.5"
+              >
+                <p className="text-[10px] font-semibold text-[color:var(--text-muted)]">{column.label}</p>
+                <p className="mt-0.5 text-xs font-semibold leading-[1.35] text-[color:var(--text-heading)]">
+                  {column.value}
+                </p>
+                {column.meta ? <ClinicalBadge label={column.meta} tone="neutral" compact /> : null}
+              </div>
+            ))}
+          </div>
+        ) : !compact && body.length ? (
+          <div className="mt-2 grid gap-1.5 text-xs leading-5 text-[color:var(--text-muted)]">
+            {body.map((item) => (
+              <p key={item} className={cn(row.tone === "danger" && "flex gap-2")}>
+                {row.tone === "danger" ? (
+                  <span className="mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full bg-red-500" aria-hidden="true" />
+                ) : null}
+                <span>{item}</span>
+              </p>
+            ))}
+          </div>
+        ) : null}
+      </div>
     </article>
   );
 }
 
-function MobileDetailList() {
-  const summaryRows = detailRows.slice(0, 5);
-  const compactRows = [
+type MobileDisclosurePanelData = {
+  label: string;
+  icon: LucideIcon;
+  badges?: ClinicalBadgeItem[];
+  body: string[];
+};
+
+function MobileDisclosurePanel({ panel }: { panel: MobileDisclosurePanelData }) {
+  const Icon = panel.icon;
+
+  return (
+    <details className="group scroll-mt-16 border-b border-[color:var(--border)] last:border-b-0">
+      <summary className="flex min-h-11 cursor-pointer list-none items-center justify-between gap-3 px-3 text-left text-sm font-semibold text-[color:var(--text-heading)] [&::-webkit-details-marker]:hidden">
+        <span className="flex min-w-0 items-center gap-2">
+          <Icon className="h-4.5 w-4.5 shrink-0 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+          <span className="truncate">{panel.label}</span>
+        </span>
+        <ChevronDown
+          className="h-4 w-4 shrink-0 text-[color:var(--text-soft)] transition group-open:rotate-180"
+          aria-hidden="true"
+        />
+      </summary>
+      <div className="px-10 pb-3">
+        <BadgeCluster items={panel.badges} compact limit={3} className="mb-2" />
+        <ul className="grid gap-1.5 text-xs leading-5 text-[color:var(--text-muted)]">
+          {panel.body.map((item) => (
+            <li key={item}>{item}</li>
+          ))}
+        </ul>
+      </div>
+    </details>
+  );
+}
+
+function MobileDetailList({ activeSection }: { activeSection: MedicationSectionId }) {
+  const rowsBySection: Record<MedicationSectionId, DetailRow[]> = {
+    summary: detailRows.filter((row) => ["Prescribing answer", "Dosing", "Do not use"].includes(row.label)),
+    dosing: detailRows.filter((row) => ["Dosing", "Administration"].includes(row.label)),
+    safety: detailRows.filter((row) => ["Do not use", "Populations", "Key risks"].includes(row.label)),
+    more: detailRows.filter((row) => row.label === "Pearls / PK"),
+  };
+  const morePanels: MobileDisclosurePanelData[] = [
     {
-      label: "Key risks",
-      icon: ShieldCheck,
-      section: "safety" as const,
-      body: ["GI: diarrhea, nausea, flatulence", "Dermatologic: rash, pruritus", "Neuropsychiatric: mood swings"],
+      label: "Checks and monitoring",
+      icon: Activity,
+      badges: [
+        { label: "Renal function", tone: "clinical", icon: Droplet },
+        { label: "Mood monitor", tone: "clinical", icon: Brain },
+        { label: "Adherence", tone: "neutral", icon: ClipboardCheck },
+      ],
+      body: sideSections[0].items.map((item) => `${item.label}: ${item.body}`),
     },
     {
       label: "Interactions",
       icon: ArrowLeftRight,
-      section: "more" as const,
+      badges: [{ label: "PK interactions limited", tone: "neutral" }],
       body: sideSections[1].items.map((item) => `${item.label}: ${item.body}`),
     },
     {
       label: "Access",
       icon: Lock,
-      section: "more" as const,
-      body: ["Campral", "PBS streamlined", "PBS item 8357W"],
+      badges: accessBadges,
+      body: ["Brand: Campral", "PBS status: PBS streamlined", "PBS item: 8357W"],
     },
   ];
 
   return (
-    <div className="space-y-3 sm:hidden">
+    <div data-medication-section={activeSection} className="space-y-3 sm:hidden">
       <section className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] shadow-[var(--shadow-soft)]">
-        {summaryRows.map((row) => (
-          <MobileDetailCard key={row.label} row={row} />
+        {rowsBySection[activeSection].map((row) => (
+          <MobileDetailCard key={row.label} row={row} compact={activeSection === "summary" || row.compact} />
         ))}
       </section>
 
-      <section className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] shadow-[var(--shadow-inset)]">
-        {compactRows.map(({ label, icon: Icon, section, body }) => (
-          <details
-            key={label}
-            data-medication-section={section}
-            className="group scroll-mt-16 border-b border-[color:var(--border)] last:border-b-0"
-          >
-            <summary className="flex min-h-11 cursor-pointer list-none items-center justify-between gap-3 px-3 text-left text-sm font-semibold text-[color:var(--text-heading)] [&::-webkit-details-marker]:hidden">
-              <span className="flex min-w-0 items-center gap-2">
-                <Icon className="h-4.5 w-4.5 shrink-0 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
-                <span className="truncate">{label}</span>
-              </span>
-              <ChevronDown
-                className="h-4 w-4 shrink-0 text-[color:var(--text-soft)] transition group-open:rotate-180"
-                aria-hidden="true"
-              />
-            </summary>
-            <ul className="grid gap-1.5 px-10 pb-3 text-[11px] leading-5 text-[color:var(--text-muted)]">
-              {body.map((item) => (
-                <li key={item}>{item}</li>
-              ))}
-            </ul>
-          </details>
-        ))}
-      </section>
+      {activeSection === "more" ? (
+        <>
+          <section className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] shadow-[var(--shadow-inset)]">
+            {morePanels.map((panel) => (
+              <MobileDisclosurePanel key={panel.label} panel={panel} />
+            ))}
+          </section>
 
-      <SourcesDisclosure mobile />
+          <SourcesDisclosure mobile />
+        </>
+      ) : null}
     </div>
   );
 }
@@ -1099,26 +1254,18 @@ function MedicationDetail() {
 
   return (
     <div className="mx-auto w-full max-w-7xl space-y-3 py-1 sm:py-2">
-      <Link
-        href="/?mode=prescribing&q=acamprosate%20renal%20dose"
-        className="sr-only focus:not-sr-only focus:absolute focus:z-50 focus:inline-flex focus:min-h-9 focus:items-center focus:gap-2 focus:rounded-lg focus:border focus:border-[color:var(--border)] focus:bg-[color:var(--surface-raised)] focus:px-3 focus:text-sm focus:font-semibold focus:text-[color:var(--text-muted)] focus:shadow-[var(--shadow-inset)] focus:outline focus:outline-2 focus:outline-offset-2 focus:outline-[color:var(--focus)]"
-      >
-        <ArrowLeft className="h-4 w-4" aria-hidden="true" />
-        Back to medication matches
-      </Link>
-
       <div className="grid gap-4 lg:grid-cols-[minmax(0,1fr)_21rem]">
         <div className="space-y-3.5">
           <section data-medication-section="summary" className="scroll-mt-16 px-1 sm:px-0">
             <div className="flex items-start gap-3 sm:items-center sm:gap-4">
-              <IconTile icon={Pill} tone="teal" className="h-14 w-14 sm:h-18 sm:w-18" />
+              <IconTile icon={Pill} tone="teal" className="h-11 w-11 sm:h-14 sm:w-14" />
               <div className="min-w-0 flex-1">
-                <h3 className="text-2xl font-semibold tracking-normal text-[color:var(--text-heading)] sm:text-4xl">
+                <h3 className="text-2xl font-semibold leading-tight tracking-normal text-[color:var(--text-heading)] sm:text-[2rem]">
                   Acamprosate
                 </h3>
-                <p className="mt-1 text-sm font-medium text-[color:var(--text-muted)] sm:text-base">
-                  Alcohol abstinence maintenance <span className="mx-1.5 text-[color:var(--text-soft)]">·</span> GABA /
-                  glutamate modulator
+                <p className="mt-1 text-[13px] font-medium leading-5 text-[color:var(--text-muted)] sm:text-sm">
+                  Alcohol abstinence maintenance <span className="mx-1.5 text-[color:var(--text-soft)]">·</span>{" "}
+                  GABA/glutamate modulator
                 </p>
                 <MedicationBadges />
               </div>
@@ -1129,19 +1276,35 @@ function MedicationDetail() {
             <DetailTile
               icon={CheckCircle2}
               label="Prescribing answer"
-              value="Maintenance after detox"
-              meta="with psychosocial support"
+              value="Maintain abstinence"
+              meta="after withdrawal"
+            />
+            <DetailTile
+              icon={CalendarDays}
+              label="Dosing"
+              value="666 mg TID"
+              meta="2 x 333 mg"
+            />
+            <DetailTile
+              icon={Gauge}
+              label="Dose ceiling"
+              value="1,998 mg/day"
+              meta="MAX"
+            />
+            <DetailTile
+              icon={AlertTriangle}
+              label="Avoid"
+              value="Cr >120"
+              meta="micromol/L"
+              danger
             />
-            <DetailTile icon={CalendarDays} label="Dosing" value="666 mg TID" meta="2 x 333 mg" />
-            <DetailTile icon={ChartNoAxesColumnIncreasing} label="Dose ceiling" value="1,998 mg/day" meta="MAX" />
-            <DetailTile icon={AlertTriangle} label="Avoid" value="Cr >120 micromol/L" danger />
           </section>
 
           <MedicationSummaryTabs activeSection={activeMobileSection} onSectionChange={setActiveMobileSection} />
 
           <DetailLedger view={clinicalDetailView} onViewChange={setClinicalDetailView} />
 
-          <MobileDetailList />
+          <MobileDetailList activeSection={activeMobileSection} />
         </div>
 
         <aside className="hidden space-y-3 lg:block lg:self-start lg:pt-[6.6rem]">
diff --git a/src/components/clinical-dashboard/mode-action-popup.tsx b/src/components/clinical-dashboard/mode-action-popup.tsx
new file mode 100644
index 0000000000..db1cbd804b
--- /dev/null
+++ b/src/components/clinical-dashboard/mode-action-popup.tsx
@@ -0,0 +1,398 @@
+"use client";
+
+import { useCallback, useRef, type KeyboardEvent as ReactKeyboardEvent } from "react";
+import {
+  BadgeCheck,
+  ChevronRight,
+  Clock3,
+  ExternalLink,
+  FileText,
+  Filter,
+  FolderOpen,
+  GitBranch,
+  Heart,
+  ListChecks,
+  Plus,
+  Search,
+  ShieldCheck,
+  Sparkles,
+  Table2,
+  UploadCloud,
+  Wrench,
+  X,
+  type LucideIcon,
+} from "lucide-react";
+
+import { useDismissableLayer } from "@/components/use-dismissable-layer";
+import { cn, chatComposerIconButton } from "@/components/ui-primitives";
+
+export type ModeActionSetId = "answer" | "documents" | "tools" | "differentials";
+
+export type ModeActionId =
+  | "answer-clinical"
+  | "answer-documents"
+  | "answer-evidence"
+  | "answer-new"
+  | "documents-search"
+  | "documents-upload"
+  | "documents-scope"
+  | "documents-recent"
+  | "documents-tables"
+  | "documents-status"
+  | "documents-collections"
+  | "documents-viewer"
+  | "medication-dose"
+  | "medication-safety"
+  | "medication-monitoring"
+  | "medication-access"
+  | "tools-browse"
+  | "tools-favourites"
+  | "tools-new"
+  | "favourites-browse"
+  | "favourites-answer"
+  | "favourites-tools"
+  | "differentials-build"
+  | "differentials-criteria"
+  | "differentials-documents"
+  | "differentials-evidence";
+
+export type ModeActionItem = {
+  id: ModeActionId;
+  label: string;
+  shortLabel?: string;
+  description?: string;
+  icon: LucideIcon;
+  primary?: boolean;
+};
+
+const modeActionSets = {
+  answer: [
+    {
+      id: "answer-clinical",
+      label: "Answer mode",
+      shortLabel: "Answer",
+      description: "Ask a clinical question",
+      icon: Sparkles,
+      primary: true,
+    },
+    { id: "answer-documents", label: "Docs", description: "Search and manage sources", icon: FileText },
+    { id: "answer-evidence", label: "Evidence", description: "Review answer sources", icon: ListChecks },
+    { id: "answer-new", label: "New answer", shortLabel: "New", description: "Clear the current thread", icon: Plus },
+  ],
+  documents: [
+    {
+      id: "documents-search",
+      label: "Search documents",
+      shortLabel: "Search",
+      description: "Find indexed clinical sources",
+      icon: Search,
+      primary: true,
+    },
+    {
+      id: "documents-upload",
+      label: "Upload PDF",
+      shortLabel: "Upload",
+      description: "Add a source to the library",
+      icon: UploadCloud,
+    },
+    {
+      id: "documents-scope",
+      label: "Set scope",
+      shortLabel: "Scope",
+      description: "Limit answers to selected sources",
+      icon: Filter,
+    },
+    { id: "documents-recent", label: "Recent documents", shortLabel: "Recent", icon: Clock3 },
+    { id: "documents-tables", label: "Tables", icon: Table2 },
+    { id: "documents-status", label: "Status", icon: BadgeCheck },
+    { id: "documents-collections", label: "Collections", shortLabel: "Folders", icon: FolderOpen },
+    { id: "documents-viewer", label: "Open source", shortLabel: "Open", icon: ExternalLink },
+  ],
+  tools: [
+    {
+      id: "tools-browse",
+      label: "Browse tools",
+      shortLabel: "Browse",
+      description: "Open the applications registry",
+      icon: Wrench,
+      primary: true,
+    },
+    {
+      id: "tools-favourites",
+      label: "Favourites",
+      shortLabel: "Saved",
+      description: "Saved clinical tools",
+      icon: Heart,
+    },
+    {
+      id: "tools-new",
+      label: "New answer",
+      shortLabel: "New",
+      description: "Clear the current thread",
+      icon: Sparkles,
+    },
+  ],
+  differentials: [
+    {
+      id: "differentials-build",
+      label: "Build differential",
+      shortLabel: "Build",
+      description: "Start a structured differential",
+      icon: GitBranch,
+      primary: true,
+    },
+    {
+      id: "differentials-criteria",
+      label: "Compare criteria",
+      shortLabel: "Criteria",
+      description: "Review distinguishing features",
+      icon: ListChecks,
+    },
+    {
+      id: "differentials-documents",
+      label: "Source documents",
+      shortLabel: "Sources",
+      description: "Search supporting documents",
+      icon: FileText,
+    },
+    {
+      id: "differentials-evidence",
+      label: "Evidence",
+      description: "Review cited support",
+      icon: ShieldCheck,
+    },
+  ],
+} as const satisfies Record<ModeActionSetId, readonly ModeActionItem[]>;
+
+export function modeActionItemsFor(setId: ModeActionSetId): readonly ModeActionItem[] {
+  return modeActionSets[setId];
+}
+
+export function ModeActionPopup({
+  open,
+  title,
+  titleIcon: TitleIcon,
+  buttonLabel,
+  items,
+  onOpenChange,
+  onBeforeOpen,
+  onAction,
+}: {
+  open: boolean;
+  title: string;
+  titleIcon: LucideIcon;
+  buttonLabel: string;
+  items: readonly ModeActionItem[];
+  onOpenChange: (open: boolean) => void;
+  onBeforeOpen?: () => void;
+  onAction: (actionId: ModeActionId) => void;
+}) {
+  const buttonRef = useRef<HTMLButtonElement | null>(null);
+  const rootRef = useRef<HTMLDivElement | null>(null);
+  const surfaceRef = useRef<HTMLDivElement | null>(null);
+  const itemRefs = useRef<Array<HTMLButtonElement | null>>([]);
+
+  const closeAndRestoreFocus = useCallback(() => {
+    onOpenChange(false);
+    window.requestAnimationFrame(() => buttonRef.current?.focus());
+  }, [onOpenChange]);
+
+  useDismissableLayer({
+    enabled: open,
+    refs: [rootRef, surfaceRef],
+    restoreFocusRef: buttonRef,
+    onDismiss: () => onOpenChange(false),
+  });
+
+  function focusActionItem(index: number) {
+    const nextIndex = (index + items.length) % items.length;
+    itemRefs.current[nextIndex]?.focus();
+  }
+
+  function openWithFocus(index: number) {
+    onBeforeOpen?.();
+    onOpenChange(true);
+    window.requestAnimationFrame(() => focusActionItem(index));
+  }
+
+  function handleTriggerKeyDown(event: ReactKeyboardEvent<HTMLButtonElement>) {
+    if (event.key !== "ArrowUp" && event.key !== "ArrowDown") return;
+    event.preventDefault();
+    openWithFocus(event.key === "ArrowUp" ? items.length - 1 : 0);
+  }
+
+  function handleItemKeyDown(event: ReactKeyboardEvent<HTMLButtonElement>, index: number) {
+    if (event.key === "ArrowRight" || event.key === "ArrowDown") {
+      event.preventDefault();
+      focusActionItem(index + 1);
+    } else if (event.key === "ArrowLeft" || event.key === "ArrowUp") {
+      event.preventDefault();
+      focusActionItem(index - 1);
+    } else if (event.key === "Home") {
+      event.preventDefault();
+      focusActionItem(0);
+    } else if (event.key === "End") {
+      event.preventDefault();
+      focusActionItem(items.length - 1);
+    } else if (event.key === "Escape") {
+      event.preventDefault();
+      closeAndRestoreFocus();
+    }
+  }
+
+  function runActionAndClose(actionId: ModeActionId) {
+    onOpenChange(false);
+    onAction(actionId);
+  }
+
+  const prominentActionCount = items.length > 4 ? 3 : items.length;
+  const prominentActions = items.slice(0, prominentActionCount);
+  const compactActions = items.slice(prominentActionCount);
+
+  function assignActionRef(element: HTMLButtonElement | null, index: number) {
+    itemRefs.current[index] = element;
+  }
+
+  return (
+    <>
+      {open ? (
+        <div
+          ref={surfaceRef}
+          className={cn(
+            "absolute inset-x-0 bottom-[calc(100%+0.55rem)] z-50 text-[color:var(--text)] motion-safe:animate-action-tray-in sm:inset-x-auto sm:left-0",
+            items.length <= 4 ? "sm:w-[min(28rem,100%)]" : "sm:w-[min(31rem,100%)]",
+          )}
+        >
+          <div className="overflow-hidden rounded-[1rem] border border-[color:var(--border-lux)] bg-[color:var(--surface)] shadow-[0_16px_38px_rgb(15_37_48_/_14%)] ring-1 ring-white/40 backdrop-blur-xl dark:ring-white/10">
+            <div className="flex min-h-11 items-center justify-between gap-3 border-b border-[color:var(--border)]/80 px-3 py-2">
+              <div className="flex min-w-0 items-center gap-2">
+                <span className="grid h-7 w-7 shrink-0 place-items-center rounded-md border border-[color:var(--clinical-chat-teal)]/18 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]">
+                  <TitleIcon className="h-3.5 w-3.5" />
+                </span>
+                <span className="block min-w-0 truncate text-[13px] font-bold text-[color:var(--text-heading)]">
+                  {title}
+                </span>
+              </div>
+              <button
+                type="button"
+                onClick={closeAndRestoreFocus}
+                className="grid h-8 w-8 shrink-0 place-items-center rounded-full text-[color:var(--text-muted)] transition hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
+                aria-label={`Close ${title.toLowerCase()} options`}
+              >
+                <X className="h-4 w-4" />
+              </button>
+            </div>
+            <div
+              id="daily-actions-sheet"
+              data-testid="daily-actions-menu"
+              role="menu"
+              aria-label={title}
+              className="p-2.5"
+            >
+              <div className="grid gap-1.5">
+                {prominentActions.map((item, index) => {
+                  const Icon = item.icon;
+                  return (
+                    <button
+                      key={item.id}
+                      ref={(element) => assignActionRef(element, index)}
+                      type="button"
+                      role="menuitem"
+                      onKeyDown={(event) => handleItemKeyDown(event, index)}
+                      onClick={() => runActionAndClose(item.id)}
+                      className={cn(
+                        "group grid min-h-[44px] w-full grid-cols-[2rem_minmax(0,1fr)_auto] items-center gap-2 rounded-lg border px-2.5 py-1.5 text-left shadow-[var(--shadow-inset)] transition motion-safe:duration-150 sm:min-h-[48px] sm:py-2",
+                        "hover:border-[color:var(--border-strong)] hover:bg-[color:var(--surface-subtle)] active:scale-[0.995]",
+                        "focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
+                        item.primary
+                          ? "border-[color:var(--clinical-chat-teal)]/24 bg-[color:var(--surface)]"
+                          : "border-[color:var(--border)] bg-[color:var(--surface)]",
+                      )}
+                    >
+                      <span
+                        className={cn(
+                          "grid h-8 w-8 shrink-0 place-items-center rounded-md border shadow-[var(--shadow-inset)] transition",
+                          item.primary
+                            ? "border-[color:var(--clinical-chat-teal)]/24 bg-[color:var(--surface)] text-[color:var(--clinical-chat-teal)]"
+                            : "border-[color:var(--border)] bg-[color:var(--surface-raised)] text-[color:var(--text-muted)] group-hover:text-[color:var(--text)]",
+                        )}
+                      >
+                        <Icon className="h-4 w-4" />
+                      </span>
+                      <span className="min-w-0">
+                        <span className="block truncate text-[13px] font-bold leading-4 text-[color:var(--text-heading)] sm:text-[13px]">
+                          <span className="sm:hidden">{item.shortLabel ?? item.label}</span>
+                          <span className="hidden sm:inline">{item.label}</span>
+                        </span>
+                        {item.description ? (
+                          <span className="mt-0.5 hidden truncate text-[11px] font-semibold leading-4 text-[color:var(--text-soft)] sm:block">
+                            {item.description}
+                          </span>
+                        ) : null}
+                      </span>
+                      <ChevronRight className="h-4 w-4 shrink-0 text-[color:var(--text-soft)] transition group-hover:translate-x-0.5 group-hover:text-[color:var(--text-muted)] motion-reduce:transition-none" />
+                    </button>
+                  );
+                })}
+              </div>
+              {compactActions.length ? (
+                <div className="mt-2 grid grid-cols-5 gap-1.5 border-t border-[color:var(--border)]/80 pt-2 max-[360px]:grid-cols-3">
+                  {compactActions.map((item, compactIndex) => {
+                    const index = prominentActionCount + compactIndex;
+                    const Icon = item.icon;
+                    return (
+                      <button
+                        key={item.id}
+                        ref={(element) => assignActionRef(element, index)}
+                        type="button"
+                        role="menuitem"
+                        onKeyDown={(event) => handleItemKeyDown(event, index)}
+                        onClick={() => runActionAndClose(item.id)}
+                        className={cn(
+                          "group grid min-h-[48px] place-items-center gap-1 rounded-lg border border-transparent px-1.5 py-1.5 text-center transition motion-safe:duration-150 sm:min-h-[52px]",
+                          "hover:border-[color:var(--border)] hover:bg-[color:var(--surface-subtle)] active:scale-[0.985]",
+                          "focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
+                        )}
+                      >
+                        <span className="grid h-7 w-7 place-items-center rounded-md border border-[color:var(--border)] bg-[color:var(--surface-raised)] text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] transition group-hover:border-[color:var(--border-strong)] group-hover:text-[color:var(--text)]">
+                          <Icon className="h-3.5 w-3.5" />
+                        </span>
+                        <span className="max-w-full truncate text-[10px] font-bold leading-3 text-[color:var(--text-muted)] group-hover:text-[color:var(--text)]">
+                          {item.shortLabel ?? item.label}
+                        </span>
+                      </button>
+                    );
+                  })}
+                </div>
+              ) : null}
+            </div>
+          </div>
+          <span
+            aria-hidden="true"
+            className="pointer-events-none absolute -bottom-[6px] left-8 h-3 w-3 rotate-45 border-b border-r border-[color:var(--border-lux)] bg-[color:var(--surface)] shadow-[4px_4px_10px_rgb(15_37_48_/_5%)]"
+          />
+        </div>
+      ) : null}
+
+      <div ref={rootRef} className="relative shrink-0">
+        <button
+          type="button"
+          ref={buttonRef}
+          className={cn(chatComposerIconButton, open && "bg-[color:var(--surface-subtle)] text-[color:var(--text)]")}
+          aria-label={buttonLabel}
+          aria-controls={open ? "daily-actions-sheet" : undefined}
+          aria-expanded={open}
+          aria-haspopup="menu"
+          title={buttonLabel}
+          onKeyDown={handleTriggerKeyDown}
+          onClick={() => {
+            if (!open) onBeforeOpen?.();
+            onOpenChange(!open);
+          }}
+        >
+          <Plus className="h-5 w-5" />
+        </button>
+      </div>
+    </>
+  );
+}
diff --git a/src/components/settings-search-mockups/settings-search-mockup-page.tsx b/src/components/settings-search-mockups/settings-search-mockup-page.tsx
index de43e8bcf9..8e291c8278 100644
--- a/src/components/settings-search-mockups/settings-search-mockup-page.tsx
+++ b/src/components/settings-search-mockups/settings-search-mockup-page.tsx
@@ -1,20 +1,23 @@
 import {
+  BatteryFull,
   Bell,
   ChevronDown,
   ChevronRight,
   CircleUserRound,
-  FileText,
   Globe2,
+  HelpCircle,
   Keyboard,
   LockKeyhole,
   MessageSquare,
   Palette,
+  PanelTop,
   Settings,
-  ShieldCheck,
+  Signal,
   SlidersHorizontal,
   Sparkles,
   Stethoscope,
   UserRound,
+  Wifi,
   X,
   type LucideIcon,
 } from "lucide-react";
@@ -22,7 +25,7 @@ import type { ReactNode } from "react";
 
 import { appBackdrop, cn } from "@/components/ui-primitives";
 
-export type SettingsSearchMockupVariant = "general" | "clinical" | "privacy";
+export type SettingsSearchMockupVariant = "general" | "clinical" | "premium";
 
 type SettingsRow = {
   label: string;
@@ -42,6 +45,8 @@ type Concept = {
   title: string;
   subtitle: string;
   activeNav: string;
+  modalTitle?: string;
+  tone: "balanced" | "compact" | "premium";
   summary: SettingsRow[];
   sections: SettingsSection[];
   phoneSections: SettingsSection[];
@@ -50,25 +55,27 @@ type Concept = {
 const navItems: Array<{ label: string; icon: LucideIcon }> = [
   { label: "General", icon: Settings },
   { label: "Clinical defaults", icon: Stethoscope },
-  { label: "Personalization", icon: Sparkles },
+  { label: "Personalisation", icon: Sparkles },
   { label: "Notifications", icon: Bell },
-  { label: "Privacy", icon: ShieldCheck },
   { label: "Security", icon: LockKeyhole },
   { label: "Account", icon: CircleUserRound },
   { label: "Keyboard", icon: Keyboard },
+  { label: "Help & About", icon: HelpCircle },
 ];
 
 const concepts: Record<SettingsSearchMockupVariant, Concept> = {
   general: {
     eyebrow: "Concept 01",
-    title: "Account hub",
+    title: "Refined account & app hub",
     subtitle:
-      "The refined default direction: profile, app behaviour, and clinical preferences in one calm settings surface.",
+      "A softer ChatGPT-style settings surface with balanced spacing, quiet cards, and one precise teal emphasis.",
     activeNav: "Account",
+    modalTitle: "Account & app",
+    tone: "balanced",
     summary: [
-      { label: "Profile", value: "Clinical", icon: UserRound },
-      { label: "Default mode", value: "Ask", icon: MessageSquare },
-      { label: "Clinical setup", value: "WA", icon: Stethoscope },
+      { label: "Profile", value: "Dr Simpson", icon: UserRound },
+      { label: "Clinical setup", value: "WA, adults", icon: Stethoscope },
+      { label: "Default view", value: "Ask", icon: PanelTop },
     ],
     sections: [
       {
@@ -79,18 +86,18 @@ const concepts: Record<SettingsSearchMockupVariant, Concept> = {
         ],
       },
       {
-        title: "App",
+        title: "Clinical defaults",
         rows: [
-          { label: "Appearance", value: "System", icon: Palette },
-          { label: "Interface density", value: "Comfortable", icon: Settings },
-          { label: "Default landing view", value: "Ask", icon: MessageSquare },
+          { label: "Jurisdiction", value: "Western Australia", icon: Globe2 },
+          { label: "Default population", value: "Adults", icon: CircleUserRound },
+          { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
         ],
       },
       {
-        title: "Clinical KB",
+        title: "App preferences",
         rows: [
-          { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
-          { label: "Citation display", value: "Inline", icon: FileText },
+          { label: "Appearance", value: "System", icon: Palette },
+          { label: "Interface density", value: "Comfortable", icon: Settings },
         ],
       },
     ],
@@ -103,53 +110,57 @@ const concepts: Record<SettingsSearchMockupVariant, Concept> = {
         ],
       },
       {
-        title: "App",
+        title: "Clinical defaults",
         rows: [
-          { label: "Appearance", value: "System", icon: Palette },
-          { label: "Interface density", value: "Comfort", icon: Settings },
-          { label: "Default mode", value: "Ask", icon: MessageSquare },
+          { label: "Jurisdiction", value: "WA", icon: Globe2 },
+          { label: "Population", value: "Adults", icon: CircleUserRound },
+          { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
         ],
       },
       {
-        title: "Clinical KB",
+        title: "App preferences",
         rows: [
-          { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
-          { label: "Citation display", value: "Inline", icon: FileText },
+          { label: "Landing view", value: "Ask", icon: PanelTop },
+          { label: "Density", value: "Comfort", icon: Settings },
         ],
       },
     ],
   },
   clinical: {
     eyebrow: "Concept 02",
-    title: "Clinical-ready account hub",
+    title: "Precision account & app hub",
     subtitle:
-      "A stronger account hub for clinicians who want role, region, evidence, and app defaults visible together.",
+      "A tighter premium settings hub with stronger hierarchy, compact rows, and clinical defaults kept easy to scan.",
     activeNav: "Account",
+    modalTitle: "Account & app",
+    tone: "compact",
     summary: [
-      { label: "Role", value: "Psychiatry", icon: Stethoscope },
-      { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
-      { label: "Evidence", value: "Current first", icon: FileText },
+      { label: "Profile", value: "Dr Simpson", icon: UserRound },
+      { label: "Clinical setup", value: "WA psychiatry", icon: Stethoscope },
+      { label: "Default view", value: "Ask", icon: PanelTop },
     ],
     sections: [
       {
         title: "Account",
         rows: [
           { label: "Profile", value: "Dr Simpson", icon: UserRound },
+          { label: "Email", value: "Private", icon: MessageSquare },
           { label: "Clinical role", value: "Consultant psychiatrist", icon: Stethoscope },
-          { label: "Jurisdiction", value: "Western Australia", icon: Globe2 },
         ],
       },
       {
         title: "Clinical defaults",
         rows: [
+          { label: "Jurisdiction", value: "Western Australia", icon: Globe2 },
+          { label: "Default population", value: "Adults", icon: CircleUserRound },
           { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
-          { label: "Citation detail", value: "Inline and expandable", icon: FileText },
-          { label: "Source preference", value: "Current guidance first" },
-          {
-            label: "Safety and monitoring prompts",
-            description: "Surface contraindication, baseline test, and follow-up monitoring prompts.",
-            enabled: true,
-          },
+        ],
+      },
+      {
+        title: "App preferences",
+        rows: [
+          { label: "Appearance", value: "System", icon: Palette },
+          { label: "Interface density", value: "Compact", icon: Settings },
         ],
       },
     ],
@@ -159,33 +170,37 @@ const concepts: Record<SettingsSearchMockupVariant, Concept> = {
         rows: [
           { label: "Profile", value: "Dr Simpson", icon: UserRound },
           { label: "Clinical role", value: "Psychiatry", icon: Stethoscope },
-          { label: "Jurisdiction", value: "WA", icon: Globe2 },
         ],
       },
       {
-        title: "Clinical KB",
+        title: "Clinical defaults",
         rows: [
+          { label: "Jurisdiction", value: "WA", icon: Globe2 },
+          { label: "Population", value: "Adults", icon: CircleUserRound },
           { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
-          { label: "Evidence", value: "Current first", icon: FileText },
-          { label: "Safety prompts", value: "On", icon: ShieldCheck },
         ],
       },
       {
         title: "App",
-        rows: [{ label: "Default mode", value: "Ask", icon: MessageSquare }],
+        rows: [
+          { label: "Landing view", value: "Ask", icon: PanelTop },
+          { label: "Density", value: "Compact", icon: Settings },
+        ],
       },
     ],
   },
-  privacy: {
+  premium: {
     eyebrow: "Concept 03",
-    title: "Private account hub",
+    title: "Profile-led account hub",
     subtitle:
-      "A privacy-led account hub with PHI-safe defaults, app lock, hidden previews, and clinical personalisation.",
+      "A more personal settings direction with a stronger profile moment, elegant grouping, and restrained clinical context.",
     activeNav: "Account",
+    modalTitle: "Account & app",
+    tone: "premium",
     summary: [
-      { label: "Privacy", value: "No PHI", icon: ShieldCheck },
-      { label: "App lock", value: "On", icon: LockKeyhole },
-      { label: "Previews", value: "Hidden", icon: Bell },
+      { label: "Profile", value: "Dr Simpson", icon: UserRound },
+      { label: "Clinical setup", value: "WA, adults", icon: Stethoscope },
+      { label: "Favourites", value: "Protocols", icon: Sparkles },
     ],
     sections: [
       {
@@ -193,40 +208,21 @@ const concepts: Record<SettingsSearchMockupVariant, Concept> = {
         rows: [
           { label: "Profile", value: "Dr Simpson", icon: UserRound },
           { label: "Clinical role", value: "Consultant psychiatrist", icon: Stethoscope },
-          { label: "Jurisdiction", value: "Western Australia", icon: Globe2 },
         ],
       },
       {
-        title: "Privacy",
+        title: "Clinical defaults",
         rows: [
-          {
-            label: "No PHI reminders",
-            description: "Warn before storing patient identifiers in saved prompts or notes.",
-            enabled: true,
-            icon: ShieldCheck,
-          },
-          {
-            label: "Topic-only history",
-            description: "Show recent work by topic and guideline, not patient details.",
-            enabled: true,
-          },
-          {
-            label: "Citation privacy",
-            description: "Keep source trails visible without recording patient-identifying details.",
-            enabled: true,
-          },
-          {
-            label: "Hide notification previews",
-            description: "Keep clinical content hidden on the lock screen and notification tray.",
-            enabled: true,
-          },
+          { label: "Jurisdiction", value: "Western Australia", icon: Globe2 },
+          { label: "Default population", value: "Adults", icon: CircleUserRound },
+          { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
         ],
       },
       {
-        title: "Security",
+        title: "App experience",
         rows: [
-          { label: "Require app lock", value: "After 5 minutes", icon: LockKeyhole },
-          { label: "Active sessions", value: "This device", icon: LockKeyhole },
+          { label: "Home modules", value: "Recent, protocols", icon: PanelTop },
+          { label: "Favourite areas", value: "Mood, psychosis", icon: Sparkles },
         ],
       },
     ],
@@ -239,18 +235,18 @@ const concepts: Record<SettingsSearchMockupVariant, Concept> = {
         ],
       },
       {
-        title: "Privacy",
+        title: "Clinical defaults",
         rows: [
-          { label: "No PHI reminders", value: "On", icon: ShieldCheck },
-          { label: "Topic-only history", value: "On", icon: MessageSquare },
-          { label: "Previews", value: "Hidden", icon: Bell },
+          { label: "Jurisdiction", value: "WA", icon: Globe2 },
+          { label: "Population", value: "Adults", icon: CircleUserRound },
+          { label: "Answer style", value: "Conservative", icon: SlidersHorizontal },
         ],
       },
       {
-        title: "Security",
+        title: "App experience",
         rows: [
-          { label: "App lock", value: "5 min", icon: LockKeyhole },
-          { label: "Security", value: "Protected", icon: LockKeyhole },
+          { label: "Home modules", value: "Recent", icon: PanelTop },
+          { label: "Favourites", value: "Protocols", icon: Sparkles },
         ],
       },
     ],
@@ -280,13 +276,13 @@ function IconFrame({ icon: Icon, active = false }: { icon: LucideIcon; active?:
   return (
     <span
       className={cn(
-        "grid h-8 w-8 shrink-0 place-items-center rounded-lg border",
+        "grid h-8 w-8 shrink-0 place-items-center rounded-lg border transition shadow-[var(--shadow-inset)]",
         active
-          ? "border-[color:var(--app-shell)] bg-[color:var(--app-shell)] text-white"
-          : "border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text-muted)]",
+          ? "border-[color:var(--clinical-chat-teal)]/30 bg-[color:var(--app-shell)] text-white shadow-[0_8px_20px_rgba(0,108,103,0.18)]"
+          : "border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] text-[color:var(--text-muted)]",
       )}
     >
-      <Icon className="h-4 w-4" />
+      <Icon className="h-[17px] w-[17px]" strokeWidth={1.75} />
     </span>
   );
 }
@@ -297,9 +293,9 @@ function DesktopNav({ active }: { active: string }) {
       <button
         type="button"
         aria-label="Close settings"
-        className="mb-3 grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-heading)] transition hover:bg-[color:var(--surface-subtle)]"
+        className="mb-4 grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-heading)] transition hover:bg-[color:var(--surface-subtle)]"
       >
-        <X className="h-5 w-5" />
+        <X className="h-5 w-5" strokeWidth={1.8} />
       </button>
       {navItems.map(({ label, icon: Icon }) => {
         const selected = label === active;
@@ -309,13 +305,16 @@ function DesktopNav({ active }: { active: string }) {
             type="button"
             aria-current={selected ? "page" : undefined}
             className={cn(
-              "grid min-h-10 w-full grid-cols-[auto_minmax(0,1fr)] items-center gap-3 rounded-lg px-3 text-left text-sm font-medium transition",
+              "relative grid min-h-10 w-full grid-cols-[auto_minmax(0,1fr)] items-center gap-3 rounded-lg border border-transparent px-3 text-left text-sm font-medium transition",
               selected
-                ? "bg-[color:var(--surface-subtle)] text-[color:var(--text-heading)]"
-                : "text-[color:var(--text-heading)] hover:bg-[color:var(--surface-subtle)]",
+                ? "border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] text-[color:var(--text-heading)] shadow-[var(--shadow-inset)] before:absolute before:bottom-2 before:left-0 before:top-2 before:w-0.5 before:rounded-full before:bg-[color:var(--clinical-chat-teal)]"
+                : "text-[color:var(--text-muted)] hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text-heading)]",
             )}
           >
-            <Icon className="h-4 w-4" />
+            <Icon
+              className={cn("h-4 w-4", selected && "text-[color:var(--clinical-chat-teal)]")}
+              strokeWidth={1.8}
+            />
             <span className="truncate">{label}</span>
           </button>
         );
@@ -324,15 +323,24 @@ function DesktopNav({ active }: { active: string }) {
   );
 }
 
-function SummaryTile({ row }: { row: SettingsRow }) {
+function SummaryTile({ row, index, tone }: { row: SettingsRow; index: number; tone: Concept["tone"] }) {
   const Icon = row.icon ?? Settings;
+  const accent =
+    (tone === "balanced" && index === 1) || (tone === "compact" && index === 1) || (tone === "premium" && index === 0);
 
   return (
     <button
       type="button"
-      className="grid min-h-[76px] grid-cols-[auto_minmax(0,1fr)] items-center gap-3 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 text-left shadow-[var(--shadow-tight)]"
+      className={cn(
+        "relative grid min-h-[76px] grid-cols-[auto_minmax(0,1fr)] items-center gap-3 overflow-hidden rounded-lg border px-3 text-left transition",
+        tone === "compact" ? "min-h-[70px]" : "",
+        tone === "premium" ? "min-h-[82px]" : "shadow-[var(--shadow-tight)]",
+        accent
+          ? "border-[color:var(--clinical-chat-teal)]/24 bg-[color:var(--clinical-chat-teal-soft)]/42 shadow-[0_12px_26px_rgba(0,108,103,0.09)] before:absolute before:bottom-3 before:left-0 before:top-3 before:w-0.5 before:rounded-full before:bg-[color:var(--clinical-chat-teal)]"
+          : "border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-inset)] hover:bg-[color:var(--surface-raised)]",
+      )}
     >
-      <IconFrame icon={Icon} />
+      <IconFrame icon={Icon} active={accent} />
       <span className="min-w-0">
         <span className="block truncate text-xs font-semibold text-[color:var(--text-muted)]">{row.label}</span>
         <span className="mt-1 block truncate text-sm font-semibold text-[color:var(--text-heading)]">{row.value}</span>
@@ -343,19 +351,32 @@ function SummaryTile({ row }: { row: SettingsRow }) {
 
 function StatusChip({ children }: { children: ReactNode }) {
   return (
-    <span className="inline-flex min-h-6 items-center rounded-md border border-[color:var(--border)] bg-[color:var(--surface-inset)] px-2 text-[11px] font-semibold text-[color:var(--text-muted)]">
+    <span className="inline-flex min-h-6 items-center rounded-md border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] px-2 text-[11px] font-semibold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)]">
       {children}
     </span>
   );
 }
 
-function DesktopProfileStrip() {
+function DesktopProfileStrip({ tone }: { tone: Concept["tone"] }) {
   return (
     <button
       type="button"
-      className="mt-4 grid min-h-[74px] w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-4 text-left shadow-[var(--shadow-tight)]"
+      className={cn(
+        "mt-4 grid w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 rounded-lg border px-4 text-left",
+        tone === "compact" ? "min-h-[76px]" : tone === "premium" ? "min-h-[88px]" : "min-h-[78px]",
+        tone === "compact"
+          ? "border-[color:var(--clinical-chat-teal)]/16 bg-[color:var(--surface-inset)] shadow-[var(--shadow-tight)]"
+          : tone === "premium"
+            ? "border-[color:var(--clinical-chat-teal)]/18 bg-[color:var(--surface-lux)] shadow-[0_12px_30px_rgba(15,31,38,0.08)]"
+            : "border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-lux)] ring-1 ring-white/45",
+      )}
     >
-      <span className="relative grid h-12 w-12 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-sm font-bold text-[color:var(--clinical-chat-teal)]">
+      <span
+        className={cn(
+          "relative grid shrink-0 place-items-center rounded-full border border-[color:var(--clinical-chat-teal)]/10 bg-[color:var(--clinical-chat-teal-soft)] font-bold text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]",
+          tone === "premium" ? "h-14 w-14 text-base" : "h-12 w-12 text-sm",
+        )}
+      >
         DS
         <span className="absolute bottom-0 right-0 h-3.5 w-3.5 rounded-full border-2 border-[color:var(--surface)] bg-emerald-600" />
       </span>
@@ -373,12 +394,15 @@ function DesktopProfileStrip() {
   );
 }
 
-function SettingRow({ row }: { row: SettingsRow }) {
+function SettingRow({ row, tone }: { row: SettingsRow; tone: Concept["tone"] }) {
   const Icon = row.icon;
   return (
     <button
       type="button"
-      className="grid min-h-14 w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-b border-[color:var(--border)] py-2.5 text-left last:border-b-0"
+      className={cn(
+        "grid w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-b border-[color:var(--border)] text-left last:border-b-0",
+        tone === "compact" ? "min-h-[46px] py-1.5" : "min-h-[48px] py-1.5",
+      )}
     >
       {Icon ? <IconFrame icon={Icon} /> : <span className="h-8 w-8" />}
       <span className="min-w-0">
@@ -394,7 +418,7 @@ function SettingRow({ row }: { row: SettingsRow }) {
       ) : (
         <span className="inline-flex items-center gap-2 text-sm font-medium text-[color:var(--text-heading)]">
           {row.value}
-          <ChevronDown className="h-4 w-4 text-[color:var(--text-muted)]" />
+          <ChevronDown className="h-4 w-4 text-[color:var(--text-muted)]" strokeWidth={1.8} />
         </span>
       )}
     </button>
@@ -403,9 +427,14 @@ function SettingRow({ row }: { row: SettingsRow }) {
 
 function DesktopModal({ concept }: { concept: Concept }) {
   return (
-    <section className="h-[800px] w-[880px] overflow-hidden rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface)] shadow-[var(--shadow-elevated)]">
+    <section
+      className={cn(
+        "h-[800px] w-[880px] overflow-hidden rounded-lg border bg-[color:var(--surface)] shadow-[0_18px_52px_rgba(15,31,38,0.11)] ring-1 ring-white/45",
+        concept.tone === "premium" ? "border-[color:var(--clinical-chat-teal)]/15" : "border-[color:var(--border-lux)]",
+      )}
+    >
       <div className="grid h-full grid-cols-[248px_minmax(0,1fr)]">
-        <aside className="border-r border-[color:var(--border)] bg-[color:var(--surface-raised)]">
+        <aside className="border-r border-[color:var(--border)] bg-[color:var(--surface-lux)]">
           <DesktopNav active={concept.activeNav} />
         </aside>
         <div className="min-w-0 overflow-hidden px-6 py-5">
@@ -414,30 +443,47 @@ function DesktopModal({ concept }: { concept: Concept }) {
               <p className="text-xs font-bold uppercase tracking-[0.08em] text-[color:var(--clinical-chat-teal)]">
                 {concept.eyebrow}
               </p>
-              <h2 className="mt-1 text-2xl font-semibold text-[color:var(--text-heading)]">{concept.activeNav}</h2>
+              <h2 className="mt-1 text-2xl font-semibold text-[color:var(--text-heading)]">
+                {concept.modalTitle ?? concept.activeNav}
+              </h2>
             </div>
-            <span className="rounded-full border border-[color:var(--border)] bg-[color:var(--surface-inset)] px-3 py-1 text-xs font-semibold text-[color:var(--text-muted)]">
-              Private workspace
+            <span className="rounded-full border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] px-3 py-1 text-xs font-semibold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)]">
+              Clinician account
             </span>
           </div>
 
-          <DesktopProfileStrip />
+          <DesktopProfileStrip tone={concept.tone} />
 
-          <div className="mt-4 grid gap-3 sm:grid-cols-3">
-            {concept.summary.map((row) => (
-              <SummaryTile key={row.label} row={row} />
+          <div className={cn("mt-4 grid gap-3 sm:grid-cols-3", concept.tone === "compact" && "gap-2.5")}>
+            {concept.summary.map((row, index) => (
+              <SummaryTile key={row.label} row={row} index={index} tone={concept.tone} />
             ))}
           </div>
 
-          <div className="mt-4 h-[524px] overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-5 shadow-[var(--shadow-tight)]">
+          <div
+            className={cn(
+              "mt-4 h-[524px] overflow-hidden rounded-lg border bg-[color:var(--surface-lux)] px-5 shadow-[var(--shadow-lux)] ring-1 ring-white/35",
+              concept.tone === "premium"
+                ? "border-[color:var(--clinical-chat-teal)]/15"
+                : "border-[color:var(--border-lux)]",
+            )}
+          >
             {concept.sections.map((section, index) => (
-              <div key={section.title} className={cn(index > 0 && "border-t border-[color:var(--border)] pt-4")}>
-                <h3 className={cn("text-sm font-semibold text-[color:var(--text-heading)]", index === 0 ? "pt-4" : "")}>
+              <div
+                key={section.title}
+                className={cn(index > 0 && "border-t border-[color:var(--border)]", concept.tone === "compact" ? "pt-3" : "pt-4")}
+              >
+                <h3
+                  className={cn(
+                    "text-sm font-semibold text-[color:var(--text-heading)]",
+                    index === 0 ? (concept.tone === "compact" ? "pt-3" : "pt-4") : "",
+                  )}
+                >
                   {section.title}
                 </h3>
-                <div className="mt-2">
+                <div className={cn(concept.tone === "compact" ? "mt-1.5" : "mt-2")}>
                   {section.rows.map((row) => (
-                    <SettingRow key={row.label} row={row} />
+                    <SettingRow key={row.label} row={row} tone={concept.tone} />
                   ))}
                 </div>
               </div>
@@ -453,9 +499,10 @@ function PhoneStatusBar() {
   return (
     <div className="flex h-9 items-center justify-between px-5 text-[11px] font-bold text-[color:var(--text-heading)]">
       <span>9:41</span>
-      <span className="flex items-center gap-1">
-        <span className="h-2.5 w-4 rounded-[3px] border border-[color:var(--text-heading)]" />
-        <span className="h-2 w-2 rounded-full bg-[color:var(--text-heading)]" />
+      <span className="flex items-center gap-1.5 text-[color:var(--text-heading)]">
+        <Signal className="h-3.5 w-3.5" strokeWidth={2} />
+        <Wifi className="h-3.5 w-3.5" strokeWidth={2} />
+        <BatteryFull className="h-4 w-4" strokeWidth={2} />
       </span>
     </div>
   );
@@ -483,13 +530,18 @@ function PhoneBackdrop() {
   );
 }
 
-function PhoneProfileRow() {
+function PhoneProfileRow({ tone }: { tone: Concept["tone"] }) {
   return (
     <button
       type="button"
-      className="grid min-h-[72px] w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 text-left shadow-[var(--shadow-tight)]"
+      className={cn(
+        "grid w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 rounded-xl border px-3 text-left",
+        tone === "premium"
+          ? "min-h-[82px] border-[color:var(--clinical-chat-teal)]/18 bg-[color:var(--surface-lux)] shadow-[0_10px_24px_rgba(15,31,38,0.08)]"
+          : "min-h-[74px] border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-lux)] ring-1 ring-white/40",
+      )}
     >
-      <span className="relative grid h-11 w-11 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-sm font-bold text-[color:var(--clinical-chat-teal)]">
+      <span className="relative grid h-11 w-11 shrink-0 place-items-center rounded-full border border-[color:var(--clinical-chat-teal)]/10 bg-[color:var(--clinical-chat-teal-soft)] text-sm font-bold text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]">
         DS
         <span className="absolute bottom-0 right-0 h-3 w-3 rounded-full border-2 border-[color:var(--surface)] bg-emerald-600" />
       </span>
@@ -499,7 +551,7 @@ function PhoneProfileRow() {
           Consultant psychiatrist, WA
         </span>
       </span>
-      <ChevronRight className="h-4 w-4 text-[color:var(--text-muted)]" />
+      <ChevronRight className="h-4 w-4 text-[color:var(--text-muted)]" strokeWidth={1.8} />
     </button>
   );
 }
@@ -511,10 +563,10 @@ function PhoneClinicalStatus() {
         <span
           key={item}
           className={cn(
-            "inline-flex min-h-8 items-center justify-center rounded-lg border px-2 text-[11px] font-semibold",
+            "inline-flex min-h-8 items-center justify-center rounded-lg border px-2 text-[11px] font-semibold shadow-[var(--shadow-inset)]",
             index === 0
               ? "border-[color:var(--clinical-chat-teal)]/25 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]"
-              : "border-[color:var(--border)] bg-[color:var(--surface-inset)] text-[color:var(--text-muted)]",
+              : "border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] text-[color:var(--text-muted)]",
           )}
         >
           {item}
@@ -527,25 +579,28 @@ function PhoneClinicalStatus() {
 function PhoneSettingsSection({ section }: { section: SettingsSection }) {
   return (
     <section>
-      <h3 className="mb-1.5 px-1 text-[11px] font-semibold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">
+      <h3 className="mb-1.5 px-1 text-[11px] font-semibold tracking-[0.02em] text-[color:var(--text-soft)]">
         {section.title}
       </h3>
-      <div className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)]">
+      <div className="overflow-hidden rounded-xl border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-lux)]">
         {section.rows.map((row, index) => {
           const Icon = row.icon ?? Settings;
           return (
             <button
               key={row.label}
               type="button"
-              className="grid min-h-[52px] w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-b border-[color:var(--border)] px-3 text-left last:border-b-0"
+              className="grid min-h-[51px] w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-b border-[color:var(--border)] px-3 text-left last:border-b-0"
             >
-              <IconFrame icon={Icon} active={index === 0 && section.title === "Clinical KB"} />
+              <IconFrame
+                icon={Icon}
+                active={index === 0 && section.title === "Clinical defaults"}
+              />
               <span className="min-w-0">
                 <span className="block truncate text-sm font-medium text-[color:var(--text-heading)]">{row.label}</span>
               </span>
               <span className="inline-flex min-w-0 items-center gap-2 text-right text-xs font-medium text-[color:var(--text-muted)]">
                 <span className="max-w-[86px] truncate">{row.value}</span>
-                <ChevronRight className="h-4 w-4 shrink-0" />
+                <ChevronRight className="h-4 w-4 shrink-0" strokeWidth={1.8} />
               </span>
             </button>
           );
@@ -557,26 +612,26 @@ function PhoneSettingsSection({ section }: { section: SettingsSection }) {
 
 function PhoneSheet({ concept }: { concept: Concept }) {
   return (
-    <section className="h-[760px] w-[350px] rounded-[42px] bg-[color:var(--app-shell)] p-2 shadow-[var(--shadow-elevated)]">
+    <section className="h-[760px] w-[350px] rounded-[42px] bg-[color:var(--app-shell)] p-2 shadow-[0_22px_55px_rgba(15,31,38,0.18)]">
       <div className="relative h-full overflow-hidden rounded-[34px] bg-[color:var(--surface-raised)]">
         <PhoneStatusBar />
         <PhoneBackdrop />
 
-        <div className="absolute inset-x-3 top-11 rounded-[22px] border border-[color:var(--border-lux)] bg-[color:var(--surface)] px-4 pb-4 pt-3 shadow-[var(--shadow-elevated)]">
+        <div className="absolute inset-x-3 top-11 rounded-[24px] border border-[color:var(--border-lux)] bg-[color:var(--surface)] px-4 pb-4 pt-3 shadow-[0_18px_42px_rgba(15,31,38,0.14)] ring-1 ring-white/45">
           <div className="grid grid-cols-[1fr_auto_1fr] items-center">
             <span />
             <p className="text-base font-semibold leading-6 text-[color:var(--text-heading)]">Settings</p>
             <button
               type="button"
               aria-label="Close settings"
-              className="ml-auto grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-heading)] hover:bg-[color:var(--surface-subtle)]"
+                className="ml-auto grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-heading)] hover:bg-[color:var(--surface-subtle)]"
             >
-              <X className="h-5 w-5" />
+              <X className="h-5 w-5" strokeWidth={1.8} />
             </button>
           </div>
 
           <div className="mt-3 space-y-4">
-            <PhoneProfileRow />
+            <PhoneProfileRow tone={concept.tone} />
             <PhoneClinicalStatus />
             {concept.phoneSections.map((section) => (
               <PhoneSettingsSection key={section.title} section={section} />
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index 823ce6e90b..cab7791b0e 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -27,10 +27,14 @@ export function Sheet({
   titleAccessory,
   descriptionContent,
   headerActions,
+  headerClassName,
+  titleClassName,
+  closeButtonClassName,
   contentClassName,
   contentStyle,
   bodyClassName,
   placement = "default",
+  mobilePlacement = "bottom",
   portal = false,
 }: {
   open: boolean;
@@ -47,10 +51,14 @@ export function Sheet({
   titleAccessory?: ReactNode;
   descriptionContent?: ReactNode;
   headerActions?: ReactNode;
+  headerClassName?: string;
+  titleClassName?: string;
+  closeButtonClassName?: string;
   contentClassName?: string;
   contentStyle?: CSSProperties;
   bodyClassName?: string;
   placement?: "default" | "left";
+  mobilePlacement?: "bottom" | "top";
   portal?: boolean;
 }) {
   const panelRef = useRef<HTMLDivElement>(null);
@@ -111,13 +119,18 @@ export function Sheet({
   if (!open) return null;
 
   const resolvedLabelledBy = labelledBy ?? (title ? titleId : undefined);
+  const defaultSheetIsTopAligned = placement !== "left" && mobilePlacement === "top";
 
   const sheet = (
     <div
       className={cn(
         "fixed inset-0 z-[100] flex bg-black/45 backdrop-blur-[2px] motion-reduce:animate-none motion-reduce:transition-none",
         placement !== "left" && "motion-safe:animate-overlay-in",
-        placement === "left" ? "items-stretch justify-start" : "items-end justify-center sm:items-center sm:p-6",
+        placement === "left"
+          ? "items-stretch justify-start"
+          : defaultSheetIsTopAligned
+            ? "items-start justify-center px-3 pb-3 pt-[max(0.75rem,env(safe-area-inset-top))] sm:items-center sm:p-6"
+            : "items-end justify-center sm:items-center sm:p-6",
       )}
       onPointerDown={(event) => {
         if (event.target === event.currentTarget) onClose();
@@ -136,7 +149,12 @@ export function Sheet({
           "transition duration-200 motion-reduce:transition-none sm:duration-150",
           placement === "left"
             ? "h-full max-h-dvh max-w-[min(22rem,calc(100vw-1rem))] rounded-r-2xl border-y-0 border-l-0 sm:max-h-dvh sm:max-w-[22rem] sm:rounded-l-none sm:rounded-r-2xl sm:pb-0"
-            : "max-h-[88dvh] rounded-t-2xl motion-safe:animate-sheet-up sm:max-w-lg sm:rounded-2xl sm:pb-0 sm:motion-safe:animate-pop-in",
+            : cn(
+                "sm:max-w-lg sm:rounded-2xl sm:pb-0 sm:motion-safe:animate-pop-in",
+                defaultSheetIsTopAligned
+                  ? "max-h-[calc(100dvh-1.5rem)] rounded-2xl motion-safe:animate-pop-in"
+                  : "max-h-[88dvh] rounded-t-2xl motion-safe:animate-sheet-up",
+              ),
           "motion-reduce:animate-none",
           contentClassName,
         )}
@@ -145,16 +163,25 @@ export function Sheet({
           className={cn(
             "mx-auto mt-2 h-1 w-9 shrink-0 rounded-full bg-[color:var(--border-strong)] sm:hidden",
             placement === "left" && "hidden",
+            defaultSheetIsTopAligned && "hidden",
           )}
           aria-hidden
         />
         {title ? (
-          <div className="flex items-center justify-between gap-3 border-b border-[color:var(--border)] p-4 sm:p-5">
+          <div
+            className={cn(
+              "flex items-center justify-between gap-3 border-b border-[color:var(--border)] p-4 sm:p-5",
+              headerClassName,
+            )}
+          >
             <div className="flex min-w-0 flex-1 items-center gap-3">
               {headerLeading ? <div className="shrink-0">{headerLeading}</div> : null}
               <div className="min-w-0">
                 <div className="flex min-w-0 items-center gap-2">
-                  <h2 id={titleId} className="truncate text-lg font-semibold text-[color:var(--text-heading)]">
+                  <h2
+                    id={titleId}
+                    className={cn("truncate text-lg font-semibold text-[color:var(--text-heading)]", titleClassName)}
+                  >
                     {title}
                   </h2>
                   {titleAccessory}
@@ -172,7 +199,13 @@ export function Sheet({
             </div>
             <div className="flex shrink-0 items-center gap-2">
               {headerActions}
-              <button ref={closeRef} type="button" onClick={onClose} aria-label={closeLabel} className={toolbarButton}>
+              <button
+                ref={closeRef}
+                type="button"
+                onClick={onClose}
+                aria-label={closeLabel}
+                className={closeButtonClassName ?? toolbarButton}
+              >
                 <X className="h-4 w-4" />
               </button>
             </div>
diff --git a/src/components/use-dismissable-layer.ts b/src/components/use-dismissable-layer.ts
new file mode 100644
index 0000000000..05285b4177
--- /dev/null
+++ b/src/components/use-dismissable-layer.ts
@@ -0,0 +1,51 @@
+"use client";
+
+import { useEffect, type RefObject } from "react";
+
+type DismissableLayerRef = RefObject<HTMLElement | null>;
+
+function eventHitsRef(event: Event, ref: DismissableLayerRef) {
+  const element = ref.current;
+  if (!element) return false;
+
+  const path = typeof event.composedPath === "function" ? event.composedPath() : null;
+  if (path?.includes(element)) return true;
+
+  const target = event.target;
+  return target instanceof Node && element.contains(target);
+}
+
+export function useDismissableLayer({
+  enabled,
+  refs,
+  onDismiss,
+  restoreFocusRef,
+}: {
+  enabled: boolean;
+  refs: DismissableLayerRef[];
+  onDismiss: (reason: "outside" | "escape") => void;
+  restoreFocusRef?: DismissableLayerRef;
+}) {
+  useEffect(() => {
+    if (!enabled) return undefined;
+
+    function handlePointerDown(event: PointerEvent) {
+      if (refs.some((ref) => eventHitsRef(event, ref))) return;
+      onDismiss("outside");
+    }
+
+    function handleKeyDown(event: KeyboardEvent) {
+      if (event.key !== "Escape") return;
+      event.preventDefault();
+      onDismiss("escape");
+      window.requestAnimationFrame(() => restoreFocusRef?.current?.focus({ preventScroll: true }));
+    }
+
+    document.addEventListener("pointerdown", handlePointerDown, true);
+    document.addEventListener("keydown", handleKeyDown);
+    return () => {
+      document.removeEventListener("pointerdown", handlePointerDown, true);
+      document.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [enabled, onDismiss, refs, restoreFocusRef]);
+}
diff --git a/src/lib/answer-ranking.ts b/src/lib/answer-ranking.ts
index e18db9bcf7..c3a0023a40 100644
--- a/src/lib/answer-ranking.ts
+++ b/src/lib/answer-ranking.ts
@@ -321,6 +321,16 @@ function applyBoldPatternOutsideExisting(text: string, pattern: RegExp, maxMatch
     .join("");
 }
 
+function capBoldSegments(text: string, originalText: string, maxSegments = 4) {
+  const existingBold = new Set(Array.from(originalText.matchAll(/\*\*([^*]+)\*\*/g), (match) => match[1]));
+  let kept = 0;
+  return text.replace(/\*\*([^*]+)\*\*/g, (match, content: string) => {
+    if (existingBold.has(content)) return match;
+    kept += 1;
+    return kept <= maxSegments ? match : content;
+  });
+}
+
 export function boldHighYieldClinicalText(text: string, query?: string) {
   if (!text.trim()) return text;
   if (query === undefined) return text;
@@ -332,7 +342,7 @@ export function boldHighYieldClinicalText(text: string, query?: string) {
   for (const pattern of fixedHighYieldPatterns) {
     output = applyBoldPatternOutsideExisting(output, pattern, 1);
   }
-  return output;
+  return capBoldSegments(output, text);
 }
 
 export function boldRagAnswerHighYieldText(answer: RagAnswer, query: string): RagAnswer {
diff --git a/src/lib/audit.ts b/src/lib/audit.ts
new file mode 100644
index 0000000000..4091bbbd70
--- /dev/null
+++ b/src/lib/audit.ts
@@ -0,0 +1,47 @@
+import { logger } from "@/lib/logger";
+
+// Append-only audit trail for sensitive operations. Rows are written via the service
+// role into public.audit_logs (RLS-enabled, service-role-only). Writes are best-effort:
+// failing to record an audit row must never break or roll back the operation it
+// describes, so failures are logged, not thrown.
+
+export type AuditAction =
+  | "document_upload"
+  | "document_delete"
+  | "document_rename"
+  | "document_label_change";
+
+export type AuditLogEntry = {
+  ownerId: string;
+  action: AuditAction;
+  resourceType?: string;
+  resourceId?: string | null;
+  metadata?: Record<string, unknown>;
+};
+
+// Minimal structural type so we do not couple to the full Supabase client type.
+type AuditInsertClient = {
+  from: (table: string) => {
+    insert: (values: Record<string, unknown>) => PromiseLike<{ error: { message: string } | null }>;
+  };
+};
+
+export async function writeAuditLog(supabase: AuditInsertClient, entry: AuditLogEntry): Promise<void> {
+  try {
+    const { error } = await supabase.from("audit_logs").insert({
+      owner_id: entry.ownerId,
+      action: entry.action,
+      resource_type: entry.resourceType ?? null,
+      resource_id: entry.resourceId ?? null,
+      metadata: entry.metadata ?? {},
+    });
+    if (error) {
+      logger.error("Audit log write failed", { action: entry.action, message: error.message });
+    }
+  } catch (error) {
+    logger.error("Audit log write threw", {
+      action: entry.action,
+      message: error instanceof Error ? error.message : String(error),
+    });
+  }
+}
diff --git a/src/lib/document-organization.ts b/src/lib/document-organization.ts
index 29c7f97723..ac8fc1b118 100644
--- a/src/lib/document-organization.ts
+++ b/src/lib/document-organization.ts
@@ -30,93 +30,98 @@ type SiteDefinition = {
 
 type SecondaryFacet = {
   label: string;
-  label_type: Extract<DocumentLabelType, "population" | "setting" | "service" | "topic" | "workflow">;
+  label_type: Extract<DocumentLabelType, "population" | "setting" | "service" | "topic" | "workflow" | "medication">;
 };
 
 const organizationProfileVersion = "document-organization-v1";
 
 const siteDefinitions: SiteDefinition[] = [
   // ── Individual hospitals ──────────────────────────────────────────────────
-  // RPBG = Royal Perth Bentley Group (RPH + Bentley Health Service) — 688 docs, most common tag
+  // Royal Perth Bentley Group — 688 docs
   {
     canonical: "Royal Perth Bentley Group",
     rawTags: ["rpbg"],
     kind: "hospital",
     evidence: [/\broyal perth bentley\b/i, /\brpbg\b/i, /\broyal perth hospital\b/i, /\brph\b/i],
   },
-  // AKG = Armadale Kalamunda Group — 197 docs
+  // Armadale Kalamunda Group — 197 docs
   {
     canonical: "Armadale Kalamunda Group",
     rawTags: ["akg"],
     kind: "hospital",
     evidence: [/\barmadale kalamunda\b/i, /\barmadale hospital\b/i, /\bakg\b/i],
   },
-  // FSH = Fiona Stanley Hospital (includes Fremantle Hospital, FSFHG) — 340 docs
+  // Fiona Stanley Hospital (incl. Fremantle Hospital / FSFHG group) — 340 docs
   {
     canonical: "Fiona Stanley Hospital",
     rawTags: ["fsh"],
     kind: "hospital",
     evidence: [/\bfiona stanley\b/i, /\bfsh\b/i, /\bfsfhg\b/i],
   },
-  // FH = Fremantle Hospital (legacy tag, 1 doc — now under FSH group)
+  // Fremantle Hospital (legacy tag — now part of FSH group)
   {
     canonical: "Fremantle Hospital",
     rawTags: ["fh", "freo"],
     kind: "hospital",
     evidence: [/\bfremantle hospital\b/i, /\bfremantle health\b/i],
   },
-  // PHC = Peel Health Campus — 156 docs
+  // Peel Health Campus — 156 docs
   {
     canonical: "Peel Health Campus",
     rawTags: ["phc"],
     kind: "hospital",
     evidence: [/\bpeel health campus\b/i, /\bpeel hospital\b/i, /\bphc\b/i],
   },
-  // BHS = Bentley Health Service (subsidiary of RPBG, 1 doc)
+  // Bentley Health Service (subsidiary of RPBG)
   {
     canonical: "Bentley Health Service",
     rawTags: ["bhs"],
     kind: "hospital",
     evidence: [/\bbentley health service\b/i, /\bbhs\b/i],
   },
-  // KEMH = King Edward Memorial Hospital — 26 docs
+  // King Edward Memorial Hospital — 26 docs
   {
     canonical: "King Edward Memorial Hospital",
     rawTags: ["kemh"],
     kind: "hospital",
     evidence: [/\bking edward memorial\b/i, /\bkemh\b/i],
   },
-  // Other major metro hospitals (not yet in this dataset but worth including)
+  // Sir Charles Gairdner Hospital
   {
     canonical: "Sir Charles Gairdner Hospital",
     rawTags: ["scgh"],
     kind: "hospital",
     evidence: [/\bsir charles gairdner\b/i, /\bscgh\b/i],
   },
+  // Perth Children's Hospital
   {
     canonical: "Perth Children's Hospital",
     rawTags: ["pch"],
     kind: "hospital",
     evidence: [/\bperth children['']?s hospital\b/i, /\bpch\b/i],
   },
+  // Joondalup Health Campus
   {
     canonical: "Joondalup Health Campus",
     rawTags: ["jhc", "joondalup"],
     kind: "hospital",
     evidence: [/\bjoondalup health campus\b/i, /\bjhc\b/i],
   },
+  // Osborne Park Hospital
   {
     canonical: "Osborne Park Hospital",
     rawTags: ["oph", "osborne park"],
     kind: "hospital",
     evidence: [/\bosborne park hospital\b/i, /\boph\b/i],
   },
+  // Rockingham General Hospital
   {
     canonical: "Rockingham General Hospital",
     rawTags: ["rgh"],
     kind: "hospital",
     evidence: [/\brockingham general hospital\b/i, /\brgh\b/i],
   },
+  // Graylands / Neuropsychiatric Campus
   {
     canonical: "Graylands / Neuropsychiatric",
     rawTags: ["graylands", "npscu"],
@@ -124,47 +129,78 @@ const siteDefinitions: SiteDefinition[] = [
     evidence: [/\bgraylands\b/i, /\bneuropsychiatric\b/i, /\bnpscu\b/i],
   },
 
-  // ── Health services / networks ────────────────────────────────────────────
-  // EMHS = East Metropolitan Health Service — 45 docs at network level
+  // ── Health service networks ───────────────────────────────────────────────
+  // East Metropolitan Health Service — 65 docs at network level
   {
     canonical: "East Metropolitan Health Service",
     rawTags: ["emhs", "emhs policy"],
     kind: "health_service",
     evidence: [/\beast metropolitan health service\b/i, /\bemhs\b/i],
   },
-  // SMHS = South Metropolitan Health Service (parent of FSH, Fremantle, CAMHS, RKPG)
+  // South Metropolitan Health Service (parent of FSH, FH, CAMHS, RKPG)
   {
     canonical: "South Metropolitan Health Service",
     rawTags: ["smhs", "smhs policy"],
     kind: "health_service",
     evidence: [/\bsouth metropolitan health service\b/i, /\bsmhs\b/i],
   },
-  // NMHS = North Metropolitan Health Service — 262 docs
+  // North Metropolitan Health Service — 262 docs
   {
     canonical: "North Metropolitan Health Service",
     rawTags: ["nmhs", "nmhs policy"],
     kind: "health_service",
     evidence: [/\bnorth metropolitan health service\b/i, /\bnmhs\b/i],
   },
-  // RKPG = Rockingham Peel Group — 168 docs
+  // Rockingham Peel Group — 168 docs
   {
     canonical: "Rockingham Peel Group",
     rawTags: ["rkpg", "rockingham peel group"],
     kind: "health_service",
     evidence: [/\brockingham peel\b/i, /\brkpg\b/i],
   },
+  // Child and Adolescent Health Service
   {
     canonical: "Child and Adolescent Health Service",
     rawTags: ["cahs"],
     kind: "health_service",
     evidence: [/\bchild and adolescent health service\b/i, /\bcahs\b/i],
   },
+  // WA Country Health Service
   {
     canonical: "WA Country Health Service",
     rawTags: ["wachs"],
     kind: "health_service",
     evidence: [/\bwa country health service\b/i, /\bwachs\b/i],
   },
+  // Bunbury Hospital / Bunbury Health Campus
+  {
+    canonical: "Bunbury Hospital",
+    rawTags: ["bunbury", "bhc"],
+    kind: "hospital",
+    evidence: [/\bbunbury\b/i, /\bbhc\b/i],
+  },
+  // Geraldton Hospital / Geraldton Health Campus
+  {
+    canonical: "Geraldton Hospital",
+    rawTags: ["geraldton", "ghc"],
+    kind: "hospital",
+    evidence: [/\bgeraldton\b/i, /\bghc\b/i],
+  },
+  // Albany Hospital / Albany Health Campus
+  {
+    canonical: "Albany Hospital",
+    rawTags: ["albany", "ahc"],
+    kind: "hospital",
+    evidence: [/\balbany\b/i, /\bahc\b/i],
+  },
+  // Kalgoorlie Hospital / Kalgoorlie Health Campus
+  {
+    canonical: "Kalgoorlie Hospital",
+    rawTags: ["kalgoorlie", "khc"],
+    kind: "hospital",
+    evidence: [/\bkalgoorlie\b/i, /\bkhc\b/i],
+  },
+  // WA Health / Department of Health
   {
     canonical: "WA Health",
     rawTags: ["wah", "wa health", "doh"],
@@ -173,27 +209,28 @@ const siteDefinitions: SiteDefinition[] = [
   },
 
   // ── Specialty programs / services ─────────────────────────────────────────
-  // CAMHS = Child and Adolescent Mental Health Service — 83 docs
+  // Child and Adolescent Mental Health Service — 83 docs
   {
     canonical: "Child and Adolescent Mental Health Service",
     rawTags: ["camhs"],
     kind: "program",
     evidence: [/\bchild and adolescent mental health\b/i, /\bcamhs\b/i],
   },
-  // MHHITH = Mental Health Hospital in the Home — 3 docs
+  // Mental Health Hospital in the Home — 3 docs
   {
     canonical: "Mental Health Hospital in the Home",
     rawTags: ["mhhith"],
     kind: "program",
     evidence: [/\bmental health hospital in the home\b/i, /\bmhhith\b/i],
   },
-  // PMHS = Peel Mental Health Service — 1 doc
+  // Peel Mental Health Service — 1 doc
   {
     canonical: "Peel Mental Health Service",
     rawTags: ["pmhs"],
     kind: "program",
     evidence: [/\bpeel mental health service\b/i, /\bpmhs\b/i],
   },
+  // Mental Health Commission
   {
     canonical: "Mental Health Commission",
     rawTags: ["mhc"],
@@ -203,8 +240,35 @@ const siteDefinitions: SiteDefinition[] = [
 ];
 
 const secondaryTagMap = new Map<string, SecondaryFacet>([
+  // Populations (Ages)
   ["adult", { label: "adult", label_type: "population" }],
-  ["child", { label: "child", label_type: "population" }],
+  ["adults", { label: "adult", label_type: "population" }],
+  ["child", { label: "paediatric", label_type: "population" }],
+  ["children", { label: "paediatric", label_type: "population" }],
+  ["paediatric", { label: "paediatric", label_type: "population" }],
+  ["pediatric", { label: "paediatric", label_type: "population" }],
+  ["neonatal", { label: "neonatal", label_type: "population" }],
+  ["neonate", { label: "neonatal", label_type: "population" }],
+  ["newborn", { label: "neonatal", label_type: "population" }],
+  ["youth", { label: "youth", label_type: "population" }],
+  ["adolescent", { label: "youth", label_type: "population" }],
+  ["teen", { label: "youth", label_type: "population" }],
+  ["geriatric", { label: "geriatric", label_type: "population" }],
+  ["older adult", { label: "geriatric", label_type: "population" }],
+  ["elderly", { label: "geriatric", label_type: "population" }],
+
+  // Clinical / Administrative Split
+  ["clinical", { label: "clinical", label_type: "workflow" }],
+  ["non-clinical", { label: "non-clinical", label_type: "workflow" }],
+  ["non clinical", { label: "non-clinical", label_type: "workflow" }],
+  ["admin", { label: "admin", label_type: "workflow" }],
+  ["clerical", { label: "admin", label_type: "workflow" }],
+  ["finance", { label: "finance", label_type: "workflow" }],
+  ["financial", { label: "finance", label_type: "workflow" }],
+  ["hr", { label: "hr", label_type: "workflow" }],
+  ["human resources", { label: "hr", label_type: "workflow" }],
+
+  // Topics / Services
   ["ect", { label: "electroconvulsive therapy", label_type: "topic" }],
   ["pats", { label: "patient assisted travel scheme", label_type: "workflow" }],
   ["ppm", { label: "permanent pacemaker", label_type: "topic" }],
@@ -420,22 +484,85 @@ function classifyDocumentType(input: OrganizationDocumentInput): DocumentOrganiz
 }
 
 function emptySecondaryFacets(): DocumentOrganizationProfile["secondary_facets"] {
-  return { population: [], setting: [], service: [], topic: [], workflow: [] };
+  return { population: [], setting: [], service: [], topic: [], workflow: [], medication: [] };
 }
 
-function secondaryFacets(rawTags: string[]) {
+function secondaryFacets(rawTags: string[], titleText: string, contentText: string) {
   const facets = emptySecondaryFacets();
   for (const rawTag of rawTags) {
     const facet = secondaryTagMap.get(normalizeText(rawTag));
     if (!facet) continue;
     facets[facet.label_type].push(facet.label);
   }
+
+  const fullText = `${titleText} ${contentText}`.toLowerCase();
+
+  // ── Population / Age cohorts ─────────────────────────────────────────────
+  if (/\b(?:neonatal|neonate|newborn|baby|born|nicu)\b/.test(fullText)) facets.population.push("neonatal");
+  if (/\b(?:paediatric|pediatric|child|children|pmh|pch)\b/.test(fullText)) facets.population.push("paediatric");
+  if (/\b(?:youth|adolescent|teen|young person|young adult)\b/.test(fullText)) facets.population.push("youth");
+  if (/\b(?:adult|adults)\b/.test(fullText)) facets.population.push("adult");
+  if (/\b(?:geriatric|older adult|elderly|aged|65 years)\b/.test(fullText)) facets.population.push("geriatric");
+
+  // ── Workflow / Admin split ───────────────────────────────────────────────
+  if (/\b(?:clinical|medical|nursing|ward|midwife|physio|ot|treatment|prescrib|drug)\b/.test(fullText)) facets.workflow.push("clinical");
+  if (/\b(?:admin|clerical|finance|billing|payroll|human resources|roster|audit|governance|non-clinical|non clinical)\b/.test(fullText)) facets.workflow.push("non-clinical");
+  if (/\b(?:finance|financial|billing|funding|invoice|payment|cost|budget)\b/.test(fullText)) facets.workflow.push("finance");
+  if (/\b(?:human resources|personnel|staffing|hiring|recruitment)\b/.test(fullText)) facets.workflow.push("hr");
+
+  // ── Clinical Specialty (mapped to service) ────────────────────────────────
+  if (/\b(?:emergency|ed\b|emergency department|trauma|resus|triage|mbcp|racpc)\b/.test(fullText)) facets.service.push("emergency-medicine");
+  if (/\b(?:mental health|psychiatr|psychosis|schizophrenia|bipolar|ect\b|seclusion|detention|camhs|inpatient mental|community mental)\b/.test(fullText)) facets.service.push("mental-health");
+  if (/\b(?:obstetric|maternity|labour|birth|antenatal|postnatal|perinatal|midwif|kemh|mbc\b|pregnancy|pregnant)\b/.test(fullText)) facets.service.push("obstetrics-maternity");
+  if (/\b(?:neonatal|nicu|neonate|newborn|neonatal intensive)\b/.test(fullText)) facets.service.push("neonatology");
+  if (/\b(?:icu\b|intensive care|critical care|hdu\b|high dependency|ventilat|vasoactive|inotrope|vasopressor)\b/.test(fullText)) facets.service.push("intensive-care");
+  if (/\b(?:perioperative|anaesth|anaesthes|anesthes|theatre|operating|preoperative|post-?operative|surgical|intraoperative)\b/.test(fullText)) facets.service.push("perioperative-anaesthesia");
+  if (/\b(?:pharmacy|pharmacist|drug guideline|iv drug|medication management|medicine management|pharmacol)\b/.test(fullText)) facets.service.push("pharmacy-medications");
+  if (/\b(?:infection control|antimicrobial|antibiotic|cdiff|c. diff|mrsa|ipc\b|sterilisation|decontamination|isolation|sepsis|infectious disease)\b/.test(fullText)) facets.service.push("infectious-disease");
+  if (/\b(?:oncolog|haematolog|hematolog|chemotherapy|transfusion|apheresis|hit\b|thrombocytopenia|blood product|leukaemia)\b/.test(fullText)) facets.service.push("oncology-haematology");
+  if (/\b(?:cardiol|cardiac|heart failure|arrhythmia|ecg\b|pacemaker|vte\b|venous thromboembolism|atrial fibrillation|chest pain|coronary)\b/.test(fullText)) facets.service.push("cardiology");
+  if (/\b(?:orthopaed|orthoped|fracture|bone|joint|spine|spinal|musculoskeletal|limb|ankle|hip replacement)\b/.test(fullText)) facets.service.push("orthopaedics");
+  if (/\b(?:renal|nephrol|dialysis|haemodialysis|hemodialysis|kidney|glomerular|renal colic|renal failure)\b/.test(fullText)) facets.service.push("renal-nephrology");
+  if (/\b(?:gastroenterol|endoscopy|colonoscopy|gastroscopy|bowel|liver|hepat|variceal|terlipressin|inflammatory bowel|ibd\b)\b/.test(fullText)) facets.service.push("gastroenterology");
+  if (/\b(?:respiratory|pulmonol|lung|sleep apnoea|cpap\b|spirometry|bronch|asthma|copd\b|pleural|thoracic)\b/.test(fullText)) facets.service.push("respiratory");
+  if (/\b(?:neurol|seizure|epilepsy|stroke|tia\b|ect\b|neuropsychol|parkinson|dementia|delirium)\b/.test(fullText)) facets.service.push("neurology");
+  if (/\b(?:palliative|end of life|dying|comfort care|hospice|eol\b)\b/.test(fullText)) facets.service.push("palliative-care");
+  if (/\b(?:dietetic|nutrition|nutritional|dietitian|enteral|parenteral|tube feed)\b/.test(fullText)) facets.service.push("allied-health");
+  if (/\b(?:physiotherap|occupational therap|speech pathol|social work|allied health)\b/.test(fullText)) facets.service.push("allied-health");
+  if (/\b(?:diabetes|endocrin|insulin|hypoglycaem|dka\b|diabetic ketoacidosis|hhs\b|hyperosmolar|thyroid|adrenal)\b/.test(fullText)) facets.service.push("diabetes-endocrinology");
+  if (/\b(?:urology|urolog|catheter|urethral|bladder|prostate|renal calculus)\b/.test(fullText)) facets.service.push("urology");
+  if (/\b(?:wound|wound care|wound management|pressure injury|ulcer|debridement|dressing)\b/.test(fullText)) facets.service.push("wound-management");
+  if (/\b(?:pain management|pain relief|analges|analgesia|acute pain|chronic pain|opioid)\b/.test(fullText)) facets.service.push("pain-management");
+
+  // ── Care Setting (mapped to setting) ─────────────────────────────────────
+  if (/\b(?:emergency department|ed\b|emergency room|er\b|triage|trauma bay)\b/.test(fullText)) facets.setting.push("emergency-department");
+  if (/\b(?:inpatient|ward|admitted|admission|bed management|inpatient unit)\b/.test(fullText)) facets.setting.push("inpatient");
+  if (/\b(?:outpatient|ambulatory|clinic\b|day procedure|day surgery|day unit)\b/.test(fullText)) facets.setting.push("outpatient");
+  if (/\b(?:icu\b|intensive care unit|critical care unit|hdu\b|high dependency)\b/.test(fullText)) facets.setting.push("icu-hdu");
+  if (/\b(?:operating theatre|operating room|theatre suite|perioperative|post-?anaesth|pacu\b|recovery room)\b/.test(fullText)) facets.setting.push("operating-theatre");
+  if (/\b(?:community|home visit|community health|outreach|community-based|cpop\b|community program)\b/.test(fullText)) facets.setting.push("community");
+  if (/\b(?:maternity unit|birth suite|labour ward|antenatal ward|postnatal ward|birthing)\b/.test(fullText)) facets.setting.push("maternity-unit");
+  if (/\b(?:mental health unit|psychiatric unit|mhu\b|acute mental health|psychiatric inpatient|seclusion)\b/.test(fullText)) facets.setting.push("mental-health-unit");
+
+  // ── Medication Category (mapped to medication) ───────────────────────────
+  if (/\b(?:anticoagul|heparin|warfarin|enoxaparin|dabigatran|rivaroxaban|apixaban|vte prophylaxis)\b/.test(fullText)) facets.medication.push("anticoagulants");
+  if (/\b(?:opioid|morphine|fentanyl|oxycodone|hydromorphone|pethidine|codeine|naloxone|buprenorphine|methadone)\b/.test(fullText)) facets.medication.push("opioids");
+  if (/\b(?:insulin|subcutaneous insulin|basal|bolus|sliding scale|dka|hyperglycaem)\b/.test(fullText)) facets.medication.push("insulin");
+  if (/\b(?:antibiotic|antimicrobial|penicillin|cephalosporin|vancomycin|gentamicin|meropenem|flucloxacillin|minocycline|benzylpenicillin)\b/.test(fullText)) facets.medication.push("antimicrobials");
+  if (/\b(?:antipsychotic|clozapine|olanzapine|quetiapine|risperidone|haloperidol|droperidol|lai\b|long-acting injectable|depot)\b/.test(fullText)) facets.medication.push("antipsychotics");
+  if (/\b(?:blood product|packed red cells|ffp\b|fresh frozen plasma|platelet|transfusion|massive transfusion|blood bank)\b/.test(fullText)) facets.medication.push("blood-products");
+  if (/\b(?:iv drug guideline|intravenous drug|iv administration|iv infusion|intravenous medication)\b/.test(fullText)) facets.medication.push("iv-medications");
+  if (/\b(?:controlled drug|schedule 8|schedule 4|restricted medication|s8\b|s4\b|dangerous drug)\b/.test(fullText)) facets.medication.push("controlled-drugs");
+  if (/\b(?:chemotherapy|cytotoxic|antineoplastic|anticancer|immunosuppressant)\b/.test(fullText)) facets.medication.push("chemotherapy");
+  if (/\b(?:lithium|mood stabiliser|mood stabilizer|valproate|carbamazepine|lamotrigine)\b/.test(fullText)) facets.medication.push("mood-stabilisers");
+
   return {
     population: uniqueStrings(facets.population),
     setting: uniqueStrings(facets.setting),
     service: uniqueStrings(facets.service),
     topic: uniqueStrings(facets.topic),
     workflow: uniqueStrings(facets.workflow),
+    medication: uniqueStrings(facets.medication),
   };
 }
 
@@ -451,7 +578,7 @@ function profileLabels(profile: DocumentOrganizationProfile): OrganizationGenera
     });
   }
   for (const [label_type, values] of Object.entries(profile.secondary_facets) as Array<
-    [Exclude<DocumentLabelType, "site" | "document_type" | "medication" | "risk" | "custom">, string[]]
+    [Exclude<DocumentLabelType, "site" | "document_type" | "risk" | "custom">, string[]]
   >) {
     for (const label of values) labels.push({ label, label_type, confidence: 0.78 });
   }
@@ -498,7 +625,7 @@ export function classifyDocumentOrganization(input: OrganizationDocumentInput) {
     raw_bracket_tags,
     site,
     document_type,
-    secondary_facets: secondaryFacets(raw_bracket_tags),
+    secondary_facets: secondaryFacets(raw_bracket_tags, input.title, `${input.contentText ?? ""} ${input.summaryText ?? ""}`),
     review_status,
   };
 
diff --git a/src/lib/env.ts b/src/lib/env.ts
index 25cc0ef7e1..98f85fc935 100644
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -16,27 +16,29 @@ const envSchema = z.object({
   // Must match the vector(N) dimension in supabase/schema.sql. Changing the embedding
   // model without updating this (and the schema) silently corrupts ingestion (IDX-C2).
   EMBEDDING_DIMENSIONS: z.coerce.number().int().positive().default(1536),
-  OPENAI_ANSWER_MODEL: z.string().default("gpt-5.4-mini"),
-  OPENAI_FAST_ANSWER_MODEL: z.string().default("gpt-5.4-mini"),
-  OPENAI_STRONG_ANSWER_MODEL: z.string().default("gpt-5.4"),
+  OPENAI_ANSWER_MODEL: z.string().default("gpt-5.5"),
+  OPENAI_FAST_ANSWER_MODEL: z.string().default("gpt-5.5"),
+  OPENAI_STRONG_ANSWER_MODEL: z.string().default("gpt-5.5-pro"),
   // Reasoning models (gpt-5*) draw reasoning tokens from this same budget, so a
   // low cap can starve the JSON answer payload and silently truncate clinical
   // content (doses/thresholds cut mid-sentence). Raised default to 4000 for headroom;
   // if output is still cut off, createTextResult now flags it as truncated (GEN-C1).
   OPENAI_MAX_OUTPUT_TOKENS: z.coerce.number().int().positive().default(4000),
   OPENAI_QUERY_CACHE_SIZE: z.coerce.number().int().nonnegative().default(200),
-  OPENAI_VISION_MODEL: z.string().default("gpt-5.4-mini"),
+  OPENAI_VISION_MODEL: z.string().default("gpt-5.5"),
+  OPENAI_VISION_IMAGE_DETAIL: z.enum(["auto", "low", "high"]).default("auto"),
   OPENAI_REQUEST_TIMEOUT_MS: z.coerce.number().int().positive().default(45000),
   OPENAI_MAX_RETRIES: z.coerce.number().int().nonnegative().default(2),
-  OPENAI_PROMPT_CACHE_RETENTION: z.enum(["off", "in_memory", "24h"]).default("in_memory"),
+  OPENAI_GENERATION_MAX_RETRIES: z.coerce.number().int().nonnegative().default(0),
+  OPENAI_PROMPT_CACHE_RETENTION: z.enum(["off", "in_memory", "24h"]).default("24h"),
   OPENAI_STORE_RESPONSES: z
     .enum(["true", "false"])
     .default("false")
     .transform((value) => value === "true"),
-  OPENAI_FAST_REASONING_EFFORT: z.enum(["none", "minimal", "low", "medium", "high"]).default("low"),
-  OPENAI_STRONG_REASONING_EFFORT: z.enum(["none", "minimal", "low", "medium", "high"]).default("medium"),
-  OPENAI_SUMMARY_REASONING_EFFORT: z.enum(["none", "minimal", "low", "medium", "high"]).default("low"),
-  OPENAI_VISION_REASONING_EFFORT: z.enum(["none", "minimal", "low", "medium", "high"]).default("low"),
+  OPENAI_FAST_REASONING_EFFORT: z.enum(["none", "low", "medium", "high", "xhigh"]).default("low"),
+  OPENAI_STRONG_REASONING_EFFORT: z.enum(["none", "low", "medium", "high", "xhigh"]).default("high"),
+  OPENAI_SUMMARY_REASONING_EFFORT: z.enum(["none", "low", "medium", "high", "xhigh"]).default("medium"),
+  OPENAI_VISION_REASONING_EFFORT: z.enum(["none", "low", "medium", "high", "xhigh"]).default("low"),
   OPENAI_TEXT_VERBOSITY: z.enum(["low", "medium", "high"]).default("low"),
   RAG_ANSWER_CACHE_TTL_MS: z.coerce.number().int().nonnegative().default(300000),
   RAG_ANSWER_CACHE_SIZE: z.coerce.number().int().nonnegative().default(100),
@@ -71,6 +73,7 @@ const envSchema = z.object({
   WORKER_PROGRESS_UPDATE_MIN_INTERVAL_MS: z.coerce.number().int().positive().default(60000),
   WORKER_MAX_CAPTIONED_IMAGES_PER_DOCUMENT: z.coerce.number().int().nonnegative().default(15),
   WORKER_MAX_CAPTIONED_IMAGES_PER_PAGE: z.coerce.number().int().nonnegative().default(2),
+  WORKER_VISION_CONCURRENCY: z.coerce.number().int().positive().default(4),
   WORKER_INLINE_ENRICHMENT: z
     .enum(["true", "false"])
     .default("false")
diff --git a/src/lib/http.ts b/src/lib/http.ts
index ea817a8b6e..19f4ed2b1d 100644
--- a/src/lib/http.ts
+++ b/src/lib/http.ts
@@ -1,5 +1,6 @@
 import { NextResponse } from "next/server";
 import { ZodError } from "zod";
+import { logger } from "@/lib/logger";
 
 export class PublicApiError extends Error {
   constructor(
@@ -28,21 +29,17 @@ function publicErrorMessage(error: unknown, status: number) {
 }
 
 function logSafeError(error: unknown, status: number) {
-  if (process.env.NODE_ENV === "test") return;
-  const name = error instanceof Error ? error.name : typeof error;
-  const message = error instanceof Error ? error.message : String(error);
-  const stack = error instanceof Error ? error.stack : undefined;
   const details = error instanceof PublicApiError ? error.details : undefined;
-  console.error("API request failed", {
+  logger.error("API request failed", {
     status,
-    name,
-    message,
+    name: error instanceof Error ? error.name : typeof error,
+    message: error instanceof Error ? error.message : String(error),
     code: details?.code,
     requestId: details?.requestId,
     causeName: details?.causeName,
     causeMessage: details?.causeMessage,
     sqlState: details?.sqlState,
-    stack,
+    stack: error instanceof Error ? error.stack : undefined,
   });
 }
 
@@ -69,3 +66,36 @@ export function assertAllowedFile(file: File, maxUploadMb: number) {
     throw new PublicApiError(`File exceeds ${maxUploadMb} MB upload limit.`);
   }
 }
+
+// OOXML documents (DOCX/XLSX) are ZIP archives; a local-file-header begins "PK\x03\x04",
+// and the empty/spanned variants begin "PK\x05\x06" / "PK\x07\x08".
+function hasZipSignature(head: Uint8Array) {
+  return (
+    head[0] === 0x50 &&
+    head[1] === 0x4b &&
+    (head[2] === 0x03 || head[2] === 0x05 || head[2] === 0x07) &&
+    (head[3] === 0x04 || head[3] === 0x06 || head[3] === 0x08)
+  );
+}
+
+const fileContentSignatures: Record<string, (head: Uint8Array) => boolean> = {
+  // PDFs start with "%PDF-".
+  "application/pdf": (head) => head[0] === 0x25 && head[1] === 0x50 && head[2] === 0x44 && head[3] === 0x46,
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": hasZipSignature,
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": hasZipSignature,
+  // text/plain has no reliable magic number and is intentionally not signature-checked.
+};
+
+// The browser-supplied MIME type (file.type) is trivially spoofable, so for the binary
+// formats we accept we also verify the actual byte signature before persisting the file.
+// This rejects polyglot/mislabeled uploads (e.g. an executable renamed to .pdf) at the
+// ingestion boundary of a clinical document store.
+export function assertFileContentSignature(fileType: string, content: Uint8Array) {
+  const check = fileContentSignatures[fileType];
+  if (!check) return;
+  if (!check(content.subarray(0, 8))) {
+    throw new PublicApiError(
+      `File content does not match its declared type (${fileType}). The file may be corrupt or mislabeled.`,
+    );
+  }
+}
diff --git a/src/lib/logger.ts b/src/lib/logger.ts
new file mode 100644
index 0000000000..828c8c5d97
--- /dev/null
+++ b/src/lib/logger.ts
@@ -0,0 +1,73 @@
+// Lightweight structured logger with redaction (plan item 1.2). API routes log
+// operational context (status, error name, request id) but must never emit secrets
+// or patient-identifying text (clinical query/answer content, emails). Values under
+// sensitive keys are redacted and long strings truncated before serialization.
+
+type LogLevel = "debug" | "info" | "warn" | "error";
+
+const REDACTED = "[redacted]";
+const MAX_STRING_LENGTH = 512;
+const MAX_DEPTH = 5;
+
+// Keys whose values may carry secrets or PII. Matched case-insensitively as substrings.
+const SENSITIVE_KEY =
+  /authorization|cookie|token|secret|api[-_]?key|password|service[-_]?role|email|\bquery\b|prompt|\bcontent\b|\banswer\b|patient|\bmrn\b/i;
+
+function redactValue(value: unknown, depth: number): unknown {
+  if (value === null || value === undefined) return value;
+  if (typeof value === "string") {
+    return value.length > MAX_STRING_LENGTH ? `${value.slice(0, MAX_STRING_LENGTH)}…[truncated]` : value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") return value;
+  if (depth >= MAX_DEPTH) return "[depth-limited]";
+  if (value instanceof Error) return { name: value.name, message: redactValue(value.message, depth + 1) };
+  if (Array.isArray(value)) return value.slice(0, 50).map((item) => redactValue(item, depth + 1));
+  if (typeof value === "object") {
+    const out: Record<string, unknown> = {};
+    for (const [key, val] of Object.entries(value as Record<string, unknown>)) {
+      out[key] = SENSITIVE_KEY.test(key) ? REDACTED : redactValue(val, depth + 1);
+    }
+    return out;
+  }
+  return String(value);
+}
+
+export function redactLogContext(context: Record<string, unknown>): Record<string, unknown> {
+  return redactValue(context, 0) as Record<string, unknown>;
+}
+
+const LEVEL_RANK: Record<LogLevel, number> = { debug: 10, info: 20, warn: 30, error: 40 };
+
+function activeLevel(): LogLevel {
+  const configured = process.env.LOG_LEVEL?.toLowerCase();
+  if (configured && configured in LEVEL_RANK) return configured as LogLevel;
+  return process.env.NODE_ENV === "production" ? "info" : "debug";
+}
+
+function emit(level: LogLevel, message: string, context?: Record<string, unknown>) {
+  // Keep tests quiet; they assert on responses, not log output.
+  if (process.env.NODE_ENV === "test") return;
+  if (LEVEL_RANK[level] < LEVEL_RANK[activeLevel()]) return;
+  const line = JSON.stringify({
+    level,
+    message,
+    timestamp: new Date().toISOString(),
+    ...(context ? redactLogContext(context) : {}),
+  });
+  if (level === "error") console.error(line);
+  else if (level === "warn") console.warn(line);
+  else console.log(line);
+}
+
+export const logger = {
+  debug: (message: string, context?: Record<string, unknown>) => emit("debug", message, context),
+  info: (message: string, context?: Record<string, unknown>) => emit("info", message, context),
+  warn: (message: string, context?: Record<string, unknown>) => emit("warn", message, context),
+  error: (message: string, context?: Record<string, unknown>) => emit("error", message, context),
+};
+
+// Correlation id so a client error report can be matched to server logs without
+// exposing the underlying log content to the client.
+export function newRequestId(): string {
+  return globalThis.crypto?.randomUUID?.() ?? Math.random().toString(36).slice(2);
+}
diff --git a/src/lib/openai.ts b/src/lib/openai.ts
index f91c3d040f..c29c686c41 100644
--- a/src/lib/openai.ts
+++ b/src/lib/openai.ts
@@ -12,7 +12,7 @@ import type { ImageEvidenceCategory, OpenAITokenUsage } from "@/lib/types";
 type OpenAIOperation =
   "embedding" | "answer" | "summary" | "vision_caption" | "vision_classification" | "text_generation";
 
-type OpenAIReasoningEffort = "none" | "minimal" | "low" | "medium" | "high";
+type OpenAIReasoningEffort = "none" | "low" | "medium" | "high" | "xhigh";
 type OpenAITextVerbosity = "low" | "medium" | "high";
 type OpenAIResponseInput = string | Array<Record<string, unknown>>;
 
@@ -27,6 +27,7 @@ type TextGenerationOptions = {
   textVerbosity?: OpenAITextVerbosity;
   timeoutMs?: number;
   maxRetries?: number;
+  signal?: AbortSignal;
 };
 
 type ResolvedTextGenerationOptions = Required<Pick<TextGenerationOptions, "model" | "maxOutputTokens">> &
@@ -124,10 +125,15 @@ function resolveTextGenerationOptions(
   };
 }
 
-function requestOptions(options?: Pick<TextGenerationOptions, "timeoutMs" | "maxRetries">) {
+function defaultMaxRetries(operation?: OpenAIOperation) {
+  return operation === "embedding" ? env.OPENAI_MAX_RETRIES : env.OPENAI_GENERATION_MAX_RETRIES;
+}
+
+function requestOptions(options?: Pick<TextGenerationOptions, "operation" | "timeoutMs" | "maxRetries" | "signal">) {
   return {
     timeout: options?.timeoutMs ?? env.OPENAI_REQUEST_TIMEOUT_MS,
-    maxRetries: options?.maxRetries ?? env.OPENAI_MAX_RETRIES,
+    maxRetries: options?.maxRetries ?? defaultMaxRetries(options?.operation),
+    ...(options?.signal ? { signal: options.signal } : {}),
   };
 }
 
@@ -148,8 +154,23 @@ function promptCacheKeyFor(operation: OpenAIOperation) {
   }
 }
 
+const reasoningEfforts = new Set<OpenAIReasoningEffort>(["low", "medium", "high", "xhigh"]);
+
+function openAIModelCapabilities(model: string) {
+  const normalized = model.toLowerCase();
+  const isGpt5 = /^gpt-5(?:[.-]|$)/.test(normalized);
+  const isReasoningModel = isGpt5 || /^o\d(?:[.-]|$)/.test(normalized);
+
+  return {
+    supportsReasoning: isReasoningModel,
+    supportsTextVerbosity: isGpt5,
+    requiredPromptCacheRetention: /^gpt-5\.5(?:[.-]|$)/.test(normalized) ? "24h" : undefined,
+    allowedReasoningEfforts: isReasoningModel ? reasoningEfforts : new Set<OpenAIReasoningEffort>(),
+  };
+}
+
 function defaultReasoningEffort(operation: OpenAIOperation, model: string): OpenAIReasoningEffort {
-  if (!model.startsWith("gpt-5")) return "none";
+  if (!openAIModelCapabilities(model).supportsReasoning) return "none";
   switch (operation) {
     case "answer":
       return model === env.OPENAI_STRONG_ANSWER_MODEL
@@ -165,12 +186,10 @@ function defaultReasoningEffort(operation: OpenAIOperation, model: string): Open
   }
 }
 
-function supportsReasoning(model: string) {
-  return model.startsWith("gpt-5") || /^o\d/.test(model);
-}
-
-function supportsTextVerbosity(model: string) {
-  return model.startsWith("gpt-5");
+function resolveReasoningEffort(model: string, effort: OpenAIReasoningEffort) {
+  const capabilities = openAIModelCapabilities(model);
+  if (!capabilities.supportsReasoning || effort === "none") return "none";
+  return capabilities.allowedReasoningEfforts.has(effort) ? effort : "low";
 }
 
 function responseBody(
@@ -180,27 +199,29 @@ function responseBody(
 ) {
   const operation = resolved.operation ?? "text_generation";
   const reasoningEffort = resolved.reasoningEffort ?? defaultReasoningEffort(operation, resolved.model);
+  const resolvedReasoningEffort = resolveReasoningEffort(resolved.model, reasoningEffort);
+  const capabilities = openAIModelCapabilities(resolved.model);
   const textConfig: Record<string, unknown> = {};
-  const promptCacheRetention =
+  const configuredPromptCacheRetention =
     env.OPENAI_PROMPT_CACHE_RETENTION === "off" ? undefined : env.OPENAI_PROMPT_CACHE_RETENTION;
+  const promptCacheRetention = capabilities.requiredPromptCacheRetention ?? configuredPromptCacheRetention;
 
   if (format) textConfig.format = format;
-  if (supportsTextVerbosity(resolved.model)) {
+  if (capabilities.supportsTextVerbosity) {
     textConfig.verbosity = resolved.textVerbosity ?? env.OPENAI_TEXT_VERBOSITY;
   }
 
   return {
     model: resolved.model,
     input,
-    instructions: resolved.instructions,
+    ...(resolved.instructions ? { instructions: resolved.instructions } : {}),
     max_output_tokens: resolved.maxOutputTokens,
     store: env.OPENAI_STORE_RESPONSES,
     prompt_cache_key: resolved.promptCacheKey ?? promptCacheKeyFor(operation),
-    prompt_cache_retention: promptCacheRetention,
+    ...(promptCacheRetention ? { prompt_cache_retention: promptCacheRetention } : {}),
     metadata: { operation },
-    reasoning:
-      supportsReasoning(resolved.model) && reasoningEffort !== "none" ? { effort: reasoningEffort } : undefined,
-    text: Object.keys(textConfig).length > 0 ? textConfig : undefined,
+    ...(resolvedReasoningEffort !== "none" ? { reasoning: { effort: resolvedReasoningEffort } } : {}),
+    ...(Object.keys(textConfig).length > 0 ? { text: textConfig } : {}),
   };
 }
 
@@ -396,7 +417,7 @@ export async function embedTexts(texts: string[]) {
         // IDX-C2: request the exact dimension the schema's vector(N) columns expect.
         dimensions: env.EMBEDDING_DIMENSIONS,
       },
-      requestOptions(),
+      requestOptions({ operation: "embedding" }),
     );
 
     // IDX-C2: a short response means some inputs silently produced no embedding.
@@ -528,7 +549,7 @@ export async function captionImageFromBase64(args: { base64: string; mimeType: s
         {
           type: "input_image",
           image_url: `data:${args.mimeType};base64,${args.base64}`,
-          detail: "auto",
+          detail: env.OPENAI_VISION_IMAGE_DETAIL,
         },
       ],
     },
@@ -817,7 +838,7 @@ export async function classifyAndCaptionImageFromBase64(args: {
         {
           type: "input_image",
           image_url: `data:${args.mimeType};base64,${args.base64}`,
-          detail: "auto",
+          detail: env.OPENAI_VISION_IMAGE_DETAIL,
         },
       ],
     },
diff --git a/src/lib/rag-routing.ts b/src/lib/rag-routing.ts
index ae4597b5c0..28101fb163 100644
--- a/src/lib/rag-routing.ts
+++ b/src/lib/rag-routing.ts
@@ -16,6 +16,8 @@ const strongRetrievalThreshold = 0.64;
 const extractiveRetrievalThreshold = 0.76;
 const complexClinicalQueryPattern =
   /\b(compare|compared|versus|vs|conflict|gap|contraindicat\w*|interaction\w*|side effect\w*|adverse|suicid\w*|toxicity|myocarditis|neutropenia|anc|fbc|urgent|escalat\w*|withhold|cease|stop|dose|dosing|prescrib\w*)\b/i;
+const strongClinicalEscalationPattern =
+  /\b(compare|compared|versus|vs|conflict|gap|contraindicat\w*|interaction\w*|side effect\w*|adverse|suicid\w*|toxicity|myocarditis|neutropenia|anc|fbc|red range|amber range|urgent|escalat\w*|withhold|cease|stop|discontinue|recommend\w*|decide|decision|pregnan\w*|renal impairment)\b/i;
 const comparisonQueryPattern = /\b(compare|compared|versus|vs|between|difference\w*|conflict\w*)\b/i;
 const routineCrossDocumentPattern =
   /\b(?:across|combine|combined|synthesi[sz]e|together|overall|all documents|these documents|different documents|multiple documents|several documents|from the documents)\b/i;
@@ -25,6 +27,7 @@ const extractiveBlockPattern =
   /\b(compare|compared|versus|vs|conflict|gap|contraindicat\w*|interaction\w*|side effect\w*|adverse|risk\w*|suicid\w*|toxicity|myocarditis|neutropenia|urgent|escalat\w*|withhold|cease|stop|dose|dosing|prescrib\w*|recommend\w*|decide|decision)\b/i;
 const broadManagementSynthesisPattern =
   /\b(?:management|manage|managed|treatment|treat|therapy|care|approach|pathway)\s+(?:of|for|in)\b|\bhow\s+(?:is|are|should)\b.{0,80}\b(?:managed|treated)\b/i;
+const clinicalPathwaySynthesisPattern = /\b(?:referral criteria|referral pathway|refer\b|pathway|what to do)\b/i;
 const queryStopWords = new Set([
   "what",
   "when",
@@ -76,6 +79,15 @@ function hasExplicitDocumentLookupIntent(query: string) {
   );
 }
 
+function hasSourceSupportLookupIntent(query: string) {
+  return (
+    /\b(?:what|which)\s+(?:documents?|sources?|files?|guidelines?)\b.{0,120}\b(?:support|supports|supporting|cover|covers|contain|contains|mention|mentions)\b/i.test(
+      query,
+    ) ||
+    /\b(?:documents?|sources?|files?|guidelines?)\s+(?:supporting|for)\b/i.test(query)
+  );
+}
+
 function normalizeLookupText(text: string) {
   return text
     .replace(/([a-z])([A-Z])/g, "$1 $2")
@@ -105,6 +117,30 @@ export function isComplexClinicalQuery(query: string) {
   return complexClinicalQueryPattern.test(query);
 }
 
+function shouldPreferModelSynthesis(query: string, queryClass: RagQueryClass) {
+  return (
+    queryClass === "medication_dose_risk" ||
+    queryClass === "table_threshold" ||
+    queryClass === "comparison" ||
+    clinicalPathwaySynthesisPattern.test(query)
+  );
+}
+
+function shouldUseStrongClinicalRoute(args: {
+  query: string;
+  queryClass: RagQueryClass;
+  strongestScore: number;
+  topTextRank: number;
+  directTitleSupport: boolean;
+  actionableConflictOrGap: boolean;
+}) {
+  if (args.actionableConflictOrGap && !args.directTitleSupport) return true;
+  if (strongClinicalEscalationPattern.test(args.query)) return true;
+  if (args.strongestScore < strongRetrievalThreshold && !args.directTitleSupport) return true;
+  if (args.queryClass === "table_threshold" && args.topTextRank < 0.035 && !args.directTitleSupport) return true;
+  return false;
+}
+
 export function shouldUseExtractiveAnswer(args: {
   query: string;
   results: SearchResult[];
@@ -120,6 +156,7 @@ export function shouldUseExtractiveAnswer(args: {
   const singleDocumentStrongMatch =
     documents === 1 && strongestScore >= 0.74 && (topTextRank >= 0.04 || hasTextSupport(args.results));
 
+  if (shouldPreferModelSynthesis(args.query, queryClass)) return false;
   if (queryClass === "broad_summary" || broadManagementSynthesisPattern.test(args.query)) return false;
   if (documents > 1 && comparisonQueryPattern.test(args.query)) return false;
   if (queryClass === "comparison") return false;
@@ -128,22 +165,10 @@ export function shouldUseExtractiveAnswer(args: {
 
   if (hasActionableConflictOrGap(args.conflictsOrGaps) && !directTitleSupport && strongestScore < 0.82) return false;
 
-  if (
-    queryClass === "table_threshold" &&
-    strongestScore >= 0.68 &&
-    (topTextRank >= 0.035 || singleDocumentStrongMatch)
-  ) {
-    return true;
-  }
-
   if (queryClass === "document_lookup" && (directTitleSupport || strongestScore >= 0.72)) {
     return true;
   }
 
-  if (queryClass === "medication_dose_risk" && singleDocumentStrongMatch && !comparisonQueryPattern.test(args.query)) {
-    return true;
-  }
-
   return (
     strongestScore >= extractiveRetrievalThreshold ||
     singleDocumentStrongMatch ||
@@ -235,6 +260,16 @@ export function chooseAnswerRoute(args: {
   const crossDocumentIntent = routineCrossDocumentPattern.test(args.query) || queryClass === "broad_summary";
   const actionableConflictOrGap = hasActionableConflictOrGap(args.conflictsOrGaps);
 
+  if (hasSourceSupportLookupIntent(args.query) && (directTitleSupport || strongestScore >= 0.4 || topTextRank >= 0.04)) {
+    return {
+      mode: "extractive",
+      model: null,
+      reason: "source_support_document_lookup",
+      strongestScore,
+      documentCount: documents,
+    };
+  }
+
   if (queryClass === "broad_summary" && broadManagementSynthesisPattern.test(args.query)) {
     return {
       mode: "strong",
@@ -291,6 +326,70 @@ export function chooseAnswerRoute(args: {
     };
   }
 
+  if (queryClass === "medication_dose_risk" || queryClass === "table_threshold") {
+    if (
+      shouldUseStrongClinicalRoute({
+        query: args.query,
+        queryClass,
+        strongestScore,
+        topTextRank,
+        directTitleSupport,
+        actionableConflictOrGap,
+      })
+    ) {
+      return {
+        mode: "strong",
+        model: args.strongModel,
+        reason:
+          actionableConflictOrGap && !directTitleSupport
+            ? "retrieval_gap_or_conflict"
+            : "clinical_risk_or_complex_query",
+        strongestScore,
+        documentCount: documents,
+      };
+    }
+
+    return {
+      mode: "fast",
+      model: args.fastModel,
+      reason: "clinical_fast_grounded_synthesis",
+      strongestScore,
+      documentCount: documents,
+    };
+  }
+
+  if (clinicalPathwaySynthesisPattern.test(args.query) && queryClass !== "document_lookup") {
+    if (
+      shouldUseStrongClinicalRoute({
+        query: args.query,
+        queryClass,
+        strongestScore,
+        topTextRank,
+        directTitleSupport,
+        actionableConflictOrGap,
+      })
+    ) {
+      return {
+        mode: "strong",
+        model: args.strongModel,
+        reason:
+          actionableConflictOrGap && !directTitleSupport
+            ? "retrieval_gap_or_conflict"
+            : "clinical_risk_or_complex_query",
+        strongestScore,
+        documentCount: documents,
+      };
+    }
+
+    return {
+      mode: "fast",
+      model: args.fastModel,
+      reason: "clinical_fast_grounded_synthesis",
+      strongestScore,
+      documentCount: documents,
+    };
+  }
+
   if (
     shouldUseExtractiveAnswer({
       query: args.query,
@@ -353,15 +452,12 @@ export function shouldRetryWithStrongAfterFast(args: {
   results: SearchResult[];
 }) {
   if (args.route.mode !== "fast") return false;
-  // A structured-parse failure is a generation/format problem, not a weak-
-  // retrieval signal. Since B5 made that fallback fail closed (ungrounded, no
-  // citations), retrying with the strong model would re-run generation (often
-  // re-truncating) instead of letting extractive recovery use the retrieved
-  // sources. Skip the strong retry here; extractive recovery handles it.
-  if (args.answer.routingReason === "structured_parse_fallback") return false;
   if (args.answer.grounded && args.answer.confidence !== "unsupported" && args.answer.citations.length > 0) {
     return false;
   }
 
-  return strongestRetrievalScore(args.results) >= strongRetrievalThreshold && args.results.length >= 2;
+  const solidSourceSupport = strongestRetrievalScore(args.results) >= strongRetrievalThreshold && args.results.length > 0;
+  if (args.answer.routingReason === "structured_parse_fallback") return solidSourceSupport;
+  if (args.route.reason === "clinical_fast_grounded_synthesis") return solidSourceSupport;
+  return solidSourceSupport && args.results.length >= 2;
 }
diff --git a/src/lib/rag.ts b/src/lib/rag.ts
index 9bd9e41ac2..dfdf7cdb42 100644
--- a/src/lib/rag.ts
+++ b/src/lib/rag.ts
@@ -219,6 +219,28 @@ const answerJsonOutputSchema = {
   required: ["answer", "grounded", "confidence", "answerSections", "citations", "quoteCards", "conflictsOrGaps"],
 };
 
+function answerJsonOutputSchemaForResults(results: SearchResult[]) {
+  const chunkIds = Array.from(new Set(results.map((result) => result.id).filter(Boolean)));
+  if (chunkIds.length === 0 || chunkIds.length > 80) return answerJsonOutputSchema;
+
+  const schema = structuredClone(answerJsonOutputSchema) as Record<string, unknown>;
+  const chunkIdSchema = { type: "string", enum: chunkIds };
+  const properties = safeRecord(schema.properties);
+  const answerSectionProperties = safeRecord(safeRecord(safeRecord(properties.answerSections).items).properties);
+  const citationProperties = safeRecord(safeRecord(safeRecord(properties.citations).items).properties);
+  const quoteCardProperties = safeRecord(safeRecord(safeRecord(properties.quoteCards).items).properties);
+  const gapProperties = safeRecord(safeRecord(safeRecord(properties.conflictsOrGaps).items).properties);
+  const answerSectionCitationIds = safeRecord(answerSectionProperties.citation_chunk_ids);
+  const gapSourceIds = safeRecord(gapProperties.source_chunk_ids);
+
+  if (Object.keys(answerSectionCitationIds).length > 0) answerSectionCitationIds.items = chunkIdSchema;
+  if (Object.keys(citationProperties).length > 0) citationProperties.chunk_id = chunkIdSchema;
+  if (Object.keys(quoteCardProperties).length > 0) quoteCardProperties.chunk_id = chunkIdSchema;
+  if (Object.keys(gapSourceIds).length > 0) gapSourceIds.items = chunkIdSchema;
+
+  return schema;
+}
+
 const fastRoutineModelContextLimit = 4;
 
 const confidenceOrder = {
@@ -267,6 +289,12 @@ export type AnswerProgressEvent = {
   smartApiPlan?: SmartRagApiPlan;
 };
 
+type AnswerQuestionWithScopeArgs = SearchChunksArgs & {
+  logQuery?: boolean;
+  onProgress?: (event: AnswerProgressEvent) => void | Promise<void>;
+  signal?: AbortSignal;
+};
+
 export type SearchTelemetry = {
   search_cache_hit: boolean;
   shared_cache_hit?: boolean;
@@ -902,8 +930,9 @@ function fallbackReasonFromRouting(reason?: string | null) {
 }
 
 const answerCache = new Map<string, { expiresAt: number; answer: RagAnswer }>();
+const answerInflight = new Map<string, Promise<RagAnswer>>();
 const searchCache = new Map<string, { expiresAt: number; results: SearchResult[]; telemetry: SearchTelemetry }>();
-const ragCacheDependencyVersion = "rag-cache-v9";
+const ragCacheDependencyVersion = "rag-cache-v10";
 const cacheIndexingVersionTtlMs = 5000;
 const cacheIndexingVersionCache = new Map<string, { expiresAt: number; value: string }>();
 
@@ -1012,7 +1041,7 @@ async function analyzeQueryWithClassifierFallback(query: string, analysis: Clini
         operation: "text_generation",
         instructions:
           "Classify this query for retrieval routing only. Do not answer the clinical question. Prefer unsupported when the query is not about indexed clinical document retrieval.",
-        reasoningEffort: "minimal",
+        reasoningEffort: "low",
         textVerbosity: "low",
         schemaName: "clinical_rag_query_classifier",
         promptCacheKey: "clinical-rag-query-classifier-v1",
@@ -1497,6 +1526,7 @@ function setSharedCachedAnswer(
 export function invalidateRagCachesForOwner(ownerId?: string | null) {
   if (!ownerId) {
     answerCache.clear();
+    answerInflight.clear();
     searchCache.clear();
     cacheIndexingVersionCache.clear();
     void (async () => {
@@ -1515,6 +1545,9 @@ export function invalidateRagCachesForOwner(ownerId?: string | null) {
   for (const key of answerCache.keys()) {
     if (key.startsWith(prefix)) answerCache.delete(key);
   }
+  for (const key of answerInflight.keys()) {
+    if (key.startsWith(prefix) || key.includes(`|${ownerId}|`)) answerInflight.delete(key);
+  }
   for (const key of searchCache.keys()) {
     if (key.startsWith(prefix)) searchCache.delete(key);
   }
@@ -3292,13 +3325,6 @@ function rankMemoryCardsForAnswer(cards: DocumentMemoryCard[], query: string, qu
     .map((item) => item.card);
 }
 
-type ExtractiveAnswerPoint = {
-  label: string;
-  text: string;
-  citationChunkIds: string[];
-  source: "dose" | "memory" | "quote";
-};
-
 type AnswerIntent =
   | "dose"
   | "contraindication"
@@ -3326,14 +3352,6 @@ type ExtractedClinicalFact = {
   priority: number;
 };
 
-function cleanExtractiveLine(line: string) {
-  return sourceTextForClinicalProse(line)
-    .replace(/^[-•]\s*/, "")
-    .replace(/^Agitation and Arousal:?\s+Pharmacological Management Guideline\s*/i, "")
-    .replace(/\s+/g, " ")
-    .trim();
-}
-
 const extractiveLabelPattern =
   /\b(?:Medication point|Table evidence|Threshold\/action|Risk\/escalation|Workflow step|Section summary|Source point|Dose detail|Monitoring)\s*:\s*/gi;
 
@@ -3351,7 +3369,7 @@ function cleanExtractivePointText(value: string) {
     .replace(extractiveLabelPattern, " ")
     .replace(/^[\s\-•:]+/, "")
     .replace(/^(?:monitoring|dose|dosing|source|section|table|guideline)\s*[.;:,-]\s*/i, "")
-    .replace(/([A-Za-z)])\s*(\d{1,2})(?=(?:[,.;]|\s|$))/g, "$1")
+    .replace(/([A-Za-z)])(\d{1,2})(?=(?:[,.;]|\s|$))/g, "$1")
     .replace(/\s+[•]\s+/g, ". ")
     .replace(
       /\s+-\s+(?=[A-Z][a-z])|(?:\s+-\s*)?(?:Medication point|Table evidence|Threshold\/action|Risk\/escalation|Workflow step|Section summary|Source point)\s*:\s*/gi,
@@ -3369,9 +3387,11 @@ const extractiveQueryStopwords = new Set([
   "a",
   "an",
   "and",
+  "after",
   "are",
   "about",
   "be",
+  "before",
   "by",
   "can",
   "do",
@@ -3385,6 +3405,8 @@ const extractiveQueryStopwords = new Set([
   "of",
   "on",
   "or",
+  "post",
+  "prior",
   "the",
   "to",
   "what",
@@ -3409,6 +3431,8 @@ const extractiveQueryStopwords = new Set([
   "referral",
   "patient",
   "patients",
+  "required",
+  "requires",
   "clinical",
   "advice",
   "contraindication",
@@ -3449,6 +3473,8 @@ const answerIntentTerms = new Set([
   "renal",
   "result",
   "results",
+  "required",
+  "requires",
   "schedule",
   "threshold",
   "thresholds",
@@ -3469,12 +3495,26 @@ export function classifyAnswerIntent(query: string, queryClass: RagQueryClass):
   if (/\b(?:contraindicat\w*|avoid|do not use|must not|should not|not use|opioid[-\s]?free)\b/.test(normalized)) {
     return "contraindication";
   }
-  if (/\b(?:red|amber|green|anc|fbc|wbc|result|results|threshold|withhold|cease|stop|stopped)\b/.test(normalized)) {
+  const hasResultActionSignal =
+    /\b(?:red|amber|green|anc|fbc|wbc|result|results|threshold|withhold|cease|stop|stopped|toxicity)\b/.test(
+      normalized,
+    ) ||
+    /\b(?:what\s+action|action\s+is\s+required|required\s+action|suspected\s+\w+\s+toxicity)\b/.test(normalized);
+  const hasScheduleSignal = /\b(?:monitor|monitoring|schedule|baseline|follow[-\s]?up|level|levels|test|tests)\b/.test(
+    normalized,
+  );
+  // Toxicity and explicit action queries take priority over monitoring even if schedule/baseline/follow-up terms appear.
+  const hasStrongResultSignal =
+    /\b(?:toxicity|what\s+action|action\s+is\s+required|required\s+action|suspected\s+\w+\s+toxicity)\b/.test(
+      normalized,
+    );
+  if (hasResultActionSignal && (!/\b(?:schedule|baseline|follow[-\s]?up)\b/.test(normalized) || hasStrongResultSignal)) {
     return "red_result_action";
   }
-  if (/\b(?:monitor|monitoring|schedule|baseline|follow[-\s]?up|level|levels|test|tests)\b/.test(normalized)) {
+  if (hasScheduleSignal) {
     return "monitoring_schedule";
   }
+  if (hasResultActionSignal) return "red_result_action";
   if (/\b(?:dose|dosing|dosage|max(?:imum)?|mg|mcg|renal|eGFR|creatinine)\b/i.test(query)) return "dose";
   if (/\b(?:pathway|refer|referral|criteria|ect|electroconvulsive)\b/.test(normalized)) return "pathway_referral";
   if (
@@ -3516,13 +3556,13 @@ function queryIntentTokens(query: string, intent: AnswerIntent) {
 function answerIntentEvidencePattern(intent: AnswerIntent) {
   switch (intent) {
     case "dose":
-      return /\b(?:dose|dosing|dosage|max(?:imum)?|mg|mcg|microgram|micrograms|mmol\/l|eGFR|renal|creatinine|daily|bd|tds|mane|nocte)\b/i;
+      return /\b(?:doses?|dosing|dosage|max(?:imum)?|mg|mcg|microgram|micrograms|mmol\/l|eGFR|renal|creatinine|daily|bd|tds|mane|nocte)\b/i;
     case "contraindication":
       return /\b(?:contraindicat\w*|avoid|must not|do not|should not|not use|opioid[-\s]?free|withdrawal|precipitat\w*)\b/i;
     case "monitoring_schedule":
       return /\b(?:monitor|monitoring|baseline|weekly|monthly|annual|every|level|levels|blood test|fbc|anc|ecg|lft|renal|review)\b/i;
     case "red_result_action":
-      return /\b(?:red|amber|threshold|withhold|cease|stop|discontinue|discontinued|urgent|contact|repeat|review|anc|fbc|wbc|neutrophil|patholog\w*|haematolog\w*|hematolog\w*)\b/i;
+      return /\b(?:red|amber|green|threshold|withhold|cease|stop|discontinue|discontinued|urgent|contact|repeat|review|anc|fbc|wbc|neutrophil|toxic\w*|action|patholog\w*|haematolog\w*|hematolog\w*)\b/i;
     case "pathway_referral":
       return /\b(?:pathway|refer|referral|criteria|indicat\w*|ect|electroconvulsive|specialist|psychiat\w*)\b/i;
     case "document_lookup":
@@ -3556,6 +3596,16 @@ const extractiveTruncationPattern =
   /\b(?:stabili[sz]e\s+the\s+do|the\s+do\b|liver\s+functi\b|respiratio\b|if\s+a\s+60%\s+decrease\s+in\s+b\b)\b/i;
 const extractiveProductCataloguePattern =
   /\b(?:Lithicarb|Quilonum\s+SR|Campral|imprest\s+location|formulary\s+one)\b|[®™]/i;
+const extractiveStructuralArtifactPattern =
+  /\b(?:for\s+required,|monitoringup|prnselection|druguse|anddoses|reviewresponse|maximumrecommendeddoses|recommendeddoses|information:\s*review|links\s+to\s+relevant\s+documents\/resources|pharmacy\s+services\s+and\s+dispensing\s+protocol|role\s+responsibilities|document\s+control|straight\s+to\s+the\s+point\s+of\s+care|full\s+text|pubmed|randomi[sz]ed\s+clinical\s+trial|j\s+psychiatry|ann\s+emerg\s+med|site\s+map|gpo,\s+perth|tel:\s*\(|fax:\s*\()\b/i;
+const extractiveHeadingOnlyPattern =
+  /^(?:dosage?|dosing|monitoring|baseline tests?|therapy|source|section|table|guideline|referral criteria|criteria)(?:\s*\([^)]{1,80}\))?\.?$/i;
+const extractiveAllowedLowercaseStarterPattern =
+  /^(?:if|when|for|in|avoid|do|must|withhold|cease|stop|monitor|check|reduce|increase|adjust|start|commence|begin|use|target|baseline|serum|therapy|dosing|titrate|arrange|refer|review|prescribe|record|complete|continue|discontinue|escalate)\b/i;
+const extractiveConcreteDosePattern =
+  /\b(?:\d+(?:\.\d+)?\s?(?:mg|mcg|microgram|micrograms|mmol\/?l)|mmol\/l|daily|bd|tds|mane|nocte|target|range|serum|levels?|titration|titrate|titrated|adjust(?:ed|ment)?|dose\s+(?:adjust|reduc|increas)|reduce(?:d)?\s+doses?|doses?\s+(?:in|for|when|with|based|according)|max(?:imum)?|renal|eGFR|CrCl|creatinine|elderly|impairment|conventional tablets?)\b/i;
+const extractiveMedicationEntityPattern =
+  /\b(?:acamprosate|aripiprazole|baclofen|citalopram|clozapine|diazepam|disulfiram|droperidol|escitalopram|fluoxetine|haloperidol|lithium|lorazepam|naltrexone|olanzapine|promethazine|quetiapine|risperidone|sertraline|valproate)\b/gi;
 
 function extractiveQueryTokens(query: string) {
   return splitBalancedWords(query).filter((token) => token.length > 2 && !extractiveQueryStopwords.has(token));
@@ -3586,6 +3636,17 @@ function queryTokenMatchesText(token: string, text: string) {
   return false;
 }
 
+function medicationEntitiesInText(text: string) {
+  extractiveMedicationEntityPattern.lastIndex = 0;
+  return Array.from(new Set((text.match(extractiveMedicationEntityPattern) ?? []).map((match) => match.toLowerCase())));
+}
+
+function mentionsDifferentMedicationEntity(sentence: string, query: string) {
+  const queryMedicationEntities = medicationEntitiesInText(query);
+  if (!queryMedicationEntities.length) return false;
+  return medicationEntitiesInText(sentence).some((entity) => !queryMedicationEntities.includes(entity));
+}
+
 function hasRelevantQueryOverlap(
   text: string,
   query: string,
@@ -3614,11 +3675,63 @@ function hasBadExtractiveQuality(text: string) {
   if (!normalized) return true;
   if (extractiveTruncationPattern.test(normalized)) return true;
   if (extractiveProductCataloguePattern.test(normalized)) return true;
+  if (extractiveStructuralArtifactPattern.test(normalized)) return true;
+  if (extractiveHeadingOnlyPattern.test(normalized.replace(/[.;]+$/, ""))) return true;
+  if (/^([A-Za-z][A-Za-z /-]{3,60})\s+\1\.?$/i.test(normalized)) return true;
+  const firstToken = normalized.split(/\s+/, 1)[0] ?? "";
+  if (
+    /^[a-z][a-z -]{2,}\b/.test(normalized) &&
+    !extractiveAllowedLowercaseStarterPattern.test(normalized) &&
+    !medicationEntitiesInText(firstToken).length
+  ) {
+    return true;
+  }
+  if (/\b[A-Za-z]{4,}[A-Z]{2,}[A-Za-z]{2,}\b/.test(normalized)) return true;
+  // Narrow consecutive-arrow check: only flag '>>' that is NOT a clinical comparator like 'QTc >500 ms'.
+  // Two adjacent > with only whitespace between them (not digits/letters) signals markup artifacts.
+  if (/>[\s]*>/.test(normalized) && !/\w\s*>\s*\d/.test(normalized)) return true; // consecutive >> arrows
+  if (/\w+\s*>\s*\w+\s*>\s*\w+/g.test(normalized) && !/\d\s*>\s*\d/.test(normalized)) return true; // breadcrumb trails like A > B > C (not numeric ranges)
+  if (/^\s*(?:references?(?!\s+(?:range|interval|value|level|limit|coordinate|check|system|dosing|monitoring|guideline))|bibliography)\b/i.test(normalized)) return true;
   if (hasClinicalAnswerQualityIssue(normalized)) return true;
   if (/\btable\s+\d+\b/i.test(normalized) && normalized.length > 180) return true;
   return false;
 }
 
+/**
+ * Quality gate for *completed* answers at the final validation step.
+ *
+ * Unlike `hasBadExtractiveQuality`, this version skips `extractiveProductCataloguePattern`
+ * because final answers to brand, PBS/access, or product-form questions legitimately contain
+ * medication brand names (Campral, Lithicarb, Quilonum SR) and ®/™ symbols.
+ * Applying the catalogue filter here would incorrectly replace valid answers with source-gap
+ * responses for those question types.
+ */
+function hasBadFinalAnswerQuality(text: string) {
+  const normalized = normalizeSectionText(text);
+  if (!normalized) return true;
+  if (extractiveTruncationPattern.test(normalized)) return true;
+  // Note: extractiveProductCataloguePattern is intentionally excluded here — see JSDoc above.
+  if (extractiveStructuralArtifactPattern.test(normalized)) return true;
+  if (extractiveHeadingOnlyPattern.test(normalized.replace(/[.;]+$/, ""))) return true;
+  if (/^([A-Za-z][A-Za-z /-]{3,60})\s+\1\.?$/i.test(normalized)) return true;
+  const firstToken = normalized.split(/\s+/, 1)[0] ?? "";
+  if (
+    /^[a-z][a-z -]{2,}\b/.test(normalized) &&
+    !extractiveAllowedLowercaseStarterPattern.test(normalized) &&
+    !medicationEntitiesInText(firstToken).length
+  ) {
+    return true;
+  }
+  if (/\b[A-Za-z]{4,}[A-Z]{2,}[A-Za-z]{2,}\b/.test(normalized)) return true;
+  if (/>[\s]*>/.test(normalized) && !/\w\s*>\s*\d/.test(normalized)) return true;
+  if (/\w+\s*>\s*\w+\s*>\s*\w+/g.test(normalized) && !/\d\s*>\s*\d/.test(normalized)) return true;
+  if (/^\s*(?:references?(?!\s+(?:range|interval|value|level|limit|coordinate|check|system|dosing|monitoring|guideline))|bibliography)\b/i.test(normalized)) return true;
+  if (hasClinicalAnswerQualityIssue(normalized)) return true;
+  if (/\btable\s+\d+\b/i.test(normalized) && normalized.length > 180) return true;
+  return false;
+}
+
+
 function isLowValueExtractiveCaption(clause: string) {
   const descriptor =
     /^(?:clinical\s+table|table|figure|image)\s+(?:showing|detailing|listing|outlining|describing|with|of)\b/i.test(
@@ -3628,55 +3741,6 @@ function isLowValueExtractiveCaption(clause: string) {
   return !extractiveClinicalDirectivePattern.test(clause);
 }
 
-function sourcePointClauses(value: string, query: string) {
-  const tokens = extractiveQueryTokens(query);
-  const clauses = cleanExtractivePointText(value)
-    .split(/(?<=[.!?])\s+|\s+[•]\s+|\s+\|\s+/)
-    .map((clause) => cleanExtractivePointText(clause))
-    .filter(
-      (clause) =>
-        clause.length >= 18 &&
-        !looksLikeJsonArtifact(clause) &&
-        !isLowValueExtractiveCaption(clause) &&
-        !hasBadExtractiveQuality(clause) &&
-        hasRelevantQueryOverlap(clause, query),
-    );
-
-  return clauses
-    .map((clause, index) => {
-      const lower = clause.toLowerCase();
-      const tokenHits = tokens.filter((token) => lower.includes(token)).length;
-      const clinicalSignal =
-        /\b(?:monitor|blood test|fbc|anc|level|baseline|review|urgent|escalat|dose|mg|withhold|cease|form|consent|commence|annual)\b/i.test(
-          clause,
-        )
-          ? 1
-          : 0;
-      const lengthPenalty = clause.length > 260 ? 0.8 : clause.length > 190 ? 0.25 : 0;
-      return { clause, score: tokenHits + clinicalSignal - lengthPenalty, index };
-    })
-    .sort((a, b) => b.score - a.score || a.index - b.index)
-    .map((item) => (item.clause.length <= 240 ? item.clause : `${item.clause.slice(0, 237).trim()}...`));
-}
-
-function bestNaturalSourcePoint(value: string, query: string) {
-  return sourcePointClauses(value, query)[0] ?? "";
-}
-
-function uniqueExtractivePoints(points: ExtractiveAnswerPoint[], limit: number) {
-  const seen = new Set<string>();
-  const selected: ExtractiveAnswerPoint[] = [];
-  for (const point of points) {
-    const normalized = cleanExtractivePointText(point.text).toLowerCase();
-    const key = normalized.slice(0, 140);
-    if (!normalized || seen.has(key)) continue;
-    seen.add(key);
-    selected.push({ ...point, text: cleanExtractivePointText(point.text) });
-    if (selected.length >= limit) break;
-  }
-  return selected;
-}
-
 function splitClinicalEvidenceSentences(value: string) {
   return sourceTextForClinicalProse(value)
     .split(/\r?\n+|(?<=[.!?])\s+|\s+[•]\s+|\s+\|\s+/)
@@ -3702,22 +3766,22 @@ function factKindForSentence(sentence: string, query: string, intent: AnswerInte
   }
   if (/\b(?:renal|kidney|eGFR|creatinine|CrCl)\b/i.test(text)) return "renal_limit";
   if (
-    /\b(?:red|amber|threshold|withhold|cease|stop|discontinue|discontinued|urgent|contact|repeat|anc|fbc|wbc|neutrophil)\b/i.test(
+    /\b(?:red|amber|green|threshold|withhold|cease|stop|discontinue|discontinued|urgent|contact|repeat|anc|fbc|wbc|neutrophil|toxic\w*|action)\b/i.test(
       text,
     )
   ) {
     return "threshold_action";
   }
+  if (/\b(?:pathway|refer|referral|criteria|indicat\w*|ect|electroconvulsive|specialist|psychiat\w*)\b/i.test(text)) {
+    return "pathway_referral";
+  }
   if (
     /\b(?:monitor|monitoring|baseline|weekly|monthly|annual|every|level|levels|blood test|ecg|lft|review)\b/i.test(text)
   ) {
     return "monitoring";
   }
-  if (/\b(?:pathway|refer|referral|criteria|indicat\w*|ect|electroconvulsive|specialist|psychiat\w*)\b/i.test(text)) {
-    return "pathway_referral";
-  }
   if (
-    /\b(?:dose|dosing|dosage|max(?:imum)?|\d+(?:\.\d+)?\s?(?:mg|mcg)|daily|bd|tds|mane|nocte|mmol\/l)\b/i.test(text)
+    /\b(?:doses?|dosing|dosage|max(?:imum)?|\d+(?:\.\d+)?\s?(?:mg|mcg)|daily|bd|tds|mane|nocte|mmol\/l)\b/i.test(text)
   ) {
     return "dose";
   }
@@ -3726,6 +3790,111 @@ function factKindForSentence(sentence: string, query: string, intent: AnswerInte
   return null;
 }
 
+function factSupportsAnswerIntent(
+  kind: ExtractedClinicalFactKind,
+  sentence: string,
+  query: string,
+  intent: AnswerIntent,
+) {
+  const text = normalizeSectionText(sentence);
+  const normalizedQuery = normalizeSectionText(query).toLowerCase();
+  if (!text || hasBadExtractiveQuality(text)) return false;
+
+  switch (intent) {
+    case "dose":
+      if (kind !== "dose" && kind !== "renal_limit") {
+        // Allow contraindication facts when the query explicitly asks for renal information,
+        // since renal contraindications (e.g. creatinine >120 micromol/L: contraindicated) are
+        // essential dose safety facts for renal-dose queries.
+        if (kind === "contraindication" && /\brenal\b/i.test(query) && /\b(?:renal|kidney|eGFR|creatinine|CrCl)\b/i.test(text)) {
+          // fall through to dose text check below
+        } else {
+          return false;
+        }
+      }
+      if (/\brenal\b/i.test(query) && !/\b(?:renal|kidney|eGFR|creatinine|CrCl)\b/i.test(text)) return false;
+      if (/\bmax(?:imum)?\b/i.test(query) && !/\b(?:max(?:imum)?|\d+(?:\.\d+)?\s?(?:mg|mcg))\b/i.test(text)) {
+        return false;
+      }
+      return extractiveConcreteDosePattern.test(text);
+    case "contraindication":
+      return (
+        kind === "contraindication" &&
+        /\b(?:contraindicat\w*|avoid|must not|do not|should not|not use|opioid[-\s]?free|withdrawal|precipitat\w*)\b/i.test(
+          text,
+        )
+      );
+    case "monitoring_schedule":
+      // Also allow renal_limit facts — sentences like 'baseline renal function then repeat periodically'
+      // are classified as renal_limit (renal check triggers before monitoring), but are directly relevant
+      // to monitoring schedule answers.
+      if (kind !== "monitoring" && kind !== "dose" && kind !== "renal_limit") return false;
+      return /\b(?:monitor|monitoring|follow[-\s]?up|baseline|weekly|monthly|annual|every|several\s+times\s+a\s+year|level|levels|blood test|fbc|anc|wbc|ecg|lft|renal|thyroid|metabolic|glucose|bsl|lipids|cholesterol|triglycerides|blood pressure|bp|pulse|weight|bmi|mmol\/l|range)\b/i.test(
+        text,
+      );
+    case "red_result_action":
+      if (kind !== "threshold_action" && kind !== "caveat") return false;
+      return (
+        /\b(?:withhold|cease|stop|discontinue|discontinued|contact|urgent|repeat|review|call for help|escalat\w*|monitor|toxicity|rash)\b/i.test(
+          text,
+        ) &&
+        // Include green/neutrophil: valid clozapine result-action vocabulary the classifier accepts
+        /\b(?:red|amber|green|threshold|result|results|anc|fbc|wbc|neutrophil|toxicity|rash|reaction|blood|patholog\w*|haematolog\w*|hematolog\w*)\b/i.test(
+          text,
+        )
+      );
+    case "pathway_referral":
+      if (kind !== "pathway_referral") return false;
+      if (/\breferr?al|refer\b/i.test(query) && !/\b(?:refer|referral|form\s*1a)\b/i.test(text)) return false;
+      if (/\bdischarge\s+criteria\b/i.test(text) && !/\bdischarge\b/.test(normalizedQuery)) return false;
+      return /\b(?:pathway|procedure|refer|referral|criteria|indicat\w*|ect|electroconvulsive|specialist|psychiat\w*|step)\b/i.test(
+        text,
+      );
+    case "document_lookup":
+      return /\b(?:document|guideline|procedure|policy|protocol|form|source|file|support|supports|covers|contains)\b/i.test(
+        text,
+      );
+    case "unsupported":
+      return false;
+    case "general":
+    default:
+      if (/\b(?:references?|bibliography|full\s+text|pubmed|randomi[sz]ed\s+clinical\s+trial)\b/i.test(text)) {
+        return false;
+      }
+      if (/^what\s+is\b/i.test(query)) {
+        return /\b(?:is|are|means|defined|characteri[sz]ed|involves|refers\s+to)\b/i.test(text);
+      }
+      return /\b(?:assess|arrange|check|continue|review|treat|manage|monitor|refer|dose|risk|therapy|diagnos\w*)\b/i.test(
+        text,
+      );
+  }
+}
+
+function factSentenceMatchesQueryFromResult(
+  sentence: string,
+  result: SearchResult,
+  query: string,
+  intent: AnswerIntent,
+) {
+  if (mentionsDifferentMedicationEntity(sentence, query)) return false;
+  if (hasRelevantQueryOverlap(sentence, query, intent)) return true;
+  if (intent === "general" || intent === "unsupported") return false;
+
+  const resultText = evidenceTextForGate(result);
+  const entityTokens = queryEntityTokens(query, intent);
+  const entityCoveredByResult =
+    entityTokens.length === 0 || entityTokens.some((token) => queryTokenMatchesText(token, resultText));
+  if (!entityCoveredByResult) return false;
+
+  const normalized = normalizeSectionText(sentence).toLowerCase();
+  const intentTokens = queryIntentTokens(query, intent);
+  const intentCovered =
+    intentTokens.length === 0 ||
+    intentTokens.some((token) => queryTokenMatchesText(token, normalized)) ||
+    (intent === "dose" && extractiveConcreteDosePattern.test(normalized));
+  return answerIntentEvidencePattern(intent).test(normalized) && intentCovered;
+}
+
 function factPriority(kind: ExtractedClinicalFactKind, intent: AnswerIntent) {
   if (intent === "contraindication" && kind === "contraindication") return 9;
   if (intent === "red_result_action" && kind === "threshold_action") return 9;
@@ -3745,7 +3914,8 @@ function tableFactsToClinicalFacts(result: SearchResult, query: string, intent:
         [fact.row_label, fact.clinical_parameter, fact.threshold_value, fact.action].filter(Boolean).join(": "),
       );
       const kind = factKindForSentence(text, query, intent);
-      if (!text || !kind || !hasRelevantQueryOverlap(text, query, intent)) return null;
+      if (!text || !kind || !factSentenceMatchesQueryFromResult(text, result, query, intent)) return null;
+      if (!factSupportsAnswerIntent(kind, text, query, intent)) return null;
       return {
         kind,
         text,
@@ -3779,9 +3949,10 @@ function extractClinicalFactsFromResults(results: SearchResult[], query: string,
       .filter(Boolean)
       .join("\n");
     for (const sentence of splitClinicalEvidenceSentences(text)) {
-      if (!hasRelevantQueryOverlap(sentence, query, intent)) continue;
+      if (!factSentenceMatchesQueryFromResult(sentence, result, query, intent)) continue;
       const kind = factKindForSentence(sentence, query, intent);
       if (!kind) continue;
+      if (!factSupportsAnswerIntent(kind, sentence, query, intent)) continue;
       const cleaned = sentence.length <= 280 ? sentence : `${sentence.slice(0, 277).trim()}...`;
       const key = `${kind}:${normalizeSectionText(cleaned).toLowerCase().slice(0, 160)}`;
       if (seen.has(key)) continue;
@@ -3903,7 +4074,14 @@ function buildDocumentSupportListAnswer(args: { query: string; results: SearchRe
     const gapAnswer = finalQualityGapAnswer(args.query, "document_lookup", "document_lookup");
     return { answer: gapAnswer, citationChunkIds: [] as string[], answerSections: [] as AnswerSection[] };
   }
-  const names = documents.map((document) => document.title || document.file_name).filter(Boolean);
+  const names = documents
+    .map((document) =>
+      normalizeSectionText(document.title || document.file_name)
+        .replace(/([a-zA-Z])\(/g, "$1 (")
+        .replace(/\s{2,}/g, " ")
+        .trim(),
+    )
+    .filter(Boolean);
   const answer =
     names.length === 1
       ? `I found one indexed document that supports this query: ${names[0]}.`
@@ -3941,140 +4119,6 @@ function buildDocumentSupportListAnswer(args: { query: string; results: SearchRe
   };
 }
 
-function extractMedicationDosePoints(results: SearchResult[], query: string, limit = 4): ExtractiveAnswerPoint[] {
-  const seen = new Set<string>();
-  const points: ExtractiveAnswerPoint[] = [];
-  const coreQueryTokens = splitBalancedWords(query).filter(
-    (token) =>
-      token.length > 3 &&
-      !["dose", "dosing", "dosage", "medication", "medicine", "patient", "patients", "please"].includes(token),
-  );
-
-  for (const result of results) {
-    const resultText = `${result.title} ${result.content}`.toLowerCase();
-    if (coreQueryTokens.length && !coreQueryTokens.some((token) => resultText.includes(token))) continue;
-    const lines = sourceTextForClinicalProse(result.content)
-      .split(/\r?\n+|(?<=[.!?])\s+/)
-      .map(cleanExtractiveLine)
-      .filter((line) => line.length >= 24);
-    const candidates = lines.flatMap((line) => {
-      if (
-        /\b(?:supporting information|relevant standards|references|document owner|authorisation|published date|amendment)\b/i.test(
-          line,
-        )
-      )
-        return [];
-      if (/\b(?:warnings? on the use|black box warning|food and drug administration|ann emerg med)\b/i.test(line))
-        return [];
-      const isMonitoring = /\b(?:monitor(?:ing)?|observations?|ecg|respiratory|every \d+|minutes?|hours?)\b/i.test(
-        line,
-      );
-      const doseAnchor = line.search(
-        /\b(?:lorazepam|clonazepam|midazolam|risperidone|haloperidol|olanzapine|quetiapine|chlorpromazine|droperidol|promethazine|diazepam|\d+(?:\.\d+)?\s?mg|maximum\s+\d)/i,
-      );
-      const hasDoseAction =
-        /\b(?:repeat(?:ing)? doses?|first dose|second dose|oral medication|im medication|maximum doses?|post im dose)\b/i.test(
-          line,
-        );
-      if (doseAnchor < 0 && !isMonitoring && !hasDoseAction) return [];
-      const headingMatch = [
-        ...line.matchAll(
-          /\b(?:Recommended pharmacological treatment options|Repeating doses|Reviewing response|Monitoring|Oral Intramuscular)\s*:/gi,
-        ),
-      ]
-        .filter((match) => (match.index ?? 0) < Math.max(doseAnchor, 0))
-        .at(-1);
-      const focused =
-        headingMatch?.index !== undefined
-          ? line.slice(headingMatch.index)
-          : doseAnchor > 80
-            ? line.slice(Math.max(0, doseAnchor - 60))
-            : line;
-      return [focused.replace(/^[^A-Za-z0-9]*(?:Appendix|Step)\s*\d*:?[^A-Za-z0-9]*/i, "").trim()];
-    });
-
-    for (const candidate of candidates) {
-      for (const clause of sourcePointClauses(candidate, query).slice(0, 3)) {
-        const text = clause.length <= 280 ? clause : `${clause.slice(0, 277).trim()}...`;
-        const key = text.toLowerCase();
-        if (seen.has(key)) continue;
-        seen.add(key);
-        const hasDrugDose =
-          /\b(?:lorazepam|clonazepam|midazolam|risperidone|haloperidol|olanzapine|quetiapine|chlorpromazine|droperidol|promethazine|diazepam|\d+(?:\.\d+)?\s?mg|maximum\s+\d)\b/i.test(
-            text,
-          );
-        const label =
-          !hasDrugDose && /\b(?:monitor|observe|ecg|physiological|respiratory|minutes?|hours?)\b/i.test(text)
-            ? "Monitoring"
-            : "Dose detail";
-        points.push({ label, text, citationChunkIds: [result.id], source: "dose" });
-        if (points.length >= limit) return points;
-      }
-    }
-  }
-
-  return points;
-}
-
-function memoryCardToExtractivePoint(card: DocumentMemoryCard, query: string): ExtractiveAnswerPoint | null {
-  const text = bestNaturalSourcePoint(card.content, query);
-  if (!text) return null;
-  return {
-    label: memoryCardAnswerLabel(card),
-    text,
-    citationChunkIds: card.source_chunk_ids ?? [],
-    source: "memory",
-  };
-}
-
-function quoteToExtractivePoint(quote: QuoteCard, query: string): ExtractiveAnswerPoint | null {
-  const text = bestNaturalSourcePoint(
-    `${quote.section_heading ? `${quote.section_heading}: ` : ""}${quote.quote}`,
-    query,
-  );
-  if (!text) return null;
-  return {
-    label: quote.section_heading ?? "Source quote",
-    text,
-    citationChunkIds: [quote.chunk_id],
-    source: "quote",
-  };
-}
-
-function formatNaturalPoint(point: ExtractiveAnswerPoint) {
-  const text = sanitizeAnswerText(cleanExtractivePointText(point.text)).replace(/[.;,\s]+$/, "");
-  if (!text) return "";
-  return `${text}.`;
-}
-
-function buildNaturalExtractiveAnswer(args: {
-  query: string;
-  queryClass: RagQueryClass;
-  points: ExtractiveAnswerPoint[];
-  sourceCount: number;
-}) {
-  const points = uniqueExtractivePoints(args.points, 3);
-  if (!points.length) {
-    const gapAnswer = finalQualityGapAnswer(args.query, args.queryClass);
-    return {
-      answer: gapAnswer,
-      body: gapAnswer,
-      citationChunkIds: [] as string[],
-      answerSections: [] as AnswerSection[],
-    };
-  }
-
-  const pointSentences = points.map(formatNaturalPoint).filter(Boolean);
-  const answer = sanitizeAnswerText(pointSentences.join(" "));
-
-  return {
-    answer: boldHighYieldClinicalText(answer, args.query),
-    body: boldHighYieldClinicalText(answer, args.query),
-    citationChunkIds: answer ? Array.from(new Set(points.flatMap((point) => point.citationChunkIds))) : [],
-    answerSections: [] as AnswerSection[],
-  };
-}
-
 function buildExtractiveAnswer(args: {
   query: string;
   queryClass: RagQueryClass;
@@ -4120,17 +4164,6 @@ function buildExtractiveAnswer(args: {
     citationIds.add(quote.chunk_id);
   }
 
-  const dosePoints =
-    args.queryClass === "medication_dose_risk" ? extractMedicationDosePoints(args.results, args.query, 4) : [];
-  const remainingPointSlots = Math.max(0, 5 - dosePoints.length);
-  const memoryPointLimit = Math.min(remainingPointSlots, memoryCards.length >= 4 ? 3 : 2);
-  const memoryPoints = selectDiverseMemoryCards(memoryCards, memoryPointLimit)
-    .map((card) => memoryCardToExtractivePoint(card, args.query))
-    .filter((point): point is ExtractiveAnswerPoint => Boolean(point));
-  const quotePoints = quoteCards
-    .slice(0, Math.max(0, 5 - dosePoints.length - memoryPoints.length))
-    .map((quote) => quoteToExtractivePoint(quote, args.query))
-    .filter((point): point is ExtractiveAnswerPoint => Boolean(point));
   const answerIntent = classifyAnswerIntent(args.query, args.queryClass);
   const naturalAnswer = documentSupportListIntent(args.query, args.queryClass)
     ? buildDocumentSupportListAnswer({ query: args.query, results: args.results })
@@ -4140,23 +4173,25 @@ function buildExtractiveAnswer(args: {
         intent: answerIntent,
         results: args.results,
       });
-  const fallbackNaturalAnswer =
-    answerIntent === "general" && naturalAnswer.citationChunkIds.length === 0
-      ? buildNaturalExtractiveAnswer({
-          query: args.query,
-          queryClass: args.queryClass,
-          points: [...dosePoints, ...memoryPoints, ...quotePoints],
-          sourceCount: args.results.length,
-        })
-      : naturalAnswer;
-
-  // When no concise source sentence could be extracted, buildNaturalExtractiveAnswer
-  // returns a sentinel non-answer with no citationChunkIds. Do not present that as a
-  // grounded, confidence-rated answer just because compactCitations seeded a citation.
-  const hasExtractedAnswer = fallbackNaturalAnswer.citationChunkIds.length > 0;
+
+  // Fact synthesis is the production extractive path. If no clean fact survives
+  // coverage and artifact gates, fail closed instead of stitching snippets.
+  const hasExtractedAnswer = naturalAnswer.citationChunkIds.length > 0;
+
+  // Ensure any chunk IDs referenced by the synthesized answer are present in citations,
+  // even if they were not in the top-ranked compactCitations slice.
+  for (const chunkId of naturalAnswer.citationChunkIds) {
+    if (!citationIds.has(chunkId)) {
+      const source = args.results.find((result) => result.id === chunkId);
+      if (source) {
+        citations.push(resultCitation(source));
+        citationIds.add(chunkId);
+      }
+    }
+  }
 
   return {
-    answer: fallbackNaturalAnswer.answer,
+    answer: naturalAnswer.answer,
     grounded: hasExtractedAnswer && citations.length > 0,
     confidence: hasExtractedAnswer ? deriveConfidence(args.results, citations.length) : "unsupported",
     citations: citations.slice(0, 5),
@@ -4166,7 +4201,7 @@ function buildExtractiveAnswer(args: {
     routingReason: args.routeReason,
     queryClass: args.queryClass,
     latencyTimings: args.timings,
-    answerSections: fallbackNaturalAnswer.answerSections ?? [],
+    answerSections: naturalAnswer.answerSections ?? [],
     quoteCards,
     visualEvidence: args.visualEvidence,
     bestSource: args.bestSource,
@@ -4254,12 +4289,23 @@ function isEssentialSimpleQuestionSection(section: Pick<AnswerSection, "heading"
 const clinicalQuerySignalPattern =
   /\b(?:lithium|clozapine|acamprosate|naltrexone|sertraline|valproate|antipsychotic|ect|bulimia|anorexia|eating disorder|dose|renal|pregnan|monitor|fbc|anc|qtc|opioid|contraindicat|referral|pathway|patient|clinical|guideline|medication|medicine|prescrib|therapy|treatment)\b/i;
 
+function isClearlyNonClinicalUnsupportedQuery(query: string) {
+  return (
+    /\b(?:coffee|machine|parking|payroll|roster|leave|wifi|printer|canteen|expense|timesheet|room\s+booking|building|staff\s+room)\b/i.test(
+      query,
+    ) && !clinicalQuerySignalPattern.test(query)
+  );
+}
+
 function finalQualityGapAnswer(
   query: string,
   queryClass: RagQueryClass,
   intent: AnswerIntent = classifyAnswerIntent(query, queryClass),
 ) {
-  if (queryClass === "unsupported_or_general" && !clinicalQuerySignalPattern.test(query)) {
+  if (
+    isClearlyNonClinicalUnsupportedQuery(query) ||
+    (queryClass === "unsupported_or_general" && !clinicalQuerySignalPattern.test(query))
+  ) {
     return "No relevant clinical source was found for this query.";
   }
   if (intent === "document_lookup") return "No current indexed document directly supporting this request was found.";
@@ -4272,6 +4318,8 @@ function finalQualityGapAnswer(
     return "No current source with monitoring timing or schedule guidance was found.";
   if (intent === "red_result_action") {
     if (/\bqtc\b/i.test(query)) return "No current source with QTc threshold or ECG action guidance was found.";
+    if (/\btoxicity\b/i.test(query)) return "No current source with toxicity action guidance was found.";
+    if (/\brash\b/i.test(query)) return "No current source with rash action guidance was found.";
     return "No current source with threshold-specific action guidance was found.";
   }
   if (intent === "dose") {
@@ -4284,6 +4332,27 @@ function finalQualityGapAnswer(
 function isFragmentLikeClinicalAnswer(text: string, query: string) {
   const normalized = normalizeSectionText(text);
   const lower = normalized.toLowerCase();
+  if (
+    /\b(?:dosing\s+frequencies\s+outside|prn\s+dose\s+daily\s+dose|table\s+summari[sz]ing|includes\s+risk\s+monitoring\s+form|recommended\s+over\s+>\d+\s*kg)\b/i.test(
+      normalized,
+    )
+  ) {
+    return true;
+  }
+  if (/^for\s+(?:after|before|prior|post),/i.test(normalized)) return true;
+  if (/\bis\s+to:\.?$/i.test(normalized)) return true;
+  if (
+    /^what\s+is\b/i.test(query) &&
+    // Only apply this fragment gate for general/definition questions, not for clinical intent
+    // queries like "What is the maximum dose?" or "What is the QTc threshold?" which produce
+    // valid concise fact answers that don't contain definition-style phrasing.
+    !/\b(?:dose|dosage|dosing|max(?:imum)?|mg|mcg|threshold|monitor|renal|contraindicat|referral|pathway|qtc|fbc|anc|wbc|level|levels)\b/i.test(query) &&
+    !/\b(?:is|are)\s+(?:a|an|the)\b|\b(?:defined\s+as|characteri[sz]ed\s+by|involves|refers\s+to|is\s+an?\s+eating\s+disorder)\b/i.test(
+      normalized,
+    )
+  ) {
+    return true;
+  }
   if (/\bbaby\s+whilst\b.*\bpost\s+anaesthetic\b/i.test(normalized)) return true;
   if (/^(\*{0,2}[a-z][a-z0-9 -]{2,}\*{0,2})\s*:\s*\1\b/i.test(normalized)) return true;
   if (/\?\s+(?:monitoring|adverse effects|when prescribed|prescribed for)\b/i.test(normalized)) return true;
@@ -4311,6 +4380,19 @@ function isMissingCriticalQueryIntent(query: string, text: string) {
   if (/\b(?:referral|refer|pathway)\b/.test(normalizedQuery) && /\bect\b/.test(normalizedQuery)) {
     return !/\b(?:ect|electroconvulsive|refer|referral|criteria|indicat\w*|psychiat\w*)\b/.test(normalizedText);
   }
+  if (/\b(?:monitor|monitoring|schedule|baseline|follow[-\s]?up)\b/.test(normalizedQuery)) {
+    if (/\bfbc\b/.test(normalizedQuery) && !/\bfbc\b/.test(normalizedText)) return true;
+    if (/\banc\b/.test(normalizedQuery) && !/\banc\b/.test(normalizedText)) return true;
+    if (
+      /\bschedule\b/.test(normalizedQuery) &&
+      !/\b(?:schedule|baseline|weekly|monthly|annual|every|first\s+\d+\s+weeks|then|ongoing)\b/.test(normalizedText)
+    ) {
+      return true;
+    }
+    return !/\b(?:monitor|monitoring|follow[-\s]?up|baseline|weekly|monthly|annual|every|level|levels|blood test|fbc|anc|wbc|ecg|lft|renal|thyroid|metabolic|glucose|bsl|lipids|cholesterol|triglycerides|blood pressure|bp|pulse|weight|bmi)\b/.test(
+      normalizedText,
+    );
+  }
   return false;
 }
 
@@ -4354,24 +4436,34 @@ function cleanAnswerSectionHeading(heading: string, body: string) {
 
 function finalizeRagAnswerQuality(answer: RagAnswer, query: string, queryClass: RagQueryClass): RagAnswer {
   const cleanedAnswer = sanitizeAnswerText(answer.answer);
-  const existingGapAnswer =
-    !answer.grounded &&
-    /could not find enough clean|no relevant clinical source|no current source|cannot provide a clinical answer|cannot provide a source-backed clinical answer/i.test(
+  const gapLikeAnswer =
+    /could not find enough clean|no relevant clinical source|no current source|cannot provide a clinical answer|cannot provide a source-backed clinical answer|nearby indexed passages|not strong enough to support a reliable answer|no specific\b.*\bcan be confirmed|do not contain indexed guidance|do not contain (?:specific\s+)?information|do not provide specific|no\b.*\bguidance\b.*\bincluded|defer to other sources/i.test(
       cleanedAnswer,
     );
+  const existingGapAnswer = gapLikeAnswer && (!answer.grounded || answer.routingMode === "strong" || answer.confidence === "low");
   if (existingGapAnswer) {
     const gapAnswer = finalQualityGapAnswer(query, queryClass);
     return {
       ...answer,
       answer: gapAnswer,
+      grounded: false,
+      confidence: "unsupported",
       answerSections: [],
       responseMode: "evidence_gap",
     };
   }
 
+  if (!answer.grounded && answer.confidence === "unsupported") {
+    return finalQualityFailure(answer, query, queryClass, "ungrounded_unsupported_answer");
+  }
+
   const answerIsBad =
     !cleanedAnswer ||
     cleanedAnswer.length < 18 ||
+    // Use hasBadFinalAnswerQuality (not hasBadExtractiveQuality) so that legitimate brand/PBS
+    // medication answers containing product names like Campral, Lithicarb, or ®/™ symbols
+    // are not incorrectly replaced with source-gap responses.
+    hasBadFinalAnswerQuality(cleanedAnswer) ||
     hasClinicalAnswerQualityIssue(cleanedAnswer) ||
     isLowYieldClinicalText(cleanedAnswer) ||
     isFragmentLikeClinicalAnswer(cleanedAnswer, query) ||
@@ -5221,18 +5313,40 @@ export async function answerQuestion(query: string, documentId?: string) {
   return answerQuestionWithScope({ query, documentId, allowGlobalSearch: true });
 }
 
-export async function answerQuestionWithScope(args: {
-  query: string;
-  documentId?: string;
-  documentIds?: string[];
-  ownerId?: string;
-  allowGlobalSearch?: boolean;
-  logQuery?: boolean;
-  skipCache?: boolean;
-  queryMode?: ClinicalQueryMode;
-  onProgress?: (event: AnswerProgressEvent) => void | Promise<void>;
-}): Promise<RagAnswer> {
+export async function answerQuestionWithScope(args: AnswerQuestionWithScopeArgs): Promise<RagAnswer> {
   const startedAt = Date.now();
+  const coalescingEnabled = !args.skipCache && env.RAG_ANSWER_CACHE_TTL_MS > 0 && env.RAG_ANSWER_CACHE_SIZE > 0;
+  const inflightKey = coalescingEnabled ? scopedAnswerCacheKey(args) : null;
+  const existing = inflightKey ? answerInflight.get(inflightKey) : undefined;
+
+  if (existing) {
+    await args.onProgress?.({
+      stage: "cached",
+      message: "Waiting for an identical cited answer request already in progress.",
+      reason: "answer_inflight_coalesced",
+    });
+    const answer = cloneAnswer(await existing);
+    answer.routingReason = answer.routingReason
+      ? `${answer.routingReason}; answer_inflight_coalesced`
+      : "answer_inflight_coalesced";
+    answer.latencyTimings = {
+      ...answer.latencyTimings,
+      total_latency_ms: Date.now() - startedAt,
+    };
+    return answer;
+  }
+
+  const pending = answerQuestionWithScopeUncoalesced(args, startedAt).finally(() => {
+    if (inflightKey) answerInflight.delete(inflightKey);
+  });
+  if (inflightKey) answerInflight.set(inflightKey, pending);
+  return pending;
+}
+
+async function answerQuestionWithScopeUncoalesced(
+  args: AnswerQuestionWithScopeArgs,
+  startedAt: number,
+): Promise<RagAnswer> {
   assertGlobalSearchAllowed({
     query: args.query,
     documentId: args.documentId,
@@ -5435,6 +5549,11 @@ export async function answerQuestionWithScope(args: {
     smart_api_display_mode: plan.displayMode,
     smart_api_latency_plan: plan.latencyPlan,
     smart_api_source_link_count: plan.sourceLinkCount,
+    smart_api_retrieval_quality: plan.answerPlan.retrievalQuality,
+    smart_api_answer_route: plan.answerPlan.routeMode,
+    smart_api_model_strategy: plan.answerPlan.modelStrategy,
+    smart_api_fallback_behavior: plan.answerPlan.fallbackBehavior,
+    smart_api_quality_criteria: plan.answerPlan.qualityCriteria,
   });
   await args.onProgress?.({
     stage: "retrieved",
@@ -5463,9 +5582,7 @@ export async function answerQuestionWithScope(args: {
     const unsupportedWithNearbySources = results.length > 0;
     const answer: RagAnswer = annotateAnswerWithDiagnostics(
       {
-        answer: unsupportedWithNearbySources
-          ? "I found nearby indexed passages, but they are not strong enough to support a reliable answer. Try refining the query or selecting a more relevant document."
-          : "I could not find enough support in the indexed documents to answer this query. Upload or index a relevant guideline, then search again.",
+        answer: finalQualityGapAnswer(args.query, queryClass),
         grounded: false,
         confidence: "unsupported",
         citations: [],
@@ -5739,6 +5856,9 @@ Rules:
       }`,
       `display_mode: ${smartApiPlan.displayMode}`,
       `route: ${route.mode} (${route.reason})`,
+      `answer_plan: ${smartApiPlan.answerPlan.modelStrategy}`,
+      `quality_gate: ${smartApiPlan.answerPlan.qualityCriteria.join(", ")}`,
+      `fallback_behavior: ${smartApiPlan.answerPlan.fallbackBehavior}`,
       `source_count: ${contextResults.length}`,
       `source_relevance: ${relevance.label}`,
     ].join("\n");
@@ -5798,17 +5918,18 @@ ${qualityRetryInstruction}`
       : buildAnswerInput(contextResults);
     const generationStartedAt = Date.now();
     try {
-      const result = await generateStructuredTextResult(input, answerJsonOutputSchema, {
+      const result = await generateStructuredTextResult(input, answerJsonOutputSchemaForResults(contextResults), {
         model,
         maxOutputTokens: env.OPENAI_MAX_OUTPUT_TOKENS,
         operation: "answer",
         schemaName: "clinical_rag_answer",
         instructions: answerInstructions,
-        promptCacheKey: "clinical-rag-answer-v11",
+        promptCacheKey: "clinical-rag-answer-v12",
         reasoningEffort:
           model === env.OPENAI_STRONG_ANSWER_MODEL
             ? env.OPENAI_STRONG_REASONING_EFFORT
             : env.OPENAI_FAST_REASONING_EFFORT,
+        signal: args.signal,
       });
       openAIUsage = addOpenAIUsage(openAIUsage, result.usage);
       if (result.requestId) openAIRequestIds.push(result.requestId);
@@ -5818,6 +5939,15 @@ ${qualityRetryInstruction}`
     }
   }
 
+  function generationIncompleteReason(result: OpenAITextResult) {
+    return result.incompleteReason ?? (result.status === "incomplete" ? "incomplete" : "unknown");
+  }
+
+  function generationRetryReason(prefix: string, result: OpenAITextResult) {
+    const reason = generationIncompleteReason(result);
+    return reason === "max_output_tokens" ? `${prefix}_max_output_tokens` : `${prefix}_incomplete_${reason}`;
+  }
+
   function summarizeGenerationFailureReason(error: unknown) {
     if (error instanceof Error && error.message.trim()) return error.message.trim();
     if (typeof error === "string" && error.trim()) return error.trim();
@@ -5850,6 +5980,8 @@ ${qualityRetryInstruction}`
       citations: hasSources ? fallbackCitations : [],
       sources: answerInputResults,
       modelUsed: null,
+      openAIRequestIds,
+      openAIUsage: hasOpenAIUsage(openAIUsage) ? openAIUsage : undefined,
       routingMode: "unsupported",
       routingReason: `${route.reason}; generation_fallback:${sanitizedReason}`,
       queryClass,
@@ -5915,6 +6047,30 @@ ${qualityRetryInstruction}`
     });
     let packedContextResults = await packContextForGeneration(modelContextResults);
     let generated = await generateWithModel(route.model!, packedContextResults);
+    if (generated.truncated && route.mode === "fast" && route.model !== env.OPENAI_STRONG_ANSWER_MODEL) {
+      const retryReason = `${generationRetryReason("fast", generated)}_retry_strong`;
+      answerRetryCount += 1;
+      answerRetryReasons.push(retryReason);
+      modelUsed = env.OPENAI_STRONG_ANSWER_MODEL;
+      routingReason = `${route.reason}; ${retryReason}`;
+      retriedWithStrong = true;
+      await args.onProgress?.({
+        stage: "retrying",
+        message: "Fast answer hit the output limit, retrying with the strong model.",
+        mode: "strong",
+        model: env.OPENAI_STRONG_ANSWER_MODEL,
+        reason: routingReason,
+      });
+      packedContextResults = await packContextForGeneration(answerInputResults);
+      generated = await generateWithModel(env.OPENAI_STRONG_ANSWER_MODEL, packedContextResults);
+      retrievalDiagnostics.routeMode = "strong";
+    }
+    if (generated.truncated) {
+      const retryReason = generationRetryReason(retriedWithStrong ? "strong" : "generation", generated);
+      answerRetryCount += 1;
+      answerRetryReasons.push(retryReason);
+      throw new Error(`OpenAI generation incomplete: ${generationIncompleteReason(generated)}`);
+    }
     let answer = annotateAnswerWithDiagnostics(
       parseAnswerJson(generated.text, packedContextResults, args.query),
       retrievalDiagnostics,
@@ -5954,6 +6110,12 @@ ${qualityRetryInstruction}`
       packedContextResults = await packContextForGeneration(answerInputResults);
       generated = await generateWithModel(env.OPENAI_STRONG_ANSWER_MODEL, packedContextResults);
       retrievalDiagnostics.routeMode = "strong";
+      if (generated.truncated) {
+        const truncatedReason = generationRetryReason("strong", generated);
+        answerRetryCount += 1;
+        answerRetryReasons.push(truncatedReason);
+        throw new Error(`OpenAI generation incomplete: ${generationIncompleteReason(generated)}`);
+      }
       answer = annotateAnswerWithDiagnostics(
         parseAnswerJson(generated.text, packedContextResults, args.query),
         retrievalDiagnostics,
@@ -5981,6 +6143,12 @@ ${qualityRetryInstruction}`
         "The previous answer failed validation. Return schema-valid output only, with a natural clinical synthesis in the answer field. Avoid template/source-inventory wording and do not include JSON fragments inside text fields. If the question is a simple definition or direct fact question, answer only that question and return answerSections as an empty array unless a source-gap or safety caveat is essential.",
       );
       retrievalDiagnostics.routeMode = "strong";
+      if (generated.truncated) {
+        const truncatedReason = generationRetryReason("strong_quality_retry", generated);
+        answerRetryCount += 1;
+        answerRetryReasons.push(truncatedReason);
+        throw new Error(`OpenAI generation incomplete: ${generationIncompleteReason(generated)}`);
+      }
       answer = annotateAnswerWithDiagnostics(
         parseAnswerJson(generated.text, packedContextResults, args.query),
         retrievalDiagnostics,
@@ -6020,7 +6188,8 @@ ${qualityRetryInstruction}`
     // answer's citations. buildExtractiveAnswer derives its own source-backed
     // citations from the retrieved results, so trigger recovery whenever the
     // generated answer is unusable and we have retrieved results to extract from.
-    const canRecoverExtractively = answer.citations.length > 0 || answerInputResults.length > 0;
+    const canRecoverExtractively =
+      modelUsed !== env.OPENAI_STRONG_ANSWER_MODEL && (answer.citations.length > 0 || answerInputResults.length > 0);
     if (canRecoverExtractively && isUnusableGeneratedAnswer(answer)) {
       answer = buildExtractiveAnswer({
         query: args.query,
@@ -6255,7 +6424,7 @@ ${document.title}
 Sources:
 ${buildRagSourceBlock(results)}`;
 
-  const generated = await generateStructuredTextResult(summaryInput, answerJsonOutputSchema, {
+  const generated = await generateStructuredTextResult(summaryInput, answerJsonOutputSchemaForResults(results), {
     model: env.OPENAI_ANSWER_MODEL,
     maxOutputTokens: env.OPENAI_MAX_OUTPUT_TOKENS,
     operation: "summary",
diff --git a/src/lib/smart-rag-api.ts b/src/lib/smart-rag-api.ts
index 686bb7b6f7..02d567eabd 100644
--- a/src/lib/smart-rag-api.ts
+++ b/src/lib/smart-rag-api.ts
@@ -11,6 +11,7 @@ import type {
 } from "@/lib/types";
 
 type RetrievalStrategy = SmartRagApiPlan["retrievalStrategy"];
+type SmartRagAnswerPlan = SmartRagApiPlan["answerPlan"];
 
 type BuildSmartRagApiPlanArgs = {
   query: string;
@@ -49,6 +50,29 @@ function resultScore(result: SearchResult) {
   return result.hybrid_score ?? result.similarity ?? 0;
 }
 
+function strongestResultScore(results: SearchResult[]) {
+  return results.reduce((max, result) => Math.max(max, resultScore(result)), 0);
+}
+
+function retrievalQuality(results: SearchResult[]): SmartRagAnswerPlan["retrievalQuality"] {
+  if (results.length === 0) return "none";
+  const strongestScore = strongestResultScore(results);
+  if (strongestScore >= 0.76) return "strong";
+  if (strongestScore >= 0.5) return "adequate";
+  return "weak";
+}
+
+function routeModeFromPlanMode(
+  mode: SmartRagApiPlan["responseMode"],
+  routeMode?: RagAnswer["routingMode"],
+): SmartRagAnswerPlan["routeMode"] {
+  if (routeMode) return routeMode;
+  if (mode === "unsupported") return "unsupported";
+  if (mode === "strong_synthesis") return "strong";
+  if (mode === "extractive_answer" || mode === "document_lookup") return "extractive";
+  return "fast";
+}
+
 function linkReason(result: SearchResult, queryClass: RagQueryClass) {
   if (queryClass === "document_lookup") return "Best document/title match";
   if (queryClass === "table_threshold") return "Relevant table, threshold, or monitoring evidence";
@@ -164,6 +188,59 @@ function answerFocus(args: {
   return "Answer directly using the highest-ranked source links.";
 }
 
+function modelStrategy(routeMode: SmartRagAnswerPlan["routeMode"]): SmartRagAnswerPlan["modelStrategy"] {
+  if (routeMode === "unsupported") return "no_generation";
+  if (routeMode === "extractive") return "narrow_extractive_lookup";
+  if (routeMode === "strong") return "strong_model_then_quality_gate";
+  return "fast_model_then_quality_gate";
+}
+
+function qualityCriteria(args: {
+  queryClass: RagQueryClass;
+  mode: SmartRagApiPlan["responseMode"];
+}): string[] {
+  const criteria = [
+    "first_sentence_answers_query",
+    "no_source_headings_or_fragments",
+    "citations_match_retrieved_chunks",
+    "no_unsupported_numbers_or_doses",
+    "query_intent_covered",
+  ];
+  if (args.queryClass === "medication_dose_risk" || args.queryClass === "table_threshold") {
+    criteria.push("no_cross_medication_leakage");
+  }
+  if (args.queryClass === "comparison" || args.mode === "multi_document_synthesis") {
+    criteria.push("conflicts_or_gaps_handled_when_supported");
+  }
+  if (args.mode === "unsupported") {
+    return ["no_answer_without_source_support", "nearby_sources_are_not_promoted_to_answer"];
+  }
+  return criteria;
+}
+
+function fallbackBehavior(routeMode: SmartRagAnswerPlan["routeMode"]): SmartRagAnswerPlan["fallbackBehavior"] {
+  if (routeMode === "unsupported") return "return_source_gap";
+  if (routeMode === "extractive") return "return_narrow_extractive_lookup";
+  return "retry_strong_then_source_gap";
+}
+
+function answerPlan(args: {
+  queryClass: RagQueryClass;
+  mode: SmartRagApiPlan["responseMode"];
+  routeMode?: RagAnswer["routingMode"];
+  results: SearchResult[];
+}): SmartRagAnswerPlan {
+  const plannedRouteMode = routeModeFromPlanMode(args.mode, args.routeMode);
+  return {
+    retrievalQuality: retrievalQuality(args.results),
+    routeMode: plannedRouteMode,
+    modelStrategy: modelStrategy(plannedRouteMode),
+    qualityCriteria: qualityCriteria({ queryClass: args.queryClass, mode: args.mode }),
+    fallbackBehavior: fallbackBehavior(plannedRouteMode),
+    sourcePolicy: "no_answer_without_retrieved_support",
+  };
+}
+
 function streamPlan(mode: SmartRagApiPlan["responseMode"], retrievalStrategy: SmartRagApiPlan["retrievalStrategy"]) {
   if (mode === "unsupported")
     return ["Search indexed sources", "Report unsupported evidence", "Show nearby source links if available"];
@@ -203,6 +280,7 @@ export function buildSmartRagApiPlan(args: BuildSmartRagApiPlanArgs): SmartRagAp
       documentCount,
       linkCount: coreSourceLinks.length,
     }),
+    answerPlan: answerPlan({ queryClass: args.queryClass, mode, routeMode: args.routeMode, results: args.results }),
     sourceLinkCount: coreSourceLinks.length,
     coreSourceLinks,
     streamPlan: streamPlan(mode, retrievalStrategy),
diff --git a/src/lib/source-governance.ts b/src/lib/source-governance.ts
index 0afa148bb4..4d03ef4773 100644
--- a/src/lib/source-governance.ts
+++ b/src/lib/source-governance.ts
@@ -28,7 +28,7 @@ export type GroupedSourceGovernanceWarning = {
 };
 
 export const sourceGovernanceRefusalAnswer =
-  "I cannot provide a clinical answer because one or more matched documents need review before use. Try a narrower clinical term or scope the search to a current approved document.";
+  "I cannot provide a clinical answer because one or more matched documents are not suitable for clinical use yet. Try a narrower clinical term or scope the search to a current approved document.";
 
 function isLocalMetadataText(value: string) {
   return /\b(?:wa|western australia|perth|north metropolitan|east metropolitan|south metropolitan|health service)\b/i.test(
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 18c45fe306..b5bc62799f 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -76,6 +76,7 @@ export type DocumentOrganizationProfile = {
     service: string[];
     topic: string[];
     workflow: string[];
+    medication: string[];
   };
   review_status: DocumentOrganizationReviewStatus;
 };
@@ -731,6 +732,19 @@ export type SmartRagSourceLink = {
   snippet: string;
 };
 
+export type SmartRagAnswerPlan = {
+  retrievalQuality: "none" | "weak" | "adequate" | "strong";
+  routeMode: "unsupported" | "extractive" | "fast" | "strong";
+  modelStrategy:
+    | "no_generation"
+    | "narrow_extractive_lookup"
+    | "fast_model_then_quality_gate"
+    | "strong_model_then_quality_gate";
+  qualityCriteria: string[];
+  fallbackBehavior: "return_source_gap" | "return_narrow_extractive_lookup" | "retry_strong_then_source_gap";
+  sourcePolicy: "no_answer_without_retrieved_support";
+};
+
 export type SmartRagApiPlan = {
   query: string;
   queryClass: RagQueryClass;
@@ -758,6 +772,7 @@ export type SmartRagApiPlan = {
     | "unknown";
   latencyPlan: "cache_or_text_first" | "balanced_hybrid" | "strong_generation" | "no_supported_answer";
   answerFocus: string;
+  answerPlan: SmartRagAnswerPlan;
   displayMode: AnswerResponseMode;
   sourceLinkCount: number;
   coreSourceLinks: SmartRagSourceLink[];
diff --git a/supabase/migrations/20260629100000_rag_queries_retention.sql b/supabase/migrations/20260629100000_rag_queries_retention.sql
new file mode 100644
index 0000000000..d7ab13012a
--- /dev/null
+++ b/supabase/migrations/20260629100000_rag_queries_retention.sql
@@ -0,0 +1,27 @@
+set search_path = public, pg_catalog, pg_temp;
+
+-- rag_queries can retain raw clinical query text (PHI) when RAG_PERSIST_RAW_QUERY_TEXT
+-- is enabled. Bound retention so logs do not accumulate indefinitely. Default 30 days.
+create or replace function public.purge_expired_rag_queries(p_retention_days integer default 30)
+returns integer
+language plpgsql
+security definer
+set search_path = public, pg_catalog, pg_temp
+as $$
+declare
+  v_deleted integer;
+begin
+  if p_retention_days < 1 then
+    raise exception 'retention days must be positive';
+  end if;
+  delete from public.rag_queries where created_at < now() - make_interval(days => p_retention_days);
+  get diagnostics v_deleted = row_count;
+  return v_deleted;
+end;
+$$;
+
+revoke all on function public.purge_expired_rag_queries(integer) from public, anon, authenticated;
+
+-- Daily purge at 03:30 UTC. Re-create idempotently by clearing any prior job first.
+select cron.unschedule(jobid) from cron.job where jobname = 'purge-expired-rag-queries';
+select cron.schedule('purge-expired-rag-queries', '30 3 * * *', $$select public.purge_expired_rag_queries(30);$$);
diff --git a/supabase/migrations/20260629110000_audit_logs.sql b/supabase/migrations/20260629110000_audit_logs.sql
new file mode 100644
index 0000000000..0c1fd03973
--- /dev/null
+++ b/supabase/migrations/20260629110000_audit_logs.sql
@@ -0,0 +1,24 @@
+set search_path = public, pg_catalog, pg_temp;
+
+-- Append-only audit trail for sensitive operations (uploads, deletes, renames,
+-- label changes). Required for clinical governance and multi-user accountability.
+create table if not exists public.audit_logs (
+  id uuid primary key default gen_random_uuid(),
+  owner_id uuid references auth.users(id) on delete set null,
+  action text not null,
+  resource_type text,
+  resource_id text,
+  metadata jsonb not null default '{}'::jsonb,
+  created_at timestamptz not null default now(),
+  constraint audit_logs_action_nonempty check (btrim(action) <> '')
+);
+
+create index if not exists audit_logs_owner_created_idx on public.audit_logs(owner_id, created_at desc);
+create index if not exists audit_logs_action_created_idx on public.audit_logs(action, created_at desc);
+
+-- audit_logs is written and read only via the service role (server-side). RLS is
+-- enabled with no policies and no authenticated/anon grants, so the table is not
+-- client-readable and not discoverable in the GraphQL schema; the service role
+-- bypasses RLS. This keeps the trail internal and tamper-resistant from clients.
+alter table public.audit_logs enable row level security;
+revoke all on public.audit_logs from anon, authenticated;
diff --git a/tests/audit.test.ts b/tests/audit.test.ts
new file mode 100644
index 0000000000..2362fddb30
--- /dev/null
+++ b/tests/audit.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it, vi } from "vitest";
+import { writeAuditLog } from "../src/lib/audit";
+
+function mockClient(insert: (values: Record<string, unknown>) => Promise<{ error: { message: string } | null }>) {
+  const insertSpy = vi.fn(insert);
+  const from = vi.fn(() => ({ insert: insertSpy }));
+  return { from, insertSpy };
+}
+
+describe("writeAuditLog", () => {
+  it("inserts a normalized audit row into audit_logs", async () => {
+    const client = mockClient(async () => ({ error: null }));
+
+    await writeAuditLog(client, {
+      ownerId: "owner-1",
+      action: "document_upload",
+      resourceType: "document",
+      resourceId: "doc-1",
+      metadata: { fileType: "application/pdf" },
+    });
+
+    expect(client.from).toHaveBeenCalledWith("audit_logs");
+    expect(client.insertSpy).toHaveBeenCalledWith({
+      owner_id: "owner-1",
+      action: "document_upload",
+      resource_type: "document",
+      resource_id: "doc-1",
+      metadata: { fileType: "application/pdf" },
+    });
+  });
+
+  it("defaults optional fields", async () => {
+    const client = mockClient(async () => ({ error: null }));
+
+    await writeAuditLog(client, { ownerId: "owner-1", action: "document_delete" });
+
+    expect(client.insertSpy).toHaveBeenCalledWith({
+      owner_id: "owner-1",
+      action: "document_delete",
+      resource_type: null,
+      resource_id: null,
+      metadata: {},
+    });
+  });
+
+  it("does not throw when the insert returns an error", async () => {
+    const client = mockClient(async () => ({ error: { message: "insert failed" } }));
+    await expect(writeAuditLog(client, { ownerId: "o", action: "document_rename" })).resolves.toBeUndefined();
+  });
+
+  it("does not throw when the insert rejects", async () => {
+    const client = mockClient(async () => {
+      throw new Error("connection lost");
+    });
+    await expect(writeAuditLog(client, { ownerId: "o", action: "document_label_change" })).resolves.toBeUndefined();
+  });
+});
diff --git a/tests/document-organization.test.ts b/tests/document-organization.test.ts
index 08fea0a7f0..5ced5b4434 100644
--- a/tests/document-organization.test.ts
+++ b/tests/document-organization.test.ts
@@ -157,4 +157,38 @@ describe("document organization classifier", () => {
     expect(classification.profile.document_type.label).toBe("unknown");
     expect(classification.profile.review_status).toBe("needs_review");
   });
+
+  it("classifies finance and hr workflows correctly and avoids bare hr false positives", () => {
+    // 1. Bracket tag [HR] should map to hr
+    const classificationBracket = classifyDocumentOrganization({
+      title: "Staff Code of Conduct (HR)",
+      file_name: "conduct.pdf",
+      contentText: "Staff policy document.",
+    });
+    expect(classificationBracket.profile.secondary_facets.workflow).toContain("hr");
+
+    // 2. Explicit 'human resources' in text should map to hr
+    const classificationExplicit = classifyDocumentOrganization({
+      title: "Staff Recruitment Policy",
+      file_name: "recruitment.pdf",
+      contentText: "Managed by the human resources department.",
+    });
+    expect(classificationExplicit.profile.secondary_facets.workflow).toContain("hr");
+
+    // 3. Bare 'hr' as time unit in text should NOT map to hr workflow
+    const classificationTime = classifyDocumentOrganization({
+      title: "Infusion Guide",
+      file_name: "infusion.pdf",
+      contentText: "Administer the drug over 1 hr.",
+    });
+    expect(classificationTime.profile.secondary_facets.workflow).not.toContain("hr");
+
+    // 4. Finance workflow should match financial terms
+    const classificationFinance = classifyDocumentOrganization({
+      title: "Annual Budget",
+      file_name: "budget.pdf",
+      contentText: "Department billing and cost allocation.",
+    });
+    expect(classificationFinance.profile.secondary_facets.workflow).toContain("finance");
+  });
 });
diff --git a/tests/file-signature.test.ts b/tests/file-signature.test.ts
new file mode 100644
index 0000000000..753bed1c59
--- /dev/null
+++ b/tests/file-signature.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from "vitest";
+import { assertFileContentSignature, PublicApiError } from "../src/lib/http";
+
+const DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+const XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+
+function bytes(...values: number[]) {
+  return new Uint8Array(values);
+}
+
+const PDF_HEAD = bytes(0x25, 0x50, 0x44, 0x46, 0x2d, 0x31, 0x2e, 0x37); // "%PDF-1.7"
+const ZIP_HEAD = bytes(0x50, 0x4b, 0x03, 0x04, 0x14, 0x00, 0x06, 0x00); // "PK\x03\x04..."
+const NOT_MATCHING = bytes(0x4d, 0x5a, 0x90, 0x00, 0x03, 0x00, 0x00, 0x00); // "MZ.." (PE executable)
+
+describe("assertFileContentSignature", () => {
+  it("accepts a PDF whose bytes start with %PDF", () => {
+    expect(() => assertFileContentSignature("application/pdf", PDF_HEAD)).not.toThrow();
+  });
+
+  it("rejects a PDF whose bytes are not a PDF", () => {
+    expect(() => assertFileContentSignature("application/pdf", NOT_MATCHING)).toThrow(PublicApiError);
+  });
+
+  it("accepts OOXML (DOCX/XLSX) with a ZIP local-file-header signature", () => {
+    expect(() => assertFileContentSignature(DOCX, ZIP_HEAD)).not.toThrow();
+    expect(() => assertFileContentSignature(XLSX, ZIP_HEAD)).not.toThrow();
+  });
+
+  it("rejects DOCX/XLSX that are not ZIP archives", () => {
+    expect(() => assertFileContentSignature(DOCX, PDF_HEAD)).toThrow(/does not match its declared type/);
+    expect(() => assertFileContentSignature(XLSX, NOT_MATCHING)).toThrow(PublicApiError);
+  });
+
+  it("does not signature-check text/plain or unknown types", () => {
+    expect(() => assertFileContentSignature("text/plain", NOT_MATCHING)).not.toThrow();
+    expect(() => assertFileContentSignature("application/octet-stream", NOT_MATCHING)).not.toThrow();
+  });
+});
diff --git a/tests/health-route.test.ts b/tests/health-route.test.ts
new file mode 100644
index 0000000000..bae0304257
--- /dev/null
+++ b/tests/health-route.test.ts
@@ -0,0 +1,65 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+function mockEnv(options: { configured: boolean; demoMode?: boolean }) {
+  vi.resetModules();
+  vi.doMock("@/lib/env", () => ({
+    env: {
+      NEXT_PUBLIC_SUPABASE_URL: options.configured ? "https://sjrfecxgysukkwxsowpy.supabase.co" : undefined,
+      SUPABASE_SERVICE_ROLE_KEY: options.configured ? "service-role-key" : undefined,
+      OPENAI_API_KEY: options.configured ? "openai-key" : undefined,
+    },
+    isDemoMode: () => Boolean(options.demoMode),
+  }));
+}
+
+function healthRequest(query = "") {
+  return new Request(`http://localhost/api/health${query}`);
+}
+
+async function payload(response: Response) {
+  return (await response.json()) as Record<string, unknown>;
+}
+
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.resetModules();
+});
+
+describe("GET /api/health", () => {
+  it("reports ok when fully configured", async () => {
+    mockEnv({ configured: true });
+    const { GET } = await import("../src/app/api/health/route");
+
+    const response = await GET(healthRequest());
+    const body = await payload(response);
+
+    expect(response.status).toBe(200);
+    expect(body.status).toBe("ok");
+    expect(body.checks).toMatchObject({ supabaseConfig: "ok", openaiConfig: "ok" });
+    expect(body.demoMode).toBe(false);
+    expect(typeof body.uptimeSeconds).toBe("number");
+  });
+
+  it("reports degraded with 503 when required config is missing", async () => {
+    mockEnv({ configured: false });
+    const { GET } = await import("../src/app/api/health/route");
+
+    const response = await GET(healthRequest());
+    const body = await payload(response);
+
+    expect(response.status).toBe(503);
+    expect(body.status).toBe("degraded");
+    expect(body.checks).toMatchObject({ supabaseConfig: "missing", openaiConfig: "missing" });
+  });
+
+  it("does not leak secret values in the payload", async () => {
+    mockEnv({ configured: true });
+    const { GET } = await import("../src/app/api/health/route");
+
+    const response = await GET(healthRequest());
+    const raw = JSON.stringify(await payload(response));
+
+    expect(raw).not.toContain("service-role-key");
+    expect(raw).not.toContain("openai-key");
+  });
+});
diff --git a/tests/logger.test.ts b/tests/logger.test.ts
new file mode 100644
index 0000000000..0a29cf4077
--- /dev/null
+++ b/tests/logger.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it } from "vitest";
+import { redactLogContext } from "../src/lib/logger";
+
+describe("redactLogContext", () => {
+  it("redacts values under sensitive keys", () => {
+    const out = redactLogContext({
+      status: 500,
+      authorization: "Bearer secret-token",
+      serviceRoleKey: "sb_secret_abc",
+      email: "patient@example.com",
+      query: "56yo male with psychosis on 12mg haloperidol",
+      answer: "clinical answer text",
+      name: "Error",
+    });
+
+    expect(out.status).toBe(500);
+    expect(out.name).toBe("Error");
+    expect(out.authorization).toBe("[redacted]");
+    expect(out.serviceRoleKey).toBe("[redacted]");
+    expect(out.email).toBe("[redacted]");
+    expect(out.query).toBe("[redacted]");
+    expect(out.answer).toBe("[redacted]");
+  });
+
+  it("redacts nested sensitive keys", () => {
+    const out = redactLogContext({ details: { apiKey: "k", code: "P0001" } }) as {
+      details: Record<string, unknown>;
+    };
+    expect(out.details.apiKey).toBe("[redacted]");
+    expect(out.details.code).toBe("P0001");
+  });
+
+  it("truncates very long strings", () => {
+    const out = redactLogContext({ stack: "x".repeat(2000) });
+    expect(String(out.stack)).toContain("[truncated]");
+    expect(String(out.stack).length).toBeLessThan(600);
+  });
+
+  it("serializes Error values to name and message", () => {
+    const out = redactLogContext({ cause: new Error("boom") }) as { cause: Record<string, unknown> };
+    expect(out.cause).toMatchObject({ name: "Error", message: "boom" });
+  });
+});
diff --git a/tests/openai-cache.test.ts b/tests/openai-cache.test.ts
index 79084c3bb2..5052b92143 100644
--- a/tests/openai-cache.test.ts
+++ b/tests/openai-cache.test.ts
@@ -85,9 +85,12 @@ describe("OpenAI query embedding cache", () => {
     vi.stubEnv("OPENAI_API_KEY", "test-key");
     vi.stubEnv("OPENAI_REQUEST_TIMEOUT_MS", "1234");
     vi.stubEnv("OPENAI_MAX_RETRIES", "1");
+    vi.stubEnv("OPENAI_GENERATION_MAX_RETRIES", "1");
     vi.stubEnv("OPENAI_PROMPT_CACHE_RETENTION", "24h");
     vi.stubEnv("OPENAI_STORE_RESPONSES", "false");
     vi.stubEnv("OPENAI_TEXT_VERBOSITY", "low");
+    vi.stubEnv("OPENAI_STRONG_ANSWER_MODEL", "gpt-5.5");
+    vi.stubEnv("OPENAI_STRONG_REASONING_EFFORT", "high");
 
     vi.doMock("openai", () => ({
       default: class MockOpenAI {
@@ -120,14 +123,16 @@ describe("OpenAI query embedding cache", () => {
     }));
 
     const { generateStructuredTextResult } = await import("../src/lib/openai");
+    const controller = new AbortController();
     const result = await generateStructuredTextResult(
       "Question",
       { type: "object", properties: {}, required: [] },
       {
-        model: "gpt-5.4-mini",
+        model: "gpt-5.5",
         operation: "answer",
         schemaName: "clinical_test",
         maxOutputTokens: 200,
+        signal: controller.signal,
       },
     );
 
@@ -139,18 +144,106 @@ describe("OpenAI query embedding cache", () => {
       cached_input_tokens: 64,
       reasoning_output_tokens: 5,
     });
-    expect(capturedOptions).toMatchObject({ timeout: 1234, maxRetries: 1 });
+    expect(capturedOptions).toMatchObject({ timeout: 1234, maxRetries: 1, signal: controller.signal });
     expect(capturedBody).toMatchObject({
-      model: "gpt-5.4-mini",
+      model: "gpt-5.5",
       max_output_tokens: 200,
       store: false,
       prompt_cache_key: "clinical-rag-answer-v2",
       prompt_cache_retention: "24h",
       metadata: { operation: "answer" },
+      reasoning: { effort: "high" },
     });
-    expect(((capturedBody.text as Record<string, unknown>).format as Record<string, unknown>).name).toBe(
-      "clinical_test",
-    );
+    expect(capturedBody.text).toMatchObject({
+      verbosity: "low",
+      format: {
+        type: "json_schema",
+        name: "clinical_test",
+        strict: true,
+        schema: { type: "object", properties: {}, required: [] },
+      },
+    });
+  });
+
+  it("applies model capability rules for reasoning and verbosity", async () => {
+    const capturedBodies: Record<string, unknown>[] = [];
+
+    vi.stubEnv("OPENAI_API_KEY", "test-key");
+    vi.stubEnv("OPENAI_STORE_RESPONSES", "false");
+    vi.stubEnv("OPENAI_TEXT_VERBOSITY", "medium");
+    vi.stubEnv("OPENAI_STRONG_ANSWER_MODEL", "gpt-5.5");
+    vi.stubEnv("OPENAI_STRONG_REASONING_EFFORT", "high");
+
+    vi.doMock("openai", () => ({
+      default: class MockOpenAI {
+        embeddings = { create: vi.fn() };
+        responses = {
+          create: vi.fn((body: Record<string, unknown>) => {
+            capturedBodies.push(body);
+            return {
+              withResponse: async () => ({
+                data: { status: "completed", output_text: '{"answer":"ok"}' },
+                request_id: `req_${capturedBodies.length}`,
+              }),
+            };
+          }),
+        };
+      },
+    }));
+
+    const { generateStructuredTextResult } = await import("../src/lib/openai");
+    const schema = { type: "object", properties: {}, required: [] };
+
+    await generateStructuredTextResult("Question", schema, {
+      model: "gpt-5.5",
+      operation: "answer",
+      schemaName: "clinical_test",
+      maxOutputTokens: 200,
+    });
+    await generateStructuredTextResult("Question", schema, {
+      model: "gpt-5.5",
+      operation: "answer",
+      schemaName: "clinical_test",
+      maxOutputTokens: 200,
+      reasoningEffort: "xhigh",
+    });
+    await generateStructuredTextResult("Question", schema, {
+      model: "gpt-5.4-mini",
+      operation: "answer",
+      schemaName: "clinical_test",
+      maxOutputTokens: 200,
+      reasoningEffort: "high",
+    });
+    await generateStructuredTextResult("Question", schema, {
+      model: "gpt-4.1-mini",
+      operation: "answer",
+      schemaName: "clinical_test",
+      maxOutputTokens: 200,
+      reasoningEffort: "high",
+    });
+
+    expect(capturedBodies[0]).toMatchObject({
+      model: "gpt-5.5",
+      reasoning: { effort: "high" },
+      text: expect.objectContaining({ verbosity: "medium" }),
+    });
+    expect(capturedBodies[1]).toMatchObject({
+      model: "gpt-5.5",
+      reasoning: { effort: "xhigh" },
+      text: expect.objectContaining({ verbosity: "medium" }),
+    });
+    expect(capturedBodies[2]).toMatchObject({
+      model: "gpt-5.4-mini",
+      reasoning: { effort: "high" },
+      text: expect.objectContaining({ verbosity: "medium" }),
+    });
+    expect(capturedBodies[3]).toMatchObject({
+      model: "gpt-4.1-mini",
+      text: expect.objectContaining({ format: expect.any(Object) }),
+    });
+    expect(capturedBodies[3]).not.toHaveProperty("reasoning");
+    expect(capturedBodies[3].text as Record<string, unknown>).not.toHaveProperty("verbosity");
+    expect(JSON.stringify(capturedBodies)).not.toContain("minimal");
   });
 
   it("flags truncated (incomplete) responses (GEN-C1)", async () => {
@@ -214,6 +307,42 @@ describe("OpenAI query embedding cache", () => {
     expect(result.status).toBe("completed");
   });
 
+  it("applies configured vision image detail to image inputs", async () => {
+    let capturedBody: Record<string, unknown> = {};
+
+    vi.stubEnv("OPENAI_API_KEY", "test-key");
+    vi.stubEnv("OPENAI_VISION_MODEL", "gpt-5.5");
+    vi.stubEnv("OPENAI_VISION_IMAGE_DETAIL", "low");
+
+    vi.doMock("openai", () => ({
+      default: class MockOpenAI {
+        embeddings = { create: vi.fn() };
+        responses = {
+          create: vi.fn((body: Record<string, unknown>) => {
+            capturedBody = body;
+            return {
+              withResponse: async () => ({
+                data: { status: "completed", output_text: "Clinical table caption." },
+                request_id: "req_vision_detail",
+              }),
+            };
+          }),
+        };
+      },
+    }));
+
+    const { captionImageFromBase64 } = await import("../src/lib/openai");
+    const caption = await captionImageFromBase64({
+      base64: "ZmFrZQ==",
+      mimeType: "image/png",
+      nearbyText: "Monitoring table",
+    });
+
+    expect(caption).toBe("Clinical table caption.");
+    const input = capturedBody.input as Array<{ content: Array<Record<string, unknown>> }>;
+    expect(input[0]?.content.find((part) => part.type === "input_image")).toMatchObject({ detail: "low" });
+  });
+
   it("maps OpenAI rate limits to a safe public error", async () => {
     const { mapOpenAIError } = await import("../src/lib/openai");
 
diff --git a/tests/rag-answer-fallback.test.ts b/tests/rag-answer-fallback.test.ts
index 731a9063fc..e738037adc 100644
--- a/tests/rag-answer-fallback.test.ts
+++ b/tests/rag-answer-fallback.test.ts
@@ -68,6 +68,70 @@ class EmptyQuery implements PromiseLike<{ data: unknown[]; error: null }> {
   }
 }
 
+type GeneratedAnswerPayload = {
+  answer: string;
+  grounded: boolean;
+  confidence: "high" | "medium" | "low" | "unsupported";
+  answerSections?: unknown[];
+  citations?: Array<{ chunk_id: string }>;
+  quoteCards?: unknown[];
+  conflictsOrGaps?: unknown[];
+};
+
+async function answerFromTextSources(
+  query: string,
+  sources: SearchResult[],
+  generatedAnswer?: GeneratedAnswerPayload,
+) {
+  vi.stubEnv("OPENAI_API_KEY", "test-key");
+  vi.stubEnv("RAG_SEARCH_CACHE_TTL_MS", "0");
+  vi.stubEnv("RAG_ANSWER_CACHE_TTL_MS", "0");
+
+  const rpc = vi.fn(async (name: string) => {
+    if (name === "match_document_chunks_text") return { data: sources, error: null };
+    if (name === "get_related_document_metadata") return { data: [], error: null };
+    return { data: [], error: null };
+  });
+
+  vi.doMock("@/lib/supabase/admin", () => ({
+    createAdminClient: () => ({
+      rpc,
+      from: vi.fn(() => new EmptyQuery()),
+    }),
+  }));
+  const generateStructuredTextResult = vi.fn(async () => ({
+    text: JSON.stringify(
+      generatedAnswer ?? {
+        answer: "No current source with specific guidance for this query was found.",
+        grounded: false,
+        confidence: "unsupported",
+        answerSections: [],
+        citations: [],
+        quoteCards: [],
+        conflictsOrGaps: [],
+      },
+    ),
+    model: "gpt-4.1-mini",
+    operation: "answer",
+    latencyMs: 12,
+    requestId: "req_answer_from_text_sources",
+    usage: { input_tokens: 120, output_tokens: 80, total_tokens: 200 },
+  }));
+
+  vi.doMock("@/lib/openai", () => ({
+    embedTextWithTelemetry: vi.fn(),
+    generateStructuredTextResult,
+  }));
+
+  const { answerQuestionWithScope } = await import("../src/lib/rag");
+  return answerQuestionWithScope({
+    query,
+    ownerId: undefined,
+    logQuery: false,
+    skipCache: true,
+  });
+}
+
 afterEach(() => {
   vi.restoreAllMocks();
   vi.resetModules();
@@ -167,12 +231,13 @@ describe("RAG structured-output fallback", () => {
       skipCache: true,
     });
 
-    expect(generateStructuredTextResult).not.toHaveBeenCalled();
-    expect(answer.routingMode).toBe("extractive");
+    expect(generateStructuredTextResult).toHaveBeenCalledTimes(1);
+    expect(answer.routingMode).toBe("fast");
+    expect(answer.routingReason).toContain("clinical_fast_grounded_synthesis");
     expect(answer.answer.replace(/\*\*/g, "")).toMatch(/clozapine Monitoring Form/i);
     expect(answer.answer).not.toContain("- Medication point");
     expect(answer.answer).not.toMatch(/Medication point:.*Medication point:/);
-    expect(answer.answerSections ?? []).toEqual([]);
+    expect(answer.answerSections?.[0]?.heading).toBe("Monitoring documents");
   });
 
   it("retries template-like fast answers with the strong model before returning", async () => {
@@ -283,16 +348,16 @@ describe("RAG structured-output fallback", () => {
       skipCache: true,
     });
 
-    expect(generateStructuredTextResult).not.toHaveBeenCalled();
-    expect(answer.routingMode).toBe("extractive");
-    expect(answer.routingReason).toContain("high_confidence_extractive_retrieval");
-    expect(answer.openAIRequestIds ?? []).toEqual([]);
-    expect(answer.grounded).toBe(false);
-    expect(answer.confidence).toBe("unsupported");
-    expect(answer.responseMode).toBe("evidence_gap");
-    expect(answer.answer).toMatch(/No current source with monitoring timing or schedule guidance/i);
+    expect(generateStructuredTextResult).toHaveBeenCalledTimes(2);
+    expect(answer.routingMode).toBe("strong");
+    expect(answer.routingReason).toContain("fast_template_retry_strong");
+    expect(answer.openAIRequestIds ?? []).toEqual(["req_fast_template", "req_strong_natural"]);
+    expect(answer.grounded).toBe(true);
+    expect(answer.confidence).toBe("medium");
+    expect(answer.responseMode).toBe("clinical_pathway");
+    expect(answer.answer.replace(/\*\*/g, "")).toMatch(/Clozapine initiation requires/i);
     expect(answer.answer).not.toMatch(/retrieved source|source-backed|based on the provided excerpts/i);
-    expect(answer.answerSections ?? []).toEqual([]);
+    expect(answer.answerSections?.[0]?.heading).toBe("Documentation");
   });
 
   it("retries over-expanded fast answers for simple direct questions", async () => {
@@ -514,7 +579,7 @@ describe("RAG structured-output fallback", () => {
           ],
           conflictsOrGaps: [],
         }),
-        model: "gpt-5.4",
+        model: "gpt-5.5",
         operation: "answer",
         latencyMs: 18,
         requestId: "req_strong_template",
@@ -546,7 +611,7 @@ describe("RAG structured-output fallback", () => {
           ],
           conflictsOrGaps: [],
         }),
-        model: "gpt-5.4",
+        model: "gpt-5.5",
         operation: "answer",
         latencyMs: 14,
         requestId: "req_strong_quality",
@@ -683,15 +748,15 @@ describe("RAG structured-output fallback", () => {
     });
 
     const plainAnswer = answer.answer.replace(/\*\*/g, "");
-    expect(generateStructuredTextResult).not.toHaveBeenCalled();
-    expect(answer.routingMode).toBe("extractive");
+    expect(generateStructuredTextResult).toHaveBeenCalledTimes(1);
+    expect(answer.routingMode).toBe("strong");
     expect(plainAnswer).toContain("must be discontinued immediately");
     expect(plainAnswer).not.toContain("Table detailing roles and responsibilities");
     expect(plainAnswer).not.toContain("clinical_table");
     expect(plainAnswer).not.toContain("table_crop");
   });
 
-  it("retries malformed fast output and fails safely through extractive recovery", async () => {
+  it("retries malformed fast output and fails closed after strong generation also fails", async () => {
     vi.stubEnv("OPENAI_API_KEY", "test-key");
     vi.stubEnv("OPENAI_MAX_OUTPUT_TOKENS", "650");
     vi.stubEnv("RAG_SEARCH_CACHE_TTL_MS", "0");
@@ -745,17 +810,21 @@ describe("RAG structured-output fallback", () => {
     });
 
     expect(answer.answer).not.toBe(machineReadableFallbackAnswer);
-    expect(answer.routingMode).toBe("extractive");
-    expect(answer.grounded).toBe(true);
-    expect(answer.citations.length).toBeGreaterThan(0);
+    expect(answer.routingMode).toBe("strong");
+    expect(answer.grounded).toBe(false);
+    expect(answer.confidence).toBe("unsupported");
+    expect(answer.responseMode).toBe("evidence_gap");
+    expect(answer.citations).toEqual([]);
     expect(answer.quoteCards?.length).toBeGreaterThan(0);
-    expect(answer.routingReason).toContain("structured_output_fallback");
+    expect(answer.routingReason).toContain("final_quality_gate");
     expect(generateStructuredTextResult).toHaveBeenCalledTimes(3);
     expect(answer.openAIRequestIds).toEqual(["req_truncated", "req_truncated", "req_truncated"]);
     expect(answer.openAIUsage).toMatchObject({ output_tokens: 1950 });
     expect(answer.latencyTimings?.answer_retry_count).toBe(2);
-    expect(answer.latencyTimings?.answer_retry_reasons).toEqual(["fast_unusable_retry_strong", "strong_quality_retry"]);
-    expect(answer.citations[0]?.source_metadata?.document_status).toBe("current");
+    expect(answer.latencyTimings?.answer_retry_reasons).toEqual([
+      "fast_unsupported_retry_strong",
+      "strong_quality_retry",
+    ]);
   });
 
   it("keeps valid structured model answers on the generated-answer path", async () => {
@@ -830,6 +899,177 @@ describe("RAG structured-output fallback", () => {
     expect(answer.quoteCards?.length).toBe(1);
   });
 
+  it("coalesces identical scoped answer requests before OpenAI generation", async () => {
+    vi.stubEnv("OPENAI_API_KEY", "test-key");
+    vi.stubEnv("RAG_SEARCH_CACHE_TTL_MS", "0");
+    vi.stubEnv("RAG_ANSWER_CACHE_TTL_MS", "300000");
+    vi.stubEnv("RAG_ANSWER_CACHE_SIZE", "100");
+
+    const sources = [
+      source({
+        content:
+          "Inpatient approach details for agitation and arousal management include a stepwise approach based on rating severity, route, oral options, and intramuscular options.",
+      }),
+    ];
+    const rpc = vi.fn(async (name: string) => {
+      if (name === "match_document_chunks_text") return { data: sources, error: null };
+      if (name === "get_related_document_metadata") return { data: [], error: null };
+      return { data: [], error: null };
+    });
+
+    let releaseGeneration!: () => void;
+    let markGenerationStarted!: () => void;
+    const generationStarted = new Promise<void>((resolve) => {
+      markGenerationStarted = resolve;
+    });
+    const generationGate = new Promise<void>((resolve) => {
+      releaseGeneration = resolve;
+    });
+    const generateStructuredTextResult = vi.fn(async () => {
+      markGenerationStarted();
+      await generationGate;
+      return {
+        text: JSON.stringify({
+          answer: "Use a stepwise agitation and arousal approach based on rating and route.",
+          grounded: true,
+          confidence: "high",
+          answerSections: [],
+          citations: [{ chunk_id: "agitation-chunk-1" }],
+          quoteCards: [
+            {
+              chunk_id: "agitation-chunk-1",
+              quote: "Agitation and arousal pharmacological management for adult mental health inpatients.",
+              section_heading: "Appendix 1",
+            },
+          ],
+          conflictsOrGaps: [],
+        }),
+        model: "gpt-4.1-mini",
+        operation: "answer",
+        latencyMs: 12,
+        requestId: "req_coalesced",
+        usage: { input_tokens: 100, output_tokens: 120, total_tokens: 220 },
+      };
+    });
+
+    vi.doMock("@/lib/supabase/admin", () => ({
+      createAdminClient: () => ({
+        rpc,
+        from: vi.fn(() => new EmptyQuery()),
+      }),
+    }));
+    vi.doMock("@/lib/openai", () => ({
+      embedTextWithTelemetry: vi.fn(async () => ({ embedding: [0.1, 0.2, 0.3], cacheHit: false })),
+      generateStructuredTextResult,
+    }));
+
+    const { answerQuestionWithScope } = await import("../src/lib/rag");
+    const first = answerQuestionWithScope({
+      query: "Summarize inpatient approach",
+      ownerId: "owner-1",
+      logQuery: false,
+    });
+    const second = answerQuestionWithScope({
+      query: "Summarize inpatient approach",
+      ownerId: "owner-1",
+      logQuery: false,
+    });
+
+    await generationStarted;
+    releaseGeneration();
+    const [firstAnswer, secondAnswer] = await Promise.all([first, second]);
+
+    expect(generateStructuredTextResult).toHaveBeenCalledTimes(1);
+    const generateCalls = generateStructuredTextResult.mock.calls as unknown as Array<
+      [
+        unknown,
+        {
+          properties: {
+            citations: { items: { properties: { chunk_id: { enum: string[] } } } };
+            answerSections: { items: { properties: { citation_chunk_ids: { items: { enum: string[] } } } } };
+          };
+        },
+      ]
+    >;
+    const schema = generateCalls[0]?.[1];
+    if (!schema) throw new Error("Expected generated answer schema");
+    expect(schema).toMatchObject({
+      properties: {
+        citations: { items: { properties: { chunk_id: { enum: ["agitation-chunk-1"] } } } },
+        answerSections: { items: { properties: { citation_chunk_ids: { items: { enum: ["agitation-chunk-1"] } } } } },
+      },
+    });
+    expect(schema.properties.citations.items.properties.chunk_id.enum).toEqual(["agitation-chunk-1"]);
+    expect(schema.properties.answerSections.items.properties.citation_chunk_ids.items.enum).toEqual([
+      "agitation-chunk-1",
+    ]);
+    expect(rpc).toHaveBeenCalledWith("match_document_chunks_text", expect.any(Object));
+    expect(rpc.mock.calls.filter(([name]) => name === "match_document_chunks_text")).toHaveLength(1);
+    expect(firstAnswer.openAIRequestIds).toEqual(["req_coalesced"]);
+    expect(secondAnswer.openAIRequestIds).toEqual(["req_coalesced"]);
+    expect(secondAnswer.routingReason).toContain("answer_inflight_coalesced");
+  });
+
+  it("treats max-output truncation as a distinct retry and fallback reason", async () => {
+    vi.stubEnv("OPENAI_API_KEY", "test-key");
+    vi.stubEnv("RAG_SEARCH_CACHE_TTL_MS", "0");
+    vi.stubEnv("RAG_ANSWER_CACHE_TTL_MS", "0");
+
+    const sources = [
+      source({
+        content:
+          "Inpatient approach details for agitation and arousal management include a stepwise approach based on rating severity, route, oral options, and intramuscular options.",
+      }),
+    ];
+    const rpc = vi.fn(async (name: string) => {
+      if (name === "match_document_chunks_text") return { data: sources, error: null };
+      if (name === "get_related_document_metadata") return { data: [], error: null };
+      return { data: [], error: null };
+    });
+    let requestIndex = 0;
+    const generateStructuredTextResult = vi.fn(async () => ({
+      text: '{"answer":"Use a stepwise approach',
+      model: "gpt-5.4-mini",
+      operation: "answer",
+      latencyMs: 12,
+      requestId: `req_truncated_${++requestIndex}`,
+      usage: { input_tokens: 100, output_tokens: 650, total_tokens: 750 },
+      status: "incomplete",
+      truncated: true,
+      incompleteReason: "max_output_tokens",
+    }));
+
+    vi.doMock("@/lib/supabase/admin", () => ({
+      createAdminClient: () => ({
+        rpc,
+        from: vi.fn(() => new EmptyQuery()),
+      }),
+    }));
+    vi.doMock("@/lib/openai", () => ({
+      embedTextWithTelemetry: vi.fn(async () => ({ embedding: [0.1, 0.2, 0.3], cacheHit: false })),
+      generateStructuredTextResult,
+    }));
+
+    const { answerQuestionWithScope } = await import("../src/lib/rag");
+    const answer = await answerQuestionWithScope({
+      query: "Summarize inpatient approach",
+      ownerId: undefined,
+      logQuery: false,
+      skipCache: true,
+    });
+
+    expect(generateStructuredTextResult).toHaveBeenCalledTimes(2);
+    expect(answer.routingMode).toBe("unsupported");
+    expect(answer.routingReason).toContain("generation_fallback:OpenAI generation incomplete: max_output_tokens");
+    expect(answer.latencyTimings?.answer_retry_count).toBe(2);
+    expect(answer.latencyTimings?.answer_retry_reasons).toEqual([
+      "fast_max_output_tokens_retry_strong",
+      "strong_max_output_tokens",
+    ]);
+    expect(answer.openAIRequestIds).toEqual(["req_truncated_1", "req_truncated_2"]);
+    expect(answer.openAIUsage).toMatchObject({ output_tokens: 1300, total_tokens: 1500 });
+  });
+
   it("keeps the confidence gate active for weak ambiguous retrieval", async () => {
     vi.stubEnv("OPENAI_API_KEY", "test-key");
     vi.stubEnv("RAG_SEARCH_CACHE_TTL_MS", "0");
@@ -985,6 +1225,254 @@ describe("RAG structured-output fallback", () => {
     expect(answer.answer).not.toMatch(/level checks|renal review|baseline tests/i);
   });
 
+  it("does not promote lithium dosage headings or continuation fragments as the primary answer", async () => {
+    vi.stubEnv("OPENAI_API_KEY", "test-key");
+    vi.stubEnv("RAG_SEARCH_CACHE_TTL_MS", "0");
+    vi.stubEnv("RAG_ANSWER_CACHE_TTL_MS", "0");
+
+    const lithiumSource = source({
+      id: "lithium-dose-1",
+      document_id: "lithium-doc",
+      title: "Lithium Therapy - Initiation And Continuation Guideline",
+      file_name: "lithium-therapy.pdf",
+      page_number: 6,
+      section_heading: "Dosage and monitoring",
+      content:
+        "Dosage (as lithium carbonate). alternative agent where possible and adjust the dose of lithium when necessary. Reduce doses in the elderly and in patients with renal impairment. Target serum lithium ranges are as follows: acute mania 0.8-1.2 mmol/L; prophylaxis uses a lower maintenance range. Therapy with lithium should always begin with conventional tablets (lithium carbonate 250 mg).",
+      similarity: 0.95,
+      hybrid_score: 0.95,
+      text_rank: 1.3,
+    });
+    const rpc = vi.fn(async (name: string) => {
+      if (name === "match_document_chunks_text") return { data: [lithiumSource], error: null };
+      if (name === "get_related_document_metadata") return { data: [], error: null };
+      return { data: [], error: null };
+    });
+
+    vi.doMock("@/lib/supabase/admin", () => ({
+      createAdminClient: () => ({
+        rpc,
+        from: vi.fn(() => new EmptyQuery()),
+      }),
+    }));
+    const generateStructuredTextResult = vi.fn(async () => ({
+      text: JSON.stringify({
+        answer:
+          "For lithium dosing, the retrieved guidance supports starting with **lithium carbonate 250 mg conventional tablets**, reducing doses in elderly patients or renal impairment, and using serum lithium targets to titrate.",
+        grounded: true,
+        confidence: "high",
+        answerSections: [
+          {
+            heading: "Dose and monitoring",
+            kind: "medication_dose",
+            supportLevel: "direct",
+            body: "The source gives acute mania and prophylaxis serum lithium target ranges and says dose adjustment is needed when clinically indicated.",
+            citation_chunk_ids: ["lithium-dose-1"],
+          },
+        ],
+        citations: [{ chunk_id: "lithium-dose-1" }],
+        quoteCards: [
+          {
+            chunk_id: "lithium-dose-1",
+            quote: "Reduce doses in the elderly and in patients with renal impairment.",
+            section_heading: "Dosage and monitoring",
+          },
+        ],
+        conflictsOrGaps: [],
+      }),
+      model: "gpt-4.1-mini",
+      operation: "answer",
+      latencyMs: 12,
+      requestId: "req_lithium_fast",
+      usage: { input_tokens: 140, output_tokens: 90, total_tokens: 230 },
+    }));
+
+    vi.doMock("@/lib/openai", () => ({
+      embedTextWithTelemetry: vi.fn(),
+      generateStructuredTextResult,
+    }));
+
+    const { answerQuestionWithScope } = await import("../src/lib/rag");
+
+    const answer = await answerQuestionWithScope({
+      query: "lithium dosing for patients",
+      ownerId: undefined,
+      logQuery: false,
+      skipCache: true,
+    });
+
+    const plainAnswer = answer.answer.replace(/\*\*/g, "");
+    expect(generateStructuredTextResult).toHaveBeenCalledTimes(1);
+    expect(answer.routingMode).toBe("fast");
+    expect(answer.grounded).toBe(true);
+    expect(plainAnswer).not.toMatch(/^Dosage\b/i);
+    expect(plainAnswer).not.toContain("alternative agent where possible");
+    expect(plainAnswer).toMatch(/target serum lithium|reduce doses|conventional tablets/i);
+  });
+
+  it("uses the same model-first guard for non-lithium dose searches", async () => {
+    const answer = await answerFromTextSources(
+      "olanzapine maximum dose",
+      [
+        source({
+          id: "olanzapine-dose-1",
+          document_id: "olanzapine-doc",
+          title: "Olanzapine Dose Chart",
+          file_name: "olanzapine-dose-chart.pdf",
+          section_heading: "Dose table",
+          content:
+            "Dosage (adult). chart reference only. Maximum olanzapine dose is 20 mg in 24 hours. Repeat doses require sedation and blood pressure monitoring.",
+          similarity: 0.95,
+          hybrid_score: 0.95,
+          text_rank: 1.3,
+        }),
+      ],
+      {
+        answer:
+          "The retrieved guidance gives a maximum **olanzapine** dose of **20 mg in 24 hours**, with repeat doses requiring sedation and blood pressure monitoring.",
+        grounded: true,
+        confidence: "high",
+        answerSections: [],
+        citations: [{ chunk_id: "olanzapine-dose-1" }],
+        quoteCards: [
+          {
+            chunk_id: "olanzapine-dose-1",
+            quote: "Maximum olanzapine dose is 20 mg in 24 hours.",
+            section_heading: "Dose table",
+          },
+        ],
+        conflictsOrGaps: [],
+      },
+    );
+
+    const plainAnswer = answer.answer.replace(/\*\*/g, "");
+    expect(answer.routingMode).toBe("fast");
+    expect(answer.grounded).toBe(true);
+    expect(plainAnswer).not.toMatch(/^Dosage\b/i);
+    expect(plainAnswer).not.toContain("chart reference only");
+    expect(plainAnswer).toContain("20 mg");
+  });
+
+  it("uses the same model-first guard for threshold-action searches", async () => {
+    const answer = await answerFromTextSources(
+      "what clozapine monitoring action is needed for red range blood results",
+      [
+        source({
+          id: "clozapine-red-action-1",
+          document_id: "clozapine-doc",
+          title: "Clozapine Monitoring Action Table",
+          file_name: "clozapine-monitoring.pdf",
+          section_heading: "Monitoring",
+          content:
+            "Monitoring. and reported to the patient monitoring system. If blood results return in the red range, clozapine therapy must be discontinued immediately and reported to the patient monitoring system.",
+          similarity: 0.95,
+          hybrid_score: 0.95,
+          text_rank: 1.3,
+        }),
+      ],
+      {
+        answer:
+          "For red-range blood results, the source-supported action is to **discontinue clozapine immediately** and report the result to the patient monitoring system.",
+        grounded: true,
+        confidence: "high",
+        answerSections: [],
+        citations: [{ chunk_id: "clozapine-red-action-1" }],
+        quoteCards: [
+          {
+            chunk_id: "clozapine-red-action-1",
+            quote: "clozapine therapy must be discontinued immediately",
+            section_heading: "Monitoring",
+          },
+        ],
+        conflictsOrGaps: [],
+      },
+    );
+
+    const plainAnswer = answer.answer.replace(/\*\*/g, "");
+    expect(answer.routingMode).toBe("strong");
+    expect(answer.grounded).toBe(true);
+    expect(plainAnswer).not.toMatch(/^Monitoring\b/i);
+    expect(plainAnswer).not.toMatch(/^and reported/i);
+    expect(plainAnswer).toMatch(/discontinue.*immediately|discontinued immediately/i);
+  });
+
+  it("uses the same model-first guard for pathway and referral searches", async () => {
+    const answer = await answerFromTextSources(
+      "what are ECT referral criteria",
+      [
+        source({
+          id: "ect-referral-1",
+          document_id: "ect-doc",
+          title: "ECT Referral Pathway",
+          file_name: "ect-referral-pathway.pdf",
+          section_heading: "Referral criteria",
+          content:
+            "Referral criteria. and document the referral form. ECT referral criteria include severe depression requiring specialist psychiatric review, consent assessment, and referral through the ECT pathway.",
+          similarity: 0.95,
+          hybrid_score: 0.95,
+          text_rank: 1.3,
+        }),
+      ],
+      {
+        answer:
+          "The ECT referral criteria include **severe depression requiring specialist psychiatric review**, consent assessment, and referral through the ECT pathway.",
+        grounded: true,
+        confidence: "high",
+        answerSections: [],
+        citations: [{ chunk_id: "ect-referral-1" }],
+        quoteCards: [
+          {
+            chunk_id: "ect-referral-1",
+            quote: "ECT referral criteria include severe depression requiring specialist psychiatric review",
+            section_heading: "Referral criteria",
+          },
+        ],
+        conflictsOrGaps: [],
+      },
+    );
+
+    const plainAnswer = answer.answer.replace(/\*\*/g, "");
+    expect(answer.routingMode).toBe("fast");
+    expect(answer.grounded).toBe(true);
+    expect(plainAnswer).not.toMatch(/^Referral criteria\b/i);
+    expect(plainAnswer).not.toMatch(/^and document/i);
+    expect(plainAnswer).toMatch(/severe depression|specialist psychiatric review|ECT pathway/i);
+  });
+
+  it("blocks same-sentence cross-medication dose leakage", async () => {
+    const answer = await answerFromTextSources(
+      "What is the maximum sertraline dose?",
+      [
+        source({
+          id: "sertraline-cross-medication-1",
+          document_id: "sertraline-doc",
+          title: "Sertraline Dose Appendix",
+          file_name: "sertraline-dose-appendix.pdf",
+          section_heading: "Maximum doses",
+          content:
+            "Sertraline dosing appendix lists fluoxetine maximum dose 60 mg and citalopram 40 mg for comparison, but does not state a maximum sertraline dose.",
+          similarity: 0.95,
+          hybrid_score: 0.95,
+          text_rank: 1.3,
+        }),
+      ],
+      {
+        answer: "No current source with dose guidance for this query was found.",
+        grounded: false,
+        confidence: "unsupported",
+        answerSections: [],
+        citations: [],
+        quoteCards: [],
+        conflictsOrGaps: [],
+      },
+    );
+
+    expect(answer.answer).toBe("No current source with dose guidance for this query was found.");
+    expect(answer.grounded).toBe(false);
+    expect(answer.confidence).toBe("unsupported");
+    expect(answer.answer).not.toMatch(/fluoxetine|citalopram|60 mg|40 mg/i);
+  });
+
   it("fails closed for classified dose intent when no accepted fact covers entity and intent together", async () => {
     vi.stubEnv("OPENAI_API_KEY", "test-key");
     vi.stubEnv("RAG_SEARCH_CACHE_TTL_MS", "0");
@@ -1016,7 +1504,22 @@ describe("RAG structured-output fallback", () => {
     }));
     vi.doMock("@/lib/openai", () => ({
       embedTextWithTelemetry: vi.fn(),
-      generateStructuredTextResult: vi.fn(),
+      generateStructuredTextResult: vi.fn(async () => ({
+        text: JSON.stringify({
+          answer: "No current source with dose guidance for this query was found.",
+          grounded: false,
+          confidence: "unsupported",
+          answerSections: [],
+          citations: [],
+          quoteCards: [],
+          conflictsOrGaps: [],
+        }),
+        model: "gpt-4.1-mini",
+        operation: "answer",
+        latencyMs: 12,
+        requestId: "req_sertraline_source_gap",
+        usage: { input_tokens: 130, output_tokens: 40, total_tokens: 170 },
+      })),
     }));
 
     const { answerQuestionWithScope } = await import("../src/lib/rag");
diff --git a/tests/rag-routing.test.ts b/tests/rag-routing.test.ts
index 95a29d0361..c052ffcc2b 100644
--- a/tests/rag-routing.test.ts
+++ b/tests/rag-routing.test.ts
@@ -46,12 +46,12 @@ describe("RAG answer routing", () => {
     expect(selected.reason).toBe("strong_routine_retrieval");
   });
 
-  it("uses extractive answers for routine medication questions with strong single-source support", () => {
+  it("uses fast model synthesis for routine medication questions with strong single-source support", () => {
     const selected = route("What clozapine monitoring is required?", [source()]);
 
-    expect(selected.mode).toBe("extractive");
-    expect(selected.model).toBeNull();
-    expect(selected.reason).toBe("high_confidence_extractive_retrieval");
+    expect(selected.mode).toBe("fast");
+    expect(selected.model).toBe("fast-model");
+    expect(selected.reason).toBe("clinical_fast_grounded_synthesis");
   });
 
   it("uses the strong model for medication or risk-heavy decision questions", () => {
@@ -106,7 +106,7 @@ describe("RAG answer routing", () => {
     expect(selected.model).toBeNull();
   });
 
-  it("uses extractive answers for direct table or threshold lookups with strong source support", () => {
+  it("uses strong synthesis for safety-critical threshold lookups with strong source support", () => {
     const selected = route("What ANC threshold should stop clozapine?", [
       source({
         title: "Clozapine Prescribing and Monitoring",
@@ -115,9 +115,9 @@ describe("RAG answer routing", () => {
       }),
     ]);
 
-    expect(selected.mode).toBe("extractive");
-    expect(selected.model).toBeNull();
-    expect(selected.reason).toBe("high_confidence_extractive_retrieval");
+    expect(selected.mode).toBe("strong");
+    expect(selected.model).toBe("strong-model");
+    expect(selected.reason).toBe("clinical_risk_or_complex_query");
   });
 
   it("keeps broad summaries on the fast synthesis path", () => {
@@ -217,4 +217,21 @@ describe("RAG answer routing", () => {
       }),
     ).toBe(true);
   });
+
+  it("retries a single-source clinical fast failure with the strong model when retrieval is strong", () => {
+    const selected = route("What clozapine monitoring is required?", [source()]);
+
+    expect(
+      shouldRetryWithStrongAfterFast({
+        route: selected,
+        answer: {
+          grounded: false,
+          confidence: "unsupported",
+          citations: [],
+          routingReason: "structured_parse_fallback",
+        },
+        results: [source()],
+      }),
+    ).toBe(true);
+  });
 });
diff --git a/tests/smart-rag-api.test.ts b/tests/smart-rag-api.test.ts
index 10ad9295a8..b004c126ef 100644
--- a/tests/smart-rag-api.test.ts
+++ b/tests/smart-rag-api.test.ts
@@ -34,6 +34,20 @@ describe("smart RAG API plan", () => {
     expect(plan.responseMode).toBe("fast_grounded_answer");
     expect(plan.displayMode).toBe("clinical_pathway");
     expect(plan.answerFocus).toContain("medication");
+    expect(plan.answerPlan).toMatchObject({
+      retrievalQuality: "strong",
+      routeMode: "fast",
+      modelStrategy: "fast_model_then_quality_gate",
+      fallbackBehavior: "retry_strong_then_source_gap",
+      sourcePolicy: "no_answer_without_retrieved_support",
+    });
+    expect(plan.answerPlan.qualityCriteria).toEqual(
+      expect.arrayContaining([
+        "first_sentence_answers_query",
+        "no_source_headings_or_fragments",
+        "no_cross_medication_leakage",
+      ]),
+    );
     expect(plan.coreSourceLinks).toHaveLength(1);
     expect(plan.coreSourceLinks[0]).toMatchObject({
       href: "/documents/doc-a?page=7&chunk=chunk-a",
@@ -58,6 +72,7 @@ describe("smart RAG API plan", () => {
     expect(plan.latencyPlan).toBe("cache_or_text_first");
     expect(plan.answerFocus).toContain("2 documents");
     expect(plan.streamPlan).toContain("Fuse strongest points");
+    expect(plan.answerPlan.qualityCriteria).toContain("conflicts_or_gaps_handled_when_supported");
     expect(plan.coreSourceLinks.map((link) => link.document_id)).toEqual(["doc-a", "doc-b"]);
   });
 
@@ -73,18 +88,21 @@ describe("smart RAG API plan", () => {
     expect(plan.responseMode).toBe("document_lookup");
     expect(plan.displayMode).toBe("document_lookup");
     expect(plan.answerFocus).toContain("best matching document");
+    expect(plan.answerPlan.modelStrategy).toBe("narrow_extractive_lookup");
   });
 
-  it("uses threshold table display mode for threshold queries", () => {
+  it("uses threshold table display mode and strong answer planning for threshold queries", () => {
     const plan = buildSmartRagApiPlan({
       query: "What ANC threshold should stop clozapine?",
       queryClass: "table_threshold",
       results: [source({ content: "ANC threshold table with action rows." })],
       retrievalStrategy: "text_fast_path",
-      routeMode: "extractive",
+      routeMode: "strong",
     });
 
     expect(plan.displayMode).toBe("threshold_table");
+    expect(plan.answerPlan.routeMode).toBe("strong");
+    expect(plan.answerPlan.modelStrategy).toBe("strong_model_then_quality_gate");
     expect(plan.answerFocus).toContain("threshold");
   });
 });
diff --git a/tests/source-governance.test.ts b/tests/source-governance.test.ts
index 698d087695..a75d8e7b31 100644
--- a/tests/source-governance.test.ts
+++ b/tests/source-governance.test.ts
@@ -129,7 +129,7 @@ describe("source governance warnings", () => {
   });
 
   it("keeps the refusal message free of backend and source-backed wording", () => {
-    expect(sourceGovernanceRefusalAnswer).not.toMatch(/source-backed|source-governance|admin/i);
-    expect(sourceGovernanceRefusalAnswer).toContain("matched documents need review");
+    expect(sourceGovernanceRefusalAnswer).not.toMatch(/source-backed|source-governance|admin|need review/i);
+    expect(sourceGovernanceRefusalAnswer).toContain("matched documents are not suitable for clinical use yet");
   });
 });
diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index 788f9c89b0..e22c28db1a 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -449,6 +449,11 @@ async function expectMinTouchTarget(locator: Locator, minSize = 44) {
   expect(box!.width + measurementTolerance).toBeGreaterThanOrEqual(minSize);
 }
 
+async function tapOutsideActiveSurface(page: Page) {
+  const viewport = page.viewportSize() ?? { width: 390, height: 820 };
+  await page.mouse.click(Math.max(1, viewport.width - 8), 8);
+}
+
 async function openMobileClinicalGuideMenu(page: Page) {
   const trigger = page.getByRole("button", { name: "Open Clinical Guide menu" });
   await expect(trigger).toBeVisible();
@@ -462,9 +467,9 @@ async function openMobileClinicalGuideMenu(page: Page) {
   await expect(menu.getByRole("button", { name: "New chat" })).toBeVisible();
   await expect(menu.getByPlaceholder("Search chats")).toBeVisible();
   await expect(menu.getByText("Recent chats", { exact: true })).toBeVisible();
-  await expect(menu.getByRole("link", { name: "Applications", exact: true })).toBeVisible();
+  await expect(menu.getByRole("link", { name: "Tools", exact: true })).toBeVisible();
   await expect(menu.getByRole("button", { name: "Guide & help" })).toBeVisible();
-  await expect(menu.getByRole("button", { name: "Settings" })).toBeVisible();
+  await expect(menu.getByRole("button", { name: "Settings", exact: true })).toBeVisible();
   await expect(menu.getByText("Guest")).toBeVisible();
   await expect(page.getByRole("dialog", { name: "Clinical KB guide" })).toHaveCount(0);
   await expectNoPageHorizontalOverflow(page);
@@ -506,6 +511,22 @@ async function openGuide(page: Page) {
   return dialog;
 }
 
+function accountSettingsDialog(page: Page) {
+  return page.getByRole("dialog", { name: "Account & app" });
+}
+
+async function expectAccountSettingsSurface(settings: Locator) {
+  await expect(settings.getByRole("heading", { name: "Account & app" })).toBeVisible();
+  await expect(settings.getByRole("heading", { name: "Account", exact: true })).toBeVisible();
+  await expect(settings.getByRole("heading", { name: "Clinical defaults", exact: true })).toBeVisible();
+  await expect(settings.getByRole("heading", { name: "App preferences", exact: true })).toBeVisible();
+  await expect(settings.getByTestId("settings-row-profile")).toBeVisible();
+  await expect(settings.getByTestId("settings-row-jurisdiction")).toBeVisible();
+  await expect(settings.getByTestId("settings-row-answer-style")).toBeVisible();
+  await expect(settings.getByTestId("settings-row-appearance")).toBeVisible();
+  await expect(settings).not.toContainText(/admin|database|storage|source review|import pipeline/i);
+}
+
 async function openUploadDrawer(page: Page) {
   const uploadButton = page.getByRole("button", { name: /Upload document/i });
   const uploadDrawer = page.getByRole("dialog", { name: "Upload and indexing" });
@@ -521,19 +542,18 @@ async function openUploadDrawer(page: Page) {
 }
 
 async function openDailyActions(page: Page) {
-  const trigger = page.getByRole("button", { name: "Open daily actions" });
-  const dialog = page.getByRole("dialog", { name: "Daily actions" });
+  const trigger = page.getByRole("button", { name: /^Open .+ options$/ });
   const menu = page.getByTestId("daily-actions-menu");
 
   await expect(trigger).toBeVisible();
   await expect(trigger).toBeEnabled();
   await expect(async () => {
-    if ((await dialog.isVisible().catch(() => false)) || (await menu.isVisible().catch(() => false))) return;
+    if (await menu.isVisible().catch(() => false)) return;
     await trigger.click();
-    await expect(dialog.or(menu)).toBeVisible({ timeout: 1_500 });
-  }).toPass({ timeout: 10_000 });
+    await expect(menu).toBeVisible({ timeout: 2_500 });
+  }).toPass({ timeout: 20_000 });
 
-  return (await dialog.isVisible().catch(() => false)) ? dialog : menu;
+  return menu;
 }
 
 test.describe("Clinical KB UI smoke coverage", () => {
@@ -563,12 +583,12 @@ test.describe("Clinical KB UI smoke coverage", () => {
         await expect(page.getByTestId("mobile-section-fab-button")).toHaveCount(0);
       }
       if (viewport.width < 640) {
-        const dailyActionsTrigger = page.getByRole("button", { name: "Open daily actions" });
+        const dailyActionsTrigger = page.getByRole("button", { name: "Open answer options" });
         const dailyActions = await openDailyActions(page);
-        const addDocument = dailyActions.getByRole("button", { name: "Add document" });
-        await expect(addDocument).toBeVisible();
-        await expect(dailyActions.getByRole("button", { name: "Tools" })).toBeVisible();
-        await expectMinTouchTarget(addDocument);
+        const documentsAction = dailyActions.getByRole("menuitem", { name: "Docs" });
+        await expect(documentsAction).toBeVisible();
+        await expect(dailyActions.getByRole("menuitem", { name: "Evidence" })).toBeVisible();
+        await expectMinTouchTarget(documentsAction);
         await expect(page.getByRole("dialog", { name: "Clinical KB guide" })).toHaveCount(0);
         await page.keyboard.press("Escape");
         await expect(dailyActions).toBeHidden();
@@ -578,6 +598,68 @@ test.describe("Clinical KB UI smoke coverage", () => {
     });
   }
 
+  test("account settings opens from desktop sidebar, header avatar, and collapsed avatar", async ({ page }) => {
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await mockDemoApi(page);
+    await gotoApp(page, "/");
+    await waitForDemoDashboardReady(page);
+
+    const settings = accountSettingsDialog(page);
+    await page.locator("#clinical-tools-sidebar").getByRole("button", { name: "Settings", exact: true }).click();
+    await expect(settings).toBeVisible();
+    await expectAccountSettingsSurface(settings);
+    await expectNoPageHorizontalOverflow(page);
+
+    await settings.getByRole("button", { name: "Close settings" }).click();
+    await expect(settings).toBeHidden();
+
+    await page.getByTestId("header-account-settings").click();
+    await expect(settings).toBeVisible();
+    await expectAccountSettingsSurface(settings);
+
+    await page.keyboard.press("Escape");
+    await expect(settings).toBeHidden();
+
+    await page.getByRole("button", { name: "Collapse sidebar" }).click();
+    await page.getByTestId("collapsed-account-settings").click();
+    await expect(settings).toBeVisible();
+    await expectAccountSettingsSurface(settings);
+  });
+
+  test("account settings uses a top mobile popup and closes from X, Escape, and backdrop", async ({ page }) => {
+    await page.setViewportSize({ width: 390, height: 820 });
+    await mockDemoApi(page);
+    await gotoApp(page, "/");
+    await waitForDemoDashboardReady(page);
+
+    const settings = accountSettingsDialog(page);
+    const menu = await openMobileClinicalGuideMenu(page);
+    await menu.getByRole("button", { name: "Settings", exact: true }).click();
+    await expect(menu).toHaveCount(0);
+    await expect(settings).toBeVisible();
+    await expectAccountSettingsSurface(settings);
+    const settingsBox = await settings.boundingBox();
+    expect(settingsBox).not.toBeNull();
+    expect(settingsBox!.x).toBeGreaterThanOrEqual(0);
+    expect(settingsBox!.y).toBeLessThanOrEqual(24);
+    await expectNoPageHorizontalOverflow(page);
+
+    await settings.getByRole("button", { name: "Close settings" }).click();
+    await expect(settings).toBeHidden();
+
+    const escapeMenu = await openMobileClinicalGuideMenu(page);
+    await escapeMenu.getByRole("button", { name: "Settings", exact: true }).click();
+    await expect(settings).toBeVisible();
+    await page.keyboard.press("Escape");
+    await expect(settings).toBeHidden();
+
+    const backdropMenu = await openMobileClinicalGuideMenu(page);
+    await backdropMenu.getByRole("button", { name: "Settings", exact: true }).click();
+    await expect(settings).toBeVisible();
+    await page.mouse.click(2, 2);
+    await expect(settings).toBeHidden();
+  });
+
   test("private mode unauthenticated dashboard gates real-mode search", async ({ page }) => {
     await page.setViewportSize({ width: 390, height: 820 });
     const answerRequests: string[] = [];
@@ -617,14 +699,29 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expectNoPageHorizontalOverflow(page);
   });
 
-  test("desktop daily actions close when clicking outside or opening scope", async ({ page }) => {
+  test("desktop mode options close when clicking outside or opening scope", async ({ page }) => {
     await page.setViewportSize({ width: 1280, height: 900 });
     await mockPrivateUnauthenticatedApi(page);
     await gotoApp(page, "/");
     await waitForDemoDashboardReady(page);
 
-    const dailyActionsTrigger = page.getByRole("button", { name: "Open daily actions" });
+    const dailyActionsTrigger = page.getByRole("button", { name: "Open answer options" });
     const dailyActionsMenu = page.getByTestId("daily-actions-menu");
+    const appModeTrigger = page.getByRole("button", { name: "Current app mode: Answer" });
+    const appModeMenu = page.getByRole("menu", { name: "Choose app mode" });
+
+    await appModeTrigger.click();
+    await expect(appModeMenu).toBeVisible();
+    await visibleQuestionInput(page).click();
+    await expect(appModeMenu).toBeHidden();
+
+    await appModeTrigger.click();
+    await expect(appModeMenu).toBeVisible();
+    await dailyActionsTrigger.click();
+    await expect(appModeMenu).toBeHidden();
+    await expect(dailyActionsMenu).toBeVisible();
+    await page.keyboard.press("Escape");
+    await expect(dailyActionsMenu).toHaveCount(0);
 
     // First open — use robust retry helper to handle async state update timing.
     await openDailyActions(page);
@@ -639,7 +736,7 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expect(dailyActionsMenu).toHaveCount(0);
     const scopePopover = page.locator('[data-testid="scope-command-popover"]:visible');
     await expect(scopePopover).toBeVisible();
-    await page.keyboard.press("Escape");
+    await visibleQuestionInput(page).click();
     await expect(scopePopover).toBeHidden();
     await expectNoPageHorizontalOverflow(page);
   });
@@ -765,6 +862,10 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expect(clinicalNotesSheet.getByTestId("clinical-notes-checklist")).toBeVisible();
     await expect(clinicalNotesSheet.getByRole("tab", { name: /Safety/ })).toBeVisible();
     await expect(clinicalNotesSheet.getByRole("tab", { name: /Monitor/ })).toBeVisible();
+    await tapOutsideActiveSurface(page);
+    await expect(clinicalNotesSheet).toHaveCount(0);
+    await clinicalNotesTrigger.click();
+    await expect(clinicalNotesSheet).toBeVisible();
     const clinicalNotesTableToggle = clinicalNotesSheet.getByRole("tab", { name: /Table/i });
     await expect(clinicalNotesTableToggle).toBeVisible();
     await expect(clinicalNotesSheet.getByText("Table details")).toHaveCount(0);
@@ -832,7 +933,7 @@ test.describe("Clinical KB UI smoke coverage", () => {
 
     await expect(page.getByText("Top source detail")).toHaveCount(0);
     await expect(page.getByText("Retrieval details")).toHaveCount(0);
-    await page.keyboard.press("Escape");
+    await tapOutsideActiveSurface(page);
     await expect(evidenceSheet).toHaveCount(0);
     await expect(evidenceDrawer).toBeFocused();
 
@@ -985,6 +1086,11 @@ test.describe("Clinical KB UI smoke coverage", () => {
     const favouritesTypeList = page.getByRole("listbox", { name: "Favourite type" });
     await expect(favouritesTypeList).toBeVisible();
     await expect(favouritesTypeList.getByRole("option", { name: /^All\b/ })).toBeFocused();
+    await page.locator("body").click({ position: { x: 8, y: 8 } });
+    await expect(favouritesTypeList).toBeHidden();
+    await favouritesTypeButton.focus();
+    await page.keyboard.press("ArrowDown");
+    await expect(favouritesTypeList).toBeVisible();
     await page.keyboard.press("End");
     await expect(favouritesTypeList.getByRole("option", { name: /^Sets\b/ })).toBeFocused();
     await page.keyboard.press("Enter");
@@ -1071,10 +1177,21 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await gotoApp(page, "/?mode=tools&q=medications&focus=1&run=1");
 
     await expect(page.getByRole("button", { name: "Current app mode: Tools" })).toBeVisible();
-    await expect(page.getByPlaceholder("Search tools...")).toHaveValue("medications");
+    await expect(page.locator('input[placeholder="Search tools..."]:visible').first()).toHaveValue("medications");
     await expect(page.getByTestId("tools-hub")).toBeVisible();
-    await expect(page.getByTestId("tool-mode-result-medications")).toContainText("Medications");
-    await expect(page.getByLabel("Launch Medications")).toHaveAttribute("href", "/?mode=prescribing");
+    await expect(page.getByTestId("tools-hub").getByRole("heading", { name: "All tools" })).toBeVisible();
+    await expect(page.getByTestId("tools-hub").getByTestId("application-row-medication-prescribing")).toContainText(
+      "Medication Prescribing",
+    );
+    await expect(page.getByTestId("tools-hub").getByTestId("selected-application-panel")).toContainText(
+      "Selected tool",
+    );
+    await expect(
+      page
+        .getByTestId("tools-hub")
+        .getByTestId("application-row-medication-prescribing")
+        .getByLabel("Launch Medication Prescribing"),
+    ).toHaveAttribute("href", "/?mode=prescribing");
     await expectNoPageHorizontalOverflow(page);
   });
 
@@ -1139,6 +1256,11 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expect(viewerNav.getByRole("link", { name: "PDF" })).toBeVisible();
     await expect(viewerNav.getByRole("link", { name: "Text" })).toBeVisible();
     await expect(page.getByRole("heading", { level: 1, name: "Synthetic lithium monitoring protocol" })).toBeVisible();
+    await page.getByRole("button", { name: "Open document actions" }).first().click();
+    const documentActions = page.getByRole("dialog", { name: "This document" });
+    await expect(documentActions).toBeVisible();
+    await tapOutsideActiveSurface(page);
+    await expect(documentActions).toHaveCount(0);
     await expect(preview).toBeVisible();
     await expect(toolbar).toBeVisible({ timeout: 30000 });
     await expectDomIntegrity(page);
@@ -1369,7 +1491,7 @@ test.describe("Clinical KB UI smoke coverage", () => {
       await expect(dialog).toBeHidden();
 
       const reopenedDialog = await openGuide(page);
-      await page.keyboard.press("Escape");
+      await tapOutsideActiveSurface(page);
       await expect(reopenedDialog).toBeHidden();
       await expectNoPageHorizontalOverflow(page);
     });
diff --git a/tests/ui-stress.spec.ts b/tests/ui-stress.spec.ts
index 05f6a6c3e8..e7a9d9a531 100644
--- a/tests/ui-stress.spec.ts
+++ b/tests/ui-stress.spec.ts
@@ -211,19 +211,18 @@ async function expectNoPageHorizontalOverflow(page: Page) {
 }
 
 async function openDailyActions(page: Page) {
-  const trigger = page.getByRole("button", { name: "Open daily actions" });
-  const dialog = page.getByRole("dialog", { name: "Daily actions" });
+  const trigger = page.getByRole("button", { name: /^Open .+ options$/ });
   const menu = page.getByTestId("daily-actions-menu");
 
   await expect(trigger).toBeVisible();
   await expect(trigger).toBeEnabled();
   await expect(async () => {
-    if ((await dialog.isVisible().catch(() => false)) || (await menu.isVisible().catch(() => false))) return;
+    if (await menu.isVisible().catch(() => false)) return;
     await trigger.click();
-    await expect(dialog.or(menu)).toBeVisible({ timeout: 1_500 });
-  }).toPass({ timeout: 10_000 });
+    await expect(menu).toBeVisible({ timeout: 2_500 });
+  }).toPass({ timeout: 20_000 });
 
-  return (await dialog.isVisible().catch(() => false)) ? dialog : menu;
+  return menu;
 }
 
 test.describe("Clinical KB long-content stress coverage", () => {
@@ -234,11 +233,11 @@ test.describe("Clinical KB long-content stress coverage", () => {
     test(`many documents and citations do not overflow at ${viewport.name}`, async ({ page }) => {
       await mockStressData(page);
       await page.setViewportSize({ width: viewport.width, height: viewport.height });
-      await page.goto("/", { waitUntil: "domcontentloaded" });
+      await page.goto("/?mode=documents", { waitUntil: "domcontentloaded" });
       await page.waitForLoadState("networkidle", { timeout: 15_000 }).catch(() => undefined);
 
       const dailyActions = await openDailyActions(page);
-      await dailyActions.getByRole("button", { name: "Add document" }).click();
+      await dailyActions.getByRole("menuitem", { name: /Upload(?: PDF)?/ }).click();
       const uploadSurface =
         viewport.name === "mobile"
           ? page.getByRole("dialog", { name: "Upload and indexing" })
diff --git a/tests/ui-tools.spec.ts b/tests/ui-tools.spec.ts
index a76c9774c6..e48d0e1caf 100644
--- a/tests/ui-tools.spec.ts
+++ b/tests/ui-tools.spec.ts
@@ -86,4 +86,49 @@ test.describe("Clinical KB applications launcher", () => {
     await expect(page.getByText("Showing 1 to 2 of 4 applications")).toBeVisible();
     await expectNoPageHorizontalOverflow(page);
   });
+
+  test("tools mode embeds the launcher content inside the dashboard", async ({ page }) => {
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await gotoLauncher(page, "/?mode=tools&q=medication&focus=1&run=1");
+
+    await expect(page.getByRole("button", { name: "Current app mode: Tools" })).toBeVisible();
+    await expect(page.locator('input[placeholder="Search tools..."]:visible').first()).toHaveValue("medication");
+
+    const toolsHub = page.getByTestId("tools-hub");
+    await expect(toolsHub).toBeVisible();
+    await expect(toolsHub.getByRole("heading", { name: "Tools", exact: true })).toBeVisible();
+    await expect(toolsHub.getByRole("region", { name: "Pinned tools" })).toBeVisible();
+    await expect(toolsHub.getByRole("heading", { name: "All tools" })).toBeVisible();
+    await expect(toolsHub.getByTestId("application-row-medication-prescribing")).toBeVisible();
+    await expect(toolsHub.getByTestId("application-row-documents")).toBeHidden();
+    await expect(toolsHub.getByText("Showing 1 to 2 of 4 tools")).toBeVisible();
+    await expect(toolsHub.getByTestId("selected-application-panel")).toContainText("Selected tool");
+    await expect(toolsHub.getByTestId("tool-mode-result-medications")).toHaveCount(0);
+
+    const launchLink = toolsHub
+      .getByTestId("application-row-medication-prescribing")
+      .getByLabel("Launch Medication Prescribing");
+    await expect(launchLink).toHaveAttribute("href", "/?mode=prescribing");
+    await expectNoPageHorizontalOverflow(page);
+  });
+
+  test("tools mode opens the selected tool slide-up on mobile", async ({ page }) => {
+    await page.setViewportSize({ width: 390, height: 820 });
+    await gotoLauncher(page, "/?mode=tools");
+
+    const toolsHub = page.getByTestId("tools-hub");
+    await expect(toolsHub.getByTestId("selected-application-panel")).toBeHidden();
+    await toolsHub.getByTestId("mobile-application-row-medication-prescribing").click();
+
+    const selectedSheet = page.getByRole("dialog", { name: "Selected tool" });
+    await expect(selectedSheet).toBeVisible();
+    await expect(page.getByTestId("selected-application-sheet-panel")).toContainText("Medication Prescribing");
+    const mobileLaunchLink = page
+      .getByTestId("selected-application-sheet-panel")
+      .getByLabel("Launch Medication Prescribing");
+    await expect(mobileLaunchLink).toHaveAttribute("href", "/?mode=prescribing");
+    await page.getByLabel("Close selected tool").click();
+    await expect(selectedSheet).toBeHidden();
+    await expectNoPageHorizontalOverflow(page);
+  });
 });
diff --git a/tsconfig.json b/tsconfig.json
index a05c2e6fda..3dd8097aaf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2017",
+    "target": "ES2022",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/vitest.config.mts b/vitest.config.mts
index ed89166900..a7c5d06f4f 100644
--- a/vitest.config.mts
+++ b/vitest.config.mts
@@ -7,6 +7,14 @@ const config = {
       reportsDirectory: "coverage",
       include: ["src/lib/**/*.ts", "src/app/**/route.ts", "src/components/**/*.{ts,tsx}"],
       exclude: ["src/app/**/{page,layout,loading,error,not-found}.tsx"],
+      // Regression floor set just below current coverage. Raise over time; the point
+      // is to fail CI on a meaningful drop, not to chase a target.
+      thresholds: {
+        statements: 48,
+        branches: 38,
+        functions: 44,
+        lines: 50,
+      },
     },
     environment: "node",
     include: ["tests/**/*.test.ts"],
diff --git a/worker/main.ts b/worker/main.ts
index 6d65710029..66a88d592d 100644
--- a/worker/main.ts
+++ b/worker/main.ts
@@ -883,7 +883,7 @@ async function uploadAndCaptionImages(
     });
   }
 
-  const captionConcurrency = 4;
+  const captionConcurrency = env.WORKER_VISION_CONCURRENCY;
   const resolvedTasks: Array<{
     task: CaptionTask;
     classification: ImageClassification;