From 7bd1bb09722daba1caa6b3bd05a1846040be7299 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Thu, 2 Jul 2026 12:59:14 +0800
Subject: [PATCH 1/7] test: make upload drawer smoke assertions env-agnostic

The upload drawer checklist test previously assumed the env-less demo
config; with .env.local (LOCAL_NO_AUTH) present uploads are enabled and
the disabled expectation failed. Branch the enablement assertions on the
real server's setup-status demoMode flag so the test passes in both
configurations, asserting Locked+disabled in demo mode and Ready+enabled
in local-auth mode. The dedicated demo-mode test is unchanged.

Verified: npx playwright test tests/ui-smoke.spec.ts --project=chromium
29/29 green both env-less and with .env.local present.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 tests/ui-smoke.spec.ts | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index 709c4807c6..759ec8218b 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -1443,9 +1443,17 @@ test.describe("Clinical KB UI smoke coverage", () => {
     expect(JSON.stringify(payload)).not.toMatch(/sk-|service_role|eyJ/i);
   });
 
-  test("upload drawer exposes setup checklist and explicit upload labels", async ({ page }) => {
+  test("upload drawer exposes setup checklist and explicit upload labels", async ({ page, request }) => {
     await page.setViewportSize({ width: 414, height: 820 });
     await mockPrivateUnauthenticatedApi(page);
+    // Upload availability depends on the checkout's env config: env-less servers run in
+    // read-only demo mode while .env.local local-auth servers accept uploads. The browser
+    // mocks above do not decide enablement, so read the real server flag and branch the
+    // enablement assertions on it to keep this test green in both configurations.
+    const setupStatusResponse = await request.get("/api/setup-status");
+    expect(setupStatusResponse.ok()).toBe(true);
+    const serverDemoMode = (await setupStatusResponse.json()).demoMode === true;
+
     await gotoApp(page, "/");
     await expect(visibleQuestionInput(page)).toBeVisible();
 
@@ -1459,9 +1467,17 @@ test.describe("Clinical KB UI smoke coverage", () => {
     await expect(uploadDrawer.getByText("Search RPC and vector indexes")).toBeVisible();
     await expect(uploadDrawer.getByText("OpenAI API key available")).toBeVisible();
     await expect(uploadDrawer.getByText("npm run worker running")).toBeVisible();
-    await uploadDrawer.getByRole("tab", { name: /Upload/ }).click();
+    const uploadTab = uploadDrawer.getByRole("tab", { name: /Upload/ });
+    await uploadTab.click();
     await expect(uploadDrawer.getByText("Clinical upload")).toBeVisible();
     await expect(uploadDrawer.getByText("Guideline PDF files")).toBeVisible();
+    if (serverDemoMode) {
+      await expect(uploadTab).toContainText("Locked");
+      await expect(uploadDrawer.getByRole("button", { name: "Guideline PDF files" })).toBeDisabled();
+    } else {
+      await expect(uploadTab).toContainText("Ready");
+      await expect(uploadDrawer.getByRole("button", { name: "Guideline PDF files" })).toBeEnabled();
+    }
     await expect(uploadDrawer.getByRole("button", { name: "Upload guidelines" })).toBeVisible();
     await expectNoPageHorizontalOverflow(page);
   });

From c7950c4dd83b0560ce3e6a984b69441a4cfbcce4 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Thu, 2 Jul 2026 13:24:26 +0800
Subject: [PATCH 2/7] refactor(theme): remove clinical-chat-teal alias, use
 clinical-accent tokens

Rename all remaining var(--clinical-chat-teal)/var(--clinical-chat-teal-soft)
consumers to the canonical var(--clinical-accent)/var(--clinical-accent-soft)
role tokens and delete the compat alias definitions from both theme blocks in
globals.css. Also map the dangling, never-defined --clinical-chat-teal-border
references in document-search-results.tsx to the real --clinical-accent-border
token, fixing silently dead hover borders.

Verified: typecheck, eslint + prettier on changed files, ui-smoke chromium
29/29, visual check of /applications launcher (desktop + mobile).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 mockups/medication-prescribing/page.tsx       | 18 +++---
 src/app/globals.css                           | 10 +--
 src/components/ClinicalDashboard.tsx          | 24 +++----
 src/components/DocumentViewer.tsx             | 18 +++---
 src/components/applications-launcher-page.tsx | 64 +++++++++----------
 .../document-search-results.tsx               | 26 ++++----
 .../clinical-dashboard/document-ui.tsx        |  6 +-
 .../clinical-dashboard/favourites-hub.tsx     | 24 +++----
 .../global-mockup-search-shell.tsx            |  2 +-
 .../medication-prescribing-workspace.tsx      | 28 ++++----
 .../clinical-dashboard/mode-action-popup.tsx  | 10 +--
 11 files changed, 113 insertions(+), 117 deletions(-)

diff --git a/mockups/medication-prescribing/page.tsx b/mockups/medication-prescribing/page.tsx
index fe80db51ed..c2c1b9b059 100644
--- a/mockups/medication-prescribing/page.tsx
+++ b/mockups/medication-prescribing/page.tsx
@@ -189,7 +189,7 @@ function IconFrame({
           ? "border-red-300 bg-red-50 text-red-600"
           : tone === "slate"
             ? "border-[color:var(--border)] bg-[color:var(--surface-subtle)] text-[color:var(--text-muted)]"
-            : "border-[color:var(--clinical-chat-teal)]/25 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+            : "border-[color:var(--clinical-accent)]/25 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]",
         className,
       ].join(" ")}
     >
@@ -222,7 +222,7 @@ function TopNav({ compact = false }: { compact?: boolean }) {
             className={[
               "relative pb-4 text-sm font-medium",
               item === "Medication"
-                ? "font-semibold text-[color:var(--clinical-chat-teal)] after:absolute after:inset-x-0 after:bottom-[-1px] after:h-0.5 after:rounded-full after:bg-[color:var(--clinical-chat-teal)]"
+                ? "font-semibold text-[color:var(--clinical-accent)] after:absolute after:inset-x-0 after:bottom-[-1px] after:h-0.5 after:rounded-full after:bg-[color:var(--clinical-accent)]"
                 : "text-[color:var(--text-muted)]",
             ].join(" ")}
           >
@@ -410,7 +410,7 @@ function MonitoringPanel({ compact = false }: { compact?: boolean }) {
   return (
     <section className="rounded-lg border border-[color:var(--border)] bg-white shadow-[var(--shadow-inset)]">
       <div className={compact ? "flex items-center gap-2 px-3 py-2.5" : "flex items-center gap-3 px-4 pt-3"}>
-        <Activity className="h-4.5 w-4.5 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+        <Activity className="h-4.5 w-4.5 text-[color:var(--clinical-accent)]" aria-hidden="true" />
         <h3
           className={
             compact
@@ -462,7 +462,7 @@ function InteractionsPanel() {
   return (
     <section className="rounded-lg border border-[color:var(--border)] bg-white p-4 shadow-[var(--shadow-inset)]">
       <div className="flex items-center gap-3">
-        <ArrowLeftRight className="h-4.5 w-4.5 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+        <ArrowLeftRight className="h-4.5 w-4.5 text-[color:var(--clinical-accent)]" aria-hidden="true" />
         <h3 className="text-base font-bold text-[color:var(--text-heading)]">Interactions</h3>
       </div>
       <ul className="mt-3 grid gap-2 text-[13px] leading-5 text-[color:var(--text-heading)]">
@@ -481,7 +481,7 @@ function AccessPanel() {
   return (
     <section className="rounded-lg border border-[color:var(--border)] bg-white p-4 shadow-[var(--shadow-inset)]">
       <div className="flex items-center gap-3">
-        <Lock className="h-4.5 w-4.5 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+        <Lock className="h-4.5 w-4.5 text-[color:var(--clinical-accent)]" aria-hidden="true" />
         <h3 className="text-base font-bold text-[color:var(--text-heading)]">Access</h3>
       </div>
       <dl className="mt-3 grid gap-2 text-sm">
@@ -547,7 +547,7 @@ function DesktopComposer() {
         <Paperclip className="h-5 w-5 text-[color:var(--text-muted)]" aria-hidden="true" />
         <Mic className="h-5 w-5 text-[color:var(--text-muted)]" aria-hidden="true" />
         <button
-          className="grid h-10 w-10 place-items-center rounded-lg bg-[color:var(--clinical-chat-teal)] text-white shadow-[var(--shadow-soft)]"
+          className="grid h-10 w-10 place-items-center rounded-lg bg-[color:var(--clinical-accent)] text-white shadow-[var(--shadow-soft)]"
           type="button"
         >
           <Send className="h-5 w-5" aria-hidden="true" />
@@ -596,7 +596,7 @@ function MobileTabs() {
           className={[
             "relative py-3 text-xs font-bold",
             index === 0
-              ? "text-[color:var(--clinical-chat-teal)] after:absolute after:inset-x-4 after:bottom-[-1px] after:h-0.5 after:rounded-full after:bg-[color:var(--clinical-chat-teal)]"
+              ? "text-[color:var(--clinical-accent)] after:absolute after:inset-x-4 after:bottom-[-1px] after:h-0.5 after:rounded-full after:bg-[color:var(--clinical-accent)]"
               : "text-[color:var(--text-muted)]",
           ].join(" ")}
         >
@@ -633,7 +633,7 @@ function MobileCollapsedRow({ label, icon: Icon }: { label: string; icon: Lucide
   return (
     <div className="flex min-h-9 items-center justify-between border-b border-[color:var(--border)] px-3 last:border-b-0">
       <span className="flex items-center gap-2 text-[11px] font-bold text-[color:var(--text-heading)]">
-        <Icon className="h-3.5 w-3.5 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+        <Icon className="h-3.5 w-3.5 text-[color:var(--clinical-accent)]" aria-hidden="true" />
         {label}
       </span>
       <ChevronDown className="h-3.5 w-3.5 text-[color:var(--text-soft)]" aria-hidden="true" />
@@ -657,7 +657,7 @@ function MobileComposer() {
         <Paperclip className="h-4 w-4 text-[color:var(--text-muted)]" aria-hidden="true" />
         <Mic className="h-4 w-4 text-[color:var(--text-muted)]" aria-hidden="true" />
         <button
-          className="grid h-9 w-9 shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-chat-teal)] text-white shadow-[var(--shadow-soft)]"
+          className="grid h-9 w-9 shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-accent)] text-white shadow-[var(--shadow-soft)]"
           type="button"
         >
           <Send className="h-4 w-4" aria-hidden="true" />
diff --git a/src/app/globals.css b/src/app/globals.css
index cf82e8dd47..239b2d8f81 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -140,10 +140,8 @@
   --clinical-accent-border: #b9e4ea;
   --clinical-accent-contrast: #ffffff;
 
-  /* Migration compat: existing teal/ready call-sites resolve to the new roles.
+  /* Migration compat: existing ready call-sites resolve to the new roles.
      Remove once all call-sites reference the role tokens directly. */
-  --clinical-chat-teal: var(--clinical-accent);
-  --clinical-chat-teal-soft: var(--clinical-accent-soft);
   --clinical-chat-sand: #f7f1e6;
   --clinical-chat-sand-border: #eadcc7;
   --clinical-chat-sand-border-strong: #ddc7a8;
@@ -282,8 +280,6 @@
   --clinical-accent-border: #235b60;
   --clinical-accent-contrast: #04252a;
 
-  --clinical-chat-teal: var(--clinical-accent);
-  --clinical-chat-teal-soft: var(--clinical-accent-soft);
   --clinical-chat-sand: #2d2418;
   --clinical-chat-sand-border: #5a4427;
   --clinical-chat-sand-border-strong: #806034;
@@ -476,9 +472,9 @@ summary::-webkit-details-marker {
   align-items: center;
   min-height: 1.75rem;
   border-radius: 999px;
-  background: color-mix(in srgb, var(--clinical-chat-teal-soft) 72%, transparent);
+  background: color-mix(in srgb, var(--clinical-accent-soft) 72%, transparent);
   padding-inline: 0.55rem;
-  color: var(--clinical-chat-teal);
+  color: var(--clinical-accent);
   font-size: 0.6875rem;
   font-weight: 800;
   letter-spacing: 0;
diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index 74cf333aed..bcf265534b 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -822,7 +822,7 @@ function SourcePreviewContent({
         ))}
       </div>
       {quoteText ? (
-        <blockquote className="mt-3 border-l-2 border-[color:var(--clinical-chat-teal)]/35 pl-3 text-sm font-medium leading-6 text-[color:var(--text)]">
+        <blockquote className="mt-3 border-l-2 border-[color:var(--clinical-accent)]/35 pl-3 text-sm font-medium leading-6 text-[color:var(--text)]">
           &ldquo;{quoteText}&rdquo;
         </blockquote>
       ) : null}
@@ -931,7 +931,7 @@ function NaturalLanguageAnswer({
     >
       <span
         data-testid="answer-clinical-icon"
-        className="mt-1 grid h-8 w-8 shrink-0 place-items-center rounded-lg border border-[color:var(--clinical-chat-teal)]/25 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]"
+        className="mt-1 grid h-8 w-8 shrink-0 place-items-center rounded-lg border border-[color:var(--clinical-accent)]/25 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]"
         aria-hidden="true"
       >
         <ShieldCheck className="h-[18px] w-[18px]" />
@@ -1012,7 +1012,7 @@ function UserQuestionBubble({ query }: { query: string }) {
     <section className="flex justify-end px-1" aria-label="User question">
       <div
         data-testid="user-question-bubble"
-        className="ml-auto max-w-[min(28rem,86%)] rounded-lg border border-[color:var(--border)] bg-[color:var(--clinical-chat-teal-soft)] px-3 py-2 text-right shadow-[var(--shadow-inset)] sm:max-w-[28rem]"
+        className="ml-auto max-w-[min(28rem,86%)] rounded-lg border border-[color:var(--border)] bg-[color:var(--clinical-accent-soft)] px-3 py-2 text-right shadow-[var(--shadow-inset)] sm:max-w-[28rem]"
       >
         <p className="text-sm font-medium leading-6 text-[color:var(--text-heading)]">{cleaned}</p>
         <p className={cn("nums mt-0.5 text-[11px] leading-4", textMuted)}>9:14 AM</p>
@@ -3349,7 +3349,7 @@ function MobileEvidenceSheetContent({
                 className={cn(
                   "inline-flex min-h-11 items-center gap-1.5 rounded-md border px-3 text-xs font-semibold transition sm:min-h-10",
                   selected
-                    ? "border-[color:var(--clinical-chat-teal)] bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]"
+                    ? "border-[color:var(--clinical-accent)] 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)]",
                 )}
               >
@@ -4958,7 +4958,7 @@ function SettingsDialog({
                   className={cn(
                     "flex min-h-10 items-center gap-3 rounded-lg px-3 text-sm font-medium leading-5 transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
                     active
-                      ? "bg-[color:var(--surface-lux)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] ring-1 ring-[color:var(--clinical-chat-teal)]/10"
+                      ? "bg-[color:var(--surface-lux)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)] ring-1 ring-[color:var(--clinical-accent)]/10"
                       : "text-[color:var(--text-muted)] hover:bg-[color:var(--surface-lux)]/80 hover:text-[color:var(--text-heading)]",
                   )}
                 >
@@ -4987,14 +4987,14 @@ function SettingsDialog({
 
           <section className="rounded-[1.35rem] border border-[color:var(--border-lux)] bg-[linear-gradient(180deg,color-mix(in_srgb,var(--surface-lux)_96%,transparent_4%)_0%,color-mix(in_srgb,var(--surface-lux)_88%,var(--background))_100%)] p-3.5 shadow-[0_12px_30px_rgba(0,0,0,0.06),var(--shadow-inset)] dark:shadow-[0_18px_40px_rgba(0,0,0,0.32),var(--shadow-inset)] lg:rounded-xl lg:bg-[color:var(--surface)] lg:p-3.5 lg:shadow-[var(--shadow-inset)]">
             <div className="flex items-center gap-3 lg:gap-3">
-              <span className="relative grid h-11 w-11 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-sm font-bold leading-none text-[color:var(--clinical-chat-teal)] ring-1 ring-[color:var(--clinical-chat-teal)]/10 lg:h-11 lg:w-11">
+              <span className="relative grid h-11 w-11 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-accent-soft)] text-sm font-bold leading-none text-[color:var(--clinical-accent)] ring-1 ring-[color:var(--clinical-accent)]/10 lg:h-11 lg:w-11">
                 {identity.initials}
                 {identity.signedIn ? (
                   <span className="absolute bottom-0.5 right-0.5 h-3 w-3 rounded-full border-2 border-[color:var(--surface)] bg-[color:var(--clinical-chat-ready)]" />
                 ) : null}
               </span>
               <div className="min-w-0 flex-1">
-                <p className="mb-0.5 text-[11px] font-semibold leading-4 text-[color:var(--clinical-chat-teal)] lg:hidden">
+                <p className="mb-0.5 text-[11px] font-semibold leading-4 text-[color:var(--clinical-accent)] lg:hidden">
                   Clinical context
                 </p>
                 <p className="truncate text-[15px] font-semibold leading-5 text-[color:var(--text-heading)] lg:text-[15px]">
@@ -5060,7 +5060,7 @@ function SettingsDialog({
 
 function SettingsChip({ label }: { label: string }) {
   return (
-    <span className="inline-flex min-h-6 items-center rounded-full border border-[color:var(--clinical-chat-teal)]/18 bg-[color:var(--clinical-chat-teal-soft)] px-2.5 text-[11px] font-semibold leading-none text-[color:var(--clinical-chat-teal)] lg:min-h-7 lg:px-3 lg:text-xs">
+    <span className="inline-flex min-h-6 items-center rounded-full border border-[color:var(--clinical-accent)]/18 bg-[color:var(--clinical-accent-soft)] px-2.5 text-[11px] font-semibold leading-none text-[color:var(--clinical-accent)] lg:min-h-7 lg:px-3 lg:text-xs">
       {label}
     </span>
   );
@@ -5068,7 +5068,7 @@ function SettingsChip({ label }: { label: string }) {
 
 function SettingsClinicalContextStrip() {
   return (
-    <div className="mt-2.5 flex min-h-8 items-center gap-2 rounded-full border border-[color:var(--clinical-chat-teal)]/14 bg-[color:var(--clinical-chat-teal-soft)]/60 px-3 text-[12px] font-semibold leading-none text-[color:var(--clinical-chat-teal)] lg:hidden">
+    <div className="mt-2.5 flex min-h-8 items-center gap-2 rounded-full border border-[color:var(--clinical-accent)]/14 bg-[color:var(--clinical-accent-soft)]/60 px-3 text-[12px] font-semibold leading-none text-[color:var(--clinical-accent)] lg:hidden">
       <ShieldCheck className="h-3.5 w-3.5 shrink-0" />
       <span className="min-w-0 truncate">
         Private<span className="hidden min-[360px]:inline"> workspace</span>{" "}
@@ -5095,7 +5095,7 @@ function SettingsSummaryTile({
       className={cn(
         "min-w-0 rounded-2xl border p-2 shadow-[var(--shadow-inset)] lg:rounded-xl lg:p-3",
         emphasized
-          ? "border-[color:var(--clinical-chat-teal)]/26 bg-[color:var(--clinical-chat-teal-soft)]/72"
+          ? "border-[color:var(--clinical-accent)]/26 bg-[color:var(--clinical-accent-soft)]/72"
           : "border-[color:var(--border-lux)] bg-[color:var(--surface)]",
       )}
     >
@@ -5104,7 +5104,7 @@ function SettingsSummaryTile({
           className={cn(
             "grid h-8 w-8 shrink-0 place-items-center rounded-xl border shadow-[var(--shadow-inset)] lg:rounded-lg",
             emphasized
-              ? "border-[color:var(--clinical-chat-teal)] bg-[color:var(--clinical-chat-teal)] text-[color:var(--primary-contrast)]"
+              ? "border-[color:var(--clinical-accent)] bg-[color:var(--clinical-accent)] text-[color:var(--primary-contrast)]"
               : "border-[color:var(--border)] bg-[color:var(--surface-lux)] text-[color:var(--text-muted)]",
           )}
         >
@@ -5144,7 +5144,7 @@ function SettingsRow({
         className={cn(
           "grid h-7 w-7 shrink-0 place-items-center rounded-full transition sm:h-8 sm:w-8 lg:rounded-lg lg:border lg:shadow-[var(--shadow-inset)]",
           active
-            ? "bg-[color:var(--clinical-chat-teal)] text-[color:var(--primary-contrast)] shadow-[0_7px_16px_color-mix(in_srgb,var(--clinical-chat-teal)_24%,transparent)] lg:border-[color:var(--clinical-chat-teal)]"
+            ? "bg-[color:var(--clinical-accent)] text-[color:var(--primary-contrast)] shadow-[0_7px_16px_color-mix(in_srgb,var(--clinical-accent)_24%,transparent)] lg:border-[color:var(--clinical-accent)]"
             : "bg-transparent text-[color:var(--text-muted)] lg:border-[color:var(--border)] lg:bg-[color:var(--surface-lux)]",
         )}
       >
diff --git a/src/components/DocumentViewer.tsx b/src/components/DocumentViewer.tsx
index a52e361f80..47b7972e96 100644
--- a/src/components/DocumentViewer.tsx
+++ b/src/components/DocumentViewer.tsx
@@ -1691,12 +1691,12 @@ function DocumentPagePreview({ pageNumber }: { pageNumber: number | null }) {
     <a href="#pdf-preview-section" className="group grid min-w-0 justify-items-center gap-2 text-center">
       <span className="grid aspect-[0.76] min-h-[86px] w-full max-w-[7.5rem] place-items-center rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 py-2 shadow-[var(--shadow-inset)] transition group-hover:border-[color:var(--border-strong)] group-hover:bg-[color:var(--surface-subtle)] sm:max-w-[5.5rem]">
         <span className="grid w-full gap-1.5">
-          <span className="h-2 rounded bg-[color:var(--clinical-chat-teal-soft)]" />
+          <span className="h-2 rounded bg-[color:var(--clinical-accent-soft)]" />
           <span className="h-1 rounded bg-[color:var(--border-strong)]/55" />
           <span className="h-1 rounded bg-[color:var(--border-strong)]/45" />
           <span className="h-1 rounded bg-[color:var(--border-strong)]/35" />
           <span className="mt-1 grid grid-cols-2 gap-1">
-            <span className="h-8 rounded bg-[color:var(--clinical-chat-teal-soft)]/75" />
+            <span className="h-8 rounded bg-[color:var(--clinical-accent-soft)]/75" />
             <span className="grid gap-1">
               <span className="h-1 rounded bg-[color:var(--border-strong)]/35" />
               <span className="h-1 rounded bg-[color:var(--border-strong)]/30" />
@@ -1743,7 +1743,7 @@ function DocumentOverviewLanding({
     <section className="grid gap-4">
       <Link
         href="/?mode=documents"
-        className="inline-flex min-h-11 w-fit items-center gap-2 rounded-lg px-1 text-sm font-semibold text-[color:var(--clinical-chat-teal)] transition hover:bg-[color:var(--clinical-chat-teal-soft)]"
+        className="inline-flex min-h-11 w-fit items-center gap-2 rounded-lg px-1 text-sm font-semibold text-[color:var(--clinical-accent)] transition hover:bg-[color:var(--clinical-accent-soft)]"
       >
         <ChevronLeft className="h-4 w-4" />
         Documents
@@ -1823,7 +1823,7 @@ function DocumentOverviewLanding({
 
       <section id="document-overview" className={cn(sourceCard, "scroll-mt-24 p-4")}>
         <div className="grid grid-cols-[auto_minmax(0,1fr)_auto] gap-4">
-          <span className="grid h-14 w-14 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]">
+          <span className="grid h-14 w-14 place-items-center rounded-full bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]">
             <FileText className="h-6 w-6" />
           </span>
           <div className="min-w-0">
@@ -1836,7 +1836,7 @@ function DocumentOverviewLanding({
 
       <section className={cn(sourceCard, "p-4")}>
         <div className="grid grid-cols-[auto_minmax(0,1fr)_auto] gap-4">
-          <span className="grid h-14 w-14 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]">
+          <span className="grid h-14 w-14 place-items-center rounded-full bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]">
             <Tag className="h-5 w-5" />
           </span>
           <div className="min-w-0">
@@ -1845,7 +1845,7 @@ function DocumentOverviewLanding({
               {(keySections.length ? keySections : ["Overview", "Useful pages", "Source PDF"]).map((section) => (
                 <span
                   key={section}
-                  className="inline-flex min-h-9 items-center rounded-lg border border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] px-3 text-sm font-medium text-[color:var(--clinical-chat-teal)]"
+                  className="inline-flex min-h-9 items-center rounded-lg border border-[color:var(--clinical-accent)]/20 bg-[color:var(--clinical-accent-soft)] px-3 text-sm font-medium text-[color:var(--clinical-accent)]"
                 >
                   {section}
                 </span>
@@ -1858,7 +1858,7 @@ function DocumentOverviewLanding({
 
       <section className={cn(sourceCard, "p-4")}>
         <div className="grid grid-cols-[auto_minmax(0,1fr)_auto] gap-4">
-          <span className="grid h-14 w-14 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]">
+          <span className="grid h-14 w-14 place-items-center rounded-full bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]">
             <FileText className="h-6 w-6" />
           </span>
           <div className="min-w-0">
@@ -2380,7 +2380,7 @@ export function DocumentViewer({
             </Link>
             <Link
               href="/?mode=documents"
-              className="inline-flex min-h-9 items-center justify-center rounded-full bg-[color:var(--clinical-chat-teal)] px-3 text-xs font-semibold text-[color:var(--primary-contrast)] shadow-[var(--shadow-tight)] sm:text-sm"
+              className="inline-flex min-h-9 items-center justify-center rounded-full bg-[color:var(--clinical-accent)] px-3 text-xs font-semibold text-[color:var(--primary-contrast)] shadow-[var(--shadow-tight)] sm:text-sm"
             >
               Documents
             </Link>
@@ -2975,7 +2975,7 @@ export function DocumentViewer({
           <button
             type="submit"
             disabled={!canSummarizeDocument}
-            className="grid h-[44px] w-[44px] shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal)] text-[color:var(--primary-contrast)] shadow-[var(--shadow-inset),var(--shadow-tight)] hover:bg-[color:var(--primary-strong)] disabled:cursor-not-allowed disabled:opacity-50"
+            className="grid h-[44px] w-[44px] shrink-0 place-items-center rounded-full bg-[color:var(--clinical-accent)] text-[color:var(--primary-contrast)] shadow-[var(--shadow-inset),var(--shadow-tight)] hover:bg-[color:var(--primary-strong)] disabled:cursor-not-allowed disabled:opacity-50"
             aria-label="Answer from this document"
           >
             {loadingSummary ? <Loader2 className="h-4 w-4 animate-spin" /> : <Send className="h-4 w-4" />}
diff --git a/src/components/applications-launcher-page.tsx b/src/components/applications-launcher-page.tsx
index 1fe25ab44f..c6134e9bac 100644
--- a/src/components/applications-launcher-page.tsx
+++ b/src/components/applications-launcher-page.tsx
@@ -289,7 +289,7 @@ function AppIcon({ app, compact = false }: { app: LauncherApp; compact?: boolean
   return (
     <span
       className={cn(
-        "grid shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]",
+        "grid shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]",
         compact ? "h-9 w-9" : "h-11 w-11",
       )}
     >
@@ -301,7 +301,7 @@ function AppIcon({ app, compact = false }: { app: LauncherApp; compact?: boolean
 function LaunchLink({ app, compact = false, className }: { app: LauncherApp; compact?: boolean; className?: string }) {
   const label = `Launch ${app.title}`;
   const classes = cn(
-    "inline-flex min-h-11 items-center justify-center gap-2 rounded-lg bg-[color:var(--clinical-chat-teal)] px-4 text-sm font-semibold text-white shadow-[var(--shadow-tight)] hover:bg-[color:var(--primary-strong)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
+    "inline-flex min-h-11 items-center justify-center gap-2 rounded-lg bg-[color:var(--clinical-accent)] px-4 text-sm font-semibold text-white shadow-[var(--shadow-tight)] hover:bg-[color:var(--primary-strong)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
     compact && "min-h-9 px-3 text-xs",
     className,
   );
@@ -343,7 +343,7 @@ function HeaderFilter({
             className={cn(
               "min-h-11 px-4 text-xs font-semibold transition sm:min-w-[5.25rem]",
               active
-                ? "bg-[color:var(--clinical-chat-teal)] text-white shadow-[var(--shadow-tight)]"
+                ? "bg-[color:var(--clinical-accent)] text-white shadow-[var(--shadow-tight)]"
                 : "border-l border-[color:var(--border)] text-[color:var(--text-muted)] first:border-l-0 hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)]",
             )}
           >
@@ -375,7 +375,7 @@ function PinnedSection({
     >
       <div className="flex min-h-10 items-center justify-between border-b border-[color:var(--border)] px-3">
         <div className="flex items-center gap-2 text-sm font-semibold text-[color:var(--text-heading)]">
-          <Pin className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" aria-hidden />
+          <Pin className="h-4 w-4 text-[color:var(--clinical-accent)]" aria-hidden />
           Pinned
         </div>
         <span className="nums text-xs font-semibold text-[color:var(--text-soft)]">{pinnedApps.length} pinned</span>
@@ -388,7 +388,7 @@ function PinnedSection({
               key={app.id}
               className={cn(
                 "grid w-full grid-cols-[auto_minmax(0,1fr)_auto_auto] items-center gap-2 px-3 py-3 text-left transition hover:bg-[color:var(--surface-subtle)] sm:gap-3",
-                selected && "bg-[color:var(--clinical-chat-teal-soft)]/55",
+                selected && "bg-[color:var(--clinical-accent-soft)]/55",
               )}
             >
               <button
@@ -413,7 +413,7 @@ function PinnedSection({
                   onTogglePin(app.id);
                 }}
                 aria-label={`Unpin ${app.title}`}
-                className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-muted)] hover:bg-[color:var(--surface)] hover:text-[color:var(--clinical-chat-teal)]"
+                className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-muted)] hover:bg-[color:var(--surface)] hover:text-[color:var(--clinical-accent)]"
               >
                 <PinOff className="h-4 w-4" aria-hidden />
               </button>
@@ -443,7 +443,7 @@ function ApplicationRow({
       className={cn(
         "grid min-h-[72px] grid-cols-[auto_minmax(0,1fr)_7rem_6rem_5.5rem_auto] items-center gap-3 border-t border-[color:var(--border)] px-3 py-3 transition first:border-t-0",
         selected &&
-          "rounded-lg border border-[color:var(--clinical-chat-teal)] bg-[color:var(--clinical-chat-teal-soft)]/55 shadow-[var(--glow-soft)]",
+          "rounded-lg border border-[color:var(--clinical-accent)] bg-[color:var(--clinical-accent-soft)]/55 shadow-[var(--glow-soft)]",
         !selected && "hover:bg-[color:var(--surface-subtle)]",
       )}
       data-testid={`application-row-${app.id}`}
@@ -462,9 +462,9 @@ function ApplicationRow({
         type="button"
         onClick={() => onTogglePin(app.id)}
         aria-label={`${pinned ? "Unpin" : "Pin"} ${app.title}`}
-        className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-muted)] hover:bg-[color:var(--surface)] hover:text-[color:var(--clinical-chat-teal)]"
+        className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-muted)] hover:bg-[color:var(--surface)] hover:text-[color:var(--clinical-accent)]"
       >
-        <Pin className={cn("h-4 w-4", pinned && "fill-current text-[color:var(--clinical-chat-teal)]")} aria-hidden />
+        <Pin className={cn("h-4 w-4", pinned && "fill-current text-[color:var(--clinical-accent)]")} aria-hidden />
       </button>
     </div>
   );
@@ -487,7 +487,7 @@ function MobileApplicationRow({
       className={cn(
         "grid min-h-[62px] w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-t border-[color:var(--border)] px-3 py-2.5 text-left first:border-t-0",
         selected &&
-          "rounded-lg border border-[color:var(--clinical-chat-teal)] bg-[color:var(--clinical-chat-teal-soft)]/60",
+          "rounded-lg border border-[color:var(--clinical-accent)] bg-[color:var(--clinical-accent-soft)]/60",
       )}
     >
       <AppIcon app={app} compact />
@@ -543,9 +543,9 @@ function DetailPanel({
             type="button"
             onClick={() => onTogglePin(app.id)}
             aria-label={`${pinned ? "Unpin" : "Pin"} ${app.title}`}
-            className="grid h-9 w-9 place-items-center rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] hover:text-[color:var(--clinical-chat-teal)]"
+            className="grid h-9 w-9 place-items-center rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] text-[color:var(--text-muted)] shadow-[var(--shadow-inset)] hover:text-[color:var(--clinical-accent)]"
           >
-            <Pin className={cn("h-4 w-4", pinned && "fill-current text-[color:var(--clinical-chat-teal)]")} />
+            <Pin className={cn("h-4 w-4", pinned && "fill-current text-[color:var(--clinical-accent)]")} />
           </button>
           {onClose ? (
             <button
@@ -584,12 +584,12 @@ function DetailPanel({
       <LaunchLink app={app} className="mt-4 w-full" />
 
       <section className="mt-5 border-t border-[color:var(--border)] pt-4">
-        <h3 className="text-sm font-semibold text-[color:var(--clinical-chat-teal)]">Overview</h3>
+        <h3 className="text-sm font-semibold text-[color:var(--clinical-accent)]">Overview</h3>
         <p className={cn("mt-2 text-sm leading-6", textMuted)}>{app.detail}</p>
       </section>
 
       <section className="mt-5">
-        <h3 className="text-sm font-semibold text-[color:var(--clinical-chat-teal)]">Quick actions</h3>
+        <h3 className="text-sm font-semibold text-[color:var(--clinical-accent)]">Quick actions</h3>
         <div className="mt-2 divide-y divide-[color:var(--border)] rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)]">
           {app.quickActions.map((action) => (
             <button
@@ -609,8 +609,8 @@ function DetailPanel({
 
       <section className="mt-5">
         <div className="flex items-center justify-between gap-3">
-          <h3 className="text-sm font-semibold text-[color:var(--clinical-chat-teal)]">Recent workflows</h3>
-          <span className="text-xs font-semibold text-[color:var(--clinical-chat-teal)]">View all</span>
+          <h3 className="text-sm font-semibold text-[color:var(--clinical-accent)]">Recent workflows</h3>
+          <span className="text-xs font-semibold text-[color:var(--clinical-accent)]">View all</span>
         </div>
         <div className="mt-2 space-y-2">
           {app.recentWorkflows.slice(0, 4).map((workflow) => (
@@ -624,15 +624,15 @@ function DetailPanel({
 
       <section className="mt-5">
         <div className="flex items-center justify-between gap-3">
-          <h3 className="text-sm font-semibold text-[color:var(--clinical-chat-teal)]">Recent activity</h3>
-          <span className="text-xs font-semibold text-[color:var(--clinical-chat-teal)]">View all</span>
+          <h3 className="text-sm font-semibold text-[color:var(--clinical-accent)]">Recent activity</h3>
+          <span className="text-xs font-semibold text-[color:var(--clinical-accent)]">View all</span>
         </div>
         <div className="mt-2 space-y-2">
           {recentActivity.map((item) => {
             const Icon = item.icon;
             return (
               <div key={item.label} className="grid grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 text-sm">
-                <Icon className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" aria-hidden />
+                <Icon className="h-4 w-4 text-[color:var(--clinical-accent)]" aria-hidden />
                 <span className="min-w-0 truncate text-[color:var(--text)]">{item.label}</span>
                 <span className="nums shrink-0 text-xs font-medium text-[color:var(--text-soft)]">{item.date}</span>
               </div>
@@ -642,7 +642,7 @@ function DetailPanel({
       </section>
 
       <section className="mt-5">
-        <h3 className="text-sm font-semibold text-[color:var(--clinical-chat-teal)]">{copy.relatedHeading}</h3>
+        <h3 className="text-sm font-semibold text-[color:var(--clinical-accent)]">{copy.relatedHeading}</h3>
         <div className="mt-3 grid grid-cols-2 gap-2">
           {related.map((relatedApp) => {
             const Icon = relatedApp.icon;
@@ -652,7 +652,7 @@ function DetailPanel({
                 href={relatedApp.href}
                 target={relatedApp.external ? "_blank" : undefined}
                 rel={relatedApp.external ? "noopener noreferrer" : undefined}
-                className="flex min-h-10 items-center gap-2 rounded-lg text-xs font-semibold text-[color:var(--clinical-chat-teal)] hover:bg-[color:var(--clinical-chat-teal-soft)]"
+                className="flex min-h-10 items-center gap-2 rounded-lg text-xs font-semibold text-[color:var(--clinical-accent)] hover:bg-[color:var(--clinical-accent-soft)]"
               >
                 <Icon className="h-4 w-4 shrink-0" aria-hidden />
                 <span className="min-w-0 truncate">{relatedApp.shortTitle ?? relatedApp.title}</span>
@@ -682,7 +682,7 @@ function ApplicationsMobileMenu({ open, onOpenChange }: { open: boolean; onOpenC
         <Link
           href="/"
           onClick={() => onOpenChange(false)}
-          className="inline-flex min-h-[44px] w-full items-center justify-center gap-2 rounded-lg bg-[color:var(--clinical-chat-teal)] px-3 text-sm font-semibold text-white shadow-[var(--shadow-tight)] hover:bg-[color:var(--primary-strong)]"
+          className="inline-flex min-h-[44px] w-full items-center justify-center gap-2 rounded-lg bg-[color:var(--clinical-accent)] px-3 text-sm font-semibold text-white shadow-[var(--shadow-tight)] hover:bg-[color:var(--primary-strong)]"
         >
           <Plus className="h-4 w-4" />
           New chat
@@ -725,7 +725,7 @@ function ApplicationsMobileMenu({ open, onOpenChange }: { open: boolean; onOpenC
                   onClick={() => onOpenChange(false)}
                   className={sidebarApplicationTile}
                 >
-                  <Icon className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" />
+                  <Icon className="h-4 w-4 text-[color:var(--clinical-accent)]" />
                   <span>{item.label}</span>
                 </Link>
               );
@@ -749,7 +749,7 @@ function ApplicationsMobileMenu({ open, onOpenChange }: { open: boolean; onOpenC
             <span>Settings</span>
           </button>
           <div className="mt-2 flex items-center gap-3 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 py-2 shadow-[var(--shadow-inset)]">
-            <span className="grid h-9 w-9 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-chat-teal-soft)] text-xs font-bold text-[color:var(--clinical-chat-teal)]">
+            <span className="grid h-9 w-9 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-accent-soft)] text-xs font-bold text-[color:var(--clinical-accent)]">
               AK
             </span>
             <span className="min-w-0 flex-1">
@@ -821,7 +821,7 @@ function ApplicationsModeMenu({ open, onOpenChange }: { open: boolean; onOpenCha
             className={cn(
               "grid min-h-[3.25rem] w-full grid-cols-[2rem_minmax(0,1fr)_auto] items-center gap-2 rounded-md px-2.5 py-2 text-left transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
               option.active
-                ? "bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]"
+                ? "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)]",
             )}
           >
@@ -829,7 +829,7 @@ function ApplicationsModeMenu({ open, onOpenChange }: { open: boolean; onOpenCha
               className={cn(
                 "grid h-8 w-8 place-items-center rounded-lg border shadow-[var(--shadow-inset)]",
                 option.active
-                  ? "border-[color:var(--clinical-chat-teal)]/25 bg-[color:var(--surface)]"
+                  ? "border-[color:var(--clinical-accent)]/25 bg-[color:var(--surface)]"
                   : "border-[color:var(--border)] bg-[color:var(--surface-raised)]",
               )}
             >
@@ -885,7 +885,7 @@ function ApplicationsHeader({
             aria-expanded={modeMenuOpen}
             aria-label="Current app mode: Applications"
           >
-            <span className="grid h-7 w-7 place-items-center rounded-full bg-[color:var(--clinical-chat-teal)] text-white shadow-[var(--shadow-tight)]">
+            <span className="grid h-7 w-7 place-items-center rounded-full bg-[color:var(--clinical-accent)] text-white shadow-[var(--shadow-tight)]">
               <Grid2X2 className="h-3.5 w-3.5" />
             </span>
             <span className="min-w-0">
@@ -1004,7 +1004,7 @@ export function ApplicationsLauncherWorkspace({
       {isDashboardTools ? (
         <section className="mx-auto grid w-full max-w-5xl gap-4 pt-4 sm:pt-7">
           <div className="grid justify-items-center gap-3 text-center">
-            <span className="grid h-14 w-14 place-items-center rounded-lg border border-[color:var(--clinical-chat-teal)]/15 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
+            <span className="grid h-14 w-14 place-items-center rounded-lg border border-[color:var(--clinical-accent)]/15 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
               <Grid2X2 className="h-6 w-6 sm:h-7 sm:w-7" aria-hidden />
             </span>
             <div className="max-w-2xl space-y-2">
@@ -1034,7 +1034,7 @@ export function ApplicationsLauncherWorkspace({
         </section>
       ) : (
         <section className="mx-auto flex min-h-[14rem] max-w-3xl flex-col items-center justify-center px-5 py-7 text-center sm:min-h-[16rem] sm:py-8 lg:min-h-[17rem]">
-          <span className="grid h-14 w-14 place-items-center rounded-2xl border border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
+          <span className="grid h-14 w-14 place-items-center rounded-2xl border border-[color:var(--clinical-accent)]/20 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
             <Grid2X2 className="h-6 w-6 sm:h-7 sm:w-7" aria-hidden />
           </span>
           <h1 className="mt-4 text-3xl font-semibold tracking-normal text-[color:var(--text-heading)] sm:mt-5 sm:text-4xl">
@@ -1109,7 +1109,7 @@ export function ApplicationsLauncherWorkspace({
             className="overflow-hidden rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] shadow-[var(--shadow-inset)]"
           >
             <div className="flex min-h-12 items-center gap-2 border-b border-[color:var(--border)] px-3">
-              <BookOpen className="h-4 w-4 text-[color:var(--clinical-chat-teal)]" aria-hidden />
+              <BookOpen className="h-4 w-4 text-[color:var(--clinical-accent)]" aria-hidden />
               <h2 className="text-sm font-semibold text-[color:var(--text-heading)]">{copy.allSectionLabel}</h2>
             </div>
 
@@ -1163,7 +1163,7 @@ export function ApplicationsLauncherWorkspace({
           <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] p-3 shadow-[var(--shadow-inset)]">
             <div className="mb-2 flex items-center justify-between gap-2">
               <h2 className="text-sm font-semibold text-[color:var(--text-heading)]">Recent activity</h2>
-              <span className="text-xs font-semibold text-[color:var(--clinical-chat-teal)]">View all</span>
+              <span className="text-xs font-semibold text-[color:var(--clinical-accent)]">View all</span>
             </div>
             <div className="grid gap-2 md:grid-cols-3">
               {recentActivity.slice(0, 3).map((item) => {
@@ -1175,7 +1175,7 @@ export function ApplicationsLauncherWorkspace({
                     onClick={() => selectApplication(item.id)}
                     className="grid min-h-14 grid-cols-[auto_minmax(0,1fr)] items-center gap-2 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 py-2 text-left shadow-[var(--shadow-inset)] hover:bg-[color:var(--surface-subtle)]"
                   >
-                    <Icon className="h-5 w-5 text-[color:var(--clinical-chat-teal)]" aria-hidden />
+                    <Icon className="h-5 w-5 text-[color:var(--clinical-accent)]" aria-hidden />
                     <span className="min-w-0">
                       <span className="block truncate text-sm font-semibold text-[color:var(--text-heading)]">
                         {item.label}
diff --git a/src/components/clinical-dashboard/document-search-results.tsx b/src/components/clinical-dashboard/document-search-results.tsx
index 7f0c4d78b4..2ff525b17e 100644
--- a/src/components/clinical-dashboard/document-search-results.tsx
+++ b/src/components/clinical-dashboard/document-search-results.tsx
@@ -421,7 +421,7 @@ function SearchResultsHeader({ resultLabel, trimmedQuery }: { resultLabel: strin
     <section className="flex items-start justify-between gap-3">
       <div className="min-w-0">
         <div className="flex items-center gap-3">
-          <span className="grid h-11 w-11 shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]">
+          <span className="grid h-11 w-11 shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]">
             <FileText className="h-5 w-5" />
           </span>
           <div className="min-w-0">
@@ -429,7 +429,7 @@ function SearchResultsHeader({ resultLabel, trimmedQuery }: { resultLabel: strin
             {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-chat-teal)] sm:inline sm:line-clamp-none">
+                <span className="line-clamp-2 font-semibold text-[color:var(--clinical-accent)] sm:inline sm:line-clamp-none">
                   {trimmedQuery}
                 </span>
               </p>
@@ -558,11 +558,11 @@ function SearchRecordResults({
     <section
       data-testid={`${copy.testIdPrefix}-results`}
       aria-label={copy.ariaLabel}
-      className="grid gap-3 rounded-lg border border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--surface-lux)] p-3 shadow-[var(--shadow-tight)]"
+      className="grid gap-3 rounded-lg border border-[color:var(--clinical-accent)]/20 bg-[color:var(--surface-lux)] p-3 shadow-[var(--shadow-tight)]"
     >
       <div className="flex flex-wrap items-center justify-between gap-3">
         <div className="flex min-w-0 items-center gap-3">
-          <span className="grid h-10 w-10 shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]">
+          <span className="grid h-10 w-10 shrink-0 place-items-center rounded-lg bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]">
             <FileText className="h-5 w-5" aria-hidden="true" />
           </span>
           <div className="min-w-0">
@@ -592,8 +592,8 @@ function SearchRecordResults({
               data-testid={`${copy.testIdPrefix}-result-${service.slug}`}
               className={cn(
                 sourceCard,
-                "grid gap-3 p-3 shadow-[0_8px_18px_rgb(15_27_45_/_4%)] transition hover:border-[color:var(--clinical-chat-teal-border)] sm:p-4",
-                index === 0 && "ring-1 ring-[color:var(--clinical-chat-teal)]/15",
+                "grid gap-3 p-3 shadow-[0_8px_18px_rgb(15_27_45_/_4%)] transition hover:border-[color:var(--clinical-accent-border)] sm:p-4",
+                index === 0 && "ring-1 ring-[color:var(--clinical-accent)]/15",
               )}
             >
               <div className="grid gap-2 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-start">
@@ -615,7 +615,7 @@ function SearchRecordResults({
                   href={recordRoute(service.slug)}
                   className={cn(
                     floatingControl,
-                    "inline-flex min-h-11 w-full justify-center rounded-lg px-3 text-sm text-[color:var(--clinical-chat-teal)] sm:w-auto",
+                    "inline-flex min-h-11 w-full justify-center rounded-lg px-3 text-sm text-[color:var(--clinical-accent)] sm:w-auto",
                   )}
                   aria-label={`Open ${service.title}`}
                 >
@@ -796,7 +796,7 @@ export function DocumentSearchResultsPanel({
       ) : matches.length === 0 ? (
         recordMatchCount > 0 ? null : trimmedQuery && !shouldShowHome ? (
           <div className={cn(panelSubtle, "grid gap-3 p-5 text-center sm:p-6")}>
-            <span className="mx-auto grid h-11 w-11 place-items-center rounded-lg bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]">
+            <span className="mx-auto grid h-11 w-11 place-items-center rounded-lg bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]">
               <FileText className="h-5 w-5" />
             </span>
             <div>
@@ -842,7 +842,7 @@ export function DocumentSearchResultsPanel({
                     className={cn(
                       "inline-flex min-h-8 shrink-0 items-center gap-1.5 rounded-md px-2.5 text-[11px] font-bold transition",
                       active
-                        ? "bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]"
+                        ? "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)]",
                     )}
                   >
@@ -884,8 +884,8 @@ export function DocumentSearchResultsPanel({
                   key={document.document_id}
                   className={cn(
                     sourceCard,
-                    "relative overflow-visible p-0 shadow-[0_8px_18px_rgb(15_27_45_/_4%)] transition hover:border-[color:var(--clinical-chat-teal-border)] hover:shadow-[0_14px_32px_rgb(15_27_45_/_7%)]",
-                    index === 0 && "ring-1 ring-[color:var(--clinical-chat-teal)]/15",
+                    "relative overflow-visible p-0 shadow-[0_8px_18px_rgb(15_27_45_/_4%)] transition hover:border-[color:var(--clinical-accent-border)] hover:shadow-[0_14px_32px_rgb(15_27_45_/_7%)]",
+                    index === 0 && "ring-1 ring-[color:var(--clinical-accent)]/15",
                   )}
                 >
                   <div className="grid grid-cols-[auto_minmax(0,1fr)] gap-3 px-3 py-3 sm:px-4">
@@ -901,7 +901,7 @@ export function DocumentSearchResultsPanel({
                                   className="h-1 w-1 rounded-full bg-[color:var(--border-strong)]"
                                   aria-hidden="true"
                                 />
-                                <span className="text-[color:var(--clinical-chat-teal)]">Best match</span>
+                                <span className="text-[color:var(--clinical-accent)]">Best match</span>
                               </>
                             ) : null}
                           </p>
@@ -969,7 +969,7 @@ export function DocumentSearchResultsPanel({
                     <DocumentActionButton
                       onClick={() => onAnswerFromDocument(document.document_id)}
                       icon={Sparkles}
-                      className="ml-auto min-h-11 rounded-lg px-2.5 text-xs text-[color:var(--clinical-chat-teal)] hover:bg-[color:var(--clinical-chat-teal-soft)]"
+                      className="ml-auto min-h-11 rounded-lg px-2.5 text-xs text-[color:var(--clinical-accent)] hover:bg-[color:var(--clinical-accent-soft)]"
                       aria-label={`Answer from ${document.title}`}
                     >
                       Answer
diff --git a/src/components/clinical-dashboard/document-ui.tsx b/src/components/clinical-dashboard/document-ui.tsx
index 565c7dca98..891a0a3d35 100644
--- a/src/components/clinical-dashboard/document-ui.tsx
+++ b/src/components/clinical-dashboard/document-ui.tsx
@@ -10,14 +10,14 @@ export type DocumentBadgeVariant = "best" | "high" | "relevant" | "neutral";
 export type DocumentTileTone = "teal" | "info";
 
 const badgeStyles: Record<DocumentBadgeVariant, string> = {
-  best: "border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]",
-  high: "border-[color:var(--clinical-chat-teal)]/18 bg-[color:var(--surface-raised)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]",
+  best: "border-[color:var(--clinical-accent)]/20 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]",
+  high: "border-[color:var(--clinical-accent)]/18 bg-[color:var(--surface-raised)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]",
   relevant: "border-[color:var(--info)]/15 bg-[color:var(--info-soft)]/70 text-[color:var(--info)]",
   neutral: "border-[color:var(--border-lux)] bg-[color:var(--surface-subtle)] text-[color:var(--text-muted)]",
 };
 
 const tileStyles: Record<DocumentTileTone, string> = {
-  teal: "border-[color:var(--clinical-chat-teal)]/12 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+  teal: "border-[color:var(--clinical-accent)]/12 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]",
   info: "border-[color:var(--info)]/15 bg-[color:var(--info-soft)]/60 text-[color:var(--info)]",
 };
 
diff --git a/src/components/clinical-dashboard/favourites-hub.tsx b/src/components/clinical-dashboard/favourites-hub.tsx
index 48bc60c18f..9b0f09766b 100644
--- a/src/components/clinical-dashboard/favourites-hub.tsx
+++ b/src/components/clinical-dashboard/favourites-hub.tsx
@@ -115,7 +115,7 @@ export function FavouritesHub({
     <div data-testid="favourites-hub" className="mx-auto w-full max-w-6xl space-y-4 overflow-x-hidden sm:space-y-5">
       <div className="mx-auto grid w-full max-w-5xl gap-4 pt-4 sm:pt-7 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-end">
         <div className="grid justify-items-center gap-3 text-center lg:justify-items-start lg:text-left">
-          <span className="grid h-14 w-14 place-items-center rounded-lg border border-[color:var(--clinical-chat-teal)]/15 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
+          <span className="grid h-14 w-14 place-items-center rounded-lg border border-[color:var(--clinical-accent)]/15 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)] sm:h-16 sm:w-16">
             <Heart className="h-6 w-6 sm:h-7 sm:w-7" />
           </span>
           <div className="max-w-2xl space-y-2">
@@ -141,7 +141,7 @@ export function FavouritesHub({
                 className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-lux)] px-3 py-2 shadow-[var(--shadow-inset)]"
               >
                 <div className="flex items-center gap-1.5 text-[11px] font-bold uppercase tracking-[0.08em] text-[color:var(--text-soft)]">
-                  <Icon className="h-3.5 w-3.5 text-[color:var(--clinical-chat-teal)]" />
+                  <Icon className="h-3.5 w-3.5 text-[color:var(--clinical-accent)]" />
                   <span className="truncate">{stat.label}</span>
                 </div>
                 <p className="nums mt-1 text-lg font-bold leading-none text-[color:var(--text-heading)]">
@@ -161,13 +161,13 @@ export function FavouritesHub({
               type="button"
               onClick={() => setTabMenuOpen((open) => !open)}
               onKeyDown={handleFavouriteTabTriggerKeyDown}
-              className="grid min-h-11 w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] px-2.5 text-left shadow-[var(--shadow-tight)] transition hover:border-[color:var(--clinical-chat-teal)]/30 hover:bg-[color:var(--surface-raised)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:w-56"
+              className="grid min-h-11 w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface-lux)] px-2.5 text-left shadow-[var(--shadow-tight)] transition hover:border-[color:var(--clinical-accent)]/30 hover:bg-[color:var(--surface-raised)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:w-56"
               aria-haspopup="listbox"
               aria-expanded={tabMenuOpen}
               aria-controls={tabMenuOpen ? "favourites-type-listbox" : undefined}
               aria-label="Choose favourite type"
             >
-              <span className="grid h-7 w-7 place-items-center rounded-md bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]">
+              <span className="grid h-7 w-7 place-items-center rounded-md bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]">
                 <SelectedTabIcon className="h-3.5 w-3.5" />
               </span>
               <span className="grid min-w-0 gap-0.5">
@@ -216,7 +216,7 @@ export function FavouritesHub({
                       className={cn(
                         "grid min-h-10 grid-cols-[1.75rem_minmax(0,1fr)_auto] items-center gap-2 rounded-lg px-2.5 text-left text-sm transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
                         selected
-                          ? "bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]"
+                          ? "bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]"
                           : "text-[color:var(--text-muted)] hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)]",
                       )}
                     >
@@ -233,7 +233,7 @@ export function FavouritesHub({
                         className={cn(
                           "nums rounded-full px-2 py-0.5 text-[11px] font-bold",
                           selected
-                            ? "bg-[color:var(--surface)] text-[color:var(--clinical-chat-teal)]"
+                            ? "bg-[color:var(--surface)] text-[color:var(--clinical-accent)]"
                             : "bg-[color:var(--surface-subtle)] text-[color:var(--text-soft)]",
                         )}
                       >
@@ -259,7 +259,7 @@ export function FavouritesHub({
             <button
               type="button"
               onClick={() => setSelectedSetId(null)}
-              className="inline-flex min-h-7 max-w-full items-center gap-1.5 rounded-md border border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] px-2 font-bold text-[color:var(--clinical-chat-teal)] hover:border-[color:var(--clinical-chat-teal)]/35"
+              className="inline-flex min-h-7 max-w-full items-center gap-1.5 rounded-md border border-[color:var(--clinical-accent)]/20 bg-[color:var(--clinical-accent-soft)] px-2 font-bold text-[color:var(--clinical-accent)] hover:border-[color:var(--clinical-accent)]/35"
             >
               <span className="truncate">Set: {selectedSet.title}</span>
               <X className="h-3.5 w-3.5" />
@@ -289,7 +289,7 @@ export function FavouritesHub({
           <button
             type="button"
             onClick={() => setSelectedTab("sets")}
-            className="text-xs font-bold text-[color:var(--clinical-chat-teal)]"
+            className="text-xs font-bold text-[color:var(--clinical-accent)]"
           >
             View all
           </button>
@@ -377,7 +377,7 @@ export function FavouritesHub({
               <button
                 type="button"
                 onClick={() => setSelectedTab("sets")}
-                className="shrink-0 text-xs font-bold text-[color:var(--clinical-chat-teal)] hover:underline"
+                className="shrink-0 text-xs font-bold text-[color:var(--clinical-accent)] hover:underline"
               >
                 View all
               </button>
@@ -466,7 +466,7 @@ function FavouriteSetRow({
       className={cn(
         "grid w-full grid-cols-[2.5rem_minmax(0,1fr)_auto] items-center gap-3 rounded-lg px-2 py-2 text-left transition hover:bg-[color:var(--surface-subtle)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
         compact ? "min-h-[3.75rem]" : "min-h-[4.25rem]",
-        selected && "bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+        selected && "bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]",
       )}
     >
       <span className={iconTilePremium}>
@@ -476,7 +476,7 @@ function FavouriteSetRow({
         <span
           className={cn(
             "block truncate font-bold",
-            selected ? "text-[color:var(--clinical-chat-teal)]" : "text-[color:var(--text-heading)]",
+            selected ? "text-[color:var(--clinical-accent)]" : "text-[color:var(--text-heading)]",
           )}
         >
           {favouriteSet.title}
@@ -484,7 +484,7 @@ function FavouriteSetRow({
         <span
           className={cn(
             "block truncate text-sm font-medium",
-            selected ? "text-[color:var(--clinical-chat-teal)]" : "text-[color:var(--text-muted)]",
+            selected ? "text-[color:var(--clinical-accent)]" : "text-[color:var(--text-muted)]",
           )}
         >
           {favouriteSet.count} items{compact ? "" : ` · ${favouriteSet.meta}`}
diff --git a/src/components/clinical-dashboard/global-mockup-search-shell.tsx b/src/components/clinical-dashboard/global-mockup-search-shell.tsx
index 4c0aa6d1e0..2f1dcfa723 100644
--- a/src/components/clinical-dashboard/global-mockup-search-shell.tsx
+++ b/src/components/clinical-dashboard/global-mockup-search-shell.tsx
@@ -267,7 +267,7 @@ function GlobalMockupSearchShellClient({
                 className={cn(
                   sidebarItem,
                   "grid grid-cols-[2rem_minmax(0,1fr)] px-2.5 py-2 text-left",
-                  active && "bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+                  active && "bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]",
                 )}
               >
                 <span className="grid h-8 w-8 place-items-center rounded-lg bg-[color:var(--surface)] shadow-[var(--shadow-inset)]">
diff --git a/src/components/clinical-dashboard/medication-prescribing-workspace.tsx b/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
index 0c4ccef692..49e56464c4 100644
--- a/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
+++ b/src/components/clinical-dashboard/medication-prescribing-workspace.tsx
@@ -364,7 +364,7 @@ function IconTile({
       className={cn(
         "grid shrink-0 place-items-center rounded-lg border shadow-[var(--shadow-inset)]",
         tone === "teal" &&
-          "border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+          "border-[color:var(--clinical-accent)]/20 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]",
         tone === "blue" && "border-blue-500/15 bg-blue-50 text-blue-700 dark:bg-blue-950/30 dark:text-blue-300",
         tone === "slate" &&
           "border-[color:var(--border)] bg-[color:var(--surface-subtle)] text-[color:var(--text-muted)]",
@@ -385,7 +385,7 @@ function ClinicalBadge({
 }: ClinicalBadgeItem & { compact?: boolean }) {
   const toneClassName: Record<ClinicalBadgeTone, string> = {
     clinical:
-      "border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]",
+      "border-[color:var(--clinical-accent)]/20 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]",
     success: toneSuccess,
     danger: toneDanger,
     warning: toneWarning,
@@ -475,7 +475,7 @@ function StatusNotice({
 function QueryChip({ query }: { query: string }) {
   return (
     <span className="inline-flex min-h-8 max-w-full items-center gap-2 rounded-full border border-[color:var(--border)] bg-[color:var(--surface-raised)] px-3 text-xs font-semibold text-[color:var(--text-muted)] shadow-[var(--shadow-inset)]">
-      <Pill className="h-3.5 w-3.5 shrink-0 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+      <Pill className="h-3.5 w-3.5 shrink-0 text-[color:var(--clinical-accent)]" aria-hidden="true" />
       <span className="min-w-0 truncate">{query}</span>
     </span>
   );
@@ -552,7 +552,7 @@ function FilterStrip({
           className={cn(
             "min-h-8 shrink-0 rounded-lg border px-2.5 text-[11px] font-semibold transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)] sm:px-3 sm:text-xs",
             activeFilter === filter.id
-              ? "border-[color:var(--clinical-chat-teal)] bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)]"
+              ? "border-[color:var(--clinical-accent)] bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]"
               : "border-[color:var(--border)] bg-[color:var(--surface-raised)] text-[color:var(--text-muted)] hover:border-[color:var(--border-strong)] hover:text-[color:var(--text-heading)]",
           )}
         >
@@ -641,7 +641,7 @@ function MedicationResults({
             const rowClassName = cn(
               "grid w-full grid-cols-[minmax(16rem,1.15fr)_minmax(6.5rem,0.42fr)_minmax(8rem,0.48fr)_minmax(16rem,1fr)_2rem] items-center gap-2.5 px-4 py-2.5 text-left transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-inset focus-visible:outline-[color:var(--focus)]",
               selected
-                ? "bg-[color:var(--clinical-chat-teal-soft)]/35 ring-1 ring-inset ring-[color:var(--clinical-chat-teal)]/35"
+                ? "bg-[color:var(--clinical-accent-soft)]/35 ring-1 ring-inset ring-[color:var(--clinical-accent)]/35"
                 : result.href
                   ? "hover:bg-[color:var(--surface-subtle)]"
                   : "cursor-default opacity-80",
@@ -705,7 +705,7 @@ function MedicationResults({
           const cardClassName = cn(
             "w-full rounded-lg border bg-[color:var(--surface-raised)] p-2 text-left shadow-[var(--shadow-inset)] transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
             selected
-              ? "border-[color:var(--clinical-chat-teal)] bg-[color:var(--clinical-chat-teal-soft)]/35"
+              ? "border-[color:var(--clinical-accent)] bg-[color:var(--clinical-accent-soft)]/35"
               : result.href
                 ? "border-[color:var(--border)] hover:border-[color:var(--border-strong)]"
                 : "border-[color:var(--border)] opacity-80",
@@ -914,7 +914,7 @@ function ClinicalViewToggle({
             className={cn(
               "min-h-8 rounded-md px-3 text-xs font-semibold transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
               active
-                ? "bg-[color:var(--surface-raised)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-tight)]"
+                ? "bg-[color:var(--surface-raised)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-tight)]"
                 : "text-[color:var(--text-muted)] hover:text-[color:var(--text-heading)]",
             )}
           >
@@ -958,7 +958,7 @@ function DetailLedger({
           <summary className="flex min-h-12 cursor-pointer list-none items-center justify-between gap-3 px-5 text-sm font-semibold text-[color:var(--text-heading)] [&::-webkit-details-marker]:hidden">
             <span className="flex min-w-0 items-center gap-2">
               <ChevronDown
-                className="h-4 w-4 shrink-0 text-[color:var(--clinical-chat-teal)] transition group-open:rotate-180"
+                className="h-4 w-4 shrink-0 text-[color:var(--clinical-accent)] transition group-open:rotate-180"
                 aria-hidden="true"
               />
               <span className="truncate">Additional populations, risks and PK</span>
@@ -983,7 +983,7 @@ function SidePanel({ section }: { section: SideSection }) {
   return (
     <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-3.5 shadow-[var(--shadow-inset)]">
       <div className="mb-2.5 flex items-center gap-2">
-        <Icon className="h-4.5 w-4.5 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+        <Icon className="h-4.5 w-4.5 text-[color:var(--clinical-accent)]" aria-hidden="true" />
         <h4 className="text-sm font-semibold text-[color:var(--text-heading)]">{section.title}</h4>
       </div>
       <div className="divide-y divide-[color:var(--border)]">
@@ -996,7 +996,7 @@ function SidePanel({ section }: { section: SideSection }) {
                   <IconTile icon={ItemIcon} tone="teal" className="mt-0.5 h-8 w-8" />
                 ) : (
                   <span
-                    className="mt-2 h-2 w-2 shrink-0 rounded-full border border-[color:var(--clinical-chat-teal)]/30 bg-[color:var(--clinical-chat-teal-soft)]"
+                    className="mt-2 h-2 w-2 shrink-0 rounded-full border border-[color:var(--clinical-accent)]/30 bg-[color:var(--clinical-accent-soft)]"
                     aria-hidden="true"
                   />
                 )}
@@ -1037,7 +1037,7 @@ function MedicationSummaryTabs({
             className={cn(
               "min-h-8 rounded-md px-2 text-xs font-semibold text-[color:var(--text-muted)] transition hover:text-[color:var(--text-heading)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
               activeSection === item.target &&
-                "bg-[color:var(--surface-raised)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-tight)]",
+                "bg-[color:var(--surface-raised)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-tight)]",
             )}
           >
             {item.label}
@@ -1056,7 +1056,7 @@ function AccessPanel() {
   return (
     <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface-raised)] p-3.5 shadow-[var(--shadow-inset)]">
       <div className="mb-2.5 flex items-center gap-2">
-        <Lock className="h-4.5 w-4.5 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+        <Lock className="h-4.5 w-4.5 text-[color:var(--clinical-accent)]" aria-hidden="true" />
         <h4 className="text-sm font-semibold text-[color:var(--text-heading)]">Access</h4>
       </div>
       <BadgeCluster items={accessBadges} compact limit={3} className="mb-2.5" />
@@ -1181,7 +1181,7 @@ function MobileDisclosurePanel({ panel }: { panel: MobileDisclosurePanelData })
     <details className="group scroll-mt-16 border-b border-[color:var(--border)] last:border-b-0">
       <summary className="flex min-h-10 cursor-pointer list-none items-center justify-between gap-3 px-3 text-left text-[13px] font-semibold text-[color:var(--text-heading)] [&::-webkit-details-marker]:hidden">
         <span className="flex min-w-0 items-center gap-2">
-          <Icon className="h-4 w-4 shrink-0 text-[color:var(--clinical-chat-teal)]" aria-hidden="true" />
+          <Icon className="h-4 w-4 shrink-0 text-[color:var(--clinical-accent)]" aria-hidden="true" />
           <span className="truncate">{panel.label}</span>
         </span>
         <ChevronDown
@@ -1336,7 +1336,7 @@ export function AcamprosateMedicationPage() {
             Clinical KB
           </div>
           <div className="flex justify-end">
-            <span className="inline-flex min-h-8 items-center gap-2 rounded-lg border border-[color:var(--clinical-chat-teal)]/20 bg-[color:var(--clinical-chat-teal-soft)] px-3 text-xs font-semibold text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)]">
+            <span className="inline-flex min-h-8 items-center gap-2 rounded-lg border border-[color:var(--clinical-accent)]/20 bg-[color:var(--clinical-accent-soft)] px-3 text-xs font-semibold text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)]">
               <Pill className="h-3.5 w-3.5" aria-hidden="true" />
               Medication
             </span>
diff --git a/src/components/clinical-dashboard/mode-action-popup.tsx b/src/components/clinical-dashboard/mode-action-popup.tsx
index 0e61982382..180b3e8015 100644
--- a/src/components/clinical-dashboard/mode-action-popup.tsx
+++ b/src/components/clinical-dashboard/mode-action-popup.tsx
@@ -340,8 +340,8 @@ export function ModeActionPopup({
               integrated ? "rounded-[1.35rem] shadow-[0_20px_48px_rgb(15_37_48_/_18%)]" : "rounded-[1rem]",
             )}
           >
-            <div className="grid min-h-[4.1rem] grid-cols-[minmax(8.5rem,0.38fr)_minmax(0,1fr)_3.75rem] overflow-hidden border-b border-[color:var(--border)]/70 bg-[linear-gradient(90deg,color-mix(in_srgb,var(--clinical-chat-teal-soft)_42%,var(--surface)_58%)_0%,color-mix(in_srgb,var(--surface-raised)_92%,var(--clinical-chat-teal-soft)_8%)_100%)]">
-              <div className="flex min-w-0 items-center gap-3 bg-[linear-gradient(135deg,color-mix(in_srgb,var(--clinical-chat-teal)_82%,#ffffff_18%)_0%,color-mix(in_srgb,var(--clinical-chat-teal)_68%,var(--primary-strong)_32%)_100%)] px-3.5 text-[color:var(--primary-contrast)] shadow-[inset_0_1px_0_rgb(255_255_255_/_22%)] sm:px-4">
+            <div className="grid min-h-[4.1rem] grid-cols-[minmax(8.5rem,0.38fr)_minmax(0,1fr)_3.75rem] overflow-hidden border-b border-[color:var(--border)]/70 bg-[linear-gradient(90deg,color-mix(in_srgb,var(--clinical-accent-soft)_42%,var(--surface)_58%)_0%,color-mix(in_srgb,var(--surface-raised)_92%,var(--clinical-accent-soft)_8%)_100%)]">
+              <div className="flex min-w-0 items-center gap-3 bg-[linear-gradient(135deg,color-mix(in_srgb,var(--clinical-accent)_82%,#ffffff_18%)_0%,color-mix(in_srgb,var(--clinical-accent)_68%,var(--primary-strong)_32%)_100%)] px-3.5 text-[color:var(--primary-contrast)] shadow-[inset_0_1px_0_rgb(255_255_255_/_22%)] sm:px-4">
                 <span className="grid h-9 w-9 shrink-0 place-items-center rounded-lg border border-white/25 bg-white/10 text-white shadow-[var(--shadow-inset)]">
                   <TitleIcon className="h-4.5 w-4.5" />
                 </span>
@@ -356,7 +356,7 @@ export function ModeActionPopup({
               <button
                 type="button"
                 onClick={closeAndRestoreFocus}
-                className="m-auto grid h-9 w-9 shrink-0 place-items-center rounded-full border border-[color:var(--clinical-chat-teal)]/28 bg-[color:var(--clinical-chat-teal-soft)] text-[color:var(--clinical-chat-teal)] shadow-[var(--shadow-inset)] transition hover:bg-[color:var(--surface)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
+                className="m-auto grid h-9 w-9 shrink-0 place-items-center rounded-full border border-[color:var(--clinical-accent)]/28 bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)] shadow-[var(--shadow-inset)] transition hover:bg-[color:var(--surface)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]"
                 aria-label={`Close ${title.toLowerCase()} options`}
               >
                 <BadgeCheck className="h-4.5 w-4.5" />
@@ -382,11 +382,11 @@ export function ModeActionPopup({
                       onClick={() => runActionAndClose(item.id)}
                       className={cn(
                         "group grid min-h-[4.6rem] place-items-center gap-1.5 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-2 py-2 text-center shadow-[var(--shadow-inset)] transition motion-safe:duration-150 sm:min-h-[4.85rem]",
-                        "hover:border-[color:var(--clinical-chat-teal)]/32 hover:bg-[color:var(--clinical-chat-teal-soft)]/24 active:scale-[0.985]",
+                        "hover:border-[color:var(--clinical-accent)]/32 hover:bg-[color:var(--clinical-accent-soft)]/24 active:scale-[0.985]",
                         "focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
                       )}
                     >
-                      <span className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-heading)] transition group-hover:text-[color:var(--clinical-chat-teal)]">
+                      <span className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-heading)] transition group-hover:text-[color:var(--clinical-accent)]">
                         <Icon className="h-5 w-5" />
                       </span>
                       <span className="max-w-full text-balance text-[12px] font-bold leading-4 text-[color:var(--text-heading)]">

From c8b6c4d14c949c37290a3547aa80fee26939eb0b Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Thu, 2 Jul 2026 13:27:41 +0800
Subject: [PATCH 3/7] style: prettier formatting after token rename and merge

The accent token rename shortened one launcher class line below the wrap
threshold; also picks up one pre-existing unformatted call in DocumentViewer
that arrived with the origin/main merge.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 src/components/DocumentViewer.tsx             | 4 +++-
 src/components/applications-launcher-page.tsx | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/DocumentViewer.tsx b/src/components/DocumentViewer.tsx
index 1eb62f194d..b267b3b5a3 100644
--- a/src/components/DocumentViewer.tsx
+++ b/src/components/DocumentViewer.tsx
@@ -362,7 +362,9 @@ function DocumentImage({ image }: { image: ImageRow }) {
   const showImageCaptionLine = cleanCaption && cleanCaption !== tableCaption;
   const displayLabels = smartEvidenceTags(
     image.labels,
-    [tableHeading, cleanCaption, image.tableTextSnippet ? sourceTextForCompactDisplay(image.tableTextSnippet) : null].filter(Boolean).join(" "),
+    [tableHeading, cleanCaption, image.tableTextSnippet ? sourceTextForCompactDisplay(image.tableTextSnippet) : null]
+      .filter(Boolean)
+      .join(" "),
   );
 
   return (
diff --git a/src/components/applications-launcher-page.tsx b/src/components/applications-launcher-page.tsx
index e78f857640..dc5473fb88 100644
--- a/src/components/applications-launcher-page.tsx
+++ b/src/components/applications-launcher-page.tsx
@@ -486,8 +486,7 @@ function MobileApplicationRow({
       data-testid={`mobile-application-row-${app.id}`}
       className={cn(
         "grid min-h-[62px] w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-t border-[color:var(--border)] px-3 py-2.5 text-left first:border-t-0",
-        selected &&
-          "rounded-lg border border-[color:var(--clinical-accent)] bg-[color:var(--clinical-accent-soft)]/60",
+        selected && "rounded-lg border border-[color:var(--clinical-accent)] bg-[color:var(--clinical-accent-soft)]/60",
       )}
     >
       <AppIcon app={app} compact />

From 85908127c52b249871e1f18ea5cde19ae0415f0a Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Thu, 2 Jul 2026 13:44:50 +0800
Subject: [PATCH 4/7] refactor(theme): remove clinical-chat-ready/amber aliases
 and dead document token

Migrate the last legacy chat alias consumers to role tokens:
- var(--clinical-chat-ready) -> var(--success) (status dots)
- var(--clinical-chat-amber) -> var(--warning) (review/caution text)
Delete both alias definitions and the consumer-less
--clinical-chat-document token from both theme blocks.

--clinical-chat-sand* and --clinical-chat-table-header stay: they are
bespoke per-theme values with no role-token equivalent, now documented
as such instead of as migration compat.

Verified: typecheck, eslint + prettier on changed files, ui-smoke
chromium 29/29, runtime token check (removed vars resolve empty,
success/warning resolve, kept tokens unchanged).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 src/app/globals.css                                    | 10 ++--------
 src/components/ClinicalDashboard.tsx                   |  2 +-
 .../clinical-dashboard/differentials-home.tsx          |  2 +-
 .../clinical-dashboard/master-search-header.tsx        |  2 +-
 .../differentials/differential-detail-page.tsx         |  2 +-
 .../differential-presentation-workflow-page.tsx        |  2 +-
 src/components/ui-primitives.tsx                       |  4 ++--
 7 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/app/globals.css b/src/app/globals.css
index f47e30900e..b67d9c0619 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -139,15 +139,12 @@
   --clinical-accent-border: #b9e4ea;
   --clinical-accent-contrast: #ffffff;
 
-  /* Migration compat: existing ready call-sites resolve to the new roles.
-     Remove once all call-sites reference the role tokens directly. */
+  /* Bespoke chat surfaces with no role-token equivalent: warm sand callouts
+     and table headers. Per-theme values, not aliases. */
   --clinical-chat-sand: #f7f1e6;
   --clinical-chat-sand-border: #eadcc7;
   --clinical-chat-sand-border-strong: #ddc7a8;
-  --clinical-chat-document: #f1f4f6;
   --clinical-chat-table-header: #f7f8fa;
-  --clinical-chat-amber: var(--warning);
-  --clinical-chat-ready: var(--success);
 
   /* Semantic triads (text / background / border), on-white for light mode. */
   --info-text: #2563eb;
@@ -282,10 +279,7 @@
   --clinical-chat-sand: #2d2418;
   --clinical-chat-sand-border: #5a4427;
   --clinical-chat-sand-border-strong: #806034;
-  --clinical-chat-document: #101215;
   --clinical-chat-table-header: #141619;
-  --clinical-chat-amber: var(--warning);
-  --clinical-chat-ready: var(--success);
 
   --info-text: #89c0f0;
   --info-bg: #122c4c;
diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index d36bef7274..7c6bff3b0b 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -4986,7 +4986,7 @@ function SettingsDialog({
               <span className="relative grid h-11 w-11 shrink-0 place-items-center rounded-full bg-[color:var(--clinical-accent-soft)] text-sm font-bold leading-none text-[color:var(--clinical-accent)] ring-1 ring-[color:var(--clinical-accent)]/10 lg:h-11 lg:w-11">
                 {identity.initials}
                 {identity.signedIn ? (
-                  <span className="absolute bottom-0.5 right-0.5 h-3 w-3 rounded-full border-2 border-[color:var(--surface)] bg-[color:var(--clinical-chat-ready)]" />
+                  <span className="absolute bottom-0.5 right-0.5 h-3 w-3 rounded-full border-2 border-[color:var(--surface)] bg-[color:var(--success)]" />
                 ) : null}
               </span>
               <div className="min-w-0 flex-1">
diff --git a/src/components/clinical-dashboard/differentials-home.tsx b/src/components/clinical-dashboard/differentials-home.tsx
index 77800e57b0..c43c79bd60 100644
--- a/src/components/clinical-dashboard/differentials-home.tsx
+++ b/src/components/clinical-dashboard/differentials-home.tsx
@@ -526,7 +526,7 @@ function SourceStatusCard({ sourceCount }: { sourceCount: number }) {
           </span>
           <span className="text-[color:var(--text-muted)]">{sourceCount.toLocaleString()} sources</span>
         </p>
-        <p className="flex items-center justify-between gap-3 text-[color:var(--clinical-chat-amber)]">
+        <p className="flex items-center justify-between gap-3 text-[color:var(--warning)]">
           <span className="inline-flex items-center gap-2">
             <CircleHelp className="h-4 w-4" aria-hidden />
             {workflow.sourceStatus.label}
diff --git a/src/components/clinical-dashboard/master-search-header.tsx b/src/components/clinical-dashboard/master-search-header.tsx
index edb951a9bf..e2cff142be 100644
--- a/src/components/clinical-dashboard/master-search-header.tsx
+++ b/src/components/clinical-dashboard/master-search-header.tsx
@@ -1203,7 +1203,7 @@ export function MasterSearchHeader({
                     <Cloud className="h-4 w-4 text-[color:var(--text-muted)]" aria-hidden />
                     Offline ready
                   </span>
-                  <span className="inline-flex min-h-10 items-center gap-2 rounded-lg border border-[color:var(--warning-border)] bg-[color:var(--warning-soft)]/45 px-3 text-xs font-extrabold text-[color:var(--clinical-chat-amber)] shadow-[var(--shadow-inset)]">
+                  <span className="inline-flex min-h-10 items-center gap-2 rounded-lg border border-[color:var(--warning-border)] bg-[color:var(--warning-soft)]/45 px-3 text-xs font-extrabold text-[color:var(--warning)] shadow-[var(--shadow-inset)]">
                     <AlertCircle className="h-4 w-4" aria-hidden />
                     Source pending review
                   </span>
diff --git a/src/components/differentials/differential-detail-page.tsx b/src/components/differentials/differential-detail-page.tsx
index 191593378f..5bf25bf9a0 100644
--- a/src/components/differentials/differential-detail-page.tsx
+++ b/src/components/differentials/differential-detail-page.tsx
@@ -302,7 +302,7 @@ function FooterStatus() {
           className="min-w-0 sm:border-l sm:border-[color:var(--border)] sm:pl-4 first:sm:border-l-0 first:sm:pl-0"
         >
           <p className="font-extrabold uppercase tracking-[0.08em] text-[color:var(--text-muted)]">{title}</p>
-          <p className="mt-3 font-bold text-[color:var(--clinical-chat-amber)]">{line}</p>
+          <p className="mt-3 font-bold text-[color:var(--warning)]">{line}</p>
           <p className="mt-2 leading-5 text-[color:var(--text-muted)]">{detail}</p>
         </div>
       ))}
diff --git a/src/components/differentials/differential-presentation-workflow-page.tsx b/src/components/differentials/differential-presentation-workflow-page.tsx
index 9e35eb79e5..7d6d938aa0 100644
--- a/src/components/differentials/differential-presentation-workflow-page.tsx
+++ b/src/components/differentials/differential-presentation-workflow-page.tsx
@@ -386,7 +386,7 @@ function SourceStatusPanel() {
   return (
     <section className="rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] p-4 shadow-[var(--shadow-inset)]">
       <h2 className="text-sm font-extrabold uppercase text-[color:var(--text-muted)]">Source status</h2>
-      <p className="mt-3 inline-flex items-center gap-2 text-sm font-bold text-[color:var(--clinical-chat-amber)]">
+      <p className="mt-3 inline-flex items-center gap-2 text-sm font-bold text-[color:var(--warning)]">
         <CircleHelp className="h-4 w-4" aria-hidden />
         {status.label}
       </p>
diff --git a/src/components/ui-primitives.tsx b/src/components/ui-primitives.tsx
index 7d40807008..d793684961 100644
--- a/src/components/ui-primitives.tsx
+++ b/src/components/ui-primitives.tsx
@@ -98,8 +98,8 @@ export const sidebarItem =
 export const sidebarToolTile =
   "grid min-h-[64px] place-items-center gap-1 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-2 py-2 text-center text-xs font-semibold text-[color:var(--text)] shadow-[var(--shadow-inset)] transition hover:border-[color:var(--border-strong)] hover:bg-[color:var(--surface-subtle)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]";
 export const statusDotBase = "inline-block h-2 w-2 shrink-0 rounded-full";
-export const statusDotReady = `${statusDotBase} bg-[color:var(--clinical-chat-ready)]`;
-export const statusDotReview = `${statusDotBase} bg-[color:var(--clinical-chat-amber)]`;
+export const statusDotReady = `${statusDotBase} bg-[color:var(--success)]`;
+export const statusDotReview = `${statusDotBase} bg-[color:var(--warning)]`;
 export const statusDotMuted = `${statusDotBase} bg-[color:var(--text-soft)]`;
 
 export const toneSuccess =

From 08a4decd361b3770ca1031298090f565a2e3fd76 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 06:11:13 +0000
Subject: [PATCH 5/7] fix: restore remaining clinical chat compat tokens

---
 src/app/globals.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/globals.css b/src/app/globals.css
index b67d9c0619..a2938bc9f4 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -144,7 +144,9 @@
   --clinical-chat-sand: #f7f1e6;
   --clinical-chat-sand-border: #eadcc7;
   --clinical-chat-sand-border-strong: #ddc7a8;
+  --clinical-chat-document: #f1f4f6;
   --clinical-chat-table-header: #f7f8fa;
+  --clinical-chat-ready: var(--success);
 
   /* Semantic triads (text / background / border), on-white for light mode. */
   --info-text: #2563eb;
@@ -279,7 +281,9 @@
   --clinical-chat-sand: #2d2418;
   --clinical-chat-sand-border: #5a4427;
   --clinical-chat-sand-border-strong: #806034;
+  --clinical-chat-document: #101215;
   --clinical-chat-table-header: #141619;
+  --clinical-chat-ready: var(--success);
 
   --info-text: #89c0f0;
   --info-bg: #122c4c;

From c3128a663dbcdfb2f1d4dc0468eba01ec7af5607 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 08:14:58 +0000
Subject: [PATCH 6/7] fix: add type casts to resolve TypeScript errors from
 updated database.types.ts

---
 src/lib/rag.ts                | 17 +++----
 tests/document-naming.test.ts |  4 +-
 worker/main.ts                | 86 +++++++++++++++++++++--------------
 3 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/src/lib/rag.ts b/src/lib/rag.ts
index 7b35c11a1d..b61364a46d 100644
--- a/src/lib/rag.ts
+++ b/src/lib/rag.ts
@@ -89,6 +89,7 @@ import type {
   ConflictOrGap,
   ClinicalQueryAnalysis,
   DocumentIndexQuality,
+  DocumentIndexQualityScore,
   DocumentIndexUnitMatch,
   DocumentMemoryCard,
   EvidenceRelevance,
@@ -2917,8 +2918,8 @@ async function attachIndexQualityMetadata(
     const qualityByDocument = new Map(data.map((row) => [row.document_id, row]));
     return results.map((result) => ({
       ...result,
-      indexing_quality: qualityByDocument.get(result.document_id) ?? result.indexing_quality ?? null,
-    }));
+      indexing_quality: (qualityByDocument.get(result.document_id) as unknown as DocumentIndexQualityScore | undefined) ?? result.indexing_quality ?? null,
+    })) as SearchResult[];
   } catch {
     return results;
   }
@@ -5645,12 +5646,12 @@ export async function searchChunksWithTelemetry(args: SearchChunksArgs) {
     (async () => {
       const startedAt = Date.now();
       const { data, error } = await supabase.rpc("match_document_chunks_hybrid", {
-        query_embedding: embedding,
+        query_embedding: embedding as unknown as string,
         query_text: textSearchQuery,
         match_count: candidateCount,
         min_similarity: minSimilarity,
-        document_filters: documentFilterList ?? null,
-        owner_filter: args.ownerId ?? null,
+        document_filters: documentFilterList ?? undefined,
+        owner_filter: args.ownerId ?? undefined,
       });
       return { data, error, latencyMs: Date.now() - startedAt };
     })(),
@@ -5738,11 +5739,11 @@ export async function searchChunksWithTelemetry(args: SearchChunksArgs) {
   const resultSets = await Promise.all(
     vectorFilters.map(async (documentFilter) => {
       const { data, error } = await supabase.rpc("match_document_chunks", {
-        query_embedding: embedding,
+        query_embedding: embedding as unknown as string,
         match_count: candidateCount,
         min_similarity: minSimilarity,
-        document_filter: documentFilter,
-        owner_filter: args.ownerId ?? null,
+        document_filter: documentFilter ?? undefined,
+        owner_filter: args.ownerId ?? undefined,
       });
 
       if (error) throw new Error(error.message);
diff --git a/tests/document-naming.test.ts b/tests/document-naming.test.ts
index dfce1d51a2..421c70bd89 100644
--- a/tests/document-naming.test.ts
+++ b/tests/document-naming.test.ts
@@ -1,4 +1,6 @@
 import { describe, expect, it } from "vitest";
+import type { SupabaseClient } from "@supabase/supabase-js";
+import type { Database } from "../src/lib/supabase/database.types";
 import { documentTitleKey, planDocumentName, smartDocumentTitle } from "../src/lib/document-naming";
 
 function supabaseWithDocuments(documents: unknown[]) {
@@ -10,7 +12,7 @@ function supabaseWithDocuments(documents: unknown[]) {
         }),
       }),
     }),
-  };
+  } as unknown as SupabaseClient<Database>;
 }
 
 describe("document naming", () => {
diff --git a/worker/main.ts b/worker/main.ts
index c2a3bc1351..f521d5ebcf 100644
--- a/worker/main.ts
+++ b/worker/main.ts
@@ -37,6 +37,7 @@ import { safeErrorLogDetails, safeIngestionJobLog } from "../src/lib/privacy";
 import { isAtomicReindexCandidate } from "../src/lib/reindex-pipeline";
 import { createAdminClient } from "../src/lib/supabase/admin";
 import { probeSupabaseHealth } from "../src/lib/supabase/health";
+import type { Database } from "../src/lib/supabase/database.types";
 import type { ExtractedDocument, ImageEvidenceCategory } from "../src/lib/types";
 import { buildAdditionalEmbeddingFieldInputs } from "./embedding-fields";
 import { checkPythonPdfPrerequisites } from "./prerequisites";
@@ -94,7 +95,10 @@ function supabaseStageError(
 }
 
 async function updateJob(jobId: string, patch: Record<string, unknown>) {
-  const { error } = await supabase.from("ingestion_jobs").update(patch).eq("id", jobId);
+  const { error } = await supabase
+    .from("ingestion_jobs")
+    .update(patch as Database["public"]["Tables"]["ingestion_jobs"]["Update"])
+    .eq("id", jobId);
   if (error) throw supabaseStageError("update ingestion job", error);
   if (typeof patch.progress === "number" || typeof patch.stage === "string") {
     progressUpdateState.set(jobId, {
@@ -127,7 +131,10 @@ async function updateJobProgress(jobId: string, patch: { stage: string; progress
 
 async function updateDocument(documentId: string, patch: Record<string, unknown>) {
   const sanitized = patch.metadata ? { ...patch, metadata: sanitizeJsonbRecord(patch.metadata) } : patch;
-  const { error } = await supabase.from("documents").update(sanitized).eq("id", documentId);
+  const { error } = await supabase
+    .from("documents")
+    .update(sanitized as Database["public"]["Tables"]["documents"]["Update"])
+    .eq("id", documentId);
   if (error) throw supabaseStageError("update document", error);
 }
 
@@ -191,7 +198,7 @@ async function completeJob(job: JobRow, stage: string) {
   const { error } = await supabase.rpc("complete_ingestion_job", {
     p_job_id: job.id,
     p_document_id: job.document_id,
-    p_batch_id: job.batch_id,
+    p_batch_id: job.batch_id ?? undefined,
     p_stage: stage,
   });
   if (!error) return;
@@ -253,12 +260,12 @@ async function failOrRetryJob(args: {
   const { error } = await supabase.rpc("fail_or_retry_ingestion_job", {
     p_job_id: args.job.id,
     p_document_id: args.job.document_id,
-    p_batch_id: args.job.batch_id,
+    p_batch_id: args.job.batch_id ?? undefined,
     p_retry: args.retry,
     p_document_status: args.documentStatus,
     p_stage: args.stage,
     p_error_message: args.errorMessage,
-    p_next_run_at: args.nextRunAt ?? null,
+    p_next_run_at: args.nextRunAt ?? undefined,
   });
   if (!error) return;
   if (!isMissingSchemaError(error)) throw supabaseStageError("fail or retry ingestion job", error);
@@ -329,7 +336,7 @@ async function claimJobs() {
   });
 
   if (error) throw supabaseStageError("claim ingestion jobs", error);
-  return ((data ?? []) as Array<Omit<JobRow, "documents"> & { documents: JobDocument }>).map((job) => ({
+  return ((data ?? []) as unknown as Array<Omit<JobRow, "documents"> & { documents: JobDocument }>).map((job) => ({
     ...job,
     documents: job.documents,
   })) as JobRow[];
@@ -353,6 +360,7 @@ function cleanString(val: string): string {
 
 type JsonbValue = string | number | boolean | null | { [key: string]: JsonbValue } | JsonbValue[];
 type JsonbRecord = { [key: string]: JsonbValue };
+type DbJson = Database["public"]["Tables"]["documents"]["Row"]["metadata"];
 
 function sanitizeJsonb(val: unknown): JsonbValue {
   if (typeof val === "string") return cleanString(val);
@@ -368,9 +376,9 @@ function sanitizeJsonb(val: unknown): JsonbValue {
   return val as JsonbValue;
 }
 
-function sanitizeJsonbRecord(value: unknown): Record<string, unknown> {
+function sanitizeJsonbRecord(value: unknown): DbJson {
   const sanitized = sanitizeJsonb(value);
-  return typeof sanitized === "object" && sanitized !== null && !Array.isArray(sanitized) ? sanitized : {};
+  return (typeof sanitized === "object" && sanitized !== null && !Array.isArray(sanitized) ? sanitized : {}) as DbJson;
 }
 
 async function resetDocumentIndex(documentId: string) {
@@ -454,8 +462,11 @@ async function replacePageRows(documentId: string, pages: ReturnType<typeof buil
 // fields, index units) cascade with their legacy chunks regardless — the
 // guarantee fully protects images, memory cards, and sections.
 async function deleteStaleIndexGenerationRows(documentId: string, indexGenerationId: string) {
+  // The table names here are known-valid; the cast bypasses the strict union of table names in generated types.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const fromTable = (table: string) => (supabase as any).from(table);
   const hasReplacementRows = async (table: string, direct: boolean) => {
-    let query = supabase.from(table).select("id").eq("document_id", documentId).limit(1);
+    let query = fromTable(table).select("id").eq("document_id", documentId).limit(1);
     query = direct
       ? query.eq("index_generation_id", indexGenerationId)
       : query.eq("metadata->>index_generation_id", indexGenerationId);
@@ -464,26 +475,23 @@ async function deleteStaleIndexGenerationRows(documentId: string, indexGeneratio
     return (data ?? []).length > 0;
   };
   const deleteDirectGenerationRows = async (table: string) => {
-    const stale = await supabase
-      .from(table)
+    const stale = await fromTable(table)
       .delete()
       .eq("document_id", documentId)
       .neq("index_generation_id", indexGenerationId);
     if (stale.error) throw supabaseStageError(`delete stale ${table}`, stale.error);
     if (!(await hasReplacementRows(table, true))) return;
-    const missing = await supabase.from(table).delete().eq("document_id", documentId).is("index_generation_id", null);
+    const missing = await fromTable(table).delete().eq("document_id", documentId).is("index_generation_id", null);
     if (missing.error) throw supabaseStageError(`delete generationless ${table}`, missing.error);
   };
   const deleteMetadataGenerationRows = async (table: string) => {
-    const stale = await supabase
-      .from(table)
+    const stale = await fromTable(table)
       .delete()
       .eq("document_id", documentId)
       .neq("metadata->>index_generation_id", indexGenerationId);
     if (stale.error) throw supabaseStageError(`delete stale ${table}`, stale.error);
     if (!(await hasReplacementRows(table, false))) return;
-    const missing = await supabase
-      .from(table)
+    const missing = await fromTable(table)
       .delete()
       .eq("document_id", documentId)
       .is("metadata->>index_generation_id", null);
@@ -500,7 +508,11 @@ async function deleteStaleIndexGenerationRows(documentId: string, indexGeneratio
 }
 
 async function upsertIndexQuality(quality: ReturnType<typeof buildIndexQualityPayload>) {
-  const { error } = await supabase.from("document_index_quality").upsert(sanitizeJsonbRecord(quality), {
+  const payload = {
+    ...quality,
+    metrics: sanitizeJsonbRecord(quality.metrics),
+  };
+  const { error } = await supabase.from("document_index_quality").upsert(payload, {
     onConflict: "document_id",
   });
   if (error) throw supabaseStageError("upsert document_index_quality", error);
@@ -748,7 +760,7 @@ async function setCachedImageClassification(args: {
       model: env.OPENAI_VISION_MODEL,
       caption: args.classification.caption,
       mime_type: args.mimeType,
-      metadata: {
+      metadata: sanitizeJsonbRecord({
         extractor: "local-worker",
         image_type: args.classification.image_type,
         searchable: args.classification.searchable,
@@ -768,7 +780,7 @@ async function setCachedImageClassification(args: {
         image_caption_cache_version: imageCaptionCacheVersion,
         vision_classification_prompt_version: visionClassificationPromptVersion,
         caption_context_hash: args.contextHash,
-      },
+      }),
       updated_at: new Date().toISOString(),
     },
     { onConflict: "owner_id,image_hash,model" },
@@ -1106,7 +1118,7 @@ async function uploadAndCaptionImages(
         id: data.id,
         caption: data.caption,
         pageNumber: data.page_number,
-        imageType: data.image_type,
+        imageType: data.image_type as ImageEvidenceCategory,
         sourceKind: image.sourceKind ?? "embedded",
         labels: data.labels ?? [],
         tableLabel: tableMetadata.tableLabel,
@@ -1258,11 +1270,11 @@ async function insertDocumentLevelEmbeddingFields(args: {
     field_type: field.field_type,
     content: field.content,
     content_hash: hashEmbeddingFieldContent(field.content),
-    embedding: assertEmbeddingDim(embeddings[index], `document_embedding_fields.${field.field_type}`),
-    metadata: {
+    embedding: assertEmbeddingDim(embeddings[index], `document_embedding_fields.${field.field_type}`) as unknown as string,
+    metadata: sanitizeJsonbRecord({
       source: "document_level",
       index_generation_id: args.chunkRows[0]?.index_generation_id ?? null,
-    },
+    }),
   }));
   const { error } = await supabase.from("document_embedding_fields").insert(rows);
   if (error) throw supabaseStageError("insert document-level embedding fields", error);
@@ -1326,10 +1338,12 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
       index_generation_id: indexGenerationId,
       embedding: assertEmbeddingDim(embeddings[index], `document_chunks.${chunk.chunk_index}`),
       metadata: sanitizeJsonbRecord(chunk.metadata),
-    })) satisfies IndexedChunkRow[];
+    })) as unknown as IndexedChunkRow[];
     indexedChunkRows.push(...rows);
 
-    const { error } = await supabase.from("document_chunks").insert(rows);
+    const { error } = await supabase
+      .from("document_chunks")
+      .insert(rows as unknown as Database["public"]["Tables"]["document_chunks"]["Insert"][]);
     if (error) throw new Error(error.message);
 
     const fieldInputs = buildEmbeddingFieldInputs(job, rows);
@@ -1340,7 +1354,7 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
           ...field,
           content: cleanString(field.content),
           content_hash: hashEmbeddingFieldContent(cleanString(field.content)),
-          embedding: assertEmbeddingDim(fieldEmbeddings[index], `document_embedding_fields.section_context.${index}`),
+          embedding: assertEmbeddingDim(fieldEmbeddings[index], `document_embedding_fields.section_context.${index}`) as unknown as string,
           metadata: sanitizeJsonbRecord({ ...field.metadata, index_generation_id: indexGenerationId }),
         }));
         for (let start = 0; start < fieldRows.length; start += 50) {
@@ -1364,7 +1378,9 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
     metadata: sanitizeJsonbRecord({ ...row.metadata, index_generation_id: indexGenerationId }),
   }));
   if (tableFacts.length > 0) {
-    const { error: factsError } = await supabase.from("document_table_facts").insert(tableFacts);
+    const { error: factsError } = await supabase
+      .from("document_table_facts")
+      .insert(tableFacts as unknown as Database["public"]["Tables"]["document_table_facts"]["Insert"][]);
     if (factsError)
       optionalIndexWriteIssues.push(
         optionalIndexWriteWarning("table fact", supabaseStageError("insert table facts", factsError)),
@@ -1380,7 +1396,7 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
     },
     chunks: indexedChunkRows,
     images: insertedImages,
-    tableFacts,
+    tableFacts: tableFacts as unknown as Parameters<typeof buildVisualDocumentIndexUnitInputs>[0]["tableFacts"],
   });
   if (visualIndexUnits.length > 0) {
     try {
@@ -1388,10 +1404,12 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
       for (let start = 0; start < visualIndexUnits.length; start += 50) {
         const batch = visualIndexUnits.slice(start, start + 50).map((unit, index) => ({
           ...unit,
-          embedding: assertEmbeddingDim(unitEmbeddings[start + index], `document_index_units.visual.${start + index}`),
+          embedding: assertEmbeddingDim(unitEmbeddings[start + index], `document_index_units.visual.${start + index}`) as unknown as string,
           metadata: sanitizeJsonbRecord({ ...unit.metadata, index_generation_id: indexGenerationId }),
         }));
-        const { error: visualUnitError } = await supabase.from("document_index_units").insert(batch);
+        const { error: visualUnitError } = await supabase
+          .from("document_index_units")
+          .insert(batch as unknown as Database["public"]["Tables"]["document_index_units"]["Insert"][]);
         if (visualUnitError) throw supabaseStageError("insert visual index units", visualUnitError);
       }
     } catch (error) {
@@ -1403,7 +1421,7 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
     job,
     chunkRows: indexedChunkRows,
     insertedImages,
-    tableFacts,
+    tableFacts: tableFacts as unknown as Parameters<typeof buildAdditionalEmbeddingFieldInputs>[0]["tableFacts"],
     qualityHint: buildChunkQualityHint(chunks),
   });
   if (additionalFieldInputs.length > 0) {
@@ -1415,7 +1433,7 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
           ...field,
           content,
           content_hash: hashEmbeddingFieldContent(content),
-          embedding: assertEmbeddingDim(additionalEmbeddings[index], `document_embedding_fields.${field.field_type}`),
+          embedding: assertEmbeddingDim(additionalEmbeddings[index], `document_embedding_fields.${field.field_type}`) as unknown as string,
           metadata: sanitizeJsonbRecord({ ...field.metadata, index_generation_id: indexGenerationId }),
         };
       });
@@ -1614,8 +1632,8 @@ async function processJob(job: JobRow) {
         const deepMemory = await upsertDocumentDeepMemory({
           supabase,
           document: job.documents,
-          chunks: enrichmentRows.chunks,
-          images: enrichmentRows.images,
+          chunks: enrichmentRows.chunks as unknown as Parameters<typeof upsertDocumentDeepMemory>[0]["chunks"],
+          images: enrichmentRows.images as unknown as Parameters<typeof upsertDocumentDeepMemory>[0]["images"],
           summary: enrichment.summary.summary,
         });
         sectionCount = deepMemory.sections.length;

From 17c09012878bce9e7ddc167ccbb6f85e9711ab35 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Thu, 2 Jul 2026 16:03:41 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix(types):=20migrate=20all=20consumers=20t?=
 =?UTF-8?q?o=20the=20PR=20#131=20typed=20Supabase=20client=20=E2=80=94=20r?=
 =?UTF-8?q?estore=20green=20typecheck=20on=20main?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR #131 (bigsimmo-typescript-review) added generated Database types and a
typed admin client but was merged with its verify check failing: 95
typecheck errors across worker, rag, scripts, API routes, and tests were
left unmigrated (compounded by PR #130 landing first). All fixes are
type-level and behavior-preserving:

- Typed Update/Insert payloads (TablesUpdate/TablesInsert) for worker job/
  document updates and bulk document rename.
- null -> undefined at rpc argument boundaries ONLY where the generated
  optionality proves a SQL default and that default is null (omitting the
  key sends the same value the explicit null did); verified against the
  migration signatures for the ingestion-job, retrieval-filter, and
  cleanup rpcs.
- pgvector embedding args cast as unknown as string: PostgREST serializes
  the number[] identically; only the generated column type is string.
- Untyped client surface scoped to helpers that take dynamic table/select
  strings or metadata->> JSON-path filters (worker generation cleanup,
  reindex-route pagination, enrich-documents row loader) — inexpressible
  in the generated types.
- Boundary casts where DB Row types meet domain types (SearchResult
  indexing_quality, MemoryChunk/MemoryImage/MemoryDocument, ChunkImage
  bbox/image_type, ImageEvidenceCategory) and where JSON-serializable
  telemetry/metadata objects are typed wider than Json.
- Replaced the computed eq/is cache-invalidation call and the legacy
  nullableQuery fallback with explicit typed branches.
- promote-query-misses filter turned into a type guard.
- tsconfig: exclude scratch/ (accidentally committed local debugging
  files from 'Save Codex local changes') from typecheck.

Verification: typecheck 0 errors; eslint clean; vitest 821 passed /
2 skipped; check:production-readiness READY; ui-smoke chromium suite run
before merge.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 scripts/backfill-smart-index.ts               |   4 +-
 scripts/backfill-source-metadata.ts           |   6 +-
 scripts/backfill-visual-intelligence.ts       |  10 +-
 .../cleanup-abandoned-reindex-generations.ts  |   4 +-
 scripts/enrich-documents.ts                   |  13 ++-
 scripts/profile-retrieval-rpcs.ts             |   4 +-
 scripts/promote-query-misses.ts               |   5 +-
 src/app/api/documents/[id]/reindex/route.ts   |  11 +-
 src/app/api/documents/[id]/route.ts           |   4 +-
 src/app/api/documents/bulk/reindex/route.ts   |  11 +-
 src/app/api/documents/bulk/route.ts           |   3 +-
 src/app/api/search/route.ts                   |   6 +-
 src/lib/rag.ts                                |  66 ++++++-----
 tests/document-naming.test.ts                 |   5 +-
 tsconfig.json                                 |   2 +-
 worker/main.ts                                | 105 ++++++++++--------
 16 files changed, 148 insertions(+), 111 deletions(-)

diff --git a/scripts/backfill-smart-index.ts b/scripts/backfill-smart-index.ts
index 652b7e548e..0d08f705f7 100644
--- a/scripts/backfill-smart-index.ts
+++ b/scripts/backfill-smart-index.ts
@@ -602,7 +602,7 @@ async function main() {
 
     const enrichment = await upsertDocumentEnrichment({
       supabase,
-      document,
+      document: document as Parameters<typeof upsertDocumentEnrichment>[0]["document"],
       chunks: chunks as never,
       images: images as never,
     });
@@ -613,7 +613,7 @@ async function main() {
     });
     const memory = await upsertDocumentDeepMemory({
       supabase,
-      document,
+      document: document as Parameters<typeof upsertDocumentDeepMemory>[0]["document"],
       chunks: chunks as never,
       images: images as never,
       summary: enrichment.summary.summary,
diff --git a/scripts/backfill-source-metadata.ts b/scripts/backfill-source-metadata.ts
index 171438b2b5..68c6b84ae0 100644
--- a/scripts/backfill-source-metadata.ts
+++ b/scripts/backfill-source-metadata.ts
@@ -1,4 +1,5 @@
 import { loadEnvConfig } from "@next/env";
+import type { Json } from "@/lib/supabase/database.types";
 
 loadEnvConfig(process.cwd());
 
@@ -658,7 +659,10 @@ async function main() {
   if (!APPLY) return;
 
   for (const item of changed) {
-    const { error } = await supabase.from("documents").update({ metadata: item.metadata }).eq("id", item.document.id);
+    const { error } = await supabase
+      .from("documents")
+      .update({ metadata: item.metadata as Json })
+      .eq("id", item.document.id);
     if (error) throw new Error(`Failed to update ${item.document.file_name}: ${error.message}`);
   }
   console.log(`Applied source metadata backfill to ${changed.length} documents.`);
diff --git a/scripts/backfill-visual-intelligence.ts b/scripts/backfill-visual-intelligence.ts
index 8523103657..84bd4a568e 100644
--- a/scripts/backfill-visual-intelligence.ts
+++ b/scripts/backfill-visual-intelligence.ts
@@ -1,4 +1,5 @@
 import { loadEnvConfig } from "@next/env";
+import type { Json, TablesInsert } from "@/lib/supabase/database.types";
 import {
   buildVisualDocumentIndexUnitInputs,
   embeddingTextForDocumentIndexUnit,
@@ -241,7 +242,10 @@ async function loadChunks(documentId: string) {
 
 async function markImage(image: BackfillImageRow, patch: Record<string, unknown>) {
   const metadata = { ...(image.metadata ?? {}), ...patch };
-  const { error } = await supabase.from("document_images").update({ metadata }).eq("id", image.id);
+  const { error } = await supabase
+    .from("document_images")
+    .update({ metadata: metadata as Json })
+    .eq("id", image.id);
   if (error) throw new Error(error.message);
 }
 
@@ -286,7 +290,9 @@ async function backfillDocument(documentId: string, images: BackfillImageRow[])
         ...unit,
         embedding: embeddings[start + index],
       }));
-      const { error } = await supabase.from("document_index_units").insert(batch);
+      const { error } = await supabase
+        .from("document_index_units")
+        .insert(batch as unknown as TablesInsert<"document_index_units">[]);
       if (error) throw new Error(error.message);
     }
   }
diff --git a/scripts/cleanup-abandoned-reindex-generations.ts b/scripts/cleanup-abandoned-reindex-generations.ts
index a50f779587..8b0c4d79af 100644
--- a/scripts/cleanup-abandoned-reindex-generations.ts
+++ b/scripts/cleanup-abandoned-reindex-generations.ts
@@ -60,7 +60,7 @@ async function main() {
   assertSupabaseHealthy(await probeSupabaseHealth(supabase), "Abandoned reindex generation cleanup");
 
   const { data, error } = await supabase.rpc("cleanup_abandoned_document_index_generations", {
-    p_document_id: args.documentId,
+    p_document_id: args.documentId ?? undefined,
     p_limit: limit,
     p_dry_run: true,
   });
@@ -93,7 +93,7 @@ async function main() {
   }
 
   const applied = await supabase.rpc("cleanup_abandoned_document_index_generations", {
-    p_document_id: args.documentId,
+    p_document_id: args.documentId ?? undefined,
     p_limit: limit,
     p_dry_run: false,
   });
diff --git a/scripts/enrich-documents.ts b/scripts/enrich-documents.ts
index cfe0de9efd..c120817cfa 100644
--- a/scripts/enrich-documents.ts
+++ b/scripts/enrich-documents.ts
@@ -1,4 +1,6 @@
 import { loadEnvConfig } from "@next/env";
+import type { SupabaseClient } from "@supabase/supabase-js";
+import type { Json } from "@/lib/supabase/database.types";
 import { createHash } from "node:crypto";
 
 loadEnvConfig(process.cwd());
@@ -134,7 +136,8 @@ async function loadRowsForDocuments(supabase: SupabaseAdmin, table: string, sele
   for (let start = 0; start < documentIds.length; start += 5) {
     const ids = documentIds.slice(start, start + 5);
     for (let rangeStart = 0; ; rangeStart += 1000) {
-      const { data, error } = await supabase
+      // Dynamic table/select strings need the untyped client surface.
+      const { data, error } = await (supabase as unknown as SupabaseClient)
         .from(table)
         .select(select)
         .in("document_id", ids)
@@ -394,7 +397,7 @@ async function classifyExistingImages(supabase: SupabaseAdmin, documentId: strin
       clinical_use_reason: finalAssessment.clinical_use_reason,
       clinical_signal_score: finalAssessment.clinical_signal_score,
       admin_signal_score: finalAssessment.admin_signal_score,
-    });
+    } as Parameters<typeof classifiedImageSkipReason>[0]);
     const retainAsAuditTable =
       image.source_kind === "table_crop" &&
       ["administrative", "reference"].includes(finalAssessment.clinical_use_class) &&
@@ -570,7 +573,7 @@ async function main() {
               .from("documents")
               .update({
                 image_count: imageStats.searchable,
-                metadata: imageMetadata,
+                metadata: imageMetadata as Json,
               })
               .eq("id", document.id);
           }
@@ -603,8 +606,8 @@ async function main() {
           const deepMemory = await upsertDocumentDeepMemory({
             supabase,
             document: { ...document, metadata: imageMetadata },
-            chunks: evidence.chunks,
-            images: evidence.images,
+            chunks: evidence.chunks as unknown as Parameters<typeof upsertDocumentDeepMemory>[0]["chunks"],
+            images: evidence.images as unknown as Parameters<typeof upsertDocumentDeepMemory>[0]["images"],
             summary: enrichmentSummary,
           });
           const { data: latestDoc } = await supabase
diff --git a/scripts/profile-retrieval-rpcs.ts b/scripts/profile-retrieval-rpcs.ts
index ecdb7b76a0..1ac139d481 100644
--- a/scripts/profile-retrieval-rpcs.ts
+++ b/scripts/profile-retrieval-rpcs.ts
@@ -81,8 +81,8 @@ async function main() {
       p_rpc: rpcName,
       p_query_text: args.query,
       p_match_count: args.matchCount,
-      p_owner_filter: ownerId ?? null,
-      p_document_filters: args.documentIds ?? null,
+      p_owner_filter: ownerId ?? undefined,
+      p_document_filters: args.documentIds ?? undefined,
       p_analyze: args.analyze,
     });
     if (error) {
diff --git a/scripts/promote-query-misses.ts b/scripts/promote-query-misses.ts
index 4084171ca8..690cf1947d 100644
--- a/scripts/promote-query-misses.ts
+++ b/scripts/promote-query-misses.ts
@@ -78,7 +78,10 @@ async function main() {
 
   let inserted = 0;
   for (const group of promotable) {
-    const labels = group.labels.filter((label) => label.document_id && label.label && label.label_type);
+    const labels = group.labels.filter(
+      (label): label is typeof label & { document_id: string; label: string; label_type: string } =>
+        Boolean(label.document_id && label.label && label.label_type),
+    );
     for (const label of labels) {
       const { error: labelError } = await supabase.from("document_labels").upsert(
         {
diff --git a/src/app/api/documents/[id]/reindex/route.ts b/src/app/api/documents/[id]/reindex/route.ts
index 2e1d749abd..3440dc21a7 100644
--- a/src/app/api/documents/[id]/reindex/route.ts
+++ b/src/app/api/documents/[id]/reindex/route.ts
@@ -1,4 +1,5 @@
 import { NextResponse } from "next/server";
+import type { SupabaseClient } from "@supabase/supabase-js";
 import { z } from "zod";
 import { env, isDemoMode } from "@/lib/env";
 import { upsertDocumentEnrichment } from "@/lib/document-enrichment";
@@ -74,7 +75,11 @@ async function selectReindexRowsInPages<T>(args: {
 }) {
   const rows: T[] = [];
   for (let offset = 0; ; offset += reindexPageSize) {
-    let query = args.supabase.from(args.table).select(args.select).eq("document_id", args.documentId);
+    // Dynamic table/select strings need the untyped client surface.
+    let query = (args.supabase as unknown as SupabaseClient)
+      .from(args.table)
+      .select(args.select)
+      .eq("document_id", args.documentId);
     if (args.searchableOnly) query = query.eq("searchable", true);
     const { data, error } = await query.range(offset, offset + reindexPageSize - 1);
     if (error) throw new Error(error.message);
@@ -147,13 +152,13 @@ export async function POST(request: Request, { params }: { params: Promise<{ id:
 
       const enrichment = await upsertDocumentEnrichment({
         supabase,
-        document,
+        document: document as Parameters<typeof upsertDocumentEnrichment>[0]["document"],
         chunks: committedChunks,
         images: committedImages,
       });
       const deepMemory = await upsertDocumentDeepMemory({
         supabase,
-        document,
+        document: document as Parameters<typeof upsertDocumentDeepMemory>[0]["document"],
         chunks: committedChunks,
         images: committedImages,
         summary: enrichment.summary.summary,
diff --git a/src/app/api/documents/[id]/route.ts b/src/app/api/documents/[id]/route.ts
index 9f68f1cb0e..55d6a15582 100644
--- a/src/app/api/documents/[id]/route.ts
+++ b/src/app/api/documents/[id]/route.ts
@@ -1,4 +1,5 @@
 import { NextResponse } from "next/server";
+import type { Json } from "@/lib/supabase/database.types";
 import { z } from "zod";
 import { getDemoDocumentPayload } from "@/lib/demo-data";
 import { env, isDemoMode } from "@/lib/env";
@@ -451,7 +452,8 @@ export async function PATCH(request: Request, { params }: { params: Promise<{ id
           renamed_at: new Date().toISOString(),
           previous_title: document.title,
           original_file_name: metadata.original_file_name ?? document.file_name,
-        },
+          // JSON-serializable; the inferred literal type is wider than Json.
+        } as unknown as Json,
       })
       .eq("id", id)
       .eq("owner_id", user.id)
diff --git a/src/app/api/documents/bulk/reindex/route.ts b/src/app/api/documents/bulk/reindex/route.ts
index 28286c58bf..9f2ae387ad 100644
--- a/src/app/api/documents/bulk/reindex/route.ts
+++ b/src/app/api/documents/bulk/reindex/route.ts
@@ -1,4 +1,5 @@
 import { NextResponse } from "next/server";
+import type { SupabaseClient } from "@supabase/supabase-js";
 import { z } from "zod";
 import { upsertDocumentDeepMemory } from "@/lib/deep-memory";
 import { upsertDocumentEnrichment } from "@/lib/document-enrichment";
@@ -66,7 +67,11 @@ async function selectRowsInPages<T>(args: {
 }) {
   const rows: T[] = [];
   for (let offset = 0; ; offset += pageSize) {
-    let query = args.supabase.from(args.table).select(args.select).eq("document_id", args.documentId);
+    // Dynamic table/select strings need the untyped client surface.
+    let query = (args.supabase as unknown as SupabaseClient)
+      .from(args.table)
+      .select(args.select)
+      .eq("document_id", args.documentId);
     if (args.searchableOnly) query = query.eq("searchable", true);
     const { data, error } = await query.range(offset, offset + pageSize - 1);
     if (error) throw new Error(error.message);
@@ -145,13 +150,13 @@ export async function POST(request: Request) {
           );
           const enrichment = await upsertDocumentEnrichment({
             supabase,
-            document,
+            document: document as Parameters<typeof upsertDocumentEnrichment>[0]["document"],
             chunks: committedChunks,
             images: committedImages,
           });
           const memory = await upsertDocumentDeepMemory({
             supabase,
-            document,
+            document: document as Parameters<typeof upsertDocumentDeepMemory>[0]["document"],
             chunks: committedChunks,
             images: committedImages,
             summary: enrichment.summary.summary,
diff --git a/src/app/api/documents/bulk/route.ts b/src/app/api/documents/bulk/route.ts
index 1f3328fe82..40f51eed29 100644
--- a/src/app/api/documents/bulk/route.ts
+++ b/src/app/api/documents/bulk/route.ts
@@ -5,6 +5,7 @@ import { isDemoMode } from "@/lib/env";
 import { jsonError, PublicApiError } from "@/lib/http";
 import { invalidateRagCachesForOwner } from "@/lib/rag";
 import { createAdminClient } from "@/lib/supabase/admin";
+import type { Json, TablesUpdate } from "@/lib/supabase/database.types";
 import { AuthenticationError, requireAuthenticatedUser, unauthorizedResponse } from "@/lib/supabase/auth";
 import { parseJsonBody } from "@/lib/validation/body";
 
@@ -156,7 +157,7 @@ export async function POST(request: Request) {
         metadata.bulk_metadata_updated_by = user.id;
 
         const nextTitle = editTitle(document.title, parsed.titleEdit);
-        const updatePayload: Record<string, unknown> = { metadata };
+        const updatePayload: TablesUpdate<"documents"> = { metadata: metadata as Json };
         if (nextTitle && nextTitle !== document.title) updatePayload.title = nextTitle;
 
         const { error: updateError } = await supabase
diff --git a/src/app/api/search/route.ts b/src/app/api/search/route.ts
index 3b61c6969a..08cf8c7510 100644
--- a/src/app/api/search/route.ts
+++ b/src/app/api/search/route.ts
@@ -1,4 +1,5 @@
 import { NextResponse } from "next/server";
+import type { Json } from "@/lib/supabase/database.types";
 import { z } from "zod";
 import { demoSearch } from "@/lib/demo-data";
 import { isDemoMode, isLocalNoAuthMode } from "@/lib/env";
@@ -539,7 +540,8 @@ function logRetrievalDiagnostics(args: {
           relevance_score: args.relevance.score,
           latency_bucket: latencyBucket(latencyMs),
           ...retrievalDecisionTelemetry(args.telemetry),
-        },
+          // Telemetry values are JSON-serializable; some are typed wider than Json.
+        } as unknown as Json,
       });
     } catch (error) {
       retrievalLogWriteMetrics.failures += 1;
@@ -599,7 +601,7 @@ function logSearchObservation(args: {
           search_cache_hit: telemetry.search_cache_hit ?? null,
           embedding_skipped: telemetry.embedding_skipped ?? null,
           ...retrievalDecisionTelemetry(telemetry),
-        },
+        } as unknown as Json,
       });
     } catch {
       // Search telemetry must not affect the user-facing search path.
diff --git a/src/lib/rag.ts b/src/lib/rag.ts
index b61364a46d..6262c3426b 100644
--- a/src/lib/rag.ts
+++ b/src/lib/rag.ts
@@ -1,5 +1,5 @@
 import { createAdminClient } from "@/lib/supabase/admin";
-import type { Database } from "@/lib/supabase/database.types";
+import type { Database, Json } from "@/lib/supabase/database.types";
 import {
   embedTextWithTelemetry,
   generateStructuredTextResult,
@@ -89,7 +89,6 @@ import type {
   ConflictOrGap,
   ClinicalQueryAnalysis,
   DocumentIndexQuality,
-  DocumentIndexQualityScore,
   DocumentIndexUnitMatch,
   DocumentMemoryCard,
   EvidenceRelevance,
@@ -1652,7 +1651,8 @@ async function replaceSharedCacheRow(
       normalized_query: normalizedQuery,
       indexing_version: indexingVersion,
       dependency_version: ragCacheDependencyVersion,
-      payload,
+      // JSON-serializable by contract of the response cache.
+      payload: payload as Json,
       expires_at: new Date(Date.now() + ttlMs).toISOString(),
     });
   } catch {
@@ -1717,11 +1717,11 @@ export function invalidateRagCachesForOwner(ownerId?: string | null) {
   }
   void (async () => {
     try {
-      await createAdminClient()
-        .from("rag_response_cache")
-        .delete()
-        [sharedCacheOwnerId ? "eq" : "is"]("owner_id", sharedCacheOwnerId)
-        .in("cache_kind", ["search", "answer"]);
+      const deletion = createAdminClient().from("rag_response_cache").delete();
+      await (sharedCacheOwnerId ? deletion.eq("owner_id", sharedCacheOwnerId) : deletion.is("owner_id", null)).in(
+        "cache_kind",
+        ["search", "answer"],
+      );
     } catch (error) {
       // Shared cache invalidation is best effort.
       console.warn("Shared cache invalidation failed for owner:", error);
@@ -1770,9 +1770,7 @@ async function insertRagQuery(row: RagQueryInsert) {
     query: queryTextForStorage(rawQuery),
     metadata: { ...existingMetadata, ...queryPrivacyMetadata(rawQuery) },
   };
-  await supabase
-    .from("rag_queries")
-    .insert(safeRow as Database["public"]["Tables"]["rag_queries"]["Insert"]);
+  await supabase.from("rag_queries").insert(safeRow as Database["public"]["Tables"]["rag_queries"]["Insert"]);
 }
 
 async function logRagQuery(row: RagQueryInsert) {
@@ -1900,12 +1898,7 @@ async function fetchEnabledRagAliases(
       .eq("enabled", true)
       .order("weight", { ascending: false })
       .limit(maxRagAliasesPerScope);
-    const nullableQuery = query as typeof query & { is?: (column: string, value: null) => typeof query };
-    query = scopeOwnerId
-      ? query.eq("owner_id", scopeOwnerId)
-      : nullableQuery.is
-        ? nullableQuery.is("owner_id", null)
-        : query.eq("owner_id", null);
+    query = scopeOwnerId ? query.eq("owner_id", scopeOwnerId) : query.is("owner_id", null);
     const { data, error } = await query;
     if (error) throw error;
     return (data ?? []) as RagAliasInput[];
@@ -2071,8 +2064,8 @@ async function searchTextChunkCandidates(args: {
     const { data, error } = await args.supabase.rpc("match_document_chunks_text", {
       query_text: queryText,
       match_count: matchCount,
-      document_filters: args.documentIds ?? null,
-      owner_filter: args.ownerId ?? null,
+      document_filters: args.documentIds ?? undefined,
+      owner_filter: args.ownerId ?? undefined,
     });
     return error || !data?.length ? ([] as SearchResult[]) : (data as SearchResult[]);
   };
@@ -2223,9 +2216,9 @@ async function fetchBestDocumentLookupChunks(args: {
   const terms = documentLookupChunkTerms(args.query);
   const { data: rpcChunks, error: rpcError } = await args.supabase.rpc("match_document_lookup_chunks_text", {
     query_text: args.query,
-    document_filters: args.documentIds,
+    document_filters: args.documentIds ?? undefined,
     match_count: Math.max(args.limit * 3, 24),
-    owner_filter: args.ownerId ?? null,
+    owner_filter: args.ownerId ?? undefined,
   });
   if (!rpcError && rpcChunks?.length) {
     const ranked = (rpcChunks as DocumentLookupChunkRow[])
@@ -2329,7 +2322,7 @@ async function searchDocumentLookupFastPath(args: {
       const { data, error } = await args.supabase.rpc("match_documents_for_query", {
         query_text: variant,
         match_count: index === 0 ? 12 : 8,
-        owner_filter: args.ownerId ?? null,
+        owner_filter: args.ownerId ?? undefined,
       });
       if (error || !data?.length) return [] as DocumentLookupRow[];
       return data as DocumentLookupRow[];
@@ -2682,8 +2675,8 @@ async function searchTableFactCandidates(args: {
       const { data, error } = await args.supabase.rpc("match_document_table_facts_text", {
         query_text: variant,
         match_count: index === 0 ? args.matchCount : Math.min(args.matchCount, 24),
-        document_filters: args.documentIds ?? null,
-        owner_filter: args.ownerId ?? null,
+        document_filters: args.documentIds ?? undefined,
+        owner_filter: args.ownerId ?? undefined,
       });
       if (error || !data?.length) return [] as TableFactRpcRow[];
       return data as TableFactRpcRow[];
@@ -2726,12 +2719,12 @@ async function searchEmbeddingFieldCandidates(args: {
   telemetry?: SearchTelemetry;
 }) {
   const { data, error } = await args.supabase.rpc("match_document_embedding_fields_hybrid", {
-    query_embedding: args.queryEmbedding,
+    query_embedding: args.queryEmbedding as unknown as string,
     query_text: buildClinicalTextSearchQuery(args.query),
     match_count: args.matchCount,
     min_similarity: 0.12,
-    document_filters: args.documentIds ?? null,
-    owner_filter: args.ownerId ?? null,
+    document_filters: args.documentIds ?? undefined,
+    owner_filter: args.ownerId ?? undefined,
   });
   if (error) recordHybridRpcError(args.telemetry, "match_document_embedding_fields_hybrid", error);
   if (error || !data?.length) return [] as SearchResult[];
@@ -2776,12 +2769,12 @@ async function searchIndexUnitCandidates(args: {
   telemetry?: SearchTelemetry;
 }) {
   const { data, error } = await args.supabase.rpc("match_document_index_units_hybrid", {
-    query_embedding: args.queryEmbedding,
+    query_embedding: args.queryEmbedding as unknown as string,
     query_text: buildClinicalTextSearchQuery(args.query),
     match_count: args.matchCount,
     min_similarity: 0.1,
-    document_filters: args.documentIds ?? null,
-    owner_filter: args.ownerId ?? null,
+    document_filters: args.documentIds ?? undefined,
+    owner_filter: args.ownerId ?? undefined,
   });
   if (error) recordHybridRpcError(args.telemetry, "match_document_index_units_hybrid", error);
   if (error || !data?.length) return [] as SearchResult[];
@@ -2904,7 +2897,7 @@ async function attachIndexQualityMetadata(
   supabase: ReturnType<typeof createAdminClient>,
   results: SearchResult[],
   ownerId?: string,
-) {
+): Promise<SearchResult[]> {
   const documentIds = Array.from(new Set(results.map((result) => result.document_id)));
   if (documentIds.length === 0) return results;
   try {
@@ -2918,8 +2911,11 @@ async function attachIndexQualityMetadata(
     const qualityByDocument = new Map(data.map((row) => [row.document_id, row]));
     return results.map((result) => ({
       ...result,
-      indexing_quality: (qualityByDocument.get(result.document_id) as unknown as DocumentIndexQualityScore | undefined) ?? result.indexing_quality ?? null,
-    })) as SearchResult[];
+      indexing_quality:
+        (qualityByDocument.get(result.document_id) as SearchResult["indexing_quality"]) ??
+        result.indexing_quality ??
+        null,
+    }));
   } catch {
     return results;
   }
@@ -3096,8 +3092,8 @@ async function attachPageVisualEvidence(
       page_number: image.page_number,
       storage_path: image.storage_path,
       caption: image.caption,
-      bbox: image.bbox,
-      image_type: image.image_type,
+      bbox: image.bbox as ChunkImage["bbox"],
+      image_type: image.image_type as ChunkImage["image_type"],
       searchable: image.searchable,
       clinical_relevance_score: image.clinical_relevance_score,
       source_kind: image.source_kind,
diff --git a/tests/document-naming.test.ts b/tests/document-naming.test.ts
index 421c70bd89..452ff8d334 100644
--- a/tests/document-naming.test.ts
+++ b/tests/document-naming.test.ts
@@ -1,9 +1,8 @@
 import { describe, expect, it } from "vitest";
-import type { SupabaseClient } from "@supabase/supabase-js";
-import type { Database } from "../src/lib/supabase/database.types";
 import { documentTitleKey, planDocumentName, smartDocumentTitle } from "../src/lib/document-naming";
 
 function supabaseWithDocuments(documents: unknown[]) {
+  // Minimal stub of the query chain planDocumentName uses.
   return {
     from: () => ({
       select: () => ({
@@ -12,7 +11,7 @@ function supabaseWithDocuments(documents: unknown[]) {
         }),
       }),
     }),
-  } as unknown as SupabaseClient<Database>;
+  } as unknown as Parameters<typeof planDocumentName>[0]["supabase"];
 }
 
 describe("document naming", () => {
diff --git a/tsconfig.json b/tsconfig.json
index 1b9373b9fc..c5498646a9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,5 +24,5 @@
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts", "**/*.mts"],
-  "exclude": ["node_modules", "supabase/functions/**"]
+  "exclude": ["node_modules", "supabase/functions/**", "scratch/**"]
 }
diff --git a/worker/main.ts b/worker/main.ts
index f521d5ebcf..f5ca325cbd 100644
--- a/worker/main.ts
+++ b/worker/main.ts
@@ -1,4 +1,5 @@
 import { createHash, randomUUID } from "node:crypto";
+import type { SupabaseClient } from "@supabase/supabase-js";
 import { readFile, rm } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -36,8 +37,8 @@ import { classifyAndCaptionImageFromBase64, embedTexts } from "../src/lib/openai
 import { safeErrorLogDetails, safeIngestionJobLog } from "../src/lib/privacy";
 import { isAtomicReindexCandidate } from "../src/lib/reindex-pipeline";
 import { createAdminClient } from "../src/lib/supabase/admin";
+import type { Json, TablesInsert, TablesUpdate } from "../src/lib/supabase/database.types";
 import { probeSupabaseHealth } from "../src/lib/supabase/health";
-import type { Database } from "../src/lib/supabase/database.types";
 import type { ExtractedDocument, ImageEvidenceCategory } from "../src/lib/types";
 import { buildAdditionalEmbeddingFieldInputs } from "./embedding-fields";
 import { checkPythonPdfPrerequisites } from "./prerequisites";
@@ -94,11 +95,8 @@ function supabaseStageError(
   return wrapped;
 }
 
-async function updateJob(jobId: string, patch: Record<string, unknown>) {
-  const { error } = await supabase
-    .from("ingestion_jobs")
-    .update(patch as Database["public"]["Tables"]["ingestion_jobs"]["Update"])
-    .eq("id", jobId);
+async function updateJob(jobId: string, patch: TablesUpdate<"ingestion_jobs">) {
+  const { error } = await supabase.from("ingestion_jobs").update(patch).eq("id", jobId);
   if (error) throw supabaseStageError("update ingestion job", error);
   if (typeof patch.progress === "number" || typeof patch.stage === "string") {
     progressUpdateState.set(jobId, {
@@ -129,12 +127,9 @@ async function updateJobProgress(jobId: string, patch: { stage: string; progress
   progressUpdateState.set(jobId, { updatedAt: now, progress: patch.progress, stage: patch.stage });
 }
 
-async function updateDocument(documentId: string, patch: Record<string, unknown>) {
+async function updateDocument(documentId: string, patch: TablesUpdate<"documents">) {
   const sanitized = patch.metadata ? { ...patch, metadata: sanitizeJsonbRecord(patch.metadata) } : patch;
-  const { error } = await supabase
-    .from("documents")
-    .update(sanitized as Database["public"]["Tables"]["documents"]["Update"])
-    .eq("id", documentId);
+  const { error } = await supabase.from("documents").update(sanitized).eq("id", documentId);
   if (error) throw supabaseStageError("update document", error);
 }
 
@@ -198,6 +193,8 @@ async function completeJob(job: JobRow, stage: string) {
   const { error } = await supabase.rpc("complete_ingestion_job", {
     p_job_id: job.id,
     p_document_id: job.document_id,
+    // SQL default for p_batch_id is null, so omitting the key when batch_id
+    // is null sends the same value the explicit null did.
     p_batch_id: job.batch_id ?? undefined,
     p_stage: stage,
   });
@@ -265,7 +262,8 @@ async function failOrRetryJob(args: {
     p_document_status: args.documentStatus,
     p_stage: args.stage,
     p_error_message: args.errorMessage,
-    p_next_run_at: args.nextRunAt ?? undefined,
+    // SQL default is null; omitting the key matches the old explicit null.
+    p_next_run_at: args.nextRunAt,
   });
   if (!error) return;
   if (!isMissingSchemaError(error)) throw supabaseStageError("fail or retry ingestion job", error);
@@ -360,7 +358,6 @@ function cleanString(val: string): string {
 
 type JsonbValue = string | number | boolean | null | { [key: string]: JsonbValue } | JsonbValue[];
 type JsonbRecord = { [key: string]: JsonbValue };
-type DbJson = Database["public"]["Tables"]["documents"]["Row"]["metadata"];
 
 function sanitizeJsonb(val: unknown): JsonbValue {
   if (typeof val === "string") return cleanString(val);
@@ -376,9 +373,9 @@ function sanitizeJsonb(val: unknown): JsonbValue {
   return val as JsonbValue;
 }
 
-function sanitizeJsonbRecord(value: unknown): DbJson {
+function sanitizeJsonbRecord(value: unknown): JsonbRecord {
   const sanitized = sanitizeJsonb(value);
-  return (typeof sanitized === "object" && sanitized !== null && !Array.isArray(sanitized) ? sanitized : {}) as DbJson;
+  return typeof sanitized === "object" && sanitized !== null && !Array.isArray(sanitized) ? sanitized : {};
 }
 
 async function resetDocumentIndex(documentId: string) {
@@ -462,11 +459,12 @@ async function replacePageRows(documentId: string, pages: ReturnType<typeof buil
 // fields, index units) cascade with their legacy chunks regardless — the
 // guarantee fully protects images, memory cards, and sections.
 async function deleteStaleIndexGenerationRows(documentId: string, indexGenerationId: string) {
-  // The table names here are known-valid; the cast bypasses the strict union of table names in generated types.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const fromTable = (table: string) => (supabase as any).from(table);
+  // Dynamic table names and `metadata->>` JSON-path filters are outside what
+  // the generated Database types can express; scope an untyped client to
+  // these generation-cleanup helpers only.
+  const dynamicTables = supabase as unknown as SupabaseClient;
   const hasReplacementRows = async (table: string, direct: boolean) => {
-    let query = fromTable(table).select("id").eq("document_id", documentId).limit(1);
+    let query = dynamicTables.from(table).select("id").eq("document_id", documentId).limit(1);
     query = direct
       ? query.eq("index_generation_id", indexGenerationId)
       : query.eq("metadata->>index_generation_id", indexGenerationId);
@@ -475,23 +473,30 @@ async function deleteStaleIndexGenerationRows(documentId: string, indexGeneratio
     return (data ?? []).length > 0;
   };
   const deleteDirectGenerationRows = async (table: string) => {
-    const stale = await fromTable(table)
+    const stale = await dynamicTables
+      .from(table)
       .delete()
       .eq("document_id", documentId)
       .neq("index_generation_id", indexGenerationId);
     if (stale.error) throw supabaseStageError(`delete stale ${table}`, stale.error);
     if (!(await hasReplacementRows(table, true))) return;
-    const missing = await fromTable(table).delete().eq("document_id", documentId).is("index_generation_id", null);
+    const missing = await dynamicTables
+      .from(table)
+      .delete()
+      .eq("document_id", documentId)
+      .is("index_generation_id", null);
     if (missing.error) throw supabaseStageError(`delete generationless ${table}`, missing.error);
   };
   const deleteMetadataGenerationRows = async (table: string) => {
-    const stale = await fromTable(table)
+    const stale = await dynamicTables
+      .from(table)
       .delete()
       .eq("document_id", documentId)
       .neq("metadata->>index_generation_id", indexGenerationId);
     if (stale.error) throw supabaseStageError(`delete stale ${table}`, stale.error);
     if (!(await hasReplacementRows(table, false))) return;
-    const missing = await fromTable(table)
+    const missing = await dynamicTables
+      .from(table)
       .delete()
       .eq("document_id", documentId)
       .is("metadata->>index_generation_id", null);
@@ -508,13 +513,11 @@ async function deleteStaleIndexGenerationRows(documentId: string, indexGeneratio
 }
 
 async function upsertIndexQuality(quality: ReturnType<typeof buildIndexQualityPayload>) {
-  const payload = {
-    ...quality,
-    metrics: sanitizeJsonbRecord(quality.metrics),
-  };
-  const { error } = await supabase.from("document_index_quality").upsert(payload, {
-    onConflict: "document_id",
-  });
+  const { error } = await supabase
+    .from("document_index_quality")
+    .upsert(sanitizeJsonbRecord(quality) as unknown as TablesInsert<"document_index_quality">, {
+      onConflict: "document_id",
+    });
   if (error) throw supabaseStageError("upsert document_index_quality", error);
 }
 
@@ -760,7 +763,7 @@ async function setCachedImageClassification(args: {
       model: env.OPENAI_VISION_MODEL,
       caption: args.classification.caption,
       mime_type: args.mimeType,
-      metadata: sanitizeJsonbRecord({
+      metadata: {
         extractor: "local-worker",
         image_type: args.classification.image_type,
         searchable: args.classification.searchable,
@@ -780,7 +783,9 @@ async function setCachedImageClassification(args: {
         image_caption_cache_version: imageCaptionCacheVersion,
         vision_classification_prompt_version: visionClassificationPromptVersion,
         caption_context_hash: args.contextHash,
-      }),
+        // JSON-serializable at runtime; structured_visual_profile's type is
+        // wider than the generated Json shape.
+      } as unknown as Json,
       updated_at: new Date().toISOString(),
     },
     { onConflict: "owner_id,image_hash,model" },
@@ -1270,13 +1275,15 @@ async function insertDocumentLevelEmbeddingFields(args: {
     field_type: field.field_type,
     content: field.content,
     content_hash: hashEmbeddingFieldContent(field.content),
-    embedding: assertEmbeddingDim(embeddings[index], `document_embedding_fields.${field.field_type}`) as unknown as string,
-    metadata: sanitizeJsonbRecord({
+    embedding: assertEmbeddingDim(embeddings[index], `document_embedding_fields.${field.field_type}`),
+    metadata: {
       source: "document_level",
       index_generation_id: args.chunkRows[0]?.index_generation_id ?? null,
-    }),
+    },
   }));
-  const { error } = await supabase.from("document_embedding_fields").insert(rows);
+  const { error } = await supabase
+    .from("document_embedding_fields")
+    .insert(rows as unknown as TablesInsert<"document_embedding_fields">[]);
   if (error) throw supabaseStageError("insert document-level embedding fields", error);
   return rows.map((row) => row.field_type);
 }
@@ -1338,12 +1345,12 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
       index_generation_id: indexGenerationId,
       embedding: assertEmbeddingDim(embeddings[index], `document_chunks.${chunk.chunk_index}`),
       metadata: sanitizeJsonbRecord(chunk.metadata),
-    })) as unknown as IndexedChunkRow[];
+    })) satisfies IndexedChunkRow[];
     indexedChunkRows.push(...rows);
 
     const { error } = await supabase
       .from("document_chunks")
-      .insert(rows as unknown as Database["public"]["Tables"]["document_chunks"]["Insert"][]);
+      .insert(rows as unknown as TablesInsert<"document_chunks">[]);
     if (error) throw new Error(error.message);
 
     const fieldInputs = buildEmbeddingFieldInputs(job, rows);
@@ -1354,12 +1361,14 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
           ...field,
           content: cleanString(field.content),
           content_hash: hashEmbeddingFieldContent(cleanString(field.content)),
-          embedding: assertEmbeddingDim(fieldEmbeddings[index], `document_embedding_fields.section_context.${index}`) as unknown as string,
+          embedding: assertEmbeddingDim(fieldEmbeddings[index], `document_embedding_fields.section_context.${index}`),
           metadata: sanitizeJsonbRecord({ ...field.metadata, index_generation_id: indexGenerationId }),
         }));
         for (let start = 0; start < fieldRows.length; start += 50) {
           const batch = fieldRows.slice(start, start + 50);
-          const { error: fieldsError } = await supabase.from("document_embedding_fields").insert(batch);
+          const { error: fieldsError } = await supabase
+            .from("document_embedding_fields")
+            .insert(batch as unknown as TablesInsert<"document_embedding_fields">[]);
           if (fieldsError) throw supabaseStageError("insert section-context embedding fields", fieldsError);
         }
       } catch (error) {
@@ -1380,7 +1389,7 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
   if (tableFacts.length > 0) {
     const { error: factsError } = await supabase
       .from("document_table_facts")
-      .insert(tableFacts as unknown as Database["public"]["Tables"]["document_table_facts"]["Insert"][]);
+      .insert(tableFacts as unknown as TablesInsert<"document_table_facts">[]);
     if (factsError)
       optionalIndexWriteIssues.push(
         optionalIndexWriteWarning("table fact", supabaseStageError("insert table facts", factsError)),
@@ -1396,7 +1405,7 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
     },
     chunks: indexedChunkRows,
     images: insertedImages,
-    tableFacts: tableFacts as unknown as Parameters<typeof buildVisualDocumentIndexUnitInputs>[0]["tableFacts"],
+    tableFacts,
   });
   if (visualIndexUnits.length > 0) {
     try {
@@ -1404,12 +1413,12 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
       for (let start = 0; start < visualIndexUnits.length; start += 50) {
         const batch = visualIndexUnits.slice(start, start + 50).map((unit, index) => ({
           ...unit,
-          embedding: assertEmbeddingDim(unitEmbeddings[start + index], `document_index_units.visual.${start + index}`) as unknown as string,
+          embedding: assertEmbeddingDim(unitEmbeddings[start + index], `document_index_units.visual.${start + index}`),
           metadata: sanitizeJsonbRecord({ ...unit.metadata, index_generation_id: indexGenerationId }),
         }));
         const { error: visualUnitError } = await supabase
           .from("document_index_units")
-          .insert(batch as unknown as Database["public"]["Tables"]["document_index_units"]["Insert"][]);
+          .insert(batch as unknown as TablesInsert<"document_index_units">[]);
         if (visualUnitError) throw supabaseStageError("insert visual index units", visualUnitError);
       }
     } catch (error) {
@@ -1421,7 +1430,7 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
     job,
     chunkRows: indexedChunkRows,
     insertedImages,
-    tableFacts: tableFacts as unknown as Parameters<typeof buildAdditionalEmbeddingFieldInputs>[0]["tableFacts"],
+    tableFacts,
     qualityHint: buildChunkQualityHint(chunks),
   });
   if (additionalFieldInputs.length > 0) {
@@ -1433,13 +1442,15 @@ async function insertEmbeddedChunks(job: JobRow, extracted: ExtractedDocument) {
           ...field,
           content,
           content_hash: hashEmbeddingFieldContent(content),
-          embedding: assertEmbeddingDim(additionalEmbeddings[index], `document_embedding_fields.${field.field_type}`) as unknown as string,
+          embedding: assertEmbeddingDim(additionalEmbeddings[index], `document_embedding_fields.${field.field_type}`),
           metadata: sanitizeJsonbRecord({ ...field.metadata, index_generation_id: indexGenerationId }),
         };
       });
       for (let start = 0; start < additionalRows.length; start += 50) {
         const batch = additionalRows.slice(start, start + 50);
-        const { error: additionalFieldsError } = await supabase.from("document_embedding_fields").insert(batch);
+        const { error: additionalFieldsError } = await supabase
+          .from("document_embedding_fields")
+          .insert(batch as unknown as TablesInsert<"document_embedding_fields">[]);
         if (additionalFieldsError)
           throw supabaseStageError("insert supplemental embedding fields", additionalFieldsError);
       }