From df088c766f1761496189ec09146aa54c23b1c012 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sun, 9 Aug 2026 06:33:06 +0000
Subject: [PATCH 1/2] fix(dsm): drop catalogue page header and clean search
 ribbon filter

Remove the redundant Diagnosis search page strip so /dsm/search leads with
the shared results band, move Compare into band utilities, and restyle the
category filter as a single inset control with a visible count.

Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
---
 src/components/dsm/dsm-search-page.tsx    | 50 +++++++++++------------
 tests/dsm-search-empty-state.dom.test.tsx | 14 +++++++
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/components/dsm/dsm-search-page.tsx b/src/components/dsm/dsm-search-page.tsx
index 46a334a4a5..7705874add 100644
--- a/src/components/dsm/dsm-search-page.tsx
+++ b/src/components/dsm/dsm-search-page.tsx
@@ -21,7 +21,6 @@ import {
   X,
 } 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, EmptyState, metadataPill, pageContainer, searchFocusRing } from "@/components/ui-primitives";
@@ -142,7 +141,7 @@ function CategoryFilterDropdown({
   const activeCount = activeCategory ? activeCategory.diagnosis_count : totalCount;
 
   return (
-    <div ref={rootRef} onBlur={handleRootBlur} className="relative w-full sm:w-auto">
+    <div ref={rootRef} onBlur={handleRootBlur} className="relative w-full">
       <button
         type="button"
         ref={triggerRef}
@@ -153,23 +152,25 @@ function CategoryFilterDropdown({
         onKeyDown={handleTriggerKeyDown}
         onClick={() => (open ? setOpen(false) : openMenu(Math.max(0, activeIndex)))}
         className={cn(
-          "inline-flex min-h-tap w-full items-center gap-2 rounded-lg border px-3 text-xs font-bold transition sm:w-auto sm:min-w-[15rem]",
+          // One inset surface inside the band filter row — avoid a bordered
+          // button sitting in another bordered gray strip (double box).
+          "inline-flex min-h-tap w-full items-center gap-2 rounded-lg border px-3 text-xs font-bold transition",
           searchFocusRing,
           open || activeCategory
             ? "border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)]"
             : "border-[color:var(--border)] bg-[color:var(--surface)] hover:border-[color:var(--border-strong)]",
         )}
       >
-        <ListFilter className="h-4 w-4 shrink-0 text-[color:var(--clinical-accent)]" aria-hidden />
-        <span className="shrink-0 text-2xs font-extrabold uppercase tracking-eyebrow text-[color:var(--text-muted)]">
+        <ListFilter className="h-4 w-4 shrink-0 text-[color:var(--text-heading)]" aria-hidden />
+        <span className="shrink-0 text-2xs font-extrabold uppercase tracking-eyebrow text-[color:var(--text-heading)]">
           Category
         </span>
         <span className="min-w-0 flex-1 truncate text-left font-extrabold text-[color:var(--text-heading)]">
           {activeLabel}
         </span>
-        <span className="shrink-0 rounded-md bg-[color:var(--surface-subtle)] px-1.5 py-0.5 text-2xs font-bold tabular-nums text-[color:var(--text-muted)]">
-          {activeCount}
-        </span>
+        {/* Plain tabular count — a surface-subtle pill on the band's
+            surface-subtle filter row made the figure disappear. */}
+        <span className="shrink-0 text-xs font-bold tabular-nums text-[color:var(--text-muted)]">{activeCount}</span>
         <ChevronDown
           className={cn(
             "h-4 w-4 shrink-0 text-[color:var(--decoration-soft)] transition-transform",
@@ -257,32 +258,27 @@ export function DsmSearchPage({
 
   return (
     <div data-testid="dsm-search-page" className="min-h-full bg-[color:var(--background)]">
-      <DsmPageHeader
-        eyebrow="Diagnosis catalogue"
-        title="Diagnosis search"
-        description="Find diagnostic records by name, ICD code, symptom phrase, or category."
-        actions={
-          canCompare ? (
-            <Link
-              href={compareHref(selected)}
-              data-testid="dsm-search-compare"
-              className="inline-flex min-h-tap items-center gap-2 rounded-lg bg-[color:var(--command)] px-3 text-xs font-bold text-[color:var(--command-contrast)] shadow-[var(--shadow-tight)] transition hover:bg-[color:var(--command-hover)]"
-            >
-              <GitCompareArrows className="h-4 w-4" aria-hidden />
-              Compare {selected.length}
-            </Link>
-          ) : null
-        }
-      />
-
       <div className={cn(pageContainer, "space-y-4 px-4 py-4 sm:px-6 sm:py-6 lg:px-8")}>
         <SearchResultsHeaderBand
           modeId="dsm"
           query={query}
           matchCount={results.length}
+          headingLevel={1}
           filterLabel="Filter diagnoses by category"
+          utilityControls={
+            canCompare ? (
+              <Link
+                href={compareHref(selected)}
+                data-testid="dsm-search-compare"
+                className="inline-flex min-h-tap shrink-0 items-center gap-1.5 rounded-lg bg-[color:var(--command)] px-2.5 text-xs font-bold text-[color:var(--command-contrast)] shadow-[var(--shadow-tight)] transition hover:bg-[color:var(--command-hover)] sm:min-h-10"
+              >
+                <GitCompareArrows className="h-4 w-4" aria-hidden />
+                Compare {selected.length}
+              </Link>
+            ) : null
+          }
           filterControls={
-            <div className="flex flex-wrap items-center gap-x-2 gap-y-1.5">
+            <div className="flex w-full flex-wrap items-center gap-x-2 gap-y-1.5">
               <CategoryFilterDropdown
                 query={query}
                 categories={categories}
diff --git a/tests/dsm-search-empty-state.dom.test.tsx b/tests/dsm-search-empty-state.dom.test.tsx
index 2a3d6034db..8781688eea 100644
--- a/tests/dsm-search-empty-state.dom.test.tsx
+++ b/tests/dsm-search-empty-state.dom.test.tsx
@@ -18,4 +18,18 @@ describe("DsmSearchPage empty state", () => {
 
     expect(screen.getByRole("heading", { level: 2, name: "No diagnosis matches" })).toBeVisible();
   });
+
+  it("drops the catalogue page header and owns the query as the page heading", () => {
+    render(<DsmSearchPage query="Delirium" categories={categories} results={[]} totalCount={12} />);
+
+    expect(screen.queryByRole("link", { name: /DSM-5 Diagnosis home/i })).toBeNull();
+    expect(screen.queryByText(/Diagnosis catalogue/i)).toBeNull();
+    expect(screen.queryByRole("heading", { name: "Diagnosis search" })).toBeNull();
+    expect(screen.queryByText(/Find diagnostic records by name/i)).toBeNull();
+
+    expect(screen.getByTestId("search-query-ribbon")).toBeVisible();
+    expect(screen.getByRole("heading", { level: 1, name: "Delirium" })).toBeVisible();
+    expect(screen.getByTestId("dsm-category-filter")).toBeVisible();
+    expect(screen.getByTestId("dsm-category-filter")).toHaveTextContent("12");
+  });
 });

From 32c97a5b59f18ddb02e718cbb90472cdf212018f Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sun, 9 Aug 2026 06:49:37 +0000
Subject: [PATCH 2/2] docs: record dsm-search-header review for
 cursor/dsm-search-header-fix-15d6

Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
---
 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 c166e87d16..609dbeca1d 100644
--- a/docs/branch-review-ledger.md
+++ b/docs/branch-review-ledger.md
@@ -832,3 +832,4 @@ Records before 2026-07-28 were written by hand and had drifted: 146 lines carrie
 | 2026-08-09 | claude/m2-ds-gates-blocking | d204c6f7c84a5e7de3f28061121fda68e7d28670 | M2 design-system gates: #264 + gate 4 of #265 | ready-to-merge; supersedes the 8ed66a05 row — the tap-floor defect renumbered #289 to #291 after main claimed #289/#290, and main was merged in | post-merge ds-contract PASS (colour-only 4, numerals 2, inversions 0) against main's new #1765/#1766 component code; outstanding-issues guard PASS 289 rows next-id=292; ledger guard PASS 774 rows; format clean |
 | 2026-08-09 | claude/m2-ds-gates-blocking | e8447b042088998d34af750df72a946b1f074b97 | M2 design-system gates: #264 + gate 4 of #265 | ready-to-merge; supersedes the d204c6f7 row — seven review findings fixed, copilot-swe-agent commits merged keeping the safer numeral classifier, tap-floor defect renumbered #291 to #293 after main claimed #291/#292 | ds-contract PASS (colour-only 4, numerals 2, inversions 0); 11 reviewer cases probe-verified; mutation-verified incl. opacity and arbitrary-filter forms; lint 0; tsc 0 errors; format clean; outstanding-issues guard PASS 291 rows next-id=294 no ids deleted; ledger guard PASS 775 rows |
 | 2026-08-09 | claude/document-viewer-phase-3-bj5k5v | 2cd72f111414935d4028a19932992c4ab475dcea | document viewer Phase 3 review-and-fix | PR #1772 deep review+fix: merged origin/main (renumber OffscreenCanvas #290->#294, drop dup #291=#284); fixed key-repeat pageRef, maxObservedCanvasPixels budget, rail remount-via-key, reserved-slot shadow-inset for DS ratchet; dispositioned Bugbot/Codex/Copilot canvas+rotation as already fixed at 8397aeb; #252 tip-only wording; #294 aggregate budgets; CodeRabbit ledger nit deferred to this superseding row | verify:cheap: Test Files 545 passed (545), Tests 5856 passed \| 4 skipped (5860); verify:pr-local completed check:runtime check:installed-lock-parity format:changed sitemap:check docs:check-index docs:check-inventory docs:check-scripts docs:check-links check:branch-review-ledger check:outstanding-issues lint typecheck test build eval:rag:offline failed:(none); focused vitest 47 passed (keyboard+rail+budget+virtualization); design-system-contract legacy shadow aliases 220; merge-tree vs origin/main exit 0; Production UI delegated (pdfjs Map.getOrInsertComputed needs Chromium 151) |
+| 2026-08-09 | cursor/dsm-search-header-fix-15d6 | df088c766f1761496189ec09146aa54c23b1c012 | dsm-search-header | pass: removed catalogue page strip; ribbon + category filter match target | vitest dsm-search-empty-state; npm test 5857 passed; lint; typecheck; ensure phone /dsm/search?q=Delirium |