From 5baf75eb5c5ce642ba5eba66523c4dbd5024166d Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 25 Jul 2026 04:46:58 +0800
Subject: [PATCH 1/4] feat(search): unify result filters and source browsing

---
 .../(search-app)/documents/search/page.tsx    |   6 +-
 src/components/ClinicalDashboard.tsx          |  34 +--
 src/components/applications-launcher-page.tsx |  45 ++--
 .../clinical-dashboard/dashboard-shell.tsx    |  13 +-
 .../clinical-dashboard/differentials-home.tsx |  17 +-
 .../clinical-dashboard/document-admin.tsx     |  21 +-
 .../document-search-results.tsx               | 220 +++++++-----------
 .../favourites-command-library-page.tsx       |  39 ++--
 .../medication-prescribing-workspace.tsx      |  11 +-
 .../clinical-dashboard/mode-action-popup.tsx  |   6 +-
 .../search-results-header-band.tsx            |  43 +++-
 src/components/dsm/dsm-search-page.tsx        |  61 ++---
 .../factsheets/factsheets-search-page.tsx     | 127 +++++-----
 .../forms/forms-search-results-page.tsx       |  29 +--
 .../formulation/formulation-home-page.tsx     |  89 ++++---
 .../services/services-navigator-page.tsx      |  93 ++++----
 .../specifiers/specifiers-home-page.tsx       |  33 ++-
 .../therapy-compass/screens/search-screen.tsx |  86 +++----
 tests/search-results-header-band.dom.test.tsx |  45 +++-
 tests/ui-accessibility.spec.ts                |  11 +-
 tests/ui-formulation.spec.ts                  |   8 +-
 tests/ui-smoke.spec.ts                        |  94 ++++++--
 tests/ui-specifiers.spec.ts                   |   8 +-
 tests/ui-stress.spec.ts                       |   2 +-
 tests/ui-tools.spec.ts                        |  12 +-
 25 files changed, 630 insertions(+), 523 deletions(-)

diff --git a/src/app/(search-app)/documents/search/page.tsx b/src/app/(search-app)/documents/search/page.tsx
index 378cd483b..204caee4c 100644
--- a/src/app/(search-app)/documents/search/page.tsx
+++ b/src/app/(search-app)/documents/search/page.tsx
@@ -9,12 +9,12 @@ export default function DocumentsSearchRoute() {
   return (
     <section className="mx-auto flex min-h-[55dvh] max-w-3xl flex-col items-center justify-center px-4 py-12 text-center">
       <p className="text-xs font-bold uppercase tracking-[0.08em] text-[color:var(--clinical-accent)]">
-        Indexed library
+        Indexed sources
       </p>
       <h1 className="mt-3 text-3xl font-semibold text-[color:var(--text-heading)]">Search clinical documents</h1>
       <p className="mt-3 max-w-xl text-sm leading-6 text-[color:var(--text-muted)]">
-        Enter a query in the Documents composer to search the live indexed library. Results open the source document at
-        the matching page and passage.
+        Enter a query in the Documents composer to search the indexed sources. Results open the source document at the
+        matching page and passage.
       </p>
     </section>
   );
diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index b8bb4a620..8bc203ff6 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -508,6 +508,7 @@ export function ClinicalDashboard({
   const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false);
   const [sidebarCollapsed, setSidebarCollapsed] = useSidebarCollapsed();
   const [documentsDrawerOpen, setDocumentsDrawerOpen] = useState(false);
+  const documentsDrawerReturnFocusRef = useRef<HTMLElement | null>(null);
   const [documentScopeOpen, setDocumentScopeOpen] = useState(false);
   const [documentsDrawerMode, setDocumentsDrawerMode] = useState<DocumentDrawerMode>("library");
   const [uploadDrawerOpen, setUploadDrawerOpen] = useState(false);
@@ -2659,18 +2660,13 @@ export function ClinicalDashboard({
   }
 
   function openDocumentsDrawer(mode: DocumentDrawerMode) {
+    documentsDrawerReturnFocusRef.current =
+      document.activeElement instanceof HTMLElement ? document.activeElement : null;
     closeDashboardTransientSurfaces("documents");
     setSearchMode("documents");
     setDocumentDrawerStatusFilter("indexed");
     setDocumentsDrawerMode(mode);
     setDocumentsDrawerOpen(true);
-    if (window.matchMedia("(min-width: 1024px)").matches) {
-      window.requestAnimationFrame(() => {
-        document
-          .getElementById("dashboard-documents-drawer")
-          ?.scrollIntoView({ block: "start", behavior: resolveScrollBehavior() });
-      });
-    }
   }
 
   function openRecentDocuments() {
@@ -2690,7 +2686,7 @@ export function ClinicalDashboard({
       openDocumentsDrawer("library");
       setActionNotice({
         tone: "warning",
-        message: "Upload and indexing tools are admin-only. Use the source library to open indexed documents.",
+        message: "Upload and indexing tools are admin-only. Use Sources to open indexed documents.",
       });
       return;
     }
@@ -3193,7 +3189,7 @@ export function ClinicalDashboard({
         ? "Source PDFs"
         : documentsDrawerIsAdmin
           ? "Document admin"
-          : "Source library";
+          : "Sources";
   const documentsDrawerSummary = dashboardDataLoading
     ? "Loading indexed document status."
     : documentsDrawerMode === "recent"
@@ -3204,14 +3200,14 @@ export function ClinicalDashboard({
           ? `${indexedDocumentTotal.toLocaleString()} indexed documents available.`
           : "Search and open indexed clinical sources.";
   const documentsDrawerMobileSummary = dashboardDataLoading
-    ? "Loading library"
+    ? "Loading sources"
     : documentsDrawerMode === "recent"
       ? "Recent sources"
       : documentsDrawerMode === "source"
         ? "PDF sources"
         : documentsDrawerIsAdmin
           ? "Admin"
-          : "Library";
+          : "Sources";
   const DocumentsDrawerIcon =
     documentsDrawerMode === "recent"
       ? Clock3
@@ -3220,7 +3216,7 @@ export function ClinicalDashboard({
         : documentsDrawerIsAdmin
           ? UploadCloud
           : FolderOpen;
-  const drawerGroupTitle = uploadDrawerOpen || documentsDrawerIsAdmin ? "Library and admin" : "Sources";
+  const drawerGroupTitle = uploadDrawerOpen || documentsDrawerIsAdmin ? "Sources and admin" : "Sources";
 
   // Stable-identity handlers for the React.memo children (StagedAnswerResultSurface,
   // DocumentSearchResultsPanel). These close over the draft `query` or call the
@@ -3236,6 +3232,15 @@ export function ClinicalDashboard({
   const handleDocumentTagSearch = useEventCallback(handleTagSearch);
   const handleOpenRecentDocuments = useEventCallback(openRecentDocuments);
   const handleOpenSourceLibrary = useEventCallback(openSourceLibrary);
+  const handleDocumentsDrawerOpenChange = useEventCallback((nextOpen: boolean) => {
+    setDocumentsDrawerOpen(nextOpen);
+    if (nextOpen) return;
+
+    const returnTarget = documentsDrawerReturnFocusRef.current;
+    window.requestAnimationFrame(() => {
+      if (returnTarget?.isConnected) returnTarget.focus({ preventScroll: true });
+    });
+  });
   const handleOpenSourcePdfBrowser = useEventCallback(openSourcePdfBrowser);
   const handleCopyAnswer = useEventCallback(() => {
     copyText("answer", answerRenderModel?.copyText || safeAnswerText || answer?.answer || "");
@@ -3828,8 +3833,9 @@ export function ClinicalDashboard({
                       summary={documentsDrawerSummary}
                       mobileSummary={documentsDrawerMobileSummary}
                       open={documentsDrawerOpen}
-                      onOpenChange={setDocumentsDrawerOpen}
-                      sheetBreakpoint="lg"
+                      onOpenChange={handleDocumentsDrawerOpenChange}
+                      sheetBreakpoint={documentsDrawerIsAdmin ? "lg" : "all"}
+                      sheetReturnFocusRef={documentsDrawerReturnFocusRef}
                       sheetHeaderLeading={
                         <span className="grid h-10 w-10 place-items-center rounded-xl border border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]">
                           <DocumentsDrawerIcon className="h-5 w-5" aria-hidden="true" />
diff --git a/src/components/applications-launcher-page.tsx b/src/components/applications-launcher-page.tsx
index fd90f054e..f7770bc72 100644
--- a/src/components/applications-launcher-page.tsx
+++ b/src/components/applications-launcher-page.tsx
@@ -24,6 +24,7 @@ import {
 import { type FormEvent, useMemo, useState } from "react";
 
 import { ModeHomeHero, ModeHomeVerificationFooter } from "@/components/mode-home-template";
+import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
 import { useSearchCommand } from "@/components/clinical-dashboard/search-command-context";
 import { useFavouritesAccess } from "@/components/clinical-dashboard/use-favourites-access";
 import { cn, toneInfo, toneSuccess, toneWarning } from "@/components/ui-primitives";
@@ -829,21 +830,37 @@ export function ApplicationsLauncherWorkspace({
         data-testid="tools-all-tools"
         className="mx-auto mt-8 grid max-w-[86rem] grid-cols-1 gap-4 sm:mt-10"
       >
-        <div className="flex flex-col gap-3 lg:flex-row lg:items-end lg:justify-between">
-          <div className="text-left">
-            <h2 className="text-lg font-extrabold text-[color:var(--text-heading)]">{copy.allSectionLabel}</h2>
-          </div>
-          <div className="flex items-center gap-3">
-            <FilterTabs
-              activeFilter={effectiveFilter}
-              onFilterChange={setActiveFilter}
-              canAccessFavourites={canAccessFavourites}
-            />
-            <p className="hidden min-h-10 items-center rounded-lg px-1 text-xs font-bold text-[color:var(--text-muted)] lg:inline-flex">
-              Sorted A to Z
-            </p>
+        {normalizedQuery ? (
+          <SearchResultsHeaderBand
+            modeId="tools"
+            query={query}
+            matchCount={filteredApps.length}
+            filterLabel="Filter tools by category"
+            filterControls={
+              <FilterTabs
+                activeFilter={effectiveFilter}
+                onFilterChange={setActiveFilter}
+                canAccessFavourites={canAccessFavourites}
+              />
+            }
+          />
+        ) : (
+          <div className="flex flex-col gap-3 lg:flex-row lg:items-end lg:justify-between">
+            <div className="text-left">
+              <h2 className="text-lg font-extrabold text-[color:var(--text-heading)]">{copy.allSectionLabel}</h2>
+            </div>
+            <div className="flex items-center gap-3">
+              <FilterTabs
+                activeFilter={effectiveFilter}
+                onFilterChange={setActiveFilter}
+                canAccessFavourites={canAccessFavourites}
+              />
+              <p className="hidden min-h-10 items-center rounded-lg px-1 text-xs font-bold text-[color:var(--text-muted)] lg:inline-flex">
+                Sorted A to Z
+              </p>
+            </div>
           </div>
-        </div>
+        )}
 
         <div id="launcher-results-panel" role="group" aria-label={resultsPanelLabel} className="grid grid-cols-1 gap-4">
           {filteredApps.length === 0 ? (
diff --git a/src/components/clinical-dashboard/dashboard-shell.tsx b/src/components/clinical-dashboard/dashboard-shell.tsx
index 0a165d1d2..9a2cd0db1 100644
--- a/src/components/clinical-dashboard/dashboard-shell.tsx
+++ b/src/components/clinical-dashboard/dashboard-shell.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { BookOpen, ChevronDown, type LucideIcon } from "lucide-react";
-import { useCallback, useEffect, useRef, useState, type CSSProperties, type ReactNode } from "react";
+import { useCallback, useEffect, useRef, useState, type CSSProperties, type ReactNode, type RefObject } from "react";
 
 import { Sheet, type SheetMobileSize } from "@/components/ui/sheet";
 import { clinicalDivider, cn, iconTilePremium, navPill, panelSubtle, textMuted } from "@/components/ui-primitives";
@@ -9,6 +9,7 @@ import { clinicalDivider, cn, iconTilePremium, navPill, panelSubtle, textMuted }
 const sheetMediaQueries = {
   sm: "(max-width: 639px)",
   lg: "(max-width: 1023px)",
+  all: "(min-width: 0px)",
 } as const;
 
 type UtilityDrawerSheetBreakpoint = keyof typeof sheetMediaQueries;
@@ -87,6 +88,7 @@ export function UtilityDrawer({
   sheetDescription,
   sheetBreakpoint = "sm",
   sheetMobileSize,
+  sheetReturnFocusRef,
 }: {
   id?: string;
   title: string;
@@ -113,13 +115,16 @@ export function UtilityDrawer({
   sheetDescription?: string | null;
   sheetBreakpoint?: UtilityDrawerSheetBreakpoint;
   sheetMobileSize?: SheetMobileSize;
+  sheetReturnFocusRef?: RefObject<HTMLElement | null>;
 }) {
   const [uncontrolledOpen, setUncontrolledOpen] = useState(defaultOpen);
   const [usesSheet, setUsesSheet] = useState(false);
   const mobileTriggerRef = useRef<HTMLButtonElement>(null);
   const open = controlledOpen ?? uncontrolledOpen;
-  const sheetTriggerClassName = sheetBreakpoint === "lg" ? "lg:hidden" : "sm:hidden";
-  const inlineDrawerClassName = sheetBreakpoint === "lg" ? "hidden lg:block" : "hidden sm:block";
+  const sheetTriggerClassName =
+    sheetBreakpoint === "all" ? "block" : sheetBreakpoint === "lg" ? "lg:hidden" : "sm:hidden";
+  const inlineDrawerClassName =
+    sheetBreakpoint === "all" ? "hidden" : sheetBreakpoint === "lg" ? "hidden lg:block" : "hidden sm:block";
   const triggerClassName = cn(
     "flex min-h-[56px] w-full cursor-pointer list-none items-center justify-between gap-3 rounded-lg px-4 py-3 text-left transition motion-safe:duration-150 hover:bg-[color:var(--surface-subtle)]",
     className,
@@ -227,7 +232,7 @@ export function UtilityDrawer({
         contentStyle={sheetContentStyle}
         bodyClassName={sheetBodyClassName}
         mobileSize={sheetMobileSize}
-        returnFocusRef={mobileTriggerRef}
+        returnFocusRef={sheetReturnFocusRef ?? mobileTriggerRef}
         portal
       >
         <div className={cn("space-y-3", sheetChildrenClassName)}>{children}</div>
diff --git a/src/components/clinical-dashboard/differentials-home.tsx b/src/components/clinical-dashboard/differentials-home.tsx
index 6018bb029..03b353317 100644
--- a/src/components/clinical-dashboard/differentials-home.tsx
+++ b/src/components/clinical-dashboard/differentials-home.tsx
@@ -907,6 +907,16 @@ function SearchResultsView({
         loading={loading || catalogLoading}
         sortValue={sortValue}
         onSortChange={setSortValue}
+        filterLabel="Filter differential result type"
+        filterControls={
+          <ResultTypeTabs
+            activeFilter={kindFilter}
+            onFilterChange={setKindFilter}
+            allCount={results.length}
+            presentationCount={presentationCount}
+            diagnosisCount={diagnosisCount}
+          />
+        }
       />
       <p
         data-testid="differentials-catalogue-notice"
@@ -1036,13 +1046,6 @@ function SearchResultsView({
                   </span>
                 </p>
               ) : null}
-              <ResultTypeTabs
-                activeFilter={kindFilter}
-                onFilterChange={setKindFilter}
-                allCount={results.length}
-                presentationCount={presentationCount}
-                diagnosisCount={diagnosisCount}
-              />
               <div className="flex items-center justify-between gap-2 text-sm font-medium text-[color:var(--text-muted)]">
                 <span className="min-w-0 truncate">
                   <strong className="text-[color:var(--text-heading)]">
diff --git a/src/components/clinical-dashboard/document-admin.tsx b/src/components/clinical-dashboard/document-admin.tsx
index 94771047a..b16c7e248 100644
--- a/src/components/clinical-dashboard/document-admin.tsx
+++ b/src/components/clinical-dashboard/document-admin.tsx
@@ -648,7 +648,7 @@ export function DocumentDrawer({
         ? "Source PDFs"
         : mode === "admin"
           ? statusFilterLabel(statusFilter)
-          : "Source library";
+          : "Sources";
   const modeSummary =
     mode === "recent"
       ? "Recently updated indexed sources."
@@ -744,6 +744,8 @@ export function DocumentDrawer({
       <label className="relative block">
         <Search aria-hidden="true" className={fieldIcon} />
         <input
+          autoFocus
+          data-sheet-autofocus="true"
           value={filter}
           onChange={(event) => setFilter(event.target.value)}
           placeholder={mode === "source" ? "Find a source PDF" : "Find a document"}
@@ -752,23 +754,22 @@ export function DocumentDrawer({
         />
       </label>
 
-      {/* Dynamic Browse Library Filters */}
-      <div className="grid grid-cols-2 gap-2 sm:grid-cols-5">
+      <div className="grid grid-cols-2 gap-2 sm:grid-cols-3" role="group" aria-label="Refine sources">
         <div>
           <label
             htmlFor="browse-filter-type"
             className="text-2xs font-bold uppercase tracking-wider text-[color:var(--text-muted)]"
           >
-            Type
+            Source type
           </label>
           <select
             id="browse-filter-type"
             value={selectedType}
             onChange={(e) => setSelectedType(e.target.value)}
-            className="w-full mt-1 px-2.5 py-1.5 text-xs rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text)] focus:border-[color:var(--primary)] focus:outline-none"
+            className={cn(fieldControlPlain, "mt-1 text-xs")}
             aria-label="Filter by document type"
           >
-            <option value="all">All Types</option>
+            <option value="all">All source types</option>
             {allTypes.map((t) => (
               <option key={t} value={t}>
                 {t.charAt(0).toUpperCase() + t.slice(1)}
@@ -787,7 +788,7 @@ export function DocumentDrawer({
             id="browse-filter-site"
             value={selectedSite}
             onChange={(e) => setSelectedSite(e.target.value)}
-            className="w-full mt-1 px-2.5 py-1.5 text-xs rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text)] focus:border-[color:var(--primary)] focus:outline-none"
+            className={cn(fieldControlPlain, "mt-1 text-xs")}
             aria-label="Filter by site"
           >
             <option value="all">All Sites</option>
@@ -809,7 +810,7 @@ export function DocumentDrawer({
             id="browse-filter-topic"
             value={selectedTopic}
             onChange={(e) => setSelectedTopic(e.target.value)}
-            className="w-full mt-1 px-2.5 py-1.5 text-xs rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text)] focus:border-[color:var(--primary)] focus:outline-none"
+            className={cn(fieldControlPlain, "mt-1 text-xs")}
             aria-label="Filter by topic"
           >
             <option value="all">All Topics</option>
@@ -831,7 +832,7 @@ export function DocumentDrawer({
             id="browse-filter-population"
             value={selectedPopulation}
             onChange={(e) => setSelectedPopulation(e.target.value)}
-            className="w-full mt-1 px-2.5 py-1.5 text-xs rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text)] focus:border-[color:var(--primary)] focus:outline-none"
+            className={cn(fieldControlPlain, "mt-1 text-xs")}
             aria-label="Filter by population"
           >
             <option value="all">All Populations</option>
@@ -853,7 +854,7 @@ export function DocumentDrawer({
             id="browse-filter-designation"
             value={selectedDesignation}
             onChange={(e) => setSelectedDesignation(e.target.value as SourceDesignation | "all")}
-            className="w-full mt-1 px-2.5 py-1.5 text-xs rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text)] focus:border-[color:var(--primary)] focus:outline-none"
+            className={cn(fieldControlPlain, "mt-1 text-xs")}
             aria-label="Filter by source provenance designation"
           >
             <option value="all">All provenance</option>
diff --git a/src/components/clinical-dashboard/document-search-results.tsx b/src/components/clinical-dashboard/document-search-results.tsx
index 002f8f5ec..5de716c5e 100644
--- a/src/components/clinical-dashboard/document-search-results.tsx
+++ b/src/components/clinical-dashboard/document-search-results.tsx
@@ -8,7 +8,6 @@ import {
   FileImage,
   FileText,
   Filter,
-  FolderOpen,
   ListChecks,
   Loader2,
   Pill,
@@ -29,7 +28,7 @@ import { documentDisplayTitle } from "@/components/DocumentOrganizationBadges";
 import { isDeployedClinicalKb } from "@/lib/deployed-app";
 import { ModeHomeTemplate, ModeHomeVerificationFooter } from "@/components/mode-home-template";
 import { ScopeAndGovernanceNotice } from "@/components/clinical-dashboard/answer-content";
-import { ResultSortControl } from "@/components/clinical-dashboard/search-results-header-band";
+import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
 import { UniversalSearchAlsoMatches } from "@/components/clinical-dashboard/universal-search-also-matches";
 import { useResultSort } from "@/components/use-result-sort";
 import { SafeBoldText } from "@/components/SafeBoldText";
@@ -63,7 +62,7 @@ import type { ServiceSearchMatch } from "@/lib/services";
 import type { FormSearchMatch } from "@/lib/forms";
 import type { ClinicalDocument, DocumentMatch, SearchResult, SearchScopeSummary } from "@/lib/types";
 import type { RegistryRequestStatus } from "@/lib/use-registry-records";
-import { sortResultItems, type ResultSortValue } from "@/lib/result-sort";
+import { sortResultItems } from "@/lib/result-sort";
 import { documentRelevancePercent } from "./relevance-score";
 
 type SearchFacet = { value: string; count: number };
@@ -327,9 +326,9 @@ function DocumentSearchHome({
       action: onOpenRecentDocuments,
     },
     {
-      label: "Browse library",
-      description: "All indexed sources.",
-      icon: FolderOpen,
+      label: "Browse sources",
+      description: "Filter all indexed sources.",
+      icon: BookOpen,
       action: onOpenLibrary,
     },
     {
@@ -360,7 +359,7 @@ function DocumentSearchHome({
           <ModeHomeVerificationFooter
             icon={ShieldCheck}
             label="Searches indexed clinical sources"
-            body="Clinical document library"
+            body="Clinical source collection"
           />
           {documentCount > 0 ? (
             <p className="text-xs font-semibold text-[color:var(--text-soft)]" aria-live="polite">
@@ -373,117 +372,57 @@ function DocumentSearchHome({
   );
 }
 
-function SearchResultsHeader({
-  resultLabel,
-  trimmedQuery,
-  sortValue,
-  onSortChange,
-  showSort = true,
-}: {
-  resultLabel: string;
-  trimmedQuery: string;
-  sortValue: ResultSortValue;
-  onSortChange: (value: ResultSortValue) => void;
-  showSort?: boolean;
-}) {
-  return (
-    <section className="flex items-start justify-between gap-3" aria-label="Document search results">
-      <div className="min-w-0">
-        <div className="flex items-center gap-3">
-          <span className="grid h-tap w-tap shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]">
-            <FileText aria-hidden="true" className="h-5 w-5" />
-          </span>
-          <div className="min-w-0">
-            <h3 className="text-lg font-semibold leading-6 text-[color:var(--text-heading)]">{resultLabel}</h3>
-            {trimmedQuery ? (
-              <p className="text-sm font-medium leading-5 text-[color:var(--text-muted)] sm:truncate">
-                <span className="block sm:inline">Results for</span>{" "}
-                <span className="line-clamp-2 font-semibold text-[color:var(--clinical-accent)] sm:inline sm:line-clamp-none">
-                  {trimmedQuery}
-                </span>
-              </p>
-            ) : null}
-          </div>
-        </div>
-      </div>
-      {showSort ? <ResultSortControl value={sortValue} onChange={onSortChange} className="min-h-tap shrink-0" /> : null}
-    </section>
-  );
-}
-
-function DocumentResultsControls({
+function DocumentSourceTypeFilters({
   resultTabs,
   activeResultType,
   onResultTypeChange,
-  sortValue,
-  onSortChange,
-  onOpenLibrary,
 }: {
   resultTabs: Array<{ key: ResultTypeFilter; label: string; count: number }>;
   activeResultType: ResultTypeFilter;
   onResultTypeChange: (value: ResultTypeFilter) => void;
-  sortValue: ResultSortValue;
-  onSortChange: (value: ResultSortValue) => void;
-  onOpenLibrary: () => void;
 }) {
-  const showTypeFilters = resultTabs.length > 1;
+  const resultTypeIcons: Record<ResultTypeFilter, LucideIcon> = {
+    all: BookOpen,
+    tables: ListChecks,
+    images: FileImage,
+    pdfs: FileText,
+  };
 
   return (
-    <section
-      aria-label="Sort and filter documents"
-      data-testid="document-results-controls"
-      className="flex flex-nowrap items-center gap-1.5 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-1 shadow-[var(--shadow-inset)]"
-    >
-      {showTypeFilters ? (
-        <div
-          role="group"
-          aria-label="Filter by result type"
-          className="polished-scroll flex min-w-0 flex-1 items-center gap-1 overflow-x-auto"
-        >
-          {resultTabs.map((tab) => {
-            const active = tab.key === activeResultType;
-            return (
-              <button
-                key={tab.key}
-                type="button"
-                aria-pressed={active}
-                onClick={() => onResultTypeChange(tab.key)}
-                className={cn(
-                  "inline-flex min-h-tap shrink-0 items-center gap-1.5 rounded-md px-2.5 text-2xs font-bold transition motion-reduce:transition-none",
-                  "focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
-                  active
-                    ? "bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]"
-                    : "text-[color:var(--text-muted)] hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)]",
-                )}
-              >
-                {tab.label}
-                <span className="nums opacity-75">{tab.count}</span>
-              </button>
-            );
-          })}
-        </div>
-      ) : (
-        <div className="min-w-0 flex-1" aria-hidden="true" />
-      )}
-      <div className="flex shrink-0 items-center gap-1">
-        <ResultSortControl
-          value={sortValue}
-          onChange={onSortChange}
-          compact
-          className="min-h-tap border-[color:var(--border)] bg-[color:var(--surface)]"
-        />
-        <button
-          type="button"
-          onClick={onOpenLibrary}
-          aria-label="Open document library"
-          title="Open document library"
-          className={cn(floatingControl, "min-h-tap min-w-tap gap-1.5 rounded-lg px-2.5 text-xs sm:px-3")}
-        >
-          <FolderOpen aria-hidden="true" className="size-icon-md shrink-0" />
-          <span className="hidden sm:inline">Library</span>
-        </button>
+    <div data-testid="document-results-controls" className="flex min-w-0 items-center gap-2">
+      <span className="shrink-0 text-3xs font-extrabold uppercase tracking-[0.1em] text-[color:var(--text-soft)]">
+        Source type
+      </span>
+      <div
+        role="group"
+        aria-label="Filter by source type"
+        className="polished-scroll flex min-w-0 flex-1 items-center gap-1.5 overflow-x-auto"
+      >
+        {resultTabs.map((tab) => {
+          const active = tab.key === activeResultType;
+          const Icon = resultTypeIcons[tab.key];
+          return (
+            <button
+              key={tab.key}
+              type="button"
+              aria-pressed={active}
+              onClick={() => onResultTypeChange(tab.key)}
+              className={cn(
+                "inline-flex min-h-tap shrink-0 items-center gap-1.5 rounded-lg border px-2.5 text-2xs font-bold transition motion-reduce:transition-none sm:min-h-9 sm:text-xs",
+                "focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
+                active
+                  ? "border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]"
+                  : "border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text-muted)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text)]",
+              )}
+            >
+              <Icon aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
+              {tab.label}
+              <span className="nums opacity-75">{tab.count}</span>
+            </button>
+          );
+        })}
       </div>
-    </section>
+    </div>
   );
 }
 
@@ -907,7 +846,6 @@ function DocumentSearchResultsPanelImpl({
   const selectedDocument =
     sortedMatches.find((document) => document.document_id === selectedDocumentId) ?? sortedMatches[0] ?? null;
   const recordMatchCount = recordMatches.length;
-  const recordCopy = searchRecordConfig[recordMode];
   const shouldShowHome = showHome || !trimmedQuery;
 
   function toggleTagFacet(facet: SmartDocumentTagFacet) {
@@ -929,23 +867,6 @@ function DocumentSearchResultsPanelImpl({
       : !realDataReady
         ? setupWarning || "Complete the search setup before using Documents mode."
         : null;
-  const resultLabel = (() => {
-    if (loading) {
-      return showRecordMatches
-        ? `Finding matching ${recordCopy.recordLabel}${recordMatchCount === 1 ? "" : "s"}`
-        : "Finding matching documents";
-    }
-    if (recordMatchCount > 0 && matches.length > 0) {
-      return `${recordMatchCount} ${recordCopy.recordLabel}${recordMatchCount === 1 ? "" : "s"} and ${
-        sortedMatches.length
-      } document${sortedMatches.length === 1 ? "" : "s"}`;
-    }
-    if (recordMatchCount > 0)
-      return `${recordMatchCount} ${recordCopy.recordLabel}${recordMatchCount === 1 ? "" : "s"}`;
-    if (matches.length) return `${sortedMatches.length} document${sortedMatches.length === 1 ? "" : "s"}`;
-    if (trimmedQuery) return "No matching documents";
-    return `${documentCount} document${documentCount === 1 ? "" : "s"}`;
-  })();
   const showResultsControls = matches.length > 0 && !loading;
   const showIdentityHeader =
     recordMatchCount > 0 ||
@@ -957,23 +878,40 @@ function DocumentSearchResultsPanelImpl({
   return (
     <div data-testid="document-search-workspace" className="w-full space-y-3">
       {showIdentityHeader ? (
-        <SearchResultsHeader
-          resultLabel={resultLabel}
-          trimmedQuery={trimmedQuery}
+        <SearchResultsHeaderBand
+          modeId={showRecordMatches ? recordMode : "documents"}
+          query={trimmedQuery}
+          matchCount={recordMatchCount + sortedMatches.length}
+          loading={loading}
           sortValue={sortValue}
-          onSortChange={setSortValue}
-          showSort={!showResultsControls}
-        />
-      ) : null}
-
-      {showResultsControls ? (
-        <DocumentResultsControls
-          resultTabs={resultTabs}
-          activeResultType={effectiveResultType}
-          onResultTypeChange={setActiveResultType}
-          sortValue={sortValue}
-          onSortChange={setSortValue}
-          onOpenLibrary={onOpenLibrary}
+          onSortChange={matches.length > 0 ? setSortValue : undefined}
+          utilityControls={
+            !loading && !shouldShowHome ? (
+              <button
+                type="button"
+                onClick={onOpenLibrary}
+                aria-label="Open source filters"
+                title="Filter and browse sources"
+                className={cn(
+                  floatingControl,
+                  "min-h-tap min-w-tap gap-1.5 rounded-lg bg-[color:var(--surface)] px-2.5 text-xs sm:min-h-10 sm:min-w-10 sm:px-3",
+                )}
+              >
+                <BookOpen aria-hidden="true" className="size-icon-md shrink-0" />
+                <span>Sources</span>
+              </button>
+            ) : null
+          }
+          filterLabel="Filter documents by source type"
+          filterControls={
+            showResultsControls && resultTabs.length > 1 ? (
+              <DocumentSourceTypeFilters
+                resultTabs={resultTabs}
+                activeResultType={effectiveResultType}
+                onResultTypeChange={setActiveResultType}
+              />
+            ) : null
+          }
         />
       ) : null}
 
diff --git a/src/components/clinical-dashboard/favourites-command-library-page.tsx b/src/components/clinical-dashboard/favourites-command-library-page.tsx
index 4e2baf8d0..13fc3a2f9 100644
--- a/src/components/clinical-dashboard/favourites-command-library-page.tsx
+++ b/src/components/clinical-dashboard/favourites-command-library-page.tsx
@@ -312,6 +312,7 @@ function ActiveFilterChips({
   onClearType,
   onClearSet,
   onClearViewMode,
+  includeSearch = true,
 }: {
   searchTerm: string;
   selectedTypeId: string;
@@ -321,11 +322,14 @@ function ActiveFilterChips({
   onClearType: () => void;
   onClearSet: () => void;
   onClearViewMode: () => void;
+  includeSearch?: boolean;
 }) {
   const typeLabel = favouriteTabs.find((tab) => tab.id === selectedTypeId)?.label;
   const chips: { key: string; label: string; onClear: () => void }[] = [];
 
-  if (searchTerm.trim()) chips.push({ key: "search", label: `Search: ${searchTerm.trim()}`, onClear: onClearSearch });
+  if (includeSearch && searchTerm.trim()) {
+    chips.push({ key: "search", label: `Search: ${searchTerm.trim()}`, onClear: onClearSearch });
+  }
   if (selectedSet) chips.push({ key: "set", label: selectedSet.title, onClear: onClearSet });
   if (selectedTypeId !== "all" && typeLabel) chips.push({ key: "type", label: typeLabel, onClear: onClearType });
   if (viewMode === "source-backed") chips.push({ key: "view", label: "Source-backed", onClear: onClearViewMode });
@@ -1186,7 +1190,27 @@ export function FavouritesCommandLibraryPage({ query = "", demoMode }: { query?:
               className="mode-home-composer-slot hidden w-full max-w-3xl [&:not(:empty)]:block"
             />
 
-            <SearchResultsHeaderBand modeId="favourites" query={query} matchCount={scopedItems.length} />
+            <SearchResultsHeaderBand
+              modeId="favourites"
+              query={query}
+              matchCount={scopedItems.length}
+              filterLabel="Active favourites filters"
+              filterControls={
+                selectedTypeId !== "all" || selectedSet || viewMode !== "all" ? (
+                  <ActiveFilterChips
+                    searchTerm={query}
+                    selectedTypeId={selectedTypeId}
+                    selectedSet={selectedSet}
+                    viewMode={viewMode}
+                    onClearSearch={clearSearch}
+                    onClearType={() => setSelectedTypeId("all")}
+                    onClearSet={() => setSelectedSetId(null)}
+                    onClearViewMode={() => setViewMode("all")}
+                    includeSearch={false}
+                  />
+                ) : null
+              }
+            />
 
             <FavouritesMobileQuickViews
               items={items}
@@ -1206,17 +1230,6 @@ export function FavouritesCommandLibraryPage({ query = "", demoMode }: { query?:
               onSelectViewMode={setViewMode}
             />
 
-            <ActiveFilterChips
-              searchTerm={query}
-              selectedTypeId={selectedTypeId}
-              selectedSet={selectedSet}
-              viewMode={viewMode}
-              onClearSearch={clearSearch}
-              onClearType={() => setSelectedTypeId("all")}
-              onClearSet={() => setSelectedSetId(null)}
-              onClearViewMode={() => setViewMode("all")}
-            />
-
             {showContinueStrip && continueItem ? <ContinueStrip item={continueItem} /> : null}
 
             {query.trim() && scopedItems.length === 0 ? (
diff --git a/src/components/clinical-dashboard/medication-prescribing-workspace.tsx b/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
index 96f0fd5d7..d44baa3a7 100644
--- a/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
+++ b/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
@@ -461,12 +461,17 @@ function MedicationResults({
 
   return (
     <div className={cn(pageContainer, "medication-results-workspace space-y-3 py-0 sm:py-2")}>
-      <SearchResultsHeaderBand modeId="prescribing" query={query} matchCount={resultCount} loading={catalog.loading} />
+      <SearchResultsHeaderBand
+        modeId="prescribing"
+        query={query}
+        matchCount={resultCount}
+        loading={catalog.loading}
+        filterLabel="Filter medication results"
+        filterControls={<FilterStrip activeFilter={activeFilter} counts={counts} onFilterChange={setActiveFilter} />}
+      />
 
       <PatientProfilePanel variant="compact" className="medication-patient-strip" />
 
-      <FilterStrip activeFilter={activeFilter} counts={counts} onFilterChange={setActiveFilter} />
-
       {catalog.loading || catalog.error ? (
         <div className="medication-results-inset">
           {catalog.loading ? (
diff --git a/src/components/clinical-dashboard/mode-action-popup.tsx b/src/components/clinical-dashboard/mode-action-popup.tsx
index dfb1e872f..9df6758b4 100644
--- a/src/components/clinical-dashboard/mode-action-popup.tsx
+++ b/src/components/clinical-dashboard/mode-action-popup.tsx
@@ -157,7 +157,7 @@ const modeActionSets = {
       icon: MessageSquarePlus,
       primary: true,
     },
-    { id: "documents-upload", label: "Add document", description: "Upload a source to the library", icon: UploadCloud },
+    { id: "documents-upload", label: "Add document", description: "Upload a source", icon: UploadCloud },
     { id: "documents-scope", label: "Scope", description: "Limit answers to chosen sources", icon: Filter },
     {
       id: "answer-evidence-map",
@@ -165,14 +165,14 @@ const modeActionSets = {
       description: "Trace quotes and source support",
       icon: ListChecks,
     },
-    { id: "documents-search", label: "Search library", description: "Find indexed sources", icon: Search },
+    { id: "documents-search", label: "Search sources", description: "Find indexed sources", icon: Search },
     { id: "tools-browse", label: "Clinical tools", description: "Open clinical tools", icon: Wrench },
   ],
   documents: [
     {
       id: "documents-upload",
       label: "Upload PDF",
-      description: "Add a source to the library",
+      description: "Add an indexed source",
       icon: UploadCloud,
       primary: true,
     },
diff --git a/src/components/clinical-dashboard/search-results-header-band.tsx b/src/components/clinical-dashboard/search-results-header-band.tsx
index 83fe52082..02fd49504 100644
--- a/src/components/clinical-dashboard/search-results-header-band.tsx
+++ b/src/components/clinical-dashboard/search-results-header-band.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Bookmark, CheckCircle2, ChevronsUpDown, LayoutList, LoaderCircle, Search, Table2, X } from "lucide-react";
+import type { ReactNode } from "react";
 
 import { searchCommandSurfaceConfig } from "@/lib/search-command-surface";
 import { cn } from "@/components/ui-primitives";
@@ -21,6 +22,10 @@ export function SearchResultsHeaderBand({
   sortValue = "relevance",
   onSortChange,
   onSaveSearch,
+  utilityControls,
+  filterControls,
+  filterLabel = "Filter search results",
+  headingLevel = 2,
   className,
 }: {
   modeId: AppModeId;
@@ -32,6 +37,13 @@ export function SearchResultsHeaderBand({
   sortValue?: ResultSortValue;
   onSortChange?: (value: ResultSortValue) => void;
   onSaveSearch?: () => void;
+  /** Page-specific actions that belong beside sort/view controls. */
+  utilityControls?: ReactNode;
+  /** Page-specific filters rendered as a full-width row within the shared ribbon. */
+  filterControls?: ReactNode;
+  filterLabel?: string;
+  /** Use level 1 when the ribbon is the route's primary page heading. */
+  headingLevel?: 1 | 2;
   className?: string;
 }) {
   const command = useSearchCommand();
@@ -43,7 +55,9 @@ export function SearchResultsHeaderBand({
   });
   const displayQuery = query.trim() || "All";
   const statusLabel = loading ? "Searching…" : `${matchCount} ${matchCount === 1 ? "match" : "matches"}`;
-  const hasUtilities = visibleScopes.length > 0 || Boolean(onSortChange || onViewChange || onSaveSearch);
+  const hasUtilities =
+    visibleScopes.length > 0 || Boolean(onSortChange || onViewChange || onSaveSearch || utilityControls);
+  const QueryHeading = headingLevel === 1 ? "h1" : "h2";
 
   return (
     <section
@@ -72,12 +86,12 @@ export function SearchResultsHeaderBand({
               <span className="lg:hidden">Query</span>
               <span className="hidden lg:inline">{loading ? "Searching for" : "Results for"}</span>
             </span>
-            <h2
+            <QueryHeading
               className="mt-0.5 truncate text-base font-extrabold text-[color:var(--text-heading)] lg:max-w-[32rem] lg:text-lg"
               title={displayQuery}
             >
               {displayQuery}
-            </h2>
+            </QueryHeading>
           </span>
           <span
             className={cn(
@@ -111,7 +125,7 @@ export function SearchResultsHeaderBand({
                 onClick={() => command?.onRemoveScope(scope.id)}
                 aria-label={`Remove ${scope.label} filter`}
                 className={cn(
-                  "inline-flex min-h-10 max-w-full items-center gap-1 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-2.5 text-xs font-bold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text)]",
+                  "inline-flex min-h-tap max-w-full items-center gap-1 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-2.5 text-xs font-bold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text)] sm:min-h-10",
                   focusRing,
                 )}
               >
@@ -127,9 +141,10 @@ export function SearchResultsHeaderBand({
                 className="min-w-[8.5rem] flex-1 sm:flex-none"
               />
             ) : null}
+            {utilityControls}
             {onViewChange ? (
               <div
-                className="inline-flex min-h-10 overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] shadow-[var(--shadow-inset)]"
+                className="inline-flex min-h-tap overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] shadow-[var(--shadow-inset)] sm:min-h-10"
                 role="group"
                 aria-label="Results view"
               >
@@ -138,7 +153,7 @@ export function SearchResultsHeaderBand({
                   aria-pressed={view === "table"}
                   onClick={() => onViewChange("table")}
                   className={cn(
-                    "grid min-h-10 min-w-10 place-items-center",
+                    "grid min-h-tap min-w-tap place-items-center sm:min-h-10 sm:min-w-10",
                     focusRing,
                     view === "table"
                       ? "bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]"
@@ -153,7 +168,7 @@ export function SearchResultsHeaderBand({
                   aria-pressed={view === "list"}
                   onClick={() => onViewChange("list")}
                   className={cn(
-                    "grid min-h-10 min-w-10 place-items-center border-l border-[color:var(--border)]",
+                    "grid min-h-tap min-w-tap place-items-center border-l border-[color:var(--border)] sm:min-h-10 sm:min-w-10",
                     focusRing,
                     view === "list"
                       ? "bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]"
@@ -170,7 +185,7 @@ export function SearchResultsHeaderBand({
                 type="button"
                 onClick={onSaveSearch}
                 className={cn(
-                  "inline-flex min-h-10 items-center gap-1.5 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-2.5 text-xs font-extrabold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text)]",
+                  "inline-flex min-h-tap items-center gap-1.5 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-2.5 text-xs font-extrabold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text)] sm:min-h-10",
                   focusRing,
                 )}
               >
@@ -181,6 +196,16 @@ export function SearchResultsHeaderBand({
           </div>
         ) : null}
       </div>
+      {filterControls ? (
+        <div
+          data-testid="search-query-ribbon-filters"
+          role="group"
+          aria-label={filterLabel}
+          className="min-w-0 border-t border-[color:var(--border)] bg-[color:var(--surface-subtle)] px-2.5 py-2 sm:px-3"
+        >
+          {filterControls}
+        </div>
+      ) : null}
     </section>
   );
 }
@@ -200,7 +225,7 @@ export function ResultSortControl({
   return (
     <label
       className={cn(
-        "relative inline-flex min-h-10 items-center gap-1.5 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] py-1 pl-2.5 pr-7 text-xs font-bold shadow-[var(--shadow-inset)]",
+        "relative inline-flex min-h-tap items-center gap-1.5 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] py-1 pl-2.5 pr-7 text-xs font-bold shadow-[var(--shadow-inset)] sm:min-h-10",
         "focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-[color:var(--focus)]",
         className,
       )}
diff --git a/src/components/dsm/dsm-search-page.tsx b/src/components/dsm/dsm-search-page.tsx
index 28dccf047..f6dd03b4d 100644
--- a/src/components/dsm/dsm-search-page.tsx
+++ b/src/components/dsm/dsm-search-page.tsx
@@ -22,6 +22,7 @@ import {
 } from "lucide-react";
 
 import { DsmPageHeader } from "@/components/dsm/dsm-page-header";
+import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
 import { useDismissableLayer } from "@/components/use-dismissable-layer";
 import { cn, codeText, metadataPill, pageContainer, searchFocusRing } from "@/components/ui-primitives";
 import type { DsmCategory, DsmDiagnosisSummary } from "@/lib/dsm";
@@ -251,18 +252,12 @@ export function DsmSearchPage({
     });
   }
 
-  const description = query
-    ? `${results.length} ${results.length === 1 ? "match" : "matches"} for “${query}”${
-        activeCategory ? ` in ${activeCategory.label}` : ""
-      }.`
-    : `${results.length} of ${totalCount} diagnoses${activeCategory ? ` in ${activeCategory.label}` : ""}.`;
-
   return (
     <div data-testid="dsm-search-page" className="min-h-full bg-[color:var(--background)]">
       <DsmPageHeader
         eyebrow="Diagnosis catalogue"
-        title={query ? `Search results for “${query}”` : "Search diagnoses"}
-        description={description}
+        title="Diagnosis search"
+        description="Find diagnostic records by name, ICD code, symptom phrase, or category."
         actions={
           canCompare ? (
             <Link
@@ -278,27 +273,35 @@ export function DsmSearchPage({
       />
 
       <div className={cn(pageContainer, "space-y-4 px-4 py-4 sm:px-6 sm:py-6 lg:px-8")}>
-        <section aria-label="Filter by category" className="flex flex-wrap items-center gap-x-3 gap-y-2">
-          <CategoryFilterDropdown
-            query={query}
-            categories={categories}
-            activeCategory={activeCategory}
-            totalCount={totalCount}
-            selected={selected}
-          />
-          {activeCategory ? (
-            <Link
-              href={categoryHref(query, undefined, selected)}
-              className={cn(
-                "inline-flex min-h-tap items-center gap-1 rounded-lg px-2 text-xs font-bold text-[color:var(--clinical-accent)] transition hover:bg-[color:var(--clinical-accent-soft)]",
-                searchFocusRing,
-              )}
-            >
-              <X className="h-3.5 w-3.5" aria-hidden />
-              Clear filter
-            </Link>
-          ) : null}
-        </section>
+        <SearchResultsHeaderBand
+          modeId="dsm"
+          query={query}
+          matchCount={results.length}
+          filterLabel="Filter diagnoses by category"
+          filterControls={
+            <div className="flex flex-wrap items-center gap-x-2 gap-y-1.5">
+              <CategoryFilterDropdown
+                query={query}
+                categories={categories}
+                activeCategory={activeCategory}
+                totalCount={totalCount}
+                selected={selected}
+              />
+              {activeCategory ? (
+                <Link
+                  href={categoryHref(query, undefined, selected)}
+                  className={cn(
+                    "inline-flex min-h-10 items-center gap-1 rounded-lg px-2 text-xs font-bold text-[color:var(--clinical-accent)] transition hover:bg-[color:var(--clinical-accent-soft)]",
+                    searchFocusRing,
+                  )}
+                >
+                  <X className="h-3.5 w-3.5" aria-hidden />
+                  Clear category
+                </Link>
+              ) : null}
+            </div>
+          }
+        />
 
         {results.length ? (
           <div className="grid gap-4 lg:grid-cols-[minmax(0,1fr)_19rem] lg:items-start">
diff --git a/src/components/factsheets/factsheets-search-page.tsx b/src/components/factsheets/factsheets-search-page.tsx
index be68e32b1..5e5a48ac0 100644
--- a/src/components/factsheets/factsheets-search-page.tsx
+++ b/src/components/factsheets/factsheets-search-page.tsx
@@ -4,6 +4,7 @@ import Link from "next/link";
 import { ChevronRight, Info, LayoutGrid, List, SearchX } from "lucide-react";
 import { useState } from "react";
 
+import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
 import {
   categoryTheme,
   factsheetCategories,
@@ -40,12 +41,6 @@ export function FactsheetsSearchPage({
   const [view, setView] = useState<ViewMode>("list");
   const activeCategory = factsheetCategories.find((entry) => entry === category);
 
-  const resultLine = query
-    ? `${results.length} result${results.length === 1 ? "" : "s"} for “${query}”${
-        activeCategory ? ` in ${activeCategory}` : ""
-      }`
-    : `${results.length} factsheet${results.length === 1 ? "" : "s"}${activeCategory ? ` in ${activeCategory}` : ""}`;
-
   return (
     <div
       data-testid="factsheets-search-page"
@@ -56,61 +51,71 @@ export function FactsheetsSearchPage({
         Search patient information
       </h1>
 
-      <section aria-label="Filter by category" className="mt-4 flex flex-wrap items-center gap-2">
-        <span className="mr-1 text-xs font-bold text-[color:var(--text-soft)]">Filter:</span>
-        {filterChips.map((chip) => {
-          const isActive = chip.key ? activeCategory === chip.key : !activeCategory;
-          return (
-            <Link
-              key={chip.label}
-              href={searchHref(query, chip.key)}
-              aria-current={isActive ? "true" : undefined}
-              className={cn(
-                "inline-flex min-h-tap items-center rounded-lg border px-3 text-xs font-bold transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
-                isActive
-                  ? "border-transparent bg-[color:var(--clinical-accent)] text-[color:var(--clinical-accent-contrast)]"
-                  : "border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text-muted)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text)]",
-              )}
-            >
-              {chip.label}
-            </Link>
-          );
-        })}
-      </section>
-
-      <div className="mt-5 flex items-center justify-between gap-3">
-        <p className="text-sm-minus font-medium text-[color:var(--text-muted)]">{resultLine}</p>
-        <div
-          role="group"
-          aria-label="Result view"
-          className="inline-flex gap-1 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-inset)] p-1"
-        >
-          {(["list", "cards"] as const).map((mode) => {
-            const isActive = view === mode;
-            return (
-              <button
-                key={mode}
-                type="button"
-                onClick={() => setView(mode)}
-                aria-pressed={isActive}
-                className={cn(
-                  "inline-flex min-h-8 items-center gap-1.5 rounded-md px-2.5 text-xs font-bold capitalize transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
-                  isActive
-                    ? "bg-[color:var(--surface)] text-[color:var(--text-heading)] shadow-[var(--shadow-tight)]"
-                    : "text-[color:var(--text-muted)] hover:text-[color:var(--text)]",
-                )}
-              >
-                {mode === "list" ? (
-                  <List className="h-3.5 w-3.5" aria-hidden="true" />
-                ) : (
-                  <LayoutGrid className="h-3.5 w-3.5" aria-hidden="true" />
-                )}
-                {mode}
-              </button>
-            );
-          })}
-        </div>
-      </div>
+      <SearchResultsHeaderBand
+        modeId="factsheets"
+        query={query}
+        matchCount={results.length}
+        className="mt-4"
+        utilityControls={
+          <div
+            role="group"
+            aria-label="Result view"
+            className="inline-flex min-h-tap overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] shadow-[var(--shadow-inset)] sm:min-h-10"
+          >
+            {(["list", "cards"] as const).map((mode) => {
+              const isActive = view === mode;
+              return (
+                <button
+                  key={mode}
+                  type="button"
+                  onClick={() => setView(mode)}
+                  aria-pressed={isActive}
+                  className={cn(
+                    "inline-flex min-h-tap items-center gap-1.5 px-2.5 text-xs font-bold capitalize transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:min-h-10",
+                    mode === "cards" && "border-l border-[color:var(--border)]",
+                    isActive
+                      ? "bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]"
+                      : "text-[color:var(--text-muted)] hover:text-[color:var(--text)]",
+                  )}
+                >
+                  {mode === "list" ? (
+                    <List className="h-3.5 w-3.5" aria-hidden="true" />
+                  ) : (
+                    <LayoutGrid className="h-3.5 w-3.5" aria-hidden="true" />
+                  )}
+                  <span className="max-[389px]:sr-only">{mode}</span>
+                </button>
+              );
+            })}
+          </div>
+        }
+        filterLabel="Filter factsheets by category"
+        filterControls={
+          <div className="polished-scroll flex min-w-0 items-center gap-1.5 overflow-x-auto">
+            <span className="hidden shrink-0 text-3xs font-extrabold uppercase tracking-[0.1em] text-[color:var(--text-soft)] sm:inline">
+              Category
+            </span>
+            {filterChips.map((chip) => {
+              const isActive = chip.key ? activeCategory === chip.key : !activeCategory;
+              return (
+                <Link
+                  key={chip.label}
+                  href={searchHref(query, chip.key)}
+                  aria-current={isActive ? "true" : undefined}
+                  className={cn(
+                    "inline-flex min-h-tap shrink-0 items-center rounded-lg border px-2.5 text-2xs font-bold transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:min-h-9 sm:text-xs",
+                    isActive
+                      ? "border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]"
+                      : "border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text-muted)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text)]",
+                  )}
+                >
+                  {chip.label}
+                </Link>
+              );
+            })}
+          </div>
+        }
+      />
 
       {results.length === 0 ? (
         <section className="mt-4 grid justify-items-center gap-3 rounded-xl border border-dashed border-[color:var(--border-strong)] bg-[color:var(--surface-inset)] px-4 py-12 text-center">
diff --git a/src/components/forms/forms-search-results-page.tsx b/src/components/forms/forms-search-results-page.tsx
index 1e3e8f6bd..22e43b1c5 100644
--- a/src/components/forms/forms-search-results-page.tsx
+++ b/src/components/forms/forms-search-results-page.tsx
@@ -650,6 +650,21 @@ function FormsSearchResultsPageContent({ query }: FormsSearchResultsPageProps) {
               matchCount={displayedMatches.length}
               sortValue={sortValue}
               onSortChange={setSortValue}
+              filterLabel="Filter form results"
+              filterControls={
+                <div className="flex min-w-0 items-center gap-2">
+                  <div className="min-w-0 flex-1 overflow-x-auto">
+                    <ResultTabs formsCount={displayedMatches.length} />
+                  </div>
+                  {supportsPathwayClaims ? (
+                    <RefineBar
+                      open={refineOpen}
+                      onToggle={() => setRefineOpen((open) => !open)}
+                      panelId={refinePanelId}
+                    />
+                  ) : null}
+                </div>
+              }
             />
             {query.trim() && deferredQuery === query && displayedMatches.length === 0 ? (
               <SearchResultsEmptyState
@@ -662,20 +677,6 @@ function FormsSearchResultsPageContent({ query }: FormsSearchResultsPageProps) {
               />
             ) : (
               <>
-                <div className="flex min-w-0 items-end gap-3 border-b border-[color:var(--border)]">
-                  <div className="min-w-0 flex-1 overflow-x-auto">
-                    <ResultTabs formsCount={displayedMatches.length} />
-                  </div>
-                  <div className="flex items-center gap-2 pb-1.5">
-                    {supportsPathwayClaims ? (
-                      <RefineBar
-                        open={refineOpen}
-                        onToggle={() => setRefineOpen((open) => !open)}
-                        panelId={refinePanelId}
-                      />
-                    ) : null}
-                  </div>
-                </div>
                 {supportsPathwayClaims ? <RefinePanel open={refineOpen} panelId={refinePanelId} /> : null}
                 <div className="hidden md:block">
                   <ResultsTable matches={displayedMatches} query={query} sortValue={sortValue} />
diff --git a/src/components/formulation/formulation-home-page.tsx b/src/components/formulation/formulation-home-page.tsx
index f8ec73edc..348c5a111 100644
--- a/src/components/formulation/formulation-home-page.tsx
+++ b/src/components/formulation/formulation-home-page.tsx
@@ -23,6 +23,7 @@ import {
   formulationCard,
 } from "@/components/formulation/formulation-ui";
 import { ModeHomeMain, ModeHomeTemplate, ModeHomeVerificationFooter } from "@/components/mode-home-template";
+import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
 import { cn, eyebrowText } from "@/components/ui-primitives";
 import { appModeHomeHref } from "@/lib/app-modes";
 import {
@@ -195,53 +196,49 @@ function FormulationResults({ query }: { query: string }) {
         <FormulationSubnav active="search" />
       </div>
 
-      <header className="grid gap-2 border-b border-[color:var(--border)] pb-5 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-end">
-        <div className="grid gap-1.5">
-          <p className={eyebrowText}>Mechanism search</p>
-          <h1 className="text-2xl font-extrabold tracking-tight text-[color:var(--text-heading)] sm:text-3xl">
-            Mechanisms matching “{query}”
-          </h1>
-          <p className="max-w-3xl text-sm font-medium leading-6 text-[color:var(--text-muted)]">
-            Matches use patient language, clinical clues, domains, symptoms, and formulation context. Open a mechanism
-            to test fit and competing explanations.
-          </p>
-        </div>
-        <p className="nums text-sm font-bold text-[color:var(--text-muted)]" aria-live="polite">
-          {results.length} {results.length === 1 ? "match" : "matches"}
-        </p>
-      </header>
+      <SearchResultsHeaderBand
+        modeId="formulation"
+        query={query}
+        matchCount={results.length}
+        loading={!rankingReady}
+        headingLevel={1}
+        filterLabel="Filter formulation mechanisms"
+        filterControls={
+          <div className="grid gap-2 sm:grid-cols-[minmax(0,1fr)_16rem] sm:items-center">
+            <div className="polished-scroll flex gap-1.5 overflow-x-auto">
+              {formulationSearchPresets.slice(0, 4).map((preset) => (
+                <Link
+                  key={preset.label}
+                  href={presetHref(preset.query)}
+                  className="inline-flex min-h-tap shrink-0 items-center rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-2.5 text-xs font-semibold text-[color:var(--text-muted)] hover:border-[color:var(--clinical-accent-border)] hover:text-[color:var(--clinical-accent)] sm:min-h-10"
+                >
+                  {preset.label}
+                </Link>
+              ))}
+            </div>
+            <label className="grid gap-1">
+              <span className="sr-only">Filter by formulation domain</span>
+              <select
+                value={domain}
+                onChange={(event) => setDomain(event.target.value)}
+                className="min-h-tap rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 text-xs font-semibold text-[color:var(--text)] shadow-[var(--shadow-inset)] outline-none focus:border-[color:var(--focus)] focus:ring-4 focus:ring-[color:var(--focus)]/20 sm:min-h-10"
+              >
+                <option value="all">All formulation domains</option>
+                {formulationDomains.map((item) => (
+                  <option key={item} value={item}>
+                    {item}
+                  </option>
+                ))}
+              </select>
+            </label>
+          </div>
+        }
+      />
 
-      <section
-        aria-label="Filter mechanism results"
-        className="grid gap-2 sm:grid-cols-[minmax(0,1fr)_16rem] sm:items-center"
-      >
-        <div className="polished-scroll flex gap-2 overflow-x-auto">
-          {formulationSearchPresets.slice(0, 4).map((preset) => (
-            <Link
-              key={preset.label}
-              href={presetHref(preset.query)}
-              className="inline-flex min-h-tap shrink-0 items-center rounded-md border border-[color:var(--border)] bg-[color:var(--surface)] px-3 text-xs font-semibold text-[color:var(--text-muted)] hover:border-[color:var(--clinical-accent-border)] hover:text-[color:var(--clinical-accent)] lg:min-h-9"
-            >
-              {preset.label}
-            </Link>
-          ))}
-        </div>
-        <label className="grid gap-1">
-          <span className="sr-only">Filter by formulation domain</span>
-          <select
-            value={domain}
-            onChange={(event) => setDomain(event.target.value)}
-            className="min-h-tap rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 text-sm font-semibold text-[color:var(--text)] shadow-[var(--shadow-inset)] outline-none focus:border-[color:var(--focus)] focus:ring-4 focus:ring-[color:var(--focus)]/20"
-          >
-            <option value="all">All formulation domains</option>
-            {formulationDomains.map((item) => (
-              <option key={item} value={item}>
-                {item}
-              </option>
-            ))}
-          </select>
-        </label>
-      </section>
+      <p className="max-w-3xl text-sm font-medium leading-6 text-[color:var(--text-muted)]">
+        Matches use patient language, clinical clues, domains, symptoms, and formulation context. Open a mechanism to
+        test fit and competing explanations.
+      </p>
 
       {results.length === 0 && rankingReady ? (
         <EmptySearchResults query={query} />
diff --git a/src/components/services/services-navigator-page.tsx b/src/components/services/services-navigator-page.tsx
index 04f6dc740..be7d27357 100644
--- a/src/components/services/services-navigator-page.tsx
+++ b/src/components/services/services-navigator-page.tsx
@@ -42,6 +42,14 @@ import { UniversalSearchAlsoMatches } from "@/components/clinical-dashboard/univ
 import { useResultSort } from "@/components/use-result-sort";
 
 const defaultQuery = "13YARN crisis Aboriginal Torres Strait Islander phone";
+const serviceQuickFilters = [
+  { label: "Best fit", query: defaultQuery },
+  { label: "Crisis", query: "crisis" },
+  { label: "Culturally safe", query: "Aboriginal Torres Strait Islander" },
+  { label: "Phone referral", query: "phone referral" },
+  { label: "Free", query: "free" },
+  { label: "WA", query: "WA" },
+];
 
 function text(value: string | null | undefined, fallback = "Confirm locally") {
   return value?.trim() ? value.trim() : fallback;
@@ -611,6 +619,41 @@ export function ServicesNavigatorPage() {
             loading={registryLoading}
             sortValue={sortValue}
             onSortChange={setSortValue}
+            filterLabel="Quick service filters"
+            filterControls={
+              <div className="flex min-w-0 items-center gap-2">
+                <span className="hidden shrink-0 items-center gap-1.5 text-3xs font-extrabold uppercase tracking-[0.1em] text-[color:var(--text-soft)] sm:inline-flex">
+                  <SlidersHorizontal className="h-3.5 w-3.5" aria-hidden />
+                  Quick filters
+                </span>
+                <div className="polished-scroll flex min-w-0 flex-1 gap-1.5 overflow-x-auto">
+                  {serviceQuickFilters.map((filter) => (
+                    <button
+                      key={filter.label}
+                      type="button"
+                      onClick={() => applyServiceQuery(filter.query)}
+                      aria-pressed={query.trim().toLowerCase() === filter.query.toLowerCase()}
+                      className={cn(
+                        "inline-flex min-h-tap shrink-0 items-center rounded-lg border px-2.5 text-2xs font-bold transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:min-h-9 sm:text-xs",
+                        query.trim().toLowerCase() === filter.query.toLowerCase()
+                          ? "border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]"
+                          : "border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text-muted)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text)]",
+                      )}
+                    >
+                      {filter.label}
+                    </button>
+                  ))}
+                </div>
+                <button
+                  type="button"
+                  onClick={() => setLocalQuery({ urlQuery, value: "" })}
+                  aria-label="Clear quick filters"
+                  className="inline-flex min-h-tap shrink-0 items-center rounded-lg px-2 text-xs font-bold text-[color:var(--clinical-accent)] hover:bg-[color:var(--clinical-accent-soft)] sm:min-h-9"
+                >
+                  Clear
+                </button>
+              </div>
+            }
           />
         </>
       }
@@ -672,56 +715,6 @@ export function ServicesNavigatorPage() {
                   </p>
                 </div>
               </div>
-              <div className="flex shrink-0 items-center gap-2">
-                <button
-                  className="inline-flex min-h-10 w-10 cursor-not-allowed items-center justify-center gap-2 rounded-xl border border-[color:var(--border)] bg-[color:var(--surface)] px-2 text-sm font-bold text-[color:var(--text-muted)] opacity-75 shadow-[var(--shadow-tight)] sm:min-h-tap sm:w-auto sm:px-4"
-                  type="button"
-                  aria-label="Advanced service filters"
-                  aria-describedby="services-filters-unavailable"
-                  disabled
-                  title="Advanced service filters — coming soon"
-                >
-                  <SlidersHorizontal className="h-4 w-4" aria-hidden />
-                  <span className="hidden sm:inline">Filters</span>
-                </button>
-                <span id="services-filters-unavailable" className="sr-only">
-                  Advanced service filters are coming soon. Use the quick filters below for now.
-                </span>
-              </div>
-            </div>
-            <div className="flex min-w-0 flex-wrap items-center gap-2 border-t border-[color:var(--border)] bg-[color:var(--surface)] px-3 py-2.5 sm:px-4">
-              <div className="flex min-w-0 flex-1 flex-wrap items-center gap-2 overflow-hidden">
-                {[
-                  { label: "Best fit", query: defaultQuery },
-                  { label: "Crisis", query: "crisis" },
-                  { label: "Culturally safe", query: "Aboriginal Torres Strait Islander" },
-                  { label: "Phone referral", query: "phone referral" },
-                  { label: "Free", query: "free" },
-                  { label: "WA", query: "WA" },
-                ].map((chip, index) => (
-                  <button
-                    key={chip.label}
-                    type="button"
-                    onClick={() => applyServiceQuery(chip.query)}
-                    className={cn(
-                      "min-h-8 rounded-full border px-3 text-xs font-bold transition hover:-translate-y-px hover:shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
-                      index > 2 ? "max-sm:hidden" : "",
-                      index === 0
-                        ? "border-[color:var(--clinical-accent)] bg-[color:var(--clinical-accent)] text-[color:var(--clinical-accent-contrast)] shadow-[var(--shadow-tight)]"
-                        : "border-[color:var(--border)] bg-[color:var(--surface-subtle)] text-[color:var(--text-muted)] hover:border-[color:var(--clinical-accent-border)] hover:bg-[color:var(--clinical-accent-soft)] hover:text-[color:var(--clinical-accent)]",
-                    )}
-                  >
-                    {chip.label}
-                  </button>
-                ))}
-              </div>
-              <button
-                type="button"
-                onClick={() => setLocalQuery({ urlQuery, value: "" })}
-                className="min-h-8 shrink-0 rounded-full px-2 text-xs font-bold text-[color:var(--clinical-accent)] hover:bg-[color:var(--clinical-accent-soft)] hover:text-[color:var(--clinical-accent-hover)] max-sm:hidden"
-              >
-                Clear all
-              </button>
             </div>
           </div>
           <div data-testid="service-search-results" className="grid gap-3">
diff --git a/src/components/specifiers/specifiers-home-page.tsx b/src/components/specifiers/specifiers-home-page.tsx
index 5ceec8769..067c3adcf 100644
--- a/src/components/specifiers/specifiers-home-page.tsx
+++ b/src/components/specifiers/specifiers-home-page.tsx
@@ -14,6 +14,7 @@ import {
 } from "lucide-react";
 
 import { ModeHomeMain, ModeHomeTemplate, ModeHomeVerificationFooter } from "@/components/mode-home-template";
+import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
 import {
   CategoryTag,
   ReviewStatusBadge,
@@ -255,25 +256,19 @@ function SpecifierResults({ query }: { query: string }) {
         <SpecifierSubnav active="search" />
       </div>
 
-      <header className="grid gap-1 border-b border-[color:var(--border)] pb-4 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-end sm:gap-3 sm:pb-5">
-        <div className="grid gap-1">
-          <p className={eyebrowText}>Specifier search</p>
-          <h1 className="text-2xl font-extrabold tracking-tight text-[color:var(--text-heading)] sm:text-3xl">
-            Matches for &ldquo;{query}&rdquo;
-          </h1>
-        </div>
-        <p className="nums text-sm font-bold text-[color:var(--text-muted)]" aria-live="polite">
-          {totalMatches} {totalMatches === 1 ? "match" : "matches"}
-        </p>
-      </header>
-
-      <section
-        aria-label="Filter specifier results"
-        className="flex flex-col items-start gap-2 sm:flex-row sm:flex-wrap sm:items-center sm:gap-2.5"
-      >
-        <SpecifierFamilyFilterChips value={family} onChange={setFamily} />
-        <SpecifierDiagnosisFilter value={diagnosis} onChange={setDiagnosis} options={diagnosisOptions} />
-      </section>
+      <SearchResultsHeaderBand
+        modeId="specifiers"
+        query={query}
+        matchCount={totalMatches}
+        headingLevel={1}
+        filterLabel="Filter specifier results"
+        filterControls={
+          <div className="flex flex-col items-start gap-2 sm:flex-row sm:flex-wrap sm:items-center sm:gap-2.5">
+            <SpecifierFamilyFilterChips value={family} onChange={setFamily} />
+            <SpecifierDiagnosisFilter value={diagnosis} onChange={setDiagnosis} options={diagnosisOptions} />
+          </div>
+        }
+      />
 
       {totalMatches === 0 ? (
         <EmptySearchResults query={query} />
diff --git a/src/components/therapy-compass/screens/search-screen.tsx b/src/components/therapy-compass/screens/search-screen.tsx
index ec513eea5..9cd9cc544 100644
--- a/src/components/therapy-compass/screens/search-screen.tsx
+++ b/src/components/therapy-compass/screens/search-screen.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { SearchResultsHeaderBand } from "@/components/clinical-dashboard/search-results-header-band";
+
 import { useTcBindings } from "../bindings";
 import { outlineControl, softControl } from "../controls";
 import { SearchIcon, SearchXIcon, XIcon } from "../icons";
@@ -36,58 +38,56 @@ export function SearchScreen() {
         </label>
       </div>
 
-      <div className="tc-screens-search-screen-008">
-        {QUICK_TAGS.map((tag) => {
-          const on = b.search.tags.includes(tag);
-          return (
+      <SearchResultsHeaderBand
+        modeId="therapy-compass"
+        query={q}
+        matchCount={results.length}
+        loading={b.loading}
+        filterLabel="Filter therapy results"
+        filterControls={
+          <div className="tc-screens-search-screen-008">
+            {QUICK_TAGS.map((tag) => {
+              const on = b.search.tags.includes(tag);
+              return (
+                <button
+                  key={tag}
+                  type="button"
+                  className={`tc-btn ${softControl}${on ? " tc-is-selected" : ""}`}
+                  onClick={() => b.toggleTag(tag)}
+                  aria-pressed={on}
+                >
+                  {tag}
+                </button>
+              );
+            })}
             <button
-              key={tag}
               type="button"
-              className={`tc-btn ${softControl}${on ? " tc-is-selected" : ""}`}
-              onClick={() => b.toggleTag(tag)}
-              aria-pressed={on}
+              className={`tc-btn ${softControl}${b.search.reviewedOnly ? " tc-is-success" : ""}`}
+              onClick={b.toggleReviewedOnly}
+              aria-pressed={b.search.reviewedOnly}
             >
-              {tag}
+              Reviewed only
             </button>
-          );
-        })}
-        <button
-          type="button"
-          className={`tc-btn ${softControl}${b.search.reviewedOnly ? " tc-is-success" : ""}`}
-          onClick={b.toggleReviewedOnly}
-          aria-pressed={b.search.reviewedOnly}
-        >
-          Reviewed only
-        </button>
-        <button
-          type="button"
-          className={`tc-btn ${softControl}${b.search.briefOnly ? " tc-is-selected" : ""}`}
-          onClick={b.toggleBriefOnly}
-          aria-pressed={b.search.briefOnly}
-        >
-          Brief available
-        </button>
-        <button type="button" className="tc-btn tc-screens-search-screen-009" onClick={b.clearSearch}>
-          <XIcon size={15} strokeWidth={1.8} />
-          Clear
-        </button>
-      </div>
+            <button
+              type="button"
+              className={`tc-btn ${softControl}${b.search.briefOnly ? " tc-is-selected" : ""}`}
+              onClick={b.toggleBriefOnly}
+              aria-pressed={b.search.briefOnly}
+            >
+              Brief available
+            </button>
+            <button type="button" className="tc-btn tc-screens-search-screen-009" onClick={b.clearSearch}>
+              <XIcon size={15} strokeWidth={1.8} />
+              Clear
+            </button>
+          </div>
+        }
+      />
 
       {b.loading ? (
         <LoadingState />
       ) : (
         <>
-          <div className="tc-screens-search-screen-010">
-            <div className="tc-screens-search-screen-011">
-              <span className="tc-screens-search-screen-012">Top results</span>
-              <span className="tc-screens-search-screen-013">
-                {results.length === 0
-                  ? "No matches"
-                  : `${Math.min(shown.length, results.length)} of ${results.length} record${results.length === 1 ? "" : "s"}`}
-              </span>
-            </div>
-          </div>
-
           {results.length === 0 ? (
             <EmptyState
               icon={SearchXIcon}
diff --git a/tests/search-results-header-band.dom.test.tsx b/tests/search-results-header-band.dom.test.tsx
index 489569dd0..378ba8e1d 100644
--- a/tests/search-results-header-band.dom.test.tsx
+++ b/tests/search-results-header-band.dom.test.tsx
@@ -1,6 +1,6 @@
 /** @vitest-environment jsdom */
 
-import { render, screen } from "@testing-library/react";
+import { render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 
@@ -14,10 +14,17 @@ describe("SearchResultsHeaderBand", () => {
     render(<SearchResultsHeaderBand modeId="services" query={`  ${query}  `} matchCount={12} />);
 
     expect(screen.getByRole("region", { name: `Search results for ${query}` })).toHaveAttribute("aria-busy", "false");
-    expect(screen.getByRole("heading", { name: query })).toHaveAttribute("title", query);
+    expect(screen.getByRole("heading", { level: 2, name: query })).toHaveAttribute("title", query);
     expect(screen.getByRole("status")).toHaveTextContent("12 matches");
   });
 
+  it("can provide the primary heading on standalone search routes", () => {
+    render(<SearchResultsHeaderBand modeId="specifiers" query="seasonal pattern" matchCount={2} headingLevel={1} />);
+
+    expect(screen.getByRole("heading", { level: 1, name: "seasonal pattern" })).toBeVisible();
+    expect(screen.queryByRole("heading", { level: 2, name: "seasonal pattern" })).toBeNull();
+  });
+
   it("announces the loading state without exposing a stale result count", () => {
     render(<SearchResultsHeaderBand modeId="differentials" query="acute confusion" matchCount={8} loading />);
 
@@ -87,4 +94,38 @@ describe("SearchResultsHeaderBand", () => {
     expect(onViewChange).toHaveBeenCalledWith("list");
     expect(onSaveSearch).toHaveBeenCalledOnce();
   });
+
+  it("keeps page-specific actions and filters inside the shared ribbon", async () => {
+    const user = userEvent.setup();
+    const onOpenSources = vi.fn();
+    const onFilterTables = vi.fn();
+
+    render(
+      <SearchResultsHeaderBand
+        modeId="documents"
+        query="lithium monitoring"
+        matchCount={4}
+        utilityControls={
+          <button type="button" onClick={onOpenSources}>
+            Sources
+          </button>
+        }
+        filterLabel="Filter documents by source type"
+        filterControls={
+          <button type="button" onClick={onFilterTables}>
+            Tables
+          </button>
+        }
+      />,
+    );
+
+    const ribbon = screen.getByRole("region", { name: "Search results for lithium monitoring" });
+    expect(within(ribbon).getByRole("group", { name: "Filter documents by source type" })).toBeVisible();
+
+    await user.click(within(ribbon).getByRole("button", { name: "Sources" }));
+    await user.click(within(ribbon).getByRole("button", { name: "Tables" }));
+
+    expect(onOpenSources).toHaveBeenCalledOnce();
+    expect(onFilterTables).toHaveBeenCalledOnce();
+  });
 });
diff --git a/tests/ui-accessibility.spec.ts b/tests/ui-accessibility.spec.ts
index 0267ca66c..01582d2a0 100644
--- a/tests/ui-accessibility.spec.ts
+++ b/tests/ui-accessibility.spec.ts
@@ -399,7 +399,7 @@ test.describe("Clinical KB accessibility coverage", () => {
     await page.locator('button[aria-label="Search differential presentations"]:visible').click();
     await expect(page.getByTestId("differentials-search-results")).toBeVisible();
 
-    const filterGroup = page.getByRole("group", { name: "Result type" });
+    const filterGroup = page.getByRole("group", { name: "Result type", exact: true });
     await expect(filterGroup).toBeVisible();
     await expect(filterGroup.getByRole("tab")).toHaveCount(0);
     const allFilter = filterGroup.getByRole("button", { name: /^All \(\d+\)$/ });
@@ -419,7 +419,7 @@ test.describe("Clinical KB accessibility coverage", () => {
     await expect(presentationsFilter).toHaveAttribute("aria-pressed", "false");
   });
 
-  test("guest upload action exposes the admin boundary and opens the source library", async ({ page }) => {
+  test("guest upload action exposes the admin boundary and opens Sources", async ({ page }) => {
     await page.setViewportSize({ width: 414, height: 820 });
     await mockMinimalDashboardApi(page);
     await gotoApp(page);
@@ -431,9 +431,9 @@ test.describe("Clinical KB accessibility coverage", () => {
     await expect(menu).toBeVisible();
     await menu.getByRole("menuitem", { name: "Add document" }).click();
     await expect(page.getByRole("dialog", { name: "Upload and indexing" })).toHaveCount(0);
-    await expect(page.getByRole("dialog", { name: "Source library" })).toBeVisible();
+    await expect(page.getByRole("dialog", { name: "Sources" })).toBeVisible();
     await expect(page.getByRole("alert").filter({ hasText: "Upload and indexing tools are admin-only" })).toContainText(
-      "Upload and indexing tools are admin-only. Use the source library to open indexed documents.",
+      "Upload and indexing tools are admin-only. Use Sources to open indexed documents.",
     );
   });
 
@@ -458,6 +458,9 @@ test.describe("Clinical KB accessibility coverage", () => {
     await page.goto("/therapy-compass/search", { waitUntil: "domcontentloaded" });
     await expect(page.getByRole("heading", { name: "Therapy Search" })).toBeVisible({ timeout: 60_000 });
     await expect(page.getByRole("button", { name: "Search", exact: true })).toHaveAttribute("aria-current", "page");
+    const therapyRibbon = page.getByTestId("search-query-ribbon");
+    await expect(therapyRibbon.getByRole("heading", { name: "All" })).toBeVisible();
+    await expect(therapyRibbon.getByRole("group", { name: "Filter therapy results" })).toBeVisible();
 
     const searchInput = page.getByRole("textbox", { name: "Search therapies" });
     await searchInput.focus();
diff --git a/tests/ui-formulation.spec.ts b/tests/ui-formulation.spec.ts
index fe37b5943..0a458ec71 100644
--- a/tests/ui-formulation.spec.ts
+++ b/tests/ui-formulation.spec.ts
@@ -70,7 +70,9 @@ test("searches patient language, opens a mechanism guide, and carries it into th
   await page.getByRole("button", { name: "Find matching formulation mechanisms" }).click();
 
   await expect(page).toHaveURL(/\/formulation\?.*q=I(?:\+|%20)keep(?:\+|%20)going(?:\+|%20)over(?:\+|%20)it.*run=1/);
-  await expect(page.getByRole("heading", { name: /Mechanisms matching “I keep going over it”/ })).toBeVisible();
+  const queryRibbon = page.getByTestId("search-query-ribbon");
+  await expect(queryRibbon.getByRole("heading", { level: 1, name: "I keep going over it" })).toBeVisible();
+  await expect(queryRibbon.getByRole("group", { name: "Filter formulation mechanisms" })).toBeVisible();
   await expect(page.getByRole("link", { name: "Rumination", exact: true })).toBeVisible();
   await expect(page.getByText("Source status", { exact: true })).toHaveCount(0);
   await expect(page.getByText("Source", { exact: true })).toHaveCount(0);
@@ -94,7 +96,9 @@ test("keeps mobile search, domain filtering, record actions, and universal chrom
   await page.setViewportSize({ width: 390, height: 844 });
   await gotoApp(page, "/formulation?q=What+if+something+goes+wrong&run=1");
 
-  await expect(page.getByRole("heading", { name: /Mechanisms matching “What if something goes wrong”/ })).toBeVisible();
+  const queryRibbon = page.getByTestId("search-query-ribbon");
+  await expect(queryRibbon.getByRole("heading", { level: 1, name: "What if something goes wrong" })).toBeVisible();
+  await expect(queryRibbon.getByRole("group", { name: "Filter formulation mechanisms" })).toBeVisible();
   await expect(page.getByRole("link", { name: "Worry", exact: true })).toBeVisible();
   await expect(page.getByRole("combobox", { name: "Filter by formulation domain" })).toBeVisible();
   await expect(page.getByTestId("global-search-input").filter({ visible: true }).first()).toBeVisible();
diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index 0566ed5df..eb45c50ff 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -851,7 +851,7 @@ async function expectAdminOnlyUploadNotice(page: Page) {
   await expect(uploadAction).toBeVisible();
   await uploadAction.click();
   await expect(page.getByRole("alert").filter({ hasText: "Upload and indexing tools are admin-only." })).toContainText(
-    "Use the source library to open indexed documents.",
+    "Use Sources to open indexed documents.",
   );
   await expect(page.getByRole("dialog", { name: "Upload and indexing" })).toHaveCount(0);
 }
@@ -2572,6 +2572,9 @@ test.describe("Clinical KB UI smoke coverage", () => {
       timeout: 30_000,
     });
     await expect(page.getByTestId("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();
 
     const result = page.getByTestId("dsm-search-result").filter({ hasText: "Major depressive disorder" });
     await expect(result).toBeVisible();
@@ -2586,6 +2589,24 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expectNoPageHorizontalOverflow(page);
   });
 
+  test("factsheet search keeps query, view, and category filters in the universal results ribbon", async ({ page }) => {
+    await mockDemoApi(page);
+
+    for (const viewport of [
+      { width: 390, height: 844 },
+      { width: 1440, height: 900 },
+    ]) {
+      await page.setViewportSize(viewport);
+      await gotoApp(page, "/factsheets/search?q=sertraline");
+      const factsheetsPage = page.getByTestId("factsheets-search-page");
+      const queryRibbon = factsheetsPage.getByTestId("search-query-ribbon");
+      await expect(queryRibbon.getByRole("heading", { name: "sertraline" })).toBeVisible();
+      await expect(queryRibbon.getByRole("group", { name: "Result view" })).toBeVisible();
+      await expect(queryRibbon.getByRole("group", { name: "Filter factsheets by category" })).toBeVisible();
+      await expectNoPageHorizontalOverflow(page);
+    }
+  });
+
   test("DSM category filter dropdown opens to the correct option by keyboard", async ({ page }) => {
     await page.setViewportSize({ width: 1100, height: 850 });
     await mockDemoApi(page);
@@ -2638,7 +2659,9 @@ test.describe("Clinical KB UI smoke coverage", () => {
 
     // /?mode=specifiers → /specifiers (Specifiers is its own mode, distinct from Formulation)
     await expect(page).toHaveURL(/\/specifiers\?q=anxious\+distress&focus=1&run=1$/);
-    await expect(page.getByRole("heading", { level: 1, name: "Matches for “anxious distress”" })).toBeVisible();
+    const queryRibbon = page.getByTestId("search-query-ribbon");
+    await expect(queryRibbon.getByRole("heading", { level: 1, name: "anxious distress" })).toBeVisible();
+    await expect(queryRibbon.getByRole("group", { name: "Filter specifier results" })).toBeVisible();
   });
 
   test("dashboard formulation mode param redirects to the standalone formulation route", async ({ page }) => {
@@ -2647,9 +2670,9 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await gotoApp(page, "/?mode=formulation&q=I+keep+going+over+it&focus=1&run=1");
 
     await expect(page).toHaveURL(/\/formulation\?q=I\+keep\+going\+over\+it&focus=1&run=1$/);
-    await expect(
-      page.getByRole("heading", { level: 1, name: "Mechanisms matching “I keep going over it”" }),
-    ).toBeVisible();
+    const queryRibbon = page.getByTestId("search-query-ribbon");
+    await expect(queryRibbon.getByRole("heading", { level: 1, name: "I keep going over it" })).toBeVisible();
+    await expect(queryRibbon.getByRole("group", { name: "Filter formulation mechanisms" })).toBeVisible();
   });
 
   test("submitted differentials searches stay on the standalone differentials route", async ({ page }) => {
@@ -2714,7 +2737,9 @@ test.describe("Clinical KB UI smoke coverage", () => {
 
     await expect(page.getByTestId("favourites-hub")).toBeVisible();
     await expect(page.getByRole("heading", { name: "Favourites command library" })).toBeVisible();
-    await expect(page.getByTestId("favourites-active-filters")).toBeVisible();
+    const queryRibbon = page.getByTestId("search-query-ribbon");
+    await expect(queryRibbon.getByRole("heading", { name: "lithium set" })).toBeVisible();
+    await expect(page.getByTestId("favourites-active-filters")).toHaveCount(0);
   });
 
   test("favourites route opens the favourites home", async ({ page }) => {
@@ -2729,7 +2754,9 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expect(globalSearchInput).toHaveValue("lithium set");
     await expect(page.getByTestId("favourites-hub")).toBeVisible();
     await expect(page.getByRole("heading", { name: "Favourites command library" })).toBeVisible();
-    await expect(page.getByTestId("favourites-active-filters")).toBeVisible();
+    const queryRibbon = page.getByTestId("search-query-ribbon");
+    await expect(queryRibbon.getByRole("heading", { name: "lithium set" })).toBeVisible();
+    await expect(page.getByTestId("favourites-active-filters")).toHaveCount(0);
 
     await page.getByRole("button", { name: "Start a new chat" }).click();
     await expect(page).toHaveURL(/\?mode=answer&focus=1$/);
@@ -2969,7 +2996,7 @@ test.describe("Clinical KB UI smoke coverage", () => {
     expect(searchInputBox?.y ?? 0).toBeGreaterThan(startHereBox?.y ?? 0);
     await expect(page.locator('form.answer-footer-search-dock[data-footer-variant="compact"]')).toHaveCount(1);
     const recentDocumentsButton = page.getByRole("button", { name: /Recent documents/i }).first();
-    const browseLibraryButton = page.getByRole("button", { name: /Browse library/i }).first();
+    const browseLibraryButton = page.getByRole("button", { name: /Browse sources/i }).first();
     const sourcePdfButton = page.getByRole("button", { name: /Open a source PDF/i }).first();
     await expect(recentDocumentsButton).toBeVisible();
     await expect(browseLibraryButton).toBeVisible();
@@ -2983,11 +3010,13 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expect(recentDocumentsDialog).toHaveCount(0);
 
     await browseLibraryButton.click();
-    const sourceLibraryDialog = page.getByRole("dialog", { name: "Source library" });
+    const sourceLibraryDialog = page.getByRole("dialog", { name: "Sources" });
     await expect(sourceLibraryDialog).toBeVisible();
-    await expect(sourceLibraryDialog.getByPlaceholder("Find a document")).toBeVisible();
+    await expect(sourceLibraryDialog.getByPlaceholder("Find a document")).toBeFocused();
+    await expect(sourceLibraryDialog.getByRole("group", { name: "Refine sources" })).toBeVisible();
     await page.keyboard.press("Escape");
     await expect(sourceLibraryDialog).toHaveCount(0);
+    await expect(browseLibraryButton).toBeFocused();
 
     await sourcePdfButton.click();
     const sourcePdfDialog = page.getByRole("dialog", { name: "Source PDFs" });
@@ -3009,13 +3038,16 @@ test.describe("Clinical KB UI smoke coverage", () => {
 
     await expect(page).toHaveURL(/\/documents\/search\?.*q=lithium\+monitoring/);
     const documentWorkspace = page.getByTestId("document-search-workspace");
-    await expect(documentWorkspace.getByRole("heading", { name: /document/i }).first()).toBeVisible();
-    await expect(documentWorkspace.getByTestId("document-results-controls")).toBeVisible();
-    const resultsControls = documentWorkspace.getByTestId("document-results-controls");
-    await expect(resultsControls.getByLabel("Sort results")).toBeVisible();
-    await expect(resultsControls.getByRole("button", { name: "Open document library" })).toBeVisible();
+    const queryRibbon = documentWorkspace.getByTestId("search-query-ribbon");
+    await expect(queryRibbon).toBeVisible();
+    await expect(queryRibbon.getByTestId("document-results-controls")).toBeVisible();
+    const resultsControls = queryRibbon.getByTestId("document-results-controls");
+    await expect(queryRibbon.getByLabel("Sort results")).toBeVisible();
+    const ribbonSourcesButton = queryRibbon.getByRole("button", { name: "Open source filters" });
+    await expect(ribbonSourcesButton).toBeVisible();
+    await expectMinTouchTarget(ribbonSourcesButton);
     await expect(documentWorkspace.getByText("Documents overview")).toHaveCount(0);
-    await expect(documentWorkspace.getByRole("button", { name: /Browse library/i })).toHaveCount(0);
+    await expect(documentWorkspace.getByRole("button", { name: /Browse sources/i })).toHaveCount(0);
     await expect(page.getByTestId("cross-mode-links")).toHaveCount(0);
     await expect(page.getByText(/Also in your library/i)).toHaveCount(0);
 
@@ -3024,19 +3056,20 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expect(documentResults).toContainText("Best match");
     await expect(documentResults).toContainText("1 table");
 
-    const typeFilters = resultsControls.getByLabel("Filter by result type");
+    const typeFilters = resultsControls.getByLabel("Filter by source type");
     if ((await typeFilters.count()) > 0) {
       const tablesFilter = typeFilters.getByRole("button", { name: /Tables/i });
       await expect(tablesFilter).toBeVisible();
+      await expectMinTouchTarget(tablesFilter);
       await tablesFilter.click();
       await expect(tablesFilter).toHaveAttribute("aria-pressed", "true");
       await expect(documentResults).toBeVisible();
       await typeFilters.getByRole("button", { name: /^All/i }).click();
     }
 
-    await resultsControls.getByLabel("Sort results").selectOption("alpha");
+    await queryRibbon.getByLabel("Sort results").selectOption("alpha");
     await expect(page).toHaveURL(/[?&]sort=alpha/);
-    await resultsControls.getByLabel("Sort results").selectOption("relevance");
+    await queryRibbon.getByLabel("Sort results").selectOption("relevance");
 
     const openDocumentLink = documentResults
       .getByRole("link", { name: /Open Synthetic lithium monitoring protocol/i })
@@ -3051,11 +3084,24 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expect(page.getByRole("complementary", { name: "Selected document evidence" })).toBeVisible();
     await expectNoPageHorizontalOverflow(page);
 
-    await resultsControls.getByRole("button", { name: "Open document library" }).click();
-    const resultsLibraryDialog = page.getByRole("dialog", { name: "Source library" });
+    await page.setViewportSize({ width: 1440, height: 900 });
+    await expectNoPageHorizontalOverflow(page);
+    const dashboardMain = page.locator("main#main-content");
+    const scrollTopBeforeSources = await dashboardMain.evaluate((element) => element.scrollTop);
+    const openSourcesButton = queryRibbon.getByRole("button", { name: "Open source filters" });
+    await openSourcesButton.click();
+    const resultsLibraryDialog = page.getByRole("dialog", { name: "Sources" });
     await expect(resultsLibraryDialog).toBeVisible();
+    await expect(resultsLibraryDialog.getByPlaceholder("Find a document")).toBeFocused();
+    const sourceDialogBox = await resultsLibraryDialog.boundingBox();
+    expect(sourceDialogBox).not.toBeNull();
+    expect(sourceDialogBox?.y ?? -1).toBeGreaterThanOrEqual(0);
+    expect((sourceDialogBox?.y ?? 0) + (sourceDialogBox?.height ?? 0)).toBeLessThanOrEqual(900);
+    await expect.poll(() => dashboardMain.evaluate((element) => element.scrollTop)).toBe(scrollTopBeforeSources);
+    await expect(page.locator("details#dashboard-documents-drawer")).not.toHaveAttribute("open", "");
     await page.keyboard.press("Escape");
     await expect(resultsLibraryDialog).toHaveCount(0);
+    await expect(openSourcesButton).toBeFocused();
 
     await page.reload({ waitUntil: "domcontentloaded" });
     await expect(documentResults).toBeVisible();
@@ -3087,7 +3133,7 @@ test.describe("Clinical KB UI smoke coverage", () => {
 
     await switchToDocumentSearchMode(page);
     await page
-      .getByRole("button", { name: /Browse library/i })
+      .getByRole("button", { name: /Browse sources/i })
       .first()
       .click();
     await expect.poll(() => requestCounts.documents).toBe(1);
@@ -3104,7 +3150,9 @@ test.describe("Clinical KB UI smoke coverage", () => {
     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();
-    await expect(page.getByTestId("tools-hub").getByRole("heading", { name: "All tools" })).toBeVisible();
+    const queryRibbon = page.getByTestId("tools-hub").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",
     );
diff --git a/tests/ui-specifiers.spec.ts b/tests/ui-specifiers.spec.ts
index 87905a821..047b2d803 100644
--- a/tests/ui-specifiers.spec.ts
+++ b/tests/ui-specifiers.spec.ts
@@ -74,7 +74,9 @@ test("searches clinical language without provenance fields and carries a result
   await page.getByRole("button", { name: "Find matching psychiatric specifiers" }).click();
 
   await expect(page).toHaveURL(/\/specifiers\?.*q=depressed(?:\+|%20)but(?:\+|%20)racing(?:\+|%20)thoughts.*run=1/);
-  await expect(page.getByRole("heading", { name: /Matches for “depressed but racing thoughts”/ })).toBeVisible();
+  const queryRibbon = page.getByTestId("search-query-ribbon");
+  await expect(queryRibbon.getByRole("heading", { level: 1, name: "depressed but racing thoughts" })).toBeVisible();
+  await expect(queryRibbon.getByRole("group", { name: "Filter specifier results" })).toBeVisible();
   await expect(page.getByText(/Results ranked by text relevance/i)).toHaveCount(0);
   await expect(page.getByText("Top match", { exact: true })).toBeVisible();
   await expect(page.getByRole("group", { name: "Filter by specifier family" })).toBeVisible();
@@ -102,7 +104,9 @@ test("keeps mobile search, filters, results, and the fixed composer usable", asy
   await page.setViewportSize({ width: 390, height: 844 });
   await gotoApp(page, "/specifiers?q=returns+every+winter&run=1");
 
-  await expect(page.getByRole("heading", { name: /Matches for “returns every winter”/ })).toBeVisible();
+  const queryRibbon = page.getByTestId("search-query-ribbon");
+  await expect(queryRibbon.getByRole("heading", { level: 1, name: "returns every winter" })).toBeVisible();
+  await expect(queryRibbon.getByRole("group", { name: "Filter specifier results" })).toBeVisible();
   await expect(page.getByRole("link", { name: "Open With seasonal pattern" })).toBeVisible();
   await expect(page.getByRole("group", { name: "Filter by specifier family" })).toBeVisible();
   await expect(page.getByRole("combobox", { name: "Filter by diagnosis" })).toBeVisible();
diff --git a/tests/ui-stress.spec.ts b/tests/ui-stress.spec.ts
index c81ca1ded..6674a2d63 100644
--- a/tests/ui-stress.spec.ts
+++ b/tests/ui-stress.spec.ts
@@ -344,7 +344,7 @@ test.describe("Clinical KB long-content stress coverage", () => {
         await expect(dailyActions).toBeHidden();
         await expect(
           page.getByRole("alert").filter({ hasText: "Upload and indexing tools are admin-only." }),
-        ).toContainText("Use the source library to open indexed documents.");
+        ).toContainText("Use Sources to open indexed documents.");
         await expect(page.getByRole("dialog", { name: "Upload and indexing" })).toHaveCount(0);
       }
       await expectNoPageHorizontalOverflow(page);
diff --git a/tests/ui-tools.spec.ts b/tests/ui-tools.spec.ts
index 2ed0fc9bc..73044a69b 100644
--- a/tests/ui-tools.spec.ts
+++ b/tests/ui-tools.spec.ts
@@ -458,7 +458,9 @@ test.describe("Clinical KB tools launcher", () => {
     await expect(toolsHub.getByTestId("tools-home")).toBeVisible();
     await expect(toolsHub.getByRole("heading", { level: 1, name: "Tools" })).toBeVisible();
     await expect(toolsHub.getByTestId("global-search-input")).toBeVisible();
-    await expect(toolsHub.getByRole("heading", { name: "All tools" })).toBeVisible();
+    const queryRibbon = toolsHub.getByTestId("search-query-ribbon");
+    await expect(queryRibbon.getByRole("heading", { name: "medication" })).toBeVisible();
+    await expect(queryRibbon.getByRole("group", { name: "Filter tools by category" })).toBeVisible();
     const medicationDetails = toolsHub.getByRole("button", { name: "View details for Medication Prescribing" });
     await expect(medicationDetails).toHaveAttribute("aria-haspopup", "dialog");
     await expect(toolsHub.getByTestId("application-card-documents")).toBeHidden();
@@ -1610,12 +1612,10 @@ test.describe("Clinical KB tools launcher", () => {
     });
     expect(foldLayout).not.toBeNull();
     expect(foldLayout!.scrollTop).toBe(0);
-    // Best Answer must start in the visible fold under the chrome — not clipped
-    // above the scrollport (the ModeHomeMain justify-center regression). Bound
-    // to the header band rather than a tight viewport fraction so tall chrome /
-    // safe-area insets do not flake the upper-half check.
+    // Best Answer must start in the visible upper fold under the consolidated
+    // query, sort, and result-type controls — never clipped above the scrollport.
     expect(foldLayout!.bestTop).toBeGreaterThanOrEqual(foldLayout!.headerBottom - 2);
-    expect(foldLayout!.bestTop).toBeLessThan(foldLayout!.headerBottom + 240);
+    expect(foldLayout!.bestTop).toBeLessThan(foldLayout!.viewportHeight * 0.5);
 
     // Phone list hides the featured best answer, so ranks must start at 1.
     const mobileCards = page.getByTestId("differential-mobile-result-card");

From 1630008c4245723050ce2b725e33ea1fb140c998 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 25 Jul 2026 04:56:29 +0800
Subject: [PATCH 2/4] docs(review): record search UI merge readiness

---
 docs/branch-review-ledger.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/branch-review-ledger.md b/docs/branch-review-ledger.md
index 53fb766b0..05fb641f8 100644
--- a/docs/branch-review-ledger.md
+++ b/docs/branch-review-ledger.md
@@ -794,3 +794,4 @@ This file is append-only. Never rewrite or delete an existing review record; app
 | 2026-07-24 | cursor/pr-queue-hygiene-72ec | pending-push | PR queue hygiene | Add pr-branch-sync workflow + sync:pr-branches helper; bump postcss to clear npm audit high; document anti-churn guidance in AGENTS/process-hardening/pr-babysit/run-pr. | check:github-actions PASS; docs:check-scripts/index PASS; vitest sync-open-pr-branches 3/3; npm audit high clean; no provider-backed checks run |
 | 2026-07-24 | codex/apply-phone-layout-to-all-home-pages (PR #1124) | pending | Babysit: ledger dedupe + merge readiness | Before: Static PR failed on exact duplicate ledger rows after main sync. After: removed duplicate rows; squash auto-merge armed. | check:branch-review-ledger PASS; no provider-backed checks run |
 | 2026-07-25 | cursor/pdf-crop-malformed-repro-9b3e (PR #1176) | c31543f5b5862dbe6911079029f28500a6af2a59 | Run PR sweep: CI fix + threads + drift | Before: GitHub reported DIRTY and Static PR checks failed formatting `docs/outstanding-issues.md` and `tests/pdf-extractor.test.ts`; 0 unresolved threads. After: merged current `origin/main` cleanly and formatted both failing files. | Prettier check pass; `git diff --check` pass; no provider-backed checks run. |
+| 2026-07-25 | codex/search-results-filters-20260725 | 88131e7267efd33059766dec80355a9246fbb2bf | Search result filters and document Sources merge-readiness review | APPROVE. No P0-P2 finding after current-main sync. Documents open Sources as an on-screen filtering surface with source-type controls; the shared results ribbon is applied across search pages. Highest residual risk: unusual real-content combinations may alter perceived density, while responsive, forced-colors, focus, and overflow paths are browser-covered. RAG impact: no retrieval behaviour change - UI controls and source browsing only. | `npm run verify:ui` pass 268/268; `npm run verify:cheap` pass (377 files, 3340 passed, 1 skipped); post-sync `npm run verify:pr-local` pass (378 files, 3349 passed, 1 skipped, production build, bundle-secret scan, offline RAG fixtures); `npm run check:production-readiness` pass with OPENAI_SAFETY_IDENTIFIER_SECRET warning; no live/provider-backed app checks run. |

From 9ae78fcfbc26ae0923be9fd931d0b4d7e9edbc02 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 25 Jul 2026 05:29:52 +0800
Subject: [PATCH 3/4] fix(ui): restore focus after closing sources

---
 src/components/ClinicalDashboard.tsx |  6 +++++-
 tests/ui-accessibility.spec.ts       | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 8ea47963e..afd19e124 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -3249,7 +3249,11 @@ export function ClinicalDashboard({
 
     const returnTarget = documentsDrawerReturnFocusRef.current;
     window.requestAnimationFrame(() => {
-      if (returnTarget?.isConnected) returnTarget.focus({ preventScroll: true });
+      const fallbackTarget = Array.from(
+        document.querySelectorAll<HTMLElement>('button[aria-haspopup="menu"][aria-label$=" options"]'),
+      ).find((element) => element.isConnected && element.getClientRects().length > 0);
+      const focusTarget = returnTarget?.isConnected ? returnTarget : fallbackTarget;
+      focusTarget?.focus({ preventScroll: true });
     });
   });
   const handleOpenSourcePdfBrowser = useEventCallback(openSourcePdfBrowser);
diff --git a/tests/ui-accessibility.spec.ts b/tests/ui-accessibility.spec.ts
index 01582d2a0..fc3acd3a0 100644
--- a/tests/ui-accessibility.spec.ts
+++ b/tests/ui-accessibility.spec.ts
@@ -431,10 +431,23 @@ test.describe("Clinical KB accessibility coverage", () => {
     await expect(menu).toBeVisible();
     await menu.getByRole("menuitem", { name: "Add document" }).click();
     await expect(page.getByRole("dialog", { name: "Upload and indexing" })).toHaveCount(0);
-    await expect(page.getByRole("dialog", { name: "Sources" })).toBeVisible();
+    const sourcesDialog = page.getByRole("dialog", { name: "Sources" });
+    await expect(sourcesDialog).toBeVisible();
     await expect(page.getByRole("alert").filter({ hasText: "Upload and indexing tools are admin-only" })).toContainText(
       "Upload and indexing tools are admin-only. Use Sources to open indexed documents.",
     );
+    await sourcesDialog.getByRole("button", { name: "Close Sources" }).click();
+    await expect(sourcesDialog).toHaveCount(0);
+    await expect
+      .poll(() =>
+        page.evaluate(() => {
+          const activeElement = document.activeElement;
+          return activeElement instanceof HTMLElement
+            ? `${activeElement.tagName}:${activeElement.getAttribute("aria-label") ?? activeElement.textContent?.trim() ?? ""}:${activeElement.getClientRects().length > 0 ? "visible" : "hidden"}`
+            : "none";
+        }),
+      )
+      .toBe("BUTTON:Open documents options:visible");
   });
 
   test("Therapy Compass preserves focus, selection, tap targets, and fixed paper tokens", async ({

From 5f107d2cbcae807b085a861b06b536c29dfde0d0 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 25 Jul 2026 05:33:35 +0800
Subject: [PATCH 4/4] docs(review): record sources focus repair

---
 docs/branch-review-ledger.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/branch-review-ledger.md b/docs/branch-review-ledger.md
index f4ad7091e..d956b4dc1 100644
--- a/docs/branch-review-ledger.md
+++ b/docs/branch-review-ledger.md
@@ -796,3 +796,4 @@ This file is append-only. Never rewrite or delete an existing review record; app
 | 2026-07-25 | cursor/pdf-crop-malformed-repro-9b3e (PR #1176) | c31543f5b5862dbe6911079029f28500a6af2a59 | Run PR sweep: CI fix + threads + drift | Before: GitHub reported DIRTY and Static PR checks failed formatting `docs/outstanding-issues.md` and `tests/pdf-extractor.test.ts`; 0 unresolved threads. After: merged current `origin/main` cleanly and formatted both failing files. | Prettier check pass; `git diff --check` pass; no provider-backed checks run. |
 | 2026-07-25 | codex/search-results-filters-20260725 | 88131e7267efd33059766dec80355a9246fbb2bf | Search result filters and document Sources merge-readiness review | APPROVE. No P0-P2 finding after current-main sync. Documents open Sources as an on-screen filtering surface with source-type controls; the shared results ribbon is applied across search pages. Highest residual risk: unusual real-content combinations may alter perceived density, while responsive, forced-colors, focus, and overflow paths are browser-covered. RAG impact: no retrieval behaviour change - UI controls and source browsing only. | `npm run verify:ui` pass 268/268; `npm run verify:cheap` pass (377 files, 3340 passed, 1 skipped); post-sync `npm run verify:pr-local` pass (378 files, 3349 passed, 1 skipped, production build, bundle-secret scan, offline RAG fixtures); `npm run check:production-readiness` pass with OPENAI_SAFETY_IDENTIFIER_SECRET warning; no live/provider-backed app checks run. |
 | 2026-07-25 | `codex/therapy-page-polish-ad78b4` | `157559aa0678f02de09c14f66d544b62a5138c4a` | Targeted release review: Therapy naming, centred navigation, and white canvas | APPROVE. No P0-P3 findings. The production Therapy route consistently uses the title Therapy, the shared page background token, and a centred overflow-safe section navigation. The latest `origin/main` merge was clean and retained both upstream responsive/home-composer assertions. Highest residual risk is visual drift at an untested browser engine; exact desktop and phone Chromium measurements were stable. | Focused Vitest 40/40; pre-sync `verify:cheap` 378 files / 3342 passed / 1 skipped; pre-sync `verify:ui` passed; integrated runtime, Prettier, lint, and typecheck passed; integrated Vitest was interrupted by the shared heavyweight-test queue after an independent 378-file / 3342-pass run. Required hosted checks must pass on the published exact head before merge. No clinical/provider workflow ran. |
+| 2026-07-25 | codex/search-results-filters-20260725 (PR #1184) | 8f74d8bd40810ede34ad4b155973b598c1be0101 | Superseding merge-readiness review after Sources focus repair | APPROVE. Supersedes the 88131e72 row: the automated P2 showed a transient Daily Actions menu item could disconnect before Sources restored focus. Closing Sources now falls back after unmount to the currently rendered action trigger, and the regression requires the visible Documents trigger to own focus. No P0-P2 finding remains. RAG impact: no retrieval behaviour change - UI focus restoration only. | Post-fix isolated production Chromium 1/1; post-current-main local Chromium 1/1; `npm run verify:cheap` pass (378 files, 3350 passed, 1 skipped); targeted Prettier and ESLint pass; required hosted checks must rerun on the published exact head; no live clinical/provider workflow ran. |