From 78b0c011ba1949c3c3a5ad3a35e74c9e41634eb9 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sat, 5 Sep 2026 08:45:58 +0000
Subject: [PATCH 01/35] fix(ui): give the mode-menu search box a search-shell
 focus owner

Clicking into "Find a mode" in the header mode menu drew a sharp accent
rectangle around the text while the magnifier icon sat outside it. The
input's Tailwind `outline-none` cannot win against the unlayered shared
text-field rule in globals.css, which paints an outline on any nested
input on focus-visible.

Adopt the established fix pair instead of inventing a new override: the
container becomes the `search-shell` focus owner and the input carries
`search-shell-input`, whose unlayered rule clears the outline and the
inset shadow. The Tailwind `focus-within:border-*` utility is dropped
because `.search-shell:focus-within` already owns that border shift, so
the control keeps a single focus affordance.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WJ1C29Kazq72SbLHUYZLQX
---
 src/components/clinical-dashboard/master-search-header.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/clinical-dashboard/master-search-header.tsx b/src/components/clinical-dashboard/master-search-header.tsx
index dc61ebd267..f395af4ecd 100644
--- a/src/components/clinical-dashboard/master-search-header.tsx
+++ b/src/components/clinical-dashboard/master-search-header.tsx
@@ -2422,7 +2422,7 @@ export function MasterSearchHeader({
               )}
             >
               <div className="border-b border-[color:var(--border)] p-3 pb-2.5">
-                <div className="grid min-h-12 grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface)] px-3 shadow-[var(--shadow-inset)] transition-[border-color,box-shadow] focus-within:border-[color:var(--clinical-accent-border)]">
+                <div className="search-shell grid min-h-12 grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface)] px-3 shadow-[var(--shadow-inset)] transition-[border-color,box-shadow]">
                   <Search aria-hidden="true" className="size-icon-md text-[color:var(--text-muted)]" strokeWidth={2} />
                   <input
                     ref={desktopModeMenuSearchRef}
@@ -2438,7 +2438,7 @@ export function MasterSearchHeader({
                     aria-controls="app-mode-options"
                     autoComplete="off"
                     spellCheck={false}
-                    className="min-w-0 bg-transparent text-sm font-semibold text-[color:var(--text-heading)] outline-none placeholder:font-medium placeholder:text-[color:var(--text-muted)]"
+                    className="search-shell-input min-w-0 bg-transparent text-sm font-semibold text-[color:var(--text-heading)] outline-none placeholder:font-medium placeholder:text-[color:var(--text-muted)]"
                   />
                   {modeMenuQuery ? (
                     <button

From d853e34f1937621a9d753e7e4ba55fb7fd6f7efa Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 09:14:11 +0000
Subject: [PATCH 02/35] test(ui-smoke): scope the DSM page-root assertions to
 the visible owner
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Production UI shard 1 failed on PR #2638 with a strict-mode violation:
`getByTestId("dsm-search-page")` resolved to two elements, the live one
under `mobile-composer-reserve-pad` and a hidden streaming twin beside it.
The PR's diff was two class names on the header mode-menu search box, which
that test never opens, and the same shard passed on the base commit minutes
earlier.

This is the known `#093` artefact: Next streaming can leave a hidden
duplicate page root in the tree under full-suite load. The repository
already adjudicated it as a test-side concern and ships `visibleByTestId`
for exactly this — its docstring names page-root and shell surfaces as the
intended callers, and `tests/dsm-ui-smoke.spec.ts` already scopes the same
testid that way. These two call sites in `ui-smoke.spec.ts` were simply
never converted, and the file already imports the helper.

`expectSingleSettledOwner` is deliberately not used here: the duplicate is
hidden and invisible to users, so requiring it to disappear would assert
more than the established decision supports.

Verified: `npm run test:e2e -- tests/ui-smoke.spec.ts --project=chromium
--grep "DSM"` — 2 passed (8.0s); eslint clean on the changed file.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WJ1C29Kazq72SbLHUYZLQX
---
 tests/ui-smoke.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index b44074d60c..ec07411ef2 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -3990,7 +3990,7 @@ test.describe("PsychSift UI smoke coverage", () => {
     await expect(page).toHaveURL(/\/dsm\/search\?q=major\+depressive&focus=1&run=1$/, {
       timeout: 30_000,
     });
-    await expect(page.getByTestId("dsm-search-page")).toBeVisible();
+    await expect(visibleByTestId(page, "dsm-search-page")).toBeVisible();
     const queryRibbon = page.getByTestId("search-query-ribbon");
     await expect(queryRibbon.getByRole("heading", { name: "major depressive" })).toBeVisible();
     await expect(queryRibbon.getByRole("group", { name: "Filter diagnoses by category" })).toBeVisible();
@@ -4051,7 +4051,7 @@ test.describe("PsychSift UI smoke coverage", () => {
     await mockDemoApi(page);
     await gotoApp(page, "/dsm/search?q=depression");
 
-    await expect(page.getByTestId("dsm-search-page")).toBeVisible();
+    await expect(visibleByTestId(page, "dsm-search-page")).toBeVisible();
     const trigger = page.getByTestId("dsm-category-filter-desktop");
     await trigger.focus();
     await page.keyboard.press("Enter");

From fef557b5c71a8282250b5c6bbe7d03d877d0aae1 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 09:25:02 +0000
Subject: [PATCH 03/35] Drop seven unreachable alternatives from the Smart
 search rules

Seven expansion patterns listed a long phrase alongside a shorter one that the
long phrase always contains, so the shorter alternative matched first and the
longer one could never be reached. Two are in Prescribing, one in Tools, and
four in Calculators.

The trimmed patterns are behaviour-identical: in each pair the surviving phrase
is a suffix of the deleted one and carries the same word boundaries, so every
string the old pattern matched the new one matches too. The existing unit tests
already exercise three of these rules using the long phrasing and still pass
unchanged, which is the proof that nothing moved.

No rule is added, removed, or retargeted. This deletes dead text only.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012j3M3zd5PkGfN5vJe3BiSU
---
 src/lib/smart-search-intent.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/smart-search-intent.ts b/src/lib/smart-search-intent.ts
index ad7c2a9737..de17c71765 100644
--- a/src/lib/smart-search-intent.ts
+++ b/src/lib/smart-search-intent.ts
@@ -116,11 +116,11 @@ const modeExpansionRules: Record<SmartNaturalSearchModeId, readonly ExpansionRul
   ],
   prescribing: [
     {
-      pattern: /\b(?:medicine that needs regular blood tests|regular blood tests)\b/i,
+      pattern: /\bregular blood tests\b/i,
       terms: ["monitoring", "blood tests"],
     },
     {
-      pattern: /\b(?:medicine for alcohol dependence|alcohol dependence)\b/i,
+      pattern: /\balcohol dependence\b/i,
       terms: ["alcohol dependence", "relapse prevention"],
     },
     {
@@ -130,7 +130,7 @@ const modeExpansionRules: Record<SmartNaturalSearchModeId, readonly ExpansionRul
   ],
   tools: [
     {
-      pattern: /\b(?:check medication interactions|medication interactions)\b/i,
+      pattern: /\bmedication interactions\b/i,
       terms: ["medication", "prescribing", "interactions", "safety"],
     },
     { pattern: /\b(?:mental health form|mental health forms)\b/i, terms: ["forms", "paperwork"] },
@@ -141,16 +141,16 @@ const modeExpansionRules: Record<SmartNaturalSearchModeId, readonly ExpansionRul
   ],
   calculators: [
     {
-      pattern: /\b(?:screen depression severity|depression severity)\b/i,
+      pattern: /\bdepression severity\b/i,
       terms: ["PHQ-9", "depression"],
     },
-    { pattern: /\b(?:measure anxiety symptoms|anxiety symptoms)\b/i, terms: ["GAD-7", "anxiety"] },
+    { pattern: /\banxiety symptoms\b/i, terms: ["GAD-7", "anxiety"] },
     {
-      pattern: /\b(?:screen hazardous drinking|hazardous drinking)\b/i,
+      pattern: /\bhazardous drinking\b/i,
       terms: ["AUDIT-C", "CAGE", "alcohol"],
     },
     {
-      pattern: /\b(?:rate obsessive compulsive symptoms|obsessive compulsive symptoms)\b/i,
+      pattern: /\bobsessive compulsive symptoms\b/i,
       terms: ["Y-BOCS", "obsessive compulsive"],
     },
   ],

From d4595938d3e7119e1e462f031115720b33773ab4 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 09:37:29 +0000
Subject: [PATCH 04/35] test(ui-smoke): derive the DSM in-page locators from
 the visible root
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Addresses the Codex review finding on PR #2714. Scoping only the
`dsm-search-page` root assertion left every locator after it resolving
across both copies, so the same strict-mode violation would reappear one
line later as soon as the #093 streaming twin exists: the query ribbon and
`dsm-search-result` in the first test, `dsm-category-filter-desktop` in the
second, and the diagnosis page root and its h1 after navigation.

Each test now owns its visible page root and derives the in-page locators
from it, as tests/dsm-ui-smoke.spec.ts already does.

Two locators deliberately stay page-scoped, because scoping them is wrong
rather than merely unnecessary: `dsm-category-filter-panel` renders through
`OverlayPortal` (result-filter-control.tsx), and the "Back to dsm-5" control
sits in the in-page nav header, which also portals out of the page root.
Both live outside the subtree, so a page-root scope cannot find them —
confirmed by the back-link assertion failing under the over-scoped form
before this correction.

Verified: `npm run test:e2e -- tests/ui-smoke.spec.ts --project=chromium
--grep "DSM"` — 2 passed (6.4s); eslint and prettier clean on the file.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WJ1C29Kazq72SbLHUYZLQX
---
 tests/ui-smoke.spec.ts | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index ec07411ef2..bfb1f2c2ca 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -3990,22 +3990,29 @@ test.describe("PsychSift UI smoke coverage", () => {
     await expect(page).toHaveURL(/\/dsm\/search\?q=major\+depressive&focus=1&run=1$/, {
       timeout: 30_000,
     });
-    await expect(visibleByTestId(page, "dsm-search-page")).toBeVisible();
-    const queryRibbon = page.getByTestId("search-query-ribbon");
+    // Own the visible page root and derive every in-page locator from it (#093).
+    // Scoping only the root assertion still leaves the ribbon and result rows
+    // resolving across both copies once a hidden streaming twin exists.
+    const dsmPage = visibleByTestId(page, "dsm-search-page");
+    await expect(dsmPage).toBeVisible();
+    const queryRibbon = dsmPage.getByTestId("search-query-ribbon");
     await expect(queryRibbon.getByRole("heading", { name: "major depressive" })).toBeVisible();
     await expect(queryRibbon.getByRole("group", { name: "Filter diagnoses by category" })).toBeVisible();
 
-    const result = page.getByTestId("dsm-search-result").filter({ hasText: "Major depressive disorder" });
+    const result = dsmPage.getByTestId("dsm-search-result").filter({ hasText: "Major depressive disorder" });
     await expect(result).toBeVisible();
     await expectMinTouchTarget(result.getByRole("button", { name: "Add Major depressive disorder to comparison" }));
     await expectMinTouchTarget(result.getByRole("link", { name: "Open Major depressive disorder" }));
 
     await result.getByRole("link", { name: "Open Major depressive disorder" }).click();
     await expect(page).toHaveURL(/\/dsm\/diagnoses\/major-depressive-disorder$/, { timeout: 30_000 });
-    await expect(page.getByTestId("dsm-diagnosis-page")).toBeVisible({ timeout: 30_000 });
-    await expect(page.getByRole("heading", { level: 1, name: "Major depressive disorder" })).toBeVisible();
+    const diagnosisPage = visibleByTestId(page, "dsm-diagnosis-page");
+    await expect(diagnosisPage).toBeVisible({ timeout: 30_000 });
+    await expect(diagnosisPage.getByRole("heading", { level: 1, name: "Major depressive disorder" })).toBeVisible();
     // The breadcrumb row went with the in-page header: its back control is the
     // one route out to the DSM search catalogue, not the shared home composer.
+    // It stays page-scoped because that header portals out of the page root,
+    // the same reason the filter panel below is not scoped either.
     await expect(page.getByRole("link", { name: "Back to dsm-5" })).toHaveAttribute("href", "/dsm/search");
     await expectNoPageHorizontalOverflow(page);
   });
@@ -4051,8 +4058,12 @@ test.describe("PsychSift UI smoke coverage", () => {
     await mockDemoApi(page);
     await gotoApp(page, "/dsm/search?q=depression");
 
-    await expect(visibleByTestId(page, "dsm-search-page")).toBeVisible();
-    const trigger = page.getByTestId("dsm-category-filter-desktop");
+    const dsmPage = visibleByTestId(page, "dsm-search-page");
+    await expect(dsmPage).toBeVisible();
+    // The trigger is rendered inside the page root, so it needs the same owner.
+    // The panel below deliberately stays page-scoped: `ResultFilterSheet`
+    // renders through `OverlayPortal`, so it lives outside this subtree.
+    const trigger = dsmPage.getByTestId("dsm-category-filter-desktop");
     await trigger.focus();
     await page.keyboard.press("Enter");
     const panel = page.getByTestId("dsm-category-filter-panel");

From d204dce793370c50e0d751744db7c1e9764929c4 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 09:40:50 +0000
Subject: [PATCH 05/35] ledger: record the prlanded verification for PR #2637

Immutable review record for the merged sidebar reliability fix: merge commit
ee0cf48 tree is identical to branch tip a943909, fix commit 1a6adff is an
ancestor of main, no orphaned commits, remote branch already deleted.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Cm7QVRJrR4gkA7SyN61EoF
---
 ...fe60a08ef7070b302e3649b721fce26c5690363f025b23b6d14.record.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/branch-review-records/173c8dc623608fe60a08ef7070b302e3649b721fce26c5690363f025b23b6d14.record.md

diff --git a/docs/branch-review-records/173c8dc623608fe60a08ef7070b302e3649b721fce26c5690363f025b23b6d14.record.md b/docs/branch-review-records/173c8dc623608fe60a08ef7070b302e3649b721fce26c5690363f025b23b6d14.record.md
new file mode 100644
index 0000000000..7279b1f0fe
--- /dev/null
+++ b/docs/branch-review-records/173c8dc623608fe60a08ef7070b302e3649b721fce26c5690363f025b23b6d14.record.md
@@ -0,0 +1 @@
+| 2026-09-07 | claude/side-navigation-reliability-0sg48b | ee0cf48b5ae370475de1526bd843ac9f62ef55a2 | prlanded | PR #2637 merged 2026-09-05T11:11:08Z by BigSimmo via true merge commit ee0cf48 (auto-merge armed, three update-branch merges of main by the owner beforehand). Tree of ee0cf48 is identical to branch tip a943909 (git diff --stat empty); fix commit 1a6adff is an ancestor of origin/main; no late or orphaned commits; remote branch already deleted by GitHub. Sidebar shortcuts now switch mode in place via onSelectMode and useHomeModeSeed consumes the UI-change flag one-shot. | git diff --stat ee0cf48 a943909 empty; git merge-base --is-ancestor 1a6adff origin/main true; PR read via GitHub MCP state=closed merged=true; CI on head a943909 green before merge |

From ad1b84b83918ef8c206119dedfce1dc1aba5d3b5 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 09:51:48 +0000
Subject: [PATCH 06/35] fix(search): a closed cross-mode tray that could not
 say what was behind it

Four small follow-ups to the "Also matches" disclosure, each independent.

The "Also in your library" tray dropped its match count from assistive tech at
every width. The visible count carries aria-hidden with a comment saying the
button's name should not read it twice, but that tray has no live region to say
it once, and below sm the count is display:none anyway. An sr-only copy now
carries it, so the closed control announces what it opens onto.

On phones the same panel showed "Tap to open", because the cross-mode lookup
waited for the click there. That is the blind door the desktop path was
deliberately built to avoid: the header could not state a count, and an empty
tray was still offered. The lookup is now eager at every width and the no-match
tray is dropped at every width. The cost is one extra cross-mode lookup per
phone search.

The page thumbnails kept the 3px accent top bar that was removed from the
best-match card, so the strip the owner asked to lose simply moved down the
page. Removed, leaving the hairline border.

One inline style={{ maxWidth }} in a design-scratch mockup became max-w-[30ch],
which puts the design-drift ratchet at 232 against its 233 ceiling. It had no
headroom, so the next PR to add a legitimate inline style would have failed on
a limit unrelated to it.

Verified: lint, typecheck, drift ratchet 232/233. Focused browser proof on the
specs the planner attributes to these files; the full Chromium suite is left to
CI, which runs it on this change.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KYV1sTeo2DHUyJBjzprTRU
---
 .../answer-chat-perfected-v2-mockups.tsx      |  2 +-
 .../clinical-dashboard/cross-mode-links.tsx   |  8 +++--
 .../document-search-results.tsx               |  2 +-
 .../universal-search-also-matches.tsx         | 36 +++++++++----------
 tests/ui-universal-search.spec.ts             | 16 ++++++---
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/components/answer-chat-perfected-v2-mockups.tsx b/src/components/answer-chat-perfected-v2-mockups.tsx
index 7c2f9774e3..f9944a27be 100644
--- a/src/components/answer-chat-perfected-v2-mockups.tsx
+++ b/src/components/answer-chat-perfected-v2-mockups.tsx
@@ -1315,7 +1315,7 @@ function ConsecutiveLineSpecimen() {
       <p className="text-3xs font-semibold uppercase tracking-eyebrow text-[color:var(--text-muted)]">
         Marks on consecutive lines
       </p>
-      <p style={{ maxWidth: "30ch" }} className="mt-1 text-base-minus leading-prose text-[color:var(--text-heading)]">
+      <p className="mt-1 max-w-[30ch] text-base-minus leading-prose text-[color:var(--text-heading)]">
         <MarkedText
           section={{
             id: "line-a",
diff --git a/src/components/clinical-dashboard/cross-mode-links.tsx b/src/components/clinical-dashboard/cross-mode-links.tsx
index e0f4d933e0..af34653fe0 100644
--- a/src/components/clinical-dashboard/cross-mode-links.tsx
+++ b/src/components/clinical-dashboard/cross-mode-links.tsx
@@ -291,14 +291,18 @@ function CrossModeLinksLine({
           {preview.join(" · ")}
           {rest > 0 ? ` · +${rest}` : null}
         </span>
-        {/* Visual cue only — the button's accessible name stays the label above,
-            so a screen reader is not read the count twice. */}
+        {/* The visible count is decorative — it is dropped entirely below sm, and
+            `hidden` hides it from assistive tech as well as from the eye. This
+            tray has no live region to carry the number, so without the sr-only
+            copy the count would never reach a screen reader at any width, and
+            the closed control would announce as a door onto an unknown. */}
         <span
           className="hidden shrink-0 text-2xs font-medium tabular-nums text-[color:var(--text-muted)] sm:inline"
           aria-hidden
         >
           {countLabel}
         </span>
+        <span className="sr-only">{countLabel}</span>
         <span
           className={cn(
             "-mr-1 grid h-7 w-7 shrink-0 place-items-center rounded-md text-[color:var(--text-muted)] transition-transform motion-reduce:transition-none",
diff --git a/src/components/clinical-dashboard/document-search-results.tsx b/src/components/clinical-dashboard/document-search-results.tsx
index fe3a29b4f4..923a96ffa1 100644
--- a/src/components/clinical-dashboard/document-search-results.tsx
+++ b/src/components/clinical-dashboard/document-search-results.tsx
@@ -269,7 +269,7 @@ function DocumentPagePreview({ document, href }: { document: DocumentMatch; href
       href={href}
       aria-label={`Preview page ${pageNumber} of ${document.title}`}
       data-testid="document-page-preview"
-      className="group relative z-10 flex h-28 w-20 shrink-0 flex-col overflow-hidden rounded-lg border border-t-[3px] border-[color:var(--border-lux)] border-t-[color:var(--clinical-accent)] bg-[color:var(--surface)] shadow-[var(--e2)] transition hover:-translate-y-0.5 hover:border-[color:var(--clinical-accent-border)] hover:shadow-[var(--shadow-hover)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] motion-reduce:transform-none motion-reduce:transition-none sm:h-32 sm:w-24"
+      className="group relative z-10 flex h-28 w-20 shrink-0 flex-col overflow-hidden rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface)] shadow-[var(--e2)] transition hover:-translate-y-0.5 hover:border-[color:var(--clinical-accent-border)] hover:shadow-[var(--shadow-hover)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] motion-reduce:transform-none motion-reduce:transition-none sm:h-32 sm:w-24"
     >
       {hasCoverUrl ? (
         // Private signed covers stay unoptimized so bearer URLs never enter `/_next/image`.
diff --git a/src/components/clinical-dashboard/universal-search-also-matches.tsx b/src/components/clinical-dashboard/universal-search-also-matches.tsx
index 9c5f086d47..8cb85a087c 100644
--- a/src/components/clinical-dashboard/universal-search-also-matches.tsx
+++ b/src/components/clinical-dashboard/universal-search-also-matches.tsx
@@ -83,11 +83,10 @@ export function UniversalSearchAlsoMatches({
   // between the composer and the results the search actually asked for. It used
   // to open itself from sm up.
   const [expanded, setExpanded] = useState(false);
-  // The sm breakpoint (640px) no longer decides whether the panel is open — the
-  // disclosure does, at every width. It still decides two things the disclosure
-  // cannot: whether the cross-mode lookup runs before the user opens anything
-  // (so the closed header can state a real count), and whether a no-match tray
-  // is dropped entirely rather than left as a header that opens onto nothing.
+  // The sm breakpoint (640px) no longer decides whether the panel is open, nor
+  // whether the lookup runs — the disclosure owns the first and the lookup is
+  // eager at every width. All it still decides is how many mode cards an opened
+  // tray may show, four on a wide viewport against three on a phone.
   const [isWide, setIsWide] = useState(false);
   const [viewportReady, setViewportReady] = useState(false);
   useEffect(() => {
@@ -106,13 +105,14 @@ export function UniversalSearchAlsoMatches({
   // arrive; a speculative phone disclosure would add dead space to short
   // answers that have no cross-mode matches.
   //
-  // Deliberately unchanged by the collapse: the lookup still runs on submit from
-  // sm up even while the tray is shut. That is what lets a closed header say
-  // "3 related modes" and lets the whole tray disappear when nothing matched. A
-  // closed control that cannot say what is behind it is a blind door, and
-  // making the fetch wait for the click would turn every desktop open into a
-  // spinner over a panel that may hold nothing.
-  const searchActive = submissionActive && (isWide || modeId === "answer" || expanded);
+  // The lookup runs on submit at every width, including phones, even while the
+  // tray is shut. That is what lets a closed header say "3 related modes" and
+  // lets the whole tray disappear when nothing matched. A closed control that
+  // cannot say what is behind it is a blind door, and the phone was the width
+  // where that bit: it showed "Tap to open" and could open onto nothing. The
+  // cost is one extra cross-mode lookup per phone search, accepted so that the
+  // closed row states a real count and an empty tray is never rendered at all.
+  const searchActive = submissionActive;
   const universal = useUniversalSearch({
     query: trimmedQuery,
     enabled: trimmedQuery.length >= 2 && searchActive,
@@ -165,18 +165,14 @@ export function UniversalSearchAlsoMatches({
     : matchCount > 0
       ? `${matchCountLabel(matchCount)} also match this search.`
       : emptyMessage;
-  const headerMeta = searchPending
-    ? "Searching…"
-    : !searchActive
-      ? "Tap to open"
-      : matchCount > 0
-        ? matchCountLabel(matchCount)
-        : "No other matches";
+  const headerMeta = searchPending ? "Searching…" : matchCount > 0 ? matchCountLabel(matchCount) : "No other matches";
 
   if (!submissionActive) return null;
   if (!viewportReady || trimmedQuery.length < 2) return null;
   if (modeId === "answer" && currentGroups.length === 0) return null;
-  if (isWide && !searchPending && currentGroups.length === 0) return null;
+  // At every width now, not just from sm up: the phone lookup is eager, so a
+  // header that would open onto nothing is dropped instead of offered.
+  if (!searchPending && currentGroups.length === 0) return null;
 
   return (
     <section
diff --git a/tests/ui-universal-search.spec.ts b/tests/ui-universal-search.spec.ts
index f783c42524..6497cf9136 100644
--- a/tests/ui-universal-search.spec.ts
+++ b/tests/ui-universal-search.spec.ts
@@ -389,7 +389,7 @@ test.describe("universal search typeahead", () => {
     ).toBe(true);
   });
 
-  test("loads submitted cross-mode matches on phones only after expansion", async ({ page }) => {
+  test("states the phone cross-mode count on the closed header, before any expansion", async ({ page }) => {
     await page.setViewportSize({ width: 390, height: 844 });
     const universalRequests: string[] = [];
     page.on("request", (request) => {
@@ -401,10 +401,18 @@ test.describe("universal search typeahead", () => {
     const alsoMatches = page.getByTestId("universal-also-matches");
     await expect(alsoMatches).toBeVisible();
     await expect(alsoMatches).toHaveCount(1);
-    expect(universalRequests).toHaveLength(0);
-
-    await alsoMatches.getByRole("button", { name: /Also matches in other modes/ }).click();
+    // Eager at phone width too. A closed row that says "Tap to open" is a blind
+    // door: it cannot promise the tray holds anything, and the empty tray was
+    // still rendered. The lookup runs on submit so the header states a count.
     await expect.poll(() => universalRequests.length).toBe(1);
+
+    const trigger = alsoMatches.getByRole("button", { name: /Also matches in other modes/ });
+    await expect(trigger).toHaveAttribute("aria-expanded", "false");
+    await expect(alsoMatches).not.toContainText("Tap to open");
+    await expect(alsoMatches.getByRole("link", { name: "Acamprosate", exact: true })).toBeHidden();
+
+    await trigger.click();
+    await expect(trigger).toHaveAttribute("aria-expanded", "true");
     await expect(alsoMatches.getByRole("link", { name: "Acamprosate", exact: true })).toBeVisible();
   });
 

From a2a539feccd61eabea02c803f23df351e146bd67 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 09:53:45 +0000
Subject: [PATCH 07/35] fix(search-chrome): ready-gate the composer reserve
 clear in the effect cleanup

MasterSearchHeader's composer effect cleanup unconditionally stripped
`data-composer-reserve` from the page-owned slot. The cleanup does not only
run on unmount: any change to the effect's dependencies re-runs it, and the
effect body then re-sets the marker about 4ms later. That leaves a window in
which the DOM lacks an attribute the page's own client render still produces,
and a page segment hydrating inside it logs a hydration mismatch on
`data-composer-reserve` (client "pending" vs server null).

Observed once on the dictionary catalogue and traced to
`commitHookEffectListUnmount` -> `setModeHomeComposerReservePending(..., false)`
with the slot not yet ready.

The cleanup now applies the same ready-gate adoption already uses: a slot is
ours to clear only once its own segment has signalled
`data-composer-slot-ready`. Nothing is stranded by skipping. The effect body
re-establishes the reserve on the next tick, and a real unmount takes the slot
element with it, so `getElementById` returns null there anyway.

Search-chrome invariant 15 is untouched: its three required clears (home media
query mismatch, suppressed composer, portal adoption fallback) all live in
`syncTarget` and the suppression branch, and the second test pins that the
suppressed-composer clear still fires on an unhydrated slot.

Evidence, same commit, instrumented Chromium on /dictionary/search:
  without the fix: +620ms REMOVE ready=false   (the window)
  with the fix:    no ready=false removal; all clears at ready=true
End state identical both ways: reserve absent, slot 80px, composer adopted.

Verification: focused unit tests 50 passed / 3 files; tsc --noEmit clean;
prettier clean on both files.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VRRn8uuZosrSaxXSB5J8S5
---
 .../master-search-header.tsx                  | 14 +++-
 tests/master-search-header.dom.test.tsx       | 78 ++++++++++++++++++-
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/src/components/clinical-dashboard/master-search-header.tsx b/src/components/clinical-dashboard/master-search-header.tsx
index 122dda142c..55367f1c43 100644
--- a/src/components/clinical-dashboard/master-search-header.tsx
+++ b/src/components/clinical-dashboard/master-search-header.tsx
@@ -1487,7 +1487,19 @@ export function MasterSearchHeader({
       mediaQuery.removeEventListener("change", syncTarget);
       host.parentNode?.removeChild(host);
       if (composerSlotId) {
-        setModeHomeComposerReservePending(document.getElementById(composerSlotId), false);
+        // Ready-gate, same as adoption: only a slot whose own segment has
+        // hydrated is ours to clear. This cleanup also runs on an ordinary
+        // dependency re-run, and stripping the SSR marker there leaves a window
+        // in which the DOM lacks an attribute the page's client render still
+        // produces — a page segment hydrating inside it logs a
+        // `data-composer-reserve` mismatch (client "pending" vs server null).
+        // Nothing is stranded by skipping: the effect body re-establishes the
+        // reserve on the very next tick, and a real unmount takes the slot
+        // element with it. Invariant 15's three required clears (media query
+        // mismatch, suppressed composer, portal fallback) live in `syncTarget`
+        // and the suppression branch above, and are untouched.
+        const slot = document.getElementById(composerSlotId);
+        if (isDesktopComposerSlotReady(slot)) setModeHomeComposerReservePending(slot, false);
       }
       setDesktopComposerPortalActive(false);
       setDesktopComposerPortalHost(null);
diff --git a/tests/master-search-header.dom.test.tsx b/tests/master-search-header.dom.test.tsx
index 6c51b475a1..0c535f3152 100644
--- a/tests/master-search-header.dom.test.tsx
+++ b/tests/master-search-header.dom.test.tsx
@@ -2,10 +2,15 @@
 
 import { fireEvent, render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { MasterSearchHeader } from "@/components/clinical-dashboard/master-search-header";
 import { factsheetsTopicsHref } from "@/lib/app-modes";
+import {
+  modeHomeComposerReserveAttr,
+  modeHomeComposerReservePendingValue,
+  modeHomeDesktopComposerSlotId,
+} from "@/lib/mode-home-composer";
 import { installMatchMediaStub } from "./setup/jsdom.setup";
 
 const router = vi.hoisted(() => ({
@@ -244,4 +249,75 @@ describe("MasterSearchHeader DOM", () => {
       expect(screen.queryByTestId("answer-composer-privacy-warning")).toBeNull();
     });
   });
+  describe("mode-home composer reserve marker", () => {
+    // The slot is appended outside React, so testing-library's cleanup does not
+    // remove it. Left behind, a stale slot keeps the id and getElementById in the
+    // next test resolves to it instead of that test's own slot.
+    afterEach(() => {
+      document.getElementById(modeHomeDesktopComposerSlotId)?.remove();
+    });
+
+    function mountSlot() {
+      const slot = document.createElement("div");
+      slot.id = modeHomeDesktopComposerSlotId;
+      // Exactly what the page SSRs: the reserve marker, and no ready flag —
+      // the owning page segment has not hydrated yet.
+      slot.setAttribute(modeHomeComposerReserveAttr, modeHomeComposerReservePendingValue);
+      document.body.appendChild(slot);
+      return slot;
+    }
+
+    function spyOnReserveRemoval() {
+      const removals: string[] = [];
+      const original = Element.prototype.removeAttribute;
+      vi.spyOn(Element.prototype, "removeAttribute").mockImplementation(function (this: Element, name: string) {
+        if (name === modeHomeComposerReserveAttr && this.id === modeHomeDesktopComposerSlotId) {
+          removals.push(this.getAttribute(modeHomeComposerReserveAttr) ?? "(absent)");
+        }
+        return original.call(this, name);
+      });
+      return removals;
+    }
+
+    it("does not strip the SSR reserve marker while the owning segment is still unhydrated", async () => {
+      // Desktop hero width, so the header wants to adopt the slot and keeps the
+      // pending reserve while it retries adoption.
+      installMatchMediaStub(true);
+      mountSlot();
+      const removals = spyOnReserveRemoval();
+
+      const props = {
+        ...defaultHeaderProps(),
+        desktopHomeComposerSlotId: modeHomeDesktopComposerSlotId,
+      };
+      const { rerender } = render(<MasterSearchHeader {...props} heroComposerBreakpoint="all" />);
+
+      // A dependency change re-runs the composer effect: React fires the cleanup
+      // and then the effect body. The cleanup used to removeAttribute() on a slot
+      // whose React segment had not hydrated, leaving a window in which the DOM
+      // lacked an attribute the page's own client render still produces. A page
+      // segment hydrating inside that window reports a hydration mismatch
+      // (client "pending" vs server null) on data-composer-reserve.
+      rerender(<MasterSearchHeader {...props} heroComposerBreakpoint="sm-up" />);
+      await Promise.resolve();
+
+      expect(removals).toEqual([]);
+    });
+
+    it("still clears the reserve marker when the composer is suppressed (invariant 15)", async () => {
+      installMatchMediaStub(true);
+      const slot = mountSlot();
+
+      const props = {
+        ...defaultHeaderProps(),
+        desktopHomeComposerSlotId: modeHomeDesktopComposerSlotId,
+        searchComposerVisible: false,
+      };
+      render(<MasterSearchHeader {...props} />);
+      // The suppression path clears in a queued microtask.
+      await new Promise((resolve) => setTimeout(resolve, 0));
+
+      expect(slot.hasAttribute(modeHomeComposerReserveAttr)).toBe(false);
+    });
+  });
 });

From 5c07dc4bd06889e539bf5b60535c772853c46755 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 10:18:08 +0000
Subject: [PATCH 08/35] test(stress): the medication breakpoint test asserted a
 tray that can now vanish

It requires the cross-mode panel to exist at 320px and to sit below the
medication results, but it never mocked /api/search/universal. That passed only
because the phone lookup was lazy, so the panel rendered a "Tap to open" header
whether or not anything was behind it. With the lookup eager the panel correctly
drops itself when the query has no cross-mode match, and the ordering assertion
went with it.

Mocks one documents-domain match for this test only, so the ordering guarantee
stays real rather than vacuous. The body is NDJSON, matching the endpoint: a
single JSON object parses to no groups and reproduces the same empty panel.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KYV1sTeo2DHUyJBjzprTRU
---
 tests/ui-stress.spec.ts | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/tests/ui-stress.spec.ts b/tests/ui-stress.spec.ts
index 666f8d5e06..caf6b08320 100644
--- a/tests/ui-stress.spec.ts
+++ b/tests/ui-stress.spec.ts
@@ -449,6 +449,47 @@ test.describe("Medication responsive stress coverage", () => {
       },
       { storageKey: PATIENT_PROFILE_STORAGE_KEY },
     );
+    // The cross-mode lookup is eager at phone width, and a tray with nothing
+    // behind it is now dropped rather than shown as a header that opens onto
+    // nothing. So the panel this test is about only exists if the endpoint
+    // returns a match outside Medication — mocked here rather than left to
+    // whatever the demo corpus happens to hold for this query.
+    await page.route(/\/api\/search\/universal(?:\?.*)?$/, async (route) => {
+      const query = new URL(route.request().url()).searchParams.get("q") ?? "";
+      const group = {
+        kind: "documents",
+        total: 1,
+        latencyMs: 2,
+        items: [
+          {
+            id: "acamprosate-guideline",
+            kind: "documents",
+            title: "Acamprosate prescribing guideline",
+            href: "/documents/acamprosate-guideline",
+            score: 0.86,
+          },
+        ],
+      };
+      const response = {
+        query,
+        tookMs: 8,
+        demoMode: true,
+        groups: [group],
+        contextMode: "prescribing",
+        preferredDomains: ["medications"],
+        domainOrder: ["medications", "documents"],
+      };
+      // The endpoint streams NDJSON, one event per line. A single JSON object
+      // parses to nothing and the panel then correctly drops itself.
+      const events = [
+        { type: "group", query, group },
+        { type: "complete", response },
+      ];
+      await route.fulfill({
+        body: `${events.map((event) => JSON.stringify(event)).join("\n")}\n`,
+        contentType: "application/x-ndjson; charset=utf-8",
+      });
+    });
     await page.setViewportSize({ width: 320, height: 720 });
     await page.goto("/?mode=prescribing&q=acamprosate%20renal%20dose&run=1", { waitUntil: "domcontentloaded" });
 

From dda10bd7cd5dccdf583291e0a5b6d70c0fec8be7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 10:19:06 +0000
Subject: [PATCH 09/35] chore(issues): record the pr-required failure this
 session never explained

The aggregate went red several times on a UI-only branch while every local gate
was green, and CI log access stayed blocked by the babysit marker for the whole
session, so the failing job was never read. Recorded with the next action, which
is to unlock the marker and read the log before offering a cause.

Inbox request only. It applies to the canonical ledger via issues:reconcile
after this lands.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KYV1sTeo2DHUyJBjzprTRU
---
 .../45cda6a2-725f-4fc7-bbd8-2350c7280d72.json      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 docs/outstanding-issues-inbox/45cda6a2-725f-4fc7-bbd8-2350c7280d72.json

diff --git a/docs/outstanding-issues-inbox/45cda6a2-725f-4fc7-bbd8-2350c7280d72.json b/docs/outstanding-issues-inbox/45cda6a2-725f-4fc7-bbd8-2350c7280d72.json
new file mode 100644
index 0000000000..386b83e487
--- /dev/null
+++ b/docs/outstanding-issues-inbox/45cda6a2-725f-4fc7-bbd8-2350c7280d72.json
@@ -0,0 +1,14 @@
+{
+  "version": 2,
+  "id": "45cda6a2-725f-4fc7-bbd8-2350c7280d72",
+  "createdOn": "2026-09-07",
+  "action": "add",
+  "payload": {
+    "pri": "P2",
+    "type": "issue",
+    "summary": "PR required failed repeatedly on a UI-only branch with no cause ever identified",
+    "detail": "Session 2026-09-07, branch claude/jolly-keller-vy36h2 (the also-matches disclosure). The pr-required aggregate went red several times while every local gate was green: 15 static gates, whole-tree Prettier, 229 + 161 focused unit tests, 129 + 28 Chromium tests. A push-cancellation theory was offered and then disproved by a run with a quiet window. CI log access was blocked by the babysit marker for the whole session, so the failing job was never read and the branch merged with the cause unknown. Next action: on the next unexplained pr-required failure, unlock the marker first (CLAUDE_ALLOW_PR_FOLLOW=1) and read the failing job log before theorising. Two contributing factors worth ruling out: a second agent was pushing merge commits to the same branch concurrently, and main merged about twelve changes during the session.",
+    "source": "docs/branch-review-records + session 331c4d4d",
+    "issueUlid": "01M1XP1FE7K06J63XSYVBS40HA"
+  }
+}

From 9b4533a7654d07834c53a6417ca4c8886ec4e9a6 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 10:23:15 +0000
Subject: [PATCH 10/35] fix(dashboard): clearing the composer left the URL
 submitted, so two retired mode homes came back
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Clearing the search box emptied the React query but left `q` and `run=1` in the
URL. `showSharedHome` reads `run=1` straight off the URL, so it stayed suppressed
while the mode branch below it, now seeing no query, fell back to the home its
route had been consolidated away from. Two modes were affected and both were
reproduced in a browser against a running build before the fix:

- `/?mode=prescribing&q=…&run=1`, clear -> `medication-home` (the Dose/Safety/
  Monitoring tiles). `tests/ui-tools.spec.ts` asserts in a comment that this view
  is "retired and no longer reachable from any route". It was reachable, by that
  one click.
- `/documents/search?q=…&run=1`, clear -> `document-search-empty-state`, the
  "Start here" home that `documents/page.tsx` records as deliberately retired.

This is the same defect a clinician reported for Sources, in two more modes: the
URL and the composer disagreed, and the mode branch resolved the disagreement by
rendering a page that no longer exists as a destination.

The fix is one handler. `onClearQuery` now also drops the submitted search from
the URL, so the shared home renders. `appModeSelectionHref` rather than
`appModeHomeHref`: every mode reaching this handler is dashboard-owned, so its
home is the shared home at `/`, and `appModeHomeHref("prescribing")` still answers
`/medications`, which only 307s back. `/documents/search` has to leave its own
route entirely, which the selection href also does.

The pre-existing `answer` guard is kept and is load-bearing. A generated answer is
durable state the URL does not own, so the clear button must not discard one; a
browser check confirms answer mode is untouched.

Both paths are pinned by new browser cases, which is where the defect was proved
rather than inferred.

Also fixes the third governance suite that fails on a shallow clone. `#1M0J6D`
added guards to the clinical-hazard and rag-plan suites; `privacy-readiness` was
left without one and still reported `reviewedCommit does not exist: <sha>`, which
reads as a governance breach rather than a missing object. It now mirrors the two
siblings exactly. The gate is not weakened: on a full clone the commit resolves,
`checkGit` stays true, and the real ancestry check runs.

Queues a correction to ledger row `#ZKR5YK`, whose Sources, Documents and
Medication examples are gone now that all three bare paths redirect. Tools is the
only live case left, and it stays an owner ruling rather than a fix.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QaizDqAQZWHgfGLitWU8xf
---
 .../4d148590-e6c2-4dde-b07d-111f312c827e.json | 11 ++++
 src/components/ClinicalDashboard.tsx          | 27 ++++++++-
 tests/privacy-readiness-contract.test.ts      | 58 ++++++++++++++++++-
 tests/ui-smoke.spec.ts                        | 22 +++++++
 tests/ui-tools.spec.ts                        | 22 +++++++
 5 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 docs/outstanding-issues-inbox/4d148590-e6c2-4dde-b07d-111f312c827e.json

diff --git a/docs/outstanding-issues-inbox/4d148590-e6c2-4dde-b07d-111f312c827e.json b/docs/outstanding-issues-inbox/4d148590-e6c2-4dde-b07d-111f312c827e.json
new file mode 100644
index 0000000000..bbd16da767
--- /dev/null
+++ b/docs/outstanding-issues-inbox/4d148590-e6c2-4dde-b07d-111f312c827e.json
@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "id": "4d148590-e6c2-4dde-b07d-111f312c827e",
+  "createdOn": "2026-09-07",
+  "action": "update",
+  "payload": {
+    "id": "#ZKR5YK",
+    "detail": "UPDATE 2026-09-06: this row is now partly stale and its Sources example is gone. PR #2672 consolidated /sources: its four-card mode home was deleted and the bare path now redirects to the shared home at /?mode=sources, so Sources no longer owns a home of its own and the mode pill landing there is correct rather than a miss. The row's remaining live cases are Favourites and Tools. Favourites is settled by an explicit owner decision (#V0EDR4, 2026-08-23: two purpose-specific surfaces are deliberate), which leaves Tools as the only open instance: changeMode still builds appModeSelectionHref, so picking Tools lands on /?mode=tools and the legacy client-only launcher (applications-launcher-page.tsx, data-testid tools-home) rather than canonical /tools (ToolsSearchResultsPage). Verified on main 0177bed by a browser probe: /?mode=tools renders tools-home. Documents and Medication also dropped off this row for the same reason as Sources - both bare paths redirect now. STILL AN OWNER RULING, not a defect to fix unilaterally: the pill deliberately always returns to the shared home, so special-casing Tools trades one inconsistency for another, and removing the second launcher means deleting a component that six assertions in tests/favourites-auth-gate.dom.test.tsx still render directly. Re-scope this row to Tools only.",
+    "baseRowFingerprint": "4a2c45298f781607394bb54bdde280518d7e1e6c1706ae00e2b05526613fa232"
+  }
+}
diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 44f39da693..11bc320920 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -3317,7 +3317,32 @@ function ClinicalDashboardContent({
           onAsk={ask}
           onClearQuery={() => {
             setQuery("");
-            if (!answer) setModeSearchSubmitted(false);
+            if (answer) return;
+            setModeSearchSubmitted(false);
+            // Clearing the box has to clear the URL too. `showSharedHome` reads
+            // `run=1` straight off the URL (`submittedUrlRunRequested`), so emptying
+            // only the React state left the dashboard in a state neither source
+            // describes: the shared home stayed suppressed while the mode branch,
+            // now seeing no query, fell back to the retired home its route was
+            // consolidated away from. Measured on a running build before this fix —
+            // clearing on `/?mode=prescribing&q=…&run=1` rendered `medication-home`,
+            // and on `/documents/search?q=…&run=1` rendered
+            // `document-search-empty-state`, both of which their own page stubs
+            // describe as retired.
+            //
+            // `appModeSelectionHref`, not `appModeHomeHref`: every mode reaching this
+            // handler is dashboard-owned, so its home IS the shared home at `/`.
+            // `appModeHomeHref("prescribing")` still answers `/medications`, which only
+            // 307s back here, and `/documents/search` must leave its own route entirely.
+            //
+            // The `answer` guard above is the pre-existing one and is load-bearing: a
+            // generated answer is durable state the URL does not own, and the clear
+            // button is not a "discard this answer" control.
+            if (submittedUrlRunRequested) {
+              router.replace(appModeSelectionHref(searchMode, { focus: true, queryMode, scopeFilters }), {
+                scroll: false,
+              });
+            }
           }}
           onClearScope={() => setSelectedDocumentIds([])}
           onQueryModeChange={setQueryMode}
diff --git a/tests/privacy-readiness-contract.test.ts b/tests/privacy-readiness-contract.test.ts
index cdb7900116..86ae71e011 100644
--- a/tests/privacy-readiness-contract.test.ts
+++ b/tests/privacy-readiness-contract.test.ts
@@ -1,3 +1,4 @@
+import { execFileSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { describe, expect, it } from "vitest";
 import { validatePrivacyReadiness } from "../scripts/check-privacy-readiness.mjs";
@@ -11,9 +12,64 @@ const retentionParityMigration = readFileSync(
   "utf8",
 );
 
+/*
+ * Web-container sessions start on a shallow clone, so `reviewedCommit` is often
+ * absent from local history. Without this the validator reports
+ * `reviewedCommit does not exist: <sha>`, which reads as a governance breach
+ * rather than a missing object, and every cloud session sees a spurious
+ * regression on an untouched file. Mirrors the guards already carried by
+ * tests/clinical-hazard-controls.test.ts and tests/rag-plan-package-parity.test.ts
+ * (`#1M0J6D`); this suite was the third with the same failure and the only one
+ * left without the guard.
+ */
+function isShallowClone(): boolean {
+  try {
+    return (
+      execFileSync("git", ["rev-parse", "--is-shallow-repository"], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+      }).trim() === "true"
+    );
+  } catch {
+    return false;
+  }
+}
+
+function isCommitAvailable(commit: string): boolean {
+  try {
+    execFileSync("git", ["cat-file", "-e", `${commit}^{commit}`], {
+      stdio: ["ignore", "ignore", "ignore"],
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function ensureHistoryDeepened(depth = 2000): void {
+  if (!isShallowClone()) return;
+  try {
+    execFileSync("git", ["fetch", `--deepen=${depth}`], {
+      stdio: ["ignore", "ignore", "ignore"],
+    });
+  } catch {
+    // Ignore network or fetch failures
+  }
+}
+
 describe("privacy readiness contract", () => {
   it("accepts the honest structural register", () => {
-    expect(validatePrivacyReadiness(manifest)).toEqual([]);
+    let checkGit = true;
+    if (!isCommitAvailable(manifest.reviewedCommit)) {
+      ensureHistoryDeepened(2000);
+      if (!isCommitAvailable(manifest.reviewedCommit) && isShallowClone()) {
+        console.warn(
+          `PRIVACY_READINESS_SHALLOW_CLONE: reviewedCommit ${manifest.reviewedCommit} is unavailable in shallow clone and history could not be deepened; skipping commit ancestry check.`,
+        );
+        checkGit = false;
+      }
+    }
+    expect(validatePrivacyReadiness(manifest, { checkGit })).toEqual([]);
   });
 
   it("keeps Railway processor evidence linked to the privacy impact assessment", () => {
diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index b44074d60c..13d9ae0eb1 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -1525,6 +1525,28 @@ test.describe("PsychSift UI smoke coverage", () => {
     expect(csp).toContain("https://*.supabase.co");
   });
 
+  /*
+   * The Documents half of the same defect. `/documents` redirects to the shared
+   * home, and `documents/page.tsx` records the idle Documents view as deliberately
+   * retired — but clearing the composer on a submitted search left `run=1` in the
+   * URL, so the shared home stayed suppressed and DocumentSearchResultsPanel fell
+   * back to that retired "Start here" home (`document-search-empty-state`).
+   */
+  test("clearing a documents search returns the shared home, never the retired Start here view", async ({ page }) => {
+    await page.setViewportSize({ width: 1280, height: 900 });
+    await mockDemoApi(page);
+    await gotoApp(page, "/documents/search?q=lithium+monitoring&run=1");
+
+    await page
+      .getByRole("button", { name: /clear search question|clear search/i })
+      .first()
+      .click();
+
+    await expect(page).toHaveURL(/\/\?mode=documents&focus=1$/);
+    await expect(page.getByTestId("shared-home-empty-state")).toBeVisible();
+    await expect(page.getByTestId("document-search-empty-state")).toHaveCount(0);
+  });
+
   test("static agent guidance is available and documents mode avoids the app error boundary", async ({ page }) => {
     const llms = await page.request.get("/llms.txt");
     expect(llms.status()).toBe(200);
diff --git a/tests/ui-tools.spec.ts b/tests/ui-tools.spec.ts
index 22ceaa8543..ccd41abe05 100644
--- a/tests/ui-tools.spec.ts
+++ b/tests/ui-tools.spec.ts
@@ -3293,6 +3293,28 @@ test.describe("Responsive layout guards", () => {
   // click/query assertions have nothing left to click. The still-live half of
   // the second test — the submitted-search results view — survives below,
   // reached directly instead of via a pill click.
+  /*
+   * Clearing the composer used to empty the React query while leaving `q` and
+   * `run=1` in the URL. `showSharedHome` reads `run=1` off the URL, so it stayed
+   * suppressed while MedicationPrescribingWorkspace, now seeing no query, fell back
+   * to `medication-home` — the Dose/Safety/Monitoring tiles `/medications` was
+   * consolidated away from, and which this file's own note above calls "retired and
+   * no longer reachable from any route". It was reachable, by this exact click.
+   */
+  test("clearing a prescribing search returns the shared home, never the retired medication home", async ({ page }) => {
+    await mockAnswerDashboardApi(page);
+    await gotoLauncher(page, "/?mode=prescribing&q=acamprosate%20renal%20dose&run=1");
+
+    await page
+      .getByRole("button", { name: /clear search question|clear search/i })
+      .first()
+      .click();
+
+    await expect(page).toHaveURL(/\/\?mode=prescribing&focus=1$/);
+    await expect(page.getByTestId("shared-home-empty-state")).toBeVisible();
+    await expect(page.getByTestId("medication-home")).toHaveCount(0);
+  });
+
   test("prescribing submitted search keeps results above the phone bottom dock", async ({ page }) => {
     await page.setViewportSize({ width: 320, height: 760 });
     await mockAnswerDashboardApi(page);

From 3040e1e092bb577eb74ce0e7a7ecb39bb72c7d31 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 10:29:57 +0000
Subject: [PATCH 11/35] test(audit): the source contract pinned the
 narrow-screen deferral that was removed

It asserted the exact `(isWide || modeId === "answer" || expanded)` gate, which
was the deferral that produced the phone blind door. Repointed at the eager gate,
at the empty-tray guard that now runs at every width, and at the three-way header
so the "Tap to open" arm cannot come back unnoticed.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KYV1sTeo2DHUyJBjzprTRU
---
 .../audit-navigation-auth-regressions.test.ts | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/audit-navigation-auth-regressions.test.ts b/tests/audit-navigation-auth-regressions.test.ts
index 0d1026b78d..7aea85eeb5 100644
--- a/tests/audit-navigation-auth-regressions.test.ts
+++ b/tests/audit-navigation-auth-regressions.test.ts
@@ -227,16 +227,28 @@ describe("audit navigation and auth regressions", () => {
     );
   });
 
-  it("defers cross-mode search on narrow screens until expansion except for completed answers", () => {
+  it("runs cross-mode search on submission at every width, so a closed tray can state its count", () => {
     // `prescribing` was excluded here while the panel mounted ABOVE the medication
     // results; the mount moved below them, so the mode is no longer suppressed and
-    // the deferral contract is the plain submission gate. tests/ui-stress.spec.ts
-    // pins the panel's position under those results.
-    expect(universalAlsoMatchesSource).toContain("const searchActive = submissionActive &&");
+    // the gate is plain submission. tests/ui-stress.spec.ts pins the panel's
+    // position under those results.
+    //
+    // The narrow-screen deferral this contract used to pin is gone deliberately.
+    // Waiting for the click meant the phone header could only say "Tap to open"
+    // and the tray was still rendered when nothing was behind it — a blind door.
+    // The lookup is eager at every width and an empty tray is dropped instead.
+    expect(universalAlsoMatchesSource).toContain("const searchActive = submissionActive;");
     expect(universalAlsoMatchesSource).not.toContain('modeId !== "prescribing"');
-    expect(universalAlsoMatchesSource).toContain('(isWide || modeId === "answer" || expanded)');
+    expect(universalAlsoMatchesSource).not.toContain('(isWide || modeId === "answer" || expanded)');
+    // The header now says pending / a count / nothing found. The "Tap to open"
+    // arm it replaced survives only in the comment above the searchActive gate,
+    // which is why this pins the expression rather than searching for the string.
+    expect(universalAlsoMatchesSource).toContain(
+      'const headerMeta = searchPending ? "Searching…" : matchCount > 0 ? matchCountLabel(matchCount) : "No other matches";',
+    );
     expect(universalAlsoMatchesSource).toContain("enabled: trimmedQuery.length >= 2 && searchActive");
     expect(universalAlsoMatchesSource).toContain('if (modeId === "answer" && currentGroups.length === 0) return null;');
+    expect(universalAlsoMatchesSource).toContain("if (!searchPending && currentGroups.length === 0) return null;");
     expect(universalAlsoMatchesSource).toContain("const [viewportReady, setViewportReady] = useState(false);");
     expect(universalAlsoMatchesSource).toContain("setViewportReady(true);");
     // The panel status is a three-way now — pending / a count / nothing found —

From d3e1b24f4187a295241aa4ae758984db87bc68d7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 10:45:39 +0000
Subject: [PATCH 12/35] issues: withdraw the #ZKR5YK re-scope in favour of the
 close already queued for it

Another session had a `done` pending on the same row (4036f064), backed by an
implementation of the mode-pill change the row asks for. Two pending mutations on
one row block reconciliation for everyone, which is the race `#686WHW` records,
and a re-scope is pointless against a close that supersedes the whole row.

The findings that prompted the re-scope are verified and worth keeping, so they
are recorded in the cancel reason and in this branch's PR rather than lost: the
row's Sources, Documents and Medication examples are all gone now that those three
bare paths redirect, Favourites is settled by owner decision `#V0EDR4`, and Tools
was the only live case left at the time of the check.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QaizDqAQZWHgfGLitWU8xf
---
 .../aca18f9d-f748-40cd-918a-51ecb9b91f1c.json          | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 docs/outstanding-issues-inbox/aca18f9d-f748-40cd-918a-51ecb9b91f1c.json

diff --git a/docs/outstanding-issues-inbox/aca18f9d-f748-40cd-918a-51ecb9b91f1c.json b/docs/outstanding-issues-inbox/aca18f9d-f748-40cd-918a-51ecb9b91f1c.json
new file mode 100644
index 0000000000..24a35d825a
--- /dev/null
+++ b/docs/outstanding-issues-inbox/aca18f9d-f748-40cd-918a-51ecb9b91f1c.json
@@ -0,0 +1,10 @@
+{
+  "version": 2,
+  "id": "aca18f9d-f748-40cd-918a-51ecb9b91f1c",
+  "createdOn": "2026-09-07",
+  "action": "cancel",
+  "payload": {
+    "requestId": "4d148590-e6c2-4dde-b07d-111f312c827e",
+    "reason": "Withdrawn in favour of the competing request 4036f064, a done on the same row backed by an actual implementation (outcome: mode pill now routes to dedicated mode homes). My request only re-scoped #ZKR5YK to Tools after verifying that its Sources, Documents and Medication examples are gone (all three bare paths redirect now) and that Favourites is settled by owner decision #V0EDR4. A re-scope is pointless against a close that supersedes the whole row, and two pending mutations on one row block reconciliation for everyone (#686WHW). The verified findings are recorded in the PR that carried this session's fixes instead, so they are not lost if that close is ever reopened."
+  }
+}

From d8367c6a71af6faed874d236e18fc71519893caa Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 10:48:56 +0000
Subject: [PATCH 13/35] fix(dashboard): keep the clear-query rationale inside
 the no-growth budget

The explanatory comment pushed ClinicalDashboard.tsx to 4141 lines, one over its
4140-line no-growth budget. The gate's advice is to extract a module rather than
grow the monolith; extracting this file is a refactor of its own, so the
proportionate answer to a one-line overrun is to say the same thing in fewer
lines. The full reasoning, the measured reproduction and the mutation check all
live in the commit that carried the fix.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QaizDqAQZWHgfGLitWU8xf
---
 src/components/ClinicalDashboard.tsx | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 11bc320920..439d412fa5 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -3319,25 +3319,13 @@ function ClinicalDashboardContent({
             setQuery("");
             if (answer) return;
             setModeSearchSubmitted(false);
-            // Clearing the box has to clear the URL too. `showSharedHome` reads
-            // `run=1` straight off the URL (`submittedUrlRunRequested`), so emptying
-            // only the React state left the dashboard in a state neither source
-            // describes: the shared home stayed suppressed while the mode branch,
-            // now seeing no query, fell back to the retired home its route was
-            // consolidated away from. Measured on a running build before this fix —
-            // clearing on `/?mode=prescribing&q=…&run=1` rendered `medication-home`,
-            // and on `/documents/search?q=…&run=1` rendered
-            // `document-search-empty-state`, both of which their own page stubs
-            // describe as retired.
-            //
-            // `appModeSelectionHref`, not `appModeHomeHref`: every mode reaching this
-            // handler is dashboard-owned, so its home IS the shared home at `/`.
-            // `appModeHomeHref("prescribing")` still answers `/medications`, which only
-            // 307s back here, and `/documents/search` must leave its own route entirely.
-            //
-            // The `answer` guard above is the pre-existing one and is load-bearing: a
-            // generated answer is durable state the URL does not own, and the clear
-            // button is not a "discard this answer" control.
+            // Clear the URL too, or `showSharedHome` (which reads `run=1` off the URL)
+            // stays suppressed while the mode branch, now query-less, falls back to the
+            // retired home its route was consolidated away from — `medication-home` and
+            // `document-search-empty-state`, both pinned by browser cases.
+            // `appModeSelectionHref`, not `appModeHomeHref`: these modes are all
+            // dashboard-owned, and `appModeHomeHref("prescribing")` answers
+            // `/medications`, which only 307s back here.
             if (submittedUrlRunRequested) {
               router.replace(appModeSelectionHref(searchMode, { focus: true, queryMode, scopeFilters }), {
                 scroll: false,

From 4d85c42ab3e0f213452886a4437aa67fc581786c Mon Sep 17 00:00:00 2001
From: Codex <codex@openai.com>
Date: Mon, 7 Sep 2026 11:29:29 +0000
Subject: [PATCH 14/35] fix(dashboard): resolve clear-request review findings

---
 src/components/ClinicalDashboard.tsx     |  4 ++++
 tests/privacy-readiness-contract.test.ts | 24 +++++---------------
 tests/ui-universal-search.spec.ts        | 28 ++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 439d412fa5..bb4c5e4f0d 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -3318,6 +3318,10 @@ function ClinicalDashboardContent({
           onClearQuery={() => {
             setQuery("");
             if (answer) return;
+            // Clearing an initial Answer request must invalidate and abort it
+            // before navigation. Otherwise its late result can repaint the
+            // answer and restore the submitted URL after the shared home opens.
+            if (loading) stopSearch();
             setModeSearchSubmitted(false);
             // Clear the URL too, or `showSharedHome` (which reads `run=1` off the URL)
             // stays suppressed while the mode branch, now query-less, falls back to the
diff --git a/tests/privacy-readiness-contract.test.ts b/tests/privacy-readiness-contract.test.ts
index 86ae71e011..bc5c0fdeef 100644
--- a/tests/privacy-readiness-contract.test.ts
+++ b/tests/privacy-readiness-contract.test.ts
@@ -46,28 +46,14 @@ function isCommitAvailable(commit: string): boolean {
   }
 }
 
-function ensureHistoryDeepened(depth = 2000): void {
-  if (!isShallowClone()) return;
-  try {
-    execFileSync("git", ["fetch", `--deepen=${depth}`], {
-      stdio: ["ignore", "ignore", "ignore"],
-    });
-  } catch {
-    // Ignore network or fetch failures
-  }
-}
-
 describe("privacy readiness contract", () => {
   it("accepts the honest structural register", () => {
     let checkGit = true;
-    if (!isCommitAvailable(manifest.reviewedCommit)) {
-      ensureHistoryDeepened(2000);
-      if (!isCommitAvailable(manifest.reviewedCommit) && isShallowClone()) {
-        console.warn(
-          `PRIVACY_READINESS_SHALLOW_CLONE: reviewedCommit ${manifest.reviewedCommit} is unavailable in shallow clone and history could not be deepened; skipping commit ancestry check.`,
-        );
-        checkGit = false;
-      }
+    if (!isCommitAvailable(manifest.reviewedCommit) && isShallowClone()) {
+      console.warn(
+        `PRIVACY_READINESS_SHALLOW_CLONE: reviewedCommit ${manifest.reviewedCommit} is unavailable in shallow clone; skipping commit ancestry check.`,
+      );
+      checkGit = false;
     }
     expect(validatePrivacyReadiness(manifest, { checkGit })).toEqual([]);
   });
diff --git a/tests/ui-universal-search.spec.ts b/tests/ui-universal-search.spec.ts
index f783c42524..d563df3129 100644
--- a/tests/ui-universal-search.spec.ts
+++ b/tests/ui-universal-search.spec.ts
@@ -578,6 +578,34 @@ test.describe("universal search smart affordances", () => {
     await expect(page.getByTestId("universal-also-matches")).toHaveCount(0);
   });
 
+  test("clearing a pending Answer request stays on the shared home after the response settles", async ({ page }) => {
+    await page.route(/\/api\/answer(?:\/stream)?(?:\?.*)?$/, async (route) => {
+      await new Promise((resolve) => setTimeout(resolve, 1_000));
+      try {
+        await route.fulfill({ json: syntheticAnswer });
+      } catch {
+        // Aborting the request is the expected clear-path outcome.
+      }
+    });
+
+    const input = await openComposer(page, "/?mode=answer&focus=1");
+    await input.fill("acamprosat");
+    await page.getByRole("button", { name: "Generate source-backed answer" }).click();
+    await expect(page.getByTestId("answer-progress")).toBeVisible();
+
+    await page
+      .getByRole("button", { name: /clear search question|clear search/i })
+      .first()
+      .click();
+
+    await expect(page).toHaveURL(/\/\?mode=answer&focus=1$/);
+    await expect(page.getByTestId("shared-home-empty-state")).toBeVisible();
+    await page.waitForTimeout(1_250);
+    await expect(page).toHaveURL(/\/\?mode=answer&focus=1$/);
+    await expect(page.getByTestId("shared-home-empty-state")).toBeVisible();
+    await expect(page.locator('[data-dashboard-stage="answer-surface"]')).toHaveCount(0);
+  });
+
   test("keeps a saved exact match first in Favourites", async ({ page }) => {
     await mockSmartSearch(page);
     const input = await openComposer(page, "/favourites?focus=1");

From 449ab10f1e63efa8ecff3c6d537c3b753598cab4 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 11:35:25 +0000
Subject: [PATCH 15/35] =?UTF-8?q?fix(tools):=20one=20Tools=20surface=20?=
 =?UTF-8?q?=E2=80=94=20port=20the=20hub's=20shortcuts,=20then=20redirect?=
 =?UTF-8?q?=20its=20alias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tools had two homes. `/tools` is the canonical directory (filter ribbon, full
catalogue, detail panel). `/?mode=tools` rendered a separate hub-shaped launcher,
because `shouldShowSharedHome` excludes `tools` and so the dashboard had nothing
else to fall back to. Which surface a clinician saw depended only on how they
arrived: the mode pill gave them the hub, every other link gave them the
directory.

The hub's one unique feature was its verb shortcut row (Ask, Compare, Prescribe,
Safety, Docs, Refer, Forms, Saved), which answers "what am I trying to do" rather
than naming a mode. That row moves to `src/components/tools/tool-quick-actions.tsx`
and renders above the directory results, sourced from `accessibleTools` so a
category filter cannot empty it, and hidden once a query is running. With nothing
of its own left to show, `/?mode=tools` now redirects to `/tools` unconditionally,
carrying its query string through.

`localSmartExcludedToolIds` was declared three times; the shared copy in
`src/lib/tools-catalog.ts` is now the one definition.

The legacy launcher component is left in place, unreachable, rather than deleted
here: `tests/favourites-auth-gate.dom.test.tsx` still proves real guest-access
behaviour against it, and re-homing that coverage onto `/tools` is a separate
change.

Browser cases that loaded `/?mode=tools` now assert the same contracts on
`/tools`: the shortcut row, the phone filter sheet, the detail panel launch
links, and no shared search chrome on a route that owns its own filtering.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QaizDqAQZWHgfGLitWU8xf
---
 docs/site-map.md                              |  50 ++++----
 scripts/generate-site-map.ts                  |   4 +-
 src/components/ClinicalDashboard.tsx          |   9 +-
 .../clinical-dashboard/ClinicalSidebar.tsx    |   2 +-
 .../clinical-dashboard-helpers.ts             |   2 +-
 .../clinical-dashboard/dashboard-nav.tsx      |   5 +-
 src/components/tools/tool-quick-actions.tsx   | 116 ++++++++++++++++++
 .../tools/tools-search-results-page.tsx       |  39 +++++-
 src/lib/app-modes.ts                          |   4 +-
 src/lib/legacy-home-redirect.ts               |  32 +++++
 src/lib/tools-catalog.ts                      |  11 ++
 .../audit-navigation-auth-regressions.test.ts |  19 +++
 tests/ui-smoke.spec.ts                        |  27 ++--
 tests/ui-tools-show-all.spec.ts               |  23 ++--
 tests/ui-tools.spec.ts                        |  78 ++++++------
 15 files changed, 319 insertions(+), 102 deletions(-)
 create mode 100644 src/components/tools/tool-quick-actions.tsx

diff --git a/docs/site-map.md b/docs/site-map.md
index 8d305892ba..94fc90be52 100644
--- a/docs/site-map.md
+++ b/docs/site-map.md
@@ -117,7 +117,7 @@ This file is generated by `npm run docs:update` (or `npm run sitemap:update` dir
 | Specifiers      | `/?mode=specifiers`      | `/specifiers/search?q=depressed+but+racing+thoughts&focus=1&run=1`    | `/specifiers/[slug]`, `/specifiers/builder`, `/specifiers/compare`, and `/specifiers/map`.                                                                                                                                                                                                                                    |
 | Formulation     | `/?mode=formulation`     | `/formulation/search?q=I+keep+going+over+it&focus=1&run=1`            | `/formulation/[slug]`, `/formulation/builder`, `/formulation/compare`, and `/formulation/map`.                                                                                                                                                                                                                                |
 | Medication      | `/medications`           | `/?mode=prescribing&q=acamprosate+renal+dose&focus=1&run=1`           | `/medications/[slug]`; submitted searches resolve to `/?mode=prescribing&q=…&run=1`.                                                                                                                                                                                                                                          |
-| Tools           | `/tools`                 | `/tools?q=medications&focus=1&run=1`                                  | Canonical all-tools results directory at `/tools`; the universal mode picker opens it directly. `/?mode=tools` remains a dashboard-mode alias.                                                                                                                                                                                |
+| Tools           | `/tools`                 | `/tools?q=medications&focus=1&run=1`                                  | Canonical all-tools results directory at `/tools`; the universal mode picker opens it directly. `/?mode=tools` redirects here, so Tools has one surface.                                                                                                                                                                      |
 | Calculators     | `/?mode=calculators`     | `/calculators/search?q=PHQ-9&focus=1&run=1`                           | `/calculators/search` is the browsable calculator catalogue and scored-results surface; an empty query lists every calculator.                                                                                                                                                                                                |
 | Factsheets      | `/?mode=factsheets`      | `/factsheets/search?q=sertraline&focus=1&run=1`                       | `/factsheets/search` is the query-and-filter surface; `/factsheets/topics` organises the library by category; `/factsheets/[slug]` records.                                                                                                                                                                                   |
 | Dictionary      | `/?mode=dictionary`      | `/dictionary/search?q=MSE&focus=1&run=1`                              | `/dictionary/search` is one catalogue for both searching and browsing; `/dictionary/browse` redirects to it. Also `/topics`, `/topics/[slug]`, `/compare` and `/dictionary/[slug]` records; `/dictionary/sources` redirects to Sources.                                                                                       |
@@ -1436,27 +1436,27 @@ This file is generated by `npm run docs:update` (or `npm run sitemap:update` dir
 
 ## Route ownership/source map
 
-| Area                           | Source                                                                                                                                                              |
-| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Root dashboard and query modes | `src/app/(search-app)/page.tsx, src/lib/app-modes.ts`                                                                                                               |
-| Global shell layouts           | `src/app/*/layout.tsx, src/components/clinical-dashboard/global-search-shell.tsx`                                                                                   |
-| Services                       | `src/app/(search-app)/services, src/lib/services.ts, src/app/api/registry/records`                                                                                  |
-| Forms                          | `src/app/(search-app)/forms, src/lib/forms.ts, src/app/api/registry/records`                                                                                        |
-| Favourites                     | `src/app/(search-app)/favourites, src/components/clinical-dashboard/favourites-command-library-page.tsx`                                                            |
-| Differentials                  | `src/app/(search-app)/differentials, src/lib/differentials.ts`                                                                                                      |
-| DSM-5 Diagnosis                | `src/app/(search-app)/dsm, src/components/dsm, src/lib/dsm.ts`                                                                                                      |
-| Specifiers                     | `src/app/(search-app)/specifiers, src/components/specifiers, src/lib/specifiers.ts`                                                                                 |
-| Formulation                    | `src/app/(search-app)/formulation, src/components/formulation, src/lib/formulation.ts`                                                                              |
-| Medications                    | `src/app/(search-app)/medications, src/components/clinical-dashboard/medication-prescribing-workspace.tsx`                                                          |
-| Documents                      | `src/app/(search-app)/documents, src/lib/document-flow-routes.ts`                                                                                                   |
-| Calculators                    | `src/app/(search-app)/calculators, src/components/calculators`                                                                                                      |
-| Therapy Compass                | `src/app/(search-app)/therapy-compass, src/lib/therapies.ts`                                                                                                        |
-| Factsheets                     | `src/app/(search-app)/factsheets, src/components/factsheets`                                                                                                        |
-| Dictionary                     | `src/app/(search-app)/dictionary, src/lib/dictionary.ts`                                                                                                            |
-| Safety Plan                    | `src/app/safety-plan, src/components/patient-safety-plan.tsx`                                                                                                       |
-| Privacy                        | `src/app/privacy`                                                                                                                                                   |
-| Tools                          | `src/app/(search-app)/tools, src/components/tools/tools-search-results-page.tsx, src/components/applications-launcher-page.tsx (the retained `/?mode=tools` alias)` |
-| Sources                        | `src/app/(search-app)/sources, src/components/sources, src/lib/sources`                                                                                             |
-| On Call                        | `src/app/(search-app)/on-call, src/components/on-call`                                                                                                              |
-| Caring Contacts workspace      | `src/app/caring-contacts, src/components/caring-contacts/workspace, src/lib/caring-contacts-routes.ts`                                                              |
-| Mockups                        | `src/app/mockups`                                                                                                                                                   |
+| Area                           | Source                                                                                                                        |
+| ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------- |
+| Root dashboard and query modes | `src/app/(search-app)/page.tsx, src/lib/app-modes.ts`                                                                         |
+| Global shell layouts           | `src/app/*/layout.tsx, src/components/clinical-dashboard/global-search-shell.tsx`                                             |
+| Services                       | `src/app/(search-app)/services, src/lib/services.ts, src/app/api/registry/records`                                            |
+| Forms                          | `src/app/(search-app)/forms, src/lib/forms.ts, src/app/api/registry/records`                                                  |
+| Favourites                     | `src/app/(search-app)/favourites, src/components/clinical-dashboard/favourites-command-library-page.tsx`                      |
+| Differentials                  | `src/app/(search-app)/differentials, src/lib/differentials.ts`                                                                |
+| DSM-5 Diagnosis                | `src/app/(search-app)/dsm, src/components/dsm, src/lib/dsm.ts`                                                                |
+| Specifiers                     | `src/app/(search-app)/specifiers, src/components/specifiers, src/lib/specifiers.ts`                                           |
+| Formulation                    | `src/app/(search-app)/formulation, src/components/formulation, src/lib/formulation.ts`                                        |
+| Medications                    | `src/app/(search-app)/medications, src/components/clinical-dashboard/medication-prescribing-workspace.tsx`                    |
+| Documents                      | `src/app/(search-app)/documents, src/lib/document-flow-routes.ts`                                                             |
+| Calculators                    | `src/app/(search-app)/calculators, src/components/calculators`                                                                |
+| Therapy Compass                | `src/app/(search-app)/therapy-compass, src/lib/therapies.ts`                                                                  |
+| Factsheets                     | `src/app/(search-app)/factsheets, src/components/factsheets`                                                                  |
+| Dictionary                     | `src/app/(search-app)/dictionary, src/lib/dictionary.ts`                                                                      |
+| Safety Plan                    | `src/app/safety-plan, src/components/patient-safety-plan.tsx`                                                                 |
+| Privacy                        | `src/app/privacy`                                                                                                             |
+| Tools                          | `src/app/(search-app)/tools, src/components/tools/tools-search-results-page.tsx, src/components/tools/tool-quick-actions.tsx` |
+| Sources                        | `src/app/(search-app)/sources, src/components/sources, src/lib/sources`                                                       |
+| On Call                        | `src/app/(search-app)/on-call, src/components/on-call`                                                                        |
+| Caring Contacts workspace      | `src/app/caring-contacts, src/components/caring-contacts/workspace, src/lib/caring-contacts-routes.ts`                        |
+| Mockups                        | `src/app/mockups`                                                                                                             |
diff --git a/scripts/generate-site-map.ts b/scripts/generate-site-map.ts
index fdde9909c9..a1720f4a2e 100644
--- a/scripts/generate-site-map.ts
+++ b/scripts/generate-site-map.ts
@@ -275,7 +275,7 @@ const routeOwnershipRows = [
   ["Privacy", "src/app/privacy"],
   [
     "Tools",
-    "src/app/(search-app)/tools, src/components/tools/tools-search-results-page.tsx, src/components/applications-launcher-page.tsx (the retained `/?mode=tools` alias)",
+    "src/app/(search-app)/tools, src/components/tools/tools-search-results-page.tsx, src/components/tools/tool-quick-actions.tsx",
   ],
   ["Sources", "src/app/(search-app)/sources, src/components/sources, src/lib/sources"],
   ["On Call", "src/app/(search-app)/on-call, src/components/on-call"],
@@ -532,7 +532,7 @@ function renderModePageIndex() {
       home: appModeHomeHref("tools"),
       search: appModeHomeHref("tools", { query: "medications", focus: true, run: true }),
       detail:
-        "Canonical all-tools results directory at `/tools`; the universal mode picker opens it directly. `/?mode=tools` remains a dashboard-mode alias.",
+        "Canonical all-tools results directory at `/tools`; the universal mode picker opens it directly. `/?mode=tools` redirects here, so Tools has one surface.",
     },
     {
       mode: "Calculators",
diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 439d412fa5..3bf5f9d81d 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -3014,11 +3014,10 @@ function ClinicalDashboardContent({
         activeModeResultKind === "services" ||
         activeModeResultKind === "forms") &&
         modeSearchSubmitted));
-  // `/tools` owns the tools catalogue, but the legacy `/?mode=tools` entry
-  // still renders this dashboard path. Keep both entry points composer-free so
-  // the alias cannot mount a second ownership model (hero/page/dock) behind
-  // the canonical route's no-composer contract. Modes that only borrow the
-  // `tools` result kind remain on the shared home and are intentionally exempt.
+  // `/tools` owns the tools catalogue and stays composer-free, so a dashboard
+  // path reaching the tools result kind must not mount a second ownership model
+  // (hero/page/dock) behind it. Modes that only borrow the `tools` result kind
+  // remain on the shared home and are intentionally exempt.
   const toolsDirectoryWithoutComposer = activeModeResultKind === "tools" && !showSharedHome;
   const showDesktopHomeComposer =
     !error &&
diff --git a/src/components/clinical-dashboard/ClinicalSidebar.tsx b/src/components/clinical-dashboard/ClinicalSidebar.tsx
index 619224498a..bf9d2ceb2e 100644
--- a/src/components/clinical-dashboard/ClinicalSidebar.tsx
+++ b/src/components/clinical-dashboard/ClinicalSidebar.tsx
@@ -88,7 +88,7 @@ const sidebarToolItems = [
   // points straight at the shared home too, matching Documents/Services above.
   { id: "prescribing", label: appModeDefinition("prescribing").label, icon: Pill, href: "/?mode=prescribing" },
   { id: "factsheets", label: "Factsheets", icon: appModeIcons.factsheets, href: "/?mode=factsheets" },
-  // PT-11: standalone /tools is the canonical entry; /?mode=tools remains a dashboard-mode alias.
+  // PT-11: standalone /tools is the canonical entry; /?mode=tools redirects to it.
   { id: "tools", label: "Tools", icon: Wrench, href: "/tools" },
 ] as const;
 
diff --git a/src/components/clinical-dashboard/clinical-dashboard-helpers.ts b/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
index 0779554450..3d3b69af2f 100644
--- a/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
+++ b/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
@@ -15,7 +15,7 @@ import type { ClinicalQueryMode } from "@/lib/clinical-query-mode";
 // `normalizedPollDelay`. Shared with the dashboard's polling loop.
 export const setupRecheckPollMs = 60_000;
 
-/** Keep the retained `/?mode=tools` launcher separate from every other idle mode home. */
+/** Keep the tools result kind separate from every other idle mode home. */
 export function shouldShowSharedHome({
   pathname,
   mode,
diff --git a/src/components/clinical-dashboard/dashboard-nav.tsx b/src/components/clinical-dashboard/dashboard-nav.tsx
index 58202f710b..e89573eea1 100644
--- a/src/components/clinical-dashboard/dashboard-nav.tsx
+++ b/src/components/clinical-dashboard/dashboard-nav.tsx
@@ -11,8 +11,9 @@ import { type AppModeId, appModeSearchConfig } from "@/lib/app-modes";
 
 const ApplicationsLauncherWorkspace = dynamic(
   () => import("@/components/applications-launcher-page").then((module) => module.ApplicationsLauncherWorkspace),
-  // The retained `/?mode=tools` dashboard alias owns this legacy client-only
-  // launcher. Canonical `/tools` is rendered by ToolsSearchResultsPage.
+  // Legacy client-only launcher, now unreachable: `/?mode=tools` redirects to
+  // `/tools`, which ToolsSearchResultsPage renders. Kept only until the guest
+  // coverage in tests/favourites-auth-gate.dom.test.tsx is re-homed onto it.
   { ssr: false, loading: () => <LoadingPanel variant="skeleton" lines={6} label="Loading tools" /> },
 );
 
diff --git a/src/components/tools/tool-quick-actions.tsx b/src/components/tools/tool-quick-actions.tsx
new file mode 100644
index 0000000000..a4b82767fb
--- /dev/null
+++ b/src/components/tools/tool-quick-actions.tsx
@@ -0,0 +1,116 @@
+"use client";
+
+import { focusRing } from "@/components/card-recipes";
+import { cn } from "@/components/ui-primitives";
+import { toolIdentity } from "@/lib/category-identity";
+import { categoryGlyph } from "@/lib/category-identity-icons";
+import { localSmartExcludedToolIds, type ToolCatalogId, type ToolCatalogRecord } from "@/lib/tools-catalog";
+
+/**
+ * The verb shortcut row that used to live only on the `/?mode=tools` launcher.
+ *
+ * Tools had two surfaces: a hub at `/?mode=tools` carrying these shortcuts, and the
+ * canonical directory at `/tools` carrying the filter ribbon and the full list. Which
+ * one a clinician saw depended on how they arrived — the mode pill gave them the hub,
+ * every other link gave them the directory. `/?mode=tools` now redirects to `/tools`,
+ * so this row moved here rather than being deleted with the hub: it is the one thing
+ * the hub had that the directory did not.
+ *
+ * Deliberately verbs, not mode names. The sidebar already lists every mode by name;
+ * this row answers "what am I trying to do" (Ask, Compare, Prescribe, Safety), which
+ * is a different question and the reason it is worth keeping at all.
+ */
+const quickActionsBase = [
+  { label: "Ask", desktopLabel: "Ask evidence", id: "clinical-kb-search" },
+  { label: "Compare", desktopLabel: "Compare", id: "differentials" },
+  { label: "Prescribe", desktopLabel: "Prescribe", id: "medication-prescribing" },
+  { label: "Safety", desktopLabel: "Safety check", id: "risk-safety" },
+  { label: "Docs", desktopLabel: "Documents", id: "documents" },
+  { label: "Refer", desktopLabel: "Refer", id: "services" },
+  { label: "Forms", desktopLabel: "Forms", id: "forms" },
+  { label: "Saved", desktopLabel: "Favourites", id: "favourites" },
+] as const satisfies ReadonlyArray<{ label: string; desktopLabel: string; id: ToolCatalogId }>;
+
+export function quickActionsForSession(canAccessFavourites: boolean, naturalSmartSearch: boolean) {
+  return quickActionsBase.filter(
+    (action) =>
+      (canAccessFavourites || action.id !== "favourites") &&
+      (!naturalSmartSearch || !localSmartExcludedToolIds.has(action.id)),
+  );
+}
+
+function toolById(id: ToolCatalogId, tools: readonly ToolCatalogRecord[]) {
+  return tools.find((tool) => tool.id === id) ?? tools[0];
+}
+
+export function ToolQuickActions({
+  onSelect,
+  mobile,
+  tools,
+  canAccessFavourites,
+  naturalSmartSearch,
+}: {
+  onSelect: (id: ToolCatalogId) => void;
+  mobile?: boolean;
+  tools: readonly ToolCatalogRecord[];
+  canAccessFavourites: boolean;
+  naturalSmartSearch: boolean;
+}) {
+  const quickActions = quickActionsForSession(canAccessFavourites, naturalSmartSearch);
+  // An empty catalogue would make `toolById` return undefined and every tile
+  // dereference it. The directory renders this row above its own results, so a
+  // filtered-to-nothing list must not take the shortcuts down with it.
+  if (tools.length === 0) return null;
+  return (
+    <section
+      aria-label="Quick tool shortcuts"
+      className={cn(mobile ? "grid grid-cols-4 gap-2" : "grid w-full grid-cols-2 gap-3 md:grid-cols-3 xl:grid-cols-6")}
+    >
+      {quickActions.slice(0, mobile ? 8 : 6).map((action) => {
+        const tool = toolById(action.id, tools);
+        const identity = toolIdentity(tool.id, tool.area);
+        return (
+          <button
+            key={action.label}
+            type="button"
+            aria-label={`Open ${action.desktopLabel}`}
+            data-testid={`tool-shortcut-${action.id}`}
+            onClick={() => onSelect(action.id)}
+            className={cn(
+              "group border border-[color:var(--border)] bg-[color:var(--surface-lux)] text-left shadow-[var(--shadow-inset)] transition hover:border-[color:var(--clinical-accent-border)] hover:bg-[color:var(--surface-raised)]",
+              focusRing,
+              mobile
+                ? "grid h-14 min-w-0 place-items-center gap-0.5 rounded-lg px-1 py-1.5 text-center"
+                : "grid min-h-14 grid-cols-[2rem_minmax(0,1fr)] items-center gap-2 rounded-lg px-2.5 py-2.5",
+            )}
+          >
+            <span
+              data-category-accent={identity.accent}
+              className={cn(
+                "grid place-items-center rounded-lg border border-[color:var(--cat-border)] bg-[color:var(--cat-soft)] text-[color:var(--cat-accent)] shadow-[var(--shadow-inset)] forced-colors:border",
+                mobile ? "h-7 w-7" : "h-8 w-8",
+              )}
+            >
+              {categoryGlyph(identity.icon, mobile ? "size-icon-md" : "size-icon-lg")}
+            </span>
+            <span className="min-w-0">
+              <span
+                className={cn(
+                  "block truncate font-bold leading-tight text-[color:var(--text-heading)]",
+                  mobile ? "text-2xs" : "text-sm",
+                )}
+              >
+                {mobile ? action.label : action.desktopLabel}
+              </span>
+              {!mobile ? (
+                <span className="mt-0.5 block text-xs font-medium leading-4 text-[color:var(--text-muted)] [overflow-wrap:anywhere]">
+                  {tool.bestFor}
+                </span>
+              ) : null}
+            </span>
+          </button>
+        );
+      })}
+    </section>
+  );
+}
diff --git a/src/components/tools/tools-search-results-page.tsx b/src/components/tools/tools-search-results-page.tsx
index 1e98089303..3f4e72fb37 100644
--- a/src/components/tools/tools-search-results-page.tsx
+++ b/src/components/tools/tools-search-results-page.tsx
@@ -22,6 +22,7 @@ import { useFavouritesAccess } from "@/components/clinical-dashboard/use-favouri
 import { useSearchCommand } from "@/components/clinical-dashboard/search-command-context";
 import { UniversalSearchAlsoMatches } from "@/components/clinical-dashboard/universal-search-also-matches";
 import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
+import { ToolQuickActions } from "@/components/tools/tool-quick-actions";
 import { cardPadding, cardSelected, cardSurface, focusRing, stretchedRowLinkClass } from "@/components/card-recipes";
 import { CategoryIconTile } from "@/components/category-icon-tile";
 import { DesktopComposerPortalSlot } from "@/components/desktop-composer-portal-slot";
@@ -37,7 +38,9 @@ import { interpretSmartSearch, smartSearchExpansions } from "@/lib/smart-search-
 import { useAuthSession } from "@/lib/supabase/client";
 import {
   rankToolRecords,
+  localSmartExcludedToolIds,
   toolCatalogRecordsForSession,
+  type ToolCatalogId,
   type ToolCatalogArea,
   type ToolCatalogRecord,
 } from "@/lib/tools-catalog";
@@ -61,8 +64,6 @@ const filterOptions = [
 type FilterId = (typeof filterOptions)[number]["id"];
 type DetailSectionId = "check-first" | "needed-input" | "output";
 
-const localSmartExcludedToolIds = new Set(["clinical-kb-search", "documents", "favourites"]);
-
 function subscribeNoop() {
   return () => undefined;
 }
@@ -433,6 +434,14 @@ export function ToolsSearchResultsPage({
     setOpenSection((current) => (current === section ? null : section));
   }
 
+  // The quick-action row selects by id; `openTool` wants the record. Resolved against
+  // `accessibleTools` rather than `filteredTools` so a shortcut still opens its tool
+  // when a category filter has excluded it from the visible list.
+  function openToolById(id: ToolCatalogId) {
+    const tool = accessibleTools.find((candidate) => candidate.id === id);
+    if (tool) openTool(tool);
+  }
+
   function openTool(tool: ToolCatalogRecord, opener?: HTMLElement | null) {
     setSelectedId(tool.id);
     setOpenSection(null);
@@ -464,6 +473,32 @@ export function ToolsSearchResultsPage({
         )}
       >
         <div className="min-w-0">
+          {/* The verb shortcut row carried over from the retired `/?mode=tools` hub.
+              Sourced from `accessibleTools`, not `filteredTools`: the shortcuts are a
+              fixed way in, so a query or category filter must not empty the row. Hidden
+              once a query is running, where the ranked results are the answer and a
+              static row above them is just noise. */}
+          {query.trim() ? null : (
+            <div className="mb-4" data-testid="tools-shortcuts">
+              <div className="hidden sm:block">
+                <ToolQuickActions
+                  onSelect={openToolById}
+                  tools={accessibleTools}
+                  canAccessFavourites={canAccessFavourites}
+                  naturalSmartSearch={naturalSmartSearch}
+                />
+              </div>
+              <div className="sm:hidden">
+                <ToolQuickActions
+                  onSelect={openToolById}
+                  tools={accessibleTools}
+                  canAccessFavourites={canAccessFavourites}
+                  naturalSmartSearch={naturalSmartSearch}
+                  mobile
+                />
+              </div>
+            </div>
+          )}
           <SearchResultsHeaderBand
             modeId="tools"
             query={query.trim() || "All tools"}
diff --git a/src/lib/app-modes.ts b/src/lib/app-modes.ts
index 8cfa019e11..79d8e01029 100644
--- a/src/lib/app-modes.ts
+++ b/src/lib/app-modes.ts
@@ -332,8 +332,8 @@ export const appModeDefinitions = [
     id: "tools",
     label: "Tools",
     description: "Clinical tools and applications",
-    // PT-11: standalone /tools is the canonical entry; /?mode=tools remains a
-    // dashboard-mode alias for bookmarks and deep links.
+    // PT-11: standalone /tools is the canonical entry; the older /?mode=tools
+    // bookmarks and deep links redirect to it.
     href: "/tools",
     search: {
       kind: "tools",
diff --git a/src/lib/legacy-home-redirect.ts b/src/lib/legacy-home-redirect.ts
index 9fec1a318a..b20f4caab8 100644
--- a/src/lib/legacy-home-redirect.ts
+++ b/src/lib/legacy-home-redirect.ts
@@ -4,6 +4,25 @@ const legacyModePaths = {
   specifiers: "/specifiers",
 } as const;
 
+/**
+ * Modes whose `/?mode=…` alias redirects unconditionally, submitted or not.
+ *
+ * Tools is the only one, and it differs from the map above because it has no shared
+ * home to fall back to: `shouldShowSharedHome` excludes `tools` outright, so
+ * `/?mode=tools` used to render a second, hub-shaped launcher instead. That gave Tools
+ * two different surfaces depending on how a clinician arrived — the mode pill served
+ * the hub, every other link served the canonical directory at `/tools`. The hub's one
+ * unique feature, its verb shortcut row, moved to `/tools`
+ * (`components/tools/tool-quick-actions.tsx`), so this alias now has nothing of its own
+ * left to show and forwards.
+ *
+ * Unconditional on purpose: unlike the submitted-only map above, there is no state in
+ * which rendering `/` for `mode=tools` is correct.
+ */
+const aliasOnlyModePaths = {
+  tools: "/tools",
+} as const;
+
 type LegacyHomeRequestUrl = Pick<URL, "pathname" | "searchParams" | "toString">;
 
 /**
@@ -17,6 +36,19 @@ export function legacyHomeRedirectUrl(requestUrl: LegacyHomeRequestUrl, method:
   if ((method !== "GET" && method !== "HEAD") || requestUrl.pathname !== "/") return null;
 
   const mode = requestUrl.searchParams.get("mode");
+
+  const aliasOnlyPath = mode ? aliasOnlyModePaths[mode as keyof typeof aliasOnlyModePaths] : undefined;
+  if (aliasOnlyPath) {
+    const aliasDestination = new URL(requestUrl.toString());
+    aliasDestination.pathname = aliasOnlyPath;
+    aliasDestination.hash = "";
+    // `mode` is consumed by the destination pathname; everything else (a query, a
+    // submitted `run=1`, navigation context) rides along, because `/tools` reads the
+    // same query string the alias carried.
+    aliasDestination.searchParams.delete("mode");
+    return aliasDestination;
+  }
+
   const destinationPath = mode ? legacyModePaths[mode as keyof typeof legacyModePaths] : undefined;
   if (!destinationPath) return null;
 
diff --git a/src/lib/tools-catalog.ts b/src/lib/tools-catalog.ts
index bd7b5e90d9..1bac15ffad 100644
--- a/src/lib/tools-catalog.ts
+++ b/src/lib/tools-catalog.ts
@@ -59,6 +59,17 @@ export type ToolCatalogRecord = {
   output: string;
 };
 
+/**
+ * Tools the composer's smart search already answers directly, so surfacing them again
+ * as local results or shortcuts would send a clinician the long way round to something
+ * they have just been handed.
+ *
+ * One definition, three consumers. It was copied into the launcher and the tools
+ * directory separately, and a third copy was nearly added when the quick-action row
+ * moved out of the launcher.
+ */
+export const localSmartExcludedToolIds = new Set<ToolCatalogId>(["clinical-kb-search", "documents", "favourites"]);
+
 export const toolCatalogRecords: ToolCatalogRecord[] = [
   {
     id: "clinical-kb-search",
diff --git a/tests/audit-navigation-auth-regressions.test.ts b/tests/audit-navigation-auth-regressions.test.ts
index 0d1026b78d..36e705fc83 100644
--- a/tests/audit-navigation-auth-regressions.test.ts
+++ b/tests/audit-navigation-auth-regressions.test.ts
@@ -120,6 +120,25 @@ describe("audit navigation and auth regressions", () => {
     expect(source("src/proxy.ts")).toContain("legacyHomeRedirectUrl(request.nextUrl, request.method)");
   });
 
+  // Tools is the one alias that forwards whether or not the URL is submitted. It has no
+  // shared home to fall back to (`shouldShowSharedHome` excludes `tools`), so `/?mode=tools`
+  // used to render a second, hub-shaped launcher and Tools had two surfaces depending on how
+  // the clinician arrived. The hub's verb shortcut row moved to `/tools`, so the alias has
+  // nothing of its own left to show.
+  it("forwards the tools alias to the canonical directory whether or not it is submitted", () => {
+    expect(legacyHomeRedirectUrl(new URL("https://clinical-kb.test/?mode=tools"), "GET")?.toString()).toBe(
+      "https://clinical-kb.test/tools",
+    );
+    expect(
+      legacyHomeRedirectUrl(
+        new URL("https://clinical-kb.test/?mode=tools&q=medications&focus=1&run=1#detail"),
+        "GET",
+      )?.toString(),
+    ).toBe("https://clinical-kb.test/tools?q=medications&focus=1&run=1");
+    // A non-navigation method still falls through, same as every other alias.
+    expect(legacyHomeRedirectUrl(new URL("https://clinical-kb.test/?mode=tools"), "POST")).toBeNull();
+  });
+
   // This redirect used to rebuild the destination from scratch (`destination.search = ""`,
   // then only q/focus/run re-added), so `queryMode` and the scope filters were already gone
   // one hop before `consolidatedModeHomeTarget` — whose own doc promises "every other query
diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index 13d9ae0eb1..211349d9d0 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -5128,28 +5128,27 @@ test.describe("PsychSift UI smoke coverage", () => {
     expect(requestCounts.quality).toBe(0);
   });
 
-  test("tools mode searches the existing applications registry inside the dashboard", async ({ page }) => {
+  // The legacy `/?mode=tools` URL used to render a second, hub-shaped launcher. It now
+  // redirects to `/tools`, so the query it carries has to survive the hop and land on
+  // the one tools directory with the same registry search behind it.
+  test("the legacy tools URL carries its query to the tools directory", async ({ page }) => {
     await page.setViewportSize({ width: 1280, height: 900 });
     await mockPrivateUnauthenticatedApi(page);
     await gotoApp(page, "/?mode=tools&q=medications&focus=1&run=1");
 
+    await page.waitForURL(/\/tools\?/);
     await expect(page.getByRole("button", { name: "Mode Tools" })).toBeVisible();
-    await expect(page.locator('input[placeholder="Search tools..."]:visible').first()).toHaveValue("medications");
-    await expect(page.getByTestId("tools-hub")).toBeVisible();
-    const queryRibbon = page.getByTestId("tools-hub").getByTestId("search-query-ribbon");
+    const results = page.getByTestId("tools-search-results-page");
+    await expect(results).toBeVisible();
+    const queryRibbon = results.getByTestId("search-query-ribbon");
     await expect(queryRibbon.getByRole("heading", { name: "medications" })).toBeVisible();
     await expect(queryRibbon.getByRole("group", { name: "Filter tools by category" })).toBeVisible();
-    await expect(page.getByTestId("tools-hub").getByTestId("application-row-medication-prescribing")).toContainText(
-      "Medication Prescribing",
-    );
-    await expect(page.getByTestId("tools-hub").getByText("Selected tool")).toHaveCount(0);
-    const detailsButton = page
-      .getByTestId("tools-hub")
-      .getByRole("button", { name: "View details for Medication Prescribing" });
-    await expect(detailsButton).toHaveAttribute("aria-haspopup", "dialog");
-    await detailsButton.click();
+    await expect(results.getByRole("heading", { level: 2, name: "Medication Prescribing" }).first()).toBeVisible();
+    // The verb shortcut row is for an unqueried catalogue, so a running query hides it.
+    await expect(page.getByTestId("tools-shortcuts")).toHaveCount(0);
+    await results.getByRole("button", { name: "View details for Medication Prescribing" }).click();
     await expect(
-      page.getByRole("dialog", { name: "Medication Prescribing" }).locator('a[href="/medications"]').first(),
+      results.getByRole("complementary", { name: "Medication Prescribing" }).locator('a[href="/medications"]').first(),
     ).toBeVisible();
     await expectNoPageHorizontalOverflow(page);
   });
diff --git a/tests/ui-tools-show-all.spec.ts b/tests/ui-tools-show-all.spec.ts
index dd78924cfa..0a75363300 100644
--- a/tests/ui-tools-show-all.spec.ts
+++ b/tests/ui-tools-show-all.spec.ts
@@ -6,26 +6,23 @@ async function gotoLauncher(page: Page, path = "/tools") {
   await expect(page.locator("#main-content").first()).toBeVisible({ timeout: 15_000 });
 }
 
-test("Show all opens the unfiltered tools search mode", async ({ page }) => {
+/**
+ * Tools used to have two surfaces: a hub at `/?mode=tools` whose "Show all" chip
+ * linked across to the directory at `/tools`. Which one a clinician landed on
+ * depended only on how they arrived. `/?mode=tools` now redirects, so the chip has
+ * nothing left to link to and the assertion worth keeping is that the alias lands on
+ * the one directory with its verb shortcuts intact.
+ */
+test("the legacy tools alias lands on the single tools directory", async ({ page }) => {
   await page.setViewportSize({ width: 390, height: 844 });
   await gotoLauncher(page, "/?mode=tools");
 
-  const showAll = page.getByRole("link", { name: "Show all tools" });
-  await expect(showAll).toBeVisible();
-  await expect(showAll).toHaveText("Show all");
-  await expect(showAll).toHaveAttribute("href", "/tools");
-
-  const showAllBox = await showAll.boundingBox();
-  expect(showAllBox?.height).toBeGreaterThanOrEqual(48);
-
-  await showAll.focus();
-  await expect(showAll).toBeFocused();
-
-  await Promise.all([page.waitForURL(/\/tools$/), page.keyboard.press("Enter")]);
+  await page.waitForURL(/\/tools$/);
 
   const results = page.getByTestId("tools-search-results-page");
   await expect(results).toBeVisible();
   await expect(results.getByRole("heading", { level: 1, name: "All tools" })).toBeVisible();
+  await expect(page.getByTestId("tools-shortcuts")).toBeVisible();
   await expect(results.getByRole("link", { name: "Open PsychSift Search" })).toHaveAttribute("href", "/?mode=answer");
   await expect(results.getByRole("button", { name: "View details for PsychSift Search" })).toBeVisible();
   await expect(page.getByTestId("global-search-input")).toHaveCount(0);
diff --git a/tests/ui-tools.spec.ts b/tests/ui-tools.spec.ts
index ccd41abe05..14ea3d7cbb 100644
--- a/tests/ui-tools.spec.ts
+++ b/tests/ui-tools.spec.ts
@@ -475,42 +475,47 @@ test.describe("PsychSift tools directory and legacy launcher", () => {
     { name: "mobile", width: 390, height: 820 },
     { name: "desktop", width: 1280, height: 900 },
   ] as const) {
-    test(`tools launcher is usable at ${viewport.name}`, async ({ page }) => {
+    /**
+     * This case used to load `/?mode=tools`, the hub that was one of two Tools
+     * surfaces. That alias now redirects to the directory, so the same contract is
+     * asserted here on the single surface: the verb shortcut row ported over from
+     * the hub, the category filter, the detail sheet with a real launch link, and no
+     * shared search chrome on a route that owns its own filtering.
+     */
+    test(`the tools directory is usable at ${viewport.name}`, async ({ page }) => {
       await page.setViewportSize({ width: viewport.width, height: viewport.height });
-      await gotoLauncher(page, "/?mode=tools");
+      await gotoLauncher(page, "/tools");
 
-      await expect(page.getByRole("heading", { level: 1, name: "Tools" })).toBeVisible();
-      await expect(page.getByRole("region", { name: "Quick tool shortcuts" })).toBeVisible();
-      await expect(page.getByRole("heading", { name: "All tools" })).toBeVisible();
-      await expect(page.locator("#launcher-results-panel")).toHaveAttribute("role", "group");
-      await expect(page.locator("#launcher-results-panel")).toHaveAttribute("aria-label", "All tools");
+      const results = visibleByTestId(page, "tools-search-results-page");
+      await expect(results.getByRole("heading", { level: 1, name: "All tools" })).toBeVisible();
+      await expect(page.getByRole("region", { name: "Quick tool shortcuts" }).first()).toBeVisible();
+      await expect(results.getByRole("region", { name: "Tool results" })).toBeVisible();
       if (viewport.name === "mobile") {
-        const categoryTrigger = page.getByTestId("tool-filter-trigger-phone");
+        const categoryTrigger = results.getByTestId("tools-search-filter-trigger-phone");
         await expect(categoryTrigger).toBeVisible();
-        await expect(categoryTrigger).toHaveAccessibleName(/No filters active/);
         await categoryTrigger.click();
-        await page.getByRole("radiogroup", { name: "Category" }).getByRole("radio", { name: "Assess" }).click();
-        await expect(page.locator("#launcher-results-panel")).toHaveAttribute("aria-label", "Assess tools");
-        await expect(categoryTrigger).toHaveAccessibleName(/1 filter active/);
+        const filterSheet = page.locator('[data-testid="tools-search-filter-sheet"]:visible');
+        await filterSheet.getByRole("radio", { name: /Assess/ }).click();
+        await filterSheet.getByTestId("tools-search-filter-sheet-done").click();
+        await expect(results.getByRole("heading", { level: 2, name: "Medication Prescribing" })).toHaveCount(0);
         await categoryTrigger.click();
-        await page.getByRole("radiogroup", { name: "Category" }).getByRole("radio", { name: "All tools" }).click();
-        await page.getByTestId("application-row-medication-prescribing").click();
-        const selectedSheet = page.getByRole("dialog", { name: "Medication Prescribing" });
-        await expect(selectedSheet).toBeVisible();
-        await expect(selectedSheet.getByRole("heading", { name: "Medication Prescribing" })).toBeVisible();
-        const mobileLaunchLink = selectedSheet.locator('a[href="/medications"]').first();
+        await filterSheet.getByRole("radio", { name: /All tools/ }).click();
+        await filterSheet.getByTestId("tools-search-filter-sheet-done").click();
+
+        await results.getByRole("button", { name: "View details for Medication Prescribing" }).click();
+        const detailSheet = page.locator('[data-testid="tools-search-detail-sheet"]:visible');
+        await expect(detailSheet.getByRole("heading", { name: "Medication Prescribing" })).toBeVisible();
+        const mobileLaunchLink = detailSheet.locator('a[href="/medications"]').first();
         await expect(mobileLaunchLink).toBeVisible();
-        await expect(mobileLaunchLink).toHaveAttribute("href", "/medications");
         await expect(mobileLaunchLink).not.toHaveAttribute("target", "_blank");
-        await page.getByRole("button", { name: "Close Medication Prescribing" }).click();
-        await expect(selectedSheet).toBeHidden();
+        await detailSheet.getByRole("button", { name: "Close Medication Prescribing" }).click();
+        await expect(detailSheet).toHaveCount(0);
       } else {
-        await expect(page.getByRole("button", { name: "View details for PsychSift Search" })).toBeVisible();
+        await expect(results.getByRole("button", { name: "View details for PsychSift Search" })).toBeVisible();
       }
-      await expect(page.getByLabel("Mode Tools")).toBeVisible();
+      await expect(page.getByRole("button", { name: "Mode Tools" })).toBeVisible();
       await expect(visibleGlobalSearchInput(page)).toHaveCount(0);
       await expect(page.locator("form.answer-footer-search-dock")).toHaveCount(0);
-      await expect(page.getByTestId("tools-local-search-input")).toBeVisible();
       await expectNoPageHorizontalOverflow(page);
     });
   }
@@ -668,10 +673,14 @@ test.describe("PsychSift tools directory and legacy launcher", () => {
     await expectNoPageHorizontalOverflow(page);
   });
 
-  test("launcher links point to the expected in-app modes", async ({ page }) => {
+  // Moved off `/?mode=tools` when that alias started redirecting here. The hrefs are
+  // the point of the case and are unchanged: both surfaces read them from the same
+  // tools catalogue, so the directory proves the same contract the hub used to.
+  test("tool links point to the expected in-app modes", async ({ page }) => {
     await page.setViewportSize({ width: 1280, height: 900 });
-    await gotoLauncher(page, "/?mode=tools");
+    await gotoLauncher(page, "/tools");
 
+    const results = visibleByTestId(page, "tools-search-results-page");
     for (const [title, href] of [
       ["Medication Prescribing", "/medications"],
       ["Documents", "/documents"],
@@ -680,12 +689,10 @@ test.describe("PsychSift tools directory and legacy launcher", () => {
       ["Saved workflows", "/favourites"],
       ["PsychSift Search", "/?mode=answer"],
     ] as const) {
-      const detailsButton = page.getByRole("button", { name: `View details for ${title}` });
-      await expect(detailsButton).toHaveAttribute("aria-haspopup", "dialog");
-      await detailsButton.click();
-      const dialog = page.getByRole("dialog", { name: title });
-      await expect(dialog.locator(`a[href="${href}"]`).first()).toBeVisible();
-      await page.getByRole("button", { name: `Close ${title}` }).click();
+      await expect(results.getByRole("link", { name: `Open ${title}` })).toHaveAttribute("href", href);
+      await results.getByRole("button", { name: `View details for ${title}` }).click();
+      const detail = results.getByRole("complementary", { name: title });
+      await expect(detail.locator(`a[href="${href}"]`).first()).toBeVisible();
     }
     // External companion-app launchers were removed; no localhost links should remain.
     await expect(page.locator('a[href^="http://localhost"], a[href^="http://127.0.0.1"]')).toHaveCount(0);
@@ -1317,14 +1324,15 @@ test.describe("PsychSift tools directory and legacy launcher", () => {
     }
   });
 
-  test("tablet legacy Tools alias uses its local filter without shared search chrome", async ({ page }) => {
+  test("tablet legacy Tools alias redirects to the directory without shared search chrome", async ({ page }) => {
     await page.setViewportSize({ width: 768, height: 1024 });
     await gotoLauncher(page, "/?mode=tools");
 
-    await expect(page.getByRole("heading", { level: 1, name: "Tools" })).toBeVisible();
+    await page.waitForURL(/\/tools$/);
+    await expect(page.getByRole("heading", { level: 1, name: "All tools" })).toBeVisible();
     await expect(visibleGlobalSearchInput(page)).toHaveCount(0);
     await expect(page.locator("form.answer-footer-search-dock")).toHaveCount(0);
-    await expect(page.getByTestId("tools-local-search-input")).toBeVisible();
+    await expect(page.getByTestId("tools-local-search-input")).toHaveCount(0);
     await expectNoPageHorizontalOverflow(page);
   });
 

From 9f1d4bf49a8abfa53c04943355bff9d80819881a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 11:48:37 +0000
Subject: [PATCH 16/35] fix(tools): port the hub's search box too, not just its
 shortcuts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The redirect landed clinicians on a directory with no way to type a tools
search. `/tools` deliberately renders no shared composer because it owns its
own filtering, but its filtering was reachable only through the URL: the box
lived on the `/?mode=tools` hub, and redirecting that alias took the box with
it. `tests/ui-clinical-ask.spec.ts` caught it — local-only Smart search in
tools mode has nowhere to be typed.

So the box comes across with the shortcut row, in flow rather than fixed, as a
page-owned filter and not a second shared composer. A draft typed here wins
over the URL and the shared command draft, the same precedence the hub used.
Submitting navigates to `/tools?q=…&run=1` so a result set stays shareable and
survives reload, which is what the hub's submit control already did.

Verified in a browser on the failing journey: typing a natural-language query
hides the shortcut row, submitting reaches the ranked results, Answer,
Documents and Favourites stay excluded, and neither the clinical-ask nor the
universal-search endpoint is called.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QaizDqAQZWHgfGLitWU8xf
---
 src/components/tools/tool-local-search.tsx    | 75 +++++++++++++++++++
 .../tools/tools-search-results-page.tsx       | 31 +++++++-
 tests/ui-tools.spec.ts                        |  7 +-
 3 files changed, 107 insertions(+), 6 deletions(-)
 create mode 100644 src/components/tools/tool-local-search.tsx

diff --git a/src/components/tools/tool-local-search.tsx b/src/components/tools/tool-local-search.tsx
new file mode 100644
index 0000000000..36a38d9ecb
--- /dev/null
+++ b/src/components/tools/tool-local-search.tsx
@@ -0,0 +1,75 @@
+"use client";
+
+import { Plus, Search } from "lucide-react";
+import type { FormEvent } from "react";
+
+import { focusRing } from "@/components/card-recipes";
+import { cn, searchShellInput } from "@/components/ui-primitives";
+
+/**
+ * The tools directory's own filter box, ported from the retired `/?mode=tools` hub.
+ *
+ * `/tools` deliberately renders no shared composer — it owns its own filtering — but
+ * until the hub was consolidated away this was the only place a clinician could type
+ * a tools search, and the directory had no input at all. So the box came here with the
+ * shortcut row rather than being lost with the hub.
+ *
+ * In-flow, never fixed: the search-chrome contract allows a page to own its filtering,
+ * but not to stack a second dock-sized bar over the shared chrome.
+ */
+export function ToolLocalSearch({
+  value,
+  onChange,
+  onSubmit,
+  className,
+}: {
+  value: string;
+  onChange: (query: string) => void;
+  onSubmit: () => void;
+  className?: string;
+}) {
+  return (
+    <form
+      role="search"
+      onSubmit={(event: FormEvent<HTMLFormElement>) => {
+        event.preventDefault();
+        onSubmit();
+      }}
+      className={cn(
+        // Both end tracks hold tap-sized children and the row has no gap, so they read
+        // the tap knob rather than a copy of its value: a literal here overlaps the
+        // input the moment `--spacing-tap` moves.
+        "search-shell grid min-h-13 grid-cols-[var(--spacing-tap)_minmax(0,1fr)_var(--spacing-tap)] items-center rounded-full border border-[color:var(--border)] bg-[color:var(--surface-lux)] text-left shadow-[var(--e2)]",
+        className,
+      )}
+    >
+      <span className="grid h-tap w-tap place-items-center rounded-full text-[color:var(--clinical-accent)]">
+        <Plus className="size-icon-lg" aria-hidden />
+      </span>
+      <label className="min-w-0">
+        <span className="sr-only">Search tools</span>
+        <input
+          data-testid="tools-local-search-input"
+          value={value}
+          onChange={(event) => onChange(event.target.value)}
+          placeholder="Search tools..."
+          className={cn(
+            searchShellInput,
+            "w-full text-sm font-medium text-[color:var(--text)] placeholder:text-[color:var(--text-placeholder)]",
+          )}
+        />
+      </label>
+      <button
+        type="submit"
+        aria-label="Open selected tool"
+        data-testid="tools-local-search-submit"
+        className={cn(
+          "grid h-tap w-tap place-items-center rounded-full bg-[color:var(--clinical-accent)] text-[color:var(--clinical-accent-contrast)] shadow-[var(--e1)] transition hover:bg-[color:var(--clinical-accent-hover)]",
+          focusRing,
+        )}
+      >
+        <Search className="size-icon-lg" aria-hidden />
+      </button>
+    </form>
+  );
+}
diff --git a/src/components/tools/tools-search-results-page.tsx b/src/components/tools/tools-search-results-page.tsx
index 3f4e72fb37..0fc9906321 100644
--- a/src/components/tools/tools-search-results-page.tsx
+++ b/src/components/tools/tools-search-results-page.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import Link from "next/link";
+import { useRouter } from "next/navigation";
 import { BadgeCheck, ChevronRight, ClipboardList, Search, ShieldCheck, Waves, type LucideIcon } from "lucide-react";
 import {
   type MutableRefObject,
@@ -22,6 +23,7 @@ import { useFavouritesAccess } from "@/components/clinical-dashboard/use-favouri
 import { useSearchCommand } from "@/components/clinical-dashboard/search-command-context";
 import { UniversalSearchAlsoMatches } from "@/components/clinical-dashboard/universal-search-also-matches";
 import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
+import { ToolLocalSearch } from "@/components/tools/tool-local-search";
 import { ToolQuickActions } from "@/components/tools/tool-quick-actions";
 import { cardPadding, cardSelected, cardSurface, focusRing, stretchedRowLinkClass } from "@/components/card-recipes";
 import { CategoryIconTile } from "@/components/category-icon-tile";
@@ -342,10 +344,13 @@ export function ToolsSearchResultsPage({
     () => true,
     () => false,
   );
-  // The route passes its submitted query so hard loads server-render the exact
-  // result set. After hydration the shared composer owns the draft, including
-  // an intentionally cleared value, until the next submitted navigation.
-  const query = hydrated ? (searchCommand?.query ?? initialQuery) : initialQuery;
+  const router = useRouter();
+  // A draft typed into this page's own filter box wins over everything else, the way
+  // it did on the retired hub. Below that: the route's submitted query so hard loads
+  // server-render the exact result set, and after hydration the shared command draft,
+  // including an intentionally cleared value, until the next submitted navigation.
+  const [localQuery, setLocalQuery] = useState<string | null>(null);
+  const query = localQuery ?? (hydrated ? (searchCommand?.query ?? initialQuery) : initialQuery);
   const filterPanelId = useId();
   const [activeFilter, setActiveFilter] = useState<FilterId>("all");
   const [filterOpen, setFilterOpen] = useState(false);
@@ -442,6 +447,18 @@ export function ToolsSearchResultsPage({
     if (tool) openTool(tool);
   }
 
+  // Submitting is a navigation, not a local state change, so the result set is
+  // shareable and survives reload. An empty box opens the first visible tool
+  // instead, which is what the hub's submit control did.
+  function submitLocalSearch() {
+    const submittedQuery = query.trim();
+    if (submittedQuery) {
+      router.push(`/tools?q=${encodeURIComponent(submittedQuery)}&run=1`);
+      return;
+    }
+    if (filteredTools[0]) openTool(filteredTools[0]);
+  }
+
   function openTool(tool: ToolCatalogRecord, opener?: HTMLElement | null) {
     setSelectedId(tool.id);
     setOpenSection(null);
@@ -478,6 +495,12 @@ export function ToolsSearchResultsPage({
               fixed way in, so a query or category filter must not empty the row. Hidden
               once a query is running, where the ranked results are the answer and a
               static row above them is just noise. */}
+          <ToolLocalSearch
+            value={query}
+            onChange={setLocalQuery}
+            onSubmit={submitLocalSearch}
+            className="mb-4 w-full"
+          />
           {query.trim() ? null : (
             <div className="mb-4" data-testid="tools-shortcuts">
               <div className="hidden sm:block">
diff --git a/tests/ui-tools.spec.ts b/tests/ui-tools.spec.ts
index 14ea3d7cbb..d6df76f2cf 100644
--- a/tests/ui-tools.spec.ts
+++ b/tests/ui-tools.spec.ts
@@ -536,7 +536,10 @@ test.describe("PsychSift tools directory and legacy launcher", () => {
     );
     await expect(visibleGlobalSearchInput(page)).toHaveCount(0);
     await expect(page.locator("form.answer-footer-search-dock")).toHaveCount(0);
-    await expect(page.getByTestId("tools-local-search-input")).toHaveCount(0);
+    // The route owns its filtering, so it has its own in-flow box and no shared
+    // composer. This box came here from the retired `/?mode=tools` hub, which was
+    // the only place a tools search could be typed until that alias redirected.
+    await expect(page.getByTestId("tools-local-search-input")).toBeVisible();
 
     const categories = results.getByRole("radiogroup", { name: "Tool category" });
     await categories.getByRole("radio", { name: /Treat/ }).click();
@@ -1332,7 +1335,7 @@ test.describe("PsychSift tools directory and legacy launcher", () => {
     await expect(page.getByRole("heading", { level: 1, name: "All tools" })).toBeVisible();
     await expect(visibleGlobalSearchInput(page)).toHaveCount(0);
     await expect(page.locator("form.answer-footer-search-dock")).toHaveCount(0);
-    await expect(page.getByTestId("tools-local-search-input")).toHaveCount(0);
+    await expect(page.getByTestId("tools-local-search-input")).toBeVisible();
     await expectNoPageHorizontalOverflow(page);
   });
 

From 1836ef0e1b8e93659869920e81163dd5be822e19 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 11:50:57 +0000
Subject: [PATCH 17/35] Answer library line: reach the modes no local catalogue
 can

The "Also in your library" line under an answer resolved links from four
catalogues loaded in the browser (medications, services, forms,
differentials). A clinician asking a question in Answer mode could never be
shown a matching DSM diagnosis, dictionary term, formulation, specifier,
therapy or tool, though every other mode's "Also matches" tray can reach
them through /api/search/universal.

Widen the data behind the existing line rather than replacing it. The line
keeps its disclosure, its placement inside the answer thread, its walk back
through earlier turns, and the per-record "Search in <mode>" action and
cross_mode_link_open telemetry that the mode-level tray does not have.

- buildCrossModeLinksFromUniversalSearch maps universal-search groups to the
  same CrossModeLink shape, gated on a query term naming the record at a word
  boundary, the same weight and minimum term length the differentials path
  uses. An errored or empty group contributes nothing.
- The consumed domains and their complement come from one array, so a domain
  cannot later be read by both halves and print one record twice.
- The lookup is opt-in per surface (universalMode) and off by default, so no
  surface that already mounts UniversalSearchAlsoMatches runs a second one.
- It is withdrawn while a generation is in flight, matching the rule the
  sibling tray follows on this mode, and it never fires for an answer thread
  restored onto an unsubmitted shared home.

Documents stays excluded: an answer already cites its documents in the
evidence rail and the source drawer.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 src/components/ClinicalDashboard.tsx          |   1 +
 .../answer-result-surface.tsx                 |  20 ++-
 .../clinical-dashboard/cross-mode-links.tsx   |  59 ++++++-
 src/lib/cross-mode-links.ts                   | 153 +++++++++++++++++-
 4 files changed, 228 insertions(+), 5 deletions(-)

diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 44f39da693..6c845e915f 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -3815,6 +3815,7 @@ function ClinicalDashboardContent({
                         followUpSuggestions={answerFollowUpSuggestions}
                         onPickFollowUpSuggestion={handleFollowUpSuggestionPick}
                         followUpSuggestionsDisabled={loading}
+                        generating={loading}
                         onScopeDocument={handleScopeDocument}
                       />
                     </>
diff --git a/src/components/clinical-dashboard/answer-result-surface.tsx b/src/components/clinical-dashboard/answer-result-surface.tsx
index 499ab9137b..29b1a1c140 100644
--- a/src/components/clinical-dashboard/answer-result-surface.tsx
+++ b/src/components/clinical-dashboard/answer-result-surface.tsx
@@ -94,6 +94,7 @@ function StagedAnswerResultSurfaceImpl({
   followUpSuggestions,
   onPickFollowUpSuggestion,
   followUpSuggestionsDisabled = false,
+  generating = false,
   onScopeDocument,
 }: {
   answer: RagAnswer;
@@ -114,6 +115,8 @@ function StagedAnswerResultSurfaceImpl({
   followUpSuggestions?: string[];
   onPickFollowUpSuggestion?: (suggestion: string) => void;
   followUpSuggestionsDisabled?: boolean;
+  /** A generation is in flight — true for a follow-up, while the prior answer is still on screen. */
+  generating?: boolean;
   /** Narrows the search to one document, from the source drawer's overflow menu. */
   onScopeDocument?: (documentId: string) => void;
 }) {
@@ -594,7 +597,22 @@ function StagedAnswerResultSurfaceImpl({
                 is one thing; removing a navigation route on the same evidence is
                 another. Still collapsed, still below the caution. */}
             {crossModeQueries?.length && onCrossModeSearch ? (
-              <CrossModeLinksSection queries={crossModeQueries} onModeSearch={onCrossModeSearch} variant="line" />
+              // `universalMode` is what lets this line reach DSM, Formulation,
+              // Specifiers, Therapy, Dictionary and Tools, which no catalogue in
+              // the browser can resolve. Answer is the only surface that may pass
+              // it: every other mode mounts `UniversalSearchAlsoMatches`, and a
+              // second lookup there would print the same records twice.
+              //
+              // Withdrawn while generating, matching the rule the sibling tray
+              // follows on this mode (`answer && !loading` in ClinicalDashboard),
+              // so the lookup never races the answer stream and the open tray
+              // never holds matches for the question being replaced.
+              <CrossModeLinksSection
+                queries={crossModeQueries}
+                onModeSearch={onCrossModeSearch}
+                variant="line"
+                universalMode={generating ? undefined : "answer"}
+              />
             ) : null}
 
             {followUpSuggestions?.length && onPickFollowUpSuggestion ? (
diff --git a/src/components/clinical-dashboard/cross-mode-links.tsx b/src/components/clinical-dashboard/cross-mode-links.tsx
index e0f4d933e0..a2dd45507e 100644
--- a/src/components/clinical-dashboard/cross-mode-links.tsx
+++ b/src/components/clinical-dashboard/cross-mode-links.tsx
@@ -7,12 +7,16 @@ import { ArrowUpRight, ChevronDown, Layers, Search, type LucideIcon } from "luci
 
 import { cn, eyebrowText, semanticChipTone, sourceCard, type SemanticChipTone } from "@/components/ui-primitives";
 import { logCrossModeLinkOpen } from "@/components/clinical-dashboard/source-actions";
+import { shouldRunUniversalAlsoMatches } from "@/components/clinical-dashboard/universal-search-also-matches-state";
 import { useMedicationCatalog } from "@/components/clinical-dashboard/use-medication-catalog";
+import { useUniversalSearch } from "@/components/clinical-dashboard/use-universal-search";
 import { appModeIcons } from "@/lib/app-mode-icons";
 import { appModeHomeHref, type AppModeId } from "@/lib/app-modes";
 import { APP_MODE_ACCENT } from "@/lib/category-identity";
 import {
   buildCrossModeLinksForThread,
+  buildCrossModeLinksFromUniversalSearch,
+  crossModeUniversalExcludedDomains,
   type CrossModeDifferentialCatalog,
   type CrossModeLink,
   type CrossModeLinkBadge,
@@ -162,12 +166,25 @@ export function CrossModeLinksSection({
   enabled = true,
   onModeSearch,
   variant = "card",
+  universalMode,
 }: {
   queries: Array<string | null | undefined>;
   enabled?: boolean;
   // Defaults to navigating to the target mode with the search pre-run.
   onModeSearch?: (mode: AppModeId, query: string) => void;
   variant?: CrossModeLinksVariant;
+  /**
+   * Opt in to the cross-entity lookup that reaches DSM, Formulation, Specifiers,
+   * Therapy, Dictionary and Tools, naming the mode the surface belongs to.
+   *
+   * Off by default, and that default is load-bearing. A surface that already
+   * mounts `UniversalSearchAlsoMatches` (every mode but Answer) would otherwise
+   * run the same query against the same endpoint twice and print the results in
+   * two panels — the duplication removed on 2026-08-26. Pass it only from a
+   * surface that mounts no other cross-mode panel, and pass `undefined` while a
+   * generation is in flight so the lookup never races the answer stream.
+   */
+  universalMode?: AppModeId;
 }) {
   const router = useRouter();
   const services = useRegistryRecords("service", { enabled, view: "search" });
@@ -201,16 +218,52 @@ export function CrossModeLinksSection({
     });
   }, [enabled, queriesKey, medications.data, services.records, forms.records, differentials]);
 
-  if (links.length === 0) return null;
-
   const telemetryQuery = queriesKey.split("\u0000").at(-1) ?? "";
+  // The newest turn, not the turn the catalogue links came from. The catalogue
+  // path walks back through the thread on purpose, because a follow-up often
+  // drops the entity name; the cross-entity lookup follows the question on
+  // screen instead, which is the same query `ClinicalDashboard` already gives
+  // the sibling "Also matches" tray on this mode.
+  const universalQuery = universalMode ? telemetryQuery : "";
+  // Read during render rather than in an effect, which is safe here only because
+  // it changes no markup: the universal half starts empty on the server and on
+  // the first client paint either way, and this value reaches nothing but the
+  // hook's `enabled`. A restored answer thread sitting on an unsubmitted shared
+  // home must not fetch, which is the rule this helper owns.
+  const universalSubmitted =
+    Boolean(universalMode) &&
+    shouldRunUniversalAlsoMatches(
+      universalMode ?? "answer",
+      typeof window === "undefined" ? null : window.location.search,
+      universalQuery,
+    );
+  const universal = useUniversalSearch({
+    query: universalQuery,
+    enabled: enabled && universalSubmitted,
+    contextMode: universalMode ?? "answer",
+    excludeDomains: crossModeUniversalExcludedDomains,
+    limitPerDomain: 2,
+  });
+  const universalLinks = useMemo(() => {
+    // `universal.query !== universalQuery` is the stale guard: the hook keeps the
+    // previous query's groups while the next request is in flight, and a card
+    // answering the prior question is exactly the guess this surface must not make.
+    if (!universalMode || universal.query !== universalQuery) return [];
+    return buildCrossModeLinksFromUniversalSearch(universalQuery, universal.groups, { existing: links });
+  }, [universalMode, universal.query, universal.groups, universalQuery, links]);
+
+  const allLinks = universalLinks.length > 0 ? [...links, ...universalLinks] : links;
+
+  if (allLinks.length === 0) return null;
   const handleModeSearch =
     onModeSearch ??
     ((mode: AppModeId, query: string) => {
       router.push(appModeHomeHref(mode, { query, focus: true, run: true }));
     });
 
-  return <CrossModeLinksStrip links={links} onModeSearch={handleModeSearch} query={telemetryQuery} variant={variant} />;
+  return (
+    <CrossModeLinksStrip links={allLinks} onModeSearch={handleModeSearch} query={telemetryQuery} variant={variant} />
+  );
 }
 
 /**
diff --git a/src/lib/cross-mode-links.ts b/src/lib/cross-mode-links.ts
index 4980830c32..71266666dc 100644
--- a/src/lib/cross-mode-links.ts
+++ b/src/lib/cross-mode-links.ts
@@ -8,8 +8,37 @@ import {
 } from "@/lib/medications";
 import { extractKeywordTerms } from "@/lib/keyword-query";
 import { rankServiceRecords, type ServiceRecord } from "@/lib/service-ranker";
+import { universalSearchDomains, type UniversalSearchDomain } from "@/lib/universal-search-domains";
+import { universalSearchModeForDomain } from "@/lib/universal-search-mode-context";
+// Type-only, and it must stay that way: `universal-search.ts` reaches snapshot
+// catalogues, rag and supabase, so a value import would pull the server module
+// into the dashboard bundle. `use-universal-search.ts` carries the same note.
+import type { UniversalSearchGroup } from "@/lib/universal-search";
 
-export type CrossModeLinkModeId = Extract<AppModeId, "prescribing" | "services" | "forms" | "differentials">;
+/**
+ * The modes a library line can point at.
+ *
+ * The first four are resolved from catalogues already in the browser. The rest
+ * are reachable only through `/api/search/universal`, and only on a surface that
+ * opts into that lookup — see `buildCrossModeLinksFromUniversalSearch`.
+ *
+ * Calculators, Factsheets, Sources, On Call and Favourites are absent on
+ * purpose: they contribute no cross-entity search domain at all
+ * (`universal-search-mode-context.ts`), so nothing can resolve a link to them.
+ */
+export type CrossModeLinkModeId = Extract<
+  AppModeId,
+  | "prescribing"
+  | "services"
+  | "forms"
+  | "differentials"
+  | "dsm"
+  | "formulation"
+  | "specifiers"
+  | "therapy-compass"
+  | "dictionary"
+  | "tools"
+>;
 
 export type CrossModeLinkBadge = {
   label: string;
@@ -61,13 +90,28 @@ const DIFFERENTIAL_TITLE_TERM_SCORE = 8;
 
 const RANKER_CANDIDATE_LIMIT = 5;
 
+// Locally resolved modes lead: their links come from name-match thresholds tuned
+// against this repo's own catalogues, while the universal-search modes below are
+// gated on one title term. Only a tiebreaker for equal scores.
 const modePriority: Record<CrossModeLinkModeId, number> = {
   prescribing: 0,
   services: 1,
   forms: 2,
   differentials: 3,
+  dsm: 4,
+  formulation: 5,
+  specifiers: 6,
+  "therapy-compass": 7,
+  dictionary: 8,
+  tools: 9,
 };
 
+const crossModeLinkModeIds = new Set<string>(Object.keys(modePriority));
+
+function isCrossModeLinkModeId(modeId: string): modeId is CrossModeLinkModeId {
+  return crossModeLinkModeIds.has(modeId);
+}
+
 function crossModeLinkBase(modeId: CrossModeLinkModeId, title: string) {
   return {
     modeId,
@@ -275,3 +319,110 @@ export function buildCrossModeLinks(
 
   return links;
 }
+
+/**
+ * The universal-search domains a library line may consume, and their complement.
+ *
+ * Only these six are read here. `documents` is left out because an answer already
+ * cites its documents in the evidence rail and source drawer, and `medications`,
+ * `services`, `forms`, `differentials` and `presentations` are left out because
+ * the catalogue path above already resolves them with tuned name-match
+ * thresholds. Deriving the exclusion list from this one array rather than writing
+ * it out twice is what stops a future domain being read by both halves and
+ * showing the same record on one line.
+ */
+export const crossModeUniversalDomains = [
+  "dsm",
+  "formulation",
+  "specifiers",
+  "therapies",
+  "dictionary",
+  "tools",
+] as const satisfies readonly UniversalSearchDomain[];
+
+export const crossModeUniversalExcludedDomains: readonly UniversalSearchDomain[] = universalSearchDomains.filter(
+  (domain) => !(crossModeUniversalDomains as readonly UniversalSearchDomain[]).includes(domain),
+);
+
+// Same gate and the same weight as `differentialTitleScore`: a term only counts
+// when it names the record at a word boundary, and only when it is long enough
+// that question filler cannot carry it. Universal search returns items its own
+// adapters already ranked, so this is a second, stricter filter on top of that —
+// never a substitute for it.
+const UNIVERSAL_TITLE_TERM_SCORE = 8;
+const UNIVERSAL_MIN_TERM_LENGTH = 4;
+
+/**
+ * Cross-mode links for the domains the local catalogues cannot reach.
+ *
+ * Returns only the links to ADD to `options.existing`, already deduplicated
+ * against it, so a caller concatenates rather than merges. An empty or errored
+ * group contributes nothing: a failed lookup must leave the line exactly as the
+ * catalogue path left it, never a guess.
+ */
+export function buildCrossModeLinksFromUniversalSearch(
+  query: string,
+  groups: readonly UniversalSearchGroup[],
+  options: { existing?: readonly CrossModeLink[]; maxPerMode?: number; maxTotal?: number } = {},
+): CrossModeLink[] {
+  const maxPerMode = options.maxPerMode ?? 1;
+  const maxTotal = options.maxTotal ?? 2;
+  const terms = extractKeywordTerms(query).filter((term) => term.length >= UNIVERSAL_MIN_TERM_LENGTH);
+  if (terms.length === 0 || maxTotal <= 0) return [];
+
+  const allowedDomains = new Set<string>(crossModeUniversalDomains);
+  const candidates: CrossModeLink[] = [];
+
+  for (const group of groups) {
+    if (group.error || !allowedDomains.has(group.kind)) continue;
+    const modeId = universalSearchModeForDomain(group.kind);
+    if (!isCrossModeLinkModeId(modeId)) continue;
+
+    for (const item of group.items) {
+      const title = item.title?.trim();
+      const detailHref = item.href?.trim();
+      if (!title || !detailHref) continue;
+      const matched = terms.filter((term) => hasWordBoundaryMatch(title, [term]));
+      if (matched.length === 0) continue;
+      const badge = item.badge?.trim();
+      candidates.push({
+        ...crossModeLinkBase(modeId, title),
+        // `id` is the domain's own record id; the href is the fallback so a
+        // domain that omits one cannot collapse two records onto one React key.
+        slug: item.id?.trim() || detailHref,
+        subtitle: item.subtitle?.trim() ?? "",
+        badges: badge ? [{ label: badge }] : [],
+        detailHref,
+        score: matched.length * UNIVERSAL_TITLE_TERM_SCORE,
+        matchReason: "title",
+      });
+    }
+  }
+
+  candidates.sort(
+    (left, right) =>
+      right.score - left.score ||
+      modePriority[left.modeId] - modePriority[right.modeId] ||
+      left.title.localeCompare(right.title),
+  );
+
+  const existing = options.existing ?? [];
+  const seenKeys = new Set(existing.map((link) => `${link.modeId}:${link.slug}`));
+  const seenHrefs = new Set(existing.map((link) => link.detailHref));
+  const perModeCounts: Partial<Record<CrossModeLinkModeId, number>> = {};
+  const links: CrossModeLink[] = [];
+
+  for (const candidate of candidates) {
+    if (links.length >= maxTotal) break;
+    const key = `${candidate.modeId}:${candidate.slug}`;
+    if (seenKeys.has(key) || seenHrefs.has(candidate.detailHref)) continue;
+    const modeCount = perModeCounts[candidate.modeId] ?? 0;
+    if (modeCount >= maxPerMode) continue;
+    seenKeys.add(key);
+    seenHrefs.add(candidate.detailHref);
+    perModeCounts[candidate.modeId] = modeCount + 1;
+    links.push(candidate);
+  }
+
+  return links;
+}

From 1b18a1097fe353fcf80ec15a59fea86a843e9a5b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 11:53:36 +0000
Subject: [PATCH 18/35] Pin the widened Answer line: builder contract and
 coverage register

Ten cases for buildCrossModeLinksFromUniversalSearch, covering the parts that
would fail silently: an errored or empty group contributing nothing, a domain
the catalogue half already resolves being ignored, a substring hit rejected
because the query does not name the record at a word boundary, short query
filler dropped, a record the catalogue half already listed not repeated, the
per-mode and total caps, and a distinct React key when a domain omits its id.

One case pins the two domain lists as exact complements, because that is the
property which stops a future domain being read by both halves and printing
one record twice.

The coverage register's Answer exemption now states the current contract
rather than only the 2026-08-26 duplication history, and a new case pins the
universalMode opt-in on the answer surface. Without it the exemption's claim
that Answer answers cross-mode discovery elsewhere quietly stops being true.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 tests/cross-mode-links.test.ts                | 158 +++++++++++++++++-
 ...iversal-also-matches-mode-coverage.test.ts |  21 ++-
 2 files changed, 175 insertions(+), 4 deletions(-)

diff --git a/tests/cross-mode-links.test.ts b/tests/cross-mode-links.test.ts
index c9dc2b15bf..b4b21843af 100644
--- a/tests/cross-mode-links.test.ts
+++ b/tests/cross-mode-links.test.ts
@@ -1,7 +1,16 @@
 import { describe, expect, it } from "vitest";
 
 import { crossModeDifferentialCatalog } from "@/lib/cross-mode-differentials";
-import { buildCrossModeLinks, buildCrossModeLinksForThread } from "@/lib/cross-mode-links";
+import {
+  buildCrossModeLinks,
+  buildCrossModeLinksForThread,
+  buildCrossModeLinksFromUniversalSearch,
+  crossModeUniversalDomains,
+  crossModeUniversalExcludedDomains,
+  type CrossModeLink,
+} from "@/lib/cross-mode-links";
+import { universalSearchDomains, type UniversalSearchDomain } from "@/lib/universal-search-domains";
+import type { UniversalSearchGroup, UniversalSearchItem } from "@/lib/universal-search";
 import { extractKeywordTerms, keywordQueryFromNaturalLanguage } from "@/lib/keyword-query";
 import { defaultMedicationRecords } from "@/lib/medication-fixtures";
 import type { ServiceRecord } from "@/lib/services";
@@ -150,3 +159,150 @@ describe("buildCrossModeLinks", () => {
     expect(buildCrossModeLinks("clozapine dose", {})).toEqual([]);
   });
 });
+
+function universalItem(overrides: Partial<UniversalSearchItem> & { kind: UniversalSearchDomain }): UniversalSearchItem {
+  return {
+    id: overrides.id ?? "record",
+    title: overrides.title ?? "Record",
+    href: overrides.href ?? "/record",
+    score: overrides.score ?? 1,
+    ...overrides,
+  };
+}
+
+function universalGroup(
+  kind: UniversalSearchDomain,
+  items: Array<Partial<UniversalSearchItem>>,
+  overrides: Partial<UniversalSearchGroup> = {},
+): UniversalSearchGroup {
+  const built = items.map((item) => universalItem({ ...item, kind }));
+  return { kind, total: built.length, items: built, latencyMs: 1, ...overrides };
+}
+
+describe("crossModeUniversalExcludedDomains", () => {
+  it("is exactly the complement of the domains the line consumes", () => {
+    // The two lists are derived from one array on purpose. If they ever drift, a
+    // domain is read by both the catalogue half and the universal half, and the
+    // same record is printed twice on one line.
+    expect([...crossModeUniversalExcludedDomains].sort()).toEqual(
+      universalSearchDomains.filter((domain) => !crossModeUniversalDomains.includes(domain)).sort(),
+    );
+    for (const domain of ["documents", "medications", "services", "forms", "differentials", "presentations"] as const) {
+      expect(crossModeUniversalExcludedDomains, `${domain} is already resolved elsewhere`).toContain(domain);
+    }
+  });
+});
+
+describe("buildCrossModeLinksFromUniversalSearch", () => {
+  it("reaches a mode no local catalogue can resolve", () => {
+    const links = buildCrossModeLinksFromUniversalSearch("criteria for bipolar disorder", [
+      universalGroup("dsm", [
+        { id: "bipolar-i-disorder", title: "Bipolar I Disorder", href: "/dsm/bipolar-i-disorder", subtitle: "296.4x" },
+      ]),
+    ]);
+
+    expect(links).toHaveLength(1);
+    expect(links[0]).toMatchObject({
+      modeId: "dsm",
+      modeLabel: "DSM-5 Diagnosis",
+      slug: "bipolar-i-disorder",
+      detailHref: "/dsm/bipolar-i-disorder",
+      subtitle: "296.4x",
+      modeSearchQuery: "Bipolar I Disorder",
+      matchReason: "title",
+    });
+  });
+
+  it("rejects an item the query does not name at a word boundary", () => {
+    // "renal" hides inside "adrenaline"; a content-ranked hit is not a named one.
+    expect(
+      buildCrossModeLinksFromUniversalSearch("renal impairment", [
+        universalGroup("dictionary", [{ id: "adrenaline", title: "Adrenaline", href: "/dictionary/adrenaline" }]),
+      ]),
+    ).toEqual([]);
+  });
+
+  it("drops query filler shorter than the minimum term length", () => {
+    expect(
+      buildCrossModeLinksFromUniversalSearch("who is at risk", [
+        universalGroup("tools", [{ id: "who-5", title: "WHO Wellbeing Index", href: "/tools/who-5" }]),
+      ]),
+    ).toEqual([]);
+  });
+
+  it("contributes nothing from an errored or empty group", () => {
+    // A failed adapter must leave the line exactly as the catalogue half left it.
+    expect(
+      buildCrossModeLinksFromUniversalSearch("bipolar disorder", [
+        universalGroup("dsm", [{ id: "bipolar-i", title: "Bipolar I Disorder", href: "/dsm/bipolar-i" }], {
+          error: true,
+        }),
+        universalGroup("dictionary", []),
+      ]),
+    ).toEqual([]);
+  });
+
+  it("ignores domains the catalogue half already resolves", () => {
+    expect(
+      buildCrossModeLinksFromUniversalSearch("clozapine dosing", [
+        universalGroup("medications", [{ id: "clozapine", title: "Clozapine", href: "/medications/clozapine" }]),
+        universalGroup("documents", [{ id: "doc-1", title: "Clozapine Protocol", href: "/documents/doc-1" }]),
+      ]),
+    ).toEqual([]);
+  });
+
+  it("never repeats a record the catalogue half already listed", () => {
+    const existing: CrossModeLink[] = [
+      {
+        modeId: "differentials",
+        modeLabel: "Differentials",
+        slug: "psychosis",
+        title: "Psychosis",
+        subtitle: "",
+        badges: [],
+        detailHref: "/dsm/psychosis",
+        modeSearchHref: "/differentials",
+        modeSearchQuery: "Psychosis",
+        score: 8,
+        matchReason: "title",
+      },
+    ];
+
+    expect(
+      buildCrossModeLinksFromUniversalSearch(
+        "psychosis assessment",
+        [universalGroup("dsm", [{ id: "psychosis", title: "Psychosis", href: "/dsm/psychosis" }])],
+        { existing },
+      ),
+    ).toEqual([]);
+  });
+
+  it("caps the added links at one per mode and two in total", () => {
+    const links = buildCrossModeLinksFromUniversalSearch("bipolar disorder assessment", [
+      universalGroup("dsm", [
+        { id: "bipolar-i", title: "Bipolar I Disorder", href: "/dsm/bipolar-i" },
+        { id: "bipolar-ii", title: "Bipolar II Disorder", href: "/dsm/bipolar-ii" },
+      ]),
+      universalGroup("dictionary", [{ id: "bipolar", title: "Bipolar", href: "/dictionary/bipolar" }]),
+      universalGroup("tools", [{ id: "bipolar-scale", title: "Bipolar Assessment Scale", href: "/tools/bipolar" }]),
+    ]);
+
+    expect(links).toHaveLength(2);
+    expect(new Set(links.map((link) => link.modeId)).size).toBe(2);
+    // Two matched terms beats one, whatever the domain's own (incomparable) score:
+    // the single-term Dictionary hit loses its place to the two-term Tools hit.
+    // DSM and Tools both match two terms, and that tie falls to mode priority.
+    expect(links.map((link) => [link.modeId, link.title])).toEqual([
+      ["dsm", "Bipolar I Disorder"],
+      ["tools", "Bipolar Assessment Scale"],
+    ]);
+  });
+
+  it("keeps a distinct key when a domain omits the record id", () => {
+    const links = buildCrossModeLinksFromUniversalSearch("bipolar disorder", [
+      universalGroup("dsm", [{ id: "", title: "Bipolar I Disorder", href: "/dsm/bipolar-i" }]),
+    ]);
+
+    expect(links[0]!.slug).toBe("/dsm/bipolar-i");
+  });
+});
diff --git a/tests/universal-also-matches-mode-coverage.test.ts b/tests/universal-also-matches-mode-coverage.test.ts
index 0d396bfef4..182dc9a2fb 100644
--- a/tests/universal-also-matches-mode-coverage.test.ts
+++ b/tests/universal-also-matches-mode-coverage.test.ts
@@ -23,9 +23,13 @@ const MOUNTS: Record<AppModeId, { file: string; mounts: true } | { file: string;
     file: "src/components/clinical-dashboard/answer-result-surface.tsx",
     mounts: false,
     because:
-      "Answer carries its cross-mode links on the answer surface's own library line (CrossModeLinksSection). " +
-      "Both rendered for a while, one directly under the other, asking the same question — the duplication " +
-      "the owner photographed on 2026-08-26. tests/ui-universal-search.spec.ts pins the panel OUT of Answer.",
+      "Answer carries its cross-mode links on the answer surface's own library line (CrossModeLinksSection), " +
+      "inside the answer thread rather than below the whole result region. Both rendered for a while, one " +
+      "directly under the other, asking the same question — the duplication the owner photographed on " +
+      "2026-08-26. tests/ui-universal-search.spec.ts pins the panel OUT of Answer. The line is not the " +
+      "narrower surface it once was: since the universalMode opt-in it runs the same /api/search/universal " +
+      "lookup the tray runs, so DSM, Formulation, Specifiers, Therapy, Dictionary and Tools are reachable " +
+      "from an answer too, on top of the four catalogues resolved in the browser.",
   },
   documents: { file: "src/components/ClinicalDashboard.tsx", mounts: true },
   services: { file: "src/components/services/services-navigator-page.tsx", mounts: true },
@@ -74,6 +78,17 @@ describe("cross-mode also-matches coverage", () => {
       expect(entry.because.length, "an exemption must carry its reason").toBeGreaterThan(80);
       expect(read(entry.file)).toContain("CrossModeLinksSection");
     });
+
+    it(`keeps ${modeId}'s own line reaching the modes no catalogue can resolve`, () => {
+      // The exemption above is only honest while the line actually reaches the
+      // other modes. Without this opt-in it falls back to four client-side
+      // catalogues, and an answer can never point at a DSM diagnosis, a
+      // dictionary term, a formulation, a specifier, a therapy or a tool —
+      // which is the coverage gap the exemption now claims is closed.
+      expect(read(entry.file), `${entry.file} must pass universalMode to CrossModeLinksSection`).toMatch(
+        /<CrossModeLinksSection[\s\S]{0,400}?universalMode=/,
+      );
+    });
   }
 
   it("lets exactly one owner mount the panel for a mode that borrows a result kind", () => {

From 94ee36ca56faf3630cdf06756e32d610bbc6abdb Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 12:09:15 +0000
Subject: [PATCH 19/35] Bound the library line at five, and prove the widened
 reach in a browser

Review of the first commit found an unstated consequence: the catalogue half
caps itself at four links and the universal half added up to two more, so the
line's ceiling moved from four rows to six without anyone deciding it. Fill to
a combined five instead. The widened reach keeps its full two rows on the
common answer, which names no medication, service, form or differential at
all, and a thread that already resolved four clinical records grows by one row
rather than three.

The new browser test is the proof the unit tests cannot give: an answer for a
question naming a DSM diagnosis, with only /api/search/universal mocked, must
show a Bipolar I Disorder card inside the answer's own library line, with both
its open and its search-in-mode controls. It also asserts the request carries
exactly the six domains the line consumes, which is what stops a record
arriving down both paths, and re-asserts that this surface still has one panel
and not two.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 .../clinical-dashboard/cross-mode-links.tsx   | 16 +++-
 tests/cross-mode-links.test.ts                | 17 +++-
 tests/ui-universal-search.spec.ts             | 83 +++++++++++++++++++
 3 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/src/components/clinical-dashboard/cross-mode-links.tsx b/src/components/clinical-dashboard/cross-mode-links.tsx
index a2dd45507e..2a0bf81479 100644
--- a/src/components/clinical-dashboard/cross-mode-links.tsx
+++ b/src/components/clinical-dashboard/cross-mode-links.tsx
@@ -36,6 +36,12 @@ const cardActionControl =
 
 type CrossModeLinksVariant = "card" | "compact" | "responsive-compact" | "line";
 
+// The ceiling on one library line once both halves have contributed. Six rows of
+// 48px is a third of an 844px phone inside a tray the reader opened deliberately;
+// five keeps it under that without spending the widened reach on threads that
+// need it least.
+const crossModeLineMaxLinks = 5;
+
 type CrossModeLinkCardProps = {
   link: CrossModeLink;
   Icon: LucideIcon;
@@ -249,7 +255,15 @@ export function CrossModeLinksSection({
     // previous query's groups while the next request is in flight, and a card
     // answering the prior question is exactly the guess this surface must not make.
     if (!universalMode || universal.query !== universalQuery) return [];
-    return buildCrossModeLinksFromUniversalSearch(universalQuery, universal.groups, { existing: links });
+    return buildCrossModeLinksFromUniversalSearch(universalQuery, universal.groups, {
+      existing: links,
+      // The catalogue half caps itself at four. Filling to a combined five keeps
+      // the widened reach where it earns its place — the common answer, which
+      // names no medication, service, form or differential at all and would
+      // otherwise show nothing — while a thread that already resolved four
+      // clinical records grows by one row, not three.
+      maxTotal: Math.max(0, crossModeLineMaxLinks - links.length),
+    });
   }, [universalMode, universal.query, universal.groups, universalQuery, links]);
 
   const allLinks = universalLinks.length > 0 ? [...links, ...universalLinks] : links;
diff --git a/tests/cross-mode-links.test.ts b/tests/cross-mode-links.test.ts
index b4b21843af..c10c97e481 100644
--- a/tests/cross-mode-links.test.ts
+++ b/tests/cross-mode-links.test.ts
@@ -185,7 +185,9 @@ describe("crossModeUniversalExcludedDomains", () => {
     // domain is read by both the catalogue half and the universal half, and the
     // same record is printed twice on one line.
     expect([...crossModeUniversalExcludedDomains].sort()).toEqual(
-      universalSearchDomains.filter((domain) => !crossModeUniversalDomains.includes(domain)).sort(),
+      universalSearchDomains
+        .filter((domain) => !(crossModeUniversalDomains as readonly UniversalSearchDomain[]).includes(domain))
+        .sort(),
     );
     for (const domain of ["documents", "medications", "services", "forms", "differentials", "presentations"] as const) {
       expect(crossModeUniversalExcludedDomains, `${domain} is already resolved elsewhere`).toContain(domain);
@@ -298,6 +300,19 @@ describe("buildCrossModeLinksFromUniversalSearch", () => {
     ]);
   });
 
+  it("adds nothing once the caller has no room left on the line", () => {
+    // The section passes `crossModeLineMaxLinks - links.length`, so a thread whose
+    // catalogue half already filled the line asks for zero. It must not round up
+    // to the builder's own default of two.
+    expect(
+      buildCrossModeLinksFromUniversalSearch(
+        "bipolar disorder",
+        [universalGroup("dsm", [{ id: "bipolar-i", title: "Bipolar I Disorder", href: "/dsm/bipolar-i" }])],
+        { maxTotal: 0 },
+      ),
+    ).toEqual([]);
+  });
+
   it("keeps a distinct key when a domain omits the record id", () => {
     const links = buildCrossModeLinksFromUniversalSearch("bipolar disorder", [
       universalGroup("dsm", [{ id: "", title: "Bipolar I Disorder", href: "/dsm/bipolar-i" }]),
diff --git a/tests/ui-universal-search.spec.ts b/tests/ui-universal-search.spec.ts
index f783c42524..106caf3e92 100644
--- a/tests/ui-universal-search.spec.ts
+++ b/tests/ui-universal-search.spec.ts
@@ -496,6 +496,89 @@ test.describe("universal search smart affordances", () => {
     await expect(page).toHaveURL(/mode=answer/);
   });
 
+  test("reaches a mode no local catalogue can resolve from the answer's library line", async ({ page }) => {
+    // The coverage this change exists for. The line used to resolve links from
+    // four catalogues in the browser (medications, services, forms,
+    // differentials), so an answer could never point at a DSM diagnosis however
+    // squarely the question named one. Everything below the mock is real: the
+    // request the surface makes, the title gate it applies, and the card.
+    const universalRequests: string[] = [];
+    await page.route(/\/api\/search\/universal(?:\?.*)?$/, async (route) => {
+      const requestUrl = new URL(route.request().url());
+      universalRequests.push(requestUrl.searchParams.get("domains") ?? "");
+      await fulfillUniversalSearch(route, {
+        ...universalPayload,
+        query: requestUrl.searchParams.get("q") ?? "",
+        contextMode: "answer",
+        preferredDomains: ["documents"],
+        domainOrder: ["dsm"],
+        groups: [
+          {
+            kind: "dsm",
+            total: 1,
+            latencyMs: 3,
+            items: [
+              {
+                id: "bipolar-i-disorder",
+                kind: "dsm",
+                title: "Bipolar I Disorder",
+                subtitle: "Manic episode required",
+                href: "/dsm/bipolar-i-disorder",
+                score: 18,
+              },
+            ],
+          },
+        ],
+      });
+    });
+    await page.route(/\/api\/answer(?:\/stream)?(?:\?.*)?$/, async (route) => {
+      if (new URL(route.request().url()).pathname.endsWith("/stream")) {
+        await route.fulfill({
+          body: [
+            `event: progress\ndata: ${JSON.stringify({ stage: "complete", message: "Answer ready.", elapsedMs: 40 })}`,
+            `event: final\ndata: ${JSON.stringify(syntheticAnswer)}`,
+            "",
+          ].join("\n\n"),
+          contentType: "text/event-stream; charset=utf-8",
+        });
+        return;
+      }
+      await route.fulfill({ json: syntheticAnswer });
+    });
+
+    const input = await openComposer(page, "/?mode=answer&focus=1");
+    await input.fill("bipolar disorder criteria");
+    await page.getByRole("button", { name: "Generate source-backed answer" }).click();
+
+    const line = page.getByTestId("cross-mode-links");
+    await expect(line).toBeVisible({ timeout: 15_000 });
+    // Still one panel on this surface, never both. The mode-level tray staying
+    // out is the other half of that contract and is asserted beside it.
+    await expect(line).toHaveCount(1);
+    await expect(page.getByTestId("universal-also-matches")).toHaveCount(0);
+
+    await page.getByTestId("cross-mode-links-line-trigger").click();
+    const rail = page.getByTestId("cross-mode-links-rail");
+    await expect(rail.getByRole("link", { name: "Open Bipolar I Disorder" })).toBeVisible();
+    await expect(rail.getByRole("button", { name: /Search Bipolar I Disorder in DSM-5 Diagnosis/ })).toBeVisible();
+
+    // The domains the catalogue half already resolves are absent from the request
+    // itself, so one record can never arrive down both paths and print twice on
+    // one line, and the answer's own documents are not re-listed under an answer
+    // that already cites them.
+    expect(universalRequests.length).toBeGreaterThan(0);
+    for (const domains of universalRequests) {
+      expect(domains.split(",").sort()).toEqual([
+        "dictionary",
+        "dsm",
+        "formulation",
+        "specifiers",
+        "therapies",
+        "tools",
+      ]);
+    }
+  });
+
   test("keeps a completed Answer query eligible for submitted cross-mode matches", async ({ page }) => {
     await mockSmartSearch(page);
     const input = await openComposer(page, "/?mode=answer&focus=1");

From e3076dd32676eaaf02c028bbe9591cb5f8da88da Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 12:20:52 +0000
Subject: [PATCH 20/35] Record what direction B cost the answer surface, and
 how it was repaid

Section 12.8 records the 2026-08-26 decision to keep one cross-mode panel
under an answer and says which one won. It does not say that the winner
reached four catalogues while the panel it replaced reached twelve domains,
so a reader working from that section would conclude the surfaces were
equivalent. They were not, and the gap is invisible from the screenshots the
section was written around.

Add 12.9: the coverage that was lost, why the fix widens the line rather than
undoing the decision, the three constraints that keep it inside 12.8, the new
five-link ceiling, and the five modes that remain unreachable because they
contribute no cross-entity search domain at all.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 docs/answer-page-redesign-handover.md | 45 +++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/docs/answer-page-redesign-handover.md b/docs/answer-page-redesign-handover.md
index 2e487ca76c..34e5bf07d5 100644
--- a/docs/answer-page-redesign-handover.md
+++ b/docs/answer-page-redesign-handover.md
@@ -731,3 +731,48 @@ panel:
 card, the rail cards, the drawer and print are fixed together. Display only.
 
 ---
+
+### 12.9 What direction B cost, and how it was repaid (2026-09-07)
+
+Keeping one panel was right. Keeping the narrower one was a coverage loss nobody wrote down at
+the time, and it is invisible from a screenshot.
+
+`UniversalSearchAlsoMatches` is fed by `/api/search/universal` and reaches twelve domains.
+`CrossModeLinksSection` was fed by four catalogues loaded in the browser — medications,
+services, forms, differentials. So from 2026-08-26 a clinician who asked a question in Answer
+mode could never be shown a matching DSM diagnosis, dictionary term, formulation, specifier,
+therapy or tool, though all sixteen other modes could. The register in
+`tests/universal-also-matches-mode-coverage.test.ts` recorded the exemption honestly and
+recorded the wrong thing about it: that Answer answers cross-mode discovery elsewhere, without
+saying that "elsewhere" reached a third of the surface the tray reached.
+
+**Widened rather than replaced.** The line keeps its disclosure, its place inside the answer
+thread between the governed caution and the follow-ups, its walk back through earlier turns when
+a follow-up drops the entity name, and the per-record `Search in <mode>` control and
+`cross_mode_link_open` telemetry the mode-level tray has never had. What changed is only where
+the links come from: `buildCrossModeLinksFromUniversalSearch` maps universal-search groups into
+the same `CrossModeLink` shape, gated on a query term naming the record at a word boundary — the
+same weight and minimum term length the differentials path already used, because a content-only
+score cannot be trusted on a question full of filler.
+
+Three things hold it inside the 12.8 decision rather than undoing it:
+
+- The lookup is opt-in per surface (`universalMode`) and off by default. Every mode but Answer
+  mounts the tray, so a surface that ran this too would print one record twice — which is what
+  §12.8 removed, and what the prescribing page later shipped anyway.
+- The consumed domains and their complement come from one array. `documents` is excluded because
+  an answer already cites its documents in the evidence rail and the drawer, and the four
+  catalogue domains are excluded because the local half already resolves them.
+- It is withdrawn while a generation is in flight, matching `answer && !loading` on the tray, so
+  the lookup never races the answer stream and an open tray never holds matches for the question
+  being replaced. An errored or empty group contributes nothing.
+
+The line now fills to five links rather than four. That ceiling is deliberate: the widened reach
+keeps both its rows on the common answer, which names no medication, service, form or
+differential at all, while a thread that already resolved four clinical records grows by one row.
+
+Calculators, Factsheets, Sources, On Call and Favourites are still unreachable from here, and
+not by omission — they contribute no cross-entity search domain at all
+(`universal-search-mode-context.ts`), so nothing can resolve a link to them from any surface.
+
+---

From 8c5ac88a4c16f0f54050690b74a99f213865a3ff Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 12:28:38 +0000
Subject: [PATCH 21/35] Answer library matches go back to the open card strip

Owner decision, 2026-09-07, reversing the collapsed one-line disclosure that
direction B introduced on 2026-08-26. The answer surface now renders the same
open card strip every other consumer of this block renders, so the same
component no longer behaves one way under an answer and another way
everywhere else, and the matches are readable without spending a tap.

What does not change: the block stays below the governed caution and above the
follow-up suggestions, keeps its two per-card actions and their telemetry, and
keeps the widened data source added earlier on this branch.

CrossModeLinksLine is left in place rather than deleted. It has no consumer
now, and it is one prop away from being the presentation again if the owner
wants it back.

Three browser tests carried the disclosure as their contract. Each is updated
rather than dropped, and each now asserts the absence of a trigger alongside a
visible rail, so a disclosure reappearing under an answer fails the suite. The
1280px case keeps its computed-display assertion on the rail, because width was
where the previous design broke and that class of failure is still worth
catching.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 .../answer-result-surface.tsx                 | 18 ++++--
 tests/ui-smoke.spec.ts                        | 56 +++++++++----------
 tests/ui-universal-search.spec.ts             |  6 +-
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/components/clinical-dashboard/answer-result-surface.tsx b/src/components/clinical-dashboard/answer-result-surface.tsx
index 29b1a1c140..4229f566b6 100644
--- a/src/components/clinical-dashboard/answer-result-surface.tsx
+++ b/src/components/clinical-dashboard/answer-result-surface.tsx
@@ -591,11 +591,18 @@ function StagedAnswerResultSurfaceImpl({
             <VerificationNotice {...answerVerification} />
 
             {/* Kept, though the approved specimen does not draw it: that specimen
-                is one answer with no library matches to show, and this collapsed
-                line is the only route from an answer to the Medication and
-                Differentials records behind it. Removing chrome a picture omits
-                is one thing; removing a navigation route on the same evidence is
-                another. Still collapsed, still below the caution. */}
+                is one answer with no library matches to show, and this block is
+                the only route from an answer to the library records behind it.
+                Removing chrome a picture omits is one thing; removing a
+                navigation route on the same evidence is another.
+
+                Presented as the open card strip every other consumer of this
+                component uses, not the collapsed one-line disclosure direction B
+                introduced on 2026-08-26 (owner decision, 2026-09-07: the toggle
+                went, the placement below the caution stayed). The matches are
+                worth a glance without spending a tap, and the answer surface no
+                longer carries a control that behaves unlike the same block
+                everywhere else in the app. */}
             {crossModeQueries?.length && onCrossModeSearch ? (
               // `universalMode` is what lets this line reach DSM, Formulation,
               // Specifiers, Therapy, Dictionary and Tools, which no catalogue in
@@ -610,7 +617,6 @@ function StagedAnswerResultSurfaceImpl({
               <CrossModeLinksSection
                 queries={crossModeQueries}
                 onModeSearch={onCrossModeSearch}
-                variant="line"
                 universalMode={generating ? undefined : "answer"}
               />
             ) : null}
diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index b44074d60c..9ea44440a2 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -2947,20 +2947,19 @@ test.describe("PsychSift UI smoke coverage", () => {
     await visibleAnswerSubmitButton(page).click();
     await expect(page.getByTestId("plain-answer-response")).toBeVisible({ timeout: 15_000 });
     await expect(page.getByTestId("answer-streaming")).toHaveCount(0);
-    // The library matches are one collapsed line in the answer's evidence stack
-    // and open on demand. Still asserted end to end rather than dropped —
-    // open it and the same two links are there, at full tap size.
+    // The library matches are an open card strip in the answer's evidence stack,
+    // the same presentation every other consumer of the block uses (owner
+    // decision, 2026-09-07, reversing the collapsed line of direction B). No
+    // disclosure to open, so the links are asserted where they sit, at full tap
+    // size, and the strip is part of the resting geometry measured below.
     const relatedRegion = page.getByRole("region", { name: "Related pages in other modes" });
-    const relatedTrigger = relatedRegion.getByTestId("cross-mode-links-line-trigger");
-    await relatedTrigger.click();
+    await expect(
+      relatedRegion.getByTestId("cross-mode-links-line-trigger"),
+      "the answer strip must carry no disclosure of its own",
+    ).toHaveCount(0);
     const relatedItems = relatedRegion.getByRole("listitem");
     await expect(relatedItems).toHaveCount(2);
     await expect(relatedItems.last()).toBeVisible();
-    // Collapse it again before the geometry below. The rest of this test
-    // measures the answer's scroll runway in its resting state, and an expanded
-    // panel adds ~88px of content that the page does not carry by default.
-    await relatedTrigger.click();
-    await expect(relatedItems.last()).toBeHidden();
 
     const main = page.locator("main#main-content");
     const header = page.locator("header.universal-header");
@@ -3111,9 +3110,8 @@ test.describe("PsychSift UI smoke coverage", () => {
     await expect(input).toBeFocused();
 
     await page.setViewportSize({ width: 320, height: 844 });
-    // Re-open the library line: the tap-target sweep below is about the links
-    // inside it, and the geometry block above needed it resting closed.
-    await relatedTrigger.click();
+    // The strip is open at every width now, so the tap-target sweep below reaches
+    // its links without a disclosure step.
     const compactCrossModeRail = page.getByTestId("cross-mode-links-rail");
     await expect(compactCrossModeRail).toBeVisible();
     await expectNoPageHorizontalOverflow(page);
@@ -3265,29 +3263,25 @@ test.describe("PsychSift UI smoke coverage", () => {
     const strip = answerSurface.getByTestId("cross-mode-links");
     await expect(strip).toBeVisible({ timeout: 15_000 });
     await expect(answerSurface.getByTestId("cross-mode-links")).toHaveCount(1);
-    // One collapsed line under the answer, opened on demand (owner decision,
-    // 2026-08-26, "direction B"). Everything below still has to work through it,
-    // so the test opens it rather than dropping the coverage.
+    // One open card strip under the answer, matching every other surface that
+    // renders this block (owner decision, 2026-09-07, reversing the collapsed
+    // line of direction B on 2026-08-26). The rail is visible on arrival and
+    // there is no disclosure to work through.
     //
-    // The closed state is asserted here at 1280px, not only at phone width. It
-    // shipped broken on desktop precisely because the one test that checked the
-    // collapse ran at 390px: `hidden` beside a `md:flex` in the same class list
-    // loses to the media-query rule from 768px up, so the rail stayed open while
-    // its trigger reported `aria-expanded="false"`.
-    const trigger = strip.getByTestId("cross-mode-links-line-trigger");
+    // Asserted here at 1280px, not only at phone width, because the width is
+    // where the previous design broke: `hidden` beside a `md:flex` in one class
+    // list loses to the media-query rule from 768px up, so a rail that reports
+    // itself closed can still be painted open. Pinning the rail's own computed
+    // display keeps that class of failure caught now that the state is fixed.
     const rail = strip.getByTestId("cross-mode-links-rail");
-    await expect(trigger).toHaveAttribute("aria-expanded", "false");
-    await expect(rail).toBeHidden();
-    await trigger.click();
-    await expect(trigger).toHaveAttribute("aria-expanded", "true");
+    await expect(
+      strip.getByTestId("cross-mode-links-line-trigger"),
+      "the answer strip must carry no disclosure of its own",
+    ).toHaveCount(0);
     await expect(rail).toBeVisible();
     await expect(rail).toHaveCSS("display", "flex");
-    // Close and re-open: the collapse is the half that regressed.
-    await trigger.click();
-    await expect(rail).toBeHidden();
-    await trigger.click();
-    await expect(rail).toBeVisible();
     await page.keyboard.press("Escape");
+    await expect(rail).toBeVisible();
     await expect(strip.getByText("Medication", { exact: true }).filter({ visible: true })).toBeVisible();
     const medicationSearch = strip.getByRole("button", { name: "Search Clozapine in Medication" });
     await expect(medicationSearch).toBeVisible();
diff --git a/tests/ui-universal-search.spec.ts b/tests/ui-universal-search.spec.ts
index 106caf3e92..083513abf7 100644
--- a/tests/ui-universal-search.spec.ts
+++ b/tests/ui-universal-search.spec.ts
@@ -557,7 +557,6 @@ test.describe("universal search smart affordances", () => {
     await expect(line).toHaveCount(1);
     await expect(page.getByTestId("universal-also-matches")).toHaveCount(0);
 
-    await page.getByTestId("cross-mode-links-line-trigger").click();
     const rail = page.getByTestId("cross-mode-links-rail");
     await expect(rail.getByRole("link", { name: "Open Bipolar I Disorder" })).toBeVisible();
     await expect(rail.getByRole("button", { name: /Search Bipolar I Disorder in DSM-5 Diagnosis/ })).toBeVisible();
@@ -657,7 +656,10 @@ test.describe("universal search smart affordances", () => {
     await expect(page.getByTestId("cross-mode-links")).toHaveCount(0);
 
     await expect(page.getByTestId("cross-mode-links")).toBeVisible({ timeout: 15_000 });
-    await expect(page.getByTestId("cross-mode-links-line-trigger")).toBeVisible();
+    // Open on arrival, no disclosure: the same card strip the rest of the app
+    // renders (owner decision, 2026-09-07).
+    await expect(page.getByTestId("cross-mode-links-rail")).toBeVisible();
+    await expect(page.getByTestId("cross-mode-links-line-trigger")).toHaveCount(0);
     await expect(page.getByTestId("universal-also-matches")).toHaveCount(0);
   });
 

From 644096adc3797b1370c6fd09d07adc666b5b312f Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 12:30:07 +0000
Subject: [PATCH 22/35] Record the presentation reversal in the answer handover

Section 12.9 explained the widened data source while still describing the
collapsed line as the presentation. Record that the line is gone, what
reversing it costs and buys, why CrossModeLinksLine stays in the file with no
consumer, and how the three browser tests that carried the disclosure were
turned into guards against it returning.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 docs/answer-page-redesign-handover.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/answer-page-redesign-handover.md b/docs/answer-page-redesign-handover.md
index 34e5bf07d5..f0d504e97b 100644
--- a/docs/answer-page-redesign-handover.md
+++ b/docs/answer-page-redesign-handover.md
@@ -775,4 +775,24 @@ Calculators, Factsheets, Sources, On Call and Favourites are still unreachable f
 not by omission — they contribute no cross-entity search domain at all
 (`universal-search-mode-context.ts`), so nothing can resolve a link to them from any surface.
 
+**The collapsed line itself is gone (owner decision, 2026-09-07).** Direction B's one-line
+disclosure was reversed on the same day the data was widened, on the owner's read of the built
+surface: the answer page should not carry a control that behaves unlike the same block
+everywhere else in the product. The answer surface now renders `variant="card"`, the open strip
+the DSM diagnosis page and the mockups already used, so §12.8's "one panel, not two" holds while
+its "one collapsed line" does not.
+
+What that costs is roughly 90px of resting height on a phone, which is the trade §12.8 made in
+the other direction. What it buys is that the matches can be read rather than opened, and that
+one component has one behaviour. `CrossModeLinksLine` is left in `cross-mode-links.tsx` with no
+consumer — deleting it would throw away a considered design that is one prop away from
+returning, and the `line` variant remains part of the component's public shape.
+
+Three browser tests carried the disclosure as their contract and were updated rather than
+dropped. Each now asserts a visible rail _and_ the absence of a trigger, so a disclosure
+reappearing under an answer fails the suite. The 1280px case keeps its computed-display
+assertion on the rail: width is where the previous design broke, when a `hidden` beside a
+`md:flex` in one class list lost to the media-query rule from 768px up and left a rail painted
+open while its own trigger reported it closed.
+
 ---

From 7a86589c0c3f92f76ae30a10691b58f0d1c8c957 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 12:33:45 +0000
Subject: [PATCH 23/35] Keep each domain's own ranking in the universal
 cross-mode links

Codex review finding on PR #2736, and it is real. The mapper replaced the
API's within-domain ordering with a term-count score, and that score ties
constantly: most matches hit exactly one query term. The comparator then fell
through to alphabetical title order, so among equally scoring items from one
domain the earliest title won. With maxPerMode at 1 that is not a cosmetic
reordering, it silently drops the domain's actual top result and shows its
second.

Carry the item's position in the group the server returned it in and use it as
the tiebreaker ahead of the title. Equal score and equal mode priority means
the same domain, so that comparison is always within a domain and never an
incomparable cross-domain one. item.score is deliberately still unused: its
own type says it is comparable within a group only.

The new case is the one the reviewer described: a higher-ranked "Zzz" item
ahead of a lower-ranked "Aaa" item in the same domain, both matching the same
terms. Alphabetical order would take the Aaa record; the domain's ranking
takes the Zzz one.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 src/lib/cross-mode-links.ts    | 44 +++++++++++++++++++++++-----------
 tests/cross-mode-links.test.ts | 15 ++++++++++++
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/lib/cross-mode-links.ts b/src/lib/cross-mode-links.ts
index 71266666dc..829d7d0c8a 100644
--- a/src/lib/cross-mode-links.ts
+++ b/src/lib/cross-mode-links.ts
@@ -371,14 +371,24 @@ export function buildCrossModeLinksFromUniversalSearch(
   if (terms.length === 0 || maxTotal <= 0) return [];
 
   const allowedDomains = new Set<string>(crossModeUniversalDomains);
-  const candidates: CrossModeLink[] = [];
+  // `rank` is the item's position in the group the server returned it in, kept
+  // so the domain's own ranking survives this mapper. Within a domain that
+  // ranking is the only trustworthy order: the term-count score below is a
+  // filter, not a ranker, and it ties constantly (most matches hit exactly one
+  // term). Falling through to alphabetical order there let an earlier title
+  // displace the domain's actual top result, which `maxPerMode` of 1 then made
+  // the only result. `item.score` is deliberately not used: the type says it is
+  // comparable within a group only.
+  const candidates: Array<{ link: CrossModeLink; rank: number }> = [];
 
   for (const group of groups) {
     if (group.error || !allowedDomains.has(group.kind)) continue;
     const modeId = universalSearchModeForDomain(group.kind);
     if (!isCrossModeLinkModeId(modeId)) continue;
 
+    let rank = 0;
     for (const item of group.items) {
+      rank += 1;
       const title = item.title?.trim();
       const detailHref = item.href?.trim();
       if (!title || !detailHref) continue;
@@ -386,24 +396,30 @@ export function buildCrossModeLinksFromUniversalSearch(
       if (matched.length === 0) continue;
       const badge = item.badge?.trim();
       candidates.push({
-        ...crossModeLinkBase(modeId, title),
-        // `id` is the domain's own record id; the href is the fallback so a
-        // domain that omits one cannot collapse two records onto one React key.
-        slug: item.id?.trim() || detailHref,
-        subtitle: item.subtitle?.trim() ?? "",
-        badges: badge ? [{ label: badge }] : [],
-        detailHref,
-        score: matched.length * UNIVERSAL_TITLE_TERM_SCORE,
-        matchReason: "title",
+        rank,
+        link: {
+          ...crossModeLinkBase(modeId, title),
+          // `id` is the domain's own record id; the href is the fallback so a
+          // domain that omits one cannot collapse two records onto one React key.
+          slug: item.id?.trim() || detailHref,
+          subtitle: item.subtitle?.trim() ?? "",
+          badges: badge ? [{ label: badge }] : [],
+          detailHref,
+          score: matched.length * UNIVERSAL_TITLE_TERM_SCORE,
+          matchReason: "title",
+        },
       });
     }
   }
 
+  // Equal score and equal mode priority means the same domain, so `rank` here is
+  // always a within-domain comparison and never an incomparable cross-domain one.
   candidates.sort(
     (left, right) =>
-      right.score - left.score ||
-      modePriority[left.modeId] - modePriority[right.modeId] ||
-      left.title.localeCompare(right.title),
+      right.link.score - left.link.score ||
+      modePriority[left.link.modeId] - modePriority[right.link.modeId] ||
+      left.rank - right.rank ||
+      left.link.title.localeCompare(right.link.title),
   );
 
   const existing = options.existing ?? [];
@@ -412,7 +428,7 @@ export function buildCrossModeLinksFromUniversalSearch(
   const perModeCounts: Partial<Record<CrossModeLinkModeId, number>> = {};
   const links: CrossModeLink[] = [];
 
-  for (const candidate of candidates) {
+  for (const { link: candidate } of candidates) {
     if (links.length >= maxTotal) break;
     const key = `${candidate.modeId}:${candidate.slug}`;
     if (seenKeys.has(key) || seenHrefs.has(candidate.detailHref)) continue;
diff --git a/tests/cross-mode-links.test.ts b/tests/cross-mode-links.test.ts
index c10c97e481..81364df249 100644
--- a/tests/cross-mode-links.test.ts
+++ b/tests/cross-mode-links.test.ts
@@ -300,6 +300,21 @@ describe("buildCrossModeLinksFromUniversalSearch", () => {
     ]);
   });
 
+  it("keeps the domain's own ranking when two items match the same terms", () => {
+    // The term-count score is a filter, not a ranker, and it ties constantly.
+    // With one link per mode, an alphabetical tiebreak would hand the slot to
+    // the domain's second-best result and silently drop its first.
+    const links = buildCrossModeLinksFromUniversalSearch("bipolar disorder", [
+      universalGroup("dsm", [
+        { id: "z-record", title: "Zzz Bipolar Disorder", href: "/dsm/z-record", score: 90 },
+        { id: "a-record", title: "Aaa Bipolar Disorder", href: "/dsm/a-record", score: 10 },
+      ]),
+    ]);
+
+    expect(links).toHaveLength(1);
+    expect(links[0]).toMatchObject({ slug: "z-record", title: "Zzz Bipolar Disorder" });
+  });
+
   it("adds nothing once the caller has no room left on the line", () => {
     // The section passes `crossModeLineMaxLinks - links.length`, so a thread whose
     // catalogue half already filled the line asks for zero. It must not round up

From 1669fb355e440c3a3eeb96f48789b02821ad3fab Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 13:00:27 +0000
Subject: [PATCH 24/35] Hold the answer strip at four links
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Five was set while this block was still a collapsed disclosure, where an extra
row cost nothing until the reader opened it. It is open at every width now, so
every row is unconditional height on the answer surface, between the governed
caution and the follow-ups. Four is the ceiling the catalogue half alone
allowed before the widened lookup existed, so holding it keeps this change
about reach rather than about size.

The cap only binds when the catalogue half filled the strip on its own, and a
question naming four medication, service, form or differential records is
already well served. The common answer names none of them, which is where the
widened reach earns its place and where this number never applies.

Renamed the constant: there is no line any more.

Also records in the handover why CrossModeLinksLine is still in the file. The
owner asked for it to be deleted; check:dead-code-candidate refused, because the
symbol was introduced on 2026-08-26 and sits inside the gate's 30-day window.
The heuristic is wrong here — its consumer existed and was removed the same day
— but tuning a threshold to pass a diff is what that gate exists to stop, so it
stays until the window lapses.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 docs/answer-page-redesign-handover.md         | 19 +++++++++----
 .../clinical-dashboard/cross-mode-links.tsx   | 27 +++++++++++--------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/docs/answer-page-redesign-handover.md b/docs/answer-page-redesign-handover.md
index f0d504e97b..06a88f8323 100644
--- a/docs/answer-page-redesign-handover.md
+++ b/docs/answer-page-redesign-handover.md
@@ -767,9 +767,13 @@ Three things hold it inside the 12.8 decision rather than undoing it:
   the lookup never races the answer stream and an open tray never holds matches for the question
   being replaced. An errored or empty group contributes nothing.
 
-The line now fills to five links rather than four. That ceiling is deliberate: the widened reach
-keeps both its rows on the common answer, which names no medication, service, form or
-differential at all, while a thread that already resolved four clinical records grows by one row.
+The strip's ceiling stays at four, the number the catalogue half alone allowed. Five was set
+while this was still a collapsed disclosure, where an extra row cost nothing until the reader
+opened it; with the strip open at every width every row is unconditional height on the answer
+surface, so the old ceiling holds and this change stays about reach rather than size. The cap
+only binds when the catalogue half filled the strip on its own, which is a question already well
+served; the common answer names none of those four record types, and that is where the widened
+reach earns its place.
 
 Calculators, Factsheets, Sources, On Call and Favourites are still unreachable from here, and
 not by omission — they contribute no cross-entity search domain at all
@@ -785,8 +789,13 @@ its "one collapsed line" does not.
 What that costs is roughly 90px of resting height on a phone, which is the trade §12.8 made in
 the other direction. What it buys is that the matches can be read rather than opened, and that
 one component has one behaviour. `CrossModeLinksLine` is left in `cross-mode-links.tsx` with no
-consumer — deleting it would throw away a considered design that is one prop away from
-returning, and the `line` variant remains part of the component's public shape.
+consumer, and not by preference: the owner asked for it to be deleted on 2026-09-07 and
+`check:dead-code-candidate` refused the removal, because the symbol was introduced on
+2026-08-26 and sits inside the gate's 30-day window ("likely awaiting its consumer"). The
+heuristic is wrong in this particular case — the consumer existed and was deliberately removed
+the same day — but tuning the threshold to pass a diff is exactly what that gate exists to stop,
+so the code stays until the window lapses after 2026-09-25. The `line` variant remains part of
+the component's public shape until then.
 
 Three browser tests carried the disclosure as their contract and were updated rather than
 dropped. Each now asserts a visible rail _and_ the absence of a trigger, so a disclosure
diff --git a/src/components/clinical-dashboard/cross-mode-links.tsx b/src/components/clinical-dashboard/cross-mode-links.tsx
index 2a0bf81479..9851a0f3d6 100644
--- a/src/components/clinical-dashboard/cross-mode-links.tsx
+++ b/src/components/clinical-dashboard/cross-mode-links.tsx
@@ -36,11 +36,20 @@ const cardActionControl =
 
 type CrossModeLinksVariant = "card" | "compact" | "responsive-compact" | "line";
 
-// The ceiling on one library line once both halves have contributed. Six rows of
-// 48px is a third of an 844px phone inside a tray the reader opened deliberately;
-// five keeps it under that without spending the widened reach on threads that
-// need it least.
-const crossModeLineMaxLinks = 5;
+// The ceiling on one library strip once both halves have contributed.
+//
+// Four, which is what the catalogue half alone allowed before the widened lookup
+// existed. Five was set while this block was still a collapsed disclosure, where
+// an extra row cost nothing until the reader opened it. It is open at every
+// width now (owner decision, 2026-09-07), so every row is unconditional height
+// on the answer surface, between the governed caution and the follow-ups.
+// Holding the old ceiling keeps this change about reach rather than about size.
+//
+// The cap only binds when the catalogue half filled the strip on its own, and a
+// question naming four medication, service, form or differential records is
+// already well served. The common answer names none of them, which is where the
+// widened reach earns its place and where this number never applies.
+const crossModeStripMaxLinks = 4;
 
 type CrossModeLinkCardProps = {
   link: CrossModeLink;
@@ -257,12 +266,8 @@ export function CrossModeLinksSection({
     if (!universalMode || universal.query !== universalQuery) return [];
     return buildCrossModeLinksFromUniversalSearch(universalQuery, universal.groups, {
       existing: links,
-      // The catalogue half caps itself at four. Filling to a combined five keeps
-      // the widened reach where it earns its place — the common answer, which
-      // names no medication, service, form or differential at all and would
-      // otherwise show nothing — while a thread that already resolved four
-      // clinical records grows by one row, not three.
-      maxTotal: Math.max(0, crossModeLineMaxLinks - links.length),
+      // Whatever the catalogue half left unused, up to the strip's ceiling.
+      maxTotal: Math.max(0, crossModeStripMaxLinks - links.length),
     });
   }, [universalMode, universal.query, universal.groups, universalQuery, links]);
 

From 0552c7fd2b8afbcc29e0eb45e191304987234205 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 13:20:37 +0000
Subject: [PATCH 25/35] Answer library matches: one toggle, resting open

Owner decision, 2026-09-07, after seeing both ends of this built. Neither was
right.

Closed by default, as direction B shipped it, hides the matches behind a tap
nobody has a reason to take: a closed tray cannot show what it holds, so the
reader spends the tap to find out whether it was worth spending. Removing the
toggle entirely, the first correction, put four unconditional rows into the
answer's evidence stack with no way to put them away, on the densest surface in
the product.

The hybrid is one control that starts open. The matches are readable without a
tap and the space is one tap away. variant="line" is the answer surface's
presentation again, so the card strip stays what the DSM diagnosis page and the
mockups use.

The three browser tests that carry this contract now pin the resting state as
open and exercise the collapse from there. The 1280px case asserts the rail's
own computed display in both states rather than the trigger's word for it: a
`hidden` beside a `md:flex` in one class list loses to the media query from
768px up, which once left a rail painted open while its trigger reported it
closed. Resting open, the same mechanic would hide a broken collapse instead,
so the closed state is the one pinned on computed display.

The ceiling stays at four. Its height argument is weaker now the line can be
put away, but four is the number the catalogue half alone allowed and there is
no reason to spend the difference without asking.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 docs/answer-page-redesign-handover.md         | 51 ++++++++--------
 .../answer-result-surface.tsx                 | 18 ++----
 .../clinical-dashboard/cross-mode-links.tsx   |  8 ++-
 tests/ui-smoke.spec.ts                        | 59 +++++++++++--------
 tests/ui-universal-search.spec.ts             |  7 +--
 5 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/docs/answer-page-redesign-handover.md b/docs/answer-page-redesign-handover.md
index 06a88f8323..9edb56dbd6 100644
--- a/docs/answer-page-redesign-handover.md
+++ b/docs/answer-page-redesign-handover.md
@@ -779,29 +779,32 @@ Calculators, Factsheets, Sources, On Call and Favourites are still unreachable f
 not by omission — they contribute no cross-entity search domain at all
 (`universal-search-mode-context.ts`), so nothing can resolve a link to them from any surface.
 
-**The collapsed line itself is gone (owner decision, 2026-09-07).** Direction B's one-line
-disclosure was reversed on the same day the data was widened, on the owner's read of the built
-surface: the answer page should not carry a control that behaves unlike the same block
-everywhere else in the product. The answer surface now renders `variant="card"`, the open strip
-the DSM diagnosis page and the mockups already used, so §12.8's "one panel, not two" holds while
-its "one collapsed line" does not.
-
-What that costs is roughly 90px of resting height on a phone, which is the trade §12.8 made in
-the other direction. What it buys is that the matches can be read rather than opened, and that
-one component has one behaviour. `CrossModeLinksLine` is left in `cross-mode-links.tsx` with no
-consumer, and not by preference: the owner asked for it to be deleted on 2026-09-07 and
-`check:dead-code-candidate` refused the removal, because the symbol was introduced on
-2026-08-26 and sits inside the gate's 30-day window ("likely awaiting its consumer"). The
-heuristic is wrong in this particular case — the consumer existed and was deliberately removed
-the same day — but tuning the threshold to pass a diff is exactly what that gate exists to stop,
-so the code stays until the window lapses after 2026-09-25. The `line` variant remains part of
-the component's public shape until then.
-
-Three browser tests carried the disclosure as their contract and were updated rather than
-dropped. Each now asserts a visible rail _and_ the absence of a trigger, so a disclosure
-reappearing under an answer fails the suite. The 1280px case keeps its computed-display
-assertion on the rail: width is where the previous design broke, when a `hidden` beside a
-`md:flex` in one class list lost to the media-query rule from 768px up and left a rail painted
-open while its own trigger reported it closed.
+**The line keeps its single toggle, and now rests open (owner decision, 2026-09-07).** Both ends
+of this were built and looked at on the day the data was widened, and both were wrong.
+
+Closed by default, as direction B shipped it, hides the matches behind a tap nobody has a reason
+to take: a closed tray cannot show what it holds, so the reader has to spend the tap to find out
+whether it was worth spending. Removing the toggle entirely, which was the first correction, put
+four unconditional rows into the answer's evidence stack with no way to put them away — roughly
+90px of resting height on a phone, on the densest surface in the product, which is the trade
+§12.8 made in the other direction for a reason.
+
+The hybrid is one control that starts open. The matches are there to be read without a tap, and
+the space is one tap away for a reader who wants the answer and the follow-ups closer together.
+`variant="line"` and `CrossModeLinksLine` are the presentation again, so the `card` strip stays
+what the DSM diagnosis page and the mockups use.
+
+Worth recording because it nearly went the other way: `CrossModeLinksLine` was almost deleted
+while it briefly had no consumer. `check:dead-code-candidate` refused the removal — the symbol
+was introduced on 2026-08-26, inside the gate's 30-day window ("likely awaiting its consumer") —
+and the deletion was dropped rather than forced past the threshold. A day later it was the
+presentation again. The gate's heuristic looked wrong at the time and was right in substance.
+
+Three browser tests carry the disclosure as their contract. The 1280px case asserts the rail's
+own computed display in both states rather than the trigger's word for it: width is where this
+broke before, when a `hidden` beside a `md:flex` in one class list lost to the media-query rule
+from 768px up and left a rail painted open while its trigger reported it closed. Now that the
+line rests open, the same mechanic would hide a broken collapse instead, which is why the closed
+state is the one pinned on computed display.
 
 ---
diff --git a/src/components/clinical-dashboard/answer-result-surface.tsx b/src/components/clinical-dashboard/answer-result-surface.tsx
index 4229f566b6..29b1a1c140 100644
--- a/src/components/clinical-dashboard/answer-result-surface.tsx
+++ b/src/components/clinical-dashboard/answer-result-surface.tsx
@@ -591,18 +591,11 @@ function StagedAnswerResultSurfaceImpl({
             <VerificationNotice {...answerVerification} />
 
             {/* Kept, though the approved specimen does not draw it: that specimen
-                is one answer with no library matches to show, and this block is
-                the only route from an answer to the library records behind it.
-                Removing chrome a picture omits is one thing; removing a
-                navigation route on the same evidence is another.
-
-                Presented as the open card strip every other consumer of this
-                component uses, not the collapsed one-line disclosure direction B
-                introduced on 2026-08-26 (owner decision, 2026-09-07: the toggle
-                went, the placement below the caution stayed). The matches are
-                worth a glance without spending a tap, and the answer surface no
-                longer carries a control that behaves unlike the same block
-                everywhere else in the app. */}
+                is one answer with no library matches to show, and this collapsed
+                line is the only route from an answer to the Medication and
+                Differentials records behind it. Removing chrome a picture omits
+                is one thing; removing a navigation route on the same evidence is
+                another. Still collapsed, still below the caution. */}
             {crossModeQueries?.length && onCrossModeSearch ? (
               // `universalMode` is what lets this line reach DSM, Formulation,
               // Specifiers, Therapy, Dictionary and Tools, which no catalogue in
@@ -617,6 +610,7 @@ function StagedAnswerResultSurfaceImpl({
               <CrossModeLinksSection
                 queries={crossModeQueries}
                 onModeSearch={onCrossModeSearch}
+                variant="line"
                 universalMode={generating ? undefined : "answer"}
               />
             ) : null}
diff --git a/src/components/clinical-dashboard/cross-mode-links.tsx b/src/components/clinical-dashboard/cross-mode-links.tsx
index 9851a0f3d6..9f7fab7158 100644
--- a/src/components/clinical-dashboard/cross-mode-links.tsx
+++ b/src/components/clinical-dashboard/cross-mode-links.tsx
@@ -308,7 +308,13 @@ function CrossModeLinksLine({
   onModeSearch: (mode: AppModeId, query: string) => void;
   query: string;
 }) {
-  const [open, setOpen] = useState(false);
+  // Open on arrival, and still collapsible — the hybrid the owner asked for on
+  // 2026-09-07, after seeing both ends of it. Closed-by-default hid the matches
+  // behind a tap nobody had a reason to take, since a closed tray cannot show
+  // what it holds. No toggle at all put four unconditional rows into the
+  // answer's evidence stack with no way to put them away. One control, already
+  // open, gives the reader the matches for free and the space back on request.
+  const [open, setOpen] = useState(true);
   // `useId`, not a constant: two of these can mount at once (the answer thread
   // and a historical turn), and a duplicate id is a DOM-integrity failure the
   // smoke audit fails on.
diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index 9ea44440a2..21f830829b 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -2947,19 +2947,21 @@ test.describe("PsychSift UI smoke coverage", () => {
     await visibleAnswerSubmitButton(page).click();
     await expect(page.getByTestId("plain-answer-response")).toBeVisible({ timeout: 15_000 });
     await expect(page.getByTestId("answer-streaming")).toHaveCount(0);
-    // The library matches are an open card strip in the answer's evidence stack,
-    // the same presentation every other consumer of the block uses (owner
-    // decision, 2026-09-07, reversing the collapsed line of direction B). No
-    // disclosure to open, so the links are asserted where they sit, at full tap
-    // size, and the strip is part of the resting geometry measured below.
+    // The library matches sit in one line in the answer's evidence stack, open on
+    // arrival and collapsible (owner decision, 2026-09-07). The links are
+    // asserted where they rest, at full tap size, and the line is then collapsed
+    // for the geometry below.
     const relatedRegion = page.getByRole("region", { name: "Related pages in other modes" });
-    await expect(
-      relatedRegion.getByTestId("cross-mode-links-line-trigger"),
-      "the answer strip must carry no disclosure of its own",
-    ).toHaveCount(0);
+    const relatedTrigger = relatedRegion.getByTestId("cross-mode-links-line-trigger");
+    await expect(relatedTrigger).toHaveAttribute("aria-expanded", "true");
     const relatedItems = relatedRegion.getByRole("listitem");
     await expect(relatedItems).toHaveCount(2);
     await expect(relatedItems.last()).toBeVisible();
+    // Collapse before the geometry below. The rest of this test measures the
+    // answer's scroll runway with the line put away, which is the state the
+    // collapse exists to give the reader.
+    await relatedTrigger.click();
+    await expect(relatedItems.last()).toBeHidden();
 
     const main = page.locator("main#main-content");
     const header = page.locator("header.universal-header");
@@ -3110,8 +3112,9 @@ test.describe("PsychSift UI smoke coverage", () => {
     await expect(input).toBeFocused();
 
     await page.setViewportSize({ width: 320, height: 844 });
-    // The strip is open at every width now, so the tap-target sweep below reaches
-    // its links without a disclosure step.
+    // Re-open the library line: the tap-target sweep below is about the links
+    // inside it, and the geometry block above deliberately collapsed it.
+    await relatedTrigger.click();
     const compactCrossModeRail = page.getByTestId("cross-mode-links-rail");
     await expect(compactCrossModeRail).toBeVisible();
     await expectNoPageHorizontalOverflow(page);
@@ -3263,25 +3266,31 @@ test.describe("PsychSift UI smoke coverage", () => {
     const strip = answerSurface.getByTestId("cross-mode-links");
     await expect(strip).toBeVisible({ timeout: 15_000 });
     await expect(answerSurface.getByTestId("cross-mode-links")).toHaveCount(1);
-    // One open card strip under the answer, matching every other surface that
-    // renders this block (owner decision, 2026-09-07, reversing the collapsed
-    // line of direction B on 2026-08-26). The rail is visible on arrival and
-    // there is no disclosure to work through.
+    // One collapsed line under the answer, opened on demand (owner decision,
+    // 2026-08-26, "direction B"). Everything below still has to work through it,
+    // so the test opens it rather than dropping the coverage.
     //
-    // Asserted here at 1280px, not only at phone width, because the width is
-    // where the previous design broke: `hidden` beside a `md:flex` in one class
-    // list loses to the media-query rule from 768px up, so a rail that reports
-    // itself closed can still be painted open. Pinning the rail's own computed
-    // display keeps that class of failure caught now that the state is fixed.
+    // The closed state is asserted here at 1280px, not only at phone width. It
+    // shipped broken on desktop precisely because the one test that checked the
+    // collapse ran at 390px: `hidden` beside a `md:flex` in the same class list
+    // loses to the media-query rule from 768px up, so the rail stayed open while
+    // its trigger reported `aria-expanded="false"`. Now that the line rests OPEN
+    // the same mechanic would hide the failure the other way round, which is why
+    // the closed state below is still asserted on the rail's computed display
+    // rather than on the trigger's word for it.
+    const trigger = strip.getByTestId("cross-mode-links-line-trigger");
     const rail = strip.getByTestId("cross-mode-links-rail");
-    await expect(
-      strip.getByTestId("cross-mode-links-line-trigger"),
-      "the answer strip must carry no disclosure of its own",
-    ).toHaveCount(0);
+    await expect(trigger).toHaveAttribute("aria-expanded", "true");
     await expect(rail).toBeVisible();
     await expect(rail).toHaveCSS("display", "flex");
-    await page.keyboard.press("Escape");
+    // Close and re-open: the collapse is the half that regressed before.
+    await trigger.click();
+    await expect(trigger).toHaveAttribute("aria-expanded", "false");
+    await expect(rail).toBeHidden();
+    await trigger.click();
+    await expect(trigger).toHaveAttribute("aria-expanded", "true");
     await expect(rail).toBeVisible();
+    await page.keyboard.press("Escape");
     await expect(strip.getByText("Medication", { exact: true }).filter({ visible: true })).toBeVisible();
     const medicationSearch = strip.getByRole("button", { name: "Search Clozapine in Medication" });
     await expect(medicationSearch).toBeVisible();
diff --git a/tests/ui-universal-search.spec.ts b/tests/ui-universal-search.spec.ts
index 083513abf7..b3341cb4d5 100644
--- a/tests/ui-universal-search.spec.ts
+++ b/tests/ui-universal-search.spec.ts
@@ -557,6 +557,8 @@ test.describe("universal search smart affordances", () => {
     await expect(line).toHaveCount(1);
     await expect(page.getByTestId("universal-also-matches")).toHaveCount(0);
 
+    // Open on arrival: no tap needed to reach the widened half.
+    await expect(page.getByTestId("cross-mode-links-line-trigger")).toHaveAttribute("aria-expanded", "true");
     const rail = page.getByTestId("cross-mode-links-rail");
     await expect(rail.getByRole("link", { name: "Open Bipolar I Disorder" })).toBeVisible();
     await expect(rail.getByRole("button", { name: /Search Bipolar I Disorder in DSM-5 Diagnosis/ })).toBeVisible();
@@ -656,10 +658,7 @@ test.describe("universal search smart affordances", () => {
     await expect(page.getByTestId("cross-mode-links")).toHaveCount(0);
 
     await expect(page.getByTestId("cross-mode-links")).toBeVisible({ timeout: 15_000 });
-    // Open on arrival, no disclosure: the same card strip the rest of the app
-    // renders (owner decision, 2026-09-07).
-    await expect(page.getByTestId("cross-mode-links-rail")).toBeVisible();
-    await expect(page.getByTestId("cross-mode-links-line-trigger")).toHaveCount(0);
+    await expect(page.getByTestId("cross-mode-links-line-trigger")).toBeVisible();
     await expect(page.getByTestId("universal-also-matches")).toHaveCount(0);
   });
 

From 1beea076594e951fcae6429e164ce695908defa3 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 7 Sep 2026 13:53:42 +0000
Subject: [PATCH 26/35] Drop the record-name preview from the library line's
 header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Owner decision, 2026-09-07. The header listed the first three record names
beside the label from sm up, so the reader saw "Bipolar disorder · East
Metropolitan Eating Disorder Specialist Service · Kara Maar Spe…" and then the
same records as cards immediately underneath.

Those names were doing real work while the line rested closed: a closed tray
cannot show what it holds, so the preview was the only way to tell the reader
whether opening it was worth a tap. The line rests open now, so the preview
repeats what is already on screen and truncates mid-word to do it.

The header is label, rule and count at every width, which is the same editorial
device the sibling "Also matches" tray uses. The rule no longer stops at sm,
because the names are no longer taking its place from there up.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Xwq7U1Gu9Ncs2Aj3yFfMF
---
 docs/answer-page-redesign-handover.md         |  5 +++
 .../clinical-dashboard/cross-mode-links.tsx   | 34 ++++++++-----------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/docs/answer-page-redesign-handover.md b/docs/answer-page-redesign-handover.md
index 9edb56dbd6..ec8c16b20b 100644
--- a/docs/answer-page-redesign-handover.md
+++ b/docs/answer-page-redesign-handover.md
@@ -794,6 +794,11 @@ the space is one tap away for a reader who wants the answer and the follow-ups c
 `variant="line"` and `CrossModeLinksLine` are the presentation again, so the `card` strip stays
 what the DSM diagnosis page and the mockups use.
 
+The header lost its preview of the first three record names in the same change. Those names
+earned their room while the line rested closed and had no other way to say what it held; open,
+they were naming the cards immediately below them. The header is label, rule and count now, at
+every width, which is the device the "Also matches" tray already uses.
+
 Worth recording because it nearly went the other way: `CrossModeLinksLine` was almost deleted
 while it briefly had no consumer. `check:dead-code-candidate` refused the removal — the symbol
 was introduced on 2026-08-26, inside the gate's 30-day window ("likely awaiting its consumer") —
diff --git a/src/components/clinical-dashboard/cross-mode-links.tsx b/src/components/clinical-dashboard/cross-mode-links.tsx
index 9f7fab7158..275bb60d7f 100644
--- a/src/components/clinical-dashboard/cross-mode-links.tsx
+++ b/src/components/clinical-dashboard/cross-mode-links.tsx
@@ -292,12 +292,14 @@ export function CrossModeLinksSection({
  * Under an answer this block used to be a permanently expanded rail sitting
  * directly above a second, near-identical panel of mode matches. Two panels
  * asking the same question ("where else does this appear") read as one panel
- * repeated. This collapses to a single row carrying a preview of what is inside,
- * closes the answer's evidence/safety stack, and opens to exactly the rail it
- * always was before the follow-up conversation begins.
+ * repeated. This is the single row that replaced them: it closes the answer's
+ * evidence/safety stack and collapses to give the space back before the
+ * follow-up conversation begins.
  *
- * The preview names come from the resolved links, so the line can never
- * advertise a match the expanded rail does not list.
+ * The header carries the label, a rule and the count — no preview of the record
+ * names (owner decision, 2026-09-07). The names were there to tell a closed line
+ * what it held, and the line rests open, so they were repeating the cards
+ * directly beneath them.
  */
 function CrossModeLinksLine({
   links,
@@ -319,8 +321,6 @@ function CrossModeLinksLine({
   // and a historical turn), and a duplicate id is a DOM-integrity failure the
   // smoke audit fails on.
   const panelId = useId();
-  const preview = links.slice(0, 3).map((link) => link.title);
-  const rest = links.length - preview.length;
   const countLabel = links.length === 1 ? "1 match" : `${links.length} matches`;
   return (
     <section
@@ -356,19 +356,13 @@ function CrossModeLinksLine({
           <Layers className="size-icon-md" aria-hidden />
         </span>
         <span className={cn(eyebrowText, "shrink-0 text-[color:var(--text-heading)]")}>Also in your library</span>
-        {/* Label, rule, count — the editorial section-header device the "Also
-            matches" tray uses. The preview names replace the rule from sm up,
-            where there is room for them; at 320px the label plus both of them
-            would not fit, and the count is the half that still says something
-            when the names are gone. */}
-        <span
-          className="h-px min-w-3 flex-1 bg-[color:var(--border)] forced-colors:bg-[CanvasText] sm:hidden"
-          aria-hidden
-        />
-        <span className="hidden min-w-0 flex-1 truncate text-2xs text-[color:var(--text-muted)] sm:block">
-          {preview.join(" · ")}
-          {rest > 0 ? ` · +${rest}` : null}
-        </span>
+        {/* Label, rule, count — the same editorial section-header device the
+            "Also matches" tray uses, and now at every width. A preview of the
+            first three record names used to take the rule's place from sm up;
+            it earned that room while the line rested closed and had no other
+            way to say what it held. Resting open, it was naming the cards
+            immediately below it. */}
+        <span className="h-px min-w-3 flex-1 bg-[color:var(--border)] forced-colors:bg-[CanvasText]" aria-hidden />
         {/* Visual cue only — the button's accessible name stays the label above,
             so a screen reader is not read the count twice. */}
         <span

From 2a327b194a85092ddb40f80cc967cadc044c22cf Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 8 Sep 2026 12:51:11 +0000
Subject: [PATCH 27/35] fix(search): key the cross-mode also-matches lookup to
 the submitted query

Editing the bottom composer on a result view calls setQuery alone: the
results and modeSearchSubmitted both stay as they were. The lookup was
keyed on that live query, so a paused draft fetched cross-mode matches
for a search the reader never ran, replaced the tray and its "N related
modes" count, and left those matches disagreeing with the primary cards
still on screen for the last submitted search.

The dashboard now holds the submitted query separately from the draft.
Every submission records the text it submitted, clearing the flag clears
the query with it, and an auto-run URL seeds it so a restored result view
is not blank. Answer mode is unchanged, since it already keyed off the
generated answer's query. Tools and Favourites never record a submission
and fall through to the draft, which is the only query they have.

Prescribing is deliberately left alone. Its medication list is itself
debounced against the same draft, so the tray following the draft agrees
with the cards above it there rather than contradicting them.

tests/universal-also-matches-submitted-query.test.ts pins the derivation,
that only the submission wrapper may write the submitted query, and that
every submission passes its text. 7 passed, and 113 passed across the 13
dashboard, seed, thread and also-matches suites.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0142trjgjRAP2GA9wzqoYUAE
---
 src/components/ClinicalDashboard.tsx          | 33 +++++--
 .../use-answer-thread-bootstrap.ts            |  7 +-
 .../clinical-dashboard/use-home-mode-seed.ts  |  3 +-
 ...ersal-also-matches-submitted-query.test.ts | 86 +++++++++++++++++++
 4 files changed, 120 insertions(+), 9 deletions(-)
 create mode 100644 tests/universal-also-matches-submitted-query.test.ts

diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 44f39da693..2cbfef5445 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -343,9 +343,24 @@ function ClinicalDashboardContent({
     (retainTarget = false) => scheduleComposerFocus(composerInputRef, retainTarget),
     [composerInputRef],
   );
-  const [modeSearchSubmitted, setModeSearchSubmitted] = useState(() =>
+  const [modeSearchSubmitted, setModeSearchSubmittedFlag] = useState(() =>
     Boolean(autoRunSearch && initialQuery.trim() && initialSearchMode !== "tools"),
   );
+  // The query the mode's on-screen results actually belong to, which is NOT `query`:
+  // editing the bottom composer calls `setQuery` alone and leaves both the results and
+  // the submitted flag in place. Anything keyed to the submitted search must read this,
+  // or a paused draft silently replaces it while the primary cards still show the last
+  // submitted search. Null until a submission records one.
+  const [submittedModeQuery, setSubmittedModeQuery] = useState<string | null>(() =>
+    autoRunSearch && initialQuery.trim() && initialSearchMode !== "tools" ? initialQuery.trim() : null,
+  );
+  // Every submission already sets `query` to the text it submitted, so the text is passed
+  // here too rather than read back from state. Clearing the flag clears the query with it.
+  const setModeSearchSubmitted = useCallback((submitted: boolean, submittedText?: string) => {
+    setModeSearchSubmittedFlag(submitted);
+    if (!submitted) setSubmittedModeQuery(null);
+    else if (submittedText !== undefined) setSubmittedModeQuery(submittedText.trim());
+  }, []);
   // focus=1 means "focus on entry", not "keep the dock focused after results".
   // Suppress autofocus once a mode search/answer has been submitted so hide-on-
   // scroll can reclaim chrome on result views (Answer and other bottom docks).
@@ -1861,7 +1876,7 @@ function ClinicalDashboardContent({
     if (modeSearch.resultKind !== "answer") {
       setQuery(trimmedQuery);
     }
-    if (modeSearch.kind !== "tools") setModeSearchSubmitted(true);
+    if (modeSearch.kind !== "tools") setModeSearchSubmitted(true, trimmedQuery);
     if (isDifferentialsMode) clearModeResultState();
 
     if (modeSearch.kind === "tools") {
@@ -2149,7 +2164,7 @@ function ClinicalDashboardContent({
     if (!trimmedSearchText) return;
     setSearchMode("prescribing");
     setQuery(trimmedSearchText);
-    setModeSearchSubmitted(true);
+    setModeSearchSubmitted(true, trimmedSearchText);
     setLoading(false);
     setError(null);
     setAnswerProgress(null);
@@ -2467,7 +2482,7 @@ function ClinicalDashboardContent({
     if (targetMode === "documents") {
       setQuery(trimmedSearchText);
       setSearchMode("documents");
-      setModeSearchSubmitted(true);
+      setModeSearchSubmitted(true, trimmedSearchText);
       setLoading(false);
       setError(null);
       setAnswerProgress(null);
@@ -2495,7 +2510,7 @@ function ClinicalDashboardContent({
 
     setQuery(trimmedSearchText);
     setSearchMode(targetMode);
-    setModeSearchSubmitted(true);
+    setModeSearchSubmitted(true, trimmedSearchText);
     setLoading(true);
     setError(null);
     const targetModeSearch = appModeSearchConfig(targetMode);
@@ -2990,7 +3005,13 @@ function ClinicalDashboardContent({
     activeModeResultKind === "answer" &&
     answerProgressEvents.length > 0 &&
     (loading || (Boolean(answer) && answerProgressCompleted));
-  const universalAlsoMatchesQuery = activeModeResultKind === "answer" ? (latestAnswerQuery ?? query) : query;
+  // Answer mode already keyed off the generated answer's query. Every other mode keys off
+  // the submitted query for the same reason: typing without pressing Enter must not fetch
+  // cross-mode matches for the draft, nor replace the tray and its count with results the
+  // primary cards do not share. Tools and Favourites never record a submission, so they
+  // fall through to `query`, which is the only query they have.
+  const universalAlsoMatchesQuery =
+    activeModeResultKind === "answer" ? (latestAnswerQuery ?? query) : (submittedModeQuery ?? query);
   // Answer-mode also-matches wait for a completed generation (`answer && !loading`)
   // so the panel never sits under the drafting skeleton/stepper. Tools/Favourites
   // still mount on submission. Follow-ups hide the panel while loading so stale
diff --git a/src/components/clinical-dashboard/use-answer-thread-bootstrap.ts b/src/components/clinical-dashboard/use-answer-thread-bootstrap.ts
index 3e97b996a8..de87f1b7bb 100644
--- a/src/components/clinical-dashboard/use-answer-thread-bootstrap.ts
+++ b/src/components/clinical-dashboard/use-answer-thread-bootstrap.ts
@@ -77,7 +77,8 @@ export function useAnswerThreadBootstrap({
   setShowEarlierTurns: Dispatch<SetStateAction<boolean>>;
   setAnswer: Dispatch<SetStateAction<RagAnswer | null>>;
   setSources: Dispatch<SetStateAction<SearchResult[]>>;
-  setModeSearchSubmitted: Dispatch<SetStateAction<boolean>>;
+  /** Also records the submitted query, so a later composer edit cannot pass for a submission. */
+  setModeSearchSubmitted: (submitted: boolean, submittedText?: string) => void;
   setQuery: Dispatch<SetStateAction<string>>;
   setAnswerThreadBootstrapped: Dispatch<SetStateAction<boolean>>;
 }) {
@@ -131,7 +132,9 @@ export function useAnswerThreadBootstrap({
           latestAnswerTurnRef.current = persisted.latestTurn;
           setAnswer(persisted.latestTurn.answer);
           setSources(persisted.latestTurn.sources);
-          setModeSearchSubmitted(true);
+          // Restoring a persisted thread is a submission of that turn's query, not of
+          // whatever happens to be in the composer.
+          setModeSearchSubmitted(true, persisted.latestTurn.query);
           setQuery("");
           autoRunSearchSignatureRef.current = persisted.latestSubmissionSignature;
         }
diff --git a/src/components/clinical-dashboard/use-home-mode-seed.ts b/src/components/clinical-dashboard/use-home-mode-seed.ts
index 0bdd9fe27e..21a677fb2b 100644
--- a/src/components/clinical-dashboard/use-home-mode-seed.ts
+++ b/src/components/clinical-dashboard/use-home-mode-seed.ts
@@ -42,7 +42,8 @@ export function useHomeModeSeed({
   setQuery: Dispatch<SetStateAction<string>>;
   setQueryMode: Dispatch<SetStateAction<ClinicalQueryMode>>;
   setScopeFilters: Dispatch<SetStateAction<SearchScopeFilters>>;
-  setModeSearchSubmitted: Dispatch<SetStateAction<boolean>>;
+  /** Also records the submitted query, so a later composer edit cannot pass for a submission. */
+  setModeSearchSubmitted: (submitted: boolean, submittedText?: string) => void;
   setLoading: Dispatch<SetStateAction<boolean>>;
   setError: Dispatch<SetStateAction<string | null>>;
   setAnswerProgress: Dispatch<SetStateAction<string | null>>;
diff --git a/tests/universal-also-matches-submitted-query.test.ts b/tests/universal-also-matches-submitted-query.test.ts
new file mode 100644
index 0000000000..8ac07c6fa5
--- /dev/null
+++ b/tests/universal-also-matches-submitted-query.test.ts
@@ -0,0 +1,86 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+/**
+ * THE DEFECT. On a phone dashboard result view, editing the bottom composer calls `setQuery`
+ * alone: the results and `modeSearchSubmitted` both stay as they were. The cross-mode
+ * also-matches lookup was keyed on `query`, so a paused draft fetched matches for a search the
+ * reader never ran, replaced the tray and its "N related modes" count, and left those matches
+ * disagreeing with the primary cards still on screen for the last submitted query.
+ *
+ * The fix keys the lookup on the submitted query instead. These assertions read the shipped
+ * source, because the behaviour lives in how ClinicalDashboard derives one value and cannot be
+ * reached without mounting the whole dashboard.
+ */
+const DASHBOARD = readFileSync(join(__dirname, "..", "src/components/ClinicalDashboard.tsx"), "utf8");
+
+function sourceOf(pattern: RegExp): string {
+  const match = DASHBOARD.match(pattern);
+  expect(match, `expected to find ${pattern}`).toBeTruthy();
+  return match![0];
+}
+
+describe("cross-mode also-matches follows the submitted query, not the draft", () => {
+  it("derives the lookup query from submittedModeQuery rather than the live composer query", () => {
+    const derivation = sourceOf(/const universalAlsoMatchesQuery =[\s\S]*?;\n/);
+    expect(derivation).toContain("submittedModeQuery ?? query");
+    // The regression this guards: the whole non-answer arm used to be the bare draft.
+    expect(derivation).not.toMatch(/:\s*query;\s*$/);
+  });
+
+  it("keeps answer mode on the generated answer's query", () => {
+    const derivation = sourceOf(/const universalAlsoMatchesQuery =[\s\S]*?;\n/);
+    expect(derivation).toContain('activeModeResultKind === "answer" ? (latestAnswerQuery ?? query)');
+  });
+
+  it("holds submittedModeQuery separately from query, so typing cannot move it", () => {
+    expect(DASHBOARD).toMatch(/const \[submittedModeQuery, setSubmittedModeQuery\] = useState<string \| null>/);
+    // Nothing may write the submitted query except the submission wrapper, or a composer edit
+    // would reach it after all.
+    const writes = [...DASHBOARD.matchAll(/setSubmittedModeQuery\(/g)];
+    expect(writes.length).toBe(2);
+    const wrapper = sourceOf(/const setModeSearchSubmitted = useCallback\([\s\S]*?\n  \}, \[\]\);/);
+    expect((wrapper.match(/setSubmittedModeQuery\(/g) ?? []).length).toBe(2);
+  });
+
+  it("records the submitted text at every submission, and clears it when submission is cleared", () => {
+    const submissions = [...DASHBOARD.matchAll(/setModeSearchSubmitted\(true[^)]*\)/g)].map((m) => m[0]);
+    expect(submissions.length).toBeGreaterThan(0);
+    // Every submission passes the text it submitted; a bare `true` would leave the previous
+    // query in place and reintroduce the mismatch.
+    for (const call of submissions) {
+      expect(call, `submission without its query: ${call}`).toMatch(/setModeSearchSubmitted\(true, \S+\)/);
+    }
+    const wrapper = sourceOf(/const setModeSearchSubmitted = useCallback\([\s\S]*?\n  \}, \[\]\);/);
+    expect(wrapper).toContain("if (!submitted) setSubmittedModeQuery(null);");
+  });
+
+  it("seeds the submitted query from an auto-run URL, so a restored result view is not blank", () => {
+    const seed = sourceOf(/const \[submittedModeQuery, setSubmittedModeQuery\][\s\S]*?\);\n/);
+    expect(seed).toContain("autoRunSearch");
+    expect(seed).toContain("initialQuery.trim()");
+    expect(seed).toContain('initialSearchMode !== "tools"');
+  });
+});
+
+/**
+ * The lookup itself is gated on this query, so with the draft no longer reaching it, typing
+ * without pressing Enter changes neither the request nor the count.
+ */
+describe("the also-matches lookup is gated on that query", () => {
+  const PANEL = readFileSync(
+    join(__dirname, "..", "src/components/clinical-dashboard/universal-search-also-matches.tsx"),
+    "utf8",
+  );
+
+  it("enables the fetch only from the query it was given", () => {
+    expect(PANEL).toMatch(/enabled: trimmedQuery\.length >= 2 && searchActive/);
+    expect(PANEL).toMatch(/query: trimmedQuery,/);
+  });
+
+  it("renders its count from the same query, so the closed row cannot describe a draft", () => {
+    expect(PANEL).toContain("universal.query === trimmedQuery");
+  });
+});

From 61bd00fb42d1f331e69a49077b00ee7a2a0911d0 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Thu, 10 Sep 2026 23:55:13 +0800
Subject: [PATCH 28/35] Extract submitted-search state to keep the dashboard
 within its budget

---
 src/components/ClinicalDashboard.tsx          | 34 +++++--------------
 .../clinical-dashboard-helpers.ts             | 10 +++++-
 .../use-submitted-mode-search.ts              | 33 ++++++++++++++++++
 ...ersal-also-matches-submitted-query.test.ts | 22 ++++++++----
 tests/use-submitted-mode-search.dom.test.tsx  | 30 ++++++++++++++++
 5 files changed, 95 insertions(+), 34 deletions(-)
 create mode 100644 src/components/clinical-dashboard/use-submitted-mode-search.ts
 create mode 100644 tests/use-submitted-mode-search.dom.test.tsx

diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 5314449b85..51265086b5 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -1,4 +1,6 @@
 "use client";
+
+import { useSubmittedModeSearch } from "@/components/clinical-dashboard/use-submitted-mode-search";
 import { useSettingsState } from "./clinical-dashboard/SettingsStateProvider";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import {
@@ -112,6 +114,7 @@ import {
 import { SearchCommandProvider } from "@/components/clinical-dashboard/search-command-context";
 import {
   answerReferencesDocument,
+  resultUsable,
   applyRenamedDocumentToAnswer,
   compactScopeFilters,
   hasActiveIndexingWork,
@@ -179,7 +182,6 @@ import { useAppPreferences } from "@/components/clinical-dashboard/use-app-prefe
 import type { SearchFacets } from "@/components/clinical-dashboard/document-search-results";
 import { isWeakRelevance } from "@/components/clinical-dashboard/relevance";
 import {
-  answerPayloadIsUsable,
   classifyAnswerError,
   createAnswerRequestWatchdog,
   generateQuerySuggestions,
@@ -343,24 +345,11 @@ function ClinicalDashboardContent({
     (retainTarget = false) => scheduleComposerFocus(composerInputRef, retainTarget),
     [composerInputRef],
   );
-  const [modeSearchSubmitted, setModeSearchSubmittedFlag] = useState(() =>
-    Boolean(autoRunSearch && initialQuery.trim() && initialSearchMode !== "tools"),
-  );
-  // The query the mode's on-screen results actually belong to, which is NOT `query`:
-  // editing the bottom composer calls `setQuery` alone and leaves both the results and
-  // the submitted flag in place. Anything keyed to the submitted search must read this,
-  // or a paused draft silently replaces it while the primary cards still show the last
-  // submitted search. Null until a submission records one.
-  const [submittedModeQuery, setSubmittedModeQuery] = useState<string | null>(() =>
-    autoRunSearch && initialQuery.trim() && initialSearchMode !== "tools" ? initialQuery.trim() : null,
-  );
-  // Every submission already sets `query` to the text it submitted, so the text is passed
-  // here too rather than read back from state. Clearing the flag clears the query with it.
-  const setModeSearchSubmitted = useCallback((submitted: boolean, submittedText?: string) => {
-    setModeSearchSubmittedFlag(submitted);
-    if (!submitted) setSubmittedModeQuery(null);
-    else if (submittedText !== undefined) setSubmittedModeQuery(submittedText.trim());
-  }, []);
+  const { modeSearchSubmitted, submittedModeQuery, setModeSearchSubmitted } = useSubmittedModeSearch({
+    autoRunSearch,
+    initialQuery,
+    initialSearchMode,
+  });
   // focus=1 means "focus on entry", not "keep the dock focused after results".
   // Suppress autofocus once a mode search/answer has been submitted so hide-on-
   // scroll can reclaim chrome on result views (Answer and other bottom docks).
@@ -1760,13 +1749,6 @@ function ClinicalDashboardContent({
     throw lastError;
   }
 
-  function resultUsable(payload: SearchResultModePayload) {
-    if (payload.kind === "documents") {
-      return payload.sources.length > 0 || payload.documentMatches.length > 0;
-    }
-    return answerPayloadIsUsable(payload.payload);
-  }
-
   // Audit M10: monotonically increasing token identifying the latest search.
   // Concurrent searches (URL-bootstrap auto-search racing a user submit) can
   // resolve out of order; only the latest request may commit answer/sources/
diff --git a/src/components/clinical-dashboard/clinical-dashboard-helpers.ts b/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
index 3d3b69af2f..7996b17ae1 100644
--- a/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
+++ b/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
@@ -1,3 +1,4 @@
+import type { SearchResultModePayload } from "@/components/clinical-dashboard/clinical-dashboard-payloads";
 // Pure domain helpers extracted from ClinicalDashboard.tsx (#51 — centralise
 // domain logic into a reusable, unit-tested module). These are verbatim moves:
 // behaviour is unchanged, and the module is framework-free (no React) so each
@@ -6,7 +7,7 @@
 
 import type { SetupCheck } from "@/components/clinical-dashboard/DocumentManagerPanel";
 import { navigationHashes } from "@/components/clinical-dashboard/dashboard-contracts";
-import { makeSearchError } from "@/components/clinical-dashboard/search-utils";
+import { answerPayloadIsUsable, makeSearchError } from "@/components/clinical-dashboard/search-utils";
 import type { ClinicalDocument, ImportBatch, IngestionJob, RagAnswer, RelatedDocument } from "@/lib/types";
 import type { SearchScopeFilters } from "@/lib/search-scope";
 import type { ClinicalQueryMode } from "@/lib/clinical-query-mode";
@@ -251,3 +252,10 @@ export function mergeDocumentRefresh(current: ClinicalDocument[], updates: Clini
     };
   });
 }
+
+export function resultUsable(payload: SearchResultModePayload) {
+  if (payload.kind === "documents") {
+    return payload.sources.length > 0 || payload.documentMatches.length > 0;
+  }
+  return answerPayloadIsUsable(payload.payload);
+}
diff --git a/src/components/clinical-dashboard/use-submitted-mode-search.ts b/src/components/clinical-dashboard/use-submitted-mode-search.ts
new file mode 100644
index 0000000000..7490b50dd2
--- /dev/null
+++ b/src/components/clinical-dashboard/use-submitted-mode-search.ts
@@ -0,0 +1,33 @@
+import { useCallback, useState } from "react";
+import type { AppModeId } from "@/lib/app-modes";
+
+/** Keeps the visible results attached to their submitted query while the composer is edited. */
+export function useSubmittedModeSearch({
+  autoRunSearch,
+  initialQuery,
+  initialSearchMode,
+}: {
+  autoRunSearch?: boolean;
+  initialQuery: string;
+  initialSearchMode: AppModeId;
+}) {
+  const [modeSearchSubmitted, setModeSearchSubmittedFlag] = useState(() =>
+    Boolean(autoRunSearch && initialQuery.trim() && initialSearchMode !== "tools"),
+  );
+  // The query the mode's on-screen results actually belong to, which is NOT `query`:
+  // editing the bottom composer calls `setQuery` alone and leaves both the results and
+  // the submitted flag in place. Anything keyed to the submitted search must read this,
+  // or a paused draft silently replaces it while the primary cards still show the last
+  // submitted search. Null until a submission records one.
+  const [submittedModeQuery, setSubmittedModeQuery] = useState<string | null>(() =>
+    autoRunSearch && initialQuery.trim() && initialSearchMode !== "tools" ? initialQuery.trim() : null,
+  );
+  // Every submission already sets `query` to the text it submitted, so the text is passed
+  // here too rather than read back from state. Clearing the flag clears the query with it.
+  const setModeSearchSubmitted = useCallback((submitted: boolean, submittedText?: string) => {
+    setModeSearchSubmittedFlag(submitted);
+    if (!submitted) setSubmittedModeQuery(null);
+    else if (submittedText !== undefined) setSubmittedModeQuery(submittedText.trim());
+  }, []);
+  return { modeSearchSubmitted, submittedModeQuery, setModeSearchSubmitted };
+}
diff --git a/tests/universal-also-matches-submitted-query.test.ts b/tests/universal-also-matches-submitted-query.test.ts
index 8ac07c6fa5..0e674a3fd4 100644
--- a/tests/universal-also-matches-submitted-query.test.ts
+++ b/tests/universal-also-matches-submitted-query.test.ts
@@ -16,8 +16,13 @@ import { describe, expect, it } from "vitest";
  */
 const DASHBOARD = readFileSync(join(__dirname, "..", "src/components/ClinicalDashboard.tsx"), "utf8");
 
-function sourceOf(pattern: RegExp): string {
-  const match = DASHBOARD.match(pattern);
+const SUBMITTED_SEARCH = readFileSync(
+  join(__dirname, "..", "src/components/clinical-dashboard/use-submitted-mode-search.ts"),
+  "utf8",
+);
+
+function sourceOf(pattern: RegExp, source = DASHBOARD): string {
+  const match = source.match(pattern);
   expect(match, `expected to find ${pattern}`).toBeTruthy();
   return match![0];
 }
@@ -36,12 +41,15 @@ describe("cross-mode also-matches follows the submitted query, not the draft", (
   });
 
   it("holds submittedModeQuery separately from query, so typing cannot move it", () => {
-    expect(DASHBOARD).toMatch(/const \[submittedModeQuery, setSubmittedModeQuery\] = useState<string \| null>/);
+    expect(DASHBOARD).toContain(
+      "const { modeSearchSubmitted, submittedModeQuery, setModeSearchSubmitted } = useSubmittedModeSearch({",
+    );
+    expect(SUBMITTED_SEARCH).toMatch(/const \[submittedModeQuery, setSubmittedModeQuery\] = useState<string \| null>/);
     // Nothing may write the submitted query except the submission wrapper, or a composer edit
     // would reach it after all.
-    const writes = [...DASHBOARD.matchAll(/setSubmittedModeQuery\(/g)];
+    const writes = [...SUBMITTED_SEARCH.matchAll(/setSubmittedModeQuery\(/g)];
     expect(writes.length).toBe(2);
-    const wrapper = sourceOf(/const setModeSearchSubmitted = useCallback\([\s\S]*?\n  \}, \[\]\);/);
+    const wrapper = sourceOf(/const setModeSearchSubmitted = useCallback\([\s\S]*?\n  \}, \[\]\);/, SUBMITTED_SEARCH);
     expect((wrapper.match(/setSubmittedModeQuery\(/g) ?? []).length).toBe(2);
   });
 
@@ -53,12 +61,12 @@ describe("cross-mode also-matches follows the submitted query, not the draft", (
     for (const call of submissions) {
       expect(call, `submission without its query: ${call}`).toMatch(/setModeSearchSubmitted\(true, \S+\)/);
     }
-    const wrapper = sourceOf(/const setModeSearchSubmitted = useCallback\([\s\S]*?\n  \}, \[\]\);/);
+    const wrapper = sourceOf(/const setModeSearchSubmitted = useCallback\([\s\S]*?\n  \}, \[\]\);/, SUBMITTED_SEARCH);
     expect(wrapper).toContain("if (!submitted) setSubmittedModeQuery(null);");
   });
 
   it("seeds the submitted query from an auto-run URL, so a restored result view is not blank", () => {
-    const seed = sourceOf(/const \[submittedModeQuery, setSubmittedModeQuery\][\s\S]*?\);\n/);
+    const seed = sourceOf(/const \[submittedModeQuery, setSubmittedModeQuery\][\s\S]*?\);\n/, SUBMITTED_SEARCH);
     expect(seed).toContain("autoRunSearch");
     expect(seed).toContain("initialQuery.trim()");
     expect(seed).toContain('initialSearchMode !== "tools"');
diff --git a/tests/use-submitted-mode-search.dom.test.tsx b/tests/use-submitted-mode-search.dom.test.tsx
new file mode 100644
index 0000000000..5568ba1a8b
--- /dev/null
+++ b/tests/use-submitted-mode-search.dom.test.tsx
@@ -0,0 +1,30 @@
+import { act, renderHook } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { useSubmittedModeSearch } from "@/components/clinical-dashboard/use-submitted-mode-search";
+
+describe("submitted mode search state", () => {
+  it("retains the submitted query when initial composer props change and clears it explicitly", () => {
+    const { result, rerender } = renderHook(
+      ({ initialQuery }) =>
+        useSubmittedModeSearch({ autoRunSearch: true, initialQuery, initialSearchMode: "documents" }),
+      { initialProps: { initialQuery: "  original search  " } },
+    );
+    expect(result.current.submittedModeQuery).toBe("original search");
+    rerender({ initialQuery: "an unsubmitted draft" });
+    expect(result.current.submittedModeQuery).toBe("original search");
+    act(() => result.current.setModeSearchSubmitted(true, "  next submission  "));
+    expect(result.current.submittedModeQuery).toBe("next submission");
+    expect(result.current.modeSearchSubmitted).toBe(true);
+    act(() => result.current.setModeSearchSubmitted(false));
+    expect(result.current.submittedModeQuery).toBeNull();
+    expect(result.current.modeSearchSubmitted).toBe(false);
+  });
+
+  it("does not seed a submitted result for tools", () => {
+    const { result } = renderHook(() =>
+      useSubmittedModeSearch({ autoRunSearch: true, initialQuery: "query", initialSearchMode: "tools" }),
+    );
+    expect(result.current.modeSearchSubmitted).toBe(false);
+    expect(result.current.submittedModeQuery).toBeNull();
+  });
+});

From 9dc14120d480df8cd8da8c5da4ebcd4e8015aeef Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 12 Sep 2026 04:03:26 +0000
Subject: [PATCH 29/35] Resolve dashboard mergeability against main

---
 .../clinical-dashboard/clinical-dashboard-helpers.ts     | 9 +++++----
 .../clinical-dashboard/use-answer-thread-bootstrap.ts    | 6 +++---
 src/lib/answer-client-payload.ts                         | 3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/clinical-dashboard/clinical-dashboard-helpers.ts b/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
index 7996b17ae1..4c2447a10f 100644
--- a/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
+++ b/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
@@ -8,7 +8,8 @@ import type { SearchResultModePayload } from "@/components/clinical-dashboard/cl
 import type { SetupCheck } from "@/components/clinical-dashboard/DocumentManagerPanel";
 import { navigationHashes } from "@/components/clinical-dashboard/dashboard-contracts";
 import { answerPayloadIsUsable, makeSearchError } from "@/components/clinical-dashboard/search-utils";
-import type { ClinicalDocument, ImportBatch, IngestionJob, RagAnswer, RelatedDocument } from "@/lib/types";
+import type { ClientRagAnswerPayload } from "@/lib/answer-client-payload";
+import type { ClinicalDocument, ImportBatch, IngestionJob, RelatedDocument } from "@/lib/types";
 import type { SearchScopeFilters } from "@/lib/search-scope";
 import type { ClinicalQueryMode } from "@/lib/clinical-query-mode";
 
@@ -165,7 +166,7 @@ export function answerTimedOutError() {
   return makeSearchError("Answer generation timed out. Please try again.", 408, false);
 }
 
-export function answerReferencesDocument(answer: RagAnswer | null, documentId: string) {
+export function answerReferencesDocument(answer: ClientRagAnswerPayload | null, documentId: string) {
   if (!answer) return false;
   // Detection must cover every field applyRenamedDocumentToAnswer rewrites
   // (incl. quoteCards and the nested smartPanel), otherwise a document referenced
@@ -182,7 +183,7 @@ export function answerReferencesDocument(answer: RagAnswer | null, documentId: s
   );
 }
 
-export function applyRenamedDocumentToAnswer(answer: RagAnswer | null, document: ClinicalDocument) {
+export function applyRenamedDocumentToAnswer(answer: ClientRagAnswerPayload | null, document: ClinicalDocument) {
   if (!answer || !answerReferencesDocument(answer, document.id)) return answer;
   const renameCitation = <T extends { document_id: string; title: string }>(item: T): T =>
     item.document_id === document.id ? { ...item, title: document.title } : item;
@@ -206,7 +207,7 @@ export function applyRenamedDocumentToAnswer(answer: RagAnswer | null, document:
           relatedDocuments: answer.smartPanel.relatedDocuments?.map(renameRelated),
         }
       : answer.smartPanel,
-  } satisfies RagAnswer;
+  } satisfies ClientRagAnswerPayload;
 }
 
 export function normalizedPollDelay(value: unknown) {
diff --git a/src/components/clinical-dashboard/use-answer-thread-bootstrap.ts b/src/components/clinical-dashboard/use-answer-thread-bootstrap.ts
index de87f1b7bb..581cdb7cf4 100644
--- a/src/components/clinical-dashboard/use-answer-thread-bootstrap.ts
+++ b/src/components/clinical-dashboard/use-answer-thread-bootstrap.ts
@@ -8,7 +8,7 @@ import {
   type PersistedAnswerThread,
   type StoredAnswerTurn,
 } from "@/lib/answer-thread-storage";
-import type { RagAnswer, SearchResult } from "@/lib/types";
+import type { ClientRagAnswerPayload, ClientSearchResult } from "@/lib/answer-client-payload";
 
 import type { AnswerThreadSnapshotMetadata } from "@/components/clinical-dashboard/use-persisted-answer-thread";
 
@@ -75,8 +75,8 @@ export function useAnswerThreadBootstrap({
   setLatestAnswerQuery: Dispatch<SetStateAction<string | null>>;
   setCollapsedTurnIds: Dispatch<SetStateAction<Set<string>>>;
   setShowEarlierTurns: Dispatch<SetStateAction<boolean>>;
-  setAnswer: Dispatch<SetStateAction<RagAnswer | null>>;
-  setSources: Dispatch<SetStateAction<SearchResult[]>>;
+  setAnswer: Dispatch<SetStateAction<ClientRagAnswerPayload | null>>;
+  setSources: Dispatch<SetStateAction<ClientSearchResult[]>>;
   /** Also records the submitted query, so a later composer edit cannot pass for a submission. */
   setModeSearchSubmitted: (submitted: boolean, submittedText?: string) => void;
   setQuery: Dispatch<SetStateAction<string>>;
diff --git a/src/lib/answer-client-payload.ts b/src/lib/answer-client-payload.ts
index 6ef28073c2..a66c8b66b7 100644
--- a/src/lib/answer-client-payload.ts
+++ b/src/lib/answer-client-payload.ts
@@ -1,5 +1,8 @@
 import type { RagAnswer, SearchResult } from "@/lib/types";
 
+export type ClientRagAnswerPayload = RagAnswer;
+export type ClientSearchResult = SearchResult;
+
 // Route-boundary trim of the answer payload. The retrieval pipeline carries
 // full chunk text plus server-only context on every source (adjacent_context
 // for generation packing, memory cards, table facts, index-unit matches,

From 979d8f1c41255025ae46b8061807327f330120e8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 12 Sep 2026 04:28:54 +0000
Subject: [PATCH 30/35] Apply remaining changes

Co-authored-by: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
---
 ...d3416570da8f44a38d5e93ce2ed8360c1fea3accdb774c7d119.record.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/branch-review-records/f2b44a47e1762d3416570da8f44a38d5e93ce2ed8360c1fea3accdb774c7d119.record.md

diff --git a/docs/branch-review-records/f2b44a47e1762d3416570da8f44a38d5e93ce2ed8360c1fea3accdb774c7d119.record.md b/docs/branch-review-records/f2b44a47e1762d3416570da8f44a38d5e93ce2ed8360c1fea3accdb774c7d119.record.md
new file mode 100644
index 0000000000..56a5e29f26
--- /dev/null
+++ b/docs/branch-review-records/f2b44a47e1762d3416570da8f44a38d5e93ce2ed8360c1fea3accdb774c7d119.record.md
@@ -0,0 +1 @@
+| 2026-09-12 | claude/answer-mode-coverage-gap-ilcwui | 9dc14120d480df8cd8da8c5da4ebcd4e8015aeef | approval review | Approved. No high-confidence P0-P2 defects in the HEAD^..HEAD static diff; change is type-only alias wiring for client-trimmed answer payloads. Residual risk: local Vitest is unavailable in this checkout (missing node_modules/vitest) and origin/main is absent, so this pass did not re-validate or diff the broader branch. | ledger:lookup NOT REVIEWED; static review of HEAD^..HEAD for clinical-dashboard-helpers.ts, use-answer-thread-bootstrap.ts, answer-client-payload.ts; npm run test:focused rejected direct test-file selection by design; npm run test -- targeted files blocked: missing node_modules/vitest/vitest.mjs; no provider-backed checks run |

From 6d961f0d6df4f06708b567402479b5b1ee9dfcd4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 12 Sep 2026 04:53:54 +0000
Subject: [PATCH 31/35] Fix merged client payload type duplication

---
 src/lib/answer-client-payload.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/lib/answer-client-payload.ts b/src/lib/answer-client-payload.ts
index 31bc146942..f325254d54 100644
--- a/src/lib/answer-client-payload.ts
+++ b/src/lib/answer-client-payload.ts
@@ -26,9 +26,6 @@ import type {
 
 export type ClientDocumentMatch = Omit<DocumentMatch, "labels"> & { labels: ClientDocumentLabel[] };
 
-export type ClientRagAnswerPayload = RagAnswer;
-export type ClientSearchResult = SearchResult;
-
 // Route-boundary trim of the answer payload. The retrieval pipeline carries
 // full chunk text plus server-only context on every source (adjacent_context
 // for generation packing, memory cards, table facts, index-unit matches,

From e1d38f87b4a3b13e6f2d91fc24e530944abe4362 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 12 Sep 2026 05:01:52 +0000
Subject: [PATCH 32/35] Fix client payload merge resolution

---
 .../clinical-dashboard-helpers.ts             | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/components/clinical-dashboard/clinical-dashboard-helpers.ts b/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
index 4c2447a10f..6447d60a4f 100644
--- a/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
+++ b/src/components/clinical-dashboard/clinical-dashboard-helpers.ts
@@ -9,7 +9,7 @@ import type { SetupCheck } from "@/components/clinical-dashboard/DocumentManager
 import { navigationHashes } from "@/components/clinical-dashboard/dashboard-contracts";
 import { answerPayloadIsUsable, makeSearchError } from "@/components/clinical-dashboard/search-utils";
 import type { ClientRagAnswerPayload } from "@/lib/answer-client-payload";
-import type { ClinicalDocument, ImportBatch, IngestionJob, RelatedDocument } from "@/lib/types";
+import type { ClinicalDocument, ImportBatch, IngestionJob } from "@/lib/types";
 import type { SearchScopeFilters } from "@/lib/search-scope";
 import type { ClinicalQueryMode } from "@/lib/clinical-query-mode";
 
@@ -169,7 +169,7 @@ export function answerTimedOutError() {
 export function answerReferencesDocument(answer: ClientRagAnswerPayload | null, documentId: string) {
   if (!answer) return false;
   // Detection must cover every field applyRenamedDocumentToAnswer rewrites
-  // (incl. quoteCards and the nested smartPanel), otherwise a document referenced
+  // (including quote cards and related documents), otherwise a document referenced
   // only there is guarded out and keeps its stale title after a rename.
   return (
     answer.citations.some((citation) => citation.document_id === documentId) ||
@@ -177,9 +177,7 @@ export function answerReferencesDocument(answer: ClientRagAnswerPayload | null,
     Boolean(answer.quoteCards?.some((card) => card.document_id === documentId)) ||
     Boolean(answer.bestSource?.document_id === documentId) ||
     Boolean(answer.relatedDocuments?.some((document) => document.document_id === documentId)) ||
-    Boolean(answer.visualEvidence?.some((image) => image.document_id === documentId)) ||
-    Boolean(answer.smartPanel?.bestSource?.document_id === documentId) ||
-    Boolean(answer.smartPanel?.relatedDocuments?.some((document) => document.document_id === documentId))
+    Boolean(answer.visualEvidence?.some((image) => image.document_id === documentId))
   );
 }
 
@@ -187,8 +185,6 @@ export function applyRenamedDocumentToAnswer(answer: ClientRagAnswerPayload | nu
   if (!answer || !answerReferencesDocument(answer, document.id)) return answer;
   const renameCitation = <T extends { document_id: string; title: string }>(item: T): T =>
     item.document_id === document.id ? { ...item, title: document.title } : item;
-  const renameRelated = (item: RelatedDocument): RelatedDocument =>
-    item.document_id === document.id ? { ...item, title: document.title } : item;
 
   return {
     ...answer,
@@ -197,16 +193,7 @@ export function applyRenamedDocumentToAnswer(answer: ClientRagAnswerPayload | nu
     sources: answer.sources.map(renameCitation),
     visualEvidence: answer.visualEvidence?.map(renameCitation),
     bestSource: answer.bestSource ? renameCitation(answer.bestSource) : answer.bestSource,
-    relatedDocuments: answer.relatedDocuments?.map(renameRelated),
-    smartPanel: answer.smartPanel
-      ? {
-          ...answer.smartPanel,
-          bestSource: answer.smartPanel.bestSource
-            ? renameCitation(answer.smartPanel.bestSource)
-            : answer.smartPanel.bestSource,
-          relatedDocuments: answer.smartPanel.relatedDocuments?.map(renameRelated),
-        }
-      : answer.smartPanel,
+    relatedDocuments: answer.relatedDocuments?.map(renameCitation),
   } satisfies ClientRagAnswerPayload;
 }
 

From 7b85f05cc9b00215566a139a276244ae62765e0f Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 12 Sep 2026 08:18:20 +0000
Subject: [PATCH 33/35] refactor(search): split ClinicalDashboard under
 maintainability budget
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extract bottom-nav item building and composer/also-matches/phone-reserve
surface flags into dashboard-mode-surface.ts so ClinicalDashboard.tsx
stays under the 4140-line no-growth budget (4153 → 4002). Pure move; no
behaviour change.
---
 src/components/ClinicalDashboard.tsx          | 280 +++-----------
 .../dashboard-mode-surface.ts                 | 359 ++++++++++++++++++
 2 files changed, 422 insertions(+), 217 deletions(-)
 create mode 100644 src/components/clinical-dashboard/dashboard-mode-surface.ts

diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 983d7ad4bd..0bd1163fd8 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -8,17 +8,13 @@ import {
   BookOpen,
   Clock3,
   ExternalLink,
-  FileImage,
   FileText,
   FolderOpen,
-  Heart,
   ListChecks,
-  Quote,
   RefreshCw,
   Search,
   ShieldAlert,
   Activity,
-  Wrench,
 } from "lucide-react";
 import {
   type CSSProperties,
@@ -61,6 +57,10 @@ import { useScopeFilterRelax } from "@/components/clinical-dashboard/use-scope-f
 import { useApplyFilters } from "@/components/clinical-dashboard/use-apply-filters";
 import { AuthPanel } from "@/components/clinical-dashboard/auth-panel";
 import { buildMobileSectionFabState, MobileSectionFab, ToolsHub } from "@/components/clinical-dashboard/dashboard-nav";
+import {
+  buildDashboardBottomNavItems,
+  resolveDashboardModeSurface,
+} from "@/components/clinical-dashboard/dashboard-mode-surface";
 import * as SidebarDialogs from "@/components/clinical-dashboard/lazy-sidebar-dialogs";
 import { useSettingsGuideFlow } from "@/components/clinical-dashboard/use-settings-guide-flow";
 import {
@@ -73,7 +73,6 @@ import {
   fallbackSetupChecks,
   hasReadyRequiredPublicSearchConfig,
   hasReadyPublicSearchSetup,
-  shouldShowDashboardDegradedNotice,
   type SetupCheck,
   type IngestionQualityReviewItem,
 } from "@/components/clinical-dashboard/document-manager-contracts";
@@ -98,11 +97,6 @@ import {
 import { requestAnswerStream } from "@/components/clinical-dashboard/answer-request";
 import { MasterSearchHeader } from "@/components/clinical-dashboard/master-search-header";
 import { PhoneFooterLayerFrame } from "@/components/clinical-dashboard/phone-footer-layer-portal";
-import {
-  mobileComposerIdleReserve,
-  resolveDashboardVisibleMobileComposerReserve,
-  resolveMobileComposerReserve,
-} from "@/components/clinical-dashboard/mobile-composer-reserve";
 import { UniversalSearchAlsoMatches } from "@/components/clinical-dashboard/universal-search-also-matches";
 import { FavouritesGuestGate } from "@/components/clinical-dashboard/favourites-guest-gate";
 import { useDashboardShellActions } from "@/components/clinical-dashboard/use-dashboard-shell-actions";
@@ -124,7 +118,6 @@ import {
   replaceOwnedAbortController,
   mergeDocumentRefresh,
   normalizeNavigationHash,
-  shouldShowSharedHome,
   setupNeedsSlowRecheck,
   setupRecheckPollMs,
   shorterPollDelay,
@@ -269,12 +262,7 @@ import type {
 } from "@/lib/types";
 import type { SearchScopeFilters } from "@/lib/search-scope";
 import { DashboardDesktopResultComposerSlot } from "@/components/clinical-dashboard/dashboard-desktop-result-composer-slot";
-import {
-  desktopPageComposerSlotId,
-  differentialsMobileCompareAddonSlotId,
-  patientDetailsAddonSlotId,
-  modeHomeDesktopComposerSlotId,
-} from "@/lib/mode-home-composer";
+import { differentialsMobileCompareAddonSlotId, patientDetailsAddonSlotId } from "@/lib/mode-home-composer";
 import { toolCatalogRecords } from "@/lib/tools-catalog";
 import { createQuoteFollowUp, type AnswerViewMode, shouldPollForUpdates } from "@/lib/ward-output";
 import {
@@ -2892,91 +2880,66 @@ function ClinicalDashboardContent({
       }),
     [answer, answerRenderModel, groupedGovernanceWarningCount, searchMode, sources.length, weakEvidence],
   );
-  const bottomNavItems = [
-    {
-      label: activeModeSearch.statusLabel,
-      description:
-        activeModeResultKind === "tools"
-          ? query.trim()
-            ? "Filtered tools"
-            : "Browse tools"
-          : activeModeResultKind === "favourites"
-            ? query.trim()
-              ? "Filtered favourites"
-              : "Browse favourites"
-            : activeModeResultKind === "answer"
-              ? answer
-                ? weakEvidence
-                  ? "Read synthesis carefully"
-                  : "Clinical synthesis"
-                : activeModeSearch.nextStep
-              : documentMatches.length
-                ? "Document results"
-                : activeModeSearch.readyTitle,
-      icon:
-        activeModeResultKind === "tools"
-          ? Wrench
-          : activeModeResultKind === "favourites"
-            ? Heart
-            : activeModeResultKind === "answer"
-              ? Search
-              : FileText,
-      href: "#search",
-      count:
-        activeModeResultKind === "tools"
-          ? toolCatalogRecords.length
-          : activeModeResultKind === "favourites"
-            ? null
-            : activeModeResultKind === "documents"
-              ? documentMatches.length
-              : null,
-      empty: activeModeResultKind === "documents" && documentMatches.length === 0,
-    },
-    {
-      label: "Quotes",
-      description: answer
-        ? answerRenderModel?.quoteCards.length
-          ? "Exact source excerpts"
-          : "No quotes yet"
-        : "No quotes yet",
-      icon: Quote,
-      href: "#quotes",
-      count: answer ? (answerRenderModel?.quoteCards.length ?? 0) : null,
-      empty: !answer || (answerRenderModel?.quoteCards.length ?? 0) === 0,
-    },
-    {
-      label: "Images",
-      description: answer ? (visualEvidence.length ? "Tables and diagrams" : "No images yet") : "No images yet",
-      icon: FileImage,
-      href: "#images",
-      count: answer ? visualEvidence.length : null,
-      empty: !answer || visualEvidence.length === 0,
-    },
-    {
-      label: "Sources",
-      description: answer
-        ? answerRenderModel?.reviewSources.length
-          ? "Passages and documents"
-          : "No sources yet"
-        : "No sources yet",
-      icon: FileText,
-      href: "#sources",
-      count: answer ? (answerRenderModel?.reviewSources.length ?? 0) : null,
-      empty: !answer || (answerRenderModel?.reviewSources.length ?? 0) === 0,
-    },
-  ] as const;
-  const showAuthPanel = false;
-  const showDegradedNotice = shouldShowDashboardDegradedNotice({ isOnline, apiUnavailable, canRunSearch });
-  const submittedAnswerSearchActive =
-    activeModeResultKind === "answer" && !answer && canRunSearch && (modeSearchSubmitted || Boolean(submittedUrlQuery));
-  const showSharedHome = shouldShowSharedHome({
+  const bottomNavItems = buildDashboardBottomNavItems({
+    activeModeResultKind,
+    activeModeSearch,
+    answer,
+    documentMatchCount: documentMatches.length,
+    query,
+    quoteCount: answerRenderModel?.quoteCards.length ?? 0,
+    reviewSourceCount: answerRenderModel?.reviewSources.length ?? 0,
+    toolCatalogCount: toolCatalogRecords.length,
+    visualEvidenceCount: visualEvidence.length,
+    weakEvidence,
+  });
+  const answerProgressCompleted = answerProgressEvents.at(-1)?.stage === "complete";
+  const {
+    showAuthPanel,
+    showDegradedNotice,
+    showSharedHome,
+    showAnswerCancelledNotice,
+    showAnswerPending,
+    showAnswerProgress,
+    universalAlsoMatchesQuery,
+    showUniversalAlsoMatches,
+    toolsDirectoryWithoutComposer,
+    desktopHomeComposerSlotId,
+    desktopResultComposerSlotId,
+    heroComposerBreakpoint,
+    heroOwnsPhoneComposer,
+    hasMobileBottomSearch,
+    openSidebarSearch,
+    centeredModeHome,
+    compactMobileModeHome,
+    differentialsCompareAddonActive,
+    patientDetailsAddonActive,
+    mobileComposerReserve,
+  } = resolveDashboardModeSurface({
+    activeModeResultKind,
+    answer,
+    answerFollowUpSuggestionCount: answerFollowUpSuggestions.length,
+    answerLifecycleStatus: answerLifecycle.status,
+    answerProgressCompleted,
+    answerProgressEventCount: answerProgressEvents.length,
+    apiUnavailable,
+    bottomComposerHidden,
+    canRunSearch,
+    documentMatchCount: documentMatches.length,
+    error,
+    favouritesAccessible,
+    focusComposerInput,
+    isOnline,
+    latestAnswerQuery,
+    loading,
+    modeSearchSubmitted,
     pathname,
-    mode: searchParams.get("mode"),
+    query,
+    searchMode,
+    startNewChat,
+    submittedModeQuery,
+    submittedUrlMode: searchParams.get("mode"),
+    submittedUrlQuery,
     submittedUrlRunRequested,
-    hasError: Boolean(error),
-    hasAnswer: Boolean(answer),
-    loading,
-    submittedAnswerSearchActive,
   });
   // The mode pill rewrites the shared-home URL with history.replaceState rather
   // than asking Next to navigate. Server metadata therefore cannot update after
@@ -2985,123 +2948,6 @@ function ClinicalDashboardContent({
   useEffect(() => {
     if (showSharedHome) document.title = sharedHomeDocumentTitle(searchMode);
   }, [searchMode, showSharedHome]);
-  // A stopped generation reports on the last action rather than describing the
-  // page, so the notice renders at the top of the content column while this same
-  // condition still short-circuits the mode-home empty-state chain below.
-  const showAnswerCancelledNotice = answerLifecycle.status === "cancelled" && activeModeResultKind === "answer";
-  // `submittedAnswerSearchActive` stays true after the reader presses Stop, and a
-  // cancel is not an `error`, so without the cancelled guard the pending branch
-  // held its skeleton on screen indefinitely — a shimmering placeholder promising
-  // an answer that was already abandoned, directly beneath the notice saying so.
-  const showAnswerPending =
-    activeModeResultKind === "answer" &&
-    !answer &&
-    !showAnswerCancelledNotice &&
-    (loading || (submittedAnswerSearchActive && !error));
-  const answerProgressCompleted = answerProgressEvents.at(-1)?.stage === "complete";
-  const showAnswerProgress =
-    activeModeResultKind === "answer" &&
-    answerProgressEvents.length > 0 &&
-    (loading || (Boolean(answer) && answerProgressCompleted));
-  // Answer mode already keyed off the generated answer's query. Every other mode keys off
-  // the submitted query for the same reason: typing without pressing Enter must not fetch
-  // cross-mode matches for the draft, nor replace the tray and its count with results the
-  // primary cards do not share. Tools and Favourites never record a submission, so they
-  // fall through to `query`, which is the only query they have.
-  const universalAlsoMatchesQuery =
-    activeModeResultKind === "answer" ? (latestAnswerQuery ?? query) : (submittedModeQuery ?? query);
-  // Answer-mode also-matches wait for a completed generation (`answer && !loading`)
-  // so the panel never sits under the drafting skeleton/stepper. Tools/Favourites
-  // still mount on submission. Follow-ups hide the panel while loading so stale
-  // matches for the prior query do not compete with the new Drafting stepper.
-  const showUniversalAlsoMatches =
-    !showSharedHome &&
-    // Prescribing declares `resultKind: "documents"` on purpose (it searches the
-    // indexed sources, not a forms table), so the documents arm below matches it
-    // and this dashboard would mount a SECOND panel over the one
-    // MedicationPrescribingWorkspace already renders under the medication list.
-    // The workspace owns the mount, because only it knows where the result list
-    // ends; the mode is named here rather than the result kind, because the kind
-    // is shared and the ownership is not. `tests/ui-stress.spec.ts` pins the count
-    // at one on `/?mode=prescribing`, which is how the duplicate was caught.
-    searchMode !== "prescribing" &&
-    Boolean(universalAlsoMatchesQuery.trim()) &&
-    (activeModeResultKind === "tools" ||
-      activeModeResultKind === "favourites" ||
-      (activeModeResultKind === "answer" && Boolean(answer) && !loading) ||
-      ((activeModeResultKind === "documents" ||
-        activeModeResultKind === "services" ||
-        activeModeResultKind === "forms") &&
-        modeSearchSubmitted));
-  // `/tools` owns the tools catalogue and stays composer-free, so a dashboard
-  // path reaching the tools result kind must not mount a second ownership model
-  // (hero/page/dock) behind it. Modes that only borrow the `tools` result kind
-  // remain on the shared home and are intentionally exempt.
-  const toolsDirectoryWithoutComposer = activeModeResultKind === "tools" && !showSharedHome;
-  const showDesktopHomeComposer =
-    !error &&
-    (showSharedHome ||
-      (!toolsDirectoryWithoutComposer && activeModeResultKind === "tools") ||
-      (activeModeResultKind === "favourites" && favouritesAccessible) ||
-      (!loading &&
-        ((searchMode === "documents" &&
-          activeModeResultKind === "documents" &&
-          documentMatches.length === 0 &&
-          !modeSearchSubmitted) ||
-          // Prescribing keeps MedicationHome (and the hero/phone composer) until
-          // an explicit submit — draft keystrokes must not flip to results/dock.
-          (searchMode === "prescribing" && activeModeResultKind === "documents" && !modeSearchSubmitted) ||
-          // Empty unsubmitted differentials visits 307 to the shared home;
-          // keep the hero slot only while that idle dashboard branch mounts.
-          (activeModeResultKind === "differentials" &&
-            !modeSearchSubmitted &&
-            !(query.trim() && documentMatches.length > 0)))));
-  const desktopHomeComposerSlotId = showDesktopHomeComposer ? modeHomeDesktopComposerSlotId : undefined;
-  const desktopResultComposerSlotId =
-    !desktopHomeComposerSlotId && searchMode !== "answer" && !toolsDirectoryWithoutComposer
-      ? desktopPageComposerSlotId
-      : undefined;
-  // Most mounted mode homes keep the in-flow hero pill on phones. The Tools
-  // directory has no composer at any breakpoint. Modes borrowing `kind:
-  // "tools"` (Factsheets, Dictionary, Therapy Compass) opt back in via
-  // `showSharedHome`.
-  const heroComposerBreakpoint =
-    showDesktopHomeComposer && (showSharedHome || activeModeResultKind !== "tools") ? "all" : "sm-up";
-  const heroOwnsPhoneComposer = Boolean(desktopHomeComposerSlotId) && heroComposerBreakpoint === "all";
-  const hasMobileBottomSearch = searchMode !== "answer" && !heroOwnsPhoneComposer && !toolsDirectoryWithoutComposer;
-  // Tools owns its local catalogue controls, so the sidebar's cross-guide
-  // search action must leave the directory before trying to focus a shared
-  // composer that is intentionally absent.
-  const openSidebarSearch = toolsDirectoryWithoutComposer ? startNewChat : focusComposerInput;
-  // Favourites and Tools are content-rich hubs that stay top-aligned; the shared
-  // home mounts neither, so it centres like every other mode.
-  const centeredModeHome =
-    showDesktopHomeComposer &&
-    (showSharedHome || (activeModeResultKind !== "tools" && activeModeResultKind !== "favourites"));
-  // Short mode homes (centred homes plus the services/forms registry homes)
-  // drop the large mobile bottom padding so phones don't get a scrollbar for
-  // content that already fits. Result views keep the full clearance.
-  const compactMobileModeHome =
-    centeredModeHome ||
-    ((searchMode === "services" || searchMode === "forms") && !modeSearchSubmitted && !query.trim() && !loading);
-  const differentialsCompareAddonActive =
-    searchMode === "differentials" && modeSearchSubmitted && Boolean(query.trim());
-  // Prescribing submitted searches render here (there is no standalone results
-  // route), so this is where the Patient details pill docks for that mode.
-  const patientDetailsAddonActive = searchMode === "prescribing" && modeSearchSubmitted && Boolean(query.trim());
-  // Hidden dock pad must stay at 0rem — Safari toolbar safe-area recreates a blank band.
-  const mobileComposerReserve = resolveMobileComposerReserve(
-    bottomComposerHidden,
-    toolsDirectoryWithoutComposer
-      ? mobileComposerIdleReserve
-      : resolveDashboardVisibleMobileComposerReserve({
-          searchMode,
-          hasAnswerFollowUps: answerFollowUpSuggestions.length > 0,
-          differentialsCompareAddonActive,
-          patientDetailsAddonActive,
-          heroOwnsPhoneComposer,
-        }),
-  );
   const setupReadyCount = setupChecks.filter((check) => check.status === "ready").length;
   const setupCheckCount = setupChecks.length || fallbackSetupChecks.length;
   const activeIndexingWorkCount =
diff --git a/src/components/clinical-dashboard/dashboard-mode-surface.ts b/src/components/clinical-dashboard/dashboard-mode-surface.ts
new file mode 100644
index 0000000000..75082dc34a
--- /dev/null
+++ b/src/components/clinical-dashboard/dashboard-mode-surface.ts
@@ -0,0 +1,359 @@
+/**
+ * Pure mode-surface helpers extracted from ClinicalDashboard.tsx so the
+ * dashboard stays under its maintainability no-growth budget. Behaviour is
+ * unchanged — these are verbatim moves of the bottom-nav item builder and the
+ * composer / also-matches / phone-reserve visibility decisions.
+ */
+import { FileImage, FileText, Heart, Quote, Search, Wrench, type LucideIcon } from "lucide-react";
+
+import {
+  mobileComposerIdleReserve,
+  resolveDashboardVisibleMobileComposerReserve,
+  resolveMobileComposerReserve,
+} from "@/components/clinical-dashboard/mobile-composer-reserve";
+import { shouldShowSharedHome } from "@/components/clinical-dashboard/clinical-dashboard-helpers";
+import { shouldShowDashboardDegradedNotice } from "@/components/clinical-dashboard/document-manager-contracts";
+import { desktopPageComposerSlotId, modeHomeDesktopComposerSlotId } from "@/lib/mode-home-composer";
+import type { AppModeId, AppModeResultKind } from "@/lib/app-modes";
+import { navigationHashes } from "@/components/clinical-dashboard/dashboard-contracts";
+
+export type DashboardBottomNavItem = {
+  label: string;
+  description: string;
+  icon: LucideIcon;
+  href: (typeof navigationHashes)[number];
+  count: number | null;
+  empty?: boolean;
+};
+
+export function buildDashboardBottomNavItems({
+  activeModeResultKind,
+  activeModeSearch,
+  answer,
+  documentMatchCount,
+  query,
+  quoteCount,
+  reviewSourceCount,
+  toolCatalogCount,
+  visualEvidenceCount,
+  weakEvidence,
+}: {
+  activeModeResultKind: AppModeResultKind;
+  activeModeSearch: { statusLabel: string; nextStep: string; readyTitle: string };
+  answer: unknown;
+  documentMatchCount: number;
+  query: string;
+  quoteCount: number;
+  reviewSourceCount: number;
+  toolCatalogCount: number;
+  visualEvidenceCount: number;
+  weakEvidence: boolean;
+}): readonly DashboardBottomNavItem[] {
+  return [
+    {
+      label: activeModeSearch.statusLabel,
+      description:
+        activeModeResultKind === "tools"
+          ? query.trim()
+            ? "Filtered tools"
+            : "Browse tools"
+          : activeModeResultKind === "favourites"
+            ? query.trim()
+              ? "Filtered favourites"
+              : "Browse favourites"
+            : activeModeResultKind === "answer"
+              ? answer
+                ? weakEvidence
+                  ? "Read synthesis carefully"
+                  : "Clinical synthesis"
+                : activeModeSearch.nextStep
+              : documentMatchCount
+                ? "Document results"
+                : activeModeSearch.readyTitle,
+      icon:
+        activeModeResultKind === "tools"
+          ? Wrench
+          : activeModeResultKind === "favourites"
+            ? Heart
+            : activeModeResultKind === "answer"
+              ? Search
+              : FileText,
+      href: "#search",
+      count:
+        activeModeResultKind === "tools"
+          ? toolCatalogCount
+          : activeModeResultKind === "favourites"
+            ? null
+            : activeModeResultKind === "documents"
+              ? documentMatchCount
+              : null,
+      empty: activeModeResultKind === "documents" && documentMatchCount === 0,
+    },
+    {
+      label: "Quotes",
+      description: answer ? (quoteCount ? "Exact source excerpts" : "No quotes yet") : "No quotes yet",
+      icon: Quote,
+      href: "#quotes",
+      count: answer ? quoteCount : null,
+      empty: !answer || quoteCount === 0,
+    },
+    {
+      label: "Images",
+      description: answer ? (visualEvidenceCount ? "Tables and diagrams" : "No images yet") : "No images yet",
+      icon: FileImage,
+      href: "#images",
+      count: answer ? visualEvidenceCount : null,
+      empty: !answer || visualEvidenceCount === 0,
+    },
+    {
+      label: "Sources",
+      description: answer ? (reviewSourceCount ? "Passages and documents" : "No sources yet") : "No sources yet",
+      icon: FileText,
+      href: "#sources",
+      count: answer ? reviewSourceCount : null,
+      empty: !answer || reviewSourceCount === 0,
+    },
+  ] as const;
+}
+
+export type DashboardModeSurfaceInput = {
+  activeModeResultKind: AppModeResultKind;
+  answer: unknown;
+  answerFollowUpSuggestionCount: number;
+  answerLifecycleStatus: string;
+  answerProgressCompleted: boolean;
+  answerProgressEventCount: number;
+  apiUnavailable: boolean;
+  bottomComposerHidden: boolean;
+  canRunSearch: boolean;
+  documentMatchCount: number;
+  error: unknown;
+  favouritesAccessible: boolean;
+  isOnline: boolean;
+  latestAnswerQuery: string | null | undefined;
+  loading: boolean;
+  modeSearchSubmitted: boolean;
+  pathname: string;
+  query: string;
+  searchMode: AppModeId;
+  startNewChat: () => void;
+  focusComposerInput: () => void;
+  submittedModeQuery: string | null | undefined;
+  submittedUrlMode: string | null;
+  submittedUrlQuery: string | null | undefined;
+  submittedUrlRunRequested: boolean;
+};
+
+export type DashboardModeSurface = {
+  showAuthPanel: boolean;
+  showDegradedNotice: boolean;
+  submittedAnswerSearchActive: boolean;
+  showSharedHome: boolean;
+  showAnswerCancelledNotice: boolean;
+  showAnswerPending: boolean;
+  showAnswerProgress: boolean;
+  universalAlsoMatchesQuery: string;
+  showUniversalAlsoMatches: boolean;
+  toolsDirectoryWithoutComposer: boolean;
+  showDesktopHomeComposer: boolean;
+  desktopHomeComposerSlotId: string | undefined;
+  desktopResultComposerSlotId: string | undefined;
+  heroComposerBreakpoint: "all" | "sm-up";
+  heroOwnsPhoneComposer: boolean;
+  hasMobileBottomSearch: boolean;
+  openSidebarSearch: () => void;
+  centeredModeHome: boolean;
+  compactMobileModeHome: boolean;
+  differentialsCompareAddonActive: boolean;
+  patientDetailsAddonActive: boolean;
+  mobileComposerReserve: string;
+};
+
+/**
+ * Derive the dashboard's shared-home / composer / also-matches surface flags.
+ * Comments that document ownership (prescribing also-matches, tools composer,
+ * cancel-vs-pending) travel with the logic so they stay next to the decisions.
+ */
+export function resolveDashboardModeSurface(input: DashboardModeSurfaceInput): DashboardModeSurface {
+  const {
+    activeModeResultKind,
+    answer,
+    answerFollowUpSuggestionCount,
+    answerLifecycleStatus,
+    answerProgressCompleted,
+    answerProgressEventCount,
+    apiUnavailable,
+    bottomComposerHidden,
+    canRunSearch,
+    documentMatchCount,
+    error,
+    favouritesAccessible,
+    focusComposerInput,
+    isOnline,
+    latestAnswerQuery,
+    loading,
+    modeSearchSubmitted,
+    pathname,
+    query,
+    searchMode,
+    startNewChat,
+    submittedModeQuery,
+    submittedUrlQuery,
+    submittedUrlRunRequested,
+  } = input;
+
+  const showAuthPanel = false;
+  const showDegradedNotice = shouldShowDashboardDegradedNotice({ isOnline, apiUnavailable, canRunSearch });
+  const submittedAnswerSearchActive =
+    activeModeResultKind === "answer" && !answer && canRunSearch && (modeSearchSubmitted || Boolean(submittedUrlQuery));
+  const showSharedHome = shouldShowSharedHome({
+    pathname,
+    mode: input.submittedUrlMode,
+    submittedUrlRunRequested,
+    hasError: Boolean(error),
+    hasAnswer: Boolean(answer),
+    loading,
+    submittedAnswerSearchActive,
+  });
+  // A stopped generation reports on the last action rather than describing the
+  // page, so the notice renders at the top of the content column while this same
+  // condition still short-circuits the mode-home empty-state chain below.
+  const showAnswerCancelledNotice = answerLifecycleStatus === "cancelled" && activeModeResultKind === "answer";
+  // `submittedAnswerSearchActive` stays true after the reader presses Stop, and a
+  // cancel is not an `error`, so without the cancelled guard the pending branch
+  // held its skeleton on screen indefinitely — a shimmering placeholder promising
+  // an answer that was already abandoned, directly beneath the notice saying so.
+  const showAnswerPending =
+    activeModeResultKind === "answer" &&
+    !answer &&
+    !showAnswerCancelledNotice &&
+    (loading || (submittedAnswerSearchActive && !error));
+  const showAnswerProgress =
+    activeModeResultKind === "answer" &&
+    answerProgressEventCount > 0 &&
+    (loading || (Boolean(answer) && answerProgressCompleted));
+  // Answer mode already keyed off the generated answer's query. Every other mode keys off
+  // the submitted query for the same reason: typing without pressing Enter must not fetch
+  // cross-mode matches for the draft, nor replace the tray and its count with results the
+  // primary cards do not share. Tools and Favourites never record a submission, so they
+  // fall through to `query`, which is the only query they have.
+  const universalAlsoMatchesQuery =
+    activeModeResultKind === "answer" ? (latestAnswerQuery ?? query) : (submittedModeQuery ?? query);
+  // Answer-mode also-matches wait for a completed generation (`answer && !loading`)
+  // so the panel never sits under the drafting skeleton/stepper. Tools/Favourites
+  // still mount on submission. Follow-ups hide the panel while loading so stale
+  // matches for the prior query do not compete with the new Drafting stepper.
+  const showUniversalAlsoMatches =
+    !showSharedHome &&
+    // Prescribing declares `resultKind: "documents"` on purpose (it searches the
+    // indexed sources, not a forms table), so the documents arm below matches it
+    // and this dashboard would mount a SECOND panel over the one
+    // MedicationPrescribingWorkspace already renders under the medication list.
+    // The workspace owns the mount, because only it knows where the result list
+    // ends; the mode is named here rather than the result kind, because the kind
+    // is shared and the ownership is not. `tests/ui-stress.spec.ts` pins the count
+    // at one on `/?mode=prescribing`, which is how the duplicate was caught.
+    searchMode !== "prescribing" &&
+    Boolean(universalAlsoMatchesQuery.trim()) &&
+    (activeModeResultKind === "tools" ||
+      activeModeResultKind === "favourites" ||
+      (activeModeResultKind === "answer" && Boolean(answer) && !loading) ||
+      ((activeModeResultKind === "documents" ||
+        activeModeResultKind === "services" ||
+        activeModeResultKind === "forms") &&
+        modeSearchSubmitted));
+  // `/tools` owns the tools catalogue and stays composer-free, so a dashboard
+  // path reaching the tools result kind must not mount a second ownership model
+  // (hero/page/dock) behind it. Modes that only borrow the `tools` result kind
+  // remain on the shared home and are intentionally exempt.
+  const toolsDirectoryWithoutComposer = activeModeResultKind === "tools" && !showSharedHome;
+  const showDesktopHomeComposer =
+    !error &&
+    (showSharedHome ||
+      (!toolsDirectoryWithoutComposer && activeModeResultKind === "tools") ||
+      (activeModeResultKind === "favourites" && favouritesAccessible) ||
+      (!loading &&
+        ((searchMode === "documents" &&
+          activeModeResultKind === "documents" &&
+          documentMatchCount === 0 &&
+          !modeSearchSubmitted) ||
+          // Prescribing keeps MedicationHome (and the hero/phone composer) until
+          // an explicit submit — draft keystrokes must not flip to results/dock.
+          (searchMode === "prescribing" && activeModeResultKind === "documents" && !modeSearchSubmitted) ||
+          // Empty unsubmitted differentials visits 307 to the shared home;
+          // keep the hero slot only while that idle dashboard branch mounts.
+          (activeModeResultKind === "differentials" &&
+            !modeSearchSubmitted &&
+            !(query.trim() && documentMatchCount > 0)))));
+  const desktopHomeComposerSlotId = showDesktopHomeComposer ? modeHomeDesktopComposerSlotId : undefined;
+  const desktopResultComposerSlotId =
+    !desktopHomeComposerSlotId && searchMode !== "answer" && !toolsDirectoryWithoutComposer
+      ? desktopPageComposerSlotId
+      : undefined;
+  // Most mounted mode homes keep the in-flow hero pill on phones. The Tools
+  // directory has no composer at any breakpoint. Modes borrowing `kind:
+  // "tools"` (Factsheets, Dictionary, Therapy Compass) opt back in via
+  // `showSharedHome`.
+  const heroComposerBreakpoint: "all" | "sm-up" =
+    showDesktopHomeComposer && (showSharedHome || activeModeResultKind !== "tools") ? "all" : "sm-up";
+  const heroOwnsPhoneComposer = Boolean(desktopHomeComposerSlotId) && heroComposerBreakpoint === "all";
+  const hasMobileBottomSearch = searchMode !== "answer" && !heroOwnsPhoneComposer && !toolsDirectoryWithoutComposer;
+  // Tools owns its local catalogue controls, so the sidebar's cross-guide
+  // search action must leave the directory before trying to focus a shared
+  // composer that is intentionally absent.
+  const openSidebarSearch = toolsDirectoryWithoutComposer ? startNewChat : focusComposerInput;
+  // Favourites and Tools are content-rich hubs that stay top-aligned; the shared
+  // home mounts neither, so it centres like every other mode.
+  const centeredModeHome =
+    showDesktopHomeComposer &&
+    (showSharedHome || (activeModeResultKind !== "tools" && activeModeResultKind !== "favourites"));
+  // Short mode homes (centred homes plus the services/forms registry homes)
+  // drop the large mobile bottom padding so phones don't get a scrollbar for
+  // content that already fits. Result views keep the full clearance.
+  const compactMobileModeHome =
+    centeredModeHome ||
+    ((searchMode === "services" || searchMode === "forms") && !modeSearchSubmitted && !query.trim() && !loading);
+  const differentialsCompareAddonActive =
+    searchMode === "differentials" && modeSearchSubmitted && Boolean(query.trim());
+  // Prescribing submitted searches render here (there is no standalone results
+  // route), so this is where the Patient details pill docks for that mode.
+  const patientDetailsAddonActive = searchMode === "prescribing" && modeSearchSubmitted && Boolean(query.trim());
+  // Hidden dock pad must stay at 0rem — Safari toolbar safe-area recreates a blank band.
+  const mobileComposerReserve = resolveMobileComposerReserve(
+    bottomComposerHidden,
+    toolsDirectoryWithoutComposer
+      ? mobileComposerIdleReserve
+      : resolveDashboardVisibleMobileComposerReserve({
+          searchMode,
+          hasAnswerFollowUps: answerFollowUpSuggestionCount > 0,
+          differentialsCompareAddonActive,
+          patientDetailsAddonActive,
+          heroOwnsPhoneComposer,
+        }),
+  );
+
+  return {
+    showAuthPanel,
+    showDegradedNotice,
+    submittedAnswerSearchActive,
+    showSharedHome,
+    showAnswerCancelledNotice,
+    showAnswerPending,
+    showAnswerProgress,
+    universalAlsoMatchesQuery,
+    showUniversalAlsoMatches,
+    toolsDirectoryWithoutComposer,
+    showDesktopHomeComposer,
+    desktopHomeComposerSlotId,
+    desktopResultComposerSlotId,
+    heroComposerBreakpoint,
+    heroOwnsPhoneComposer,
+    hasMobileBottomSearch,
+    openSidebarSearch,
+    centeredModeHome,
+    compactMobileModeHome,
+    differentialsCompareAddonActive,
+    patientDetailsAddonActive,
+    mobileComposerReserve,
+  };
+}

From 87887b479bf3ea463bcd747408dc24c4148d0bb0 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 12 Sep 2026 08:53:54 +0000
Subject: [PATCH 34/35] fix(test): point also-matches contracts at
 dashboard-mode-surface

ClinicalDashboard split moved universalAlsoMatchesQuery, the visibility
gate, and the hidden dock pad comment into dashboard-mode-surface.ts.
Update source-reading unit contracts to the new module so coverage stays
green without restoring the extracted symbols.
---
 tests/phone-dock-addon-contract.test.ts              |  3 ++-
 tests/ui-overlay-css-contract.test.ts                |  5 +++--
 tests/universal-also-matches-mode-coverage.test.ts   |  3 ++-
 tests/universal-also-matches-submitted-query.test.ts | 11 +++++++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/phone-dock-addon-contract.test.ts b/tests/phone-dock-addon-contract.test.ts
index 06481ca3f6..3655f71b89 100644
--- a/tests/phone-dock-addon-contract.test.ts
+++ b/tests/phone-dock-addon-contract.test.ts
@@ -36,7 +36,8 @@ function read(relativePath: string): string {
 }
 
 const globalsCss = read("src/app/globals.css");
-const dashboard = read("src/components/ClinicalDashboard.tsx");
+// Addon-active flags are derived in dashboard-mode-surface (extracted from ClinicalDashboard).
+const dashboard = read("src/components/clinical-dashboard/dashboard-mode-surface.ts");
 const shell = read("src/components/clinical-dashboard/global-search-shell.tsx");
 const header = read("src/components/clinical-dashboard/master-search-header.tsx");
 
diff --git a/tests/ui-overlay-css-contract.test.ts b/tests/ui-overlay-css-contract.test.ts
index d3abaf3974..32af42b55c 100644
--- a/tests/ui-overlay-css-contract.test.ts
+++ b/tests/ui-overlay-css-contract.test.ts
@@ -12,6 +12,7 @@ const globalStylesSource = read("src/app/globals.css");
 const agentsSource = read("AGENTS.md");
 const searchChromeBehaviourSource = read("docs/search-chrome-behaviour.md");
 const clinicalDashboardSource = read("src/components/ClinicalDashboard.tsx");
+const dashboardModeSurfaceSource = read("src/components/clinical-dashboard/dashboard-mode-surface.ts");
 const globalSearchShellSource = read("src/components/clinical-dashboard/global-search-shell.tsx");
 const uiPrimitivesSource = readPrimitiveRecipeSources();
 const therapyWorkspaceSource = read("src/components/therapy-compass/workspace.tsx");
@@ -141,8 +142,8 @@ describe("overlay and global CSS contracts", () => {
     expect(searchChromeBehaviourSource).not.toContain(
       "A hidden phone dock must release the content-facing reserve to `0.75rem`",
     );
-    expect(clinicalDashboardSource).toContain("Hidden dock pad must stay at 0rem");
-    expect(clinicalDashboardSource).not.toContain("Hidden dock pad must stay at 0.75rem");
+    expect(dashboardModeSurfaceSource).toContain("Hidden dock pad must stay at 0rem");
+    expect(dashboardModeSurfaceSource).not.toContain("Hidden dock pad must stay at 0.75rem");
   });
 
   it("uses document scrolling in phone browsers and a bounded standalone scroller", () => {
diff --git a/tests/universal-also-matches-mode-coverage.test.ts b/tests/universal-also-matches-mode-coverage.test.ts
index 182dc9a2fb..9146e51826 100644
--- a/tests/universal-also-matches-mode-coverage.test.ts
+++ b/tests/universal-also-matches-mode-coverage.test.ts
@@ -99,7 +99,8 @@ describe("cross-mode also-matches coverage", () => {
     // Prescribing is that mode — `/?mode=prescribing` renders
     // MedicationPrescribingWorkspace inside the dashboard — and it shipped two
     // panels until ui-stress caught the count at 2.
-    const dashboard = read("src/components/ClinicalDashboard.tsx");
+    // Visibility gate lives in dashboard-mode-surface (extracted from ClinicalDashboard).
+    const dashboard = read("src/components/clinical-dashboard/dashboard-mode-surface.ts");
     const gate = dashboard.slice(
       dashboard.indexOf("const showUniversalAlsoMatches ="),
       dashboard.indexOf("const showDesktopHomeComposer ="),
diff --git a/tests/universal-also-matches-submitted-query.test.ts b/tests/universal-also-matches-submitted-query.test.ts
index 0e674a3fd4..d5a6afafbd 100644
--- a/tests/universal-also-matches-submitted-query.test.ts
+++ b/tests/universal-also-matches-submitted-query.test.ts
@@ -16,6 +16,13 @@ import { describe, expect, it } from "vitest";
  */
 const DASHBOARD = readFileSync(join(__dirname, "..", "src/components/ClinicalDashboard.tsx"), "utf8");
 
+// Lookup-query derivation lives in the mode-surface helper extracted from ClinicalDashboard
+// (maintainability budget split). Submission wiring below still lives on the dashboard.
+const MODE_SURFACE = readFileSync(
+  join(__dirname, "..", "src/components/clinical-dashboard/dashboard-mode-surface.ts"),
+  "utf8",
+);
+
 const SUBMITTED_SEARCH = readFileSync(
   join(__dirname, "..", "src/components/clinical-dashboard/use-submitted-mode-search.ts"),
   "utf8",
@@ -29,14 +36,14 @@ function sourceOf(pattern: RegExp, source = DASHBOARD): string {
 
 describe("cross-mode also-matches follows the submitted query, not the draft", () => {
   it("derives the lookup query from submittedModeQuery rather than the live composer query", () => {
-    const derivation = sourceOf(/const universalAlsoMatchesQuery =[\s\S]*?;\n/);
+    const derivation = sourceOf(/const universalAlsoMatchesQuery =[\s\S]*?;\n/, MODE_SURFACE);
     expect(derivation).toContain("submittedModeQuery ?? query");
     // The regression this guards: the whole non-answer arm used to be the bare draft.
     expect(derivation).not.toMatch(/:\s*query;\s*$/);
   });
 
   it("keeps answer mode on the generated answer's query", () => {
-    const derivation = sourceOf(/const universalAlsoMatchesQuery =[\s\S]*?;\n/);
+    const derivation = sourceOf(/const universalAlsoMatchesQuery =[\s\S]*?;\n/, MODE_SURFACE);
     expect(derivation).toContain('activeModeResultKind === "answer" ? (latestAnswerQuery ?? query)');
   });
 

From 1d97967ff3d42e940c58be80c26d9a68aa21fa92 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 12 Sep 2026 09:29:22 +0000
Subject: [PATCH 35/35] fix(test): retarget mode-surface contracts after
 dashboard split

Point source-reading guards at dashboard-mode-surface for
showSharedHome, also-matches gate, hero composer ownership, and
mobile reserve helpers extracted under the maintainability budget.
---
 .../audit-navigation-auth-regressions.test.ts |  3 +-
 ...clinical-dashboard-merge-artifacts.test.ts | 11 ++++++--
 tests/mobile-composer-reserve.test.ts         | 28 +++++++++++--------
 tests/search-route-ownership.test.ts          | 11 ++++++--
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/tests/audit-navigation-auth-regressions.test.ts b/tests/audit-navigation-auth-regressions.test.ts
index 2a81ba516e..b0b527cfe3 100644
--- a/tests/audit-navigation-auth-regressions.test.ts
+++ b/tests/audit-navigation-auth-regressions.test.ts
@@ -18,6 +18,7 @@ function source(relativePath: string) {
 }
 
 const clinicalDashboardSource = source("src/components/ClinicalDashboard.tsx");
+const dashboardModeSurfaceSource = source("src/components/clinical-dashboard/dashboard-mode-surface.ts");
 const masterSearchHeaderSource = source("src/components/clinical-dashboard/master-search-header.tsx");
 const universalAlsoMatchesSource = source("src/components/clinical-dashboard/universal-search-also-matches.tsx");
 const universalCommandSurfaceSource = source("src/components/clinical-dashboard/universal-search-command-surface.tsx");
@@ -290,7 +291,7 @@ describe("audit navigation and auth regressions", () => {
 
   it("mounts Answer-mode also-matches only after generation completes", () => {
     const alsoMatchesGate = sourceSegment(
-      clinicalDashboardSource,
+      dashboardModeSurfaceSource,
       "const showUniversalAlsoMatches =",
       "const showDesktopHomeComposer =",
       { label: "also-matches visibility gate" },
diff --git a/tests/clinical-dashboard-merge-artifacts.test.ts b/tests/clinical-dashboard-merge-artifacts.test.ts
index 8ba1a85f9c..1ce32ec70d 100644
--- a/tests/clinical-dashboard-merge-artifacts.test.ts
+++ b/tests/clinical-dashboard-merge-artifacts.test.ts
@@ -31,6 +31,10 @@ const globalSearchShellSource = readFileSync(
   "utf8",
 );
 const clinicalDashboardSource = readFileSync(resolve(process.cwd(), "src/components/ClinicalDashboard.tsx"), "utf8");
+const dashboardModeSurfaceSource = readFileSync(
+  resolve(process.cwd(), "src/components/clinical-dashboard/dashboard-mode-surface.ts"),
+  "utf8",
+);
 const modeHomeCanvasSource = readFileSync(
   resolve(process.cwd(), "src/components/clinical-dashboard/mode-home-canvas.ts"),
   "utf8",
@@ -222,9 +226,10 @@ describe("ClinicalDashboard merge-artifact guards", () => {
     expect(globalSearchShellSource).toContain("max-sm:pb-[var(--mobile-composer-reserve)]");
     expect(globalSearchShellSource).not.toContain('data-testid="mobile-composer-reserve-spacer"');
 
-    expect(clinicalDashboardSource).toContain("resolveDashboardVisibleMobileComposerReserve");
-    expect(clinicalDashboardSource).toContain("resolveMobileComposerReserve(");
-    expect(clinicalDashboardSource).toContain('from "@/components/clinical-dashboard/mobile-composer-reserve"');
+    // Reserve helpers were extracted with the mode-surface decisions.
+    expect(dashboardModeSurfaceSource).toContain("resolveDashboardVisibleMobileComposerReserve");
+    expect(dashboardModeSurfaceSource).toContain("resolveMobileComposerReserve(");
+    expect(dashboardModeSurfaceSource).toContain('from "@/components/clinical-dashboard/mobile-composer-reserve"');
     expect(clinicalDashboardSource).not.toContain('bottomComposerHidden ? "max(0.75rem, env(safe-area-inset-bottom))"');
     expect(clinicalDashboardSource).not.toMatch(/pb-\[max\([^"']*safe-area-inset-bottom/);
     expect(clinicalDashboardSource).toContain(
diff --git a/tests/mobile-composer-reserve.test.ts b/tests/mobile-composer-reserve.test.ts
index 3e639048de..b7b003a846 100644
--- a/tests/mobile-composer-reserve.test.ts
+++ b/tests/mobile-composer-reserve.test.ts
@@ -134,6 +134,9 @@ describe("mobile composer reserve contract", () => {
     // back in. Without it the modes that borrow `resultKind: "tools"` as a benign
     // search kind (Factsheets, Dictionary, Therapy Compass) inherited the Tools
     // dock on `/` and lost the hero composer, ticker and privacy notice.
+    // Hero/composer ownership for the dashboard was extracted into
+    // dashboard-mode-surface.ts under the ClinicalDashboard maintainability budget.
+    const modeSurface = source("src/components/clinical-dashboard/dashboard-mode-surface.ts");
     const dashboard = source("src/components/ClinicalDashboard.tsx");
     const header = source("src/components/clinical-dashboard/master-search-header.tsx");
     const shell = source("src/components/clinical-dashboard/global-search-shell.tsx");
@@ -146,24 +149,24 @@ describe("mobile composer reserve contract", () => {
     // only invited the "catalogue is a home" reading that #2639 punished.
     expect(shell).toMatch(/heroComposerBreakpoint=\{mobileHomeComposerPlacement === "footer" \? "sm-up" : "all"\}/);
     expect(shell).not.toContain('mobileHomeComposerPlacement === "footer" || isDictionaryCatalogue');
-    expect(dashboard).toContain('(activeModeResultKind === "favourites" && favouritesAccessible)');
-    expect(dashboard).toMatch(
-      /const heroComposerBreakpoint =\s*showDesktopHomeComposer && \(showSharedHome \|\| activeModeResultKind !== "tools"\) \? "all" : "sm-up";/,
+    expect(modeSurface).toContain('(activeModeResultKind === "favourites" && favouritesAccessible)');
+    expect(modeSurface).toMatch(
+      /const heroComposerBreakpoint(?::[^=]+)?=\s*showDesktopHomeComposer && \(showSharedHome \|\| activeModeResultKind !== "tools"\) \? "all" : "sm-up";/,
     );
-    expect(dashboard).not.toContain('const heroComposerBreakpoint = showDesktopHomeComposer ? "all" : "sm-up";');
-    expect(dashboard).not.toMatch(
-      /const heroComposerBreakpoint =\s*showDesktopHomeComposer && activeModeResultKind !== "tools" \? "all" : "sm-up";/,
+    expect(modeSurface).not.toContain('const heroComposerBreakpoint = showDesktopHomeComposer ? "all" : "sm-up";');
+    expect(modeSurface).not.toMatch(
+      /const heroComposerBreakpoint(?::[^=]+)?=\s*showDesktopHomeComposer && activeModeResultKind !== "tools" \? "all" : "sm-up";/,
     );
-    expect(dashboard).toContain(
+    expect(modeSurface).toContain(
       'const heroOwnsPhoneComposer = Boolean(desktopHomeComposerSlotId) && heroComposerBreakpoint === "all";',
     );
-    expect(dashboard).not.toContain("const heroOwnsPhoneComposer = showDesktopHomeComposer || showAnswerHome;");
+    expect(modeSurface).not.toContain("const heroOwnsPhoneComposer = showDesktopHomeComposer || showAnswerHome;");
     // Prescribing keeps MedicationHome until explicit submit; draft keystrokes
     // must not drop the hero slot (and idle phone reserve) for the dock path.
-    expect(dashboard).toMatch(
+    expect(modeSurface).toMatch(
       /searchMode === "prescribing" &&\s*activeModeResultKind === "documents" &&\s*!modeSearchSubmitted/,
     );
-    expect(dashboard).not.toMatch(
+    expect(modeSurface).not.toMatch(
       /searchMode === "prescribing" &&\s*activeModeResultKind === "documents" &&\s*!modeSearchSubmitted &&\s*!query\.trim\(\)/,
     );
     // Results mount only after submit — never on the first draft keystroke.
@@ -171,8 +174,9 @@ describe("mobile composer reserve contract", () => {
     expect(dashboard).not.toContain("showHome={!query.trim() && !modeSearchSubmitted}");
     // DifferentialsHome shows results (no mode-home slot) when a draft query
     // coincides with stale evidence matches after clearing a submitted search.
-    expect(dashboard).toMatch(
-      /activeModeResultKind === "differentials" &&\s*!modeSearchSubmitted &&\s*!\(query\.trim\(\) && documentMatches\.length > 0\)/,
+    // Count is named documentMatchCount in the extracted helper (param rename).
+    expect(modeSurface).toMatch(
+      /activeModeResultKind === "differentials" &&\s*!modeSearchSubmitted &&\s*!\(query\.trim\(\) && documentMatchCount > 0\)/,
     );
     expect(header).toContain(
       'const heroComposerOwnsPhones = Boolean(desktopHomeComposerSlotId) && heroComposerBreakpoint === "all";',
diff --git a/tests/search-route-ownership.test.ts b/tests/search-route-ownership.test.ts
index 597fcb0665..6b12bc5c5a 100644
--- a/tests/search-route-ownership.test.ts
+++ b/tests/search-route-ownership.test.ts
@@ -501,9 +501,16 @@ describe("shared-search route ownership", () => {
     expect(dashboardSource).toMatch(
       /if \(mode === "answer" \|\| mode === "documents"\) \{[\s\S]*?void executeSearch\(crossQuery, mode/,
     );
-    expect(dashboardSource).toMatch(
-      /const showSharedHome = shouldShowSharedHome\(\{[\s\S]*?pathname,[\s\S]*?mode: searchParams\.get\("mode"\),[\s\S]*?submittedAnswerSearchActive,[\s\S]*?\}\);/,
+    // showSharedHome lives in dashboard-mode-surface; ClinicalDashboard still
+    // supplies mode via searchParams.get("mode") at the call site.
+    const modeSurface = readFileSync(
+      resolve(process.cwd(), "src/components/clinical-dashboard/dashboard-mode-surface.ts"),
+      "utf8",
+    );
+    expect(modeSurface).toMatch(
+      /const showSharedHome = shouldShowSharedHome\(\{[\s\S]*?pathname,[\s\S]*?mode: input\.submittedUrlMode,[\s\S]*?submittedAnswerSearchActive,[\s\S]*?\}\);/,
     );
+    expect(dashboardSource).toMatch(/submittedUrlMode:\s*searchParams\.get\("mode"\)/);
   });
 
   it("routes a submitted shared-composer search to the selected mode's own surface", () => {